From 2e1b2364ff8b1733805ba60e1076f4cee4b09597 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Fri, 5 Sep 2025 16:41:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.typings.ts               |  1 +
 src/components/fly-login/fly-login.vue |  2 +-
 src/pages/index/index.vue              | 25 +++++++++---------
 src/pages/my/components/wx-login.vue   |  4 +--
 src/pages/my/setting.vue               | 31 ++++-------------------
 src/store/user.ts                      |  7 ++++--
 src/utils/index.ts                     | 35 ++++++++++++++++++++++++++
 7 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/src/api/login.typings.ts b/src/api/login.typings.ts
index 99f2eea..226103e 100644
--- a/src/api/login.typings.ts
+++ b/src/api/login.typings.ts
@@ -6,6 +6,7 @@ export interface IUserInfoVo {
   nickname: string
   avatar: string
   token: string
+  isset: boolean
 }
 
 /**
diff --git a/src/components/fly-login/fly-login.vue b/src/components/fly-login/fly-login.vue
index 37f43c0..4d827d6 100644
--- a/src/components/fly-login/fly-login.vue
+++ b/src/components/fly-login/fly-login.vue
@@ -68,7 +68,7 @@ const onSubmit = () => {
   // }
 
   emit('update:modelValue', false)
-  console.log('保存用户信息')
+  // console.log('保存用户信息')
   // userStore.setUserInfo({ nickname: nickname.value, avatar: avatarUrl.value })
   userStore.wxLogin()
 }
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index ef7cfa3..dcfa655 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -378,14 +378,13 @@
 <script lang="ts">
 // import { toLogin } from '@/libs/login.js'
 import { getProductAPI, getBannerAPI } from '@/service/crmeb/product.ts'
-import { useUserStore } from '@/store'
-import { getUrl, getWebUrl, getShopWebUrl } from '@/utils'
+
+import { getUrl, getWebUrl, getShopWebUrl, hasLogin } from '@/utils'
 import {
   getArticleCategoryAPI,
   getArticleIndexAPI,
   getArticleDetailAPI,
 } from '@/service/crmeb/product.ts'
-const userStore = useUserStore()
 
 import { defineComponent } from 'vue'
 
@@ -481,19 +480,19 @@ export default defineComponent({
       })
     },
     more(item) {
-      const hasLogin = userStore.userInfo['id'] ? true : false
-      if (!hasLogin) {
+      if (hasLogin() === false) {
         this.show = true
         return
       }
-
-      console.log(item)
-      if (item.type == 1) {
-        getUrl(item.url)
-      } else if (item.type == 2) {
-        getWebUrl(item.url)
-      } else if (item.type == 3) {
-        getShopWebUrl(item.url)
+      if (hasLogin() === true) {
+        console.log(item)
+        if (item.type == 1) {
+          getUrl(item.url)
+        } else if (item.type == 2) {
+          getWebUrl(item.url)
+        } else if (item.type == 3) {
+          getShopWebUrl(item.url)
+        }
       }
     },
   },
diff --git a/src/pages/my/components/wx-login.vue b/src/pages/my/components/wx-login.vue
index 3457cd1..3fab5ee 100644
--- a/src/pages/my/components/wx-login.vue
+++ b/src/pages/my/components/wx-login.vue
@@ -105,7 +105,7 @@
           </view>
         </wd-grid>
       </wd-card>
-      <button v-if="!hasLogin" class="mt-2" @click="logout">退出登录</button>
+      <button v-if="hasLogin" class="mt-2" @click="logout">退出登录</button>
     </view>
     <fly-login v-model="show" />
   </view>
@@ -123,7 +123,7 @@ const logout = () => {
     title: '确认退出当前账号？',
     success: (res) => {
       if (res.confirm) {
-        userStore.clearUserInfo()
+        userStore.logout()
       }
     },
   })
diff --git a/src/pages/my/setting.vue b/src/pages/my/setting.vue
index 0b70b97..6467488 100644
--- a/src/pages/my/setting.vue
+++ b/src/pages/my/setting.vue
@@ -100,6 +100,8 @@
             :rules="[{ required: false, pattern: /^1[3-9]\d{9}$/, message: '请输入有效手机号码' }]"
           />
           <button v-if="hasLogin" class="mt-2" @click="logout">退出登录</button>
+          <button class="mt-2" @click="goBack">返回上一级</button>
+
           <view class="text-center m-10">
             <wd-button
               type="primary"
@@ -143,9 +145,6 @@
             ]"
           ></wd-col-picker>
         </wd-popup>
-        <!-- <wd-popup v-model="show" custom-style="border-radius:32rpx;" @close="handleClose">
-          <text class="custom-txt">弹弹弹</text>
-        </wd-popup> -->
       </wd-card>
     </view>
     <button v-if="hasLogin" class="mt-2" @click="logout">退出登录</button>
@@ -218,6 +217,7 @@ export default defineComponent({
     }
   },
   async onLoad(option) {
+    this.show = option.show || false
     this.getArea()
     this.getUserInfo()
   },
@@ -260,29 +260,6 @@ export default defineComponent({
       }
     },
 
-    // pickDate(e) {
-    //   // this.userInfo.banquet_date = e[0]
-    //   this.showDatePicker = false
-    // },
-    close() {
-      this.propShowOrder = false
-    },
-    //表单验证
-    handleSubmit(reservation_type) {
-      this.userInfo.reservation_type = reservation_type //付款类型
-      this.$refs.form
-        .validate()
-        .then(({ valid, errors }) => {
-          if (valid) {
-            this.userInfo.address = this.address_string + this.userInfo.street_name
-            this.addOrder()
-          }
-        })
-        .catch((error) => {
-          console.log(error, 'error')
-        })
-    },
-
     //获取地址--直接到泸州市区级
     getArea() {
       this.getDistrict()
@@ -345,6 +322,8 @@ export default defineComponent({
       const res = await setGroupAPI(this.addressinfo)
       console.log(res)
       this.show = false
+      //重新获取地址信息
+      userStore.getUserInfo()
     },
 
     //地址改版事件
diff --git a/src/store/user.ts b/src/store/user.ts
index e1db743..bc279bf 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -17,6 +17,7 @@ const userInfoState: IUserInfoVo = {
   nickname: '',
   avatar: '/static/images/default-avatar.png',
   token: '',
+  isset: false,
 }
 
 export const useUserStore = defineStore(
@@ -34,6 +35,8 @@ export const useUserStore = defineStore(
         val.avatar = baseUrl + val.avatar //地址拼接
         // val.avatar = 'https://oss.laf.run/ukw0y1-site/avatar.jpg?feige'
       }
+      //判断是否设置村庄
+      val.isset = userInfoState.village ? true : false
       userInfo.value = val
     }
     const setUserAvatar = (avatar: string) => {
@@ -54,8 +57,8 @@ export const useUserStore = defineStore(
       const res = await _getUserInfo()
       const userInfo = res.data
       setUserInfo(userInfo)
-      uni.setStorageSync('userInfo', userInfo)
-      uni.setStorageSync('token', userInfo.token)
+      // uni.setStorageSync('userInfo', userInfo)
+      // uni.setStorageSync('token', userInfo.token)
       // TODO 这里可以增加获取用户路由的方法 根据用户的角色动态生成路由
       return res
     }
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 146427d..2ff4924 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -214,3 +214,38 @@ export function getShopWebUrl(url) {
     url: `/pages/web_view/h5?target=${url}`,
   })
 }
+import { useUserStore } from '@/store'
+// const userStore = useUserStore()
+// 代登录跳转
+export function hasLogin() {
+  const hasLogin = useUserStore().userInfo.id ? true : false
+  // console.log(useUserStore().userInfo)
+
+  console.log('是否登录', hasLogin)
+  console.log('是否登录sss', useUserStore().userInfo)
+  //强制跳转设置村庄
+  if (hasLogin && !useUserStore().userInfo.isset) {
+    // if (!this.phone) {
+    //   uni.showToast({
+    //     title: '请填写手机号',
+    //     icon: 'none',
+    //   })
+    //   return
+    // }
+    uni.showModal({
+      title: '温馨提示',
+      content: ' 您尚未完善个人信息,是否前往设置你的个人地址?',
+      success: function (res) {
+        if (res.confirm) {
+          uni.navigateTo({
+            url: '/pages/my/setting',
+          })
+        }
+      },
+    })
+
+    return
+  }
+  //返回是否登录
+  return hasLogin
+}