fix: 上线前修改

src/components/Avatar.vue

@@ -23,7 +23,7 @@ defineProps({
       bg-gray-100
       class="h-full w-full"
       mode="aspectFill"
-      :src="src ?? DefaultAavatar"
+      :src="src ? src : DefaultAavatar"
     />
   </div>
 </template>

src/pages-sub/asset/index.vue

@@ -16,7 +16,7 @@ const userStore = useUserStore()
 const tabList = computed(() => {
   return [
     { label: '我的余额', value: 1, money: userStore.userInfo?.money },
-    { label: '救济金余额', value: 2, money: userStore.userInfo?.moneyjiu },
+    { label: '社保金余额', value: 2, money: userStore.userInfo?.moneyjiu },
     { label: '养老金余额', value: 3, money: userStore.userInfo?.moneyold },
     { label: '团队佣金余额', value: 4, money: userStore.userInfo?.moneyyong },
   ]
@@ -35,6 +35,9 @@ const { list: assetList, onReload } = useListPageRequest(
 
 onLoad((options) => {
   tabIndex.value = Number(options.tabIndex ?? 0)
+  uni.setNavigationBarTitle({
+    title: tabList.value[tabIndex.value].label,
+  })
 })
 watch(
   () => tabIndex.value,
@@ -52,7 +55,7 @@ watch(
 <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>
-    <view class="flex justify-around">
+    <!-- <view class="flex justify-around">
       <view
         v-for="(tabItem, index) in tabList"
         @click="tabIndex = index"
@@ -62,28 +65,33 @@ watch(
       >
         <view class="text-14">{{ tabItem.label }}</view>
       </view>
-    </view>
+    </view> -->
     <view class="p-15">
       <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="mb-15 px-25">【{{ tabList[tabIndex].label }}】明细</view>
-      <view
+      <template v-if="assetList.length">
-        class="flex px-25 py-12 border-b items-center border-#3333331A border-b-solid"
+        <view
-        v-for="item in assetList"
+          class="flex px-25 py-12 border-b items-center border-#3333331A border-b-solid"
-        :key="item.id"
+          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">
+          <image src="/static/images/page-sub/invite-icon.png" class="w-48 h-48" />
-          <view class="text-14 text-#333">{{ item.memo }}</view>
+          <view class="flex flex-col flex-1 ml-15">
-          <view class="text-12 mt-4 text-#333">{{ item.createtime }}</view>
+            <view class="text-14 text-#333">{{ item.memo }}</view>
-        </view>
+            <view class="text-12 mt-4 text-#333">{{ item.createtime }}</view>
+          </view>
 
-        <view class="flex flex-col items-end">
+          <view class="flex flex-col items-end">
-          <view class="text-17 font-bold text-gradient">{{ item.money }}</view>
+            <view class="text-17 font-bold text-gradient">{{ item.money }}</view>
+          </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

src/pages/index/index.vue

@@ -12,8 +12,8 @@
     <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">
-        <view>姓名：{{ userStore.userInfo?.nickname }}</view>
+        <view>姓名：{{ userStore.userInfo?.realname }}</view>
-        <view class="mt-10">社会xx号码：{{ userStore.userInfo?.banknum.substring(0, 4) }}</view>
+        <view class="mt-10">社会保障号码：{{ userStore.userInfo?.banknum.substring(0, 4) }}</view>
         <view class="mt-15">中国工商银行卡号</view>
         <view class="mt-5 text-14 text-#333">
           <!-- 每四位数字插入空格 -->
@@ -24,7 +24,7 @@
     <template v-else>
       <view class="main-container w-345 h-185 mx-auto rounded-14 px-20 pt-70 text-12">
         <view>姓名：***</view>
-        <view class="mt-15">社会xx号码：***</view>
+        <view class="mt-15">社会保障号码：***</view>
         <view class="mt-15">中国工商银行卡号：**************</view>
       </view>
       <view
@@ -49,7 +49,7 @@
         class="h-240 mt-10"
       >
         <swiper-item v-for="item in newsList" :key="item.id" @click="handleNewsDetail(item.id)">
-          <image class="w-full h-160" :src="item.image" mode="aspectFill" />
+          <video class="w-full h-160" :src="item.image" mode="aspectFill" />
           <view class="mt-10 flex-1 flex flex-col justify-between">
             <view text-14>{{ item.name }}</view>
           </view>

src/pages/invest/index.vue

@@ -25,9 +25,7 @@
         </view>
         <view class="flex-1 text-center">
           <view class="text-14">医疗</view>
-          <view class="text-16 font-bold mt-15">
+          <view class="text-16 font-bold mt-15">{{ userStore.userInfo?.yiliao }}份</view>
-            {{ userStore.userInfo?.yiliao ? '保障中' : '未保障' }}
-          </view>
         </view>
       </view>
     </view>
@@ -208,11 +206,16 @@ const onShowRights = (item: any) => {
 }
 
 const onInvest = mergeStep(async (item: any) => {
-  await showModal('确认投资?')
+  try {
-  await submitInvestAPI({
+    await submitInvestAPI({
-    investid: item.id,
+      investid: item.id,
-    type: 3,
+      type: 3,
-  })
+    })
+  } catch {
+    return uni.switchTab({
+      url: '/pages/invite/index',
+    })
+  }
   await userStore.loadUserInfo()
   uni.showToast({
     title: '投资成功',

src/pages/invite/index.vue

@@ -163,7 +163,8 @@ async function onGetReward(level) {
         <view class="font-500 text-14 mt-4">直推人数</view>
       </view>
       <view class="flex-1 text-center">
-        <view class="text-18 text-#333">我的佣金</view>
+        <!-- <view class="text-18 text-#333">我的佣金</view> -->
+        <view class="text-18 text-#333 h-25"></view>
         <view class="text-gradient text-18 mt-8">{{ inviteData.performance }}</view>
         <view class="font-500 text-14 mt-4">直推业绩</view>
       </view>

src/pages/login/index.vue

@@ -8,11 +8,14 @@
 }
 </route>
 <template>
-  <view class="login-container relative">
+  <view class="login-container relative pt-44">
-    <NavBar />
+    <!-- <NavBar title-color="#333" /> -->
-    <view class="mt-44 text-28 pl-32 text-gradient" style="-webkit-background-clip: text">
+    <!-- <view class="text-28 pl-32 text-gradient" style="-webkit-background-clip: text">登录</view> -->
-      登录
+    <image
-    </view>
+      class="w-100 mx-auto block h-100"
+      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="flex items-center py-15">

src/pages/my/index.vue

@@ -13,7 +13,9 @@
     <view class="flex mt-50 text-white px-15 items-center">
       <Avatar class="w-60 h-60" :src="getImageUrl(userStore.userInfo?.avatar)" />
       <view class="ml-15 flex-1">
-        <view class="text-16">{{ userStore.userInfo?.nickname }}</view>
+        <view class="text-16">
+          {{ userStore.userInfo?.realname ?? userStore.userInfo?.nickname }}
+        </view>
         <view class="text-12 mt-8">账号：{{ userStore.userInfo?.username }}</view>
       </view>
       <view
@@ -26,36 +28,36 @@
     </view>
 
     <view class="grid grid-cols-2 gap-10 px-15 mt-15">
-      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33">
+      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33" @click="handleAsset(0)">
         <view class="flex text-white text-12">我的余额</view>
         <view class="text-20 text-gradient font-bold">{{ userStore.userInfo?.money }}</view>
         <view
           class="btn-gradient w-fit rounded-full text-center text-12 text-white py-2 px-15 mt-8"
-          @click="handleWithdrawal"
+          @click.stop="handleWithdrawal"
         >
           提现
         </view>
       </view>
-      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33">
+      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33" @click="handleAsset(2)">
         <view class="flex text-white text-12">养老金余额</view>
         <view class="text-20 text-gradient font-bold">{{ userStore.userInfo?.moneyold }}</view>
         <view
           class="btn-gradient w-fit rounded-full text-center text-12 text-white py-2 px-15 mt-8"
-          @click="handleConvert(0)"
+          @click.stop="handleConvert(0)"
         >
           转至我的余额
         </view>
       </view>
-      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33">
+      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33" @click="handleAsset(1)">
-        <view class="flex text-white text-12">救济金余额</view>
+        <view class="flex text-white text-12">社保金余额</view>
         <view class="text-20 text-gradient font-bold">{{ userStore.userInfo?.moneyjiu }}</view>
       </view>
-      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33">
+      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33" @click="handleAsset(3)">
         <view class="flex text-white text-12">团队佣金</view>
         <view class="text-20 text-gradient font-bold">{{ userStore.userInfo?.moneyyong }}</view>
         <view
           class="btn-gradient w-fit rounded-full text-center text-12 text-white py-2 px-15 mt-8"
-          @click="handleConvert(1)"
+          @click.stop="handleConvert(1)"
         >
           转至养老金
         </view>
@@ -125,9 +127,10 @@ const handleWithdrawalDetail = () => {
 }
 
 const handleWithdrawal = () => {
-  uni.navigateTo({
+  return showModal('暂未开放')
-    url: '/pages-sub/withdrawal/index',
+  // uni.navigateTo({
-  })
+  //   url: '/pages-sub/withdrawal/index',
+  // })
 }
 
 const handleTeam = () => {
@@ -142,9 +145,9 @@ const handleRealName = () => {
   })
 }
 
-const handleAsset = () => {
+const handleAsset = (index = 0) => {
   uni.navigateTo({
-    url: '/pages-sub/asset/index',
+    url: `/pages-sub/asset/index?tabIndex=${index}`,
   })
 }
 
@@ -161,6 +164,9 @@ const handleInvite = () => {
 }
 
 const handleConvert = (type) => {
+  if (type === 0) {
+    return showModal('提前申请领取养老金')
+  }
   uni.navigateTo({
     url: `/pages-sub/convert/index?type=${type}`,
   })
@@ -193,7 +199,7 @@ const commonList = [
   {
     title: '资金明细',
     icon: CommonIcon6,
-    handle: handleAsset,
+    handle: () => handleAsset(0),
   },
   {
     title: '申请理赔',

src/store/user.ts

@@ -19,6 +19,7 @@ export const useUserStore = defineStore(
             url: '/pages-sub/realname/index',
           })
         }
+        userInfo.value.realname = res.data.realname
         return res.data
       })
     })