From 659c5524a0848be59f6ca9e12fa3c5d2394a99c0 Mon Sep 17 00:00:00 2001
From: Ankkaya <staryou@126.com>
Date: Thu, 30 May 2024 18:57:02 +0800
Subject: [PATCH] opt

---
 pages.json               | 45 +++++++++++++++++++++-------------------
 pages/index/index.vue    |  1 -
 pages/index/my.vue       |  5 +++--
 peach/api/member/auth.js |  9 +++++++-
 peach/store/app.js       |  6 ++++++
 5 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/pages.json b/pages.json
index 316737f..64a0f67 100644
--- a/pages.json
+++ b/pages.json
@@ -29,6 +29,15 @@
                 "auth": false
             }
         },
+        {
+            "path": "pages/index/icons",
+            "style": {
+                "navigationBarTitleText": "ICONS"
+            },
+            "meta": {
+                "auth": false
+            }
+        },
         {
             "path": "pages/index/index",
             "style": {
@@ -55,15 +64,6 @@
             "meta": {
                 "auth": false
             }
-        },
-        {
-            "path": "pages/index/icons",
-            "style": {
-                "navigationBarTitleText": "uni-app"
-            },
-            "meta": {
-                "auth": false
-            }
         }
     ],
     "subPackages": [
@@ -103,18 +103,18 @@
             ]
         },
         {
-          "root": "pages/user",
-          "pages": [
-            {
-              "path": "wallet/money",
-              "style": {
-                "navigationBarTitleText": "余额"
-              },
-              "meta": {
-                "auth": false
-              }
-            }
-          ]
+            "root": "pages/user",
+            "pages": [
+                {
+                    "path": "wallet/money",
+                    "style": {
+                        "navigationBarTitleText": "余额"
+                    },
+                    "meta": {
+                        "auth": false
+                    }
+                }
+            ]
         }
     ],
     "tabBar": {
@@ -130,6 +130,9 @@
             },
             {
                 "pagePath": "pages/index/my"
+            },
+            {
+                "pagePath": "pages/index/icons"
             }
         ]
     },
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9a6400f..997a5fb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,5 @@
 <template>
     <pb-layout navbar="inner" tabbar="/pages/index/index" :bgStyle="bgStyle">
-        <view :style="[{ paddingTop: peach.$platform.navBar + 'px' }]"></view>
         <view class="dashboard-module ss-p-x-30">
             <view class="merchant-info flex align-center">
                 <image class="logo" :src="merchantInfo.logo" mode="aspectFill"></image>
diff --git a/pages/index/my.vue b/pages/index/my.vue
index 66eccfe..c483869 100644
--- a/pages/index/my.vue
+++ b/pages/index/my.vue
@@ -1,6 +1,5 @@
 <template>
     <pb-layout navbar="inner" tabbar="/pages/index/my" :bgStyle="bgStyle">
-        <view :style="[{ paddingTop: peach.$platform.navBar + 'px' }]"></view>
         <view class="my-module ss-p-x-30">
             <view class="user-info flex align-center">
                 <image class="avatar" :src="userInfo.avatar || '/static/default_avatar.png'" mode="aspectFill"></image>
@@ -18,7 +17,9 @@
                         <view class="unit self-start">￥</view>
                         <view class="sremain ss-font-60">{{ remain }}</view>
                     </view>
-                    <button class="right-btn ss-reset-button">查看详情</button>
+                    <button @click="peach.$router.go('/pages/user/wallet/money')" class="right-btn ss-reset-button">
+                        查看详情
+                    </button>
                 </view>
                 <view class="cent ss-m-t-20"> 总获取积分 {{ userInfo.point }} </view>
             </view>
diff --git a/peach/api/member/auth.js b/peach/api/member/auth.js
index 43565ce..f2e3200 100644
--- a/peach/api/member/auth.js
+++ b/peach/api/member/auth.js
@@ -14,6 +14,13 @@ const AuthUtil = {
             },
         })
     },
+    // 退出登陆
+    logout: () => {
+        return request({
+            url: '/particulars/member/auth/logout',
+            method: 'POST',
+        })
+    },
     // 发送手机验证码
     sendSmsCode: (mobile, scene) => {
         return request({
@@ -33,7 +40,7 @@ const AuthUtil = {
     // 刷新令牌
     refreshToken: (refreshToken) => {
         return request({
-            url: '/member/auth/refresh-token',
+            url: '/particulars/member/auth/refresh-token',
             method: 'POST',
             params: {
                 refreshToken,
diff --git a/peach/store/app.js b/peach/store/app.js
index 5d4ecd6..f5398c5 100644
--- a/peach/store/app.js
+++ b/peach/store/app.js
@@ -80,6 +80,12 @@ const useAppStore = defineStore(
                             text: '我的',
                             url: '/pages/index/my',
                         },
+                        {
+                            activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-002.png',
+                            iconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-001.png',
+                            text: 'icons',
+                            url: '/pages/index/icons',
+                        },
                     ],
                     style: {
                         activeColor: '#fc4141',