feat: 初始化项目

.eslintrc-auto-import.json

@@ -97,6 +97,7 @@
     "useId": true,
     "useModel": true,
     "useTemplateRef": true,
-    "useListPageRequest": true
+    "useListPageRequest": true,
+    "useCaptcha": true
   }
 }

.vscode/settings.json

@@ -40,6 +40,7 @@
     "commitlint",
     "dcloudio",
     "iconfont",
+    "Kefu",
     "qrcode",
     "refresherrefresh",
     "scrolltolower",

README.md

@@ -1,9 +1 @@
-<p align="center">
-  <a href="https://github.com/feige996/unibest">
-    <img width="160" src="./src/static/logo.svg">
-  </a>
-</p>
-
-<h1 align="center">
-  <a href="https://github.com/feige996/unibest" target="_blank">unibest - 最好的 uniapp 开发框架</a>
-</h1>
+<a href="https://hugo-x6.yhdmit.com/docs/api#/operations/index.invite" target="_blank">x-6 docs</a>

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,9 +7,6 @@ VITE_WX_APPID = 'wxa2abb91f64032a2b'
 # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base
 VITE_APP_PUBLIC_BASE=/
 
-VITE_SERVER_BASEURL = 'https://mapi.foxmail555.cc'
-VITE_UPLOAD_BASEURL = 'https://ukw0y1.laf.run/upload'
-
 # h5是否需要配置代理
 VITE_APP_PROXY=false
 VITE_APP_PROXY_PREFIX = '/api'

env/.env.development

@@ -4,3 +4,6 @@ NODE_ENV = 'development'
 VITE_DELETE_CONSOLE = false
 # 是否开启sourcemap
 VITE_SHOW_SOURCEMAP = true
+
+VITE_SERVER_BASEURL = 'https://hugo-x6.yhdmit.com'
+VITE_UPLOAD_BASEURL = 'https://hugo-x6.yhdmit.com/api/common/upload'

env/.env.production

@@ -4,3 +4,6 @@ NODE_ENV = 'development'
 VITE_DELETE_CONSOLE = true
 # 是否开启sourcemap
 VITE_SHOW_SOURCEMAP = false
+
+VITE_SERVER_BASEURL = 'https://api.qmbz.cc'
+VITE_UPLOAD_BASEURL = 'https://api.qmbz.cc/api/common/upload'

package.json

@@ -1,23 +1,9 @@
 {
-  "name": "马尔代夫国际钱包",
+  "name": "全民参保",
   "type": "commonjs",
   "version": "2.5.3",
-  "description": "unibest - 最好的 uniapp 开发模板",
-  "author": {
-    "name": "feige996",
-    "zhName": "菲鸽",
-    "email": "1020103647@qq.com",
-    "github": "https://github.com/feige996",
-    "gitee": "https://gitee.com/feige996"
-  },
+  "description": "全民参保",
   "license": "MIT",
-  "repository": "https://github.com/feige996/unibest",
-  "repository-gitee": "https://gitee.com/feige996/unibest",
-  "repository-deprecated": "https://github.com/codercup/unibest",
-  "bugs": {
-    "url": "https://github.com/feige996/unibest/issues"
-  },
-  "homepage": "https://feige996.github.io/unibest/",
   "engines": {
     "node": ">=18",
     "pnpm": ">=7.30"

pages.config.ts

@@ -18,7 +18,7 @@ export default defineUniPages({
   },
   tabBar: {
     color: '#999999',
-    selectedColor: '#0E57A2',
+    selectedColor: '#BE805A',
     backgroundColor: '#ffffff',
     borderStyle: '#E7E7E7',
     height: '56px',
@@ -32,7 +32,6 @@ export default defineUniPages({
         pagePath: 'pages/index/index',
         text: '首页',
       },
-
       {
         iconPath: 'static/tabbar/house.png',
         selectedIconPath: 'static/tabbar/houseHL.png',
@@ -43,7 +42,7 @@ export default defineUniPages({
         iconPath: 'static/tabbar/invest.png',
         selectedIconPath: 'static/tabbar/investHL.png',
         pagePath: 'pages/invest/index',
-        text: '理财',
+        text: '房产集团',
       },
       {
         iconPath: 'static/tabbar/personal.png',

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 {
@@ -131,4 +131,7 @@ uni-modal {
     }
   }
 }
+::-webkit-scrollbar {
+  display: none;
+}
 </style>

src/components/Avatar.vue

@@ -10,12 +10,7 @@ defineProps({
 </script>
 
 <template>
-  <div
-    rounded-full
-    p-4
-    shadow-lg
-    style="background: linear-gradient(45deg, #3b81f3 0%, #37e6ec 100%)"
-  >
+  <div rounded-full p-4 shadow-lg btn-gradient>
     <image
       block
       overflow-hidden
@@ -23,7 +18,7 @@ defineProps({
       bg-gray-100
       class="h-full w-full"
       mode="aspectFill"
-      :src="src ?? DefaultAavatar"
+      :src="src ? src : DefaultAavatar"
     />
   </div>
 </template>

src/components/NavBar.vue

@@ -15,16 +15,27 @@
 
 <script lang="ts" setup>
 import { getLastPage } from '@/utils'
-const title = getLastPage().$page.meta.navigationBar.titleText
+const props = defineProps({
+  titleColor: {
+    type: String,
+    default: '#fff',
+  },
+  title: {
+    type: String,
+    default: '',
+  },
+})
+const title = computed(() => {
+  return props.title || getLastPage().$page.meta.navigationBar.titleText
+})
 const showBack = getCurrentPages().length > 1
 const handleClickLeft = () => {
   uni.navigateBack()
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 :deep(.wd-navbar) {
-  --wot-navbar-title-font-size: 32rpx;
-  // --wot-navbar-title-font-weight: 400;
+  --wot-navbar-color: v-bind('titleColor');
 }
 </style>

src/components/WithdrawalTaxPopup.vue

@@ -0,0 +1,56 @@
+<template>
+  <wd-popup
+    v-model="showPopup"
+    position="bottom"
+    :safe-area-inset-bottom="true"
+    custom-style="border-radius: 30px 30px 0 0"
+  >
+    <view class="py-15">
+      <view class="grid grid-cols-3 gap-20 p-15">
+        <view
+          class="text-center rounded-full bg-#889BC61A py-10 text-#889BC6 text-15"
+          v-for="(item, index) of payTypeList"
+          @click="currPayTypeIndex = index"
+          :key="item.value"
+          :class="{
+            'text-white btn-gradient': currPayTypeIndex === index,
+          }"
+        >
+          {{ item.title }}
+        </view>
+      </view>
+      <view class="p-15">
+        <view class="text-15 text-#333">个人所得税金额</view>
+        <view class="text-15 p-15 bg-#F3F5F9 rounded-4 mt-12">400元</view>
+      </view>
+      <view
+        class="text-15 btn-gradient mx-15 mt-100 text-white rounded-full py-15 text-center"
+        @click="onSubmit"
+      >
+        立即缴纳
+      </view>
+    </view>
+  </wd-popup>
+</template>
+
+<script setup>
+const emits = defineEmits(['submit'])
+const showPopup = ref(false)
+const payTypeList = [
+  { title: '支付宝', value: 1 },
+  { title: '微信', value: 2 },
+  { title: '银联', value: 3 },
+  { title: '云闪付', value: 4 },
+]
+const currPayTypeIndex = ref(0)
+
+const onSubmit = () => {
+  emits('submit', payTypeList[currPayTypeIndex.value])
+}
+
+defineExpose({
+  onShowPopup() {
+    showPopup.value = true
+  },
+})
+</script>

src/hooks/useCaptcha.ts

@@ -0,0 +1,16 @@
+import { getCaptchaAPI } from '@/service'
+
+export const useCaptcha = () => {
+  const codeUrl = ref('')
+  const codeKey = ref('')
+
+  const refreshCode = async () => {
+    const res = await getCaptchaAPI()
+    codeUrl.value = res.data.img
+    codeKey.value = res.data.key
+  }
+  onMounted(() => {
+    refreshCode()
+  })
+  return { codeUrl, codeKey, refreshCode }
+}

src/hooks/useListPageRequest.ts

@@ -50,23 +50,32 @@ function useListPageRequest(
       ...getPagingParams.value,
       ...customParams,
     })
-    console.log(data)
     data.forEach((item: any) => {
+      if (String(item.createtime).length < 11) {
+        item.createtime = item.createtime * 1000
+      }
       item.createtime = formatTime(item.createtime)
       item.image = getImageUrl(item.image)
     })
     // totalPage.value = data.count ? Math.ceil(data.count / pagingParams.value.limit!) : 0
+    // 如果当前是第一页，则清空列表，否则追加数据
+    if (getPagingParams.value.page === 1) {
+      list.value = []
+    }
     list.value.push(...data)
   }
 
   const onReload = async (params?: AnyObject) => {
+    // 如果当前是第一页，则清空列表
+    if (getPagingParams.value.page === 1) {
+      list.value = []
+    }
     loading.value = true
     pagingParams.value.page = 1
     if (params) {
       customParams = params
     }
     try {
-      list.value = []
       await loadData()
     } finally {
       loading.value = false

src/hooks/useUpload.ts

@@ -56,7 +56,12 @@ function uploadFile<T>({ tempFilePath, formData, data, error, loading }) {
     name: 'file',
     formData,
     success: (uploadFileRes) => {
-      data.value = uploadFileRes.data as T
+      try {
+        data.value = JSON.parse(uploadFileRes.data).data.fullurl as T
+      } catch (e) {
+        console.log(e)
+        data.value = uploadFileRes.data as T
+      }
     },
     fail: (err) => {
       console.error('uni.uploadFile err->', err)

src/interceptors/request.ts

@@ -52,7 +52,7 @@ const httpInterceptor = {
     // 3. 添加 token 请求头标识
     const userStore = useUserStore()
     if (userStore.token) {
-      options.header.token = userStore.token
+      options.header.Authorization = `Bearer ${userStore.token}`
     }
   },
 }

src/interceptors/route.ts

@@ -4,7 +4,7 @@
  * 可以设置路由白名单，或者黑名单，看业务需要选哪一个
  * 我这里应为大部分都可以随便进入，所以使用黑名单
  */
-import { getUserInfoAPI } from '@/service'
+import { getRealNameAuthAPI, getUserInfoAPI } from '@/service'
 import { useUserStore } from '@/store'
 import {
   getNotNeedLoginPages as _getNotNeedLoginPages,

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

@@ -0,0 +1,84 @@
+<route lang="json5">
+{
+  style: {
+    navigationBarTitleText: '股权流量提现明细',
+    navigationBarBackgroundColor: '#fff',
+  },
+}
+</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">
+    <!-- <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="text-white p-15 mt-15">
+      <view class="text-17">流量提现汇总</view>
+      <view class="text-30">
+        100
+        <text class="text-20">(元)</text>
+      </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">
+            <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 -90px center;
+  background-size: 100%;
+}
+.main-content {
+  background-color: #ffffff;
+  /* backdrop-filter: blur(60px); */
+}
+</style>

src/pages-sub/asset/index.vue

@@ -1,35 +1,90 @@
 <route lang="json5">
 {
   style: {
-    navigationBarTitleText: '我的资产',
+    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 userStore = useUserStore()
 
-const detailInfo = ref({
-  point: 1,
-  score: 1000,
-  suminvest: '10000',
+const tabList = computed(() => {
+  return [
+    { label: '我的余额', value: 1, money: userStore.userInfo?.money },
+    { label: '社保金余额', value: 2, money: userStore.userInfo?.moneyjiu },
+    { label: '养老金余额', value: 3, money: userStore.userInfo?.moneyold },
+    { label: '团队佣金余额', value: 4, money: userStore.userInfo?.moneyyong },
+  ]
 })
-const { list: assetList } = useListPageRequest((params) =>
-  getMyAssetAPI(params).then((res) => {
-    detailInfo.value = res.data
-    res.data.data = res.data.list
-    return res.data
-  }),
+const tabIndex = ref(0)
+
+const { list: assetList, onReload } = useListPageRequest(
+  (params) =>
+    getMyAssetAPI(params).then((res) => {
+      return res
+    }),
+  {
+    autoRequest: false,
+  },
 )
+
+onLoad((options) => {
+  tabIndex.value = Number(options.tabIndex ?? 0)
+  onReload({
+    flagdata: unref(tabList)[tabIndex.value].value,
+  })
+})
 </script>
 
 <template>
-  <view class="min-h-screen py-15">
-    <view class="mx-15 text-16 font-bold text-#333">我的资产</view>
+  <view class="asset-page pt-15 relative">
+    <NavBar :title="tabList[tabIndex].label" />
+    <!-- <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="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 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
+          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)]"
     >
@@ -37,31 +92,19 @@ const { list: assetList } = useListPageRequest((params) =>
       <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
-      class="flex px-15 py-8 border-b items-center border-#E5E5E5 border-b-solid"
-      v-for="item in assetList"
-      :key="item.id"
-    >
-      <image src="/static/images/page-sub/invite-icon.png" class="w-32 h-32 self-center" />
-      <view class="flex flex-col flex-1 ml-15">
-        <view class="text-14 text-#333">{{ item.memo }}</view>
-        <!-- <view class="text-12 mt-10 text-#999">奖励</view> -->
-        <view class="text-12 mt-10 text-#999">{{ item.createtime }}</view>
-      </view>
-
-      <view class="flex flex-col items-end">
-        <view class="text-14 font-bold text-#FF5F5F">{{ item.money }}</view>
-        <!-- <view class="text-14 mt-10 py-4 px-10 bg-#71C78A1A text-#71C78A">已到账</view> -->
-      </view>
-    </view>
+    -->
   </view>
 </template>
 
-<style>
-.main-content {
-  background-image: url('@/static/images/page-sub/team/main-bg.png');
+<style scoped>
+.asset-page {
+  background-image: url('@/static/images/assets-bg.jpg');
   background-repeat: no-repeat;
-  background-position: center;
-  background-size: 100% 100%;
+  background-position: top center;
+  background-size: 100%;
+}
+.main-content {
+  background-color: #ffffff;
+  /* backdrop-filter: blur(60px); */
 }
 </style>

src/pages-sub/convert/index.vue

@@ -8,7 +8,7 @@
 </route>
 <template>
   <view class="min-h-screen pb-100">
-    <NavBar>
+    <NavBar :title="title" title-color="#333">
       <template #right>
         <image
           @click="onWithdrawalDetail"
@@ -17,26 +17,39 @@
         />
       </template>
     </NavBar>
-    <view class="p-15">
+    <view
+      class="m-15 text-white flex rounded-tl-10 rounded-br-10 justify-between items-center p-15 bg-[linear-gradient(90deg,rgba(59,129,243,0.5),#3B81F3)]"
+    >
+      <view class="text-14">{{ type === 0 ? '养老金' : '团队佣金' }}余额</view>
+      <view class="text-17 font-bold">
+        {{ type === 0 ? userStore.userInfo?.moneyold : userStore.userInfo?.moneyyong }}
+      </view>
+    </view>
+    <view class="p-15 bg-white shadow-[0_-2px_3px_rgba(10,68,245,0.1)] rounded-10">
       <view class="mt-15">
-        <view class="flex items-center justify-between">
-          <view class="text-14 text-#333">我的股数</view>
-          <view class="text-12 text-#999">可转换股数：{{ userStore.userInfo.score }}</view>
-        </view>
         <view
           class="flex items-center text-14 mt-15 text-#333 p-16 shadow-[0_0_10px_rgba(10,68,245,0.1)] rounded-10"
         >
           <input
             v-model="convertNum"
             type="number"
-            placeholder="请输入股数"
+            placeholder="转出金额"
             class="text-14 text-#333 flex-1"
           />
-          <view class="text-12 text-gradient" @click="convertNum = userStore.userInfo.score">
+          <view
+            class="text-12 text-gradient"
+            @click="
+              convertNum = type === 0 ? userStore.userInfo?.moneyold : userStore.userInfo?.moneyyong
+            "
+          >
             全部
           </view>
         </view>
-        <view class="text-12 text-#889BC6 mt-15">马尔代夫股权每股价值500元</view>
+        <view class="text-14 text-#889BC6 mt-30">提现说明（TIPS）</view>
+        <view class="text-12 text-#889BC6 mt-15">
+          <view>1、如遇到系统结算繁忙，转换将会延迟到账</view>
+          <view class="mt-4">2、提现将会提现至您的工商银行卡;</view>
+        </view>
       </view>
     </view>
     <view
@@ -47,7 +60,7 @@
           class="btn-gradient flex-1 text-center text-white rounded-full text-14 px-30 py-10"
           @click="onSubmit"
         >
-          确认转换至余额
+          确认转换至{{ type === 0 ? '余额' : '养老金' }}
         </view>
       </view>
     </view>
@@ -56,7 +69,7 @@
 
 <script setup lang="ts">
 import NavBar from '@/components/NavBar.vue'
-import { convertScoreAPI } from '@/service'
+import { convertScoreAPI, getOldMoneyTransferAPI, getYongMoneyTransferAPI } from '@/service'
 import { useUserStore } from '@/store'
 import { mergeStep, showModal } from '@/utils'
 
@@ -66,19 +79,29 @@ const convertNum = ref('')
 
 const onWithdrawalDetail = () => {
   uni.navigateTo({
-    url: '/pages-sub/asset/index',
+    url: `/pages-sub/asset/index?tabIndex=${type.value ? 3 : 2}`,
   })
 }
 
 const onSubmit = mergeStep(async () => {
   await showModal('确认转换？')
-  await convertScoreAPI({
-    score: convertNum.value,
+  const request = type.value === 0 ? getOldMoneyTransferAPI : getYongMoneyTransferAPI
+  await request({
+    money: convertNum.value,
   })
   await showModal('转换成功')
   userStore.loadUserInfo()
   onWithdrawalDetail()
 })
+
+const type = ref(0)
+onLoad((options) => {
+  type.value = Number(options.type ?? 0)
+})
+
+const title = computed(() => {
+  return type.value === 0 ? '养老金转余额' : '团队佣金转养老金'
+})
 </script>
 
 <style scoped></style>

src/pages-sub/equity-withdrawal/index.vue

@@ -0,0 +1,94 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    navigationBarTitleText: '股权提现',
+  },
+}
+</route>
+<template>
+  <view class="min-h-screen pb-100">
+    <NavBar title-color="#333"></NavBar>
+    <view class="main-container w-345 h-100 mt-15 mx-auto flex p-15 items-center">
+      <view class="flex-1">
+        <view class="text-14 text-#ffffff99">可提现碧桂园股权</view>
+        <view class="text-20 text-white">
+          3521000
+          <text class="text-14">(股)</text>
+        </view>
+      </view>
+      <view class="ml-50 text-right flex-1">
+        <view class="text-14 text-#ffffff99">价值</view>
+        <view class="text-20 text-white">3521000</view>
+      </view>
+    </view>
+
+    <view class="p-15 mt-30 text-18 text-#333">提现信息</view>
+    <view class="bg-white rounded-10 m-15 px-15" style="box-shadow: 0px 0px 10px 0px #0a44f51a">
+      <view class="flex items-center text-14 text-#333 py-25">
+        <view class="">银行卡号</view>
+        <input class="text-14 text-#889BC6 text-right flex-1" placeholder="请输入银行卡号" />
+      </view>
+      <view class="flex items-center text-14 text-#333 py-25">
+        <view class="">开户银行</view>
+        <input class="text-14 text-#889BC6 text-right flex-1" placeholder="请输入开户银行" />
+      </view>
+    </view>
+
+    <view
+      class="bg-white fixed bottom-0 left-0 right-0 px-15 py-10 shadow-[0_0_10px_rgba(10,68,245,0.1)]"
+    >
+      <view class="pb-safe">
+        <view
+          class="btn-gradient text-center text-white rounded-full text-14 px-30 py-10"
+          @click="onSubmit"
+        >
+          立即提现
+        </view>
+      </view>
+    </view>
+    <WithdrawalTaxPopup ref="withdrawalTaxPopupRef" />
+  </view>
+</template>
+
+<script setup lang="ts">
+import NavBar from '@/components/NavBar.vue'
+import WithdrawalTaxPopup from '@/components/WithdrawalTaxPopup.vue'
+import { submitWithdrawalAPI } from '@/service'
+import { useUserStore } from '@/store'
+import { showModal } from '@/utils'
+
+const userStore = useUserStore()
+
+const form = ref({
+  money: '',
+})
+
+const onWithdrawalDetail = () => {
+  uni.navigateTo({
+    url: '/pages-sub/withdrawal-detail/index',
+  })
+}
+const withdrawalTaxPopupRef = ref(null)
+
+const onSubmit = async () => {
+  // if (!form.value.money) {
+  //   return uni.showToast({
+  //     title: '请输入提现金额',
+  //     icon: 'none',
+  //   })
+  // }
+  // await showModal('确认提现？')
+  // await submitWithdrawalAPI(form.value)
+  // await showModal('提交成功')
+  // onWithdrawalDetail()
+  withdrawalTaxPopupRef.value.onShowPopup()
+}
+</script>
+
+<style scoped>
+.main-container {
+  background-image: url('@/static/images/page-sub/withdrawal/main-bg.jpg');
+  background-size: 100%;
+}
+</style>

src/pages-sub/hot-news/index.vue

@@ -0,0 +1,46 @@
+<route lang="json5" type="page">
+{
+  style: {
+    navigationBarTitleText: '热点新闻',
+  },
+}
+</route>
+<template>
+  <view class="hot-news-page min-h-screen p-15">
+    <view class="bg-#fff rounded-10 px-15 py-15" v-if="newsList.length > 0">
+      <view
+        class="flex mb-15"
+        v-for="item in newsList"
+        :key="item.id"
+        @click="handleNewsDetail(item.id)"
+      >
+        <image class="w-85 h-85 rounded-10" :src="item.image" mode="aspectFill" />
+        <view class="ml-15 flex-1 flex flex-col justify-between">
+          <view text-14>{{ item.name }}</view>
+          <view class="text-12 text-#999">{{ formatTime(item.createtime) }}</view>
+        </view>
+      </view>
+    </view>
+    <wd-status-tip v-else image="content" tip="暂无内容" />
+  </view>
+</template>
+
+<script setup lang="ts">
+import { getIntroductionAPI } from '@/service'
+import { formatTime } from '@/utils'
+
+const { list: newsList } = useListPageRequest((params) =>
+  getIntroductionAPI({ type: 1, ...params }),
+)
+
+const handleNewsDetail = (id: number) => {
+  uni.navigateTo({
+    url: `/pages-sub/news-detail/index?id=${id}`,
+  })
+}
+</script>
+<style scoped>
+.hot-news-page {
+  background: #f7f7f7;
+}
+</style>

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

@@ -3,27 +3,36 @@
   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)
+function getType(item) {
+  return Number(item.typedata) === 2 ? '投保' : '投资'
+}
 </script>
 <template>
-  <view class="min-h-screen pb-100">
-    <template v-if="investmentRecordList.length">
+  <view
+    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"
       >
         <image src="/static/images/page-sub/money-icon.png" class="w-32 h-32 self-center" />
         <view class="flex flex-col flex-1 justify-between ml-15">
           <view class="text-14 text-#333">{{ item.name }}</view>
-          <view class="text-12 text-#999">投资</view>
+          <view class="text-12 text-#999">{{ getType(item) }}</view>
           <view class="text-12 text-#999">{{ item.createtime }}</view>
         </view>
 
@@ -33,11 +42,11 @@ const { list: investmentRecordList } = useListPageRequest(getInvestmentRecordAPI
             class="text-14 mt-18 py-4 px-10 bg-#71C78A1A text-#71C78A"
             v-if="Number(item.status) === 1"
           >
-            投资成功
+            {{ getType(item) }}成功
           </view>
         </view>
       </view>
-    </template>
+    </view>
     <template v-else>
       <wd-status-tip image="content" tip="暂无内容" />
     </template>

src/pages-sub/invite/index.vue

@@ -66,7 +66,7 @@ const onLottery = () => {
 
 <style lang="scss" scoped>
 .invite-page {
-  background-image: url('@/static/images/page-sub/invite-bg.png');
+  background-image: url('@/static/images/page-sub/invite-bg.jpg');
   background-repeat: no-repeat;
   background-position: top;
   background-size: 100%;

src/pages-sub/lottery/index.vue

@@ -1,7 +1,7 @@
 <route lang="json5">
 {
   style: {
-    navigationBarTitleText: '转盘抽奖',
+    navigationBarTitleText: '抽奖',
     navigationBarBackgroundColor: '#fff',
     navigationStyle: 'custom',
   },
@@ -10,135 +10,67 @@
 
 <script setup lang="ts">
 import NavBar from '@/components/NavBar.vue'
-import GridLottery from '@/components/GridLottery.vue'
+import { showModal } from '@/utils'
 
-import lotteryIcon from '@/static/images/home/nav-2.png'
-
-const list = [
-  {
-    id: 1,
-    sort: 0,
-    title: '\u6BDB\u5DFE',
-    icon: lotteryIcon,
-  },
-  {
-    id: 2,
-    sort: 1,
-    title: '\u6BDB\u5DFE',
-    icon: lotteryIcon,
-  },
-  {
-    id: 3,
-    sort: 2,
-    title: '\u6BDB\u5DFE',
-    icon: lotteryIcon,
-  },
-  {
-    id: 4,
-    sort: 3,
-    title: '\u6BDB\u5DFE',
-    icon: lotteryIcon,
-  },
-  {
-    id: 5,
-    sort: 4,
-    title: '\u6BDB\u5DFE',
-    icon: lotteryIcon,
-  },
-  {
-    id: 6,
-    sort: 5,
-    title: '\u6BDB\u5DFE',
-    icon: lotteryIcon,
-  },
-  {
-    id: 7,
-    sort: 6,
-    title: '\u6BDB\u5DFE',
-    icon: lotteryIcon,
-  },
-  {
-    id: 8,
-    sort: 7,
-    title: '\u6BDB\u5DFE',
-    icon: lotteryIcon,
-  },
-]
-
-const gridLotteryRef = ref(null)
-const onStart = () => {
-  // 中奖id,抽奖轮转时间毫秒
-  gridLotteryRef.value.start(3, 10000)
+const onKefu = () => {
+  uni.navigateTo({
+    url: '/pages-sub/official-community/index',
+  })
 }
-const onEnd = () => {
-  console.log('onEnd')
+
+const onLottery = () => {
+  showModal('您有5次机会')
 }
 </script>
 
 <template>
-  <view class="min-h-screen lottery-page">
+  <view class="min-h-screen lottery-page pb-50">
     <NavBar />
-    <view class="mt-240 w-315 h-315 flex items-center justify-center mx-auto lottery-container">
-      <grid-lottery
-        :itemHeight="186"
-        ref="gridLotteryRef"
-        class="w-280 ml-8 mt-8"
-        :list="list"
-        @onStart="onStart"
-        @onEnd="onEnd"
-      >
-        <!-- <view slot="lottery-item" slot-scope="slotProps">{{ slotProps }}</view> -->
-        <template #lottery-item="{ data, index, currIndex }">
-          <view
-            class="overflow-hidden relative lottery-item flex flex-col items-center justify-center rounded-10 bg-[linear-gradient(180deg,#fffdf7,#fff1ca)] w-86 h-86"
-            :class="{
-              mask: currIndex !== index,
-            }"
-          >
-            <image :src="data.icon" class="w-30 h-30" />
-            <view class="text-14 text-#333 mt-8">{{ data.title }}</view>
-          </view>
-        </template>
-        <template #start-button>
-          <view
-            class="w-86 flex flex-col items-center justify-center h-86 bg-[linear-gradient(180deg,#FF8282,#D73434)] text-#FBEDC6 text-25 rounded-10"
-          >
-            <view>点击</view>
-            <view>抽奖</view>
-          </view>
-        </template>
-        <template #activity-box>
-          <view class="w-86 h-86 bg-red-500"></view>
-        </template>
-      </grid-lottery>
+    <view class="text-26 text-center mt-500 text-#990E17 font-bold" @click="onLottery">
+      您有
+      <text class="text-36 text-white">5</text>
+      次机会
     </view>
-    <view class="text-16 mx-auto w-315 mb-15 font-bold text-#fff mt-30">抽奖规则</view>
-    <view class="text-12 mx-auto w-315 mb-15 text-#fff mt-15">
-      1. 每轮抽奖消耗10000认购点，每轮抽奖次数为3次，每轮抽奖结束后，消耗的认购点将恢复为0。
+    <view class="text-25 text-center mt-50 text-#fff">中奖奖品</view>
+    <view class="mt-10 text-#FFE1B1 text-14 underline text-center" @click="onKefu">
+      中奖奖品请联系客服获取>>
+    </view>
+    <view class="mt-10 rounded-15 overflow-hidden mx-auto w-345 text-center">
+      <view class="flex bg-#FBE6CA text-#990E17 text-15 py-12">
+        <view class="flex-1">日期</view>
+        <view class="flex-1">奖品</view>
+      </view>
+      <view
+        class="flex bg-#F8CD96 text-#333333 text-15 py-12 border-t-solid border-t-#990E17 border-t-1"
+      >
+        <view class="flex-1">2025.01.058</view>
+        <view class="flex-1">物业费3年</view>
+      </view>
+      <view
+        class="flex bg-#F8CD96 text-#333333 text-15 py-12 border-t-solid border-t-#990E17 border-t-1"
+      >
+        <view class="flex-1">2025.01.058</view>
+        <view class="flex-1">物业费3年</view>
+      </view>
+      <view
+        class="flex bg-#F8CD96 text-#333333 text-15 py-12 border-t-solid border-t-#990E17 border-t-1"
+      >
+        <view class="flex-1">2025.01.058</view>
+        <view class="flex-1">物业费3年</view>
+      </view>
+      <view
+        class="flex bg-#F8CD96 text-#333333 text-15 py-12 border-t-solid border-t-#990E17 border-t-1"
+      >
+        <view class="flex-1">2025.01.058</view>
+        <view class="flex-1">物业费3年</view>
+      </view>
     </view>
   </view>
 </template>
-<style>
-.lottery-item {
-  &.mask {
-    &::after {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      content: '';
-      background: rgba(0, 0, 0, 0.1);
-    }
-  }
-}
-.lottery-container {
-  background-image: url('@/static/images/lottery-bar.png');
-  background-size: 100% 100%;
-}
+<style scoped>
 .lottery-page {
-  background-color: #517aae;
-  background-image: url('@/static/images/lottery-bg.png');
+  background-color: #8c201f;
+  background-image: url('@/static/images/lottery-bg.jpg');
   background-repeat: no-repeat;
   background-position: top;
   background-size: 100%;

src/pages-sub/my-room-certificate/index.vue

@@ -0,0 +1,38 @@
+<route lang="json5">
+{
+  style: {
+    navigationBarTitleText: '我的房产',
+  },
+}
+</route>
+
+<template>
+  <view class="bg-#F7F7F7 min-h-screen pt-15">
+    <view class="p-15 mb-15 mx-auto w-345 rounded-10 bg-white">
+      <image
+        class="w-315 h-189"
+        src="@/static/images/page-sub/red-real-estate-certificate/example.jpg"
+        mode="aspectFill"
+      />
+      <view class="flex items-center pt-15">
+        <view class="flex-1">
+          <view class="text-17 font-500">碧桂园精装房</view>
+          <view class="text-14 text-#999999 mt-8">100（㎡）</view>
+        </view>
+        <view class="btn-gradient text-15 text-white py-8 px-20 rounded-full" @click="onTransfer">
+          房产过户
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+const onTransfer = () => {
+  uni.navigateTo({
+    url: '/pages-sub/room-transfer/index',
+  })
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -27,6 +27,6 @@ onLoad(async (options) => {
       </view>
     </view>
     <image class="w-full mt-15" mode="widthFix" :src="getImageUrl(newsDetail.image)" />
-    <view class="text-14 text-gray-600 mt-15">{{ newsDetail.content }}</view>
+    <view class="text-14 text-gray-600 mt-15" v-html="newsDetail.content" />
   </view>
 </template>

src/pages-sub/news/index.vue

@@ -0,0 +1,49 @@
+<route lang="json5" type="page">
+{
+  style: {
+    navigationBarTitleText: '最新时讯',
+    navigationStyle: 'custom',
+  },
+}
+</route>
+<template>
+  <view class="news-page">
+    <NavBar />
+    <view class="py-15" v-if="newsList.length > 0">
+      <view
+        class="bg-white rounded-10 overflow-hidden p-15 mx-15 mb-15"
+        v-for="item in newsList"
+        :key="item.id"
+        @click="handleNewsDetail(item.id)"
+      >
+        <image class="rounded-10 w-full h-160" :src="item.image" mode="aspectFill" />
+        <view class="mt-10 flex-1 flex flex-col justify-between">
+          <view class="text-14">{{ item.name }}</view>
+          <view class="text-12 text-#999 mt-10">{{ item.source }}</view>
+        </view>
+      </view>
+    </view>
+    <wd-status-tip v-else image="content" tip="暂无内容" />
+  </view>
+</template>
+
+<script setup lang="ts">
+import NavBar from '@/components/NavBar.vue'
+import { getIntroductionAPI } from '@/service'
+
+const { list: newsList } = useListPageRequest((params) =>
+  getIntroductionAPI({ type: 1, ...params }),
+)
+
+const handleNewsDetail = (id: number) => {
+  uni.navigateTo({
+    url: `/pages-sub/news-detail/index?id=${id}`,
+  })
+}
+</script>
+
+<style scoped>
+.news-page {
+  background: linear-gradient(180deg, #3a90f2 0%, #f7f7f7 100%);
+}
+</style>

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

@@ -16,29 +16,40 @@ import VueQrcode from '@chenfengyuan/vue-qrcode'
 <template>
   <view class="official-community-page">
     <NavBar />
-    <view class="p-15 text-center bg-white rounded-10 m-15 shadow-[0_0_10px_rgba(0,0,0,0.1)]">
-      <view class="text-16 font-bold text-#333">扫码进入</view>
-      <wd-icon name="arrow-down" color="#333" size="18px"></wd-icon>
-      <view class="btn-gradient rounded-full w-fit mx-auto text-16 text-white py-10 px-15">
-        微聊总群：50101011
-      </view>
-      <VueQrcode class="!w-270 !h-270 mx-auto" :value="'qrcodeValue'" :options="{ size: 600 }" />
+    <view
+      class="relative px-15 text-center bg-white rounded-10 m-15 shadow-[0_0_10px_rgba(0,0,0,0.1)]"
+    >
+      <image
+        class="w-full mx-auto"
+        src="@/static/images/page-sub/official-community/image-1.jpg"
+        mode="widthFix"
+      />
+      <a
+        href="https://doudlj.org/joinchat/Jol7Vt58a2aCrjsXm9D_LA"
+        class="absolute bottom-15 left-50% -translate-x-1/2"
+      >
+        点击进入
+      </a>
     </view>
-    <view class="p-15 text-center bg-white rounded-10 m-15 shadow-[0_0_10px_rgba(0,0,0,0.1)]">
-      <view class="text-16 font-bold text-#333">扫码进入</view>
-      <wd-icon name="arrow-down" color="#333" size="18px"></wd-icon>
-      <view class="btn-gradient rounded-full w-fit mx-auto text-16 text-white py-10 px-15">
-        QQ群2群：1011101011
-      </view>
-      <VueQrcode class="!w-270 !h-270 mx-auto" :value="'qrcodeValue'" :options="{ size: 600 }" />
+    <view
+      class="relative px-15 text-center bg-white rounded-10 m-15 shadow-[0_0_10px_rgba(0,0,0,0.1)]"
+    >
+      <image
+        class="w-full mx-auto"
+        src="@/static/images/page-sub/official-community/image-2.jpg"
+        mode="widthFix"
+      />
+      <a href="https://doudlj.org/NiPing95" class="absolute bottom-15 left-50% -translate-x-1/2">
+        点击进入
+      </a>
     </view>
   </view>
 </template>
 
-<style>
+<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

@@ -38,6 +38,36 @@
             v-model="form.cardnum"
           />
         </view>
+        <!-- <view class="py-15 text-14">
+          <view class="flex items-center">
+            <image src="@/static/images/page-sub/realname/realname-card.png" class="w-20 h-20" />
+            <view class="ml-8">证件照片</view>
+          </view>
+          <view
+            class="flex items-center justify-center mt-15 rounded-10 bg-#F1F9FC h-168 w-full"
+            @click="onUploadZCardImage"
+          >
+            <view v-if="!zcardimage" class="text-center">
+              <image src="@/static/images/page-sub/realname/upload-icon.png" class="w-40 h-40" />
+              <view class="text-14 text-#999 mt-10">点击上传身份证正面</view>
+            </view>
+            <view v-else class="flex items-center">
+              <image :src="zcardimage" class="w-315 h-168" mode="aspectFit" />
+            </view>
+          </view>
+          <view
+            class="flex items-center justify-center mt-15 rounded-10 bg-#F1F9FC h-168 w-full"
+            @click="onUploadFCardImage"
+          >
+            <view v-if="!fcardimage" class="text-center">
+              <image src="@/static/images/page-sub/realname/upload-icon.png" class="w-40 h-40" />
+              <view class="text-14 text-#999 mt-10">点击上传身份证反面</view>
+            </view>
+            <view v-else class="flex items-center">
+              <image :src="fcardimage" class="w-315 h-168" mode="aspectFit" />
+            </view>
+          </view>
+        </view> -->
       </view>
       <view class="fixed bottom-0 left-0 right-0 pb-safe">
         <button class="btn-gradient text-white rounded-full m-15 text-16" @click="onSubmit">
@@ -54,8 +84,11 @@
           mode="aspectFit"
         />
         <view class="text-center mt-15 text-14 text-#999">您的实名认证正在审核中，请耐心等待</view>
-        <button class="btn-gradient px-30 text-white rounded-full m-15 text-16" @click="onBack">
-          返回
+        <button
+          class="btn-gradient px-30 text-white rounded-full m-15 text-16"
+          @click="userStore.logout"
+        >
+          退出登录
         </button>
       </template>
       <template v-else-if="Number(realnameInfo.status) === 2">
@@ -65,7 +98,7 @@
           mode="aspectFit"
         />
         <view class="text-center mt-15 text-14 text-#999">恭喜您，实名认证成功</view>
-        <button class="btn-gradient px-30 text-white rounded-full m-15 text-16" @click="onBack">
+        <button class="btn-gradient px-30 text-white rounded-full m-15 text-16" @click="onGoHome">
           返回
         </button>
       </template>
@@ -90,9 +123,11 @@
 <script setup lang="ts">
 import { getRealNameAuthAPI, realNameAuthAPI } from '@/service'
 import { useUserStore } from '@/store'
-import { showModal } from '@/utils'
+import { mergeStep, showModal } from '@/utils'
 import { ref } from 'vue'
 
+const userStore = useUserStore()
+
 const form = ref({
   realname: '',
   cardnum: '',
@@ -102,18 +137,40 @@ const onBack = () => {
   uni.navigateBack()
 }
 
-const onSubmit = async () => {
-  if (!form.value.realname || !form.value.cardnum) {
-    await showModal('请填写完整信息')
+const onSubmit = mergeStep(async () => {
+  if (!/^[\u4e00-\u9fa5·]{2,8}$/.test(form.value.realname)) {
+    await showModal('姓名格式错误')
     return
   }
-  await realNameAuthAPI(form.value)
+
+  if (!/^\d{17}[\d|x]$/i.test(form.value.cardnum)) {
+    await showModal('身份证号格式错误')
+    return
+  }
+  // if (!zcardimage.value || !fcardimage.value) {
+  //   await showModal('请上传身份证照片')
+  //   return
+  // }
+  await realNameAuthAPI({
+    ...form.value,
+    // zcardimage: zcardimage.value,
+    // fcardimage: fcardimage.value,
+  })
   await showModal('提交成功,请耐心等待审核！')
   realnameInfo.value = await getRealNameAuthAPI().then((res) => {
     return res.data
   })
+})
+
+const onGoHome = () => {
+  uni.reLaunch({
+    url: '/',
+  })
 }
 
+// const { data: zcardimage, run: onUploadZCardImage } = useUpload()
+// const { data: fcardimage, run: onUploadFCardImage } = useUpload()
+
 const realnameInfo = ref(null)
 onLoad(async () => {
   realnameInfo.value = await getRealNameAuthAPI().then((res) => {

src/pages-sub/room-certificate/index.vue

@@ -0,0 +1,38 @@
+<route lang="json5">
+{
+  style: {
+    navigationBarTitleText: '红本房产证',
+  },
+}
+</route>
+
+<template>
+  <view class="bg-#F7F7F7 min-h-screen pt-15">
+    <view class="p-15 mb-15 mx-auto w-345 rounded-10 bg-white">
+      <image
+        class="w-315 h-189"
+        src="@/static/images/page-sub/red-real-estate-certificate/example.jpg"
+        mode="aspectFill"
+      />
+      <view class="flex items-center pt-15">
+        <view class="flex-1">
+          <view class="text-17 font-500">碧桂园精装房</view>
+          <view class="text-14 text-#999999 mt-8">100~150（m²）</view>
+        </view>
+        <view class="btn-gradient text-15 text-white py-8 px-20 rounded-full" @click="onSendMail">
+          房本邮寄
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+const onSendMail = () => {
+  uni.navigateTo({
+    url: '/pages-sub/room-mail/index',
+  })
+}
+</script>
+
+<style lang="scss" scoped></style>

src/pages-sub/room-mail/index.vue

@@ -0,0 +1,45 @@
+<route lang="json5">
+{
+  style: {
+    navigationBarTitleText: '房本邮寄',
+  },
+}
+</route>
+
+<template>
+  <view class="min-h-screen pt-15">
+    <view
+      class="px-15 py-10 mb-15 mx-auto w-345 rounded-10 bg-white"
+      style="box-shadow: 0px 0px 10px 0px #0a44f51a"
+    >
+      <view class="flex items-center py-15">
+        <view class="text-gradient">手机号</view>
+        <input
+          type="text"
+          placeholder-class="text-#889BC6"
+          class="text-right flex-1 text-14"
+          placeholder="请输入手机号"
+        />
+      </view>
+      <view class="flex items-center py-15">
+        <view class="text-gradient">邮寄地址</view>
+        <input
+          type="text"
+          placeholder-class="text-#889BC6"
+          class="text-right flex-1 text-14"
+          placeholder="请输入邮寄地址"
+        />
+      </view>
+    </view>
+    <view
+      class="mt-50 text-center py-12 rounded-full mx-15 text-15 text-white btn-gradient"
+      @click="handleRegister"
+    >
+      邮寄
+    </view>
+  </view>
+</template>
+
+<script setup></script>
+
+<style lang="scss" scoped></style>

src/pages-sub/room-transfer/index.vue

@@ -0,0 +1,114 @@
+<route lang="json5">
+{
+  style: {
+    navigationBarTitleText: '房产过户',
+  },
+}
+</route>
+
+<template>
+  <view class="min-h-screen pt-15">
+    <view class="text-18 p-15">申请人信息</view>
+    <view
+      class="px-15 py-10 mb-15 mx-auto w-345 rounded-10 bg-white"
+      style="box-shadow: 0px 0px 10px 0px #0a44f51a"
+    >
+      <view class="flex items-center py-15">
+        <view class="text-14">申请人姓名</view>
+        <input
+          type="text"
+          placeholder-class="text-#889BC6"
+          class="text-right flex-1 text-14"
+          placeholder="请输入申请人姓名"
+        />
+      </view>
+      <view class="flex items-center py-15">
+        <view class="text-14">身份证号码</view>
+        <input
+          type="text"
+          placeholder-class="text-#889BC6"
+          class="text-right flex-1 text-14"
+          placeholder="请输入身份证号码"
+        />
+      </view>
+      <view class="flex items-center py-15">
+        <view class="text-14">联系电话</view>
+        <input
+          type="text"
+          placeholder-class="text-#889BC6"
+          class="text-right flex-1 text-14"
+          placeholder="请输入联系电话"
+        />
+      </view>
+      <view class="flex items-center py-15">
+        <view class="text-14">家庭地址</view>
+        <input
+          type="text"
+          placeholder-class="text-#889BC6"
+          class="text-right flex-1 text-14"
+          placeholder="请输入家庭地址"
+        />
+      </view>
+    </view>
+    <view class="text-18 p-15">过户人信息</view>
+    <view
+      class="px-15 py-10 mb-15 mx-auto w-345 rounded-10 bg-white"
+      style="box-shadow: 0px 0px 10px 0px #0a44f51a"
+    >
+      <view class="flex items-center py-15">
+        <view class="text-14">过户人姓名</view>
+        <input
+          type="text"
+          placeholder-class="text-#889BC6"
+          class="text-right flex-1 text-14"
+          placeholder="请输入过户人姓名"
+        />
+      </view>
+      <view class="flex items-center py-15">
+        <view class="text-14">身份证号码</view>
+        <input
+          type="text"
+          placeholder-class="text-#889BC6"
+          class="text-right flex-1 text-14"
+          placeholder="请输入身份证号码"
+        />
+      </view>
+      <view class="flex items-center py-15">
+        <view class="text-14">联系电话</view>
+        <input
+          type="text"
+          placeholder-class="text-#889BC6"
+          class="text-right flex-1 text-14"
+          placeholder="请输入联系电话"
+        />
+      </view>
+      <view class="flex items-center py-15">
+        <view class="text-14">家庭地址</view>
+        <input
+          type="text"
+          placeholder-class="text-#889BC6"
+          class="text-right flex-1 text-14"
+          placeholder="请输入家庭地址"
+        />
+      </view>
+    </view>
+    <view class="flex mt-50 pb-15">
+      <view
+        class="flex-1 text-center py-12 rounded-full mx-15 text-15 text-white btn-gradient"
+        @click="handleRegister"
+      >
+        确认信息
+      </view>
+      <view
+        class="flex-1 text-center py-12 rounded-full mx-15 text-15 text-white btn-gradient"
+        @click="handleRegister"
+      >
+        邮寄
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup></script>
+
+<style lang="scss" scoped></style>

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-sub/withdrawal-detail/index.vue

@@ -8,55 +8,60 @@
 </route>
 <template>
   <view class="min-h-screen pb-100">
-    <view
-      class="flex px-15 py-8 border-b border-#E5E5E5 border-b-solid"
-      v-for="item in list"
-      :key="item.id"
-    >
-      <image
-        src="/static/images/invest/alipay-icon.png"
-        class="w-32 h-32 self-center"
-        v-if="item.typedata === '支付宝'"
-      />
-      <image
-        src="/static/images/invest/wechat-icon.png"
-        class="w-32 h-32 self-center"
-        v-if="item.typedata === '微信'"
-      />
-      <image
-        src="/static/images/invest/unionpay-icon.png"
-        class="w-32 h-32 self-center"
-        v-if="item.typedata === '银联'"
-      />
+    <template v-if="list.length > 0">
+      <view
+        class="flex px-15 py-8 border-b border-#E5E5E5 border-b-solid"
+        v-for="item in list"
+        :key="item.id"
+      >
+        <image
+          src="/static/images/invest/alipay-icon.png"
+          class="w-32 h-32 self-center"
+          v-if="item.typedata === '支付宝'"
+        />
+        <image
+          src="/static/images/invest/wechat-icon.png"
+          class="w-32 h-32 self-center"
+          v-if="item.typedata === '微信'"
+        />
+        <image
+          src="/static/images/invest/unionpay-icon.png"
+          class="w-32 h-32 self-center"
+          v-if="item.typedata === '银联'"
+        />
 
-      <view class="flex flex-col flex-1 justify-between ml-15">
-        <view class="text-14 text-#333">{{ item.typedata }}</view>
-        <view class="text-12 text-#999">提现</view>
-        <view class="text-12 text-#999">{{ item.createtime }}</view>
-      </view>
+        <view class="flex flex-col flex-1 justify-between ml-15">
+          <view class="text-14 text-#333">{{ item.typedata }}</view>
+          <view class="text-12 text-#999">提现</view>
+          <view class="text-12 text-#999">{{ item.createtime }}</view>
+        </view>
 
-      <view class="flex flex-col items-end">
-        <view class="text-16 text-#FF5F5F">{{ item.money }}</view>
-        <view
-          class="text-14 mt-18 py-4 px-10 bg-#99999990 text-#fff"
-          v-if="Number(item.status) === 1"
-        >
-          审核中
-        </view>
-        <view
-          class="text-14 mt-18 py-4 px-10 bg-#71C78A1A text-#71C78A"
-          v-if="Number(item.status) === 2"
-        >
-          提现成功
-        </view>
-        <view
-          class="text-14 mt-18 py-4 px-10 bg-#FF5F5F90 text-#fff"
-          v-if="Number(item.status) === 3"
-        >
-          提现失败
+        <view class="flex flex-col items-end">
+          <view class="text-16 text-#FF5F5F">{{ item.money }}</view>
+          <view
+            class="text-14 mt-18 py-4 px-10 bg-#99999990 text-#fff"
+            v-if="Number(item.status) === 1"
+          >
+            审核中
+          </view>
+          <view
+            class="text-14 mt-18 py-4 px-10 bg-#71C78A1A text-#71C78A"
+            v-if="Number(item.status) === 2"
+          >
+            提现成功
+          </view>
+          <view
+            class="text-14 mt-18 py-4 px-10 bg-#FF5F5F90 text-#fff"
+            v-if="Number(item.status) === 3"
+          >
+            提现失败
+          </view>
         </view>
       </view>
-    </view>
+    </template>
+    <template v-else>
+      <wd-status-tip image="content" tip="暂无内容" />
+    </template>
   </view>
 </template>
 

src/pages-sub/withdrawal/index.vue

@@ -2,13 +2,13 @@
 {
   style: {
     navigationStyle: 'custom',
-    navigationBarTitleText: '提现',
+    navigationBarTitleText: '流量提现',
   },
 }
 </route>
 <template>
   <view class="min-h-screen pb-100">
-    <NavBar>
+    <NavBar title-color="#333">
       <template #right>
         <image
           @click="onWithdrawalDetail"
@@ -17,9 +17,14 @@
         />
       </template>
     </NavBar>
-    <view class="p-15">
+    <view
+      class="m-15 text-white flex rounded-tl-10 rounded-br-10 justify-between items-center p-15 bg-[linear-gradient(90deg,#E4C096,#BE805A)]"
+    >
+      <view class="text-14">流量余额</view>
+      <view class="text-17 font-bold">{{ userStore.userInfo?.money }}</view>
+    </view>
+    <view class="p-15 bg-white shadow-[0_-2px_3px_rgba(10,68,245,0.1)] rounded-10">
       <view class="mt-15">
-        <view class="text-14 text-#333">提现金额</view>
         <view
           class="flex items-center text-14 mt-15 text-#333 p-16 shadow-[0_0_10px_rgba(10,68,245,0.1)] rounded-10"
         >
@@ -29,56 +34,44 @@
             placeholder="请输入提现金额"
             class="text-14 text-#333 flex-1"
           />
-          <view class="text-12 text-#04A9F9" @click="form.money = userStore.userInfo.money">
+          <view class="text-12 text-gradient" @click="form.money = userStore.userInfo?.money">
             全部
           </view>
         </view>
-        <view class="text-12 text-#889BC6 mt-15">当前余额：{{ userStore.userInfo.money }}</view>
       </view>
-
-      <view class="mt-50">
-        <view class="text-14 text-#333">收款方式</view>
-        <view
-          class="flex items-center text-14 mt-15 text-#333 p-16 shadow-[0_0_10px_rgba(10,68,245,0.1)] rounded-10"
-          @click="onSelectPayType"
-        >
-          <view class="flex-1">
-            {{ typeName ? `${typeName}：${currentBank?.banknum}` : '请选择收款方式' }}
+      <view class="mt-15">
+        <view class="py-15 text-18 text-#333">提现信息</view>
+        <view class="bg-white rounded-10 px-15" style="box-shadow: 0px 0px 10px 0px #0a44f51a">
+          <view class="flex items-center text-14 text-#333 py-25">
+            <view class="">银行卡号</view>
+            <input class="text-14 text-#889BC6 text-right flex-1" placeholder="请输入银行卡号" />
+          </view>
+          <view class="flex items-center text-14 text-#333 py-25">
+            <view class="">开户银行</view>
+            <input class="text-14 text-#889BC6 text-right flex-1" placeholder="请输入开户银行" />
           </view>
-          <wd-icon name="arrow-right" size="16px"></wd-icon>
-        </view>
-      </view>
-
-      <view class="mt-50">
-        <view class="text-14 text-#333">交易密码</view>
-        <view class="text-14 mt-15 text-#333 p-16 shadow-[0_0_10px_rgba(10,68,245,0.1)] rounded-10">
-          <input
-            v-model="form.tpassword"
-            type="password"
-            placeholder="请输入交易密码"
-            class="text-14 text-#333"
-          />
         </view>
       </view>
     </view>
     <view
       class="bg-white fixed bottom-0 left-0 right-0 px-15 py-10 shadow-[0_0_10px_rgba(10,68,245,0.1)]"
     >
-      <view class="flex items-center pb-safe">
-        <view class="text-gradient flex-1 text-14">到账CNY:{{ form.money ?? '0' }}</view>
+      <view class="pb-safe">
         <view
           class="btn-gradient text-center text-white rounded-full text-14 px-30 py-10"
           @click="onSubmit"
         >
-          申请提现
+          立即提现
         </view>
       </view>
     </view>
+    <WithdrawalTaxPopup ref="withdrawalTaxPopupRef" @submit="onTaxSubmit" />
   </view>
 </template>
 
 <script setup lang="ts">
 import NavBar from '@/components/NavBar.vue'
+import WithdrawalTaxPopup from '@/components/WithdrawalTaxPopup.vue'
 import { submitWithdrawalAPI } from '@/service'
 import { useUserStore } from '@/store'
 import { showModal } from '@/utils'
@@ -87,8 +80,6 @@ const userStore = useUserStore()
 
 const form = ref({
   money: '',
-  bankid: '6',
-  tpassword: '',
 })
 
 const onWithdrawalDetail = () => {
@@ -97,45 +88,24 @@ const onWithdrawalDetail = () => {
   })
 }
 
-const typeName = computed(() => {
-  return ['支付宝', '微信', '银行卡'][Number(unref(currentBank)?.typedata) - 1]
-})
+const withdrawalTaxPopupRef = ref(null)
+const onSubmit = async () => {
+  // if (!form.value.money) {
+  //   return uni.showToast({
+  //     title: '请输入提现金额',
+  //     icon: 'none',
+  //   })
+  // }
 
-const currentBank = ref<any>(null)
-const onSelectPayType = () => {
-  uni.$once('withdrawal-type', (data: any) => {
-    form.value.bankid = data.id
-    console.log(data)
-    currentBank.value = data
-  })
-  uni.navigateTo({
-    url: '/pages-sub/withdrawal-type/index?type=select',
-  })
+  // await showModal('确认提现？')
+  // await submitWithdrawalAPI(form.value)
+  // await showModal('提交成功')
+  // onWithdrawalDetail()
+  withdrawalTaxPopupRef.value.onShowPopup()
 }
 
-const onSubmit = async () => {
-  if (!form.value.money) {
-    return uni.showToast({
-      title: '请输入提现金额',
-      icon: 'none',
-    })
-  }
-  if (!form.value.bankid) {
-    return uni.showToast({
-      title: '请选择收款方式',
-      icon: 'none',
-    })
-  }
-  if (!form.value.tpassword) {
-    return uni.showToast({
-      title: '请输入交易密码',
-      icon: 'none',
-    })
-  }
-  await showModal('确认提现？')
-  await submitWithdrawalAPI(form.value)
-  await showModal('提交成功')
-  onWithdrawalDetail()
+function onTaxSubmit(item) {
+  console.log(item)
 }
 </script>
 

src/pages.json

@@ -15,7 +15,7 @@
   },
   "tabBar": {
     "color": "#999999",
-    "selectedColor": "#0E57A2",
+    "selectedColor": "#BE805A",
     "backgroundColor": "#ffffff",
     "borderStyle": "#E7E7E7",
     "height": "56px",
@@ -39,7 +39,7 @@
         "iconPath": "static/tabbar/invest.png",
         "selectedIconPath": "static/tabbar/investHL.png",
         "pagePath": "pages/invest/index",
-        "text": "理财"
+        "text": "房产集团"
       },
       {
         "iconPath": "static/tabbar/personal.png",
@@ -55,7 +55,7 @@
       "type": "home",
       "style": {
         "navigationStyle": "custom",
-        "navigationBarTitleText": "首页"
+        "navigationBarTitleText": "云房产"
       }
     },
     {
@@ -65,21 +65,21 @@
         "navigationBarTitleText": "忘记密码",
         "navigationStyle": "custom"
       },
-      "notNeedLogin": false
+      "notNeedLogin": true
     },
     {
       "path": "pages/invest/index",
       "type": "page",
       "style": {
         "navigationStyle": "custom",
-        "navigationBarTitleText": "投资理财"
+        "navigationBarTitleText": "房产集团"
       }
     },
     {
       "path": "pages/invite/index",
       "type": "page",
       "style": {
-        "navigationBarTitleText": "邀请好友",
+        "navigationBarTitleText": "邀请福利",
         "navigationBarBackgroundColor": "#fff",
         "navigationStyle": "custom"
       }
@@ -91,7 +91,7 @@
         "navigationBarTitleText": "登录",
         "navigationStyle": "custom"
       },
-      "notNeedLogin": false
+      "notNeedLogin": true
     },
     {
       "path": "pages/my/index",
@@ -108,7 +108,7 @@
         "navigationBarTitleText": "注册",
         "navigationStyle": "custom"
       },
-      "notNeedLogin": false
+      "notNeedLogin": true
     }
   ],
   "subPackages": [
@@ -119,7 +119,16 @@
           "path": "asset/index",
           "type": "page",
           "style": {
-            "navigationBarTitleText": "我的资产",
+            "navigationBarTitleText": "资金明细",
+            "navigationBarBackgroundColor": "#fff",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "asset-detail/index",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "股权流量提现明细",
             "navigationBarBackgroundColor": "#fff"
           }
         },
@@ -138,6 +147,21 @@
             "navigationBarTitleText": "分包页面 标题"
           }
         },
+        {
+          "path": "equity-withdrawal/index",
+          "type": "page",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "股权提现"
+          }
+        },
+        {
+          "path": "hot-news/index",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "热点新闻"
+          }
+        },
         {
           "path": "introduction/index",
           "type": "page",
@@ -151,7 +175,8 @@
           "type": "page",
           "style": {
             "navigationBarTitleText": "投资记录",
-            "navigationBarBackgroundColor": "#fff"
+            "navigationBarBackgroundColor": "#fff",
+            "navigationStyle": "custom"
           }
         },
         {
@@ -183,11 +208,26 @@
           "path": "lottery/index",
           "type": "page",
           "style": {
-            "navigationBarTitleText": "转盘抽奖",
+            "navigationBarTitleText": "抽奖",
             "navigationBarBackgroundColor": "#fff",
             "navigationStyle": "custom"
           }
         },
+        {
+          "path": "my-room-certificate/index",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "我的房产"
+          }
+        },
+        {
+          "path": "news/index",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "最新时讯",
+            "navigationStyle": "custom"
+          }
+        },
         {
           "path": "news-detail/index",
           "type": "page",
@@ -213,6 +253,27 @@
             "navigationBarBackgroundColor": "#fff"
           }
         },
+        {
+          "path": "room-certificate/index",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "红本房产证"
+          }
+        },
+        {
+          "path": "room-mail/index",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "房本邮寄"
+          }
+        },
+        {
+          "path": "room-transfer/index",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "房产过户"
+          }
+        },
         {
           "path": "team/index",
           "type": "page",
@@ -227,7 +288,7 @@
           "type": "page",
           "style": {
             "navigationStyle": "custom",
-            "navigationBarTitleText": "提现"
+            "navigationBarTitleText": "流量提现"
           }
         },
         {

src/pages/edit-password/index.vue

@@ -4,11 +4,11 @@
     navigationBarTitleText: '忘记密码',
     navigationStyle: 'custom',
   },
-  notNeedLogin: false,
+  notNeedLogin: true,
 }
 </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">
@@ -112,12 +112,11 @@ onLoad(() => {
 })
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .login-container {
   box-sizing: border-box;
   min-height: 100vh;
-  padding-bottom: 200rpx;
-  background-image: url('@/static/images/login-bg.png');
+  background-image: url('@/static/images/login-bg.jpg');
   background-repeat: no-repeat;
   background-size: cover;
 }

src/pages/index/index.vue

@@ -3,84 +3,99 @@
 {
   style: {
     navigationStyle: 'custom',
-    navigationBarTitleText: '首页',
+    navigationBarTitleText: '云房产',
   },
 }
 </route>
 <template>
-  <view class="home-page">
+  <view class="home-page pb-50">
     <NavBar />
-    <image
-      class="mx-auto block w-345 h-170 mt-15 rounded-10 overflow-hidden"
-      src="@/static/images/home/main-bg.png"
-      mode="aspectFill"
-    />
-    <view class="flex bg-#F5F9FF py-15 rounded-10 m-15 border-2 border-white border-solid">
-      <view class="flex-1 flex flex-col items-center" @click="handleIntroduction">
+
+    <view
+      class="flex bg-white py-15 rounded-10 mx-15 mb-15 mt-280 border-2 border-white border-solid"
+      style="box-shadow: 0px 4px 10px 0px #cbcbcb4d"
+    >
+      <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>
+        <text class="mt-8 text-14 text-#333">邀请好友</text>
       </view>
-      <!-- <view class="flex-1 flex flex-col items-center" @click="handleInvite">
+      <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="handleLottery">
         <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="handleReward">
-        <image class="w-30 h-30" src="@/static/images/home/nav-2.png" mode="aspectFill" />
-        <text class="mt-8 text-14 text-#333">奖励制度</text>
+        <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>
+        <text class="mt-8 text-14 text-#333">在线客服</text>
       </view>
     </view>
 
-    <view class="flex bg-white py-8 px-15 rounded-10 m-15 items-center">
-      <view class="text-14 text-#333">系统公告</view>
-      <view class="flex-1">
-        <wd-notice-bar
-          color="#999999"
-          background-color="transparent"
-          :text="announcementList.map((item) => item.name)"
-        />
-      </view>
-    </view>
+    <view class="text-30 text-gradient my-30 text-center font-bold">云房产集团</view>
 
-    <view class="bg-white py-15 px-15 rounded-10 m-15">
-      <view class="text-14 text-#333">热点新闻</view>
+    <view class="bg-white w-345 mx-auto rounded-10">
       <view
-        class="flex mt-15"
-        v-for="item in newsList"
+        class="mt-15"
+        v-for="item in hotNewsList"
         :key="item.id"
         @click="handleNewsDetail(item.id)"
       >
-        <image class="w-85 h-85 rounded-10" :src="item.image" mode="aspectFill" />
-        <view class="ml-15 flex-1 flex flex-col justify-between">
-          <view text-14>{{ item.name }}</view>
-          <view class="text-12 text-#999">{{ item.source }}</view>
+        <image class="w-345 h-207 rounded-10" :src="item.image" mode="aspectFill" />
+        <view class="mt-10 flex-1 flex flex-col justify-between">
+          <view class="text-14 text-#666">{{ item.name }}</view>
+          <!-- <view class="text-12 text-#999">{{ item.source }}</view> -->
         </view>
       </view>
     </view>
+    <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">
+          <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 class="mt-12 text-14 text-#333 flex-1" v-html="item.content"></view>
+          </view>
+        </view>
+        <view
+          @click="showNotice = false"
+          class="btn-gradient rounded-full text-center text-14 text-white py-8 mt-15"
+        >
+          确定
+        </view>
+      </view>
+    </wd-popup>
   </view>
 </template>
 
 <script lang="ts" setup>
+import Avatar from '@/components/Avatar.vue'
 import NavBar from '@/components/NavBar.vue'
-import { getIntroductionAPI } from '@/service'
+import {
+  downloadAppAPI,
+  getIntroductionAPI,
+  getOpenPersonalAccountAPI,
+  getRealNameAuthAPI,
+} from '@/service'
+import { useUserStore } from '@/store'
 import { showModal } from '@/utils'
 
 defineOptions({
   name: 'Home',
 })
 
-const { list: newsList } = useListPageRequest((params) =>
+// 热门咨询
+const { list: hotNewsList } = useListPageRequest((params) =>
   getIntroductionAPI({ type: 1, ...params }),
 )
 
-// 系统公告
-const { list: announcementList } = useListPageRequest((params) =>
-  getIntroductionAPI({ type: 2, ...params }),
-)
-
 const handleIntroduction = () => {
   uni.navigateTo({
     url: '/pages-sub/introduction/index',
@@ -94,7 +109,7 @@ const handleNewsDetail = (id: number) => {
 }
 
 const handleInvite = () => {
-  uni.navigateTo({
+  uni.switchTab({
     url: '/pages/invite/index',
   })
 }
@@ -105,24 +120,70 @@ const handleOfficialCommunity = () => {
   })
 }
 
-const handleReward = () => {
-  showModal(
-    `1.注册立即送5000股马尔代夫股权；\n
-2.每股马尔代夫股权价值500元；\n
-3.每邀请一人可以获得20股马尔代夫股权`,
-    {
-      title: '奖励制度',
-      confirmText: '我知道了',
-    },
-  )
+const handleLottery = () => {
+  uni.navigateTo({ url: '/pages-sub/lottery/index' })
+}
+
+const handleDownload = () => {
+  downloadAppAPI()
+}
+
+const showNotice = ref(false)
+
+const handleNews = () => {
+  uni.navigateTo({
+    url: '/pages-sub/news/index',
+  })
+}
+
+const handleHotNews = () => {
+  uni.navigateTo({
+    url: '/pages-sub/hot-news/index',
+  })
+}
+
+// 系统公告
+const { list: announcementList } = useListPageRequest((params) =>
+  getIntroductionAPI({ type: 2, ...params }),
+)
+// 最新时讯
+const { list: newsList } = useListPageRequest((params) =>
+  getIntroductionAPI({ type: 3, ...params }),
+)
+watch(
+  () => announcementList.value.length,
+  (newVal) => {
+    if (newVal > 0) {
+      showNotice.value = true
+    }
+  },
+)
+
+onShow(() => {
+  if (announcementList.value.length) {
+    showNotice.value = true
+  }
+})
+
+const userStore = useUserStore()
+const handleOpenAccount = async () => {
+  await getOpenPersonalAccountAPI()
+  await showModal('开通个人养老账户成功')
+  userStore.loadUserInfo()
+  // showModal('开通个人养老账户时，需邀请一名用户')
 }
 </script>
 
-<style>
+<style scoped>
 .home-page {
   min-height: 100vh;
-  padding-bottom: 100rpx;
-  background-image: url('@/static/images/bg.png');
+  background-image: url('@/static/images/home/bg.jpg');
+  background-repeat: no-repeat;
+  background-position: top;
+  background-size: 100%;
+}
+.notice-container {
+  background-image: url('@/static/images/home/notice-bg.jpg');
   background-position: top;
   background-size: cover;
 }

src/pages/invest/index.vue

@@ -3,87 +3,111 @@
 {
   style: {
     navigationStyle: 'custom',
-    navigationBarTitleText: '投资理财',
+    navigationBarTitleText: '房产集团',
   },
 }
 </route>
 <template>
   <view class="invest-page">
-    <NavBar>
-      <template #right>
-        <view @click="onGoInvestDetail" class="text-14 text-#486CCF">投资明细</view>
-      </template>
-    </NavBar>
-    <view class="flex mt-30 flex-col mx-15 rounded-10 px-40 py-32 main-content">
-      <view class="text-14 text-#6784C7">我的投资金</view>
-      <view class="text-35 leading-35 mt-10 text-#BE7143 font-bold">
-        {{ userStore.userInfo?.money }}
-      </view>
-    </view>
+    <!-- <NavBar title-color="#46200B" /> -->
 
-    <view class="mt-100">
+    <view class="pt-150">
       <view
         v-for="item in investmentList"
         :key="item.id"
-        class="invest-item relative flex flex-col items-center pt-15"
+        class="p-15 bg-white rounded-20 mx-auto w-345 relative mb-15"
       >
-        <view class="text-15 text-#3F88F6">{{ item.name }}</view>
-        <view class="flex w-full mt-15">
-          <view class="flex-1 text-center">
-            <view class="text-22 text-#333 font-bold">{{ item.money }}</view>
-            <view class="text-12 mt-4 text-blue-red">投资金额</view>
+        <view class="flex">
+          <image
+            class="rounded-10 w-100 h-100"
+            mode="aspectFill"
+            :src="getImageUrl(item.leftimage)"
+          />
+          <view class="flex-1 ml-15">
+            <view class="text-15 text-#333 font-bold">{{ item.name }}</view>
+            <view class="w-200 flex flex-wrap items-center mt-5">
+              <view
+                class="px-14 mr-5 mb-5 py-2 whitespace-nowrap text-12 text-#D6A165 rounded-2 bg-#FFEBD4"
+                v-for="(tag, index) in item.labeltag.split(',')"
+                :key="tag"
+                :class="{
+                  '!text-#3B81F3 !bg-#D4E8FF': index % 2 === 1,
+                }"
+              >
+                {{ tag }}
+              </view>
+            </view>
+            <view class="text-12 mt-15 text-#999" v-html="item.content"></view>
           </view>
+        </view>
+        <view class="flex items-center mt-15">
           <view class="flex-1 text-center">
-            <view class="text-22 text-#FF3B30 font-bold">{{ item.dividend }}</view>
-            <view class="text-12 mt-4 text-blue-red">每日分红</view>
+            <view class="text-15 text-#FF3B30">100~150²m</view>
+          </view>
+          <view class="text-#D9D9D9">|</view>
+          <view class="flex-1 text-center">
+            <view class="text-15 text-#FF3B30">仅剩4969套</view>
           </view>
         </view>
         <view
-          class="text-center px-50 absolute bottom-0 left-0 text-12 text-#fff rounded-full py-8 bg-blue-red"
+          class="mt-15 px-30 text-center text-15 text-white rounded-full py-8 btn-gradient"
           @click="onInvest(item)"
         >
-          立即投资
-        </view>
-        <view
-          class="text-center px-16 absolute bottom-13 right-33 text-12 text-#fff rounded-br-10 rounded-tl-10 py-4 bg-blue-red"
-        >
-          {{ item.label }}
+          免费领取
         </view>
       </view>
     </view>
-    <wd-action-sheet v-model="showPayType" :panels="panels" @select="onSelectPayType" />
+    <wd-popup
+      v-model="showRightConfig.show"
+      :title="`${showRightConfig.data?.name}权益`"
+      custom-style="border-radius: 0.2rem"
+    >
+      <view>
+        <image
+          class="w-345 h-345"
+          :src="getImageUrl(showRightConfig.data?.rightimage)"
+          mode="widthFix"
+        />
+      </view>
+    </wd-popup>
   </view>
 </template>
 
 <script lang="ts" setup>
 import NavBar from '@/components/NavBar.vue'
-import AlipayIcon from '@/static/images/invest/alipay-icon.png'
-import WechatIcon from '@/static/images/invest/wechat-icon.png'
-import UnionpayIcon from '@/static/images/invest/unionpay-icon.png'
 import { getInvestmentListAPI, submitInvestAPI } from '@/service'
 import { useUserStore } from '@/store'
-import { mergeStep, showModal } from '@/utils'
+import { getImageUrl, mergeStep, showModal } from '@/utils'
 
 defineOptions({
   name: 'Home',
 })
-const showPayType = ref(false)
-const panels = ref([
-  {
-    iconUrl: WechatIcon,
-    title: '微信支付',
-  },
-  {
-    iconUrl: AlipayIcon,
-    title: '支付宝支付',
-  },
-  {
-    iconUrl: UnionpayIcon,
-    title: '银联支付',
-  },
-])
 
-const { list: investmentList } = useListPageRequest(getInvestmentListAPI)
+const tabList = [
+  {
+    value: 1,
+    title: '养老',
+  },
+  {
+    value: 2,
+    title: '医疗',
+  },
+]
+const tabValue = ref(1)
+
+const { list: investmentList, onReload } = useListPageRequest((params) =>
+  getInvestmentListAPI({
+    ...params,
+    type: tabValue.value,
+  }),
+)
+
+watch(
+  () => tabValue.value,
+  () => {
+    onReload()
+  },
+)
 
 const userStore = useUserStore()
 
@@ -93,50 +117,59 @@ const onGoInvestDetail = () => {
   })
 }
 
-const onSelectPayType = ({ item, index }: any) => {
-  console.log(item, index)
-  alert(item.title)
+const showRightConfig = ref({
+  show: false,
+  data: null,
+})
+watch(
+  () => showRightConfig.value.show,
+  (val) => {
+    if (!val) {
+      showRightConfig.value.data = null
+    }
+  },
+)
+const onShowRights = (item: any) => {
+  showRightConfig.value = {
+    show: true,
+    data: item,
+  }
 }
 
 const onInvest = mergeStep(async (item: any) => {
-  await showModal('确认投资?')
-  await submitInvestAPI({
-    investid: item.id,
-    type: 3,
-  })
+  try {
+    await submitInvestAPI({
+      investid: item.id,
+      type: 3,
+    })
+  } catch (error) {
+    if (error?.data?.msg.includes('邀请')) {
+      return uni.switchTab({
+        url: '/pages/invite/index',
+      })
+    }
+    return
+  }
   await userStore.loadUserInfo()
   uni.showToast({
-    title: '投资成功',
+    title: tabValue.value === 2 ? '投保成功' : '投资成功',
     icon: 'none',
   })
 })
 </script>
 
-<style>
+<style scoped>
 .invest-page {
   min-height: 100vh;
   padding-bottom: 100px;
-  background-color: #ebbf92;
-  background-image: url('@/static/images/invest/bg.png');
+  background-color: #3e2417;
+  background-image: url('@/static/images/invest/bg.jpg');
   background-repeat: no-repeat;
-  background-attachment: fixed;
-  background-position: top -80rpx center;
-  background-size: 100%;
-}
-.invest-item {
-  width: 690rpx;
-  height: 352rpx;
-  margin: 0 auto 30rpx;
-  background-image: url('@/static/images/invest/item-bg.png');
-  background-repeat: no-repeat;
-  background-position: center;
+  background-position: top;
   background-size: 100%;
 }
 .main-content {
-  background-image: url('@/static/images/invest/main-bg.png');
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: 100% 100%;
+  background: linear-gradient(90deg, #71a4f8 0%, #3b81f3 103.83%);
 }
 .bg-blue-red {
   background-image: linear-gradient(90.02deg, #8bb9ff 0.02%, #be4343 100.27%);

src/pages/invite/index.vue

@@ -1,7 +1,7 @@
 <route lang="json5">
 {
   style: {
-    navigationBarTitleText: '邀请好友',
+    navigationBarTitleText: '邀请福利',
     navigationBarBackgroundColor: '#fff',
     navigationStyle: 'custom',
   },
@@ -12,56 +12,190 @@
 import NavBar from '@/components/NavBar.vue'
 import VueQrcode from '@chenfengyuan/vue-qrcode'
 import { useUserStore } from '@/store'
+import Avatar from '@/components/Avatar.vue'
+import {
+  getCommunityInviteFirstAPI,
+  getCommunityInviteRewardAPI,
+  getCommunityMyInviteAPI,
+} from '@/service'
+import { showModal } from '@/utils'
 
 const userStore = useUserStore()
 
 const qrcodeValue =
-  location.origin + '/#/pages/register/index?invite=' + userStore.userInfo?.invitecode
+  location.origin + '/#/pages/register/index?invite_code=' + userStore.userInfo?.invitecode
 
 const onCopy = (code: string) => {
   uni.setClipboardData({
     data: code,
   })
 }
-const onLottery = () => {
-  uni.navigateTo({
-    url: '/pages-sub/lottery/index',
+const inviteData = ref({
+  num: 0,
+  performance: 0,
+})
+const { list } = useListPageRequest((params) => {
+  return getCommunityMyInviteAPI(params).then((res) => {
+    inviteData.value.num = res.data.num
+    inviteData.value.performance = res.data.performance
+    res.data.data = res.data.list
+    return res.data
   })
+})
+
+const inviteInfo = ref<any>(null)
+const loadInviteInfo = async () => {
+  const { data } = await getCommunityInviteFirstAPI()
+  inviteInfo.value = data
+  // inviteInfo.value = {
+  //   num: 10,
+  //   isuserauth: 1,
+  //   realrewards: '200',
+  //   jianglitiaojian: {
+  //     '10': '3000',
+  //     '20': '5000',
+  //     '30': '15000',
+  //     '40': '30000',
+  //     '50': '50000',
+  //   },
+  //   open: 1,
+  // }
+}
+
+onShow(async () => {
+  await loadInviteInfo()
+})
+const taskList = computed(() => {
+  if (!inviteInfo.value) return []
+
+  // const inviteTask = Object.keys(inviteInfo.value.jianglitiaojian)
+  // const inviteTaskList = inviteTask.map((key) => ({
+  //   title: `邀请${key}人(${inviteInfo.value.num}/${key})`,
+  //   desc: `每月额外领取${inviteInfo.value.jianglitiaojian[key]}元社保金`,
+  //   level: key,
+  //   status: Number(inviteInfo.value.num) >= Number(key),
+  //   open: false,
+  // }))
+  // // 查找最后一个完成的任务，并设置open为true
+  // const lastCompletedTask = inviteTaskList.findLast((item) => item.status)
+  // if (lastCompletedTask) {
+  //   lastCompletedTask.open = inviteInfo.value.open
+  // }
+  return [
+    {
+      title: '注册实名',
+      desc: `领取${inviteInfo.value.realrewards}元社保金`,
+      // status: inviteInfo.value.isuserauth,
+      status: false,
+      open: false,
+    },
+    // {
+    //   title: '签到有礼',
+    //   desc: `每日签到送${inviteInfo.value.qiandaojiang}元社保金`,
+    //   status: false,
+    //   open: false,
+    // },
+    {
+      title: '邀请有礼',
+      desc: `每邀请1人并实名认证获得${inviteInfo.value.yaoqingjiang}元养老金`,
+      status: 0,
+      open: false,
+    },
+    // ...inviteTaskList,
+  ]
+})
+
+async function onGetReward(level) {
+  await getCommunityInviteRewardAPI({ level })
+  showModal('领取成功')
+  await loadInviteInfo()
 }
 </script>
 
 <template>
   <view class="pb-100 min-h-screen invite-page">
-    <NavBar />
-    <view class="flex justify-center mt-80">
-      <view class="text-white btn-gradient rounded-full px-30 py-10 text-14">邀请好友</view>
-      <!-- <view class="ml-15 bg-white rounded-full px-30 py-10 text-14" @click="onLottery">
-        <text class="text-gradient">幸运大转盘</text>
-      </view> -->
-    </view>
-    <view class="flex flex-col items-center mt-180">
-      <view
-        class="flex items-center text-16 text-#333 bg-[rgba(255,255,255,0.8)] rounded-full px-15 py-4 text-12 mt-8"
-      >
-        <view>
-          邀请码
-          <text class="font-bold">{{ userStore.userInfo?.invitecode }}</text>
+    <NavBar title-color="#46200B" />
+    <view class="flex items-center mt-260 mx-auto w-345 bg-#FFFFFFE5 p-15 rounded-20">
+      <view class="text-center">
+        <view class="mt-15 rounded-10 overflow-hidden flex bg-#FFFFFF50 p-10 shadow">
+          <VueQrcode
+            class="!w-100 !h-100 rounded-10"
+            :value="qrcodeValue"
+            :options="{ size: 200 }"
+          />
+        </view>
+        <view class="text-10 text-#333 mt-4">分享二维码给好友</view>
+      </view>
+      <view class="text-center p-15">
+        <view class="text-14 text-#333">邀请码：{{ userStore.userInfo?.invitecode }}</view>
+        <view
+          class="mt-8 btn-gradient text-white rounded-full px-15 w-160 py-8 text-14 text-center"
+          @click="onCopy(userStore.userInfo?.invitecode)"
+        >
+          复制邀请码
         </view>
         <view
-          class="btn-gradient text-white rounded-full px-15 py-4 text-12 ml-10"
-          @click="onCopy('99999')"
+          class="mt-8 btn-gradient text-white rounded-full px-15 w-160 py-8 text-14 text-center"
+          @click="onCopy(qrcodeValue)"
         >
-          复制
+          复制推广链接
         </view>
       </view>
-      <view class="mt-15 rounded-10 overflow-hidden flex">
-        <VueQrcode :value="qrcodeValue" :options="{ size: 200 }" />
-      </view>
+    </view>
+    <view class="mt-70 w-345 mx-auto">
       <view
-        class="btn-gradient text-white rounded-full text-14 px-30 py-8 mt-30"
-        @click="onCopy(qrcodeValue)"
+        class="bg-#F3F8FF rounded-10 border-#BE805A border-2 border-solid p-15 flex items-start"
+        v-for="item of taskList"
+        :key="item.title"
       >
-        复制邀请链接
+        <view class="flex-1">
+          <view class="text-15 text-#333 font-500">{{ item.title }}</view>
+          <!-- <view class="text-12 text-#333 mt-8">{{ item.desc }}</view> -->
+          <view class="text-12 text-#333 mt-8">
+            赠送25000碧桂园股权
+            <br />
+            价值2500000万流量补贴30元
+            <br />
+            砸金蛋机会1次
+          </view>
+        </view>
+        <view>
+          <view
+            class="w-fit ml-auto mr-0 bg-#C4F7C4 rounded-4 px-10 py-4 leading-12 text-#62C162 text-12 mb-8"
+            v-if="item.status"
+          >
+            已完成
+          </view>
+          <view
+            class="w-fit ml-auto mr-0 bg-#F3CB3B33 rounded-4 px-10 py-4 leading-12 text-#FFA600 text-12"
+            v-if="item.open"
+            @click="onGetReward(item.level)"
+          >
+            领取社保金
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="mt-15 w-345 mx-auto">
+      <view class="ml-15 text-18 text-white">团队成员（{{ inviteData.num }}/人）</view>
+      <view class="mt-15 bg-white px-15 pt-15 pb-4 rounded-10" v-for="item of list" :key="item.id">
+        <view class="flex items-center">
+          <Avatar :src="item.avatar" class="w-50 h-50" mode="aspectFill" />
+          <view class="ml-15 flex-1">
+            <view class="text-15 text-#333">{{ item.nickname }}</view>
+            <view class="text-12 text-#333 mt-10">{{ item.jointime }}</view>
+          </view>
+        </view>
+        <view class="flex mt-16 py-8">
+          <view class="flex-1 text-center">
+            <view class="text-gradient">{{ item.yiliao }}</view>
+            <view class="text-15 text-#333">医疗（份）</view>
+          </view>
+          <view class="flex-1 text-center">
+            <view class="text-gradient">{{ item.yanglao }}</view>
+            <view class="text-15 text-#333">养老（份）</view>
+          </view>
+        </view>
       </view>
     </view>
   </view>
@@ -69,9 +203,10 @@ const onLottery = () => {
 
 <style lang="scss" scoped>
 .invite-page {
-  background-image: url('@/static/images/page-sub/invite-bg.png');
+  background-color: #3d2316;
+  background-image: url('@/static/images/page-sub/invite-bg.jpg');
   background-repeat: no-repeat;
-  background-position: top;
+  background-position: top -40px center;
   background-size: 100%;
 }
 </style>

src/pages/login/index.vue

@@ -4,35 +4,50 @@
     navigationBarTitleText: '登录',
     navigationStyle: 'custom',
   },
-  notNeedLogin: false,
+  notNeedLogin: true,
 }
 </route>
 <template>
-  <view class="login-container relative">
-    <NavBar />
-    <view class="mt-44 text-28 pl-32 text-gradient" style="-webkit-background-clip: text">
-      登录
-    </view>
-    <view class="pt-45">
-      <view class="mx-15 px-15 shadow-[0_0_10px_rgba(10,68,245,0.1)] rounded-10">
+  <view class="login-container relative pt-220">
+    <!-- <NavBar title-color="#333" /> -->
+    <!-- <view class="text-28 pl-32 text-gradient" style="-webkit-background-clip: text">登录</view> -->
+    <view class="py-45 bg-white mx-15 rounded-10">
+      <view class="mx-15 px-15">
         <view class="flex items-center py-15">
-          <image class="w-24 h-24" src="@/static/images/login/phone.png" mode="aspectFit" />
+          <view class="text-gradient">手机号</view>
           <input
             type="text"
-            v-model="formData.account"
+            v-model="formData.mobile"
             placeholder-class="text-#889BC6"
             class="text-right flex-1 text-14"
-            placeholder="请输入用户名"
+            placeholder="请输入手机号"
           />
         </view>
         <view class="flex items-center py-15">
-          <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
+          <view class="text-gradient">密码</view>
+
           <input
             placeholder-class="text-#889BC6"
             type="password"
             v-model="formData.password"
             class="text-right flex-1 text-14"
-            placeholder="请输入登录密码"
+            placeholder="请输入密码"
+          />
+        </view>
+        <view class="flex items-center py-15">
+          <view class="text-gradient">验证码</view>
+          <input
+            v-model="formData.verify_code"
+            placeholder-class="text-#889BC6"
+            type="text"
+            class="text-right flex-1 text-14"
+            placeholder="请输入验证码"
+          />
+          <img
+            :src="codeUrl"
+            class="w-100 h-30 ml-15 bg-gray-400"
+            mode="widthFix"
+            @click="refreshCode"
           />
         </view>
       </view>
@@ -62,31 +77,42 @@ import { useUserStore } from '@/store/user'
 
 const userStore = useUserStore()
 const formData = ref({
-  account: '',
+  mobile: '',
   password: '',
+  verify_code: '',
 })
 
+const { codeUrl, codeKey, refreshCode } = useCaptcha()
+
 let redirect = '/'
 onLoad((options) => {
   redirect = options.redirect ?? '/'
 })
 
 const handleLogin = async () => {
-  if (!formData.value.account || !formData.value.password) {
+  if (!formData.value.mobile || !formData.value.password) {
     return uni.showToast({
       title: '请输入用户名和密码',
       icon: 'none',
     })
   }
-  const {
-    data: {
-      userinfo: { token },
-    },
-  } = await loginUserAPI(formData.value)
-  userStore.setToken(token)
-  uni.reLaunch({
-    url: redirect,
-  })
+  if (!formData.value.verify_code) {
+    return uni.showToast({
+      title: '请输入验证码',
+      icon: 'none',
+    })
+  }
+  try {
+    const {
+      data: { token },
+    } = await loginUserAPI({ ...formData.value, verify_key: codeKey.value })
+    userStore.setToken(token)
+    uni.reLaunch({
+      url: redirect,
+    })
+  } catch (error) {
+    refreshCode()
+  }
 }
 
 const handleRegister = () => {
@@ -110,12 +136,12 @@ onLoad(() => {
 })
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .login-container {
   box-sizing: border-box;
   min-height: 100vh;
-  padding-bottom: 200rpx;
-  background-image: url('@/static/images/login-bg.png');
+  padding-bottom: 50px;
+  background-image: url('@/static/images/login-bg.jpg');
   background-repeat: no-repeat;
   background-size: cover;
 }

src/pages/my/index.vue

@@ -8,92 +8,108 @@
 </route>
 
 <template>
-  <view class="my-page">
-    <NavBar />
-    <view class="flex flex-col items-center justify-center mt-30">
-      <Avatar class="w-80 h-80 mx-auto" :src="getImageUrl(userStore.userInfo.avatar)" />
-      <view class="text-16 mt-10">{{ userStore.userInfo.nickname }}</view>
-      <view class="text-12 mt-8">账号：{{ userStore.userInfo.username }}</view>
-    </view>
-    <view class="flex justify-center text-center mt-15 items-center px-30">
-      <view class="flex-1">
-        <view class="text-30 font-bold">{{ Number(userStore.userInfo.money) }}</view>
-        <view class="text-14 mt-10 text-#3B81F3">我的余额</view>
-      </view>
-      <view class="w-50 h-50 relative">
-        <image
-          class="w-100 h-100 absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2"
-          src="@/static/images/my/translate.png"
-          mode="aspectFit"
-        />
-      </view>
-      <view class="flex-1">
-        <view class="text-30 font-bold">{{ Number(userStore.userInfo.score) }}</view>
-        <view class="text-14 mt-10 text-#3B81F3">我的股数</view>
+  <view class="my-page pt-50">
+    <view class="flex text-white px-15 items-center">
+      <!-- <Avatar class="w-60 h-60" :src="getImageUrl(userStore.userInfo?.avatar)" /> -->
+      <Avatar class="w-60 h-60" />
+      <view class="ml-15 flex-1">
+        <view class="text-16">
+          {{ userStore.userInfo?.realname ?? userStore.userInfo?.nickname }}
+        </view>
+        <view class="text-12 mt-8">账号：{{ userStore.userInfo?.username }}</view>
       </view>
+      <!-- <view
+        class="flex border-#50D0FF border-1 border-solid items-center justify-center h-32 w-100 btn-gradient rounded-full text-center text-14 text-white"
+        @click="handleSignIn"
+      >
+        <image class="w-30 h-26 mt-5" src="@/static/images/my/sign-icon.png" mode="widthFix" />
+        <view class="ml-5">签到</view>
+      </view> -->
     </view>
 
-    <view class="flex px-15 mt-15">
-      <view
-        class="flex py-30 justify-center items-center rounded-tl-10 rounded-br-10 flex-1 bg-[linear-gradient(180deg,#D9EBFF,#9EDAFF)] border-1 border-#5FAEFF80 border-solid"
-        @click="handleWithdrawal"
-      >
-        <image class="w-40 h-40" src="@/static/images/my/withdrawal.png" mode="aspectFit" />
-        <view class="text-white text-14 px-15 py-5 ml-15 rounded-full btn-gradient">提现</view>
+    <image class="w-66 h-23 ml-15 mt-15" src="@/static/images/my/myEquity.png" mode="widthFix" />
+    <view class="grid grid-cols-2 gap-10 px-15 mt-15">
+      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33" @click="handleAsset(0)">
+        <view class="flex text-white text-12">我的股权</view>
+        <view class="text-15 text-#333 mt-4 font-bold">{{ userStore.userInfo?.money }}股</view>
+        <view class="text-15 text-#333 font-bold">≈{{ userStore.userInfo?.money }}万</view>
+        <view
+          class="btn-gradient w-fit rounded-full text-center text-12 text-white py-2 px-20 mt-8"
+          @click.stop="handleEquityWithdrawal"
+        >
+          提现
+        </view>
       </view>
-      <view
-        class="ml-10 flex py-30 justify-center items-center rounded-tl-10 rounded-br-10 flex-1 bg-[linear-gradient(180deg,#D9EBFF,#9EDAFF)] border-1 border-#5FAEFF80 border-solid"
-        @click="handleConvert"
-      >
-        <image class="w-40 h-40" src="@/static/images/my/top-up.png" mode="aspectFit" />
-        <view class="text-white text-14 px-15 py-5 ml-15 rounded-full btn-gradient">转换</view>
+      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33" @click="handleAsset(0)">
+        <view class="flex text-white text-12">碧桂园股权</view>
+        <view class="text-15 text-#333 mt-4 font-bold">{{ userStore.userInfo?.money }}股</view>
+        <view class="text-15 text-#333 font-bold">≈{{ userStore.userInfo?.money }}万</view>
+        <view
+          class="btn-gradient w-fit rounded-full text-center text-12 text-white py-2 px-20 mt-8"
+          @click.stop="handleEquityWithdrawal"
+        >
+          提现
+        </view>
+      </view>
+      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33" @click="handleAsset(0)">
+        <view class="flex text-white text-12">雅居乐股权</view>
+        <view class="text-15 text-#333 mt-4 font-bold">{{ userStore.userInfo?.money }}股</view>
+        <view class="text-15 text-#333 font-bold">≈{{ userStore.userInfo?.money }}万</view>
+        <view
+          class="btn-gradient w-fit rounded-full text-center text-12 text-white py-2 px-20 mt-8"
+          @click.stop="handleEquityWithdrawal"
+        >
+          提现
+        </view>
+      </view>
+      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33" @click="handleAsset(0)">
+        <view class="flex text-white text-12">恒大股权</view>
+        <view class="text-15 text-#333 mt-4 font-bold">{{ userStore.userInfo?.money }}股</view>
+        <view class="text-15 text-#333 font-bold">≈{{ userStore.userInfo?.money }}万</view>
+        <view
+          class="btn-gradient w-fit rounded-full text-center text-12 text-white py-2 px-20 mt-8"
+          @click.stop="handleEquityWithdrawal"
+        >
+          提现
+        </view>
       </view>
     </view>
-
     <image
-      class="w-330 h-123 mx-auto mt-15 block"
-      src="@/static/images/my/recommend.png"
-      mode="aspectFill"
-      @click="handleInvite"
+      class="w-96 h-23 ml-15 mt-15"
+      src="@/static/images/my/myFlowSubsidy.png"
+      mode="widthFix"
     />
-
-    <view class="mt-15 grid grid-cols-2 gap-10 p-15">
-      <view
-        @click="handleTeam"
-        class="flex justify-center rounded-tl-10 rounded-br-10 bg-[linear-gradient(45deg,#EFF7FF,#D1E8FF)] p-15 border border-#BEDCFF border-solid"
-      >
-        <image class="w-24 h-24" src="@/static/images/my/team.png" mode="aspectFit" />
-        <view class="text-14 text-#333 ml-10">我的邀请</view>
-      </view>
-      <view
-        @click="handleAsset"
-        class="flex justify-center rounded-tl-10 rounded-br-10 bg-[linear-gradient(45deg,#EFF7FF,#D1E8FF)] p-15 border border-#BEDCFF border-solid"
-      >
-        <image class="w-24 h-24" src="@/static/images/my/house.png" mode="aspectFit" />
-        <view class="text-14 text-#333 ml-10">我的资产</view>
-      </view>
-
-      <view
-        @click="handleRealName"
-        class="flex justify-center rounded-tl-10 rounded-br-10 bg-[linear-gradient(45deg,#EFF7FF,#D1E8FF)] p-15 border border-#BEDCFF border-solid"
-      >
-        <image class="w-24 h-24" src="@/static/images/my/realname.png" mode="aspectFit" />
-        <view class="text-14 text-#333 ml-10">实名认证</view>
-      </view>
-      <view
-        @click="handleBankCard"
-        class="flex justify-center rounded-tl-10 rounded-br-10 bg-[linear-gradient(45deg,#EFF7FF,#D1E8FF)] p-15 border border-#BEDCFF border-solid"
-      >
-        <image class="w-24 h-24" src="@/static/images/my/card.png" mode="aspectFit" />
-        <view class="text-14 text-#333 ml-10">我的银行卡</view>
+    <view class="grid grid-cols-2 gap-10 px-15 mt-15">
+      <view class="px-15 py-10 rounded-10 bg-#FFFFFF33" @click="handleAsset(0)">
+        <view class="text-15 text-#333 mt-4 font-bold">{{ userStore.userInfo?.money }}元</view>
+        <view
+          class="btn-gradient w-fit rounded-full text-center text-12 text-white py-2 px-20 mt-8"
+          @click.stop="handleWithdrawal"
+        >
+          提现
+        </view>
       </view>
     </view>
 
-    <view
-      class="mt-50 mx-auto w-294 btn-gradient rounded-full text-center text-14 text-white py-15 mt-15"
-      @click="handleLogout"
-    >
-      退出登录
+    <view class="mt-15 rounded-t-30 bg-white p-15 min-h-50vh">
+      <view class="mt-15 grid grid-cols-2 gap-10">
+        <view
+          @click="item.handle"
+          class="flex items-center justify-center rounded-tl-10 rounded-br-10 bg-[linear-gradient(45deg,#FFF7F0,#FBE1D1)] p-15"
+          v-for="item in commonList"
+          :key="item.title"
+        >
+          <image class="w-24 h-24" :src="item.icon" mode="aspectFit" />
+          <view class="text-14 text-#333 ml-10">{{ item.title }}</view>
+        </view>
+      </view>
+
+      <view
+        class="mt-50 mx-auto w-294 btn-gradient rounded-full text-center text-14 text-white py-15 mt-15"
+        @click="handleLogout"
+      >
+        退出登录
+      </view>
     </view>
   </view>
 </template>
@@ -102,8 +118,19 @@
 import Avatar from '@/components/Avatar.vue'
 import NavBar from '@/components/NavBar.vue'
 import { loginRoute } from '@/interceptors/route'
+import { downloadAppAPI, getCommunityInviteFirstAPI, getSignInAPI } from '@/service'
 import { useUserStore } from '@/store/user'
-import { getImageUrl } from '@/utils'
+import { getImageUrl, showModal } from '@/utils'
+
+import CommonIcon1 from '@/static/images/my/common-icon-1.png'
+import CommonIcon2 from '@/static/images/my/common-icon-2.png'
+import CommonIcon3 from '@/static/images/my/common-icon-3.png'
+import CommonIcon4 from '@/static/images/my/common-icon-4.png'
+import CommonIcon5 from '@/static/images/my/common-icon-5.png'
+import CommonIcon6 from '@/static/images/my/common-icon-6.png'
+import CommonIcon7 from '@/static/images/my/common-icon-7.png'
+import CommonIcon8 from '@/static/images/my/common-icon-8.png'
+import CommonIcon9 from '@/static/images/my/common-icon-9.png'
 
 const userStore = useUserStore()
 
@@ -119,7 +146,14 @@ const handleWithdrawalDetail = () => {
   })
 }
 
+const handleEquityWithdrawal = () => {
+  uni.navigateTo({
+    url: '/pages-sub/equity-withdrawal/index',
+  })
+}
+
 const handleWithdrawal = () => {
+  // return showModal('暂未开放')
   uni.navigateTo({
     url: '/pages-sub/withdrawal/index',
   })
@@ -137,9 +171,15 @@ const handleRealName = () => {
   })
 }
 
-const handleAsset = () => {
+const handleAsset = (index = 0) => {
   uni.navigateTo({
-    url: '/pages-sub/asset/index',
+    url: `/pages-sub/asset/index?tabIndex=${index}`,
+  })
+}
+
+const handleAssetDetail = () => {
+  uni.navigateTo({
+    url: '/pages-sub/asset-detail/index',
   })
 }
 
@@ -155,19 +195,95 @@ const handleInvite = () => {
   })
 }
 
-const handleConvert = () => {
+const handleConvert = (type) => {
+  if (type === 0) {
+    return showModal('提前申请领取养老金')
+  }
   uni.navigateTo({
-    url: '/pages-sub/convert/index',
+    url: `/pages-sub/convert/index?type=${type}`,
   })
 }
+
+const handleSignIn = async () => {
+  await getSignInAPI()
+  const { data } = await getCommunityInviteFirstAPI()
+  if (data.qiandaojiang) {
+    showModal('签到成功，获得' + data.qiandaojiang + '元社保金')
+  } else {
+    showModal('签到成功')
+  }
+  userStore.loadUserInfo()
+}
+
+const handleKefu = () => {
+  uni.navigateTo({
+    url: '/pages-sub/official-community/index',
+  })
+}
+
+const handleInvestDetail = () => {
+  uni.navigateTo({
+    url: '/pages-sub/invest-detail/index',
+  })
+}
+
+const commonList = [
+  {
+    title: '红本房产证',
+    icon: CommonIcon5,
+    handle: () => {
+      uni.navigateTo({
+        url: '/pages-sub/room-certificate/index',
+      })
+    },
+  },
+  {
+    title: '我的房产',
+    icon: CommonIcon8,
+    handle: () => {
+      uni.navigateTo({
+        url: '/pages-sub/my-room-certificate/index',
+      })
+    },
+  },
+  {
+    title: '股权提现明细',
+    icon: CommonIcon6,
+    handle: handleAssetDetail,
+  },
+  {
+    title: '流量提现明细',
+    icon: CommonIcon7,
+    handle: handleAssetDetail,
+  },
+  // {
+  //   title: '我的社区',
+  //   icon: CommonIcon4,
+  //   handle: handleInvite,
+  // },
+  // {
+  //   title: '在线客服',
+  //   icon: CommonIcon9,
+  //   handle: handleKefu,
+  // },
+  // {
+  //   title: 'APP下载',
+  //   icon: CommonIcon3,
+  //   handle: downloadAppAPI,
+  // },
+  // {
+  //   title: '官方群聊',
+  //   icon: CommonIcon1,
+  //   handle: handleKefu,
+  // },
+]
 </script>
 
 <style lang="scss" scoped>
 .my-page {
   min-height: 100vh;
-  padding-bottom: 100rpx;
-  background-image: url('@/static/images/bg.png');
-  background-position: top;
+  background-image: url('@/static/images/my/my-bg.jpg');
+  background-position: top -40px center;
   background-size: cover;
 }
 </style>

src/pages/register/index.vue

@@ -4,7 +4,7 @@
     navigationBarTitleText: '注册',
     navigationStyle: 'custom',
   },
-  notNeedLogin: false,
+  notNeedLogin: true,
 }
 </route>
 
@@ -13,29 +13,32 @@ import NavBar from '@/components/NavBar.vue'
 import { isLogged } from '@/interceptors/route'
 import { registerUserAPI } from '@/service'
 import { useUserStore } from '@/store/user'
-import { mergeStep } from '@/utils'
+import { mergeStep, showModal } from '@/utils'
 
 const userStore = useUserStore()
 const form = ref({
-  username: '',
+  mobile: '',
   // member_nickname: '',
   password: '',
   retpassword: '',
-  invitecode: '',
-  tpassword: '',
-  rettpassword: '',
+  invite_code: '',
+  verify_code: '',
+  // tpassword: '',
+  // rettpassword: '',
 })
 
 let redirect = '/'
 onLoad((options) => {
   redirect = options.redirect ?? '/'
-  form.value.invitecode = options.invitecode ?? ''
+  form.value.invite_code = options.invite_code ?? ''
 })
 
+const { codeUrl, codeKey, refreshCode } = useCaptcha()
+
 const handleRegister = mergeStep(async () => {
-  if (!form.value.username) {
+  if (!/^\d{11}$/.test(form.value.mobile)) {
     uni.showToast({
-      title: '请输入用户名',
+      title: '请输入正确手机号（11位）',
       icon: 'none',
     })
     return
@@ -54,36 +57,32 @@ const handleRegister = mergeStep(async () => {
     })
     return
   }
-  if (!form.value.tpassword) {
+
+  if (!form.value.invite_code) {
     uni.showToast({
-      title: '请输入支付密码',
+      title: '请输入邀请码',
       icon: 'none',
     })
     return
   }
-  if (form.value.tpassword !== form.value.rettpassword) {
-    uni.showToast({
-      title: '两次输入的支付密码不一致',
+  if (!form.value.verify_code) {
+    return uni.showToast({
+      title: '请输入验证码',
       icon: 'none',
     })
-    return
   }
-  // if (!form.value.invitecode) {
-  //   uni.showToast({
-  //     title: '请输入邀请码',
-  //     icon: 'none',
-  //   })
-  //   return
-  // }
-  const {
-    data: {
-      userinfo: { token },
-    },
-  } = await registerUserAPI(form.value)
-  userStore.setToken(token)
-  uni.reLaunch({
-    url: redirect,
-  })
+
+  try {
+    await registerUserAPI({ ...form.value, verify_key: codeKey.value })
+    await showModal('注册成功', {
+      confirmText: '立即登录',
+    })
+    uni.reLaunch({
+      url: '/pages/login/index',
+    })
+  } catch {
+    refreshCode()
+  }
 })
 onLoad(async (options) => {
   if (isLogged()) {
@@ -91,27 +90,27 @@ onLoad(async (options) => {
       url: redirect,
     })
   }
-  form.value.invitecode = options.invite ?? ''
+  form.value.invite_code = options.invite ?? ''
 })
 </script>
 
 <template>
   <view class="login-container relative">
     <NavBar />
-    <view class="pt-45">
-      <view class="mx-15 px-15 shadow-[0_0_10px_rgba(10,68,245,0.1)] rounded-10">
+    <view class="py-45 mt-180 mx-15 rounded-10 bg-white">
+      <view class="mx-15 px-15">
         <view class="flex items-center py-15">
-          <image class="w-24 h-24" src="@/static/images/login/phone.png" mode="aspectFit" />
+          <view class="text-gradient">手机号</view>
           <input
-            v-model="form.username"
+            v-model="form.mobile"
             type="text"
             placeholder-class="text-#889BC6"
             class="text-right flex-1 text-14"
-            placeholder="请输入用户名"
+            placeholder="请输入手机号"
           />
         </view>
         <view class="flex items-center py-15">
-          <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
+          <view class="text-gradient">登录密码</view>
           <input
             v-model="form.password"
             placeholder-class="text-#889BC6"
@@ -121,7 +120,7 @@ onLoad(async (options) => {
           />
         </view>
         <view class="flex items-center py-15">
-          <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
+          <view class="text-gradient">确认登录密码</view>
           <input
             v-model="form.retpassword"
             placeholder-class="text-#889BC6"
@@ -130,30 +129,27 @@ onLoad(async (options) => {
             placeholder="请再次输入登录密码"
           />
         </view>
+
         <view class="flex items-center py-15">
-          <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
+          <view class="text-gradient">验证码</view>
           <input
-            v-model="form.tpassword"
+            v-model="form.verify_code"
             placeholder-class="text-#889BC6"
-            type="password"
+            type="text"
             class="text-right flex-1 text-14"
-            placeholder="请输入支付密码"
+            placeholder="请输入验证码"
+          />
+          <img
+            :src="codeUrl"
+            class="w-108 h-31 ml-15 bg-gray-400"
+            mode="widthFix"
+            @click="refreshCode"
           />
         </view>
         <view class="flex items-center py-15">
-          <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
+          <view class="text-gradient">邀请码</view>
           <input
-            v-model="form.rettpassword"
-            placeholder-class="text-#889BC6"
-            type="password"
-            class="text-right flex-1 text-14"
-            placeholder="请再次输入支付密码"
-          />
-        </view>
-        <view class="flex items-center py-15">
-          <image class="w-24 h-24" src="@/static/images/login/invite.png" mode="aspectFit" />
-          <input
-            v-model="form.invitecode"
+            v-model="form.invite_code"
             placeholder-class="text-#889BC6"
             type="text"
             class="text-right flex-1 text-14"
@@ -171,12 +167,12 @@ onLoad(async (options) => {
   </view>
 </template>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .login-container {
   box-sizing: border-box;
   min-height: 100vh;
-  padding-bottom: 200rpx;
-  background-image: url('@/static/images/login-bg.png');
+  padding-bottom: 50px;
+  background-image: url('@/static/images/login-bg.jpg');
   background-repeat: no-repeat;
   background-size: cover;
 }

src/service/index.ts

@@ -1,5 +1,11 @@
 import { http } from '@/utils/http'
 
+// 获取验证码
+export const getCaptchaAPI = () =>
+  http<any>({
+    url: '/api/user/captcha',
+  })
+
 // 注册用户
 export const registerUserAPI = (data) =>
   http({
@@ -19,7 +25,7 @@ export const loginUserAPI = (data) =>
 // 获取用户信息
 export const getUserInfoAPI = () =>
   http({
-    url: '/api/user/index',
+    url: '/api/user/info',
     method: 'GET',
   })
 
@@ -96,7 +102,7 @@ export const getMyTeamAPI = (data) =>
 // 我的资产
 export const getMyAssetAPI = (data) =>
   http({
-    url: '/api/user/myassets',
+    url: '/api/user/moneyloglist',
     method: 'POST',
     data,
   })
@@ -148,3 +154,61 @@ export const getWithdrawalRecordAPI = (data) =>
     method: 'POST',
     data,
   })
+
+// 下载APP
+export const downloadAppAPI = () => {
+  location.href = 'https://r2.maldiveswallet.vip/app/qmbz-3.apk'
+}
+
+// 社区我的邀请
+export const getCommunityMyInviteAPI = (data) =>
+  http({
+    url: '/api/user/inviteelist',
+    method: 'POST',
+    data,
+  })
+
+// 领取奖励第一步
+export const getCommunityInviteFirstAPI = () =>
+  http({
+    url: '/api/user/rewardone',
+    method: 'POST',
+  })
+
+// 领取救济金
+export const getCommunityInviteRewardAPI = (data) =>
+  http({
+    url: '/api/user/rewardtwo',
+    method: 'POST',
+    data,
+  })
+
+// 签到功能
+export const getSignInAPI = () =>
+  http({
+    url: '/api/user/signin',
+    method: 'POST',
+  })
+
+// 开通个人养老账户
+export const getOpenPersonalAccountAPI = () =>
+  http({
+    url: '/api/user/activateold',
+    method: 'POST',
+  })
+
+// 养老金转入余额
+export const getOldMoneyTransferAPI = (data) =>
+  http({
+    url: '/api/user/yangout',
+    method: 'POST',
+    data,
+  })
+
+// 佣金转入养老金
+export const getYongMoneyTransferAPI = (data) =>
+  http({
+    url: '/api/user/tuanduiout',
+    method: 'POST',
+    data,
+  })

src/store/user.ts

@@ -1,4 +1,4 @@
-import { getUserInfoAPI, logoutUserAPI } from '@/service'
+import { getRealNameAuthAPI, getUserInfoAPI, logoutUserAPI } from '@/service'
 import { mergeStep } from '@/utils'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
@@ -12,6 +12,16 @@ export const useUserStore = defineStore(
     const loadUserInfo = mergeStep(async () => {
       const res = await getUserInfoAPI()
       userInfo.value = res.data.userinfo
+
+      getRealNameAuthAPI().then((res) => {
+        if (Number(res.data?.status) !== 2) {
+          uni.reLaunch({
+            url: '/pages-sub/realname/index',
+          })
+        }
+        userInfo.value.realname = res.data.realname
+        return res.data
+      })
     })
 
     const setUserInfo = (val: IUserInfo) => {

src/types/auto-import.d.ts

@@ -75,6 +75,7 @@ declare global {
   const triggerRef: typeof import('vue')['triggerRef']
   const unref: typeof import('vue')['unref']
   const useAttrs: typeof import('vue')['useAttrs']
+  const useCaptcha: typeof import('../hooks/useCaptcha')['useCaptcha']
   const useCssModule: typeof import('vue')['useCssModule']
   const useCssVars: typeof import('vue')['useCssVars']
   const useId: typeof import('vue')['useId']
@@ -172,6 +173,7 @@ declare module 'vue' {
     readonly triggerRef: UnwrapRef<typeof import('vue')['triggerRef']>
     readonly unref: UnwrapRef<typeof import('vue')['unref']>
     readonly useAttrs: UnwrapRef<typeof import('vue')['useAttrs']>
+    readonly useCaptcha: UnwrapRef<typeof import('../hooks/useCaptcha')['useCaptcha']>
     readonly useCssModule: UnwrapRef<typeof import('vue')['useCssModule']>
     readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
     readonly useId: UnwrapRef<typeof import('vue')['useId']>

src/types/uni-pages.d.ts

@@ -12,17 +12,25 @@ 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/equity-withdrawal/index" |
+       "/pages-sub/hot-news/index" |
        "/pages-sub/introduction/index" |
        "/pages-sub/invest-detail/index" |
        "/pages-sub/invest-immediately/index" |
        "/pages-sub/invest-result/index" |
        "/pages-sub/invite/index" |
        "/pages-sub/lottery/index" |
+       "/pages-sub/my-room-certificate/index" |
+       "/pages-sub/news/index" |
        "/pages-sub/news-detail/index" |
        "/pages-sub/official-community/index" |
        "/pages-sub/realname/index" |
+       "/pages-sub/room-certificate/index" |
+       "/pages-sub/room-mail/index" |
+       "/pages-sub/room-transfer/index" |
        "/pages-sub/team/index" |
        "/pages-sub/withdrawal/index" |
        "/pages-sub/withdrawal-detail/index" |

src/typings.ts

@@ -2,7 +2,7 @@
 
 type IResData<T> = {
   code: number
-  msg: string
+  message: string
   data: T
 }
 

src/utils/http.ts

@@ -1,6 +1,19 @@
 import { CustomRequestOptions } from '@/interceptors/request'
 import { loginRoute } from '@/interceptors/route'
 import { useUserStore } from '@/store'
+import { mergeStep, showModal } from '.'
+
+const realnameJump = mergeStep(async (message) => {
+  if (location.href.includes('realname/index')) {
+    return
+  }
+  await showModal(message, {
+    confirmText: '立即认证',
+  })
+  uni.reLaunch({
+    url: '/pages-sub/realname/index',
+  })
+})
 
 export const http = <T>(options: CustomRequestOptions) => {
   // 1. 返回 Promise 对象
@@ -20,13 +33,16 @@ export const http = <T>(options: CustomRequestOptions) => {
             const data = res.data as IResData<T>
             if (data.code === 1) {
               resolve(data as IResData<T>)
-            } else if (data.code === 401) {
+            } else if (data.code === 1002) {
+              realnameJump(data.message)
+              reject(res)
+            } else if (data.code === 1001) {
               const userStore = useUserStore()
               userStore.logout()
               !options.hideErrorToast &&
                 (await uni.showModal({
                   title: '提示',
-                  content: data.msg || '请求错误',
+                  content: data.message || '请求错误',
                   showCancel: false,
                 }))
               uni.reLaunch({
@@ -38,7 +54,7 @@ export const http = <T>(options: CustomRequestOptions) => {
               !options.hideErrorToast &&
                 (await uni.showModal({
                   title: '提示',
-                  content: data.msg || '请求错误',
+                  content: data.message || '请求错误',
                   showCancel: false,
                 }))
               reject(res)
@@ -52,7 +68,7 @@ export const http = <T>(options: CustomRequestOptions) => {
           !options.hideErrorToast &&
             (await uni.showModal({
               title: '提示',
-              content: res.data.msg || '请求错误',
+              content: res.data.message || '请求错误',
               showCancel: false,
             }))
           uni.reLaunch({
@@ -65,7 +81,7 @@ export const http = <T>(options: CustomRequestOptions) => {
           !options.hideErrorToast &&
             (await uni.showModal({
               title: '提示',
-              content: (res.data as IResData<T>).msg || '请求错误',
+              content: (res.data as IResData<T>).message || '请求错误',
               showCancel: false,
             }))
           reject(res)

src/utils/index.ts

@@ -84,7 +84,7 @@ export const getAllPages = (key = 'notNeedLogin') => {
     ...pages
       .filter((page) => {
         if (!key) return false
-        return page[key] === false
+        return page[key] === true
       })
       .map((page) => ({
         ...page,

uno.config.ts

@@ -78,11 +78,11 @@ export default defineConfig({
     ],
     ['pt-safe', { 'padding-top': 'env(safe-area-inset-top)' }],
     ['pb-safe', { 'padding-bottom': 'env(safe-area-inset-bottom)' }],
-    ['btn-gradient', { background: 'linear-gradient(90deg,#95C3FF,#4D72F6)' }],
+    ['btn-gradient', { background: 'linear-gradient(90deg,#E4C096,#BE805A)' }],
     [
       'text-gradient',
       {
-        'background-image': 'linear-gradient(90deg,#95C3FF,#4D72F6 30%)',
+        'background-image': 'linear-gradient(180deg,#B2926B,#F5CB97)',
         'background-clip': 'text',
         color: 'transparent',
       },

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,
           }),
         ],