From eb4dfc088779e228f252d8edb477bf80e0236f17 Mon Sep 17 00:00:00 2001
From: Huakk <1751826683@qq.com>
Date: Thu, 16 May 2024 16:36:46 +0800
Subject: [PATCH] wip:

---
 src/components/MerList.vue |  27 +++++++------
 src/components/Pay.vue     |  75 +++++++++++++++++--------------------
 src/pages/cart/index.vue   |  55 +++++++++++++--------------
 src/pages/index/index.scss |  29 ++++++--------
 src/pages/index/index.vue  |  12 ++----
 src/pages/search/index.vue |  15 ++++----
 src/pages/user/index.vue   |  74 ++++++++++++++++++------------------
 src/static/tabbar/2-02.png | Bin 875 -> 1367 bytes
 src/static/tabbar/3-02.png | Bin 578 -> 899 bytes
 src/static/tabbar/4-02.png | Bin 650 -> 956 bytes
 10 files changed, 133 insertions(+), 154 deletions(-)

diff --git a/src/components/MerList.vue b/src/components/MerList.vue
index da58bad..84a67a9 100644
--- a/src/components/MerList.vue
+++ b/src/components/MerList.vue
@@ -88,17 +88,16 @@ import {calculateDistance, parseQueryString} from '@/utils';
 import {bindParent, getBanner} from '@/api/user';
 import {getMerList} from '@/api/goods';
 
-const props = defineProps({
-  classId: {
-    type: Number,
-    default: 0,
-  },
-});
+const classId = defineModel({default: 0});
 
 const list1 = ref<Array<MerData>>([]);
 const list2 = ref<Array<MerData>>([]);
 
-Taro.useLoad(async () => {
+Taro.useLoad(() => {
+  init();
+});
+
+const init = async () => {
   Taro.showLoading({
     title: '加载中',
   });
@@ -119,7 +118,7 @@ Taro.useLoad(async () => {
     }
   }
   Taro.hideLoading();
-});
+};
 
 interface MerData {
   ID: number;
@@ -149,11 +148,10 @@ const get_mer_list = async () => {
       userLocalNum.value.t = res.latitude;
     },
   });
-
   const res = await getMerList({
     PageNum: pageVal.value.page,
     PageSize: 10,
-    class_id: props.classId,
+    class_id: classId.value,
   });
   pageVal.value.total = res.data.total;
 
@@ -209,6 +207,7 @@ Taro.useReachBottom(() => {
 
 <style lang="scss">
 .list-box {
+  margin: 20px;
   padding: 10px;
   display: flex;
   flex-wrap: wrap;
@@ -218,8 +217,8 @@ Taro.useReachBottom(() => {
     overflow: scroll;
 
     .item {
-      width: 350px;
-      margin-bottom: 10px;
+      width: 340px;
+      margin-bottom: 18px;
       border-radius: 20px;
       background-color: #fff;
 
@@ -233,7 +232,7 @@ Taro.useReachBottom(() => {
 
         .title {
           color: #333333;
-          font-size: 28px;
+          font-size: 30px;
           overflow: hidden;
           text-overflow: ellipsis;
           // white-space: nowrap;
@@ -252,7 +251,7 @@ Taro.useReachBottom(() => {
           }
 
           .desc {
-            font-size: 25px;
+            font-size: 28px;
           }
         }
       }
diff --git a/src/components/Pay.vue b/src/components/Pay.vue
index f55c146..adb6760 100644
--- a/src/components/Pay.vue
+++ b/src/components/Pay.vue
@@ -5,21 +5,18 @@
     round
     safe-area-inset-bottom
     :close-on-click-overlay="false"
-    :style="{ height: 'auto' }"
+    :style="{height: 'auto'}"
     :visible="isShowPay"
-    @click-close-icon="closePay"
-  >
+    @click-close-icon="closePay">
     <view class="div">
       <view style="text-align: center">支付方式</view>
       <nut-cell-group
-        :style="{ margin: interval ? '40rpx 0 150rpx 0' : '40rpx 0' }"
-      >
+        :style="{margin: interval ? '40rpx 0 150rpx 0' : '40rpx 0'}">
         <nut-cell
           title="微信支付"
           desc="使用微信快捷支付"
           is-link
-          @click="goPay(1)"
-        >
+          @click="goPay(1)">
           <template v-slot:icon>
             <IconFont size="30" :name="require('../static/wx.png')" />
           </template>
@@ -28,8 +25,7 @@
           title="平台积分支付"
           :desc="`剩余积分:${info.integral || 0}`"
           is-link
-          @click="goPay(2)"
-        >
+          @click="goPay(2)">
           <template v-slot:icon>
             <IconFont size="30" :name="require('../static/pt.png')" />
           </template>
@@ -38,8 +34,7 @@
           title="天才小猪积分支付"
           :desc="`剩余积分:${jfInfo.jh_info?.integral || 0}`"
           is-link
-          @click="goPay(3)"
-        >
+          @click="goPay(3)">
           <template v-slot:icon>
             <IconFont size="30" :name="require('../static/jh.png')" />
           </template>
@@ -50,11 +45,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from "vue";
-import { IconFont } from "@nutui/icons-vue-taro";
-import Taro from "@tarojs/taro";
-import { payOrder } from "@/api/order";
-import { getPersonalInfo } from "@/api/user";
+import {ref, watch} from 'vue';
+import {IconFont} from '@nutui/icons-vue-taro';
+import Taro from '@tarojs/taro';
+import {payOrder} from '@/api/order';
+import {getPersonalInfo} from '@/api/user';
 
 const prop = defineProps({
   interval: {
@@ -78,15 +73,15 @@ const prop = defineProps({
   },
 });
 
-const emit = defineEmits(["closePay", "successPay"]);
+const emit = defineEmits(['closePay', 'successPay']);
 
-const info = ref<{ integral?: any }>({});
+const info = ref<{integral?: any}>({});
 
 watch(
   () => prop.isShowPay,
   () => {
     getInfo();
-  }
+  },
 );
 
 const getInfo = async () => {
@@ -96,7 +91,7 @@ const getInfo = async () => {
   } catch (error) {
     Taro.showToast({
       title: error.msg,
-      icon: "none",
+      icon: 'none',
     });
     throw error;
   }
@@ -105,13 +100,13 @@ const getInfo = async () => {
 const goPay = async (type: number) => {
   if (!prop.jfInfo)
     return Taro.showToast({
-      title: "未获取到订单信息~",
-      icon: "none",
+      title: '未获取到订单信息~',
+      icon: 'none',
     });
   try {
     console.log(prop.jfInfo);
     // 1微信支付 2积分支付 3专属积分兑换
-    const { data } = await payOrder({
+    const {data} = await payOrder({
       oid: prop.jfInfo.oid,
       OrderType: prop.OrderType,
       PayType: type,
@@ -128,53 +123,53 @@ const goPay = async (type: number) => {
             paySign: data.data.paySign,
             success: function () {
               Taro.showToast({
-                title: "支付成功",
-                icon: "success",
+                title: '支付成功',
+                icon: 'success',
                 duration: 2000,
               });
-              emit("successPay", false);
+              emit('successPay', false);
             },
             fail: function () {
               Taro.showToast({
-                title: "支付失败",
-                icon: "none",
+                title: '支付失败',
+                icon: 'none',
                 duration: 2000,
               });
-              emit("closePay", false);
+              emit('closePay', false);
             },
           });
         } else {
           Taro.showToast({
-            title: "支付失败，请稍后再试~",
-            icon: "none",
+            title: '支付失败，请稍后再试~',
+            icon: 'none',
           });
-          emit("closePay", false);
+          emit('closePay', false);
         }
         break;
       default:
         Taro.showToast({
-          title: "支付成功",
-          icon: "none",
+          title: '支付成功',
+          icon: 'none',
         });
-        emit("successPay", false);
+        emit('successPay', false);
         break;
     }
   } catch (e) {
     Taro.showToast({
       title: e.msg,
-      icon: "none",
+      icon: 'none',
     });
-    emit("closePay", false);
+    emit('closePay', false);
     throw e;
   }
 };
 
 const closePay = () => {
   Taro.showToast({
-    title: "取消支付",
-    icon: "none",
+    title: '取消支付',
+    icon: 'none',
   });
-  emit("closePay", false);
+  emit('closePay', false);
 };
 </script>
 
diff --git a/src/pages/cart/index.vue b/src/pages/cart/index.vue
index 6a892bd..41f8314 100644
--- a/src/pages/cart/index.vue
+++ b/src/pages/cart/index.vue
@@ -12,9 +12,8 @@
         </nut-cell>
         <nut-checkbox-group
           v-model="itm.state.checkboxgroup"
-          :ref="(el) => getGroup(el, idx)"
-          @change="(label) => changeBox(label, itm)"
-        >
+          :ref="el => getGroup(el, idx)"
+          @change="label => changeBox(label, itm)">
           <nut-cell v-for="(item, idx1) in itm.Goods" :key="idx1">
             <nut-checkbox :label="item.gid" style="width: 10%"></nut-checkbox>
             <view class="box">
@@ -33,8 +32,7 @@
                 readonly
                 :min="-1"
                 @add.stop="() => onAdd(item)"
-                @reduce.stop="() => onReduce(item)"
-              />
+                @reduce.stop="() => onReduce(item)" />
             </view>
           </nut-cell>
         </nut-checkbox-group>
@@ -44,7 +42,7 @@
     <view>
       <view style="height: 100rpx"></view>
     </view>
-    <view class="bottom-box">
+    <view class="bottom-box" v-if="list.length > 0">
       <view class="left">
         <!-- <nut-checkbox v-model="selectAllVal" @change="selectAll"
           >全选
@@ -55,16 +53,14 @@
             <nut-price
               v-model:price="localCount.price"
               size="normal"
-              :need-symbol="false"
-            />
+              :need-symbol="false" />
           </view>
           <view class="text-box">
             总积分：
             <nut-price
               v-model:price="localCount.exchange"
               size="normal"
-              :need-symbol="false"
-            />
+              :need-symbol="false" />
           </view>
         </view>
       </view>
@@ -75,17 +71,16 @@
       :is-show-pay="isShowPay"
       :interval="true"
       v-model:jfInfo="orderData"
-      @closePay="closePay"
-    />
+      @closePay="closePay" />
   </view>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, ref } from "vue";
-import Taro from "@tarojs/taro";
-import { addCart, getAllCart } from "@/api/cart";
-import { createActiveOrder } from "@/api/goods";
-import Pay from "@/components/Pay.vue";
+import {nextTick, ref} from 'vue';
+import Taro from '@tarojs/taro';
+import {addCart, getAllCart} from '@/api/cart';
+import {createActiveOrder} from '@/api/goods';
+import Pay from '@/components/Pay.vue';
 
 interface CardList {
   name: string;
@@ -134,7 +129,7 @@ const changeBox = (label: string[], item: any) => {
     exchange: 0,
   };
 
-  item["Count"] = {
+  item['Count'] = {
     priceCount: 0,
     exchangeCount: 0,
   };
@@ -143,8 +138,8 @@ const changeBox = (label: string[], item: any) => {
     label.forEach((id: string) => {
       item.Goods.forEach((itm: any) => {
         if (itm.gid === id) {
-          item["Count"].priceCount += itm.price;
-          item["Count"].exchangeCount += itm.exchange;
+          item['Count'].priceCount += itm.price;
+          item['Count'].exchangeCount += itm.exchange;
         }
       });
     });
@@ -193,18 +188,18 @@ const orderData = ref<any>([]);
 
 const sub = async () => {
   const arr: any = list.value.filter(
-    (item: any) => item.state.checkboxgroup.length > 0
+    (item: any) => item.state.checkboxgroup.length > 0,
   );
   if (arr.length === 0) {
     Taro.showToast({
-      title: "请选择商品",
-      icon: "none",
+      title: '请选择商品',
+      icon: 'none',
     });
     return;
   }
 
   try {
-    const { data: res } = await createActiveOrder({
+    const {data: res} = await createActiveOrder({
       Bid: arr.map((item: any) => item.StoreBid),
     });
     if (res.oid) {
@@ -214,7 +209,7 @@ const sub = async () => {
   } catch (e) {
     Taro.showToast({
       title: e.msg,
-      icon: "none",
+      icon: 'none',
     });
   }
 };
@@ -224,7 +219,7 @@ const closePay = async (val: boolean) => {
   orderData.value = [];
   await getList();
   Taro.navigateTo({
-    url: "/pages/users/order_list/index?type=0",
+    url: '/pages/users/order_list/index?type=0',
   });
 };
 
@@ -239,7 +234,7 @@ const getList = async () => {
     list.value = list.value.map((item: any) => ({
       ...item,
       Goods: item.Goods.sort(
-        (a: CardList, b: CardList) => Number(a.gid) - Number(b.gid)
+        (a: CardList, b: CardList) => Number(a.gid) - Number(b.gid),
       ),
       state: {
         indeterminate: false,
@@ -277,13 +272,13 @@ const add_cart = async (item: CardList, num: number = 1) => {
     });
     Taro.showToast({
       title: res.msg,
-      icon: "none",
+      icon: 'none',
     });
     await getList();
   } catch (e) {
     Taro.showToast({
       title: e.msg,
-      icon: "none",
+      icon: 'none',
     });
   }
 };
@@ -291,7 +286,7 @@ const add_cart = async (item: CardList, num: number = 1) => {
 
 <style lang="scss">
 .index {
-  font-family: "Avenir", Helvetica, Arial, sans-serif;
+  font-family: 'Avenir', Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss
index 4d1cbf9..15e85f8 100644
--- a/src/pages/index/index.scss
+++ b/src/pages/index/index.scss
@@ -1,5 +1,5 @@
 page {
-  background-image: url("//p0.meituan.net/csc/aaaccd28594119e4b838d07d30739471440261.png");
+  background-image: url('//p0.meituan.net/csc/aaaccd28594119e4b838d07d30739471440261.png');
   background-size: 100% 57%;
   background-repeat: no-repeat;
   box-sizing: border-box;
@@ -10,10 +10,6 @@ page {
   display: flex;
   align-items: flex-end;
   color: #fff;
-
-  text {
-    font-size: 25px;
-  }
 }
 
 .search {
@@ -43,7 +39,7 @@ page {
 
 .banner {
   .title {
-    background-image: url("//p0.meituan.net/csc/542112fc072d4687b437848bc29b0a1730495.png");
+    background-image: url('//p0.meituan.net/csc/542112fc072d4687b437848bc29b0a1730495.png');
     background-size: 100% 100%;
     width: 600px;
     height: 90px;
@@ -52,7 +48,7 @@ page {
 
   .jf-btn {
     margin: 15px auto;
-    background-image: url("//p1.meituan.net/csc/e125184432dc591137c24a26abe5796a25262.png");
+    background-image: url('//p1.meituan.net/csc/e125184432dc591137c24a26abe5796a25262.png');
     background-size: 100% 100%;
     width: 350px;
     height: 70px;
@@ -66,21 +62,21 @@ page {
     padding: 0 15px;
 
     .btn-1 {
-      background-image: url("//p0.meituan.net/csc/7708348ee250eae910328bb7c12197f029562.png");
+      background-image: url('//p0.meituan.net/csc/7708348ee250eae910328bb7c12197f029562.png');
       background-size: 100% 100%;
       width: 200px;
       height: 220px;
     }
 
     .btn-2 {
-      background-image: url("//p1.meituan.net/csc/8cc2b518031eb7424b184d90a583d805146287.png");
+      background-image: url('//p1.meituan.net/csc/8cc2b518031eb7424b184d90a583d805146287.png');
       background-size: 100% 100%;
       width: 300px;
       height: 220px;
     }
 
     .btn-3 {
-      background-image: url("//p0.meituan.net/csc/31bd1f5c791c95557758dfa5c96e001529545.png");
+      background-image: url('//p0.meituan.net/csc/31bd1f5c791c95557758dfa5c96e001529545.png');
       background-size: 100% 100%;
       width: 200px;
       height: 220px;
@@ -91,13 +87,12 @@ page {
 .navigation {
   display: grid;
   grid-template-columns: repeat(4, 1fr);
-  grid-gap: 10px;
-  margin: 10px auto;
-  width: 730px;
+  grid-gap: 40px;
+  margin: 20px;
   height: auto;
   background-color: #fff;
   border-radius: 20px;
-  padding: 20px;
+  padding: 32px 26px;
 
   .item {
     display: flex;
@@ -112,15 +107,15 @@ page {
 
     .text {
       color: #333333;
-      font-size: 23px;
+      font-size: 26px;
       margin-top: 6px;
     }
   }
 }
 
 .ad {
-  background-image: url("https://jdt168.oss-cn-guangzhou.aliyuncs.com/ad.png");
+  background-image: url('https://jdt168.oss-cn-guangzhou.aliyuncs.com/ad.png');
   background-size: 100% 100%;
-  width: 100%;
   height: 180px;
+  margin: 20px;
 }
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 264422d..cf6f5e3 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -3,7 +3,7 @@
     <view :style="{marginTop: BarHeight + 'px'}"></view>
     <view class="local">
       <view class="iconfont icon-dizhi" style="font-size: 20px"></view>
-      <text>{{ address }}</text>
+      <text class="text-[28px]">{{ address }}</text>
     </view>
     <view class="search">
       <view
@@ -31,12 +31,7 @@
         v-for="(item, index) in navigationList"
         :key="index"
         @click="toPage(item)">
-        <view
-          class="icon"
-          :style="{
-            backgroundImage: `url(${item.icon})`,
-          }">
-        </view>
+        <image class="icon" :src="item.icon" />
         <view class="text">{{ item.name }}</view>
       </view>
     </view>
@@ -72,6 +67,7 @@ Taro.useShareAppMessage(() => ({
 }));
 
 const searchVal = ref('');
+
 const clickSearch = () => {
   if (!searchVal.value)
     return Taro.showToast({
@@ -97,7 +93,7 @@ const getUserLocal = async () => {
         method: 'GET',
         success: res => {
           const data = res.data.result.address_component;
-          address.value = `${data.city}${data.district}${data.street_number}`;
+          address.value = `${data.district}${data.street_number}`;
         },
       });
     },
diff --git a/src/pages/search/index.vue b/src/pages/search/index.vue
index 1e557eb..0a2e0a8 100644
--- a/src/pages/search/index.vue
+++ b/src/pages/search/index.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
-import { ref } from "vue";
-import Taro from "@tarojs/taro";
-import MerList from "@/components/MerList.vue";
+import {ref, onMounted} from 'vue';
+import Taro from '@tarojs/taro';
+import MerList from '@/components/MerList.vue';
 
-const classId = ref<null | number>(null);
+const classId = ref();
 
-Taro.useLoad((e) => {
+onMounted(() => {
+  const e = Taro.getCurrentInstance().router?.params as any;
   Taro.setNavigationBarTitle({
     title: e.name,
   });
@@ -14,9 +15,7 @@ Taro.useLoad((e) => {
 </script>
 
 <template>
-  <view>
-    <MerList :classId="classId" />
-  </view>
+  <MerList v-model="classId" />
 </template>
 
 <style lang="scss"></style>
diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index 75ea85e..56d1f2c 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -43,24 +43,24 @@
         </view>
       </view>
     </view>
-    <view class="user-acc flex justify-center items-center text-center">
+    <view class="user-acc flex items-center text-center justify-evenly px-10">
       <view>
-        <view class="text-[#CFAA32]">豆子</view>
-        <view class="text-[#ffc300] text-[35px] font-bold">{{
+        <view class="text-[#ffc300] text-[40px] font-bold">{{
           userInfo.data?.pulse || 0
         }}</view>
+        <view class="text-[#CFAA32] text-[28px]">豆子</view>
       </view>
       <view class="line"></view>
       <view>
-        <view class="text-[#CFAA32]">积分</view>
-        <view class="text-[#ffc300] text-[35px] font-bold">{{
+        <view class="text-[#ffc300] text-[40px] font-bold">{{
           userInfo.data?.integral || 0
         }}</view>
+        <view class="text-[#CFAA32] text-[28px]">积分</view>
       </view>
     </view>
     <view class="container">
       <!--我的订单-->
-      <view class="border-box bg-[#fff] p-[30px]">
+      <view class="border-box bg-[#fff] p-[20px]">
         <view class="flex justify-between items-center">
           <view class="text-[#333333]">我的订单</view>
           <view
@@ -70,13 +70,13 @@
             <ArrowRight size="10" />
           </view>
         </view>
-        <view class="flex justify-between text-[#666] pl-[30px] pr-[30px]">
+        <view class="flex justify-between text-[#666] px-[20px]">
           <view
             class="mt-[30px] flex flex-col items-center"
             @click="toOrderList(1)">
             <IconFont
               name="http://p0.meituan.net/csc/9943f6c938fc0e310141a2b99d5bde6617483.png"
-              size="40" />
+              size="42" />
             <view class="mt-[15px] text-[25px] text-[#333333]">待付款</view>
           </view>
           <view
@@ -84,7 +84,7 @@
             @click="toOrderList(2)">
             <IconFont
               name="http://p0.meituan.net/csc/5306d094d7b4b61848dd21c86b693a9515523.png"
-              size="40" />
+              size="42" />
             <view class="mt-[15px] text-[25px] text-[#333333]">待使用</view>
           </view>
           <view
@@ -92,7 +92,7 @@
             @click="toOrderList(3)">
             <IconFont
               name="http://p0.meituan.net/csc/32ea9bbf51e3bbb0cbd75bc0fea97ca815779.png"
-              size="40" />
+              size="42" />
             <view class="mt-[15px] text-[25px] text-[#333333]">已使用</view>
           </view>
           <view
@@ -100,7 +100,7 @@
             @click="toOrderList(4)">
             <IconFont
               name="http://p0.meituan.net/csc/2e0dee89e9a3e3f2e7bf65db355fa11c11630.png"
-              size="40" />
+              size="42" />
             <view class="mt-[15px] text-[25px] text-[#333333]">已失效</view>
           </view>
         </view>
@@ -115,11 +115,11 @@
               v-if="item.type !== 333"
               class="box-mini"
               @click="toPage(item.url)">
-              <IconFont size="40" :name="item.icon"></IconFont>
+              <IconFont size="42" :name="item.icon"></IconFont>
               <view class="label">{{ item.label }}</view>
             </view>
             <button v-else class="kf-btn" open-type="contact">
-              <IconFont class="IconFont" size="40" :name="item.icon"></IconFont>
+              <IconFont class="IconFont" size="42" :name="item.icon"></IconFont>
               <view class="label">{{ item.label }}</view>
             </button>
           </view>
@@ -131,44 +131,44 @@
         class="user-center"
         v-if="userInfo.data?.bid && userInfo.store_status === 1">
         <view class="text-[#333333]">商家服务</view>
-        <nut-grid :gutter="0" :border="false">
-          <nut-grid-item
-            :border="false"
+        <view class="box">
+          <view
             v-if="userInfo.data.permission.dd"
-            text="点单"
+            class="box-mini"
             @click="toPage('/pages/admin/add_order/index')">
             <IconFont
-              size="40"
+              size="42"
               name="http://p0.meituan.net/csc/72a389ac6a441061fd534b96644c431b7839.png"></IconFont>
-          </nut-grid-item>
-          <nut-grid-item
-            :border="false"
+            <view class="label">后结点单</view>
+          </view>
+          <view
             v-if="userInfo.data.permission.hx"
-            text="订单核销"
+            class="box-mini"
             @click="toPage('/pages/admin/verify/index')">
             <IconFont
-              size="40"
+              size="42"
               name="http://p1.meituan.net/csc/c236a8b7a73178da25218e1fb59a96f06610.png"></IconFont>
-          </nut-grid-item>
-          <nut-grid-item
-            :border="false"
+            <view class="label">订单核销</view>
+          </view>
+          <view
             v-if="userInfo.data.permission.tj"
-            text="订单统计"
+            class="box-mini"
             @click="toPage('/pages/admin/order_manage/index')">
             <IconFont
-              size="40"
+              size="42"
               name="http://p0.meituan.net/csc/bd9aca457a109b4d69a692a9109a73ed9045.png"></IconFont>
-          </nut-grid-item>
-          <nut-grid-item
-            :border="false"
+            <view class="label">订单统计</view>
+          </view>
+          <view
             v-if="userInfo.data.permission.tx"
-            text="收益提现"
+            class="box-mini"
             @click="toPage('/pages/admin/withdrawal/index')">
             <IconFont
-              size="40"
+              size="42"
               name="http://p0.meituan.net/csc/f85d7dc1bf9eda8977e9089b260a586b7440.png"></IconFont>
-          </nut-grid-item>
-        </nut-grid>
+            <view class="label">收益提现</view>
+          </view>
+        </view>
       </view>
 
       <!--    版权    -->
@@ -428,10 +428,10 @@ const scanCode = () => {
   -nut-grid-item-text-color: #333;
 
   .box {
-    margin-top: 20px;
+    margin-top: 30px;
     display: grid;
     grid-template-columns: repeat(4, 1fr);
-    grid-gap: 20px;
+    grid-gap: 20px 100px;
     box-sizing: border-box;
     line-height: 1.5;
 
diff --git a/src/static/tabbar/2-02.png b/src/static/tabbar/2-02.png
index b47570f9d861324973e675e180cda1c64625e546..b03d0c4feb77f4872857ccbb1a7d1df51790ea00 100644
GIT binary patch
literal 1367
zcmb_c{W}u~0G?q+NKH7W6Jia`XGx^dvbM1?<1*vs>n_uLjV@h<YK^trFtKiz<ob|V
zY{=4TsoYSklFYX_ADO1Z6CUQ=zi`jJ&-?Mbzr8=b1tB<;k%6TF001yTA43v0Gwol2
zL7Uz-x`^EjEjj@e01$Rr&1@DOdH|XT-o#mOLOuYXtA$4T6HoK!ey0_G++~6ocu_4a
zB+JBdecvlkO4mnSdDfl4l6AL>aiE~w$*Qn*jp|y>w(QD0kf<f;x&uZ2_B|X>0@||M
z_`kC2Nw4{@q>VLiLsz5c<Bd3Q-%jJhj1mz^`MIK^%UuhQ$<)paAi@Ut(K9s0oeZ|j
z{tWC&zTsYTghV8*DwmZTh}t6~y>5>Ri9J6B&kF2C`7-r_H;Eq%)mgj?AuVI1)hDTq
zZ7N{>gpxvxz|<^+9*OJq4>HaM%->rs?`S=lMJIIZz&4qcV~6>i7C%%CJyc}>V^W^i
zZI)a+*WBg_rc?RpY@*}7_wu*Er-djLR(NNlbaSW+U1GV`5+lyhdn6;ovVishFskF#
zzoZ#1iqe|~o-nt`0{w9b0&;*FUHc%3H@I{G%89Bd<JX$dOv30B=sdC=fopbpJg?JM
z(z=I*`0lZDi4*%)LR_30E;jY(Cb3C}S9`9%D~`cT3mAjx7PmU%K^}cdUP7MR7(FTS
z9^~VfREH`;@+BXaaVZA2W;z0Sht;<(>-^+X4*~kY%TO$~yLamek&MGBE++M3CHe(@
zyBP{jU9bL^Q;mR8@3KW{s*8QlbHx5wPL*{K#KLt|g@;bf3fE?$VX4V;c&G?S5BX!O
z>UQRE*2t9DOJ}4s!$I$$%`qlHb>0;{+OO&Uj`eLXeD!=qca0FGtC|i?h*v*eVmSLq
zR*eLHyC)A~D<bW{Vr#Zp^C=B8RFQ6>A>W1AuB2$1$rpxGyYc6^F_728dY`Sv;GRoO
zjl`Xk9l@vaEK1dn^!HrMJ`%`OG&0f{-t1~X8-+4sDNIxLn>vsv@~!B(hN%UA0VeZm
z8f}vPCUo{?w?J#bA>W{~S{Kaglng&)yw7niNC#>=DfVSYmkcZ>#y9Q1hpv?SruA5+
zVAhN3H=<KLn7(r%vr#FIl35?9usYQ6C2o4P>9+^GsBZ#my~Ju$Cl->S=ySohYxn<o
zg9kloo{6d*n>}q9^YSSyT-6W;t2>V+f`ivHAfPhbJl8KASwzKGH#;r${otNsfONXj
z^v?A$a*OJXOCZ7LIHi!avk`Ox(Z`SIOoR;TrNnL@GO);M$5U;Mw+O(26&=6=h%;w_
zLwmNDbHKUI)*?(qg{&NZ_2L7cdi|-UaK(5&Vmk<?Q=!;<Zu<v*f_qLkqrI6MGk5He
zWI%vWK_QnzGLk9xWuqpndTV+?|5n1jk>J?5dWnA!E&H;RJFh<T+EU9^IK-7jOemLe
z;f(<vz$mWXysyom<1-*#Rh$xj!{$TLe)c0nv;1=nvqSAe*G??u|GZ?<f5tjq{MCwh
zRkzCR(nDD;Ef>3t``lzWY4knKl=a1qr2cxAVnnTLP3Ovbe3<urwcBojlAX5=>9uJ9
zpZ+$4U9@~9w3|sUsq}tcD;F0iTUaa8?GsZBIC}ArA|-i{OCsOsC^AL-GFlT^$h$n2
zSew%MmfYNHMTawYY^bL!$oKIRJkR61(*GA~w8xnZ?DCvN&&_iLppW8^!T`#Je*i~a
BXj%XO

delta 859
zcmV-h1El=d3hM?TiBL{Q4GJ0x0000DNk~Le0000q0000q2nGNE0L6G4>yaTJe*+as
zL_t(&f$dpMdfG4$eWG17SCBXD8Kfl;ag+8WagWlISR^dX9oh{XfvhrJAO|7q*EmhS
zuX-zNOPYDo{AmCxDk>@}Dk>^MU{fbbDO&&_qI&>pCVeyjFvfoNeXpl1P)tZl*%Hyi
z6k(+>#M+`cC4&QGG-GUAvQ7wrf790c{eF|XMm8ar%#__Lkfn?)RVpiskP*<C$D$p(
z1wx1pg`^fa3%e&XQNLo?8<*?1NkUReh3j3?)6|;=djp5a8bgwhy)$p+GclCPj1sa>
z2PQ}Oa9Xe1=hccz1eahqr5v-163X=*b`G~VEte`=OPn`MO4*u?i$Pm+f7;l<te^lu
z&+R)V4Rl2GKtx@Pl##80^eF`ixxt`V<3gkqwUc*@{O2hGPRpgjVxg?T=iiHkI<42Q
z@9!QT+lY=DfNj#zYNPM_RtPbSR|xoYFtJ)m?JAL;mP^GL>q7HfrN2Bq1(UEbyL-mi
zHYb|diFUu=dv*7okf{t5e=s(;yWLKo*6XWx>{5eivUmFBMaLBMk+4jC<hP8m?Vy*G
zQu+Ma%hD-1HmQK{yjpbt6cKIicDv}<7(DgjNVX7y%r|c-l!|h*N4FBh{Mc0HBZLU4
zITV@zZ9n(|h2;Xux4?*y9TH2!^)2QGob!#5sdK7pU-<R~h0&lCe`1lW6e$v^@I5*q
z%QoNDe{$gSqukQxqd|v01WoSNK0!voiOHRvOFkOO2$numG2{}W^ld^2k(K94aAk7N
zt`-TAQYs+?mA1Hus56Ot5?o7|<%FCj3UFy{>DWB0v!jF%-5kxAD?)wWYazt&s8R|6
zV={&9Ep3%qN=n(5e_pv=bG<3b-AD$&xwB(mv2z+Bp|S_?6Vk)tu|<a)=kR<><I&7}
zm77D#K)WwKxi6Zg`34gXo2Fr$a~uwb-@|t)Wy?8NG;<gAcs%~%oDXX#&bexu<`3um
zt1BPCcO&<Q{SC;tKBO>bOW17zC*bYi=G<7lc;nu78~d9kF(y0O+qPo7z3@M)@tnRO
lfcI&3R#a3}R8;)8_zQ)t%+sZh=ve>&002ovPDHLkV1h4Jl#~Df

diff --git a/src/static/tabbar/3-02.png b/src/static/tabbar/3-02.png
index c3e6a23da7b810f2db9aff7a426b71c61b7f8b9a..523faa4cd09a9b2c09431e62ee3b87e594a2e2b9 100644
GIT binary patch
delta 883
zcmV-(1C0E_1cL`5iBL{Q4GJ0x0000DNk~Le0000)0000;2nGNE08i0V$&n!+e*-N^
zL_t(|ob8-ZlA<saMQ_q{O}iWNk4#(&E9fPtOK=6clV;R^dpC4dk7PcYU<?VOV}ck?
zl~oc6gv(9d)AB*k14WW>03d|St0oR07lix)0F-4u+3)i{#zuUetVj}GiNL$;F9=yq
zw%di%L1}msq)5{R5n_IM&vSf>f8s@uuj%vy?XJi#d=4SR%*Ql}T%Vvw(*=a!db<!}
z1_0_s7D>WEDK|N(nrgY;es7#Q#4=6tx7}`bOJ5(;$C)720{Wr0U3)>sV>q5V)YXBN
zkP6_oyF1zMb3w?m?YQ^GnM1y&Q=x9Z?RGbxOJ9^-y2Ob?Wa1^!@A9?Oe+ioh+)Not
z`CX4!mbtp=a@t%KcJ(`Ng9!2atf4IPu6^%4mTRY0r+IyAmiZ{iDcfaHZxzH8_J&NC
zNY}cCJd+pzK!lhVX}W0J$12FBjzfhAF>hOctbz=A&G;XTg4{bIJQ{6b+w72g=Me+K
z*>{--huc0d3erfd0wPq0e^}Q^n;^!WLm*g(*aAmGkY^9Mmk8D&w!qO8B;Xtb2-qR8
z1dfIvA?F}K*bXrU5R)K{okAjLhnP4MB)A;J5K)76h$(=a3lew^0tD_56K8@1n1gV=
zVRVRwE(q^q5PhOY*3lsvwIIReAQCOIjt<c{2@+@yqDR)zAsV$He*xwo60UBH4$)8r
z;e8FFZ`24oIz)p4esU1XnAd){^5YQ4Avel0yslP=vh1pUud7x4a*A^OUZ%`TCB#c5
z%q1ve__f{E?x2i0b&48cy$Et#uj}`eF{@iBW3`*~{^jA|e4Ie_$6ePs$lpp3=@iNs
zz!*pzLwtUM#Ie-@f5-K@?(YNV1w;~E6yPL`iSls3akKH|3@+agpjo-#l1N!kOh^H~
z-`{-=3Baks!n+_UQI>(kF#zDW*#LmIwL(V<67~5zh|jg5D>T%v{S7J|#?-w+M%qyj
z4I1$8AVx-qoZ!HZAiURMJQ$-xG$=gO(+`9k0I1KJ*hfa{NziNR{z%Bma|)auT@fm3
z<v9h+4;=^vy>zuvw>$Kr<txaA5KF!C+gix{%>M@H>j_wc<R8vUG{{q1NRt2n002ov
JPDHLkV1kMXl_3BC

delta 560
zcmV-00?++}2f_p)iBL{Q4GJ0x0000DNk~Le0000u0000u2nGNE0H}sL9+4p*e*x@C
zL_t(&f$f<=a>F1D0F^X-kVhYiFZew@!o?pl<2)z{J+v?+<GL0?IAqvM+rUI#OUMNu
zoO2G|nB(3TAWajjohDd2O|W*FVC}rU;HgBAVHf}az*-9c07|KcpOT0QT5E$`j4>ws
zE-vYWn5M}gqC-TdwRY1qg)y!5f5Vt0VuDJkRe|^h#PYcj5%d?Yl*%%XLzXq@o5#}M
z&tqHXA!3e8gM)MF8{T0URt2~qA|N8G5hZ8P7!%~4@AhAxFR?b)S_{_NAeuyKZTkkX
zgzu7DI^^2-<XEFg|H=60nDjF&$2t^w&{NjVmh$7Qb1^}!^`^Q1%|k?%e_&FHQkqCE
zQYBfti4ua`7_1DIq<98Pm8XwWOmL6vaYz;{oxxP9IkMQLi<W|u#g{M9rPvf+zKe3H
zqKg(SQEos^Jn<5x2Dr~NT*r|-mMcC0aW|3DU~az>r@jxLUB?k_;|RyDql8aF^x*f{
zb@0*maEpZQ^Bl%LzrHqoe-Ecb#gFde%(=_uNBVp&l0AR|B?|B;nTp@|`a`I#RMAB_
zh<4GOq~26=2KUY$^(K=9{W^$Wf0e?=B(HzU<XEs|xyCO}se<Hp6ULZbGDta!jA6Ze
yDV0Uex@QU2KovWB4o$FjnqciT!P<Fy!EgD-7mOJ4KOq1B002ov22Mn-LSTZ@y8^rb

diff --git a/src/static/tabbar/4-02.png b/src/static/tabbar/4-02.png
index 7867e1dcd0cd8fcad79f97f32431b4cefb382812..112ab3522be013048af86fdf4be1e6d6a75f68ec 100644
GIT binary patch
delta 941
zcmV;e15*5o1-u6#iBL{Q4GJ0x0000DNk~Le0001B0001B2nGNE0OFW;IFTVAe*<Po
zL_t(|ob8?6RpT%aMkh`<+fLL#YQYsyODb?`p#jkjhs5TAc#kp0amdVkpN{9g08g^#
zYV>1`b~jzubrQg+&=0V7LI9W$044;02?1b20GJQ}W`}-&ztHCV?e8ij(33n4y?}Gm
zh=|DL`tvt>3ESuAqJ(T%cf#kUf4Ld-IjWST1Q~P!9u52$b`dlJv;#lp>3F1+Kq0_7
z_&wXYmR((&w{s8hWvEy1MZPBTvr}73feP>peh-@jm;glZdzd6Z1hhHBg5Sd;0V3dX
zIw6{+#9cs}^N&vnC>XN9T>x9}M-PRr0+@RL5M&m(3SjH~47l!u-wy|`f2Qu{-|H)+
zUAGKi9D0VJo)7*hf`#_&4brY(27q3WoyY(%ZUVZ<fJxj0Z1#JvrivnlATS}|N(IVL
zHvy;@WXDec;emKhl@jdvT!)}7*?~9%F$c(3H60390c<59BG}<a1dsu2!w|CfivR@d
z>Y7FZy7!BK<^Yx@DZ2NIf1m`U1kVDNT2a_42sspO>zX3?A}d{nGOfl|S(^BMIM5uC
zx|gRT13!kLT-{XwQ}BDLl;r7ngthM`;N#_mChey{t%_Xc0QTUE;GWSu14;<~5bpvl
z(+nsr_#*ywqGkflO;cR(Mf^+FO$0F9fO!N@2_|y@a}n-6c+3ate;I(jak7Nnbpv*5
z+3E2v>KRZ%?;rN;Tf>cY7N}-G3B7;JtuLe2@1!cAl={!{0%7i8#(FWKCV=(+*A(M#
zQdLT`ALT5wKutht_rJ#bl)1wp%PdgMfYKNbnR8iS^?oV>N({cp&!J^53#@MVtnx^5
z2ztk^lL3XSex?{_f5C6VkktxLML;Rb&qtu114?HY+_|e%77{|h9as#tAwZT7p%x{T
zApneufYPs^4u_Vx9lb@>1pU7q?LnI}>@&Jb2C$TyTVho+q$7Z!+}s+gy96-_FTk>#
zUG+$kvG!8~%VSB^3|Ml|T^iPfyXr#_%hewZJl@5uHnim7f5`LRfN61Vo3mU_r(zCl
z5EnLF?g#WD`rlcoQu@D(N8OZhzoOI&@D?%*cD3Kr%u^Kqg^9>_5gMO;hr4r@U{66K
zV6DVX7)%HN69T}505Bl{Ob7rI0>Fd-Fd+a;2mliTz=QxWAplGW0P_h8AhDq}Ch&s*
P0000<MNUMn143Ye(YU2U

delta 632
zcmV-;0*C#)2Z{wDiBL{Q4GJ0x0000DNk~Le0000u0000u2nGNE0H}sL9+4p*e*!c~
zL_t(&f$f=1ZsZ^kg<qV>ebTDl`Y^qz`($Yr@r6Ljaax)rHH#4rq4Q(IBW*|iR&>ih
zJQo!8;Ks}hznJdY9caxiaO>;>x6Uqb>+Axz&Y#vV2q7SZFtsD93IGt1rtiOLRjP#$
z;GBCW>LXNj65E0%0-bYk&P~7be`v+1M)4v7Rc#YZBQp$xiHM1a4a4x|wcdME)#>^c
zPz8GLXNyaTA7#lsbD;{1(J1L?$%mN(ZJCI3D$b{+#Cy`Y%YY^@cC0ibrb*_z%)5kD
zE%d7vn5O(Su}5$&jLyY-nU&2d1u~%z(b6=Zmu@U*0@E~KBC>Xw`4nc=e^6VhsVcKO
zW=1a6%<775?>)OaMm4<YJObWqlZaf*tNhydAA238`N7-+ipZ?2sHztUW*7!WmjI9i
zrs8sko}1f9UX-WLpo**=<4fk;ca$cnuc#8(qC@OwR;`1d4a-uV#}S9F<9b8Jmu7M9
zd;9zNXlA@^jN%Bks61{@e<!?*Bc8|c;yuNbewkJ~VduWLbKjd8CyGT8Y-w(9PbUC)
z7sVP@Wq1LgyT6~>3=6ip2zH0V)V`X)pTM4;C<eIs=~4-I4-fwvude_qM@ngSYPA!c
z60KB?jVd0ZX|=)LOL5NOcsx$_sV0I|ZX$O8K-s}&>NaxARqHCMPVLg%gHB++M+A8F
zEzR&op|QP$bQsnS$(&|K*pZLK{^a(4bAi`pwF^CqUEtQ)1#X>P;MV!|0{;OO)=AsH
Sp`ZK!0000<MNUMnLSTa5wk~b}