refactor: 余额明细修复

env/.env

@@ -1,5 +1,5 @@
 VITE_APP_TITLE = 'unibest'
-VITE_APP_PORT = 9000
+VITE_APP_PORT = 9001
 
 VITE_UNI_APPID = 'H57F2ACE4'
 VITE_WX_APPID = 'wxa2abb91f64032a2b'
@@ -7,8 +7,8 @@ VITE_WX_APPID = 'wxa2abb91f64032a2b'
 # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base
 VITE_APP_PUBLIC_BASE=/
 
-VITE_SERVER_BASEURL = 'https://sapi.foxmail555.cc'
+VITE_SERVER_BASEURL = 'https://api.qmbz.cc'
-VITE_UPLOAD_BASEURL = 'https://sapi.foxmail555.cc/api/common/upload'
+VITE_UPLOAD_BASEURL = 'https://api.qmbz.cc/api/common/upload'
 
 # h5是否需要配置代理
 VITE_APP_PROXY=false

src/App.vue

@@ -36,7 +36,7 @@ const userStore = useUserStore()
 /* 覆盖 uniapp 自带rpx效果 */
 html {
   font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-size: 16px !important;
+  // font-size: 16px !important;
 }
 /* stylelint-disable-next-line selector-type-no-unknown */
 #app {

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>

src/pages-sub/asset-detail/index.vue

@@ -0,0 +1,79 @@
+<route lang="json5">
+{
+  style: {
+    navigationBarTitleText: '资金明细',
+    navigationBarBackgroundColor: '#fff',
+    navigationStyle: 'custom',
+  },
+}
+</route>
+
+<script lang="ts" setup>
+import NavBar from '@/components/NavBar.vue'
+import { getMyAssetAPI } from '@/service'
+import { useUserStore } from '@/store'
+
+const { list: assetList } = useListPageRequest(getMyAssetAPI)
+</script>
+
+<template>
+  <view class="asset-page pt-15 relative">
+    <NavBar />
+    <!-- <view class="flex justify-around">
+      <view
+        v-for="(tabItem, index) in tabList"
+        @click="tabIndex = index"
+        :key="tabItem.value"
+        class="flex items-center bg-#DEEBFF text-#3B81F3 rounded-full justify-center py-4 px-10"
+        :class="{ 'btn-gradient text-white': tabIndex === index }"
+      >
+        <view class="text-14">{{ tabItem.label }}</view>
+      </view>
+    </view> -->
+    <view class="relative z-1 mt-10 main-content pt-30 pb-30 rounded-t-15">
+      <view class="mb-15 px-25">资金明细</view>
+      <template v-if="assetList.length">
+        <view
+          class="flex px-25 py-12 border-b items-center border-#3333331A border-b-solid"
+          v-for="item in assetList"
+          :key="item.id"
+        >
+          <image src="/static/images/page-sub/invite-icon.png" class="w-48 h-48" />
+          <view class="flex flex-col flex-1 ml-15">
+            <view class="text-14 text-#333">{{ item.memo }}</view>
+            <view class="text-12 mt-4 text-#333">{{ item.createtime }}</view>
+          </view>
+
+          <view class="flex flex-col items-end">
+            <view class="text-17 font-bold text-gradient">{{ item.money }}</view>
+          </view>
+        </view>
+      </template>
+      <template v-else>
+        <wd-status-tip image="content" tip="暂无数据" />
+      </template>
+    </view>
+    <!-- <view class="mx-15 text-16 font-bold text-#333">我的资产</view>
+    <view
+      class="mt-15 mx-15 rounded-20 text-#476FFF main-content p-15 rounded-10 shadow-[0_5px_30px_rgba(149,195,255,0.4)]"
+    >
+      <view class="text-14 text-#6784C7">总投资金</view>
+      <view class="text-35 mt-10 font-bold">{{ detailInfo.suminvest }}</view>
+    </view>
+    <view class="text-16 mx-15 mb-15 font-bold text-#333 mt-30">资产记录</view>
+    -->
+  </view>
+</template>
+
+<style scoped>
+.asset-page {
+  background-image: url('@/static/images/assets-bg.jpg');
+  background-repeat: no-repeat;
+  background-position: top center;
+  background-size: 100%;
+}
+.main-content {
+  background-color: #ffffff;
+  /* backdrop-filter: blur(60px); */
+}
+</style>

src/pages-sub/asset/index.vue

@@ -3,11 +3,13 @@
   style: {
     navigationBarTitleText: '资金明细',
     navigationBarBackgroundColor: '#fff',
+    navigationStyle: 'custom',
   },
 }
 </route>
 
 <script lang="ts" setup>
+import NavBar from '@/components/NavBar.vue'
 import { getMyAssetAPI } from '@/service'
 import { useUserStore } from '@/store'
 
@@ -35,26 +37,15 @@ const { list: assetList, onReload } = useListPageRequest(
 
 onLoad((options) => {
   tabIndex.value = Number(options.tabIndex ?? 0)
-  uni.setNavigationBarTitle({
+  onReload({
-    title: tabList.value[tabIndex.value].label,
+    flagdata: unref(tabList)[tabIndex.value].value,
   })
 })
-watch(
-  () => tabIndex.value,
-  (index) => {
-    onReload({
-      type: unref(tabList)[index].value,
-    })
-  },
-  {
-    immediate: true,
-  },
-)
 </script>
 
 <template>
   <view class="asset-page pt-15 relative">
-    <view class="absolute top-130 -left-55 btn-gradient text-white rounded-full w-172 h-172"></view>
+    <NavBar :title="tabList[tabIndex].label" />
     <!-- <view class="flex justify-around">
       <view
         v-for="(tabItem, index) in tabList"
@@ -66,11 +57,11 @@ watch(
         <view class="text-14">{{ tabItem.label }}</view>
       </view>
     </view> -->
-    <view class="p-15">
+    <view class="mt-30 p-15 text-white">
       <view class="text-17">{{ tabList[tabIndex].label }}</view>
       <view class="text-30">￥{{ tabList[tabIndex].money }}</view>
     </view>
-    <view class="relative z-1 main-content pt-40 pb-30 rounded-t-15">
+    <view class="relative z-1 mt-10 main-content pt-30 pb-30 rounded-t-15">
       <view class="mb-15 px-25">【{{ tabList[tabIndex].label }}】明细</view>
       <template v-if="assetList.length">
         <view
@@ -107,11 +98,13 @@ watch(
 
 <style scoped>
 .asset-page {
+  background-image: url('@/static/images/assets-bg.jpg');
   background-repeat: no-repeat;
-  background-position: center;
+  background-position: top center;
-  background-size: 172px 172px;
+  background-size: 100%;
 }
 .main-content {
-  backdrop-filter: blur(60px);
+  background-color: #ffffff;
+  /* backdrop-filter: blur(60px); */
 }
 </style>

src/pages-sub/invest-detail/index.vue

@@ -3,11 +3,13 @@
   style: {
     navigationBarTitleText: '投资记录',
     navigationBarBackgroundColor: '#fff',
+    navigationStyle: 'custom',
   },
 }
 </route>
 
 <script setup lang="ts">
+import NavBar from '@/components/NavBar.vue'
 import { getInvestmentRecordAPI } from '@/service'
 
 const { list: investmentRecordList } = useListPageRequest(getInvestmentRecordAPI)
@@ -16,10 +18,14 @@ function getType(item) {
 }
 </script>
 <template>
-  <view class="min-h-screen pb-100">
+  <view
-    <template v-if="investmentRecordList.length">
+    class="min-h-screen pb-100"
+    style="background: linear-gradient(180deg, #3a90f2 0%, #f7f7f7 100%)"
+  >
+    <NavBar />
+    <view class="mt-15" v-if="investmentRecordList.length">
       <view
-        class="flex px-15 py-8 border-b border-#E5E5E5 border-b-solid"
+        class="flex px-15 py-8 mb-1 bg-#ffffff"
         v-for="item in investmentRecordList"
         :key="item.id"
       >
@@ -40,7 +46,7 @@ function getType(item) {
           </view>
         </view>
       </view>
-    </template>
+    </view>
     <template v-else>
       <wd-status-tip image="content" tip="暂无内容" />
     </template>

src/pages-sub/official-community/index.vue

@@ -49,7 +49,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;

src/pages-sub/realname/index.vue

@@ -143,7 +143,7 @@ const onSubmit = mergeStep(async () => {
     return
   }
 
-  if (!/^\d{17}[\d|x]$/.test(form.value.cardnum)) {
+  if (!/^\d{17}[\d|x]$/i.test(form.value.cardnum)) {
     await showModal('身份证号格式错误')
     return
   }

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;

src/pages.json

@@ -120,7 +120,17 @@
           "type": "page",
           "style": {
             "navigationBarTitleText": "资金明细",
-            "navigationBarBackgroundColor": "#fff"
+            "navigationBarBackgroundColor": "#fff",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "asset-detail/index",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "资金明细",
+            "navigationBarBackgroundColor": "#fff",
+            "navigationStyle": "custom"
           }
         },
         {
@@ -158,7 +168,8 @@
           "type": "page",
           "style": {
             "navigationBarTitleText": "投资记录",
-            "navigationBarBackgroundColor": "#fff"
+            "navigationBarBackgroundColor": "#fff",
+            "navigationStyle": "custom"
           }
         },
         {

src/pages/edit-password/index.vue

@@ -8,7 +8,7 @@
 }
 </route>
 <template>
-  <view class="login-container relative">
+  <view class="login-container pb-50 relative">
     <NavBar />
     <view class="pt-45">
       <view class="mx-15 px-15 shadow-[0_0_10px_rgba(10,68,245,0.1)] rounded-10">
@@ -116,7 +116,6 @@ onLoad(() => {
 .login-container {
   box-sizing: border-box;
   min-height: 100vh;
-  padding-bottom: 200rpx;
   background-image: url('@/static/images/login-bg.png');
   background-repeat: no-repeat;
   background-size: cover;

src/pages/index/index.vue

@@ -8,7 +8,7 @@
 }
 </route>
 <template>
-  <view class="home-page">
+  <view class="home-page pb-50">
     <NavBar />
     <template v-if="userStore.userInfo?.banknum">
       <view class="main-container w-345 h-185 mx-auto rounded-14 px-20 pt-70 text-12">
@@ -36,6 +36,24 @@
       </view>
     </template>
 
+    <view class="flex bg-white py-15 rounded-10 m-15 border-2 border-white border-solid">
+      <view class="flex-1 flex flex-col items-center" @click="handleInvite">
+        <image class="w-30 h-30" src="@/static/images/home/nav-1.png" mode="aspectFill" />
+        <text class="mt-8 text-14 text-#333">社区</text>
+      </view>
+      <view class="flex-1 flex flex-col items-center" @click="handleDownload">
+        <image class="w-30 h-30" src="@/static/images/home/nav-4.png" mode="aspectFill" />
+        <text class="mt-8 text-14 text-#333">下载APP</text>
+      </view>
+      <view class="flex-1 flex flex-col items-center" @click="handleOfficialCommunity">
+        <image class="w-30 h-30" src="@/static/images/home/nav-2.png" mode="aspectFill" />
+        <text class="mt-8 text-14 text-#333">官方群聊</text>
+      </view>
+      <view class="flex-1 flex flex-col items-center" @click="handleOfficialCommunity">
+        <image class="w-30 h-30" src="@/static/images/home/nav-3.png" mode="aspectFill" />
+        <text class="mt-8 text-14 text-#333">在线客服</text>
+      </view>
+    </view>
     <view class="bg-white pt-15 px-15 rounded-10 m-15">
       <view class="flex justify-between items-center">
         <view class="text-14 text-#333">最新时讯</view>
@@ -73,7 +91,7 @@
         </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="py-15 flex-1 overflow-y-auto">
@@ -133,7 +151,7 @@ const handleNewsDetail = (id: number) => {
 }
 
 const handleInvite = () => {
-  uni.navigateTo({
+  uni.switchTab({
     url: '/pages/invite/index',
   })
 }
@@ -179,6 +197,12 @@ watch(
   },
 )
 
+onShow(() => {
+  if (announcementList.value.length) {
+    showNotice.value = true
+  }
+})
+
 const userStore = useUserStore()
 const handleOpenAccount = async () => {
   await getOpenPersonalAccountAPI()
@@ -191,7 +215,6 @@ const handleOpenAccount = async () => {
 <style scoped>
 .home-page {
   min-height: 100vh;
-  padding-bottom: 100rpx;
   background-image: url('@/static/images/home/bg.jpg');
   background-position: top;
   background-size: cover;

src/pages/invest/index.vue

@@ -126,7 +126,7 @@
     <wd-popup
       v-model="showRightConfig.show"
       :title="`${showRightConfig.data?.name}权益`"
-      custom-style="border-radius: 15px"
+      custom-style="border-radius: 0.2rem"
     >
       <view>
         <image

src/pages/login/index.vue

@@ -148,7 +148,7 @@ onLoad(() => {
 .login-container {
   box-sizing: border-box;
   min-height: 100vh;
-  padding-bottom: 200rpx;
+  padding-bottom: 50px;
   background-image: url('@/static/images/login-bg.png');
   background-repeat: no-repeat;
   background-size: cover;

src/pages/my/index.vue

@@ -152,6 +152,12 @@ const handleAsset = (index = 0) => {
   })
 }
 
+const handleAssetDetail = () => {
+  uni.navigateTo({
+    url: '/pages-sub/asset-detail/index',
+  })
+}
+
 const handleBankCard = () => {
   uni.navigateTo({
     url: '/pages-sub/withdrawal-type/index',
@@ -205,7 +211,7 @@ const commonList = [
   {
     title: '资金明细',
     icon: CommonIcon6,
-    handle: () => handleAsset(0),
+    handle: handleAssetDetail,
   },
   {
     title: '申请理赔',

src/pages/register/index.vue

@@ -84,9 +84,14 @@ onLoad(async (options) => {
 
 <template>
   <view class="login-container relative">
-    <NavBar title-color="#333" />
+    <NavBar />
+    <image
+      class="mt-30 w-86 rounded-full mx-auto block h-86"
+      src="@/static/images/login/logo.png"
+      mode="aspectFit"
+    />
     <view class="pt-45">
-      <view class="mx-15 px-15 shadow-[0_0_10px_rgba(10,68,245,0.1)] rounded-10">
+      <view class="mx-15 bg-white px-15 shadow-[0_0_10px_rgba(10,68,245,0.1)] rounded-10">
         <view class="flex items-center py-15">
           <view class="text-gradient">手机号</view>
           <input
@@ -153,8 +158,8 @@ onLoad(async (options) => {
 .login-container {
   box-sizing: border-box;
   min-height: 100vh;
-  padding-bottom: 200rpx;
+  padding-bottom: 50px;
-  background-image: url('@/static/images/login-bg.png');
+  background-image: url('@/static/images/register-bg.jpg');
   background-repeat: no-repeat;
   background-size: cover;
 }

src/service/index.ts

@@ -151,7 +151,7 @@ export const getWithdrawalRecordAPI = (data) =>
 
 // 下载APP
 export const downloadAppAPI = () => {
-  location.href = 'https://r2.maldiveswallet.vip/app/qmbz.apk'
+  location.href = 'https://r2.maldiveswallet.vip/app/qmbz-2.apk'
 }
 
 // 社区我的邀请

src/types/uni-pages.d.ts

@@ -12,6 +12,7 @@ interface NavigateToOptions {
        "/pages/my/index" |
        "/pages/register/index" |
        "/pages-sub/asset/index" |
+       "/pages-sub/asset-detail/index" |
        "/pages-sub/convert/index" |
        "/pages-sub/demo/index" |
        "/pages-sub/hot-news/index" |

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: ['uni-'],
             viewportWidth: 375,
             maxDisplayWidth: 600,
-            rootContainingBlockSelectorList: ['van-tabbar', 'van-popup'],
+            // rootContainingBlockSelectorList: ['wd-navbar__title'],
             border: true,
           }),
         ],