From c65eb5ddcdf8a64a85abfdeb1e47e8cb4ed8200c Mon Sep 17 00:00:00 2001
From: Ankkaya <staryou@126.com>
Date: Wed, 29 May 2024 17:07:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=99=BB=E5=BD=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                             |   2 +-
 App.vue                          |   2 -
 pages.json                       |  26 +-
 pages/index/index.vue            |  93 ++++--
 pages/index/login.vue            | 295 ++++++++++---------
 pages/index/my.vue               |  36 +--
 pages/index/redirect.vue         |  31 ++
 peach/api/member/auth.js         |  91 +++---
 peach/api/member/user.js         |  29 ++
 peach/request/index.js           | 485 +++++++++++++++----------------
 peach/router/index.js            | 296 +++++++++----------
 peach/store/app.js               | 328 ++++++++++-----------
 peach/store/sys.js               |   1 -
 peach/store/user.js              | 200 +++++++------
 peach/ui/pb-tabbar/pb-tabbar.vue |   7 +
 static/default_avatar.png        | Bin 0 -> 4755 bytes
 16 files changed, 1012 insertions(+), 910 deletions(-)
 create mode 100644 pages/index/redirect.vue
 create mode 100644 peach/api/member/user.js
 create mode 100644 static/default_avatar.png

diff --git a/.env b/.env
index b67a5b6..7e7b528 100644
--- a/.env
+++ b/.env
@@ -5,7 +5,7 @@ MALL_VERSION = v1.0.0
 MALL_BASE_URL = http://api-dashboard.yudao.iocoder.cn
 
 # 后端接口 - 测试环境（通过 process.env.NODE_ENV = development）
-MALL_DEV_BASE_URL = http://mall-backend-dev.jiandyb.cn:7001
+MALL_DEV_BASE_URL = https://mall-baclend-local.jiandyb9834.xyz
 
 # 后端接口前缀（一般不建议调整）
 MALL_API_PATH = /merchant-api
diff --git a/App.vue b/App.vue
index 0832d65..3c8a008 100644
--- a/App.vue
+++ b/App.vue
@@ -3,8 +3,6 @@ import { onLaunch, onShow, onError } from '@dcloudio/uni-app'
 import { peachInit } from './peach'
 
 onLaunch(() => {
-    // 隐藏原生导航栏 使用自定义底部导航
-    uni.hideTabBar()
     peachInit()
 })
 
diff --git a/pages.json b/pages.json
index f2eec73..f6750fe 100644
--- a/pages.json
+++ b/pages.json
@@ -8,6 +8,9 @@
     },
     "pages": [
         //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+        {
+            "path": "pages/index/redirect"
+        },
         {
             "path": "pages/order/list",
             "style": {
@@ -64,18 +67,17 @@
         }
     ],
     "subPackages": [
-      {
-        "root": "pages/public",
-        "pages": [
-
-          {
-            "path": "error",
-            "style": {
-              "navigationBarTitleText": "错误页面"
-            }
-          }
-        ]
-      }
+        {
+            "root": "pages/public",
+            "pages": [
+                {
+                    "path": "error",
+                    "style": {
+                        "navigationBarTitleText": "错误页面"
+                    }
+                }
+            ]
+        }
     ],
     "tabBar": {
         "list": [
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6e7c004..9a6400f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,34 +3,38 @@
         <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="state.merchantInfo.logo" mode="aspectFill"></image>
+                <image class="logo" :src="merchantInfo.logo" mode="aspectFill"></image>
 
                 <view class="detail flex flex-column justify-center gap-10">
-                    <view class="name ss-font-26">{{ state.merchantInfo.name }}</view>
-                    <view class="description ss-font-26">{{ state.merchantInfo.description }}</view>
+                    <view class="name ss-font-26">{{ merchantInfo.name }}</view>
+                    <view class="description ss-font-26">{{ merchantInfo?.contactPhone }}</view>
                 </view>
             </view>
 
             <view class="statistic ss-m-t-24">
                 <view class="title ss-font-24 ss-m-b-20">
-                    {{ `今日收款金额（成功收款${state.statistic.total}笔）` }}
+                    {{ `今日收款金额（成功收款${state.statistic.todayPaymentCount}笔）` }}
                 </view>
                 <view class="income flex justify-between align-center">
                     <view class="left flex align-center">
                         <view class="unit self-start">￥</view>
-                        <view class="sincome ss-font-60">{{ state.statistic.income }}</view>
+                        <view class="sincome ss-font-60">{{ state.statistic.todayPaymentAmount || 0 }}</view>
                     </view>
                     <button class="right-btn ss-reset-button">查看详情</button>
                 </view>
+                <view class="des ss-m-t-20">
+                    总销售额{{ state.statistic.totalSalesAmount }}元 | 成功退款{{ state.statistic.refundCount }}笔 |
+                    退款金额{{ state.statistic.refundAmount }}元
+                </view>
             </view>
 
             <view class="more ss-m-t-70">
                 <view class="title ss-m-b-30">基础数据</view>
                 <view class="items">
-                    <view class="item" v-for="item in state.more">
+                    <view class="item" v-for="item in state.more" :key="item.name">
                         <view class="label">{{ item.name }}</view>
                         <view class="value">{{ item.value }}</view>
-                        <view class="last">昨日 {{ item.last }}</view>
+                        <view class="last"> 昨日 {{ item.last }} </view>
                     </view>
                 </view>
             </view>
@@ -39,8 +43,11 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
+import { onLoad, onShow } from '@dcloudio/uni-app'
 import peach from '@/peach'
+import $store from '@/peach/store'
+import UserUtil from '@/peach/api/member/user'
 import bg from '@/static/bg-page.png'
 
 const bgStyle = {
@@ -51,43 +58,62 @@ const bgStyle = {
 }
 
 const state = ref({
-    merchantInfo: {
-        name: '测试商家',
-        logo: '/static/logo.png',
-        description: '测试商家描述',
-    },
     statistic: {
-        total: 100,
-        income: 2222222222,
+        todayPaymentCount: 0,
+        todayPaymentAmount: 0,
+        totalSalesAmount: 0,
+        refundCount: 0,
+        refundAmount: 0,
     },
     more: [
         {
-            name: '支付金额',
-            value: 10000000,
-            last: 100000000,
-        },
-        {
-            name: '访客数',
-            value: 100000,
-            last: 100000,
+            name: '销售金额',
+            key: 'Amount',
+            value: 0,
+            last: 0,
         },
         {
             name: '订单数',
-            value: 100000,
-            last: 10000,
+            key: 'orderCount',
+            value: 0,
+            last: 0,
         },
         {
-            name: '客单价',
-            value: 10000,
-            last: 100,
+            name: '待核销',
+            key: 'verificationOrderCount',
+            value: 0,
         },
         {
-            name: '支付买家数',
-            value: 100,
-            last: 100,
+            name: '待配送',
+            key: 'deliveryOrderCount',
+            value: 0,
         },
     ],
 })
+
+const userStore = $store('user')
+
+const merchantInfo = computed(() => {
+    return userStore.userInfo?.particulars
+})
+
+async function getStatistic() {
+    let res = await UserUtil.getHomeStatistics()
+    for (let key of Object.keys(state.value.statistic)) {
+        state.value.statistic[key] = res.data[key]
+    }
+
+    state.value.more[0].value = res.data.todayPaymentAmount ?? 0
+    state.value.more[0].last = res.data.yesterdaySalesAmount ?? 0
+    state.value.more[1].value = res.data.orderCount
+    state.value.more[1].last = res.data.yesterdayOrderCount
+    state.value.more[2].value = res.data.verificationOrderCount
+    state.value.more[3].value = res.data.deliveryOrderCount
+}
+
+onShow(() => {
+    getStatistic()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -136,6 +162,11 @@ const state = ref({
                 color: #fff;
             }
         }
+
+        .des {
+            color: var(--ui-TC-2);
+            font-size: 24rpx;
+        }
     }
 
     .more {
diff --git a/pages/index/login.vue b/pages/index/login.vue
index a497e30..31525cf 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -1,181 +1,194 @@
 <template>
-  <pb-layout :leftIcon="''" navbar="inner" :bgStyle="{ backgroundColor: '#fff' }">
-    <view class="login-module ss-p-x-30">
-      <view class="login-title ss-font-56 ss-m-b-72">
-        {{ title }}
-      </view>
-      <uni-forms ref="smsLoginRef" v-model="state.model" :rules="state.rules" validateTrigger="bind">
-        <uni-forms-item name="mobile">
-          <uni-easyinput :styles="state.inputStyle" trim="all" placeholder="请输入手机号" v-model="state.model.mobile"
-            :inputBorder="false" type="number" />
-        </uni-forms-item>
-        <uni-forms-item name="code">
-          <uni-easyinput :styles="state.inputStyle" trim="all" placeholder="验证码" v-model="state.model.code"
-            :inputBorder="false" type="number" maxlength="4">
-            <template #right>
-              <button :disabled="state.isMobileEnd" :class="{ 'code-btn-end': state.isMobileEnd }"
-                class="ss-reset-button code-btn code-btn-start" @tap="getSmsCode('smsLogin', state.model.mobile)">
-                {{ getSmsTimer('smsLogin') }}
-              </button>
-            </template>
-          </uni-easyinput>
-        </uni-forms-item>
-      </uni-forms>
-      <button class="ss-reset-button login-btn-start" @tap="smsLoginSubmit">登录</button>
-      <view class="agreement-box ss-flex ss-row-center" :class="{ shake: state.isShaking }">
-        <label class="radio ss-flex" @tap="onChange">
-          <radio :checked="state.agreeStatus" color="var(--ui-BG-Main)" style="transform: scale(0.8)"
-            @tap.stop="onChange" />
-          <view class="agreement-text ss-flex ss-m-l-8">
-            我已阅读并遵守
-            <view class="tcp-text" @tap.stop="onProtocol('商家入驻协议')"> 《商家入驻协议》 </view>
-          </view>
-        </label>
-      </view>
-    </view>
-  </pb-layout>
+    <pb-layout :leftIcon="''" navbar="inner" :bgStyle="{ backgroundColor: '#fff' }">
+        <view class="login-module ss-p-x-30">
+            <view class="login-title ss-font-56 ss-m-b-72">
+                {{ title }}
+            </view>
+            <uni-forms ref="smsLoginRef" v-model="state.model" :rules="state.rules" validateTrigger="bind">
+                <uni-forms-item name="mobile">
+                    <uni-easyinput
+                        :styles="state.inputStyle"
+                        trim="all"
+                        placeholder="请输入手机号"
+                        v-model="state.model.mobile"
+                        :inputBorder="false"
+                        type="number"
+                    />
+                </uni-forms-item>
+                <uni-forms-item name="code">
+                    <uni-easyinput
+                        :styles="state.inputStyle"
+                        trim="all"
+                        placeholder="验证码"
+                        v-model="state.model.code"
+                        :inputBorder="false"
+                        type="number"
+                        maxlength="4"
+                    >
+                        <template #right>
+                            <button
+                                :disabled="state.isMobileEnd"
+                                :class="{ 'code-btn-end': state.isMobileEnd }"
+                                class="ss-reset-button code-btn code-btn-start"
+                                @tap="getSmsCode('smsLogin', state.model.mobile)"
+                            >
+                                {{ getSmsTimer('smsLogin') }}
+                            </button>
+                        </template>
+                    </uni-easyinput>
+                </uni-forms-item>
+            </uni-forms>
+            <button class="ss-reset-button login-btn-start" @tap="smsLoginSubmit">登录</button>
+            <view class="agreement-box ss-flex ss-row-center" :class="{ shake: state.isShaking }">
+                <label class="radio ss-flex" @tap="onChange">
+                    <radio
+                        :checked="state.agreeStatus"
+                        color="var(--ui-BG-Main)"
+                        style="transform: scale(0.8)"
+                        @tap.stop="onChange"
+                    />
+                    <view class="agreement-text ss-flex ss-m-l-8">
+                        我已阅读并遵守
+                        <view class="tcp-text" @tap.stop="onProtocol('商家入驻协议')"> 《商家入驻协议》 </view>
+                    </view>
+                </label>
+            </view>
+        </view>
+    </pb-layout>
 </template>
 
 <script setup>
 import { ref } from 'vue'
-import { code, mobile } from '@/peach/validate/form';
-import AuthUtil from '@/peach/api/member/auth';
+import { code, mobile } from '@/peach/validate/form'
+import AuthUtil from '@/peach/api/member/auth'
 import peach from '@/peach'
-import { showAuthModal, closeAuthModal, getSmsCode, getSmsTimer } from '@/peach/hooks/useModal';
+import { showAuthModal, closeAuthModal, getSmsCode, getSmsTimer } from '@/peach/hooks/useModal'
 
 const title = ref('欢迎登录')
 const smsLoginRef = ref(null)
 
 const state = ref({
-  isMobileEnd: false,
-  agreeStatus: false,
-  isShaking: false,
-  model: {
-    mobile: '15036370128',
-    code: '9999',
-  },
-  rules: {
-    mobile,
-    code
-  },
-  inputStyle: {
-    backgroundColor: '#ECECEC'
-  }
+    isMobileEnd: false,
+    agreeStatus: false,
+    isShaking: false,
+    model: {
+        mobile: '15036370128',
+        code: '9999',
+    },
+    rules: {
+        mobile,
+        code,
+    },
+    inputStyle: {
+        backgroundColor: '#ECECEC',
+    },
 })
 
-
 function onChange() {
-  state.value.agreeStatus = !state.value.agreeStatus
+    state.value.agreeStatus = !state.value.agreeStatus
 }
 
-
 async function smsLoginSubmit() {
-  const validate = await smsLoginRef.value.validate().catch(err => {
-    console.log('err', err)
-  })
-  if (!validate) return
-  if (!state.value.agreeStatus) {
-    state.value.isShaking = true
-    setTimeout(() => {
-      state.value.isShaking = false
-    }, 1000)
-    peach.$helper.toast('请勾选同意')
-    return
-  }
-
-  const { code } = await AuthUtil.smsLogin(state.value.model)
-  if (code === 0) {
-
-  }
+    const validate = await smsLoginRef.value.validate().catch((err) => {
+        console.log('err', err)
+    })
+    if (!validate) return
+    if (!state.value.agreeStatus) {
+        state.value.isShaking = true
+        setTimeout(() => {
+            state.value.isShaking = false
+        }, 1000)
+        peach.$helper.toast('请勾选同意')
+        return
+    }
 
+    const { code } = await AuthUtil.smsLogin(state.value.model)
 }
 </script>
 
 <style lang="scss">
 .login-module {
-
-  .uni-easyinput {
-
-    ::v-deep .uni-easyinput__content {
-      border-radius: 41rpx;
-      padding: 0 10rpx;
-    }
-
-    .is-focused {
-      ::v-deep .content-clear-icon {
-        .uniui-clear {
-          color: red !important
+    .uni-easyinput {
+        ::v-deep .uni-easyinput__content {
+            border-radius: 41rpx;
+            padding: 0 10rpx;
+        }
+
+        .is-focused {
+            ::v-deep .content-clear-icon {
+                .uniui-clear {
+                    color: red !important;
+                }
+            }
         }
-      }
     }
-  }
 }
 </style>
 
 <style lang="scss" scoped>
 .login-module {
-  margin-top: 50%;
-  overflow: hidden;
+    margin-top: 50%;
+    overflow: hidden;
 
-  .login-title {
-    color: '#1818d';
-    font-weight: 600;
-  }
-
-  .login-btn-start {
-    height: 82rpx;
-    line-height: normal;
-    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-    border-radius: 28rpx;
-    font-size: 26rpx;
-    font-weight: 500;
-    color: #fff;
-  }
-
-  .code-btn-start {
-    width: 160rpx;
-    height: 56rpx;
-    line-height: normal;
-    border-radius: 28rpx;
-    font-size: 26rpx;
-    font-weight: 400;
-    color: var(--ui-BG-Main);
-    opacity: 1;
-  }
-
-  .agreement-box {
-    margin: -10px auto 10px;
-    position: absolute;
-    bottom: 30rpx;
-    width: 100%;
-
-    .protocol-check {
-      transform: scale(0.7);
+    .login-title {
+        color: '#1818d';
+        font-weight: 600;
     }
 
-    .agreement-text {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: #999999;
+    .login-btn-start {
+        height: 82rpx;
+        line-height: normal;
+        background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+        border-radius: 28rpx;
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #fff;
+    }
 
-      .tcp-text {
+    .code-btn-start {
+        width: 160rpx;
+        height: 56rpx;
+        line-height: normal;
+        border-radius: 28rpx;
+        font-size: 26rpx;
+        font-weight: 400;
         color: var(--ui-BG-Main);
-      }
-    }
-  }
-
-  .shake {
-    animation: shake 0.05s linear 4 alternate;
-  }
-
-  @keyframes shake {
-    from {
-      transform: translateX(-5rpx);
+        opacity: 1;
     }
 
-    to {
-      transform: translateX(5rpx);
+    .agreement-box {
+        margin: -10px auto 10px;
+        position: absolute;
+        bottom: 30rpx;
+        width: 100%;
+
+        .protocol-check {
+            transform: scale(0.7);
+        }
+
+        .agreement-text {
+            font-size: 26rpx;
+            font-weight: 500;
+            color: #999999;
+
+            .tcp-text {
+                color: var(--ui-BG-Main);
+            }
+        }
+    }
+
+    .shake {
+        animation: shake 0.05s linear 4 alternate;
+    }
+
+    @keyframes shake {
+        from {
+            transform: translateX(-5rpx);
+        }
+
+        to {
+            transform: translateX(5rpx);
+        }
     }
-  }
 }
 </style>
diff --git a/pages/index/my.vue b/pages/index/my.vue
index 7a2b7c9..578a477 100644
--- a/pages/index/my.vue
+++ b/pages/index/my.vue
@@ -3,11 +3,11 @@
         <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="state.userInfo.avatar" mode="aspectFill"></image>
+                <image class="avatar" :src="userInfo.avatar || '/static/default_avatar.png'" mode="aspectFill"></image>
 
                 <view class="detail flex flex-column justify-center gap-10">
-                    <view class="name ss-font-26">{{ state.userInfo.name }}</view>
-                    <view class="description ss-font-26">{{ state.userInfo.description }}</view>
+                    <view class="name ss-font-26">{{ userInfo.nickname }}</view>
+                    <view class="description ss-font-26">{{ userInfo.mobile }}</view>
                 </view>
             </view>
 
@@ -16,17 +16,17 @@
                 <view class="remain flex justify-between align-center">
                     <view class="left flex align-center">
                         <view class="unit self-start">￥</view>
-                        <view class="sremain ss-font-60">{{ state.statistic.remain }}</view>
+                        <view class="sremain ss-font-60">{{ remain }}</view>
                     </view>
                     <button class="right-btn ss-reset-button">查看详情</button>
                 </view>
-                <view class="cent ss-m-t-20"> 总获取积分{{ state.statistic.cent }} </view>
+                <view class="cent ss-m-t-20"> 总获取积分{{ cent }} </view>
             </view>
 
             <view class="menu ss-m-t-70">
                 <view class="title ss-m-b-30">我的服务</view>
                 <view class="items">
-                    <view class="item" v-for="item in state.menus">
+                    <view class="item" v-for="item in state.menus" :key="item.name">
                         <image class="icon" :src="item.icon" mode="aspectFill"></image>
                         <view class="label">{{ item.name }}</view>
                     </view>
@@ -40,26 +40,17 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
+import $store from '@/peach/store'
 import peach from '@/peach'
 
 const bgStyle = {
     backgroundImage: '/static/bg-page.png',
     imageType: 'local',
     backgroundColor: '#fff',
-    description: '',
 }
 
 const state = ref({
-    userInfo: {
-        name: 'Ankkaya',
-        avatar: '/static/logo.png',
-        description: '测试商家描述',
-    },
-    statistic: {
-        remain: 2222222222,
-        cent: 10000,
-    },
     menus: [
         {
             name: '余额提现',
@@ -83,6 +74,17 @@ const state = ref({
         },
     ],
 })
+
+const userStore = $store('user')
+console.log(userStore)
+
+const remain = computed(() => {
+    return userStore.userWallet?.balance
+})
+
+const userInfo = computed(() => {
+    return userStore.userInfo
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/index/redirect.vue b/pages/index/redirect.vue
new file mode 100644
index 0000000..cafbb83
--- /dev/null
+++ b/pages/index/redirect.vue
@@ -0,0 +1,31 @@
+<template>
+    <view></view>
+</template>
+
+<script setup>
+import { onLoad } from '@dcloudio/uni-app'
+import $store from '@/peach/store'
+import peach from '@/peach'
+
+const userStore = $store('user')
+
+async function redirectFn() {
+    // 判断是否登录
+    if (!userStore.isLogin) {
+        userStore.logOut()
+        peach.$router.redirect('/pages/index/login')
+    } else {
+        await userStore.loginAfter()
+
+        if (userStore.lastRoutePage) {
+            peach.$router.redirect(userStore.lastRoutePage)
+        } else {
+            peach.$router.redirect('/pages/index/index')
+        }
+    }
+}
+
+onLoad(() => {
+    redirectFn()
+})
+</script>
diff --git a/peach/api/member/auth.js b/peach/api/member/auth.js
index ba70072..43565ce 100644
--- a/peach/api/member/auth.js
+++ b/peach/api/member/auth.js
@@ -1,48 +1,49 @@
-import request from "@/peach/request";
+import request from '@/peach/request'
 
 const AuthUtil = {
-  smsLogin: (data) => {
-    return request({
-      url: "/particulars/member/auth/sms-login",
-      method: "POST",
-      data,
-      custom: {
-        showSuccess: true,
-        loadingMsg: "登陆中",
-        successMsg: "登陆成功",
-      },
-    });
-  },
-  // 发送手机验证码
-  sendSmsCode: (mobile, scene) => {
-    return request({
-      url: "/member/auth/send-sms-code",
-      method: "POST",
-      data: {
-        mobile,
-        scene,
-      },
-      custom: {
-        loadingMsg: "发送中",
-        showSuccess: true,
-        successMsg: "发送成功",
-      },
-    });
-  },
-  // 刷新令牌
-  refreshToken: (refreshToken) => {
-    return request({
-      url: "/member/auth/refresh-token",
-      method: "POST",
-      params: {
-        refreshToken,
-      },
-      custom: {
-        loading: false, // 不用加载中
-        showError: false, // 不展示错误提示
-      },
-    });
-  },
-};
+    smsLogin: (data) => {
+        return request({
+            url: '/particulars/member/auth/sms-login',
+            method: 'POST',
+            data,
+            custom: {
+                showSuccess: true,
+                loadingMsg: '登陆中',
+                successMsg: '登陆成功',
+                auth: false,
+            },
+        })
+    },
+    // 发送手机验证码
+    sendSmsCode: (mobile, scene) => {
+        return request({
+            url: '/member/auth/send-sms-code',
+            method: 'POST',
+            data: {
+                mobile,
+                scene,
+            },
+            custom: {
+                loadingMsg: '发送中',
+                showSuccess: true,
+                successMsg: '发送成功',
+            },
+        })
+    },
+    // 刷新令牌
+    refreshToken: (refreshToken) => {
+        return request({
+            url: '/member/auth/refresh-token',
+            method: 'POST',
+            params: {
+                refreshToken,
+            },
+            custom: {
+                loading: false, // 不用加载中
+                showError: false, // 不展示错误提示
+            },
+        })
+    },
+}
 
-export default AuthUtil;
+export default AuthUtil
diff --git a/peach/api/member/user.js b/peach/api/member/user.js
new file mode 100644
index 0000000..7ce156b
--- /dev/null
+++ b/peach/api/member/user.js
@@ -0,0 +1,29 @@
+import request from '@/peach/request'
+
+const UserUtil = {
+    // 获取用户信息
+    getUserInfo: () => {
+        return request({
+            url: '/particulars/member/get',
+            method: 'GET',
+        })
+    },
+
+    // 获取钱包
+    getWalletInfo: () => {
+        return request({
+            url: '/pay/wallet/get',
+            method: 'GET',
+        })
+    },
+
+    // 首页统计
+    getHomeStatistics: () => {
+        return request({
+            url: '/statistics/index/get-count',
+            method: 'GET',
+        })
+    },
+}
+
+export default UserUtil
diff --git a/peach/request/index.js b/peach/request/index.js
index 169726d..14e8268 100644
--- a/peach/request/index.js
+++ b/peach/request/index.js
@@ -3,34 +3,34 @@
  * @description api 模块管理，loading 配置，请求拦截，错误处理
  */
 
-import Request from "luch-request";
-import { baseUrl, apiPath } from "@/peach/config";
-import peach from "@/peach";
-import $store from "@/peach/store";
-import AuthUtil from "@/peach/api/member/auth";
+import Request from 'luch-request'
+import { baseUrl, apiPath } from '@/peach/config'
+import peach from '@/peach'
+import $store from '@/peach/store'
+import AuthUtil from '@/peach/api/member/auth'
 
 const options = {
-  // 显示操作成功消息 默认不显示
-  showSuccess: false,
-  // 成功提醒 默认使用后端返回值
-  successMsg: "",
-  // 显示失败消息 默认显示
-  showError: true,
-  // 失败提醒 默认使用后端返回信息
-  errorMsg: "",
-  // 显示请求时loading模态框 默认显示
-  showLoading: true,
-  // loading提醒文字
-  loadingMsg: "加载中",
-  // 需要授权才能请求 默认放开
-  auth: false,
-};
+    // 显示操作成功消息 默认不显示
+    showSuccess: false,
+    // 成功提醒 默认使用后端返回值
+    successMsg: '',
+    // 显示失败消息 默认显示
+    showError: true,
+    // 失败提醒 默认使用后端返回信息
+    errorMsg: '',
+    // 显示请求时loading模态框 默认显示
+    showLoading: true,
+    // loading提醒文字
+    loadingMsg: '加载中',
+    // 需要授权才能请求 默认放开
+    auth: true,
+}
 
 // Loading全局实例
 let LoadingInstance = {
-  target: null,
-  count: 0,
-};
+    target: null,
+    count: 0,
+}
 
 /**
  * @author Ankkaya
@@ -39,21 +39,21 @@ let LoadingInstance = {
  * @returns {Type}
  */
 function closeLoading() {
-  if (LoadingInstance.count > 0) LoadingInstance.count--;
-  if (LoadingInstance.count === 0) uni.hideLoading();
+    if (LoadingInstance.count > 0) LoadingInstance.count--
+    if (LoadingInstance.count === 0) uni.hideLoading()
 }
 
 // 请求实例
 const http = new Request({
-  baseURL: baseUrl + apiPath,
-  timeout: 8000,
-  method: "GET",
-  header: {
-    Accept: "text/json",
-    "Content-Type": "application/json;charset=UTF-8",
-  },
-  custom: options,
-});
+    baseURL: baseUrl + apiPath,
+    timeout: 8000,
+    method: 'GET',
+    header: {
+        Accept: 'text/json',
+        'Content-Type': 'application/json;charset=UTF-8',
+    },
+    custom: options,
+})
 
 /**
  * @author Ankkaya
@@ -63,39 +63,40 @@ const http = new Request({
  */
 
 http.interceptors.request.use(
-  (config) => {
-    // 自定义处理【auth 授权】：必须登录的接口，否则提示登录
-    if (config.custom.auth && !$store("user").isLogin) {
-      // 处理登录
-      peach.$router.go("/pages/index/login");
-      return Promise.reject();
-    }
+    (config) => {
+        // 自定义处理【auth 授权】：必须登录的接口，否则提示登录
+        if (config.custom.auth && !$store('user').isLogin) {
+            // 处理登录
+            peach.$router.go('/pages/index/login')
+            return Promise.reject()
+        }
 
-    // 自定义处理【loading 加载中】：如果需要显示 loading，则显示 loading
-    if (config.custom.showLoading) {
-      LoadingInstance.count++;
-      LoadingInstance.count === 1 &&
-        uni.showLoading({
-          title: config.custom.loadingMsg,
-          mask: true,
-          fail: () => {
-            uni.hideLoading();
-          },
-        });
-    }
+        // 自定义处理【loading 加载中】：如果需要显示 loading，则显示 loading
+        if (config.custom.showLoading) {
+            LoadingInstance.count++
+            LoadingInstance.count === 1 &&
+                uni.showLoading({
+                    title: config.custom.loadingMsg,
+                    mask: true,
+                    fail: () => {
+                        uni.hideLoading()
+                    },
+                })
+        }
 
-    // 增加 token 令牌、terminal 终端、tenant 租户的请求头
-    const token = getAccessToken();
-    if (token) {
-      config.header["Authorization"] = token;
+        // 增加 token 令牌、terminal 终端、tenant 租户的请求头
+        const token = getAccessToken()
+        if (token) {
+            config.header['Authorization'] = token
+        }
+        config.header['Accept'] = '*/*'
+        config.header['tenant-id'] = '1'
+        return config
+    },
+    (error) => {
+        return Promise.reject(error)
     }
-    config.header["Accept"] = "*/*";
-    return config;
-  },
-  (error) => {
-    return Promise.reject(error);
-  }
-);
+)
 
 /**
  * @author Ankkaya
@@ -104,202 +105,194 @@ http.interceptors.request.use(
  * @returns {Type}
  */
 http.interceptors.response.use(
-  (response) => {
-    console.log("response", response);
-    // 约定：如果是 /auth/ 下的 URL 地址，并且返回了 accessToken 说明是登录相关的接口，则自动设置登陆令牌
-    if (
-      response.config.url.indexOf("/member/auth/") >= 0 &&
-      response.data?.data?.accessToken
-    ) {
-      $store("user").setToken(
-        response.data.data.accessToken,
-        response.data.data.refreshToken
-      );
+    (response) => {
+        console.log('response', response)
+        // 约定：如果是 /auth/ 下的 URL 地址，并且返回了 accessToken 说明是登录相关的接口，则自动设置登陆令牌
+        if (response.config.url.indexOf('/member/auth/') >= 0 && response.data?.data?.accessToken) {
+            $store('user').setToken(response.data.data.accessToken, response.data.data.refreshToken)
+        }
+
+        // 自定处理【loading 加载中】：如果需要显示 loading，则关闭 loading
+        response.config.custom.showLoading && closeLoading()
+
+        // 自定义处理【error 错误提示】：如果需要显示错误提示，则显示错误提示
+        if (response.data.code !== 0) {
+            // 特殊：如果 401 错误码，则跳转到登录页 or 刷新令牌
+            if (response.data.code === 401) {
+                return refreshToken(response.config)
+            }
+
+            // 错误提示
+            if (response.config.custom.showError) {
+                uni.showToast({
+                    title: response.data.msg || '服务器开小差啦,请稍后再试~',
+                    icon: 'none',
+                    mask: true,
+                })
+                return Promise.reject(false)
+            }
+        }
+
+        // 自定义处理【showSuccess 成功提示】：如果需要显示成功提示，则显示成功提示
+        if (
+            response.config.custom.showSuccess &&
+            response.config.custom.successMsg !== '' &&
+            response.data.code === 0
+        ) {
+            uni.showToast({
+                title: response.config.custom.successMsg,
+                icon: 'none',
+            })
+        }
+
+        // 返回结果：包括 code + data + msg
+        return Promise.resolve(response.data)
+    },
+    (error) => {
+        console.log('error', error)
+        const userStore = $store('user')
+        const isLogin = userStore.isLogin
+        let errorMessage = '网络请求出错'
+        if (error !== undefined) {
+            switch (error.statusCode) {
+                case 400:
+                    errorMessage = '请求错误'
+                    break
+                case 401:
+                    errorMessage = isLogin ? '您的登陆已过期' : '请先登录'
+                    // 正常情况下，后端不会返回 401 错误，所以这里不处理 handleAuthorized
+                    break
+                case 403:
+                    errorMessage = '拒绝访问'
+                    break
+                case 404:
+                    errorMessage = '请求出错'
+                    break
+                case 408:
+                    errorMessage = '请求超时'
+                    break
+                case 429:
+                    errorMessage = '请求频繁, 请稍后再访问'
+                    break
+                case 500:
+                    errorMessage = '服务器开小差啦,请稍后再试~'
+                    break
+                case 501:
+                    errorMessage = '服务未实现'
+                    break
+                case 502:
+                    errorMessage = '网络错误'
+                    break
+                case 503:
+                    errorMessage = '服务不可用'
+                    break
+                case 504:
+                    errorMessage = '网络超时'
+                    break
+                case 505:
+                    errorMessage = 'HTTP 版本不受支持'
+                    break
+            }
+            if (error.errMsg.includes('timeout')) errorMessage = '请求超时'
+            // #ifdef H5
+            if (error.errMsg.includes('Network'))
+                errorMessage = window.navigator.onLine ? '服务器异常' : '请检查您的网络连接'
+            // #endif
+        }
+
+        if (error && error.config) {
+            if (error.config.custom.showError === true) {
+                uni.showToast({
+                    title: error.data?.msg || errorMessage,
+                    icon: 'none',
+                    mask: true,
+                })
+            }
+            error.config.custom.showLoading && closeLoading()
+        }
+
+        return Promise.reject(false)
     }
+)
 
-    // 自定处理【loading 加载中】：如果需要显示 loading，则关闭 loading
-    response.config.custom.showLoading && closeLoading();
-
-    // 自定义处理【error 错误提示】：如果需要显示错误提示，则显示错误提示
-    if (response.data.code !== 0) {
-      // 特殊：如果 401 错误码，则跳转到登录页 or 刷新令牌
-      if (response.data.code === 401) {
-        return refreshToken(response.config);
-      }
-
-      // 错误提示
-      if (response.config.custom.showError) {
-        uni.showToast({
-          title: response.data.msg || "服务器开小差啦,请稍后再试~",
-          icon: "none",
-          mask: true,
-        });
-        return Promise.reject(false);
-      }
-    }
-
-    // 自定义处理【showSuccess 成功提示】：如果需要显示成功提示，则显示成功提示
-    if (
-      response.config.custom.showSuccess &&
-      response.config.custom.successMsg !== "" &&
-      response.data.code === 0
-    ) {
-      uni.showToast({
-        title: response.config.custom.successMsg,
-        icon: "none",
-      });
-    }
-
-    // 返回结果：包括 code + data + msg
-    return Promise.resolve(response.data);
-  },
-  (error) => {
-    console.log("error", error);
-    const userStore = $store("user");
-    const isLogin = userStore.isLogin;
-    let errorMessage = "网络请求出错";
-    if (error !== undefined) {
-      switch (error.statusCode) {
-        case 400:
-          errorMessage = "请求错误";
-          break;
-        case 401:
-          errorMessage = isLogin ? "您的登陆已过期" : "请先登录";
-          // 正常情况下，后端不会返回 401 错误，所以这里不处理 handleAuthorized
-          break;
-        case 403:
-          errorMessage = "拒绝访问";
-          break;
-        case 404:
-          errorMessage = "请求出错";
-          break;
-        case 408:
-          errorMessage = "请求超时";
-          break;
-        case 429:
-          errorMessage = "请求频繁, 请稍后再访问";
-          break;
-        case 500:
-          errorMessage = "服务器开小差啦,请稍后再试~";
-          break;
-        case 501:
-          errorMessage = "服务未实现";
-          break;
-        case 502:
-          errorMessage = "网络错误";
-          break;
-        case 503:
-          errorMessage = "服务不可用";
-          break;
-        case 504:
-          errorMessage = "网络超时";
-          break;
-        case 505:
-          errorMessage = "HTTP 版本不受支持";
-          break;
-      }
-      if (error.errMsg.includes("timeout")) errorMessage = "请求超时";
-      // #ifdef H5
-      if (error.errMsg.includes("Network"))
-        errorMessage = window.navigator.onLine
-          ? "服务器异常"
-          : "请检查您的网络连接";
-      // #endif
-    }
-
-    if (error && error.config) {
-      if (error.config.custom.showError === true) {
-        uni.showToast({
-          title: error.data?.msg || errorMessage,
-          icon: "none",
-          mask: true,
-        });
-      }
-      error.config.custom.showLoading && closeLoading();
-    }
-
-    return Promise.reject(false);
-  }
-);
-
-let requestList = []; // 请求队列
-let isRefreshToken = false; // 是否正在刷新中
+let requestList = [] // 请求队列
+let isRefreshToken = false // 是否正在刷新中
 const refreshToken = async (config) => {
-  // 如果当前已经是 refresh-token 的 URL 地址，并且还是 401 错误，说明是刷新令牌失败了，直接返回 Promise.reject(error)
-  if (config.url.indexOf("/member/auth/refresh-token") >= 0) {
-    return Promise.reject("error");
-  }
+    // 如果当前已经是 refresh-token 的 URL 地址，并且还是 401 错误，说明是刷新令牌失败了，直接返回 Promise.reject(error)
+    if (config.url.indexOf('/member/auth/refresh-token') >= 0) {
+        return Promise.reject('error')
+    }
 
-  // 如果未认证，并且未进行刷新令牌，说明可能是访问令牌过期了
-  if (!isRefreshToken) {
-    isRefreshToken = true;
-    // 1. 如果获取不到刷新令牌，则只能执行登出操作
-    const refreshToken = getRefreshToken();
-    if (!refreshToken) {
-      return handleAuthorized();
+    // 如果未认证，并且未进行刷新令牌，说明可能是访问令牌过期了
+    if (!isRefreshToken) {
+        isRefreshToken = true
+        // 1. 如果获取不到刷新令牌，则只能执行登出操作
+        const refreshToken = getRefreshToken()
+        if (!refreshToken) {
+            return handleAuthorized()
+        }
+        // 2. 进行刷新访问令牌
+        try {
+            const refreshTokenResult = await AuthUtil.refreshToken(refreshToken)
+            if (refreshTokenResult.code !== 0) {
+                // 如果刷新不成功，直接抛出 e 触发 2.2 的逻辑
+                // noinspection ExceptionCaughtLocallyJS
+                throw new Error('刷新令牌失败')
+            }
+            // 2.1 刷新成功，则回放队列的请求 + 当前请求
+            config.header.Authorization = 'Bearer ' + getAccessToken()
+            requestList.forEach((cb) => {
+                cb()
+            })
+            requestList = []
+            return request(config)
+        } catch (e) {
+            // 为什么需要 catch 异常呢？刷新失败时，请求因为 Promise.reject 触发异常。
+            // 2.2 刷新失败，只回放队列的请求
+            requestList.forEach((cb) => {
+                cb()
+            })
+            // 提示是否要登出。即不回放当前请求！不然会形成递归
+            return handleAuthorized()
+        } finally {
+            requestList = []
+            isRefreshToken = false
+        }
+    } else {
+        // 添加到队列，等待刷新获取到新的令牌
+        return new Promise((resolve) => {
+            requestList.push(() => {
+                config.header.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+                resolve(request(config))
+            })
+        })
     }
-    // 2. 进行刷新访问令牌
-    try {
-      const refreshTokenResult = await AuthUtil.refreshToken(refreshToken);
-      if (refreshTokenResult.code !== 0) {
-        // 如果刷新不成功，直接抛出 e 触发 2.2 的逻辑
-        // noinspection ExceptionCaughtLocallyJS
-        throw new Error("刷新令牌失败");
-      }
-      // 2.1 刷新成功，则回放队列的请求 + 当前请求
-      config.header.Authorization = "Bearer " + getAccessToken();
-      requestList.forEach((cb) => {
-        cb();
-      });
-      requestList = [];
-      return request(config);
-    } catch (e) {
-      // 为什么需要 catch 异常呢？刷新失败时，请求因为 Promise.reject 触发异常。
-      // 2.2 刷新失败，只回放队列的请求
-      requestList.forEach((cb) => {
-        cb();
-      });
-      // 提示是否要登出。即不回放当前请求！不然会形成递归
-      return handleAuthorized();
-    } finally {
-      requestList = [];
-      isRefreshToken = false;
-    }
-  } else {
-    // 添加到队列，等待刷新获取到新的令牌
-    return new Promise((resolve) => {
-      requestList.push(() => {
-        config.header.Authorization = "Bearer " + getAccessToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
-        resolve(request(config));
-      });
-    });
-  }
-};
+}
 
 /** 处理 401 未登陆的错误 */
 const handleAuthorized = () => {
-  const userStore = $store("user");
-  userStore.logout(true);
-  peach.$router.go("/pages/index/login");
-  // 登录超时
-  return Promise.reject({
-    code: 401,
-    msg: userStore.isLogin ? "您的登陆已过期" : "请先登录",
-  });
-};
+    const userStore = $store('user')
+    userStore.logOut()
+    peach.$router.go('/pages/index/login')
+    // 登录超时
+    return Promise.reject({
+        code: 401,
+        msg: userStore.isLogin ? '您的登陆已过期' : '请先登录',
+    })
+}
 
 /** 获得访问令牌 */
 const getAccessToken = () => {
-  return uni.getStorageSync("token");
-};
+    return uni.getStorageSync('token')
+}
 
 /** 获得刷新令牌 */
 const getRefreshToken = () => {
-  return uni.getStorageSync("refresh-token");
-};
+    return uni.getStorageSync('refresh-token')
+}
 
 const request = (config) => {
-  return http.middleware(config);
-};
+    return http.middleware(config)
+}
 
-export default request;
+export default request
diff --git a/peach/router/index.js b/peach/router/index.js
index 3c3eec4..6641231 100644
--- a/peach/router/index.js
+++ b/peach/router/index.js
@@ -1,198 +1,190 @@
-import $store from "@/peach/store";
-import { showShareModal } from "@/peach/hooks/useModal";
-import {
-  isNumber,
-  isString,
-  isEmpty,
-  startsWith,
-  isObject,
-  isNil,
-  clone,
-} from "lodash";
-import throttle from "@/peach/helper/throttle";
+import $store from '@/peach/store'
+import { showShareModal } from '@/peach/hooks/useModal'
+import { isNumber, isString, isEmpty, startsWith, isObject, isNil, clone } from 'lodash'
+import throttle from '@/peach/helper/throttle'
 
 const _go = (
-  path,
-  params = {},
-  options = {
-    redirect: false,
-  }
+    path,
+    params = {},
+    options = {
+        redirect: false,
+    }
 ) => {
-  let page = ""; // 跳转页面
-  let query = ""; // 页面参数
-  let url = ""; // 跳转页面完整路径
+    let page = '' // 跳转页面
+    let query = '' // 页面参数
+    let url = '' // 跳转页面完整路径
 
-  if (isString(path)) {
-    // 判断跳转类型是 path ｜ 还是http
-    if (startsWith(path, "http")) {
-      // #ifdef H5
-      window.location = path;
-      return;
-      // #endif
-      // #ifndef H5
-      page = `/pages/public/webview`;
-      query = `url=${encodeURIComponent(path)}`;
-      // #endif
-    } else if (startsWith(path, "action:")) {
-      handleAction(path);
-      return;
-    } else {
-      [page, query] = path.split("?");
+    if (isString(path)) {
+        // 判断跳转类型是 path ｜ 还是http
+        if (startsWith(path, 'http')) {
+            // #ifdef H5
+            window.location = path
+            return
+            // #endif
+            // #ifndef H5
+            page = `/pages/public/webview`
+            query = `url=${encodeURIComponent(path)}`
+            // #endif
+        } else if (startsWith(path, 'action:')) {
+            handleAction(path)
+            return
+        } else {
+            ;[page, query] = path.split('?')
+        }
+        if (!isEmpty(params)) {
+            let query2 = paramsToQuery(params)
+            if (isEmpty(query)) {
+                query = query2
+            } else {
+                query += '&' + query2
+            }
+        }
     }
-    if (!isEmpty(params)) {
-      let query2 = paramsToQuery(params);
-      if (isEmpty(query)) {
-        query = query2;
-      } else {
-        query += "&" + query2;
-      }
+
+    if (isObject(path)) {
+        page = path.url
+        if (!isNil(path.params)) {
+            query = paramsToQuery(path.params)
+        }
     }
-  }
 
-  if (isObject(path)) {
-    page = path.url;
-    if (!isNil(path.params)) {
-      query = paramsToQuery(path.params);
+    const nextRoute = ROUTES_MAP[page]
+
+    // 未找到指定跳转页面
+    // mark: 跳转404页
+    if (!nextRoute) {
+        console.log(`%c跳转路径参数错误<${page || 'EMPTY'}>`, 'color:red;background:yellow')
+        return
     }
-  }
 
-  const nextRoute = ROUTES_MAP[page];
+    // 页面登录拦截
+    if (nextRoute.meta?.auth && !$store('user').isLogin) {
+        uni.redirectTo({
+            url: '/pages/index/login',
+        })
+        return
+    }
 
-  // 未找到指定跳转页面
-  // mark: 跳转404页
-  if (!nextRoute) {
-    console.log(
-      `%c跳转路径参数错误<${page || "EMPTY"}>`,
-      "color:red;background:yellow"
-    );
-    return;
-  }
+    url = page
+    if (!isEmpty(query)) {
+        url += `?${query}`
+    }
 
-  // 页面登录拦截
-  if (nextRoute.meta?.auth && !$store("user").isLogin) {
-    uni.redirectTo({
-      url: "/pages/index/login",
-    });
-    return;
-  }
+    // 保存最新的页面地址
+    $store('user').lastRoutePage = url
 
-  url = page;
-  if (!isEmpty(query)) {
-    url += `?${query}`;
-  }
+    // 跳转底部导航
+    if (TABBAR.includes(page)) {
+        uni.switchTab({
+            url,
+        })
+        return
+    }
 
-  // 跳转底部导航
-  if (TABBAR.includes(page)) {
-    uni.switchTab({
-      url,
-    });
-    return;
-  }
+    // 使用redirect跳转
+    if (options.redirect) {
+        uni.redirectTo({
+            url,
+        })
+        return
+    }
 
-  // 使用redirect跳转
-  if (options.redirect) {
-    uni.redirectTo({
-      url,
-    });
-    return;
-  }
-
-  uni.navigateTo({
-    url,
-  });
-};
+    uni.navigateTo({
+        url,
+    })
+}
 
 // 限流 防止重复点击跳转
 function go(...args) {
-  throttle(() => {
-    _go(...args);
-  });
+    throttle(() => {
+        _go(...args)
+    })
 }
 
 function paramsToQuery(params) {
-  if (isEmpty(params)) {
-    return "";
-  }
-  // return new URLSearchParams(Object.entries(params)).toString();
-  let query = [];
-  for (let key in params) {
-    query.push(key + "=" + params[key]);
-  }
+    if (isEmpty(params)) {
+        return ''
+    }
+    // return new URLSearchParams(Object.entries(params)).toString();
+    let query = []
+    for (let key in params) {
+        query.push(key + '=' + params[key])
+    }
 
-  return query.join("&");
+    return query.join('&')
 }
 
 function back() {
-  // #ifdef H5
-  history.back();
-  // #endif
+    // #ifdef H5
+    history.back()
+    // #endif
 
-  // #ifndef H5
-  uni.navigateBack();
-  // #endif
+    // #ifndef H5
+    uni.navigateBack()
+    // #endif
 }
 
 function redirect(path, params = {}) {
-  go(path, params, {
-    redirect: true,
-  });
+    go(path, params, {
+        redirect: true,
+    })
 }
 
 // 检测是否有浏览器历史
 function hasHistory() {
-  // #ifndef H5
-  const pages = getCurrentPages();
-  if (pages.length > 1) {
-    return true;
-  }
-  return false;
-  // #endif
+    // #ifndef H5
+    const pages = getCurrentPages()
+    if (pages.length > 1) {
+        return true
+    }
+    return false
+    // #endif
 
-  // #ifdef H5
-  return !!history.back;
-  // #endif
+    // #ifdef H5
+    return !!history.back
+    // #endif
 }
 
-function getCurrentRoute(field = "") {
-  let currentPage = getCurrentPage();
-  // #ifdef MP
-  currentPage.$page["route"] = currentPage.route;
-  currentPage.$page["options"] = currentPage.options;
-  // #endif
-  if (field !== "") {
-    return currentPage.$page[field];
-  } else {
-    return currentPage.$page;
-  }
+function getCurrentRoute(field = '') {
+    let currentPage = getCurrentPage()
+    // #ifdef MP
+    currentPage.$page['route'] = currentPage.route
+    currentPage.$page['options'] = currentPage.options
+    // #endif
+    if (field !== '') {
+        return currentPage.$page[field]
+    } else {
+        return currentPage.$page
+    }
 }
 
 function getCurrentPage() {
-  let pages = getCurrentPages();
-  return pages[pages.length - 1];
+    let pages = getCurrentPages()
+    return pages[pages.length - 1]
 }
 
 function handleAction(path) {
-  const action = path.split(":");
-  switch (action[1]) {
-    case "showShareModal":
-      showShareModal();
-      break;
-  }
+    const action = path.split(':')
+    switch (action[1]) {
+        case 'showShareModal':
+            showShareModal()
+            break
+    }
 }
 
-function error(errCode, errMsg = "") {
-  redirect("/pages/public/error", {
-    errCode,
-    errMsg,
-  });
+function error(errCode, errMsg = '') {
+    redirect('/pages/public/error', {
+        errCode,
+        errMsg,
+    })
 }
 
 export default {
-  go,
-  back,
-  hasHistory,
-  redirect,
-  getCurrentPage,
-  getCurrentRoute,
-  error,
-};
+    go,
+    back,
+    hasHistory,
+    redirect,
+    getCurrentPage,
+    getCurrentRoute,
+    error,
+}
diff --git a/peach/store/app.js b/peach/store/app.js
index 0d3f507..5d4ecd6 100644
--- a/peach/store/app.js
+++ b/peach/store/app.js
@@ -1,185 +1,175 @@
-import { ref } from "vue";
-import { defineStore } from "pinia";
-import $platform from "@/peach/platform";
-import $router from "@/peach/router";
-import useUserStore from "./user";
-import useSysStore from "./sys";
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+import $platform from '@/peach/platform'
+import $router from '@/peach/router'
+import useSysStore from './sys'
 
 const useAppStore = defineStore(
-  "app",
-  () => {
-    /**
-     * @description 应用信息
-     * @param string name 应用名称
-     * @param string logo 应用logo
-     * @param string version 应用版本
-     * @param string copyright 版权信息
-     * @param string copyrightTime 版权时间
-     * @param string cdnurl 静态资源域名
-     * @param string filesystem 文件系统
-     */
-    const info = ref({
-      name: "",
-      logo: "",
-      version: "",
-      copyright: "",
-      copytime: "",
-      cdnurl: "",
-      filesystem: "",
-    });
+    'app',
+    () => {
+        /**
+         * @description 应用信息
+         * @param string name 应用名称
+         * @param string logo 应用logo
+         * @param string version 应用版本
+         * @param string copyright 版权信息
+         * @param string copyrightTime 版权时间
+         * @param string cdnurl 静态资源域名
+         * @param string filesystem 文件系统
+         */
+        const info = ref({
+            name: '',
+            logo: '',
+            version: '',
+            copyright: '',
+            copytime: '',
+            cdnurl: '',
+            filesystem: '',
+        })
 
-    /**
-     * @description 平台信息
-     * @param Array share.methods 分享方式
-     * @param Object share.forwardInfo 转发信息
-     * @param Object share.posterInfo 海报信息
-     * @param string share.linkAddress 分享链接地址
-     * @param number bindMobile 绑定手机号提醒 0: 提醒 1: 不提醒
-     */
-    const platform = ref({
-      share: {
-        methods: [],
-        forwardInfo: {},
-        posterInfo: {},
-        linkAddress: "",
-      },
-      bindMobile: 0,
-    });
-
-    const chat = ref({});
-
-    /**
-     * @description 模板信息
-     * @param Object basic 基础模板
-     * @param Object tabbar 底部导航模板
-     */
-    const template = ref({
-      basic: {
-        tabbar: {
-          items: [
-            {
-              activeIconUrl:
-                "http://mall.yudao.iocoder.cn/static/images/1-002.png",
-              iconUrl: "http://mall.yudao.iocoder.cn/static/images/1-001.png",
-              text: "首页",
-              url: "/pages/index/index",
+        /**
+         * @description 平台信息
+         * @param Array share.methods 分享方式
+         * @param Object share.forwardInfo 转发信息
+         * @param Object share.posterInfo 海报信息
+         * @param string share.linkAddress 分享链接地址
+         * @param number bindMobile 绑定手机号提醒 0: 提醒 1: 不提醒
+         */
+        const platform = ref({
+            share: {
+                methods: [],
+                forwardInfo: {},
+                posterInfo: {},
+                linkAddress: '',
             },
-            {
-              activeIconUrl:
-                "http://mall.yudao.iocoder.cn/static/images/2-002.png",
-              iconUrl: "http://mall.yudao.iocoder.cn/static/images/2-001.png",
-              text: "产品",
-              url: "/pages/index/product",
+            bindMobile: 0,
+        })
+
+        const chat = ref({})
+
+        /**
+         * @description 模板信息
+         * @param Object basic 基础模板
+         * @param Object tabbar 底部导航模板
+         */
+        const template = ref({
+            basic: {
+                tabbar: {
+                    items: [
+                        {
+                            activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/1-002.png',
+                            iconUrl: 'http://mall.yudao.iocoder.cn/static/images/1-001.png',
+                            text: '首页',
+                            url: '/pages/index/index',
+                        },
+                        {
+                            activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/2-002.png',
+                            iconUrl: 'http://mall.yudao.iocoder.cn/static/images/2-001.png',
+                            text: '产品',
+                            url: '/pages/index/product',
+                        },
+                        {
+                            activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/3-002.png',
+                            iconUrl: 'http://mall.yudao.iocoder.cn/static/images/3-001.png',
+                            text: '订单',
+                            url: '/pages/order/list',
+                        },
+                        {
+                            activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-002.png',
+                            iconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-001.png',
+                            text: '我的',
+                            url: '/pages/index/my',
+                        },
+                    ],
+                    style: {
+                        activeColor: '#fc4141',
+                        bgColor: '#fff',
+                        bgType: 'color',
+                        color: '#282828',
+                    },
+                    theme: 'red',
+                },
             },
-            {
-              activeIconUrl:
-                "http://mall.yudao.iocoder.cn/static/images/3-002.png",
-              iconUrl: "http://mall.yudao.iocoder.cn/static/images/3-001.png",
-              text: "订单",
-              url: "/pages/order/list",
-            },
-            {
-              activeIconUrl:
-                "http://mall.yudao.iocoder.cn/static/images/4-002.png",
-              iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png",
-              text: "我的",
-              url: "/pages/index/my",
-            },
-          ],
-          style: {
-            activeColor: "#fc4141",
-            bgColor: "#fff",
-            bgType: "color",
-            color: "#282828",
-          },
-          theme: "red",
-        },
-      },
-    });
+        })
 
-    // 全局分享信息
-    const shareInfo = ref({});
+        // 全局分享信息
+        const shareInfo = ref({})
 
-    // 小程序发货信息管理 0: 没有 1：有
-    const hasWechatTradeManaged = ref(0);
+        // 小程序发货信息管理 0: 没有 1：有
+        const hasWechatTradeManaged = ref(0)
 
-    /**
-     * @author Ankkaya
-     * @description 小程序初始化
-     * @param {Type}  -
-     * @returns {Type}
-     */
-    async function init() {
-      // 检查网络
-      const networkStatus = await $platform.checkNetwork();
-      if (!networkStatus) {
-        $router.error("NetworkError");
-      }
+        /**
+         * @author Ankkaya
+         * @description 小程序初始化
+         * @param {Type}  -
+         * @returns {Type}
+         */
+        async function init() {
+            // 检查网络
+            const networkStatus = await $platform.checkNetwork()
+            if (!networkStatus) {
+                $router.error('NetworkError')
+            }
 
-      if (true) {
-        this.info = {
-          name: "🍑商城",
-          logo: "https://static.iocoder.cn/ruoyi-vue-pro-logo.png",
-          version: "1.0.0",
-          copyright: "全部开源，个人与企业可 100% 免费使用",
-          copytime: "Copyright© 2018-2024",
+            if (true) {
+                this.info = {
+                    name: '🍑商城',
+                    logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
+                    version: '1.0.0',
+                    copyright: '全部开源，个人与企业可 100% 免费使用',
+                    copytime: 'Copyright© 2018-2024',
 
-          cdnurl: "https://file.sheepjs.com", // 云存储域名
-          filesystem: "qcloud", // 云存储平台
-        };
-        this.platform = {
-          share: {
-            methods: ["poster", "link"],
-            linkAddress: "https://shopro.sheepjs.com/#/",
-            posterInfo: {
-              user_bg: "/static/img/shop/config/user-poster-bg.png",
-              goods_bg: "/static/img/shop/config/goods-poster-bg.png",
-              groupon_bg: "/static/img/shop/config/groupon-poster-bg.png",
-            },
-          },
-          bind_mobile: 0,
-        };
-        this.chat = {
-          chat_domain: "https://api.shopro.sheepjs.com/chat",
-          room_id: "admin",
-        };
-        this.has_wechat_trade_managed = 0;
+                    cdnurl: 'https://file.sheepjs.com', // 云存储域名
+                    filesystem: 'qcloud', // 云存储平台
+                }
+                this.platform = {
+                    share: {
+                        methods: ['poster', 'link'],
+                        linkAddress: 'https://shopro.sheepjs.com/#/',
+                        posterInfo: {
+                            user_bg: '/static/img/shop/config/user-poster-bg.png',
+                            goods_bg: '/static/img/shop/config/goods-poster-bg.png',
+                            groupon_bg: '/static/img/shop/config/groupon-poster-bg.png',
+                        },
+                    },
+                    bind_mobile: 0,
+                }
+                this.chat = {
+                    chat_domain: 'https://api.shopro.sheepjs.com/chat',
+                    room_id: 'admin',
+                }
+                this.has_wechat_trade_managed = 0
 
-        // 加载主题
-        const sysStore = useSysStore();
-        sysStore.setTheme();
+                // 加载主题
+                const sysStore = useSysStore()
+                sysStore.setTheme()
 
-        // 模拟用户登录
-        const userStore = useUserStore();
-        if (userStore.isLogin) {
-          userStore.loginAfter();
+                return Promise.resolve(true)
+            } else {
+                $router.error('InitError', res.msg || '加载失败')
+            }
         }
-        return Promise.resolve(true);
-      } else {
-        $router.error("InitError", res.msg || "加载失败");
-      }
-    }
 
-    return {
-      info,
-      platform,
-      chat,
-      template,
-      shareInfo,
-      hasWechatTradeManaged,
-      init,
-    };
-  },
-  {
-    persist: {
-      enabled: true,
-      strategies: [
-        {
-          key: "app-store",
-        },
-      ],
+        return {
+            info,
+            platform,
+            chat,
+            template,
+            shareInfo,
+            hasWechatTradeManaged,
+            init,
+        }
     },
-  }
-);
+    {
+        persist: {
+            enabled: true,
+            strategies: [
+                {
+                    key: 'app-store',
+                },
+            ],
+        },
+    }
+)
 
-export default useAppStore;
+export default useAppStore
diff --git a/peach/store/sys.js b/peach/store/sys.js
index e5fca86..7295c56 100644
--- a/peach/store/sys.js
+++ b/peach/store/sys.js
@@ -10,7 +10,6 @@ const useSysStore = defineStore(
         const fontSize = ref(1)
 
         function setTheme(stheme = '') {
-            console.log('setTheme', stheme)
             theme.value = stheme ? stheme : 'orange'
         }
 
diff --git a/peach/store/user.js b/peach/store/user.js
index a8e5481..37913bc 100644
--- a/peach/store/user.js
+++ b/peach/store/user.js
@@ -1,110 +1,124 @@
-import { ref } from "vue";
-import { defineStore } from "pinia";
-import $share from "@/peach/platform/share";
-import { isEmpty, cloneDeep, clone } from "lodash";
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+import $share from '@/peach/platform/share'
+import $router from '@/peach/router'
+import UserUtil from '@/peach/api/member/user'
+import { isEmpty, cloneDeep, clone } from 'lodash'
 
 // 默认用户信息
 const defaultUserInfo = {
-  avatar: "", // 头像
-  nickname: "", // 昵称
-  gender: 0, // 性别
-  mobile: "", // 手机号
-  point: 0, // 积分
-};
+    avatar: '', // 头像
+    nickname: '', // 昵称
+    mobile: '', // 手机号
+    point: 0, // 积分
+    particulars: null,
+}
 
 // 默认钱包信息
 const defaultWallet = {
-  balance: 0, // 余额
-};
+    balance: 0, // 余额
+    totalExpense: 0, // 总消费
+    totalRecharge: 0, // 总充值
+}
 
 // 默认订单信息
 const defaultNumData = {
-  unusedCouponCount: 0,
-  orderCount: {
-    allCount: 0,
-    unpaidCount: 0,
-    undeliveredCount: 0,
-    deliveredCount: 0,
-    uncommentedCount: 0,
-    afterSaleCount: 0,
-  },
-};
+    unusedCouponCount: 0,
+    orderCount: {
+        allCount: 0,
+        unpaidCount: 0,
+        undeliveredCount: 0,
+        deliveredCount: 0,
+        uncommentedCount: 0,
+        afterSaleCount: 0,
+    },
+}
 
 const useUserStore = defineStore(
-  "user",
-  () => {
-    const userInfo = ref(clone(defaultUserInfo));
-    const userWallet = ref(clone(defaultWallet));
-    const userNumData = ref(cloneDeep(defaultNumData));
-    const isLogin = ref(!!uni.getStorageSync("token"));
-    const lastUpdateTime = ref(0);
+    'user',
+    () => {
+        const userInfo = ref(cloneDeep(defaultUserInfo))
+        const userWallet = ref(clone(defaultWallet))
+        const userNumData = ref(cloneDeep(defaultNumData))
+        const isLogin = ref(!!uni.getStorageSync('token'))
+        const lastUpdateTime = ref(0)
+        const lastRoutePage = ref(null)
 
-    function getUserInfo() {}
+        async function getUserInfo() {
+            let res = await UserUtil.getUserInfo()
+            userInfo.value = res.data
+        }
 
-    function getWallet() {}
+        async function getWallet() {
+            let res = await UserUtil.getWalletInfo()
+            userWallet.value = res.data
+        }
 
-    function getNumData() {}
+        function getNumData() {}
 
-    function setToken(token, refreshToken) {
-      if (token === "") {
-        isLogin.value = false;
-        uni.removeStorageSync("token");
-        uni.removeStorageSync("refresh-token");
-      } else {
-        isLogin.value = true;
-        uni.setStorageSync("token", token);
-        uni.setStorageSync("refresh-token", refreshToken);
-        // 成功后处理
-        loginAfter();
-      }
-      return isLogin.value;
+        function setToken(token, refreshToken) {
+            if (token === '') {
+                isLogin.value = false
+                uni.removeStorageSync('token')
+                uni.removeStorageSync('refresh-token')
+            } else {
+                isLogin.value = true
+                uni.setStorageSync('token', token)
+                uni.setStorageSync('refresh-token', refreshToken)
+                // 成功后处理
+                loginAfter()
+            }
+            return isLogin.value
+        }
+
+        function resetUserData() {
+            setToken('')
+            userInfo.value = cloneDeep(defaultUserInfo)
+            userWallet.value = clone(defaultWallet)
+            userNumData.value = cloneDeep(defaultNumData)
+        }
+
+        async function updateUserData() {
+            const nowTime = new Date().getTime()
+            if (lastUpdateTime.value + 5000 > nowTime) {
+                return
+            }
+            lastUpdateTime.value = nowTime
+            await Promise.all([getUserInfo(), getWallet(), getNumData()])
+            return userInfo.value
+        }
+
+        async function loginAfter() {
+            await updateUserData()
+            $share.getShareInfo()
+            $router.go('/pages/index/index')
+        }
+
+        function logOut() {
+            resetUserData()
+            return !isLogin.value
+        }
+
+        return {
+            userInfo,
+            userWallet,
+            isLogin,
+            setToken,
+            logOut,
+            loginAfter,
+            lastRoutePage,
+        }
+    },
+    {
+        persist: {
+            enabled: true,
+            strategies: [
+                {
+                    key: 'user-store',
+                },
+            ],
+        },
     }
+)
 
-    function resetUserData() {
-      setToken("");
-      userInfo.value = clone(defaultUserInfo);
-      userWallet.value = clone(defaultWallet);
-      userNumData.value = cloneDeep(defaultNumData);
-    }
-
-    async function updateUserData() {
-      const nowTime = new Date().getTime();
-      if (lastUpdateTime.value + 5000 > nowTime) {
-        return;
-      }
-      lastUpdateTime.value = nowTime;
-
-      await getUserInfo();
-      getWallet();
-      getNumData();
-      return userInfo.value;
-    }
-
-    function loginAfter() {
-      updateUserData();
-      $share.getShareInfo();
-    }
-
-    function logOut() {
-      resetUserData();
-      return !isLogin.value;
-    }
-
-    return {
-      userInfo,
-      isLogin,
-      setToken,
-      logOut,
-    };
-  },
-  {
-    persist: true,
-    strategies: [
-      {
-        key: "user-store",
-      },
-    ],
-  }
-);
-
-export default useUserStore;
+export default useUserStore
diff --git a/peach/ui/pb-tabbar/pb-tabbar.vue b/peach/ui/pb-tabbar/pb-tabbar.vue
index cd1e643..8a4c654 100644
--- a/peach/ui/pb-tabbar/pb-tabbar.vue
+++ b/peach/ui/pb-tabbar/pb-tabbar.vue
@@ -31,6 +31,7 @@
 </template>
 
 <script setup>
+import { onLoad } from '@dcloudio/uni-app'
 import { computed, unref } from 'vue'
 import PbSTabbar from './pb-s-tabbar.vue'
 import peach from '@/peach'
@@ -59,6 +60,12 @@ const props = defineProps({
     path: String,
     default: '',
 })
+
+onLoad(() => {
+    // 隐藏原生导航栏 使用自定义底部导航
+    // app.vue 内直接调用，在首页是非 tabbar 页面时，会报错
+    uni.hideTabBar()
+})
 </script>
 
 <style lang="scss">
diff --git a/static/default_avatar.png b/static/default_avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d3f8d8873745ef49467295442bb29e35743dfaa
GIT binary patch
literal 4755
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

literal 0
HcmV?d00001