From 8f06cf703d7b17e55cf0a2083982edaeaeb33cdd Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Thu, 6 Jun 2024 17:36:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home/index.vue          | 10 +++++-----
 src/pages/mine/index.vue          | 22 ++++++++++++----------
 src/pages/qrcode/index.vue        |  3 +--
 src/permission.ts                 | 11 ++++++-----
 src/utils/common/index.ts         | 17 ++++++++++++++++-
 src/utils/request/interceptors.ts |  9 ++++++++-
 6 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 5e4a32e..47e2e72 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -14,15 +14,15 @@
         </view>
       </view>
 
-      <view class='user-info-card' @click.stop='goPath("/pages/mine/index")'>
+      <view class='user-info-card' @click.stop='goPath("/pages/mine/index",true)'>
         <image class='user-avatar' :src='userInfo?.image||defaultAvatar' mode='aspectFill' />
         <text class='user-name primary-text-color'>{{ userInfo?.nickName || '点击注册会员' }}</text>
-        <view class='integral-view primary-text-color' @click.stop='goPath("/pages/mine/subs/integral/index")'>
+        <view class='integral-view primary-text-color' @click.stop='goPath("/pages/mine/subs/integral/index",true)'>
           <text>{{ userInfo?.integration || 0 }}</text>
           <text>积分</text>
         </view>
         <view class='divider' style='height: 83rpx' />
-        <view class='balance-view' @click.stop='goPath("/pages/mine/subs/recharge/index")'>
+        <view class='balance-view' @click.stop='goPath("/pages/mine/subs/recharge/index",true)'>
           <text class='accent-text-color'>{{ userInfo?.balance || 0 }}</text>
           <text>余额(元)</text>
         </view>
@@ -33,12 +33,12 @@
       </view>
 
       <view class='menu-view'>
-        <view @click.stop='goPath("/pages/mine/subs/recharge/index")'>
+        <view @click.stop='goPath("/pages/mine/subs/recharge/index",true)'>
           <image :src='assetsUrl("ic_member_card2.png")' style='width: 108rpx;height: 72rpx;padding: 11rpx 0' />
           <text>会员充值</text>
         </view>
         <view class='divider' style='margin: 0;height: 153rpx' />
-        <view @click.stop='goPath("/pages/mine/subs/coupon/index")'>
+        <view @click.stop='goPath("/pages/mine/subs/coupon/index",true)'>
           <image :src='assetsUrl("ic_coupon2.png")' style='width: 108rpx;height: 95rpx' />
           <text>优惠券</text>
         </view>
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 17e8349..831220a 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -136,15 +136,17 @@ onLoad(() => {
 });
 
 onShow(async () => {
-  const { list } = await getOrderList({
-    pageNum: 1,
-    pageSize: 9999,
-    obj: { payStatus: 1 }
-  });
-  unPaidOrderCount.value = list.filter((item: any) => isPending(item))?.length || 0;
-  const { cardurl } = await getCardLink();
-  cardLink.value = cardurl;
-  await userStore.getProfile();
+  if(isLogin()) {
+    const { list } = await getOrderList({
+      pageNum: 1,
+      pageSize: 9999,
+      obj: { payStatus: 1 }
+    });
+    unPaidOrderCount.value = list.filter((item: any) => isPending(item))?.length || 0;
+    const { cardurl } = await getCardLink();
+    cardLink.value = cardurl;
+    await userStore.getProfile();
+  }
 });
 
 const openCard = () => {
@@ -173,7 +175,7 @@ const gotoPath = (path: string) => {
       phoneNumber: companyInfo.value.telphone
     });
   } else {
-    goPath(path);
+    goPath(path, true);
   }
 };
 
diff --git a/src/pages/qrcode/index.vue b/src/pages/qrcode/index.vue
index 5d38acb..1a0eb2d 100644
--- a/src/pages/qrcode/index.vue
+++ b/src/pages/qrcode/index.vue
@@ -11,7 +11,7 @@
     <view class='qrcode-card'>
       <view class='balance-view'>
         <text class='balance-text'>账户余额：{{ userInfo?.balance || 0 }}元</text>
-        <view class='btn-recharge' @click.stop='goPath("/pages/mine/subs/recharge/index")'>
+        <view class='btn-recharge' @click.stop='goPath("/pages/mine/subs/recharge/index",true)'>
           <text>去充值</text>
           <image :src='assetsUrl("ic_arrow_right.png")' />
         </view>
@@ -36,7 +36,6 @@
         <text>店铺名称（{{ userInfo?.creatorName }}）</text>
         <text>{{ userInfo?.storeId }}</text>
       </view>
-
     </view>
   </view>
 </template>
diff --git a/src/permission.ts b/src/permission.ts
index 4d899f3..f82b16c 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -25,11 +25,12 @@ list.forEach((item) => {
         return true;
       }
       else {
-        if (checkWhite(to.url))
-          return true;
-
-        uni.reLaunch({ url: loginPage });
-        return false;
+        // if (checkWhite(to.url))
+        //   return true;
+        //
+        // uni.reLaunch({ url: loginPage });
+        // return false;
+        return true;
       }
     },
     fail(err) {
diff --git a/src/utils/common/index.ts b/src/utils/common/index.ts
index b54aba9..708812e 100644
--- a/src/utils/common/index.ts
+++ b/src/utils/common/index.ts
@@ -1,5 +1,7 @@
 // 小程序更新检测
 
+import { isLogin } from '@/utils';
+
 export function mpUpdate() {
   const updateManager = uni.getUpdateManager();
   updateManager.onCheckForUpdate((res) => {
@@ -50,7 +52,20 @@ export function showToast(title: string, { icon, duration, complete }: ToastOpti
   });
 }
 
-export function goPath(path: string) {
+export function goPath(path: string, needAuth: boolean = false) {
+  if(needAuth && !isLogin()) {
+    uni.showModal({
+      title: '提示',
+      content: '您还未登录，请先登录',
+      showCancel: true,
+      success: (res) => {
+        if(res.confirm) {
+          goLogin();
+        }
+      }
+    });
+    return;
+  }
   if(path.includes('home/index') || path.includes('mall/index') || path.includes('qrcode/index') || path.includes('mine/index')) {
     uni.switchTab({
       url: path
diff --git a/src/utils/request/interceptors.ts b/src/utils/request/interceptors.ts
index f9b520a..c7312fc 100644
--- a/src/utils/request/interceptors.ts
+++ b/src/utils/request/interceptors.ts
@@ -86,7 +86,14 @@ function responseInterceptors() {
 
       // 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
       if(custom?.toast !== false) {
-        uni.$u.toast(data.message || data.retinfo);
+        if(data?.retinfo?.includes('未登录')
+          || data?.retinfo?.includes('未登陆')
+          || data.message?.includes('未登录')
+          || data.message?.includes('未登陆')) {
+          getApp()?.globalData?.logger.error('未登录');
+        } else {
+          uni.$u.toast(data.message || data.retinfo);
+        }
       }
 
       // 如果需要catch返回，则进行reject