From 94a4b5e1df037b17a7e6a1792f123f7999db4f5d Mon Sep 17 00:00:00 2001
From: Huakk <1751826683@qq.com>
Date: Mon, 20 May 2024 18:18:16 +0800
Subject: [PATCH] feat(custom):

---
 config/index.ts                              |   2 +-
 src/app.config.ts                            |  16 +-
 src/pages/admin/verify/index.vue             |   2 +-
 src/pages/admin/verify/verify_list/index.vue |   4 +-
 src/pages/admin/withdrawal/index.vue         |   8 +-
 src/pages/index/index.scss                   |   6 +-
 src/pages/index/index.vue                    |  24 +-
 src/pages/user/index.scss                    | 141 +++++++
 src/pages/user/index.vue                     | 363 ++++++-------------
 src/pages/users/account/index.vue            |  90 +++--
 src/pages/users/order_list/index.vue         |  19 +-
 src/static/tabbar/1-0.png                    | Bin 0 -> 1002 bytes
 src/static/tabbar/1-01.png                   | Bin 2329 -> 0 bytes
 src/static/tabbar/1-02.png                   | Bin 3289 -> 0 bytes
 src/static/tabbar/1-1.png                    | Bin 0 -> 919 bytes
 src/static/tabbar/2-0.png                    | Bin 0 -> 1635 bytes
 src/static/tabbar/2-01.png                   | Bin 813 -> 0 bytes
 src/static/tabbar/{2-02.png => 2-1.png}      | Bin
 src/static/tabbar/3-0.png                    | Bin 0 -> 1075 bytes
 src/static/tabbar/3-01.png                   | Bin 541 -> 0 bytes
 src/static/tabbar/3-02.png                   | Bin 899 -> 0 bytes
 src/static/tabbar/3-1.png                    | Bin 0 -> 986 bytes
 src/static/tabbar/4-0.png                    | Bin 0 -> 1288 bytes
 src/static/tabbar/4-01.png                   | Bin 590 -> 0 bytes
 src/static/tabbar/{4-02.png => 4-1.png}      | Bin
 25 files changed, 330 insertions(+), 345 deletions(-)
 create mode 100644 src/pages/user/index.scss
 create mode 100644 src/static/tabbar/1-0.png
 delete mode 100644 src/static/tabbar/1-01.png
 delete mode 100644 src/static/tabbar/1-02.png
 create mode 100644 src/static/tabbar/1-1.png
 create mode 100644 src/static/tabbar/2-0.png
 delete mode 100644 src/static/tabbar/2-01.png
 rename src/static/tabbar/{2-02.png => 2-1.png} (100%)
 create mode 100644 src/static/tabbar/3-0.png
 delete mode 100644 src/static/tabbar/3-01.png
 delete mode 100644 src/static/tabbar/3-02.png
 create mode 100644 src/static/tabbar/3-1.png
 create mode 100644 src/static/tabbar/4-0.png
 delete mode 100644 src/static/tabbar/4-01.png
 rename src/static/tabbar/{4-02.png => 4-1.png} (100%)

diff --git a/config/index.ts b/config/index.ts
index d1a5dd9..2f6adf0 100644
--- a/config/index.ts
+++ b/config/index.ts
@@ -51,7 +51,7 @@ const config = {
     prebundle: {enable: false},
   },
   cache: {
-    enable: false, // Webpack 持久化缓存配置，建议开启。默认配置请参考：https://docs.taro.zone/docs/config-detail#cache
+    enable: true, // Webpack 持久化缓存配置，建议开启。默认配置请参考：https://docs.taro.zone/docs/config-detail#cache
   },
   sass: {
     data: `@import "@nutui/nutui-taro/dist/styles/variables.scss";`,
diff --git a/src/app.config.ts b/src/app.config.ts
index 3073d08..80d70a7 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -92,26 +92,26 @@ export default defineAppConfig({
     list: [
       {
         pagePath: 'pages/index/index',
-        iconPath: 'static/tabbar/1-01.png',
-        selectedIconPath: 'static/tabbar/1-02.png',
+        iconPath: 'static/tabbar/1-0.png',
+        selectedIconPath: 'static/tabbar/1-1.png',
         text: '首页',
       },
       {
         pagePath: 'pages/game/gamehome/index',
-        iconPath: 'static/tabbar/2-01.png',
-        selectedIconPath: 'static/tabbar/2-02.png',
+        iconPath: 'static/tabbar/2-0.png',
+        selectedIconPath: 'static/tabbar/2-1.png',
         text: '游戏',
       },
       {
         pagePath: 'pages/cart/index',
-        iconPath: 'static/tabbar/3-01.png',
-        selectedIconPath: 'static/tabbar/3-02.png',
+        iconPath: 'static/tabbar/3-0.png',
+        selectedIconPath: 'static/tabbar/3-1.png',
         text: '购物车',
       },
       {
         pagePath: 'pages/user/index',
-        iconPath: 'static/tabbar/4-01.png',
-        selectedIconPath: 'static/tabbar/4-02.png',
+        iconPath: 'static/tabbar/4-0.png',
+        selectedIconPath: 'static/tabbar/4-1.png',
         text: '我的',
       },
     ],
diff --git a/src/pages/admin/verify/index.vue b/src/pages/admin/verify/index.vue
index 44848ab..19c41ae 100644
--- a/src/pages/admin/verify/index.vue
+++ b/src/pages/admin/verify/index.vue
@@ -58,7 +58,7 @@ page {
 }
 
 .card {
-  width: 80%;
+  width: 690px;
   height: 300px;
   box-sizing: border-box;
   background-color: #fff;
diff --git a/src/pages/admin/verify/verify_list/index.vue b/src/pages/admin/verify/verify_list/index.vue
index 35ee3ed..658382d 100644
--- a/src/pages/admin/verify/verify_list/index.vue
+++ b/src/pages/admin/verify/verify_list/index.vue
@@ -73,10 +73,10 @@ Taro.useLoad(options => {
 const goodInfo = ref<any>({});
 
 const getData = async (options: any) => {
-  const merInfo = Taro.getStorageSync('mer_info');
+  const merInfo = Taro.getStorageSync("userInfo");
   const res = await getActiveVerifyList({
     oid: options.oid,
-    bid: merInfo.bid,
+    bid: merInfo.data.bid,
   });
   if (!res.data.data.oid) {
     Taro.showToast({
diff --git a/src/pages/admin/withdrawal/index.vue b/src/pages/admin/withdrawal/index.vue
index c89ab69..a6a691c 100644
--- a/src/pages/admin/withdrawal/index.vue
+++ b/src/pages/admin/withdrawal/index.vue
@@ -164,13 +164,13 @@ Taro.useReachBottom(() => {
       </view>
     </view>
     <view class="formCard">
-      <view class="flex justify-between">
+      <view class="flex justify-between mb-[25px]">
         <text>积分提现</text>
         <view class="flex items-center" @click="visible1 = true">
           <image
-            class="w-[25px] h-[25px]"
+            class="w-[26px] h-[26px]"
             src="http://p1.meituan.net/csc/5437a800f4ed4a49f14984494c1c3077994.png"></image>
-          <view class="text-[#EC4443] text-[20px] ml-1">提现疑问</view>
+          <view class="text-[#EC4443] text-[26px] ml-1">提现疑问</view>
         </view>
       </view>
       <nut-form ref="formRef" :model-value="basicData" :rules="rules">
@@ -182,7 +182,7 @@ Taro.useReachBottom(() => {
             type="text">
             <template #right>
               <text
-                class="text-[#EC4443] text-[25px]"
+                class="text-[#EC4443] text-[26px]"
                 @tap="basicData.num = row.toString()"
                 >全部</text
               >
diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss
index 15e85f8..7f3f4c9 100644
--- a/src/pages/index/index.scss
+++ b/src/pages/index/index.scss
@@ -92,7 +92,7 @@ page {
   height: auto;
   background-color: #fff;
   border-radius: 20px;
-  padding: 32px 26px;
+  padding: 32px 0;
 
   .item {
     display: flex;
@@ -101,8 +101,8 @@ page {
 
     .icon {
       background-size: 100% 100%;
-      width: 80px;
-      height: 80px;
+      width: 90px;
+      height: 90px;
     }
 
     .text {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index fbb8981..af13b89 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -105,18 +105,18 @@ const getUserLocal = async () => {
 
 const getNavLists = async () => {
   navigationList.value = [
-    {
-      type: 1,
-      icon: '//p0.meituan.net/csc/5c770748f0028c63741c5ec14df3cc386715.png',
-      url: '',
-      name: '活动商家',
-    },
-    {
-      type: 1,
-      icon: '//p0.meituan.net/csc/4868c06b99008ff7d5f81e6514858c8a7950.png',
-      url: '',
-      name: '兑换商家',
-    },
+    // {
+    //   type: 1,
+    //   icon: '//p0.meituan.net/csc/5c770748f0028c63741c5ec14df3cc386715.png',
+    //   url: '',
+    //   name: '活动商家',
+    // },
+    // {
+    //   type: 1,
+    //   icon: '//p0.meituan.net/csc/4868c06b99008ff7d5f81e6514858c8a7950.png',
+    //   url: '',
+    //   name: '兑换商家',
+    // },
     {
       type: 1,
       icon: '//p0.meituan.net/csc/f33ad2443a67e9f3474a1d5fd9d529db7504.png',
diff --git a/src/pages/user/index.scss b/src/pages/user/index.scss
new file mode 100644
index 0000000..bc53d64
--- /dev/null
+++ b/src/pages/user/index.scss
@@ -0,0 +1,141 @@
+.appUser {
+  box-sizing: border-box;
+  background-color: #f8f8f8;
+  height: 100%;
+  background-image: url('http://p0.meituan.net/csc/f44bb11463e3c538c307d7ce4b303bec33520.png');
+  background-size: 100% 500px;
+  background-repeat: no-repeat;
+  position: relative;
+  padding-top: 180px;
+  color: var(--nut-grid-item-text-color, var(--nut-title-color2, #666666));
+}
+
+.user-center-card__header__avatar {
+  img {
+    border-radius: 50%;
+  }
+}
+
+.user-center-card__header__info__phone {
+  color: #737373;
+  font-size: 25px;
+}
+
+.user-center-card__header__transparent {
+  padding-left: 30px;
+  background-color: transparent;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  text-align: left;
+  padding-right: 20px;
+
+  .user-center-card__header__info {
+    margin-left: 20px;
+    width: 400px;
+    color: #333;
+    font-weight: bolder;
+  }
+}
+.cell-card {
+  box-sizing: border-box;
+  background-color: #fff;
+  padding: 30px;
+
+  .center {
+    display: flex;
+    justify-content: space-between;
+    color: #666;
+    padding: 0 30px;
+
+    .center-t {
+      margin-top: 30px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .center-text {
+        margin-top: 15px;
+      }
+    }
+  }
+}
+
+.user-center {
+  background-color: #fff;
+  margin: 20px 0px;
+  padding: 20px;
+
+  -nut-grid-item-text-color: #333;
+
+  .box {
+    margin-top: 30px;
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    grid-gap: 20px 100px;
+    box-sizing: border-box;
+    line-height: 1.5;
+
+    .box-mini {
+      display: flex;
+      box-sizing: border-box;
+      flex-direction: column;
+      align-items: center;
+
+      .label {
+        font-size: 25px;
+        margin-top: 10px;
+        color: #333333;
+      }
+
+      image {
+        width: 80px;
+        height: 80px;
+      }
+    }
+  }
+}
+
+.mer-box {
+  background-color: #fff;
+  margin: 20px;
+  width: 100%;
+}
+
+.user-acc {
+  background-image: url('http://p0.meituan.net/csc/a74c44a7af541f01efbcc6fb023e6e09132712.png');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 90%;
+  height: 150px;
+  padding: 0 100px;
+  margin: 50px auto 0 auto;
+
+  .line {
+    width: 1px;
+    height: 50px;
+    background-color: #ffc300;
+    margin: 0 100px;
+  }
+}
+
+.kf-btn {
+  padding: 0 !important;
+  margin: 0 !important;
+  background: transparent;
+  -webkit-tap-highlight-color: transparent;
+  overflow: hidden;
+  font-size: 25px;
+  color: #333333;
+  line-height: 1;
+
+  .IconFont {
+    margin-bottom: 13px;
+  }
+
+  &::after {
+    border: none;
+    background: transparent;
+    line-height: 1;
+  }
+}
\ No newline at end of file
diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index 56d1f2c..bb74280 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -43,7 +43,7 @@
         </view>
       </view>
     </view>
-    <view class="user-acc flex items-center text-center justify-evenly px-10">
+    <view class="user-acc flex items-center text-center justify-between">
       <view>
         <view class="text-[#ffc300] text-[40px] font-bold">{{
           userInfo.data?.pulse || 0
@@ -58,124 +58,120 @@
         <view class="text-[#CFAA32] text-[28px]">积分</view>
       </view>
     </view>
-    <view class="container">
-      <!--我的订单-->
-      <view class="border-box bg-[#fff] p-[20px]">
-        <view class="flex justify-between items-center">
-          <view class="text-[#333333]">我的订单</view>
-          <view
-            class="flex text-[#c9c9c9] items-center"
-            @click="toOrderList(0)">
-            <view class="text-[25px]">查看全部</view>
-            <ArrowRight size="10" />
-          </view>
-        </view>
-        <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="42" />
-            <view class="mt-[15px] text-[25px] text-[#333333]">待付款</view>
-          </view>
-          <view
-            class="mt-[30px] flex flex-col items-center"
-            @click="toOrderList(2)">
-            <IconFont
-              name="http://p0.meituan.net/csc/5306d094d7b4b61848dd21c86b693a9515523.png"
-              size="42" />
-            <view class="mt-[15px] text-[25px] text-[#333333]">待使用</view>
-          </view>
-          <view
-            class="mt-[30px] flex flex-col items-center"
-            @click="toOrderList(3)">
-            <IconFont
-              name="http://p0.meituan.net/csc/32ea9bbf51e3bbb0cbd75bc0fea97ca815779.png"
-              size="42" />
-            <view class="mt-[15px] text-[25px] text-[#333333]">已使用</view>
-          </view>
-          <view
-            class="mt-[30px] flex flex-col items-center"
-            @click="toOrderList(4)">
-            <IconFont
-              name="http://p0.meituan.net/csc/2e0dee89e9a3e3f2e7bf65db355fa11c11630.png"
-              size="42" />
-            <view class="mt-[15px] text-[25px] text-[#333333]">已失效</view>
-          </view>
+    <!--我的订单-->
+    <view class="border-box bg-[#fff] p-[20px]">
+      <view class="flex justify-between items-center mt-2">
+        <view class="text-[#333333] text-[32px]">我的订单</view>
+        <view class="flex text-[#c9c9c9] items-center" @click="toOrderList(0)">
+          <view class="text-[26px]">查看全部</view>
+          <ArrowRight size="12" />
         </view>
       </view>
+      <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="42" />
+          <view class="mt-[15px] text-[25px] text-[#333333]">待付款</view>
+        </view>
+        <view
+          class="mt-[30px] flex flex-col items-center"
+          @click="toOrderList(2)">
+          <IconFont
+            name="http://p0.meituan.net/csc/5306d094d7b4b61848dd21c86b693a9515523.png"
+            size="42" />
+          <view class="mt-[15px] text-[25px] text-[#333333]">待使用</view>
+        </view>
+        <view
+          class="mt-[30px] flex flex-col items-center"
+          @click="toOrderList(3)">
+          <IconFont
+            name="http://p0.meituan.net/csc/32ea9bbf51e3bbb0cbd75bc0fea97ca815779.png"
+            size="42" />
+          <view class="mt-[15px] text-[25px] text-[#333333]">已使用</view>
+        </view>
+        <view
+          class="mt-[30px] flex flex-col items-center"
+          @click="toOrderList(4)">
+          <IconFont
+            name="http://p0.meituan.net/csc/2e0dee89e9a3e3f2e7bf65db355fa11c11630.png"
+            size="42" />
+          <view class="mt-[15px] text-[25px] text-[#333333]">已失效</view>
+        </view>
+      </view>
+    </view>
 
-      <!--  我的服务  -->
-      <view class="user-center" v-if="isLogin">
-        <view class="text-[#333333]">我的服务</view>
-        <view class="box">
-          <view v-for="(item, idx) in userMenuList" :key="idx">
-            <view
-              v-if="item.type !== 333"
-              class="box-mini"
-              @click="toPage(item.url)">
-              <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="42" :name="item.icon"></IconFont>
-              <view class="label">{{ item.label }}</view>
-            </button>
+    <!--  我的服务  -->
+    <view class="user-center" v-if="isLogin">
+      <view class="text-[#333333] text-[32px] mt-2">我的服务</view>
+      <view class="box">
+        <view v-for="(item, idx) in userMenuList" :key="idx">
+          <view
+            v-if="item.type !== 333"
+            class="box-mini"
+            @click="toPage(item.url)">
+            <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="42" :name="item.icon"></IconFont>
+            <view class="label">{{ item.label }}</view>
+          </button>
         </view>
       </view>
+    </view>
 
-      <!--  商家管理  -->
-      <view
-        class="user-center"
-        v-if="userInfo.data?.bid && userInfo.store_status === 1">
-        <view class="text-[#333333]">商家服务</view>
-        <view class="box">
-          <view
-            v-if="userInfo.data.permission.dd"
-            class="box-mini"
-            @click="toPage('/pages/admin/add_order/index')">
-            <IconFont
-              size="42"
-              name="http://p0.meituan.net/csc/72a389ac6a441061fd534b96644c431b7839.png"></IconFont>
-            <view class="label">后结点单</view>
-          </view>
-          <view
-            v-if="userInfo.data.permission.hx"
-            class="box-mini"
-            @click="toPage('/pages/admin/verify/index')">
-            <IconFont
-              size="42"
-              name="http://p1.meituan.net/csc/c236a8b7a73178da25218e1fb59a96f06610.png"></IconFont>
-            <view class="label">订单核销</view>
-          </view>
-          <view
-            v-if="userInfo.data.permission.tj"
-            class="box-mini"
-            @click="toPage('/pages/admin/order_manage/index')">
-            <IconFont
-              size="42"
-              name="http://p0.meituan.net/csc/bd9aca457a109b4d69a692a9109a73ed9045.png"></IconFont>
-            <view class="label">订单统计</view>
-          </view>
-          <view
-            v-if="userInfo.data.permission.tx"
-            class="box-mini"
-            @click="toPage('/pages/admin/withdrawal/index')">
-            <IconFont
-              size="42"
-              name="http://p0.meituan.net/csc/f85d7dc1bf9eda8977e9089b260a586b7440.png"></IconFont>
-            <view class="label">收益提现</view>
-          </view>
+    <!--  商家管理  -->
+    <view
+      class="user-center"
+      v-if="userInfo.data?.bid && userInfo.store_status === 1">
+      <view class="text-[#333333] text-[32px] mt-2">商家服务</view>
+      <view class="box">
+        <view
+          v-if="userInfo.data.permission.dd"
+          class="box-mini"
+          @click="toPage('/pages/admin/add_order/index')">
+          <IconFont
+            size="42"
+            name="http://p0.meituan.net/csc/72a389ac6a441061fd534b96644c431b7839.png"></IconFont>
+          <view class="label">后结点单</view>
+        </view>
+        <view
+          v-if="userInfo.data.permission.hx"
+          class="box-mini"
+          @click="toPage('/pages/admin/verify/index')">
+          <IconFont
+            size="42"
+            name="http://p1.meituan.net/csc/c236a8b7a73178da25218e1fb59a96f06610.png"></IconFont>
+          <view class="label">订单核销</view>
+        </view>
+        <view
+          v-if="userInfo.data.permission.tj"
+          class="box-mini"
+          @click="toPage('/pages/admin/order_manage/index')">
+          <IconFont
+            size="42"
+            name="http://p0.meituan.net/csc/bd9aca457a109b4d69a692a9109a73ed9045.png"></IconFont>
+          <view class="label">订单统计</view>
+        </view>
+        <view
+          v-if="userInfo.data.permission.tx"
+          class="box-mini"
+          @click="toPage('/pages/admin/withdrawal/index')">
+          <IconFont
+            size="42"
+            name="http://p0.meituan.net/csc/f85d7dc1bf9eda8977e9089b260a586b7440.png"></IconFont>
+          <view class="label">收益提现</view>
         </view>
       </view>
+    </view>
 
-      <!--    版权    -->
-      <view class="text-[#999999] mt-5 text-[20px] text-center">
-        <view>鑫瓴科技版权所有</view>
-        <view>v4.0.0</view>
-      </view>
+    <!--    版权    -->
+    <view class="text-[#999999] mt-5 text-[20px] text-center">
+      <view>鑫瓴科技版权所有</view>
+      <view>v4.0.0</view>
     </view>
     <!-- 登录 -->
     <Auth
@@ -309,7 +305,7 @@ const userMenuList = ref([
   {
     label: '设置',
     url: '/pages/users/setting/index',
-    icon: 'http://p0.meituan.net/csc/333f2ec6a76c1fb2e442d277f8b99d5e2853.png',
+    icon: 'http://p0.meituan.net/csc/1d8e6b328d384ff042c282976b82feec6005.png',
   },
 ]);
 
@@ -351,150 +347,5 @@ const scanCode = () => {
 </script>
 
 <style lang="scss">
-.appUser {
-  box-sizing: border-box;
-  background-color: #f8f8f8;
-  height: 100%;
-  background-image: url('http://p0.meituan.net/csc/f44bb11463e3c538c307d7ce4b303bec33520.png');
-  background-size: 100% 500px;
-  background-repeat: no-repeat;
-  position: relative;
-  padding-top: 180px;
-  color: var(--nut-grid-item-text-color, var(--nut-title-color2, #666666));
-}
-
-.user-center-card__header__avatar {
-  img {
-    border-radius: 50%;
-  }
-}
-
-.user-center-card__header__info__phone {
-  color: #737373;
-  font-size: 25px;
-}
-
-.user-center-card__header__transparent {
-  padding-left: 30px;
-  background-color: transparent;
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  text-align: left;
-  padding-right: 20px;
-
-  .user-center-card__header__info {
-    margin-left: 20px;
-    width: 400px;
-    color: #333;
-    font-weight: bolder;
-  }
-}
-
-.container {
-  position: absolute;
-  top: 500px;
-}
-
-.cell-card {
-  box-sizing: border-box;
-  background-color: #fff;
-  padding: 30px;
-
-  .center {
-    display: flex;
-    justify-content: space-between;
-    color: #666;
-    padding: 0 30px;
-
-    .center-t {
-      margin-top: 30px;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-
-      .center-text {
-        margin-top: 15px;
-      }
-    }
-  }
-}
-
-.user-center {
-  background-color: #fff;
-  margin: 20px 0px;
-  padding: 20px;
-
-  -nut-grid-item-text-color: #333;
-
-  .box {
-    margin-top: 30px;
-    display: grid;
-    grid-template-columns: repeat(4, 1fr);
-    grid-gap: 20px 100px;
-    box-sizing: border-box;
-    line-height: 1.5;
-
-    .box-mini {
-      display: flex;
-      box-sizing: border-box;
-      flex-direction: column;
-      align-items: center;
-
-      .label {
-        font-size: 25px;
-        margin-top: 10px;
-        color: #333333;
-      }
-
-      image {
-        width: 80px;
-        height: 80px;
-      }
-    }
-  }
-}
-
-.mer-box {
-  background-color: #fff;
-  margin: 20px;
-  width: 100%;
-}
-
-.user-acc {
-  background-image: url('http://p0.meituan.net/csc/a74c44a7af541f01efbcc6fb023e6e09132712.png');
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  width: 95%;
-  height: 150px;
-  margin: 60px auto;
-
-  .line {
-    width: 1px;
-    height: 50px;
-    background-color: #ffc300;
-    margin: 0 100px;
-  }
-}
-
-.kf-btn {
-  padding: 0 !important;
-  margin: 0 !important;
-  background: transparent;
-  -webkit-tap-highlight-color: transparent;
-  overflow: hidden;
-  font-size: 25px;
-  color: #333333;
-  line-height: 1;
-
-  .IconFont {
-    margin-bottom: 13px;
-  }
-
-  &::after {
-    border: none;
-    background: transparent;
-    line-height: 1;
-  }
-}
+@import './index.scss';
 </style>
diff --git a/src/pages/users/account/index.vue b/src/pages/users/account/index.vue
index c505198..f15488e 100644
--- a/src/pages/users/account/index.vue
+++ b/src/pages/users/account/index.vue
@@ -20,14 +20,14 @@ const tabsList = ref([
     title: '豆子明细',
     value: 2,
   },
-  {
-    title: '活动赠送',
-    value: 4,
-  },
   {
     title: '聚合积分',
     value: 5,
   },
+  {
+    title: '活动赠送',
+    value: 4,
+  },
 ]);
 
 const computerType = computed(() => {
@@ -133,7 +133,7 @@ const closePicker = () => {
 </script>
 
 <template>
-  <view>
+  <view class="overflow-scroll">
     <view class="tabs-box">
       <view
         class="item"
@@ -170,28 +170,32 @@ const closePicker = () => {
     <view v-if="data.length > 0">
       <view v-if="tabValue === 1">
         <view class="card-list" v-for="(item, index) in data" :key="index">
-          <view class="left">
-            <view>订单号: {{ item.oid }}</view>
-            <text class="jf">{{
+          <view>
+            <view class="text-[28px]">订单号: {{ item.oid }}</view>
+            <view class="text-[#484848] text-[26px] mt-[18px]">{{
               dayjs(item.add_time).format('YYYY/MM/DD mm:ss')
-            }}</text>
+            }}</view>
           </view>
-          <view class="right">
+          <view class="flex-1 text-right mt-[18px]">
             <view v-if="tabValue === 1" style="color: red"
               >-
               <text>{{ item.number }}</text>
             </view>
-            <text class="jf">积分余额: {{ item.residue || 0 }}</text>
+            <text class="text-[#484848]"
+              >积分余额: {{ item.residue || 0 }}</text
+            >
           </view>
         </view>
       </view>
       <view v-if="tabValue === 3 || tabValue === 5">
         <view class="card-list" v-for="(item, index) in data" :key="index">
-          <view class="left">
-            <view>订单：{{ item.oid }}</view>
-            <view>时间：{{ item.add_time.slice(0, 10) }}</view>
+          <view>
+            <view class="text-[28px]">订单：{{ item.oid }}</view>
+            <view class="text-[#484848] text-[26px] mt-[18px]"
+              >时间：{{ item.add_time.slice(0, 10) }}</view
+            >
           </view>
-          <view class="right">
+          <view class="flex-1 text-right mt-[18px]">
             <view v-if="tabValue === 5" style="color: red"
               >-
               <text>{{ item.number }}积分</text>
@@ -206,11 +210,13 @@ const closePicker = () => {
       </view>
       <view v-else-if="tabValue === 2">
         <view class="card-list" v-for="(item, index) in data" :key="index">
-          <view class="left">
-            <view class="text">订单：{{ item.oid }}</view>
-            <view>时间：{{ item.add_time.slice(0, 10) }}</view>
+          <view>
+            <view class="text-[28px]">订单：{{ item.oid }}</view>
+            <view class="text-[#484848] text-[26px] mt-[18px]"
+              >时间：{{ item.add_time.slice(0, 10) }}</view
+            >
           </view>
-          <view class="right">
+          <view class="flex-1 text-right mt-[18px]">
             <view style="color: green"
               >+
               <text>{{ item.number }}</text>
@@ -221,11 +227,13 @@ const closePicker = () => {
       </view>
       <view v-else-if="tabValue === 4">
         <view class="card-list" v-for="(item, index) in data" :key="index">
-          <view class="left">
-            <view class="text">类型：{{ computerType(item.type) }}</view>
-            <view>时间：{{ item.add_time.slice(0, 10) }}</view>
+          <view>
+            <view class="text-[28px]">类型：{{ computerType(item.type) }}</view>
+            <view class="text-[#484848] text-[26px] mt-[18px]"
+              >时间：{{ item.add_time.slice(0, 10) }}</view
+            >
           </view>
-          <view class="right">
+          <view class="flex-1 text-right mt-[18px]">
             <view style="color: green"
               >+
               <text>{{ item.number }}</text>
@@ -257,19 +265,24 @@ const closePicker = () => {
   align-items: center;
   background-color: #fff;
   text-align: center;
-  flex-wrap: wrap;
   padding: 15px;
-  justify-content: space-evenly;
+  justify-content: space-between;
+  overflow-x: scroll;
 
   .item {
-    padding: 10px 20px;
-    font-size: 23px;
+    width: 144px;
+    min-width: 144px;
+    height: 60px;
+    min-height: 60px;
+    font-size: 26px;
     border-radius: 10px;
+    text-align: center;
+    line-height: 60px;
+    margin-left: 25px;
   }
 }
 
 .card-list {
-  // margin: 10px 20px;
   background-color: #fff;
   display: flex;
   border-radius: 10px;
@@ -277,27 +290,8 @@ const closePicker = () => {
   justify-content: space-between;
   align-items: center;
   font-size: 25px;
+  margin-bottom: 25px;
 
-  .jf {
-    color: #484848;
-  }
 
-  .left {
-    .text {
-      text-align: left;
-      font-weight: bolder;
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-      -webkit-line-clamp: 1;
-      overflow: hidden;
-      word-break: break-word;
-      color: #484848;
-    }
-  }
-
-  .right {
-    flex: 1;
-    text-align: right;
-  }
 }
 </style>
diff --git a/src/pages/users/order_list/index.vue b/src/pages/users/order_list/index.vue
index 7b21d37..052e63b 100644
--- a/src/pages/users/order_list/index.vue
+++ b/src/pages/users/order_list/index.vue
@@ -228,7 +228,7 @@ const getTj = async () => {
         :key="index"
         @click="toDetail(item)">
         <view class="top">
-          <view class="text-[#9C9C9C] text-[25px]">订单号：{{ item.oid }}</view>
+          <view class="text-[#9C9C9C] text-[28px]">订单号：{{ item.oid }}</view>
           <view
             :style="{
               color:
@@ -272,8 +272,10 @@ const getTj = async () => {
           class="flex justify-between items-center mt-2 mb-2 text-[25px]"
           v-if="item.status !== 0"
           style="text-align: right">
-          <text class="text-[#9C9C9C]">共{{ item.count }}件商品</text>
-          <text
+          <text class="text-[#9C9C9C] text-[28px]"
+            >共{{ item.count }}件商品</text
+          >
+          <text class="text-[26px]"
             >{{ item.status !== 0 ? '实' : '应' }}付款{{
               item.pay_type === 1 ? '(元): ' : '(积分): '
             }}{{ item.pay_type === 1 ? item.price : item.exchange }}</text
@@ -352,9 +354,8 @@ page {
   text-align: center;
 
   .text {
-    // margin: 10px 20px;
     align-items: center;
-    font-size: 25px;
+    font-size: 30px;
   }
 
   .line {
@@ -373,7 +374,7 @@ page {
 .order-card {
   width: 95%;
   box-sizing: border-box;
-  margin: 15px auto;
+  margin: 20px auto;
   background-color: #fff;
   border-radius: 10px;
   padding: 20px;
@@ -382,7 +383,7 @@ page {
     width: 100%;
     height: 1px;
     background-color: #f5f5f5;
-    margin: 10px;
+    margin: 20px auto;
   }
 
   .top {
@@ -398,17 +399,15 @@ page {
   }
 
   .center {
-    // margin-bottom: 10px;
     .top {
       display: flex;
-      // justify-content: space-between;
       align-items: flex-start;
 
       image {
         width: 150px;
         height: 150px;
         border-radius: 15px;
-        margin-right: 10px;
+        margin-right: 20px;
       }
 
       .title {
diff --git a/src/static/tabbar/1-0.png b/src/static/tabbar/1-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..bab861395a828f1be949f53d2760f6761a5e25de
GIT binary patch
literal 1002
zcmeAS@N?(olHy`uVBq!ia0vp^1t8491|*L?_~H$u7>k44ofy`glX(f`uoOFahHwBu
z4M$1`0|WCEPZ!6KiaBrR8u~qU5NVq)99F;>Ri(vs*}>IOkh60h_YG0;2T~#1cCbyE
zqfpG_(%RDEaxm*-SYO#*x$4P3&hDxIR4?0P)Bp2N|J);==a~9l=4eb6t7b^C))0{4
zVrgeOxX_`1IA*&3H-=@$EY+2iN@Ke_Jmx)DQVJ4r-C~$IX=zDtaO`#M!dem6iE~b<
zuvk4`vhH>0uVWsbDt|<*rdi$3cDXboEK%5E+Af>(OEtQ#-v8;~ue{{I!Ye;paz071
zEMVbVy3RMI`s&ViuU!pX4{^wN1<ZRM6na%<>jjlr;uh0pty;wv{5<(hgM{~HQ6KI(
zMy0cJm=$}~ShJR%V=t0A%gHlwm+!V*)81wGPE1dg{K~a)?S1u&uV&W^bC#U*jGVT2
zf46Dt!X<`POv%g7v3p4^R=tq)swToOc?wI^zxFSQmc5R`JKnk{ift(S!0NqVtL%M|
z?934V1g@2z6CW-J@m<g=d*z6e)K#GuliTO*vOAV0dDg!_gyq+hr4x23CcW9-b>Q;l
z%lqs63`^~5GUxna{xR)j{+qYfOk3IVCzhRh^X~osdxqQfUX`aUw@Kx@csF07@owWg
zuTQ%Us0Cy%SR${N$4E*<K-4bM{}40%*<0Uz^XD(Ete?LoZQFkR&E4E5`})*YOLA#6
zo;}@NbN9{*k@|`W^54H3SzBIQxt`^U$gkHQ1GoM=e>?i>FDVDkDgFFcKYd=U4d%?5
zJAd`H^L_oHud^9S`R2@>d-C4hxi$8-o}Yhd6%}l#y?EaLBp-ijS*7OZ*RS8cW@YnQ
z&~c(><Ak3{g4Ggf4YQn1?hjC~5aHlsZE|jW;G<U%E?#o1i8Dm$ic@%L<L+Ha=2wC~
zpJZ)|y3^0rb3pIh&bgB<zU`Q=8Mw3KrCjd9vSVEP@_eOMsBFlWx+~gQ8#~LS`soVO
z-LGG_&Mi8v8{e&aBCT9^U)!^{f-{}Omv3yJqBGt5>f6;^GFdtQ)K_%M?6%;(sI2F4
z{>?&n?j;^4f?YQ(dp_GnOLXD|+rVaf^F>o<Ogb||JpH2l-e#MvQ5NOy;vU<Y@4Gbs
g9gE~{g3Lc`4`npW-1=J0f%%oe)78&qol`;+0QHEmwEzGB

literal 0
HcmV?d00001

diff --git a/src/static/tabbar/1-01.png b/src/static/tabbar/1-01.png
deleted file mode 100644
index 3c9ac3924000e4b399c1488a263a1d5302e743dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2329
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

diff --git a/src/static/tabbar/1-02.png b/src/static/tabbar/1-02.png
deleted file mode 100644
index f05682b6dc657817dcf710255734b6dc70b60a14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3289
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
X5v+egK>PPI00000NkvXXu0mjfFg97_

diff --git a/src/static/tabbar/1-1.png b/src/static/tabbar/1-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f2b0264b210d19920cfd4c2f743d9635578f755
GIT binary patch
literal 919
zcmeAS@N?(olHy`uVBq!ia0vp^1t8491|*L?_~H$u7>k44ofy`glX(f`uoOFahHwBu
z4M$1`0|T?8r;B4q#hkZuZT++jMcm$>nb6+S(&Ey3gJm-#m)8v!rHhN+G}$FFdb;<!
zxHoDnkXi8}^Cm-}ky&Vi`lI8@AGiLk+;_Q2PnqwyMg6=(QQ55rf{yKD*d!;y!N=O<
z-1s0s!GbvEX2IV~HOaHwTwHFQba8R%YGxJ`yeYwx6gx@F)h|D5R{!x!eaFwO4{vrX
zQ`#($G0W}N$tR2V%|GF(@<-@baOvrYntDE=MD9PirFs{#TXYJhzKU6Jog;L?`d2Xu
z*EoU~oCnb}Y8r1{)m^+Md*!cM&DT~p&c{q$!rHdtUA%(MN>8qyz`5O5vVHs#-n@!g
z5|tb@d&bRz87`%#JxZG=yEHD#Ofi!=wy)>E+ES^-;xmd$^@3IzMm1(!-PsYFJcTLv
z?us=|Z={;VW?VYV%$syYV$Fd$tBM5|yM1LUUVqMYg;Xf_8>dn|r>iT%5~e?`UAiXw
zWv^S+XVbQzd+I==*ZtTXpjl8=@uFJAX75Fhr<{fFS+o9aRZNzX4}JD&?#;#x8cbXD
zL}b^t2i{{Xd;2jiXGaT3;R}h2i}nwGMt9wf)$H$Ea^vPlv&(+Vlk)P9?%Pu_Tarto
z@#w#Oe|GM<B3W0ZwRy9#p})V?=cx@*POB#iU;VkaoBQfdDF@CeZ*#AHeEW6ls~X+~
zEVF)BU;X**XJqL<wt)Z4XAd`@Ie&hsjoq}QeE%nJbN?=kj!ue?KYHhmM|J7ee|rv8
z{4Wu*pZO&1^Sg7ueO9PWscC0AxX__MLqLX$<@oLcA^dJ<Ma6(Ahs`NF^^@L)SKn*<
z&omv4y;5_S>0sc^BL&KzW!D;C4&i!Y^viteqsDSArpSltsj;i)MXacb(|FYQY~RHS
z)<@c_X3toszjW4dA3ctuw6g17Je9lWCA7~gf68<50{eXS{rN{8S)7`aa%_)d*q7+{
w3i@j`-)vdTt@8Td@=FI`&Ove+KIT2f%`zE6JDE?L0W%kar>mdKI;Vst07xX0umAu6

literal 0
HcmV?d00001

diff --git a/src/static/tabbar/2-0.png b/src/static/tabbar/2-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..1eaa9eeb35ea0648b4cb2c6942d59abc212f30e5
GIT binary patch
literal 1635
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

literal 0
HcmV?d00001

diff --git a/src/static/tabbar/2-01.png b/src/static/tabbar/2-01.png
deleted file mode 100644
index 3a4a367faa70517e6673b2e15f4714ad67426af0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 813
zcmV+|1JeA7P)<h;3K|Lk000e1NJLTq001-q001-y1^@s6#dsU*00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZr*GWV{RA_<iSxcG}Aq)=cDX5K}f$WF5iJoN2qj-{{
z_w*ff(|wG%5HwBk3RUCyee$omsvyY^<Utx>Vq#)qVq#*V1T{Jl5mx{JB6<P<dy+j4
z06;1A)qC$o1c(VC;z~p>Bg&)*#8%N9$>0JRr<A%#<djg@ZFjw1pL=C=6H3X9te!xZ
z4Z5sUR~Mn6U<;3;6*~fB%mzYI?|KBMJ2PmX7<}P+{kBO65iLBfk{dH`4157&WUZk|
zh_B3R`AiK`omE17cOc}5!noBKLlVUj#9it+c2z>Xz7xW2T!3yMqD92DW1eGk*4n_X
zpa1~wY~KlKU?ZXzBHC)Cf^G-U-lZa;G#H327NTV+Pu?~1A4U`;z6C@Se_O7s;m{5M
z_>rzw8{YfX7!$`^DEM?Sv9hH0kVumx+d?%7hhz7ol)CgpGoEO#*K5}H><$H^Ex`V`
zdG8$}KD=W!SX$S)nt?eIZ1;D5tCYG#yAaXl{5s1rDLI~70U?g>8Cyf9Ufjux>7i5#
zwW8eV(M^JyAIDUYqD07^VbA~^f5-(2<^nb+U`L2YDQUPqx|`m67j(Lw>N*#`b3tJ@
zsD(4H6D<<0@V(n1b~fMCe|nJfqu$czUxO=sC?2_^eS)4sb-1(hCm-!}6ic5`#9Ttu
zzD*coy7HU^4@WLpRgn@zw8j{cwz!CB3yFCM=}9<chcfkDEP-5Y9_#E_W6X9&w0t1s
zy?4f#_-I=O0qn^L+gpy6Sr!pj>6JS@u7{%BK{5dFD~Itbc26UuRQ3Sm3Are|CN$nS
z<MWZmW0?0_Zx5*em%ezPzF3y!6NGTMEQ``w!|ita9={{vs<pOsau@Y}zkkzOM;TUY
zZI@;Fp|$>)>IZ<&LGKs-4WQ%t(88H5;j{(ZK=$(3b7Rfom3!N3?Qfcz?rLwF#dt3G
ruhn>I?*ia$nw=996B82?|1Ew3o4Ly#e(ru600000NkvXXu0mjfQIc=u

diff --git a/src/static/tabbar/2-02.png b/src/static/tabbar/2-1.png
similarity index 100%
rename from src/static/tabbar/2-02.png
rename to src/static/tabbar/2-1.png
diff --git a/src/static/tabbar/3-0.png b/src/static/tabbar/3-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..7847c29c17d94320c34bf52af48d7e5a63bab6a5
GIT binary patch
literal 1075
zcmeAS@N?(olHy`uVBq!ia0vp^1t8491|*L?_~H$u7>k44ofy`glX(f`uoOFahHwBu
z4M$1`0|WD2PZ!6KiaBrRIu@;R5NNYLRz5#sGV@VhJxlLtn;trC{9>o}%PhZ!#ocA*
z%V+a{?q3z+!=>?L@$Q$7?bAR1tPx{6eW;54go%cL3>Ql~)4_!f1*9;iU9%RLd^fNB
z=f`^M=SM8nl|H>L)!Xyr!^T5*^VDabO}nz`oaM?@TGA6gFqzLjtNKW8;VLa4|DfDU
zChZNGQkk>T3M8N3iQO3=A8%OhEgRAJ{{8##|DRu8-2d&zE(xJ`b0)tno1Nz_%&ci3
zQkxw7XiDjGju>gfP=}10%QEM!T3pN!lrTMgk$Q<})%tnoL^T@!YRsJUYuoL&p>thW
zq7-g@3uaK=aQ;f#9{If;OzDPG%)T9HeRX9@^S$`();#6?JA0nY*ebYB-`VE1?Z2cG
zLCZQ17%tZEi1;?~mFb6T9UMl}X1dri<?}Z7dO9zZE6_ThXIvr_)w6mP7th^qFTW={
zmpnZ#b$HIEv;R*1I8oi%n#ILy`lxv4tm-z)EsD!(6*k#SeEs))oI=rQfh0b4g%Fmq
z>HVc2lJX`CR<PgCFU`N>xAb<8z48SsuCr~I=GjJU<d1k`{psK2f~Xa)3HHC%oWBzh
zv7g_#QHAfq_Q}s0O0^T!E?9kCq7>b@rZF>ti?v<cP;kSaf+?OXQOoDf2@sr-{dae3
zn#e4UGrXsTCxIm2utqWqPndh)Qq}^sHI0G^yk{6z#|6YHTuzUf#I3XSU#9EAT?b+|
zS{X(%D+l&CEW5B{1DhJq{GCBQT)M3}N*lc2y}bPBuc~N7*5A(=E(=#35SjC>`s&xV
z6M9U+#cQ%HuWhZ_{`N(w-|xSvdy`|;?^w$&$X?LDX#O@?)sMS#pGI7t{x!*c;nCi^
zOXBl9W0~WxXaD@Ee(rzVp1miNw*K0BCv*Sw%MS}8m+h|e+9WJ7`>8!+Y^S}_ewKS(
zo9yS$4_~xADUdncF!-{_FCo{q;KxZ@CtdIFfAMKefbfh@Z(_=V677Afwj3#4UfJfi
z@Rsd@={sW9KLy%bW6{y!;dfEY$#;R;=_BIm{S$sk@4is`K;~rGqWM8>7q?U&Okwht
zXTR#?o3QeLTf)keNM>)p`8^Is9!8A|)5WJcba`gB2Xr5}vn-M?(Qt0bCdul2+bM!y
z6@$O;n3@{oe|S#Gsi$|+me-5)-h4CpUhfC%_(d*je{K#{vz4!6NY2Z!54iN?p#09b
ziBVs6Pw@Ys@;_0TpO3Z4x$!}Of`teNG0e~6H(36vYz@1X49xfpp00i_>zopr03BK9
Aj{pDw

literal 0
HcmV?d00001

diff --git a/src/static/tabbar/3-01.png b/src/static/tabbar/3-01.png
deleted file mode 100644
index c558cfcedaa4c2dd542c85cf4e091dbdaebea2aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZq$4Nv%RA_<incI=WAPhy7ophw0a7|DXs)_xQ2WPxq
zgpeFOoS!^kA})Fm;a4f8z=Qd@djZxgfwQv&&dw4zJ4@i~JYL}2!^pO6002Nl000m|
zIJ{b7Dv*eFaWyHW{k^%!VnoilAYwtp5@Rem=Y1^3co?(9OkfD%Qb4@{wfNDP2;{|w
z5QfatFeC@Lc$|Iy9BZA2h$EH;uTuIO-fi111!zG;Ktxp`>h@qtX&3jo+kbt3#?@RR
z0wUUlcF`N#Tp-TiD%nyYuYPAlj&}W%;d9LT3>%S$CI`JFcUr<vljmjvV~kC6|C@)1
zDuG=gDk&nP=oP8zCOiacZKyoxiMt2A!jtW|3B1F58oC8~d$5;jt}Je;qF!jc`1K)r
zW?RD7S5YlfR8iLu)f&{;GY?Uz0U|nF5w?zvvJW8aCVC3YS?`!qf|Qa=B$!_Oa!*(b
zsyC^%rP73``PF^xIlf;BA-LtSd58jxx!Pdw^Cq=2MHSUxT17|FyQyLi-t9f<CW{1e
z9!Srx5wK0^28)VJEzmPu>j$S&f#PQqe5QFLIX7!m4_~~zsL6Ykz!{jLqt~zm&dw4z
fJ4@i~JYL{0!T}e*68Zp300000NkvXXu0mjffbQtp

diff --git a/src/static/tabbar/3-02.png b/src/static/tabbar/3-02.png
deleted file mode 100644
index 523faa4cd09a9b2c09431e62ee3b87e594a2e2b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 899
zcmV-}1AP36P)<h;3K|Lk000e1NJLTq002Y)002k`1^@s6PtjA!00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZsElET{RCt{2oKcdZFcd{^(sWI`8}g4#Tna1bC8$eq
z1-g@F)PH+7bXAXJKAK<*38G_y7*3T{5($LMP2SV;LC^z5l5hYZgv_fZ4j>nV`~d)z
zWj@*O^FGE#e4eaG5?+bGyX-FrSx&awh0{T4coU>Z(*+S?etFMxe2d~mkgw_V1MRNJ
zFMJLm#LUMuid>(dNYe#`;Cj0dVg>-}MHWfIK`A#mshVoJ-hOYKI>a(f^0(b?c1vF$
z)5n=0)dKpVwq1Kc#$!01I@HyHm5>VHw!1so?{h)OvhBF{#+gIDrc<GAzwLH6pG#kq
zUAn}HLuBG5(eLuL)Crph+)Not`CX4!mbtp=a@t%KcJ(`Ng9!2atf4IPu6^%4mTRY0
zr+IyAmiZ{iDcfaHZxzH8_J&NCNY}cCJd+pzK!lhVX}W0J$12FBjzfhAF>hOctbz=A
z&G;XTg4{bIJQ{6b+w72g=Me+K*>{--huc0d3erfd0wPq0Sl3CLAjX|TAXtak0!KrT
zXAilT2-YFCz|j;W;2Z=9*dee4j)ov1=O94X4lxE0lOT<qLLz8~m^c$8xE#a~QG<4f
zDS(^{5_k>*1nv+MXMzNngK)iJbclv72=8MMeWFL!(IFbOAi?Dz5-qZh4$(LX5@-&h
zN7m6H8nqw+<{%QTZj27mPzB+A4We(<2s=7Ng93hX5XzX>ez)@D5XT`m$}+sJR*16f
zs(!DlRsC{`a{XSW%u6N2OC`)DC}a4w-PZ1)j5&3R8ezQ%a$K+L_mnZKTPS0-oAmzW
z;oy9nK=sF6*Ez`FN)YK3${4^HNE}0aeuBiY)d9!#y6*1-=LJL(T@>IXjEVAaz;Uzj
z<qR(05TIGP;F3sLPfSPwzTe+{4GF-h!os^CDp8h!#4!NixY+=Jx3xk?3KI4CJBZJ<
zp(`}hul)@w9mdqXLPpwA5Dgme?;u7-hn(QRk089)VLTY4Lo_Hn)YA`y8~~`#n%GB1
z>d<TI{z%Bma|)auT@fm3<v9h+4;=^vy>zuvw>$Kr<txaA5KF!C+gix{%>M@H>j_wc
Z<R8vUG{{q1NRt2n002ovPDHLkV1k{fmQnx!

diff --git a/src/static/tabbar/3-1.png b/src/static/tabbar/3-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5d7261fc6accd7f29eedb3c833ee417771d6fc7
GIT binary patch
literal 986
zcmeAS@N?(olHy`uVBq!ia0vp^1t8491|*L?_~H$u7>k44ofy`glX(f`uoOFahHwBu
z4M$1`0|Rr5r;B4q#hkZuUl*=65OBMma6XsabVAf3t{8672T_+8woLZq`6>KUZN`lo
z8R0dLtc_>d9OE}>kA2$}@un?NqUAu)5<7-XJX|d8Oa~V_6le&@kieW%`--{4^ZvF=
z<#Tyr%YW`I@GA>dRZ?;d^?Vp}%DLy9UVFXvo7-V_ea9pFb>~d}^wm^);s+-CKKGZm
zzdd|D_1@`w)vd~#Si>HqUp}!jGtX{W!Mk;L>htpr`A^G4G``o@53lEbY4}HmqxkWZ
z4~Hx*uWY@RxQbb`K<n4DWk*!c$0`@(9tmQse!o=4_S+p3|Fes;8T=A@Ufis%4{e?2
zzkF%?G!~7<#~P87ejWQPr+lH|-)_hLqZV9(s!p6T!8PkQ*m$pqVBY92z#X=6irM!w
z^Rt+zxtxu-aiMf`e7>%><;hze`*NSwSUE0R>+rJn)7PsiOwZRWQkb}@-()`X?`>zj
z=6T$*yJW+(eA<B`#iP4cWwI!pFE92mw2N+RNd2X}L_)qqeur7x9oA(M3GWP;lqda{
znNcY?naM37WsQH3abu62>>HL%4S|iCCPvrPwOHMb?Fuy#J|P#t?xtX|#z}c{uC!x`
zf#8m*FSsN6uDdC4OPJ1Z65U{vs2RX`dfG`Bg=z=eh$9V$MOHbKg=$=Mj(rezdHK~H
zUs-`>wrYyVaD^Pw`n-bsP8NTLX`Yzj1A|triN2y<C4r(lzJAFxtcz`A6aKk*zJL5_
zHCFFNzlH6)ra8yjfBE@k!_L?rPU)hzdu+Tr7H#-`^ZDHK_xitkUhX@z@AZ}Y&Y=s+
z^h@$)bx-)Pcm9pnOAGwER?WKe#80?8E+BNlHx)Uhcgv3yec4y<dSJ8l-*vn%M6`-@
z1D}*-ok?t7IR5~*$WPnvy_ZuIS}nT22i;bGHgWEg<jvpz6|HW(a&g(-@}4M`WqbH4
z)=O<wxwG4e`-R<vfCW~!W_tKO2wTq_wOGwyx>2p>Ep?+{4GWPKJ!NW(915<mJS*Cp
zt69I6=V+54N8hXiA8jSKb$v^Fu}U+<x^|6h_s7+7y&UQBdAqNie;9CGt+e6fy06>w
z4$P3gW<JGa|67N1+9sM>`6sL^CjH;g%RpjQ_{k(IGCjKS*uyQr{K??y>gTe~DWM4f
Dn(43&

literal 0
HcmV?d00001

diff --git a/src/static/tabbar/4-0.png b/src/static/tabbar/4-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..8454018bea954540ec8ca5fed31acc16dbb3a1e4
GIT binary patch
literal 1288
zcmeAS@N?(olHy`uVBq!ia0vp^1t8491|*L?_~H$u7>k44ofy`glX(f`uoOFahHwBu
z4M$1`kh{s##WAE}&fB@ZMUNbK+(b{@VL!E|c-jWT(=m-Qir&?axp#Jd_VMM|JR>vw
z@`~Qxx7U`t<hy!^7XFOP`r3c!^3$T76BbUJ`h`{EvO(i1L();@w0#YhD_`%bemiIP
zuh>A55E0k!zjl9E@;6}ebg@&r-GL(0QolzTXR%%@we^bX+N5JWQz}rsK(Ej+%5{~H
zg-e{q!R7Aua#qjtjvbq@NMpsSRg&vW<g-}5ozy=4X_d#z!`wD9d~e?W{jnl7Cq(f>
zfyIW2#-?w-+KS}fw)?ZwvT;89wbHYvR<FwXG$VAHYG~+Dw`eV=iw$BYTs;Csu55do
zqj|2s`r~uU=VF@Ep0R}~lrvA)F|z3N4&77Cq&;DGq4)HkcMe|+->Sr*IYIk-acJ8|
z=cajHimXK|jjyZBUY+Cnz+=aY)12SG2Lx-*Ij}FbWlq6L5kZT_6)#V**mYcC+U)wE
zdBHu6kOwTsJoL1RR~u(IaJuYqeBr=pa*SD3AeZ0I*{wn7L}Q8YML7c{henN7=1a|&
z+4nez1gz)wOX#_B%I8mcp#PeKoKNyX@;bl!tyg4JpYS3qDX;NP*|en>1PjcyryseJ
zW~8-&X{Sa^)S}{d&rGC>z6dsQsd)9bdiVJXJug@W^h(G6%9YOhf*;z2ALh)hX!Q18
z^Lkd<ZrN%f2HRg9Q{>mqzjb_qRJf_>&I8;sL3?;IZ}6->t@wG*m5J3R39RP=OOL%x
zO}==+m_t+GrH6HuRjYQ=yRVGfa;>wgJ_k<w<zsK|5*yXrbzonTYN+V1#qX2zHvFG+
zC1&$`Mknu;229U09`$gGE_%Hv%||>xK3*xPkXdoU<aUE^OMVG2U9as@!{cN7l4E68
zcion}rC&c**m(Udd@i$h|Ni@X`ll@0v65r@yrlxY4(~kOCOv-`Rvoa+Dv4?5mCijC
zXL_sc!xC2gmrcC$xyFq5Z(ZfW^UGe|bDpB1Bv5<*?dy_7pX&>sFMFx7%xspbVD|xm
zEwS&fmQ{cKyfgE~>k=iU9_Mhyo2-lcB$KZF{(JR&{k?m;u6tac9lKzfaQyk-e|wJ<
z*zinT<FT3RO4*~=mO?L%yDl*eyjZD_^`*6^(}{Bv*OYZP<P`gy`dt+gbzFHBdkz&V
zF?FU`&Dzx8s2Ihv&P@7SZA+NN$GaT7M?N1aNYd|JdO`B%HNlRmWhq=7|9MUXy>NJB
z;?-ifEM54=+)JseR!nsGvU~EJ;;bX<;^R9zUSw{5xkxZEZnkNwQjcW+rdxS0uOB~t
z^@v<zq`*6mR<R&o!<~Y?4obH7&kG!SYv-Z6HnrbDuQzMbj9XT}0-1KIuDF}WJ~yaV
zS!0ro(!$9%zc1o@%Dv*xztsE9s(Z~f%C^*H1bhA1y3)J0HS3PQ;TQS89;cO=Ui8k`
zJh7N3c$q=%UEiI8;vQcjx@WL>JhBmBvW-*d@|nMFVt<_jXV1svKpQt*M-5KRL+==M
vH}tPG3RKS0$zqlIzu~XL(;1|rKdf$x9{A-f`?v&HnlX5~`njxgN@xNA?T%bg

literal 0
HcmV?d00001

diff --git a/src/static/tabbar/4-01.png b/src/static/tabbar/4-01.png
deleted file mode 100644
index f92dfeadb10ad7686b75b00751488c31c9b5cd41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZq_(?=TRA_<inOkzhAPhy7PIsiNNqd4d!J5=BxrDrI
zbd}-`=gZ0X!9^f+;i9Ta|Cq18Za_3k;MrLM&(0Efc9y`i^Bw(xS}WCBw`)U0h=_=p
zL%)BCD%EPOlyklj^#~E!#6}PzFy~A;=k0eNEsLs&XJ!(Sm}n}Pl#(*DGP9<XUfx?u
zQ4!hhj{qvLl(Jh~i*?G8XZ8XWXwevH=t#%x0k%xooU-|J6nmzfy9i(ctzn}Xu}w1X
zGVc+lTIi=1*rxoMSP|R{qH*>tva*>{AQJcx9ZmCn>4pL(uubzLBE8GZQ;=1Iw^S1m
zWOGy%T&k)1itSPgx;Y9pyzM+9`n65Wd^fN9d+k5;ItufHy$59GU0G2??h;H&3DG1X
z0tsxz^$xu^w?<!-x9@<8^p5c(bM76ZN$M3Yfe{Ttztgo2J{y*Z_qD%WAbJ`_8#UB6
z#&859Di0C4%f{{~dU`uzC#-!hB8o#1j5N3Cy_u;DFVStMAuQN*5u8HcCwNr-j1Ydh
zG(umdxkidN+eK`*8)l_EHfnf?w%HE7my&a)>-D<XCr<=jZlZSpL}Le=?R@Jkm)BLe
z?b6<ZPNMxDkqB4c!VIqowd*6a!_Ye<d%}*ejYncXxxF7Q@UNM6p+~U<o}DG|>@0z2
c=idwb0e;g&w7RPs*8l(j07*qoM6N<$f?;q70{{R3

diff --git a/src/static/tabbar/4-02.png b/src/static/tabbar/4-1.png
similarity index 100%
rename from src/static/tabbar/4-02.png
rename to src/static/tabbar/4-1.png