From 302dfdf2038c2e1d924c581da3b54b446af63919 Mon Sep 17 00:00:00 2001
From: anonymous <anonymous@example.com>
Date: Thu, 16 Jan 2025 14:19:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=89=E5=8D=93=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.config.ts                            | 19 +++++++-------
 src/App.vue                                |  1 -
 src/components/NavBar.vue                  |  1 -
 src/pages-sub/official-community/index.vue |  2 +-
 src/pages-sub/realname/index.vue           |  4 +--
 src/pages-sub/team/index.vue               |  2 +-
 src/pages.json                             | 30 +++++++++-------------
 src/pages/bank/index.vue                   |  8 +-----
 src/pages/edit-password/index.vue          |  2 +-
 src/pages/index/index.vue                  | 25 +++---------------
 src/pages/invest/index.vue                 |  2 +-
 src/pages/login/index.vue                  |  4 +--
 src/pages/register/index.vue               |  4 +--
 src/types/uni-pages.d.ts                   |  6 ++---
 vite.config.ts                             |  8 ++++--
 15 files changed, 46 insertions(+), 72 deletions(-)

diff --git a/pages.config.ts b/pages.config.ts
index afafdbb..f22fa3d 100644
--- a/pages.config.ts
+++ b/pages.config.ts
@@ -26,10 +26,16 @@ export default defineUniPages({
     iconWidth: '20px',
     spacing: '3px',
     list: [
+      // {
+      //   iconPath: 'static/tabbar/home.png',
+      //   selectedIconPath: 'static/tabbar/homeHL.png',
+      //   pagePath: 'pages/index/index',
+      //   text: '首页',
+      // },
       {
-        iconPath: 'static/tabbar/home.png',
-        selectedIconPath: 'static/tabbar/homeHL.png',
-        pagePath: 'pages/index/index',
+        iconPath: 'static/tabbar/bank.png',
+        selectedIconPath: 'static/tabbar/bankHL.png',
+        pagePath: 'pages/bank/index',
         text: '首页',
       },
       {
@@ -38,12 +44,7 @@ export default defineUniPages({
         pagePath: 'pages/invite/index',
         text: '邀请福利',
       },
-      {
-        iconPath: 'static/tabbar/bank.png',
-        selectedIconPath: 'static/tabbar/bankHL.png',
-        pagePath: 'pages/bank/index',
-        text: '银行卡',
-      },
+
       {
         iconPath: 'static/tabbar/house.png',
         selectedIconPath: 'static/tabbar/houseHL.png',
diff --git a/src/App.vue b/src/App.vue
index 714b811..046f047 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,7 +36,6 @@ const userStore = useUserStore()
 /* 覆盖 uniapp 自带rpx效果 */
 html {
   font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-size: 16px !important;
 }
 /* stylelint-disable-next-line selector-type-no-unknown */
 #app {
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 6e82c30..76ad190 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -36,7 +36,6 @@ const handleClickLeft = () => {
 
 <style lang="scss" scoped>
 :deep(.wd-navbar) {
-  --wot-navbar-title-font-size: 32rpx;
   --wot-navbar-color: v-bind('titleColor');
 }
 </style>
diff --git a/src/pages-sub/official-community/index.vue b/src/pages-sub/official-community/index.vue
index 50af3ee..60e93cb 100644
--- a/src/pages-sub/official-community/index.vue
+++ b/src/pages-sub/official-community/index.vue
@@ -38,7 +38,7 @@ import VueQrcode from '@chenfengyuan/vue-qrcode'
 <style scoped>
 .official-community-page {
   min-height: 100vh;
-  padding-bottom: 100rpx;
+  padding-bottom: 50px;
   background-image: url('@/static/images/bg.png');
   background-position: top;
   background-size: cover;
diff --git a/src/pages-sub/realname/index.vue b/src/pages-sub/realname/index.vue
index 0e04911..b1b8e81 100644
--- a/src/pages-sub/realname/index.vue
+++ b/src/pages-sub/realname/index.vue
@@ -188,11 +188,11 @@ onLoad(async () => {
   --wot-cell-wrapper-padding: 0;
   box-sizing: border-box;
   min-height: 100vh;
-  padding-bottom: 200rpx;
+  padding-bottom: 50px;
   // background-repeat: no-repeat;
   // background-size: cover;
   background:
-    url('@/static/images/brand-person.png') right 40rpx bottom / 60% no-repeat,
+    url('@/static/images/brand-person.png') right 20px bottom / 60% no-repeat,
     linear-gradient(180deg, #fff3eb 0%, #ffffff 100%);
 }
 </style>
diff --git a/src/pages-sub/team/index.vue b/src/pages-sub/team/index.vue
index 09a2bca..e48571e 100644
--- a/src/pages-sub/team/index.vue
+++ b/src/pages-sub/team/index.vue
@@ -123,7 +123,7 @@ watch(
 <style lang="scss" scoped>
 .team-page {
   min-height: 100vh;
-  padding-bottom: 100rpx;
+  padding-bottom: 50px;
   background-image: url('@/static/images/bg.png');
   background-position: top;
   background-size: cover;
diff --git a/src/pages.json b/src/pages.json
index 9d0cea1..43b51bc 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -24,9 +24,9 @@
     "spacing": "3px",
     "list": [
       {
-        "iconPath": "static/tabbar/home.png",
-        "selectedIconPath": "static/tabbar/homeHL.png",
-        "pagePath": "pages/index/index",
+        "iconPath": "static/tabbar/bank.png",
+        "selectedIconPath": "static/tabbar/bankHL.png",
+        "pagePath": "pages/bank/index",
         "text": "首页"
       },
       {
@@ -35,12 +35,6 @@
         "pagePath": "pages/invite/index",
         "text": "邀请福利"
       },
-      {
-        "iconPath": "static/tabbar/bank.png",
-        "selectedIconPath": "static/tabbar/bankHL.png",
-        "pagePath": "pages/bank/index",
-        "text": "银行卡"
-      },
       {
         "iconPath": "static/tabbar/house.png",
         "selectedIconPath": "static/tabbar/houseHL.png",
@@ -56,17 +50,9 @@
     ]
   },
   "pages": [
-    {
-      "path": "pages/index/index",
-      "type": "home",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "首页"
-      }
-    },
     {
       "path": "pages/bank/index",
-      "type": "page",
+      "type": "home",
       "style": {
         "navigationBarTitleText": "银行卡",
         "navigationBarBackgroundColor": "#fff",
@@ -82,6 +68,14 @@
       },
       "notNeedLogin": true
     },
+    {
+      "path": "pages/index/index",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "首页"
+      }
+    },
     {
       "path": "pages/invest/index",
       "type": "page",
diff --git a/src/pages/bank/index.vue b/src/pages/bank/index.vue
index 2a04bd1..b3e3763 100644
--- a/src/pages/bank/index.vue
+++ b/src/pages/bank/index.vue
@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5" type="home">
 {
   style: {
     navigationBarTitleText: '银行卡',
@@ -11,12 +11,6 @@
 <template>
   <view class="bank-page min-h-screen pb-100">
     <NavBar title-color="#333" />
-    <view
-      class="mx-auto rounded-tl-20 ml-15 mt-15 rounded-br-20 w-fit px-10 py-2 text-15"
-      style="background: linear-gradient(90deg, #ffdd99 0%, #efb85a 100%)"
-    >
-      我的银行卡片
-    </view>
     <view class="bank-card mx-auto mt-24 relative w-345 h-210">
       <view class="absolute text-19 top-120 left-40 text-white" style="font-family: FARRINGTON-7B">
         {{ userStore.userInfo.banknum.replace(/(\d{4})(?=\d)/g, '$1 ') }}
diff --git a/src/pages/edit-password/index.vue b/src/pages/edit-password/index.vue
index 7d26dae..36aa3aa 100644
--- a/src/pages/edit-password/index.vue
+++ b/src/pages/edit-password/index.vue
@@ -116,7 +116,7 @@ onLoad(() => {
 .login-container {
   box-sizing: border-box;
   min-height: 100vh;
-  padding-bottom: 200rpx;
+  padding-bottom: 50px;
   background-image: url('@/static/images/login-bg.jpg');
   background-repeat: no-repeat;
   background-size: cover;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 76cfe55..d02d4e8 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,5 +1,5 @@
 <!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page；推荐使用json5，更强大，且允许注释 -->
-<route lang="json5" type="home">
+<route lang="json5" type="page">
 {
   style: {
     navigationStyle: 'custom',
@@ -92,28 +92,11 @@
         </view>
       </view>
     </view>
-    <wd-popup :lockScroll="false" v-model="showNotice" custom-style="border-radius:40rpx;">
+    <wd-popup :lockScroll="false" v-model="showNotice" custom-style="border-radius:0.2rem;">
       <view class="px-30 py-30 w-330 h-457 notice-container rounded-20 flex flex-col">
         <view class="text-18 font-bold pb-15 text-center">系统公告</view>
         <view class="flex-1 overflow-y-auto">
-          <view
-            v-for="(item, index) in announcementList"
-            :key="item.id"
-            class="border-b-1 border-b-gray-300 border-b-solid pb-15"
-          >
-            <view class="whitespace-nowrap text-14 font-bold text-gradient text-center">
-              公告{{ ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十'][index] }}
-            </view>
-            <view class="mt-12 text-14 text-#333 flex-1" v-html="item.content"></view>
-          </view>
-          <view
-            v-for="(item, index) in announcementList"
-            :key="item.id"
-            class="border-b-1 border-b-gray-300 border-b-solid py-15"
-          >
-            <view class="whitespace-nowrap text-14 font-bold text-gradient text-center">
-              公告{{ ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十'][index] }}
-            </view>
+          <view v-for="(item, index) in announcementList" :key="item.id" class="mb-15">
             <view class="mt-12 text-14 text-#333 flex-1" v-html="item.content"></view>
           </view>
         </view>
@@ -228,7 +211,7 @@ onLoad(getBanner)
 <style scoped>
 .home-page {
   min-height: 100vh;
-  padding-bottom: 100rpx;
+  padding-bottom: 50px;
   background: linear-gradient(180deg, #fff3da 0%, #f8f8f8 100%);
 }
 .notice-container {
diff --git a/src/pages/invest/index.vue b/src/pages/invest/index.vue
index 52edd31..adca7b1 100644
--- a/src/pages/invest/index.vue
+++ b/src/pages/invest/index.vue
@@ -61,7 +61,7 @@ const handleRecover = async (item: any) => {
     linear-gradient(to right, #e4c198, #e3bd93);
   background-repeat: no-repeat;
   background-position:
-    top -160rpx center,
+    top -80px center,
     top center;
   background-size: 100%;
 }
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index c056011..8efcb71 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -142,9 +142,9 @@ onLoad(() => {
 .login-container {
   box-sizing: border-box;
   min-height: 100vh;
-  padding-bottom: 200rpx;
+  padding-bottom: 50px;
   background:
-    url('@/static/images/brand-person.png') right 40rpx bottom / 60% no-repeat,
+    url('@/static/images/brand-person.png') right 20px bottom / 60% no-repeat,
     url('@/static/images/login-bg.jpg') top center / cover no-repeat;
 }
 </style>
diff --git a/src/pages/register/index.vue b/src/pages/register/index.vue
index fbd4eca..c83a3d6 100644
--- a/src/pages/register/index.vue
+++ b/src/pages/register/index.vue
@@ -153,11 +153,11 @@ onLoad(async (options) => {
 .register-container {
   box-sizing: border-box;
   min-height: 100vh;
-  padding-bottom: 200rpx;
+  padding-bottom: 50px;
   // background-repeat: no-repeat;
   // background-size: cover;
   background:
-    url('@/static/images/brand-person.png') right 40rpx bottom / 60% no-repeat,
+    url('@/static/images/brand-person.png') right 20px bottom / 60% no-repeat,
     url('@/static/images/login-bg.jpg') top center / cover no-repeat;
 }
 </style>
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index d14c49d..d411cfb 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -4,9 +4,9 @@
 // Generated by vite-plugin-uni-pages
 
 interface NavigateToOptions {
-  url: "/pages/index/index" |
-       "/pages/bank/index" |
+  url: "/pages/bank/index" |
        "/pages/edit-password/index" |
+       "/pages/index/index" |
        "/pages/invest/index" |
        "/pages/invite/index" |
        "/pages/login/index" |
@@ -35,7 +35,7 @@ interface NavigateToOptions {
 interface RedirectToOptions extends NavigateToOptions {}
 
 interface SwitchTabOptions {
-  url: "/pages/index/index" | "/pages/invite/index" | "/pages/bank/index" | "/pages/invest/index" | "/pages/my/index"
+  url: "/pages/bank/index" | "/pages/invite/index" | "/pages/invest/index" | "/pages/my/index"
 }
 
 type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;
diff --git a/vite.config.ts b/vite.config.ts
index c9a4551..5fe6bda 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -113,12 +113,16 @@ export default ({ command, mode }) => {
     css: {
       postcss: {
         plugins: [
-          autoprefixer(),
+          autoprefixer({
+            overrideBrowserslist: ['Android >= 4.0', 'iOS >= 8'],
+          }),
           viewport({
+            mobileUnit: 'rem',
             appSelector: '#app',
+            // selectorBlackList: ['wd-'],
             viewportWidth: 375,
             maxDisplayWidth: 600,
-            rootContainingBlockSelectorList: ['van-tabbar', 'van-popup'],
+            // rootContainingBlockSelectorList: ['wd-navbar__title'],
             border: true,
           }),
         ],