fix: 退出bug

.eslintrc-auto-import.json

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

.stylelintrc.cjs

@@ -33,12 +33,6 @@ module.exports = {
         ignorePseudoClasses: ['global', 'export', 'v-deep', 'deep'],
       },
     ],
-    'unit-no-unknown': [
-      true,
-      {
-        ignoreUnits: ['rpx'],
-      },
-    ],
     // 处理小程序page标签不认识的问题
     'selector-type-no-unknown': [
       true,

.vscode/settings.json

@@ -44,6 +44,7 @@
     "refresherrefresh",
     "scrolltolower",
     "tabbar",
+    "unibest",
     "uvui",
     "WechatMiniprogram"
   ],
@@ -58,5 +59,6 @@
     "CHANGELOG.md": "CHANGELOG*",
     "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,.npmrc,.browserslistrc",
     ".eslintrc.cjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,.stylelintrc.*,.eslintrc-auto-import.json,.editorconfig,.commitlint.cjs"
-  }
+  },
+  "i18n-ally.localesPaths": ["src/locale"]
 }

README.md

@@ -5,5 +5,5 @@
 </p>
 
 <h1 align="center">
-  <a href="https://github.com/feige996/unibest" target="_blank">x-1</a>
+  <a href="https://github.com/feige996/unibest" target="_blank">unibest - 最好的 uniapp 开发框架</a>
 </h1>

env/.env

@@ -7,8 +7,8 @@ VITE_WX_APPID = 'wxa2abb91f64032a2b'
 # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base
 VITE_APP_PUBLIC_BASE=/
 
-VITE_SERVER_BASEURL = 'https://api.divine913.com'
+VITE_SERVER_BASEURL = 'https://mapi.foxmail555.cc'
-VITE_UPLOAD_BASEURL = 'https://api.divine913.com/api/v1/UploadFile'
+VITE_UPLOAD_BASEURL = 'https://ukw0y1.laf.run/upload'
 
 # h5是否需要配置代理
 VITE_APP_PROXY=false

index.html

@@ -14,7 +14,7 @@
           '" />',
       )
     </script>
-    <title></title>
+    <title>unibest</title>
     <!--preload-links-->
     <!--app-context-->
   </head>

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "中国经济",
+  "name": "马尔代夫国际钱包",
   "type": "commonjs",
   "version": "2.5.3",
   "description": "unibest - 最好的 uniapp 开发模板",
@@ -108,6 +108,7 @@
     "pinia-plugin-persistedstate": "3.2.1",
     "qs": "6.5.3",
     "vue": "3.4.21",
+    "vue-i18n": "9.1.9",
     "wot-design-uni": "^1.4.0",
     "z-paging": "^2.8.4"
   },

pages.config.ts

@@ -32,17 +32,18 @@ export default defineUniPages({
         pagePath: 'pages/index/index',
         text: '首页',
       },
+
+      {
+        iconPath: 'static/tabbar/house.png',
+        selectedIconPath: 'static/tabbar/houseHL.png',
+        pagePath: 'pages/invite/index',
+        text: '邀请好友',
+      },
       {
         iconPath: 'static/tabbar/invest.png',
         selectedIconPath: 'static/tabbar/investHL.png',
         pagePath: 'pages/invest/index',
-        text: '投资',
+        text: '理财',
-      },
-      {
-        iconPath: 'static/tabbar/house.png',
-        selectedIconPath: 'static/tabbar/houseHL.png',
-        pagePath: 'pages/house/index',
-        text: '房屋',
       },
       {
         iconPath: 'static/tabbar/personal.png',

pnpm-lock.yaml

@@ -77,6 +77,9 @@ importers:
       vue:
         specifier: 3.4.21
         version: 3.4.21(typescript@5.7.2)
+      vue-i18n:
+        specifier: 9.1.9
+        version: 9.1.9(vue@3.4.21(typescript@5.7.2))
       wot-design-uni:
         specifier: ^1.4.0
         version: 1.4.0(vue@3.4.21(typescript@5.7.2))
@@ -5426,6 +5429,12 @@ packages:
     peerDependencies:
       eslint: '>=6.0.0'
 
+  vue-i18n@9.1.9:
+    resolution: {integrity: sha512-JeRdNVxS2OGp1E+pye5XB6+M6BBkHwAv9C80Q7+kzoMdUDGRna06tjC0vCB/jDX9aWrl5swxOMFcyAr7or8XTA==}
+    engines: {node: '>= 10'}
+    peerDependencies:
+      vue: ^3.0.0
+
   vue-router@4.5.0:
     resolution: {integrity: sha512-HDuk+PuH5monfNuY+ct49mNmkCRK4xJAV9Ts4z9UFc4rzdDnxQLyCMGGc8pKhZhHTVzfanpNwB/lwqevcBwI4w==}
     peerDependencies:
@@ -12238,6 +12247,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  vue-i18n@9.1.9(vue@3.4.21(typescript@5.7.2)):
+    dependencies:
+      '@intlify/core-base': 9.1.9
+      '@intlify/shared': 9.1.9
+      '@intlify/vue-devtools': 9.1.9
+      '@vue/devtools-api': 6.6.4
+      vue: 3.4.21(typescript@5.7.2)
+
   vue-router@4.5.0(vue@3.4.21(typescript@5.7.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4

scripts/postupgrade.js

@@ -19,7 +19,7 @@ const dependencies = [
   '@dcloudio/uni-mp-xhs',
   '@dcloudio/uni-quickapp-webview',
   // i18n模板要注释掉下面的
-  'vue-i18n',
+  // 'vue-i18n',
 ]
 
 // 使用exec执行命令

src/App.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
+import { onLaunch, onHide } from '@dcloudio/uni-app'
 import { useUserStore } from './store'
 import { checkWithRedirectLogin, loginRoute } from './interceptors/route'
 

src/components/Avatar.vue

@@ -20,8 +20,9 @@ defineProps({
       block
       overflow-hidden
       rounded-full
-      style="background: linear-gradient(180deg, #96e517 0%, #8bc135 100%)"
+      bg-gray-100
       class="h-full w-full"
+      mode="aspectFill"
       :src="src ?? DefaultAavatar"
     />
   </div>

src/components/GridLottery.vue

@@ -0,0 +1,222 @@
+<template>
+  <view
+    class="grid-lottery"
+    :style="{
+      height: gridLotteryHeight,
+    }"
+  >
+    <view class="lottery-list">
+      <view
+        v-for="(item, index) in formateList"
+        :key="item.id"
+        class="lottery-item"
+        :style="{
+          width: `${itemWidth}%`,
+          height: `${itemHeight}${itemHeightUnit}`,
+          transform: `translate(${place(index).x}%, ${place(index).y}${itemHeightUnit})`,
+        }"
+      >
+        <view class="relative">
+          <slot name="lottery-item" :data="item" :index="index" :currIndex="currIndex" />
+        </view>
+      </view>
+    </view>
+    <view
+      class="start-button"
+      :style="{
+        left: `${itemWidth}%`,
+        right: `${itemWidth}%`,
+        top: `${itemWidth}%`,
+        bottom: `${itemWidth}%`,
+      }"
+      @tap="onStart"
+    >
+      <slot name="start-button"></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'GridLottery',
+  props: {
+    // 转盘转动间隔
+    interval: {
+      type: Number,
+      default: 50,
+    },
+    // 是否逐渐减速
+    isIntervalIncrease: {
+      type: Boolean,
+      default: true,
+    },
+    // 减速开始时间
+    intervalIncreaseStartTime: {
+      type: Number,
+      default: 3000,
+    },
+    // 最小速度
+    maxInterval: {
+      type: Number,
+      default: 500,
+    },
+    // 奖项外框高度
+    itemHeight: {
+      type: Number,
+      default: 100,
+    },
+    // 高度单位
+    itemHeightUnit: {
+      type: String,
+      default: 'rpx',
+    },
+    // 总数必须为>=8 且被4整除
+    list: {
+      type: Array,
+      default() {
+        // return [
+        //   {
+        //     id: string,
+        //     sort: number
+        //   }
+        // ];
+        return []
+      },
+    },
+  },
+  data() {
+    return {
+      transform: {
+        x: 0,
+        y: 0,
+      },
+      currIndex: 0,
+      startFlag: false,
+    }
+  },
+  computed: {
+    gridLotteryHeight({ itemHeight, formateList, colunmCount, itemHeightUnit }) {
+      return `${itemHeight * ((formateList.length - colunmCount * 2) / 2 + 2)}${itemHeightUnit}`
+    },
+    itemWidth() {
+      return 100 / this.colunmCount
+    },
+    colunmCount() {
+      const len = this.list.length
+      if (len > 8) {
+        return 3 + Math.floor((len - 8) / 4)
+      }
+      return 3
+    },
+
+    formateList() {
+      const len = this.list.length
+      if (len > 7 && (len - 8) % 4 !== 0) {
+        console.warn(
+          '请检查数组，总数必须为>=8 且大余8部分部分能被4整除，如长度为8、12、16...的数组',
+        )
+      }
+      const _list = this.list || []
+      const formateList = _list.sort((a, b) => a.sort - b.sort)
+      return formateList
+    },
+  },
+  methods: {
+    // 通过索引获取定位
+    place(index) {
+      const len = this.list.length
+      // 序号
+      const indexToOrder = index + 1
+      if (indexToOrder > this.colunmCount) {
+        // 去除上下行，总行数
+        const rowCount = (len - this.colunmCount * 2) / 2
+        // 非处于左侧
+        if (index > this.colunmCount + rowCount) {
+          // 处于右侧
+          if (indexToOrder > this.colunmCount * 2 + rowCount) {
+            return {
+              x: 0,
+              y: this.itemHeight * (rowCount * 2 + this.colunmCount * 2 - index),
+            }
+          }
+          // 处于底部
+          return {
+            x: 100 * (this.colunmCount * 2 + rowCount - indexToOrder),
+            y: this.itemHeight * (rowCount + 1),
+          }
+        }
+        // 处于右侧
+        return {
+          x: 100 * (this.colunmCount - 1),
+          y: this.itemHeight * (indexToOrder - this.colunmCount),
+        }
+      }
+      // 处于顶部
+      return {
+        x: 100 * index,
+        y: 0,
+      }
+    },
+    /**
+     * 开始抽奖
+     * @param {string|number} id 获奖id
+     * @param {number} minTime 转盘最小持续时间
+     */
+    async start(id, minTime) {
+      if (this.startFlag) return
+      const len = this.formateList.length
+      const activeIndex = this.formateList.findIndex((item) => item.id === id)
+      if (activeIndex === -1) {
+        const errorText = `没有找到该中奖id ${id}`
+        console.error(errorText)
+        return this.$emit('onError', errorText)
+      }
+      let time = minTime
+      // 动画速度
+      let interval = this.interval
+      const startRotate = () => {
+        this.startFlag = true
+        clearTimeout(this.timer)
+        this.timer = setTimeout(() => {
+          // 抽奖结束
+          if (time < 1 && this.currIndex === activeIndex) {
+            this.startFlag = false
+            clearTimeout(this.timer)
+            return this.$emit('onEnd', this.formateList[activeIndex])
+          }
+          time -= interval
+          if (time < 3000 && this.isIntervalIncrease) {
+            // 调整动画速度
+            interval = interval >= this.maxInterval ? this.maxInterval : interval + 20
+          }
+          this.currIndex = this.currIndex >= len - 1 ? 0 : this.currIndex + 1
+          this.transform = this.place(this.currIndex)
+          return startRotate()
+        }, interval)
+      }
+      startRotate()
+    },
+    onStart() {
+      this.$emit('onStart')
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.grid-lottery {
+  position: relative;
+  .start-button {
+    position: absolute;
+  }
+  .lottery-list {
+    display: flex;
+    flex-wrap: wrap;
+    .lottery-item {
+      position: absolute;
+      top: 0;
+      left: 0;
+    }
+  }
+}
+</style>

src/hooks/useCaptcha.ts

@@ -1,11 +0,0 @@
-export const useCaptcha = () => {
-  const codeUrl = ref('')
-  const refreshCode = () => {
-    const baseUrl = import.meta.env.VITE_SERVER_BASEURL
-    codeUrl.value = baseUrl + '/api/v1/getCaptcha?t=' + Date.now()
-  }
-  onMounted(() => {
-    refreshCode()
-  })
-  return { codeUrl, refreshCode }
-}

src/hooks/useListPageRequest.ts

@@ -1,9 +1,10 @@
+import { formatTime, getImageUrl } from '@/utils'
 import { onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
 import { computed, onMounted, ref } from 'vue'
 
 interface PaginationRequest {
-  pageIndex?: number
+  page?: number
-  pageSize?: number
+  limit?: number
   [key: string]: any
 }
 
@@ -22,10 +23,10 @@ function useListPageRequest(
   const moreLoading = ref(false)
   // 全部数据加载完成
   const totalPage = ref(0)
-  const finished = computed(() => totalPage.value <= pagingParams.value.pageIndex)
+  const finished = computed(() => totalPage.value <= pagingParams.value.page)
   const pagingParams = ref<PaginationRequest>({
-    pageIndex: 1,
+    page: 1,
-    pageSize: 10,
+    limit: 1000,
   })
   const getPagingParams = computed(() => {
     return {
@@ -49,13 +50,18 @@ function useListPageRequest(
       ...getPagingParams.value,
       ...customParams,
     })
-    totalPage.value = data.count ? Math.ceil(data.count / pagingParams.value.pageSize!) : 0
+    console.log(data)
-    list.value.push(...data.list)
+    data.forEach((item: any) => {
+      item.createtime = formatTime(item.createtime)
+      item.image = getImageUrl(item.image)
+    })
+    // totalPage.value = data.count ? Math.ceil(data.count / pagingParams.value.limit!) : 0
+    list.value.push(...data)
   }
 
   const onReload = async (params?: AnyObject) => {
     loading.value = true
-    pagingParams.value.pageIndex = 1
+    pagingParams.value.page = 1
     if (params) {
       customParams = params
     }
@@ -70,7 +76,7 @@ function useListPageRequest(
     if (finished.value) {
       return
     }
-    pagingParams.value.pageIndex = pagingParams.value.pageIndex! + 1
+    pagingParams.value.page = pagingParams.value.page! + 1
     moreLoading.value = true
     try {
       await loadData()

src/hooks/useRequest.ts

@@ -17,7 +17,7 @@ type IUseRequestOptions<T> = {
  */
 export default function useRequest<T>(
   func: () => Promise<IResData<T>>,
-  options: IUseRequestOptions<T> = { immediate: true },
+  options: IUseRequestOptions<T> = { immediate: false },
 ) {
   const loading = ref(false)
   const error = ref(false)

src/interceptors/index.ts

@@ -1,3 +1,3 @@
-export { routerBeforeEachConfig } from './route'
+export { routeInterceptor, routerBeforeEachConfig } from './route'
 export { requestInterceptor } from './request'
 export { prototypeInterceptor } from './prototype'

src/interceptors/request.ts

@@ -51,9 +51,8 @@ const httpInterceptor = {
     }
     // 3. 添加 token 请求头标识
     const userStore = useUserStore()
-    const token = userStore.token
+    if (userStore.token) {
-    if (token) {
+      options.header.token = userStore.token
-      options.header.Authorization = token
     }
   },
 }

src/locale/README.md

@@ -0,0 +1,12 @@
+# 注意事项
+
+> 文件夹名字必须为 `locale`, 这是 `uniapp` 官方约定的，如果改为别的，标题将不能正常切换多语言（其他内容还是正常）。
+>
+> `xxx.json` 的 `xxx` 多语言标识必须与 `uniapp` 官方约定的一致，否则也会出现 BUG。
+>
+> 查看截图 `screenshots/i18n.png`。
+
+## 参考文档
+
+[uniapp 国际化开发指南](https://uniapp.dcloud.net.cn/tutorial/i18n.html)
+[uniapp 国际化-注意事项](https://uniapp.dcloud.net.cn/api/ui/locale.html#onlocalechange) 最下面的注意事项

src/locale/en.json

@@ -0,0 +1,8 @@
+{
+  "tabbar.home": "Home",
+  "tabbar.about": "About",
+  "app.name": "En Title",
+  "weight": "{heavy}KG",
+  "detail": "{0}cm, {1}KG",
+  "introduction": "I am {name},height:{detail.height},weight:{detail.weight}"
+}

src/locale/index.ts

@@ -0,0 +1,80 @@
+import { createI18n } from 'vue-i18n'
+
+import en from './en.json'
+import zhHans from './zh-Hans.json' // 简体中文
+
+const messages = {
+  en,
+  'zh-Hans': zhHans, // key 不能乱写，查看截图 screenshots/i18n.png
+}
+
+const i18n = createI18n({
+  locale: uni.getLocale(), // 获取已设置的语言，fallback 语言需要再 manifest.config.ts 中设置
+  messages,
+  allowComposition: true,
+})
+
+console.log(uni.getLocale())
+console.log(i18n.global.locale)
+
+/**
+ * 可以拿到原始的语言模板，非 vue 文件使用这个方法，
+ * @param { string } key 多语言的key，eg: "app.name"
+ * @returns {string} 返回原始的多语言模板，eg: "{heavy}KG"
+ */
+export const getTemplateByKey = (key: string) => {
+  if (!key) {
+    console.error(`[i18n] Function getTemplateByKey(), key param is required`)
+    return ''
+  }
+  const locale = uni.getLocale()
+  console.log('locale:', locale)
+
+  const message = messages[locale] // 拿到某个多语言的所有模板（是一个对象)
+  if (Object.keys(message).includes(key)) {
+    return message[key]
+  }
+
+  try {
+    const keyList = key.split('.')
+    return keyList.reduce((pre, cur) => {
+      return pre[cur]
+    }, message)
+  } catch (error) {
+    console.error(`[i18n] Function getTemplateByKey(), key param ${key} is not existed.`)
+    return ''
+  }
+}
+
+/**
+ * formatI18n('我是{name},身高{detail.height},体重{detail.weight}',{name:'张三',detail:{height:178,weight:'75kg'}})
+ * 暂不支持数组
+ * @param template 多语言模板字符串，eg: `我是{name}`
+ * @param {Object|undefined} data 需要传递的数据对象，里面的key与多语言字符串对应，eg: `{name:'菲鸽'}`
+ * @returns
+ */
+function formatI18n(template: string, data?: any) {
+  return template.replace(/\{([^}]+)\}/g, function (match, key: string) {
+    // console.log( match, key) // => { detail.height }  detail.height
+    const arr = key.trim().split('.')
+    let result = data
+    while (arr.length) {
+      const first = arr.shift()
+      result = result[first]
+    }
+    return result
+  })
+}
+
+/**
+ * t('introduction',{name:'张三',detail:{height:178,weight:'75kg'}})
+ * => formatI18n('我是{name},身高{detail.height},体重{detail.weight}',{name:'张三',detail:{height:178,weight:'75kg'}})
+ * 没有key的，可以不传 data；暂不支持数组
+ * @param template 多语言模板字符串，eg: `我是{name}`
+ * @param {Object|undefined} data 需要传递的数据对象，里面的key与多语言字符串对应，eg: `{name:'菲鸽'}`
+ * @returns
+ */
+export function t(key, data?) {
+  return formatI18n(getTemplateByKey(key), data)
+}
+export default i18n

src/locale/zh-Hans.json

@@ -0,0 +1,8 @@
+{
+  "tabbar.home": "首页",
+  "tabbar.about": "关于",
+  "app.name": "中文标题",
+  "weight": "{heavy}公斤",
+  "detail": "{0}cm, {1}公斤",
+  "introduction": "我是 {name},身高:{detail.height},体重:{detail.weight}"
+}

src/pages-sub/asset/index.vue

@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationBarTitleText: '我的资产',
@@ -7,60 +7,61 @@
 }
 </route>
 
+<script lang="ts" setup>
+import { getMyAssetAPI } from '@/service'
+import { useUserStore } from '@/store'
+
+const userStore = useUserStore()
+
+const detailInfo = ref({
+  point: 1,
+  score: 1000,
+  suminvest: '10000',
+})
+const { list: assetList } = useListPageRequest((params) =>
+  getMyAssetAPI(params).then((res) => {
+    detailInfo.value = res.data
+    res.data.data = res.data.list
+    return res.data
+  }),
+)
+</script>
+
 <template>
   <view class="min-h-screen py-15">
     <view class="mx-15 text-16 font-bold text-#333">我的资产</view>
     <view
-      class="mt-15 mx-15 text-white btn-gradient p-15 rounded-10 shadow-[0_5px_30px_rgba(55,230,236,0.4)]"
+      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">总投资金</view>
+      <view class="text-14 text-#6784C7">总投资金</view>
-      <view class="text-35 mt-10 font-bold">{{ userStore.userInfo?.member_investment }}</view>
+      <view class="text-35 mt-10 font-bold">{{ detailInfo.suminvest }}</view>
-      <view class="flex mt-15">
-        <view class="flex-1">
-          <view class="text-12 font-light">我的分红</view>
-          <view class="text-16 font-bold mt-5">{{ userStore.userInfo?.member_dividend }}</view>
-        </view>
-        <view class="flex-1">
-          <view class="text-12 font-light">数字人民币</view>
-          <view class="text-16 font-bold mt-5">{{ userStore.userInfo?.member_dividend }}</view>
-        </view>
-        <view class="flex-1">
-          <view class="text-12 font-light">认购点</view>
-          <view class="text-16 font-bold mt-5">{{ userStore.userInfo?.member_point }}</view>
-        </view>
-      </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 list"
+      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.title }}</view>
+        <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">奖励</view> -->
-        <view class="text-12 mt-10 text-#999">{{ item.create_time }}</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">
+        <view class="text-14 font-bold text-#FF5F5F">{{ item.money }}</view>
-          {{ item.action === 1 ? '+' : '-' }}{{ item.money }}
+        <!-- <view class="text-14 mt-10 py-4 px-10 bg-#71C78A1A text-#71C78A">已到账</view> -->
-        </view>
-        <!-- <view class="text-14 font-bold text-#FF5F5F">+2000 RMB</view> -->
-        <!-- <view class="text-14 font-bold text-#FF5F5F">+30 点</view> -->
-        <view class="text-14 mt-10 py-4 px-10 bg-#71C78A1A text-#71C78A" v-if="item.status === 1">
-          {{ item.action === 1 ? '已到账' : '已扣除' }}
-        </view>
       </view>
     </view>
   </view>
 </template>
 
-<script setup lang="ts">
+<style>
-import { getBalanceRecordsAPI } from '@/service'
+.main-content {
-import { useUserStore } from '@/store'
+  background-image: url('@/static/images/page-sub/team/main-bg.png');
-const userStore = useUserStore()
+  background-repeat: no-repeat;
-
+  background-position: center;
-const { list } = useListPageRequest(getBalanceRecordsAPI)
+  background-size: 100% 100%;
-</script>
+}
+</style>

src/pages-sub/convert/index.vue

@@ -0,0 +1,84 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    navigationBarTitleText: '转换',
+  },
+}
+</route>
+<template>
+  <view class="min-h-screen pb-100">
+    <NavBar>
+      <template #right>
+        <image
+          @click="onWithdrawalDetail"
+          src="/static/images/page-sub/recharge.png"
+          class="w-24 h-24"
+        />
+      </template>
+    </NavBar>
+    <view class="p-15">
+      <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="请输入股数"
+            class="text-14 text-#333 flex-1"
+          />
+          <view class="text-12 text-gradient" @click="convertNum = userStore.userInfo.score">
+            全部
+          </view>
+        </view>
+        <view class="text-12 text-#889BC6 mt-15">马尔代夫股权每股价值500元</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="btn-gradient flex-1 text-center text-white rounded-full text-14 px-30 py-10"
+          @click="onSubmit"
+        >
+          确认转换至余额
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import NavBar from '@/components/NavBar.vue'
+import { convertScoreAPI } from '@/service'
+import { useUserStore } from '@/store'
+import { mergeStep, showModal } from '@/utils'
+
+const userStore = useUserStore()
+
+const convertNum = ref('')
+
+const onWithdrawalDetail = () => {
+  uni.navigateTo({
+    url: '/pages-sub/asset/index',
+  })
+}
+
+const onSubmit = mergeStep(async () => {
+  await showModal('确认转换？')
+  await convertScoreAPI({
+    score: convertNum.value,
+  })
+  await showModal('转换成功')
+  userStore.loadUserInfo()
+  onWithdrawalDetail()
+})
+</script>
+
+<style scoped></style>

src/pages-sub/introduction/index.vue

@@ -1,27 +1,34 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationBarTitleText: '公司简介',
+    navigationBarBackgroundColor: '#fff',
   },
 }
 </route>
 
-<script setup lang="ts">
-import { getCompanyInfoAPI } from '@/service'
-
-const { data: companyInfo } = useRequest(() => getCompanyInfoAPI())
-</script>
-
 <template>
-  <view class="pt-15 pb-50 min-h-screen">
+  <view class="pt-15 pb-50 min-h-screen" v-if="introductionDetail">
-    <view class="text-center text-16 font-bold">{{ companyInfo.title }}</view>
+    <view class="text-center text-16 font-bold">{{ introductionDetail.name }}</view>
     <image
       class="w-345 h-170 rounded-10 mt-15 mx-auto block"
-      :src="companyInfo.cover_image"
+      :src="introductionDetail.image"
       mode="aspectFill"
     />
-    <view class="text-gray-500 mx-16 text-14 mt-15">
+    <view class="text-gray-500 mx-16 text-14 mt-15 break-all">
-      {{ companyInfo.description }}
+      {{ introductionDetail.content }}
     </view>
   </view>
 </template>
+
+<script setup lang="ts">
+import { getIntroductionAPI } from '@/service'
+
+const { list: introductionList } = useListPageRequest((params) =>
+  getIntroductionAPI({ type: 3, ...params }),
+)
+
+const introductionDetail = computed(() => {
+  return introductionList.value[0]
+})
+</script>

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

@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationBarTitleText: '投资记录',
@@ -6,33 +6,32 @@
   },
 }
 </route>
-<script lang="ts" setup>
-import { getBuyFundOrderListAPI } from '@/service'
-import { useListPageRequest } from '@/hooks/useListPageRequest'
-import { formatTime } from '@/utils'
 
-const { list: fundList } = useListPageRequest(getBuyFundOrderListAPI)
+<script setup lang="ts">
+import { getInvestmentRecordAPI } from '@/service'
+
+const { list: investmentRecordList } = useListPageRequest(getInvestmentRecordAPI)
 </script>
 <template>
   <view class="min-h-screen pb-100">
-    <template v-if="fundList.length > 0">
+    <template v-if="investmentRecordList.length">
       <view
         class="flex px-15 py-8 border-b border-#E5E5E5 border-b-solid"
-        v-for="item in fundList"
+        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.fund_name }}</view>
+          <view class="text-14 text-#333">{{ item.name }}</view>
           <view class="text-12 text-#999">投资</view>
-          <view class="text-12 text-#999">{{ formatTime(item.create_time * 1000) }}</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.buy_price }} RMB</view>
+          <view class="text-16 text-#FF5F5F">{{ item.money }}</view>
           <view
             class="text-14 mt-18 py-4 px-10 bg-#71C78A1A text-#71C78A"
-            v-if="item.order_status === 1"
+            v-if="Number(item.status) === 1"
           >
             投资成功
           </view>

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

@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationStyle: 'custom',

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

@@ -1,7 +1,7 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
-    navigationBarTitleText: '充值成功',
+    navigationBarTitleText: '投资成功',
     navigationBarBackgroundColor: '#fff',
   },
 }
@@ -9,7 +9,7 @@
 <template>
   <view class="min-h-screen flex flex-col items-center justify-center">
     <image mode="aspectFit" src="/static/images/page-sub/invest-success.png" class="w-150 h-150" />
-    <view class="text-17 text-#333">恭喜您！充值成功</view>
+    <view class="text-17 text-#333">恭喜您！投资成功</view>
     <!-- 返回 -->
     <view class="mt-15">
       <view @click="onBack" class="btn-gradient text-14 text-white rounded-full px-30 py-10">

src/pages-sub/invite/index.vue

@@ -1,41 +1,52 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationBarTitleText: '邀请好友',
     navigationBarBackgroundColor: '#fff',
+    navigationStyle: 'custom',
   },
 }
 </route>
 
 <script setup lang="ts">
-import { useUserStore } from '@/store'
+import NavBar from '@/components/NavBar.vue'
 import VueQrcode from '@chenfengyuan/vue-qrcode'
 
-const userStore = useUserStore()
+const qrcodeValue = '/pages/register/index?invite=888888'
-
-const qrcodeValue =
-  location.origin + '/#/pages/register/index?invite=' + userStore.userInfo?.invitation_code
 
 const onCopy = (code: string) => {
   uni.setClipboardData({
     data: code,
   })
 }
+
+const onLottery = () => {
+  uni.navigateTo({
+    url: '/pages-sub/lottery/index',
+  })
+}
 </script>
 
 <template>
-  <view class="pt-250 pb-100 min-h-screen invite-page">
+  <view class="pb-100 min-h-screen invite-page">
-    <view class="flex flex-col items-center">
+    <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.invitation_code }}</text>
+          <text class="font-bold">9999999</text>
         </view>
         <view
           class="btn-gradient text-white rounded-full px-15 py-4 text-12 ml-10"
-          @click="onCopy(userStore.userInfo.invitation_code)"
+          @click="onCopy('99999')"
         >
           复制
         </view>

src/pages-sub/lottery/index.vue

@@ -0,0 +1,146 @@
+<route lang="json5">
+{
+  style: {
+    navigationBarTitleText: '转盘抽奖',
+    navigationBarBackgroundColor: '#fff',
+    navigationStyle: 'custom',
+  },
+}
+</route>
+
+<script setup lang="ts">
+import NavBar from '@/components/NavBar.vue'
+import GridLottery from '@/components/GridLottery.vue'
+
+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 onEnd = () => {
+  console.log('onEnd')
+}
+</script>
+
+<template>
+  <view class="min-h-screen lottery-page">
+    <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>
+    <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>
+  </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%;
+}
+.lottery-page {
+  background-color: #517aae;
+  background-image: url('@/static/images/lottery-bg.png');
+  background-repeat: no-repeat;
+  background-position: top;
+  background-size: 100%;
+}
+</style>

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

@@ -7,22 +7,26 @@
 }
 </route>
 <script setup lang="ts">
-import { getNewsDetailAPI } from '@/service'
+import { getIntroductionDetailAPI } from '@/service'
+import { getImageUrl } from '@/utils'
+import dayjs from 'dayjs'
 
 const newsDetail = ref<any>({})
 onLoad(async (options) => {
-  const { data } = await getNewsDetailAPI({ news_id: options.id })
+  const { data } = await getIntroductionDetailAPI({ id: options.id })
   newsDetail.value = data
 })
 </script>
 <template>
   <view class="min-h-screen pb-100 pt-30 px-15">
-    <view class="text-20 text-black font-bold">{{ newsDetail.title }}</view>
+    <view class="text-20 text-black font-bold">{{ newsDetail.name }}</view>
     <view class="flex justify-between py-10">
-      <view class="text-14 text-gray-500">{{ newsDetail.auther }}</view>
+      <view class="text-14 text-gray-500">{{ newsDetail.source }}</view>
-      <view class="text-14 text-gray-500">{{ newsDetail.create_time }}</view>
+      <view class="text-14 text-gray-500">
+        {{ dayjs(newsDetail.createtime * 1000).format('YYYY-MM-DD HH:mm') }}
       </view>
-    <image class="w-full mt-15" mode="widthFix" :src="newsDetail.cover_image" />
+    </view>
-    <view class="text-14 text-gray-600 mt-15">{{ newsDetail.description }}</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>
 </template>

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

@@ -3,7 +3,7 @@ import NavBar from '@/components/NavBar.vue'
 import VueQrcode from '@chenfengyuan/vue-qrcode'
 </script>
 
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationBarTitleText: '官方社群',

src/pages-sub/purchase-member/index.vue

@@ -1,127 +0,0 @@
-<template>
-  <view class="min-h-screen pt-50 pb-100">
-    <view
-      class="w-345 mx-auto rounded-10 btn-gradient px-30 pb-20 relative shadow-[0_5px_30px_rgba(55,230,236,0.4)]"
-    >
-      <view class="relative -top-30px">
-        <view class="relative w-70">
-          <Avatar class="w-70 h-70 box-border" />
-          <view
-            class="text-center left-1/2 whitespace-nowrap -translate-x-1/2 py-2 px-10 absolute -bottom-6 bg-[linear-gradient(180deg,#FFD54B,#FFB99A)] rounded-full text-10 left-0 text-#fff"
-          >
-            黄金会员
-          </view>
-        </view>
-        <view class="text-16 mt-15 text-#fff">132***0101</view>
-      </view>
-      <view class="absolute -bottom-10 right-30 text-90 leading-80 font-bold text-#ffffff20">
-        VIP
-      </view>
-    </view>
-
-    <view class="mt-30 w-345 mx-auto grid grid-cols-3 gap-10">
-      <view
-        class="bg-#fff py-40 rounded-10 text-center border border-#E5E5E5 border-solid"
-        v-for="(item, index) of vipList"
-        :key="item.id"
-        :class="{
-          '!bg-[linear-gradient(90deg,#3B81F320,#37E6EC20)]': currentVipIndex === index,
-          '!border-#3B81F3': currentVipIndex === index,
-        }"
-        @click="currentVipIndex = index"
-      >
-        <view class="text-14">{{ item.vip_name }}</view>
-        <view class="mt-10 text-20 font-bold">{{ item.buy_price }}</view>
-      </view>
-    </view>
-
-    <view class="text-center mt-30 mt-30 pt-30 border-t-8 border-#f7f7f7 border-t-solid">
-      <view class="text-18 font-500 text-#333">会员专属权益</view>
-      <view class="text-14 text-#666 mt-10">每日获得高收益分红</view>
-    </view>
-
-    <view class="mt-30 w-345 mx-auto grid grid-cols-3 gap-10">
-      <view class="bg-#fff py-20 rounded-10 text-center border border-#E5E5E5 border-solid">
-        <image
-          class="w-50 h-50"
-          src="@/static/images/page-sub/purchase-member/icon-1.png"
-          mode="scaleToFill"
-        />
-        <view class="mt-10 text-12 text-#999">每日可以获取</view>
-        <view class="text-14 font-bold text-#FF5F5F">
-          {{ Number(vipList[currentVipIndex].award_investment) }}投资金
-        </view>
-      </view>
-      <view class="border border-#E5E5E5 border-solid py-20 rounded-10 text-center">
-        <image
-          class="w-50 h-50"
-          src="@/static/images/page-sub/purchase-member/icon-2.png"
-          mode="scaleToFill"
-        />
-        <view class="mt-10 text-12 text-#999">数字人民币</view>
-        <view class="text-14 font-bold text-#FF5F5F">
-          {{ Number(vipList[currentVipIndex].award_currency) }}元
-        </view>
-      </view>
-      <view class="bg-#fff py-20 rounded-10 text-center border border-#E5E5E5 border-solid">
-        <image
-          class="w-50 h-50"
-          src="@/static/images/page-sub/purchase-member/icon-3.png"
-          mode="scaleToFill"
-        />
-        <view class="mt-10 text-12 text-#999">AI智能</view>
-        <view class="text-14 font-bold text-#FF5F5F">
-          {{ vipList[currentVipIndex].dividend_multiple }}倍
-        </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="btn-gradient flex-1 text-center text-white rounded-full text-14 px-30 py-10"
-          @click="onSubmit"
-        >
-          立即购买
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script lang="ts" setup>
-import Avatar from '@/components/Avatar.vue'
-import { buyVIPAPI, getVipListAPI } from '@/service'
-import { useUserStore } from '@/store'
-import { mergeStep, showModal } from '@/utils'
-
-const vipList = ref<any[]>([])
-const currentVipIndex = ref(0)
-onLoad(() => {
-  getVipListAPI().then((res) => {
-    vipList.value = res.data.list
-  })
-})
-
-const userStore = useUserStore()
-const onSubmit = mergeStep(async () => {
-  console.log(vipList.value[currentVipIndex.value])
-  await showModal('确认购买吗？')
-  await buyVIPAPI({
-    fund_id: vipList.value[currentVipIndex.value].id,
-  })
-  await showModal('购买成功')
-  await userStore.loadUserInfo()
-})
-</script>
-
-<route lang="json5" type="page">
-{
-  style: {
-    navigationBarTitleText: '购买会员',
-    navigationBarBackgroundColor: '#fff',
-  },
-}
-</route>

src/pages-sub/realname/index.vue

@@ -9,47 +9,7 @@
 
 <template>
   <view class="withdrawal-type-edit-page pb-100 min-h-screen">
-    <template v-if="Number(userStore.userInfo?.member_certification) === 2">
+    <template v-if="!realnameInfo">
-      <image
-        src="@/static/images/page-sub/realname/realname-checking.png"
-        class="w-150 mx-auto h-150 block"
-        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>
-    </template>
-    <template v-else-if="Number(userStore.userInfo?.member_certification) === 1">
-      <view class="flex flex-col items-center">
-        <image
-          src="@/static/images/page-sub/realname/realname-success.png"
-          class="w-150 h-150 block"
-          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>
-      </view>
-    </template>
-    <template v-else-if="Number(userStore.userInfo?.member_certification) === 3">
-      <view class="flex flex-col items-center">
-        <image
-          src="@/static/images/page-sub/realname/realname-checking.png"
-          class="w-150 h-150 block"
-          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="onReachBottom"
-        >
-          重新提交
-        </button>
-      </view>
-    </template>
-    <template v-else>
       <view class="p-15 m-15 shadow-[0_0_10px_rgba(10,68,245,0.1)] rounded-10">
         <view class="flex items-center py-15 text-14">
           <image src="@/static/images/page-sub/realname/realname-type.png" class="w-20 h-20" />
@@ -64,7 +24,7 @@
             placeholder-class=" text-#889BC6 text-right"
             type="text"
             placeholder="请输入真实姓名"
-            v-model="form.credentials_name"
+            v-model="form.realname"
           />
         </view>
         <view class="flex items-center py-15 text-14">
@@ -75,7 +35,7 @@
             placeholder-class=" text-#889BC6 text-right"
             type="text"
             placeholder="请输入身份证号"
-            v-model="form.credentials_number"
+            v-model="form.cardnum"
           />
         </view>
       </view>
@@ -85,39 +45,81 @@
         </button>
       </view>
     </template>
+
+    <view v-else class="flex flex-col items-center">
+      <template v-if="Number(realnameInfo.status) === 1">
+        <image
+          src="@/static/images/page-sub/realname/realname-checking.png"
+          class="w-150 mx-auto h-150 block"
+          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>
+      </template>
+      <template v-else-if="Number(realnameInfo.status) === 2">
+        <image
+          src="@/static/images/page-sub/realname/realname-success.png"
+          class="w-150 h-150 block"
+          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>
+      </template>
+      <template v-else>
+        <image
+          src="@/static/images/page-sub/realname/realname-checking.png"
+          class="w-150 h-150 block"
+          mode="aspectFit"
+        />
+        <view class="text-center mt-15 text-14 text-#999">您的实名认证审核未通过，请重新提交</view>
+        <button
+          @click="() => (realnameInfo = null)"
+          class="btn-gradient px-30 text-white rounded-full m-15 text-16"
+        >
+          重新提交
+        </button>
+      </template>
+    </view>
   </view>
 </template>
 
 <script setup lang="ts">
-import { createAuthUser } from '@/service'
+import { getRealNameAuthAPI, realNameAuthAPI } from '@/service'
 import { useUserStore } from '@/store'
 import { showModal } from '@/utils'
 import { ref } from 'vue'
 
-const userStore = useUserStore()
-
 const form = ref({
-  credentials_name: '',
+  realname: '',
-  credentials_number: '',
+  cardnum: '',
 })
 
 const onBack = () => {
   uni.navigateBack()
 }
 
-const onReachBottom = () => {
-  userStore.userInfo.member_certification = null
-}
-
 const onSubmit = async () => {
-  if (!form.value.credentials_name || !form.value.credentials_number) {
+  if (!form.value.realname || !form.value.cardnum) {
     await showModal('请填写完整信息')
     return
   }
-  await createAuthUser(form.value)
+  await realNameAuthAPI(form.value)
-  await showModal('提交成功')
+  await showModal('提交成功,请耐心等待审核！')
-  userStore.loadUserInfo()
+  realnameInfo.value = await getRealNameAuthAPI().then((res) => {
+    return res.data
+  })
 }
+
+const realnameInfo = ref(null)
+onLoad(async () => {
+  realnameInfo.value = await getRealNameAuthAPI().then((res) => {
+    return res.data
+  })
+})
 </script>
 <style lang="scss" scoped>
 .withdrawal-type-edit-page {

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

@@ -1,86 +0,0 @@
-<route lang="json5" type="page">
-{
-  style: {
-    navigationBarTitleText: '充值记录',
-    navigationBarBackgroundColor: '#fff',
-  },
-}
-</route>
-<template>
-  <view class="min-h-screen pb-100">
-    <template v-if="list.length">
-      <view
-        class="flex px-15 py-8 border-b border-#E5E5E5 border-b-solid"
-        v-for="item in list"
-        :key="item.id"
-      >
-        <image
-          v-if="getCurrentWallet(item.wall_id).wallet_crad_type === 1"
-          src="/static/images/invest/unionpay-icon.png"
-          class="w-32 h-32 self-center"
-        />
-        <image
-          v-if="getCurrentWallet(item.wall_id).wallet_crad_type === 2"
-          src="/static/images/invest/alipay-icon.png"
-          class="w-32 h-32 self-center"
-        />
-        <image
-          v-if="getCurrentWallet(item.wall_id).wallet_crad_type === 3"
-          src="/static/images/invest/wechat-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">{{ getCurrentWallet(item.wall_id).wallet_name }}</view>
-          <view class="text-12 text-#999">充值</view>
-          <view class="text-12 text-#999">{{ item.create_time }}</view>
-        </view>
-
-        <view class="flex flex-col items-end">
-          <view class="text-16 text-#FF5F5F">+{{ item.change_money }} RMB</view>
-          <view
-            class="text-14 mt-18 py-4 px-10 bg-gray-400 text-white"
-            v-if="item.change_status === 0"
-          >
-            审核中
-          </view>
-          <view
-            class="text-14 mt-18 py-4 px-10 bg-#71C78A1A text-#71C78A"
-            v-else-if="item.change_status === 1"
-          >
-            充值成功
-          </view>
-
-          <view
-            class="text-14 mt-18 py-4 px-10 bg-#FF5F5F text-white"
-            v-else-if="item.change_status === 2"
-          >
-            充值失败
-          </view>
-        </view>
-      </view>
-    </template>
-    <template v-else>
-      <wd-status-tip image="content" tip="暂无数据" />
-    </template>
-  </view>
-</template>
-
-<script setup lang="ts">
-import { getRechargeRecordAPI, getSystemRechargeAccountAPI } from '@/service'
-
-const { list } = useListPageRequest(getRechargeRecordAPI)
-
-const walletList = ref<any[]>([])
-onMounted(async () => {
-  const {
-    data: { list },
-  } = await getSystemRechargeAccountAPI({
-    wallet_type: 1,
-  })
-  walletList.value = list
-})
-
-const getCurrentWallet = (id: string) => {
-  return walletList.value.find((item) => item.id === id)
-}
-</script>

src/pages-sub/recharge/index.vue

@@ -1,224 +0,0 @@
-<route lang="json5">
-{
-  style: {
-    navigationStyle: 'custom',
-    navigationBarTitleText: '充值',
-  },
-}
-</route>
-<template>
-  <view class="recharge-page min-h-screen pb-100">
-    <NavBar>
-      <template #right>
-        <image @click="onRecharge" src="/static/images/page-sub/recharge.png" class="w-24 h-24" />
-      </template>
-    </NavBar>
-    <view class="p-15">
-      <view class="mt-15">
-        <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.change_money"
-            type="number"
-            placeholder="请输入充值金额"
-            class="text-14 text-#333"
-          />
-        </view>
-      </view>
-
-      <view class="mt-15">
-        <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">
-          <wd-select-picker
-            type="radio"
-            custom-class="!p-0"
-            custom-value-class="text-14 text-#889BC6"
-            class="flex-1"
-            placeholder="请选择充值方式"
-            v-model="walletType"
-            :columns="columns"
-          ></wd-select-picker>
-
-          <!-- 用卡片展示收款银行信息 -->
-          <view class="mt-15">
-            <!-- 银行卡信息 -->
-            <view class="mt-15" v-if="walletType === 1">
-              <view class="mt-15 flex items-center justify-between">
-                <view class="text-14 text-#333">银行名称</view>
-                <view class="text-14 text-#889BC6">{{ currentWallet.wallet_name }}</view>
-              </view>
-              <view class="mt-15 flex items-center justify-between">
-                <view class="text-14 text-#333">银行账号</view>
-                <view class="text-14 text-#889BC6">{{ currentWallet.wallet_account }}</view>
-              </view>
-              <view class="mt-15 flex items-center justify-between">
-                <view class="text-14 text-#333">银行户名</view>
-                <view class="text-14 text-#889BC6">{{ currentWallet.wallet_username }}</view>
-              </view>
-            </view>
-            <!-- 支付宝信息 -->
-            <view class="mt-15" v-if="walletType === 2">
-              <view class="mt-15 flex items-center justify-between">
-                <view class="text-14 text-#333">支付宝账号</view>
-                <view class="text-14 text-#889BC6">{{ currentWallet.wallet_account }}</view>
-              </view>
-              <view class="mt-15 flex items-center justify-between">
-                <view class="text-14 text-#333">支付宝户名</view>
-                <view class="text-14 text-#889BC6">{{ currentWallet.wallet_username }}</view>
-              </view>
-            </view>
-            <!-- 微信信息 -->
-            <view class="mt-15" v-if="walletType === 3">
-              <view class="mt-15 flex items-center justify-between">
-                <view class="text-14 text-#333">微信账号</view>
-                <view class="text-14 text-#889BC6">{{ currentWallet.wallet_account }}</view>
-              </view>
-              <view class="mt-15 flex items-center justify-between">
-                <view class="text-14 text-#333">微信户名</view>
-                <view class="text-14 text-#889BC6">{{ currentWallet.wallet_username }}</view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <view class="mt-15">
-        <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.bank_account"
-            type="number"
-            placeholder="请输入充值账号"
-            class="text-14 text-#333"
-          />
-        </view>
-      </view>
-      <view class="mt-15">
-        <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">
-          <view @click="handleUpload" class="text-14 text-gradient">上传截图</view>
-          <image
-            v-if="form.change_image"
-            mode="aspectFill"
-            @click="handlePreview"
-            class="w-100 h-100 mt-15 rounded-10"
-            :src="form.change_image"
-          />
-        </view>
-      </view>
-    </view>
-    <view class="fixed bottom-0 left-0 right-0 px-15 pb-safe">
-      <view
-        class="btn-gradient mb-15 text-center text-white rounded-full text-16 px-30 py-10"
-        @click="onSubmit"
-      >
-        提交
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup lang="ts">
-import NavBar from '@/components/NavBar.vue'
-import { getSystemRechargeAccountAPI, rechargeAPI } from '@/service'
-import { mergeStep, showModal } from '@/utils'
-
-const walletType = ref(1)
-const columns = [
-  {
-    label: '银行卡',
-    value: 1,
-  },
-  {
-    label: '支付宝',
-    value: 2,
-  },
-  {
-    label: '微信',
-    value: 3,
-  },
-]
-
-const form = ref({
-  change_money: '',
-  bank_account: '',
-  change_image: '',
-  wall_id: '',
-})
-
-const currentWallet = ref<any>(null)
-
-watch(
-  () => columns[walletType.value - 1]?.value,
-  async (walletCradType) => {
-    const {
-      data: { list },
-    } = await getSystemRechargeAccountAPI({
-      wallet_type: 1,
-      wallet_crad_type: walletCradType,
-    })
-    currentWallet.value = list[0]
-    form.value.wall_id = list[0].id
-  },
-  { immediate: true },
-)
-
-const { data, run } = useUpload<any>()
-const handleUpload = () => {
-  run()
-}
-
-watch(data, async (newVal) => {
-  const path = JSON.parse(newVal)?.data?.path
-  form.value.change_image = path
-})
-
-const onRecharge = () => {
-  uni.navigateTo({
-    url: '/pages-sub/recharge-detail/index',
-  })
-}
-
-const onSubmit = mergeStep(async () => {
-  if (!form.value.change_image) {
-    uni.showToast({
-      title: '请上传付款截图',
-      icon: 'none',
-    })
-    return
-  }
-  if (!form.value.bank_account) {
-    uni.showToast({
-      title: '请输入充值账号',
-      icon: 'none',
-    })
-    return
-  }
-
-  if (!form.value.change_money) {
-    uni.showToast({
-      title: '请输入充值金额',
-      icon: 'none',
-    })
-    return
-  }
-  await rechargeAPI(form.value)
-  await showModal('充值成功')
-  uni.redirectTo({
-    url: '/pages-sub/recharge-detail/index',
-  })
-})
-const handlePreview = () => {
-  uni.previewImage({
-    urls: [form.value.change_image],
-  })
-}
-</script>
-
-<style lang="scss" scoped>
-.recharge-page {
-  --wot-input-placeholder-color: #889bc6;
-  --wot-cell-wrapper-padding: 0;
-  --wot-cell-padding: 0;
-}
-</style>

src/pages-sub/team/index.vue

@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationBarTitleText: '我的邀请',
@@ -15,15 +15,15 @@
         <view @click="handleRule" class="text-14 text-#333">邀请奖励规则</view>
       </template>
     </NavBar>
-    <view class="p-15 relative bg-white rounded-10 mt-50 w-345 mx-auto">
+    <view class="px-15 py-30 relative rounded-10 mt-50 w-345 mx-auto main-content">
       <image
-        class="w-186 h-122 rounded-10 mt-15 mx-auto block absolute right-0 bottom-0"
+        class="w-150 h-150 rounded-10 mt-15 mx-auto block absolute right-15 bottom-30"
         src="@/static/images/page-sub/team/team-main-hero.png"
         mode="aspectFit"
       />
       <view class="flex flex-col">
-        <view class="text-14 text-gradient">看看人数</view>
+        <view class="text-14 text-#6784C7">邀请人数</view>
-        <view class="text-35 font-bold text-gradient mt-10 leading-35">{{ totalCount }}</view>
+        <view class="text-35 font-bold text-#476FFF mt-10 leading-35">{{ totalCount }}</view>
       </view>
     </view>
     <image
@@ -41,32 +41,28 @@
         }"
         @click="() => (currentLevelIndex = index)"
       >
-        <image class="w-42 h-52 rounded-10 mx-auto block" :src="item.icon" mode="aspectFill" />
+        <image class="w-30 h-30 rounded-10 mx-auto block" :src="item.icon" mode="aspectFill" />
-        <view class="text-14 text-center">{{ item.title }}</view>
+        <view class="text-14 mt-10 text-center">{{ item.title }}</view>
       </view>
     </view>
-    <view class="mt-25 bg-white rounded-10 w-345 mx-auto" v-if="list.length > 0">
+    <view class="mt-25 bg-white rounded-10 w-345 mx-auto" v-if="list.length">
-      <view class="flex p-15 items-center" v-for="item in list" :key="item.id">
+      <view class="flex p-15 items-center" v-for="item in list" :key="item">
-        <Avatar class="w-40 h-40" :src="item.member_portrait" />
+        <Avatar class="w-40 h-40" :src="item.avatar" />
         <view class="flex-1 flex flex-col ml-15">
           <view class="text-14 text-#333">{{ item.nickname }}</view>
-          <view class="text-12 mt-10 text-#999">{{ item.from_username }}</view>
+          <view class="text-12 mt-10 text-#999">{{ item.username }}</view>
-          <view class="text-12 mt-10 text-#999">{{ item.create_time }}</view>
+          <view class="text-12 mt-10 text-#999">{{ item.jointime }}</view>
         </view>
-        <view class="bg-#71C78A80 text-white text-12 rounded-10 px-10 py-5">邀请成功</view>
+        <!-- <view class="bg-#71C78A80 text-white text-12 rounded-10 px-10 py-5">邀请成功</view> -->
+        <view class="text-14 font-bold text-#FF5F5F">+{{ item.score }} 股</view>
       </view>
     </view>
     <view class="mt-25 bg-white rounded-10 w-345 mx-auto p-15" v-else>
       <wd-status-tip image="content" tip="暂无内容" />
     </view>
-
     <wd-action-sheet v-model="showRule" title="邀请奖励规则">
       <view class="text-16 text-#333 p-15">
-        <view class="mb-10">1.每邀请一人可以获得1万投资金，2000数字人民币 1点认购点</view>
+        <view class="mb-10 text-center">每邀请一人可以获得20股马尔代夫股权</view>
-        <view class="mb-10">2.邀请满5人可以额外获得5万投资金。1万数字人民币 5点认购点</view>
-        <view class="mb-10">3.邀请满10人可以额外获得10万投资金。2万数字人民币 10点认购点</view>
-        <view class="mb-10">4.邀请满20人可以额外获得20万投资金。5万数字人民币 20点认购点</view>
-        <view class="mb-10">5.邀请满50人可以额外获得50万投资金。10万数字人民币 50点认购点</view>
       </view>
     </wd-action-sheet>
   </view>
@@ -75,13 +71,10 @@
 <script setup lang="ts">
 import Avatar from '@/components/Avatar.vue'
 import NavBar from '@/components/NavBar.vue'
-import { getMyTeamAPI } from '@/service'
+import { getMyTeamAPI, getMyTeamApi } from '@/service'
 import Level1 from '@/static/images/page-sub/team/level-1.png'
 import Level2 from '@/static/images/page-sub/team/level-2.png'
 import Level3 from '@/static/images/page-sub/team/level-3.png'
-import Level4 from '@/static/images/page-sub/team/level-4.png'
-import Level5 from '@/static/images/page-sub/team/level-5.png'
-import Level6 from '@/static/images/page-sub/team/level-6.png'
 
 const showRule = ref(false)
 
@@ -106,28 +99,14 @@ const levelList = ref([
     icon: Level3,
     level: 3,
   },
-  {
-    title: '四级用户',
-    icon: Level4,
-    level: 4,
-  },
-  {
-    title: '五级用户',
-    icon: Level5,
-    level: 5,
-  },
-  {
-    title: '六级用户',
-    icon: Level6,
-    level: 6,
-  },
 ])
 
 const totalCount = ref(0)
 const { list, onReload } = useListPageRequest((...rest) => {
   return getMyTeamAPI(...rest).then((res) => {
-    totalCount.value = (res.data as any).total_count
+    totalCount.value = (res.data as any).num
-    return res
+    res.data.data = res.data.list
+    return res.data
   })
 })
 
@@ -149,4 +128,10 @@ watch(
   background-position: top;
   background-size: cover;
 }
+.main-content {
+  background-image: url('@/static/images/page-sub/team/main-bg.png');
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100% 100%;
+}
 </style>

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

@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationBarTitleText: '提现记录',
@@ -8,60 +8,55 @@
 </route>
 <template>
   <view class="min-h-screen pb-100">
-    <template v-if="list.length">
     <view
       class="flex px-15 py-8 border-b border-#E5E5E5 border-b-solid"
       v-for="item in list"
       :key="item.id"
     >
       <image
-          v-if="item.cash_type === 1"
-          src="/static/images/invest/unionpay-icon.png"
-          class="w-32 h-32 self-center"
-        />
-        <image
-          v-if="item.cash_type === 2"
         src="/static/images/invest/alipay-icon.png"
         class="w-32 h-32 self-center"
+        v-if="item.typedata === '支付宝'"
       />
       <image
-          v-if="item.cash_type === 3"
         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">{{ typeName(item.cash_type) }}</view>
+        <view class="text-14 text-#333">{{ item.typedata }}</view>
         <view class="text-12 text-#999">提现</view>
-          <view class="text-12 text-#999">{{ item.create_time }}</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.cash_money }} RMB</view>
+        <view class="text-16 text-#FF5F5F">{{ item.money }}</view>
         <view
-            class="text-14 mt-18 py-4 px-10 bg-gray-400 text-white"
+          class="text-14 mt-18 py-4 px-10 bg-#99999990 text-#fff"
-            v-if="item.cash_status === 0"
+          v-if="Number(item.status) === 1"
         >
           审核中
         </view>
         <view
           class="text-14 mt-18 py-4 px-10 bg-#71C78A1A text-#71C78A"
-            v-else-if="item.cash_status === 1"
+          v-if="Number(item.status) === 2"
         >
           提现成功
         </view>
-
         <view
-            class="text-14 mt-18 py-4 px-10 bg-#FF5F5F text-white"
+          class="text-14 mt-18 py-4 px-10 bg-#FF5F5F90 text-#fff"
-            v-else-if="item.cash_status === 2"
+          v-if="Number(item.status) === 3"
         >
           提现失败
         </view>
       </view>
     </view>
-    </template>
-    <template v-else>
-      <wd-status-tip image="content" tip="暂无内容" />
-    </template>
   </view>
 </template>
 
@@ -69,8 +64,4 @@
 import { getWithdrawalRecordAPI } from '@/service'
 
 const { list } = useListPageRequest(getWithdrawalRecordAPI)
-
-const typeName = (item) => {
-  return ['银行卡', '支付宝', '微信'][Number(item.card_type) - 1]
-}
 </script>

src/pages-sub/withdrawal-type/edit.vue

@@ -18,28 +18,18 @@
           custom-value-class="text-14 text-#889BC6 text-right"
           class="flex-1"
           placeholder="请选择收款类型"
-          v-model="form.card_type"
+          v-model="form.typedata"
           :columns="columns"
         ></wd-select-picker>
       </view>
-      <view class="flex items-center py-15 text-14" v-if="form.card_type === 1">
+      <view class="flex items-center py-15 text-14" v-if="form.typedata === 3">
         <view>开户行</view>
         <input
           class="flex-1 text-right text-14"
           placeholder-class=" text-#889BC6 text-right"
           type="text"
           placeholder="请输入开户行"
-          v-model="form.bank_name"
+          v-model="form.kaihuhang"
-        />
-      </view>
-      <view class="flex items-center py-15 text-14" v-if="form.card_type === 1">
-        <view>开户行地址</view>
-        <input
-          class="flex-1 text-right text-14"
-          placeholder-class=" text-#889BC6 text-right"
-          type="text"
-          placeholder="请输入开户行地址"
-          v-model="form.bank_address"
         />
       </view>
       <view class="flex items-center py-15 text-14">
@@ -49,17 +39,17 @@
           placeholder-class=" text-#889BC6 text-right"
           type="text"
           :placeholder="`请输入${typeName}账号`"
-          v-model="form.card_account"
+          v-model="form.banknum"
         />
       </view>
       <view class="flex items-center py-15 text-14">
-        <view>{{ form.card_type === 1 ? '持卡人' : '' }}姓名</view>
+        <view>{{ form.typedata === 3 ? '持卡人' : '' }}姓名</view>
         <input
           class="flex-1 text-right text-14"
           placeholder-class=" text-#889BC6 text-right"
           type="text"
-          :placeholder="`请输入${form.card_type === 1 ? '持卡人' : ''}姓名`"
+          :placeholder="`请输入${form.typedata === 3 ? '持卡人' : ''}姓名`"
-          v-model="form.card_name"
+          v-model="form.name"
         />
       </view>
 
@@ -83,59 +73,58 @@
 </template>
 
 <script setup lang="ts">
-import { bindBankCardAPI } from '@/service'
+import { addBankCardAPI } from '@/service'
 import { mergeStep, showModal } from '@/utils'
 import { ref } from 'vue'
 
 const form = ref({
-  card_type: 1,
+  typedata: 1,
-  bank_name: '',
+  kaihuhang: '',
-  bank_address: '',
+  name: '',
-  card_name: '',
+  banknum: '',
-  card_account: '',
 })
 const columns = [
   {
-    label: '银行卡',
+    label: '支付宝',
     value: 1,
   },
   {
-    label: '支付宝',
+    label: '微信',
     value: 2,
   },
   {
-    label: '微信',
+    label: '银行卡',
     value: 3,
   },
 ]
 
 const typeName = computed(() => {
-  return ['银行卡', '支付宝', '微信'][Number(form.value.card_type) - 1]
+  return ['支付宝', '微信', '银行卡'][Number(form.value.typedata) - 1]
 })
 
 const onAddType = mergeStep(async () => {
-  if (form.value.card_type === 1) {
+  if (form.value.typedata === 3) {
-    if (!form.value.bank_name) {
+    if (!form.value.kaihuhang) {
       return uni.showToast({
         title: '请输入开户行',
         icon: 'none',
       })
     }
   }
-  if (!form.value.card_account) {
+  if (!form.value.banknum) {
     return uni.showToast({
       title: '请输入账号',
       icon: 'none',
     })
   }
-  if (!form.value.card_name) {
+  if (!form.value.name) {
     return uni.showToast({
       title: '请输入姓名',
       icon: 'none',
     })
   }
 
-  await bindBankCardAPI(form.value)
+  await addBankCardAPI(form.value)
   await showModal('添加成功')
   uni.navigateBack()
 })

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

@@ -16,28 +16,28 @@
           @click="onSelectType(item)"
         >
           <image
-            v-if="Number(item.card_type) === 1"
+            v-if="Number(item.typedata) === 3"
             class="w-45 h-45"
             src="@/static/images/invest/unionpay-icon.png"
             mode="aspectFit"
           />
           <image
-            v-if="Number(item.card_type) === 2"
+            v-if="Number(item.typedata) === 1"
             class="w-45 h-45"
             src="@/static/images/invest/alipay-icon.png"
             mode="aspectFit"
           />
           <image
-            v-if="Number(item.card_type) === 3"
+            v-if="Number(item.typedata) === 2"
             class="w-45 h-45"
             src="@/static/images/invest/wechat-icon.png"
             mode="aspectFit"
           />
           <view class="flex-1 ml-15">
             <view class="text-16 font-bold">
-              {{ ['银行卡', '支付宝', '微信'][Number(item.card_type) - 1] }}
+              {{ ['支付宝', '微信', '银行卡'][Number(item.typedata) - 1] }}
             </view>
-            <view class="mt-10 text-14 text-#889BC6">{{ item.card_account }}</view>
+            <view class="mt-10 text-14 text-#889BC6">{{ item.banknum }}</view>
           </view>
           <wd-icon v-if="isSelect" name="arrow-right" size="14px"></wd-icon>
         </view>
@@ -63,7 +63,7 @@
 </template>
 
 <script setup lang="ts">
-import { deleteBankCardAPI, getBankCardListAPI } from '@/service'
+import { deleteBankCardAPI, getBankCardAPI } from '@/service'
 import { showModal } from '@/utils'
 import { onLoad } from '@dcloudio/uni-app'
 
@@ -94,17 +94,20 @@ const onAddType = () => {
 const onDelete = async (item) => {
   await showModal('确认删除？')
   await deleteBankCardAPI({
-    card_account: item.card_account,
+    id: item.id,
   })
   await showModal('删除成功')
   loadData()
 }
 
-const list = ref([])
 const loadData = async () => {
-  list.value = (await getBankCardListAPI().then((res) => res.data)) as any
+  list.value = (await getBankCardAPI({
+    limit: 1000,
+    page: 1,
+  }).then((res) => res.data)) as any
 }
 
+const list = ref([])
 onShow(async () => {
   loadData()
 })

src/pages-sub/withdrawal/index.vue

@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationStyle: 'custom',
@@ -24,21 +24,16 @@
           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="form.cash_money"
+            v-model="form.money"
             type="number"
             placeholder="请输入提现金额"
             class="text-14 text-#333 flex-1"
           />
-          <view
+          <view class="text-12 text-#04A9F9" @click="form.money = userStore.userInfo.money">
-            class="text-12 text-#04A9F9"
-            @click="form.cash_money = Number(userStore.userInfo.member_dividend ?? 0)"
-          >
             全部
           </view>
         </view>
-        <view class="text-12 text-#889BC6 mt-15">
+        <view class="text-12 text-#889BC6 mt-15">当前余额：{{ userStore.userInfo.money }}</view>
-          当前余额：{{ userStore.userInfo.member_dividend }}
-        </view>
       </view>
 
       <view class="mt-50">
@@ -48,7 +43,7 @@
           @click="onSelectPayType"
         >
           <view class="flex-1">
-            {{ typeName ? `${typeName}：${currentBank?.card_account}` : '请选择收款方式' }}
+            {{ typeName ? `${typeName}：${currentBank?.banknum}` : '请选择收款方式' }}
           </view>
           <wd-icon name="arrow-right" size="16px"></wd-icon>
         </view>
@@ -58,8 +53,8 @@
         <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"
-            v-model="form.pay_password"
             placeholder="请输入交易密码"
             class="text-14 text-#333"
           />
@@ -70,7 +65,7 @@
       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.cash_money }}</view>
+        <view class="text-gradient flex-1 text-14">到账CNY:{{ form.money ?? '0' }}</view>
         <view
           class="btn-gradient text-center text-white rounded-full text-14 px-30 py-10"
           @click="onSubmit"
@@ -84,35 +79,33 @@
 
 <script setup lang="ts">
 import NavBar from '@/components/NavBar.vue'
-import { applyWithdrawalAPI } from '@/service'
+import { submitWithdrawalAPI } from '@/service'
 import { useUserStore } from '@/store'
 import { showModal } from '@/utils'
-import { ref } from 'vue'
 
 const userStore = useUserStore()
 
 const form = ref({
-  cash_money: 0,
+  money: '',
-  cash_remark: '',
+  bankid: '6',
-  bank_id: '',
+  tpassword: '',
-  pay_password: '',
 })
 
-const typeName = computed(() => {
-  return ['银行卡', '支付宝', '微信'][Number(unref(currentBank)?.card_type) - 1]
-})
-
-const currentBank = ref<any>(null)
-
 const onWithdrawalDetail = () => {
   uni.navigateTo({
     url: '/pages-sub/withdrawal-detail/index',
   })
 }
 
+const typeName = computed(() => {
+  return ['支付宝', '微信', '银行卡'][Number(unref(currentBank)?.typedata) - 1]
+})
+
+const currentBank = ref<any>(null)
 const onSelectPayType = () => {
   uni.$once('withdrawal-type', (data: any) => {
-    form.value.bank_id = data.id
+    form.value.bankid = data.id
+    console.log(data)
     currentBank.value = data
   })
   uni.navigateTo({
@@ -121,38 +114,29 @@ const onSelectPayType = () => {
 }
 
 const onSubmit = async () => {
-  if (!form.value.bank_id) {
+  if (!form.value.money) {
-    return uni.showToast({
-      title: '请选择收款方式',
-      icon: 'none',
-    })
-  }
-  if (!form.value.bank_id) {
-    return uni.showToast({
-      title: '请选择收款方式',
-      icon: 'none',
-    })
-  }
-
-  if (!form.value.pay_password) {
-    return uni.showToast({
-      title: '请输入交易密码',
-      icon: 'none',
-    })
-  }
-  if (!form.value.cash_money) {
     return uni.showToast({
       title: '请输入提现金额',
       icon: 'none',
     })
   }
-  await applyWithdrawalAPI(form.value)
+  if (!form.value.bankid) {
-  await showModal('申请成功')
+    return uni.showToast({
-  userStore.loadUserInfo()
+      title: '请选择收款方式',
-  uni.redirectTo({
+      icon: 'none',
-    url: '/pages-sub/withdrawal-detail/index',
     })
   }
+  if (!form.value.tpassword) {
+    return uni.showToast({
+      title: '请输入交易密码',
+      icon: 'none',
+    })
+  }
+  await showModal('确认提现？')
+  await submitWithdrawalAPI(form.value)
+  await showModal('提交成功')
+  onWithdrawalDetail()
+}
 </script>
 
 <style scoped></style>

src/pages.json

@@ -29,17 +29,17 @@
         "pagePath": "pages/index/index",
         "text": "首页"
       },
+      {
+        "iconPath": "static/tabbar/house.png",
+        "selectedIconPath": "static/tabbar/houseHL.png",
+        "pagePath": "pages/invite/index",
+        "text": "邀请好友"
+      },
       {
         "iconPath": "static/tabbar/invest.png",
         "selectedIconPath": "static/tabbar/investHL.png",
         "pagePath": "pages/invest/index",
-        "text": "投资"
+        "text": "理财"
-      },
-      {
-        "iconPath": "static/tabbar/house.png",
-        "selectedIconPath": "static/tabbar/houseHL.png",
-        "pagePath": "pages/house/index",
-        "text": "房屋"
       },
       {
         "iconPath": "static/tabbar/personal.png",
@@ -67,20 +67,21 @@
       },
       "notNeedLogin": false
     },
-    {
-      "path": "pages/house/index",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "房屋"
-      }
-    },
     {
       "path": "pages/invest/index",
       "type": "page",
       "style": {
         "navigationStyle": "custom",
-        "navigationBarTitleText": "投资"
+        "navigationBarTitleText": "投资理财"
+      }
+    },
+    {
+      "path": "pages/invite/index",
+      "type": "page",
+      "style": {
+        "navigationBarTitleText": "邀请好友",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationStyle": "custom"
       }
     },
     {
@@ -122,6 +123,14 @@
             "navigationBarBackgroundColor": "#fff"
           }
         },
+        {
+          "path": "convert/index",
+          "type": "page",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "转换"
+          }
+        },
         {
           "path": "demo/index",
           "type": "page",
@@ -133,7 +142,8 @@
           "path": "introduction/index",
           "type": "page",
           "style": {
-            "navigationBarTitleText": "公司简介"
+            "navigationBarTitleText": "公司简介",
+            "navigationBarBackgroundColor": "#fff"
           }
         },
         {
@@ -156,7 +166,7 @@
           "path": "invest-result/index",
           "type": "page",
           "style": {
-            "navigationBarTitleText": "充值成功",
+            "navigationBarTitleText": "投资成功",
             "navigationBarBackgroundColor": "#fff"
           }
         },
@@ -165,7 +175,17 @@
           "type": "page",
           "style": {
             "navigationBarTitleText": "邀请好友",
-            "navigationBarBackgroundColor": "#fff"
+            "navigationBarBackgroundColor": "#fff",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "lottery/index",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "转盘抽奖",
+            "navigationBarBackgroundColor": "#fff",
+            "navigationStyle": "custom"
           }
         },
         {
@@ -185,14 +205,6 @@
             "navigationStyle": "custom"
           }
         },
-        {
-          "path": "purchase-member/index",
-          "type": "page",
-          "style": {
-            "navigationBarTitleText": "购买会员",
-            "navigationBarBackgroundColor": "#fff"
-          }
-        },
         {
           "path": "realname/index",
           "type": "page",
@@ -201,22 +213,6 @@
             "navigationBarBackgroundColor": "#fff"
           }
         },
-        {
-          "path": "recharge/index",
-          "type": "page",
-          "style": {
-            "navigationStyle": "custom",
-            "navigationBarTitleText": "充值"
-          }
-        },
-        {
-          "path": "recharge-detail/index",
-          "type": "page",
-          "style": {
-            "navigationBarTitleText": "充值记录",
-            "navigationBarBackgroundColor": "#fff"
-          }
-        },
         {
           "path": "team/index",
           "type": "page",

src/pages/edit-password/index.vue

@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationBarTitleText: '忘记密码',
@@ -15,46 +15,46 @@
         <view class="flex items-center py-15">
           <image class="w-24 h-24" src="@/static/images/login/phone.png" mode="aspectFit" />
           <input
-            v-model="form.member_username"
             type="text"
             placeholder-class="text-#889BC6"
             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/password.png" mode="aspectFit" />
+          <image class="w-24 h-24" src="@/static/images/login/message.png" mode="aspectFit" />
           <input
-            v-model="form.old_password"
+            type="text"
             placeholder-class="text-#889BC6"
-            type="password"
             class="text-right flex-1 text-14"
-            placeholder="请输入旧登录密码"
+            placeholder="请输入短信验证码"
           />
+          <view
+            class="py-6 rounded-full ml-15 px-15 text-12 text-white btn-gradient text-14 text-#889BC6"
+            @click="handleGetCode"
+          >
+            获取验证码
+          </view>
         </view>
-
         <view class="flex items-center py-15">
           <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
           <input
-            v-model="form.member_password"
             placeholder-class="text-#889BC6"
             type="password"
             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" />
           <input
-            v-model="form.confirm_member_password"
             placeholder-class="text-#889BC6"
             type="password"
             class="text-right flex-1 text-14"
-            placeholder="请再次输入新登录密码"
+            placeholder="请再次输入登录密码"
           />
         </view>
-        <!-- <view class="flex items-center py-15">
+        <view class="flex items-center py-15">
           <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
           <input
             placeholder-class="text-#889BC6"
@@ -71,22 +71,11 @@
             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/message.png" mode="aspectFit" />
-          <input
-            v-model="form.verify_code"
-            type="text"
-            placeholder-class="text-#889BC6"
-            class="text-right flex-1 text-14"
-            placeholder="请输入图形验证码"
-          />
-          <image :src="codeUrl" class="ml-10 w-80 h-30" @click="handleGetCode" />
         </view>
       </view>
       <view
         class="mt-50 text-center py-12 rounded-full mx-15 text-15 text-white btn-gradient"
-        @click="handleUpdatePassword"
+        @click="handleRegister"
       >
         确认
       </view>
@@ -96,85 +85,24 @@
 
 <script lang="ts" setup>
 import NavBar from '@/components/NavBar.vue'
-import { isLogged, loginRoute } from '@/interceptors/route'
+import { isLogged } from '@/interceptors/route'
-import { getCodeAPI, updateUserAPI } from '@/service'
 import { useUserStore } from '@/store/user'
 
 const userStore = useUserStore()
-const form = ref({
-  member_username: '',
-  member_password: '',
-  confirm_member_password: '',
-  verify_code: '',
-  old_password: '',
-})
 
 let redirect = '/'
 onLoad((options) => {
   redirect = options.redirect ?? '/'
 })
 
-const { codeUrl, refreshCode: handleGetCode } = useCaptcha()
+const handleRegister = () => {
-
+  userStore.setUserInfo({
-onLoad(async () => {
+    token: '123456',
-  if (isLogged()) {
+  })
   uni.reLaunch({
     url: redirect,
   })
 }
-})
-
-const handleUpdatePassword = async () => {
-  if (!form.value.member_username) {
-    uni.showToast({
-      title: '请输入用户名',
-      icon: 'none',
-    })
-    return
-  }
-  if (!form.value.old_password) {
-    uni.showToast({
-      title: '请输入旧登录密码',
-      icon: 'none',
-    })
-    return
-  }
-  if (!form.value.member_password) {
-    uni.showToast({
-      title: '请输入新登录密码',
-      icon: 'none',
-    })
-    return
-  }
-  if (form.value.member_password !== form.value.confirm_member_password) {
-    uni.showToast({
-      title: '两次输入的密码不一致',
-      icon: 'none',
-    })
-    return
-  }
-  if (!form.value.verify_code) {
-    uni.showToast({
-      title: '请输入图形验证码',
-      icon: 'none',
-    })
-    return
-  }
-  // userStore.setUserInfo({
-  //   token: '123456',
-  // })
-  await updateUserAPI(form.value)
-  uni.showToast({
-    title: '修改密码成功',
-    icon: 'none',
-  })
-  uni.redirectTo({
-    url: loginRoute,
-  })
-  // uni.reLaunch({
-  //   url: redirect,
-  // })
-}
 onLoad(() => {
   if (isLogged()) {
     uni.reLaunch({

src/pages/house/index.vue

@@ -1,78 +0,0 @@
-<!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page；推荐使用json5，更强大，且允许注释 -->
-<route lang="json5" type="page">
-{
-  style: {
-    navigationStyle: 'custom',
-    navigationBarTitleText: '房屋',
-  },
-}
-</route>
-<template>
-  <view class="house-page">
-    <NavBar />
-    <view class="p-15" v-for="cityItem in cityList" :key="cityItem.id">
-      <view class="text-16 pl-15">{{ cityItem.region }}</view>
-      <view class="mt-15 bg-white p-15 rounded-10 grid grid-cols-2 gap-15">
-        <view v-for="houseItem in cityItem.house_list" :key="houseItem.id">
-          <image class="w-150 h-170" :src="houseItem.house_image" mode="aspectFill" />
-          <view class="flex items-center justify-between py-10">
-            <view
-              class="text-14 bg-[linear-gradient(to_right,#3B81F3,#37E6EC)] text-transparent"
-              style="background-clip: text"
-            >
-              {{ houseItem.size }}平
-            </view>
-            <view class="text-12 text-#999">认购点{{ houseItem.buy_price }}点</view>
-          </view>
-          <view
-            class="text-12 text-center bg-[linear-gradient(to_right,#3B81F3,#37E6EC)] text-white py-8 rounded-full"
-            @click="handleClick(houseItem)"
-          >
-            领取
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script lang="ts" setup>
-import NavBar from '@/components/NavBar.vue'
-import { buyHouseAPI, getHouseListAPI } from '@/service'
-import { useUserStore } from '@/store'
-import { showModal } from '@/utils'
-
-defineOptions({
-  name: 'Home',
-})
-
-const userStore = useUserStore()
-const handleClick = async (item: any) => {
-  await showModal('确认领取?')
-  await buyHouseAPI({
-    house_id: item.id,
-  })
-  await userStore.loadUserInfo()
-  uni.showToast({
-    title: '领取成功',
-    icon: 'none',
-  })
-}
-
-const cityList = ref<any[]>([])
-
-onMounted(async () => {
-  const res = await getHouseListAPI()
-  cityList.value = res.data.list
-})
-</script>
-
-<style>
-.house-page {
-  min-height: 100vh;
-  padding-bottom: 100rpx;
-  background-image: url('@/static/images/bg.png');
-  background-position: top;
-  background-size: cover;
-}
-</style>

src/pages/index/index.vue

@@ -10,24 +10,23 @@
 <template>
   <view class="home-page">
     <NavBar />
-    <wd-swiper
+    <image
-      v-if="bannerList.length"
+      class="mx-auto block w-345 h-170 mt-15 rounded-10 overflow-hidden"
-      class="w-345 bg-#ffffff30 mx-auto mt-15 rounded-10 overflow-hidden"
+      src="@/static/images/home/main-bg.png"
-      height="min(45.333vw, 272px)"
+      mode="aspectFill"
-      value-key="swipe_image"
+    />
-      :list="bannerList"
+    <view class="flex bg-#F5F9FF py-15 rounded-10 m-15 border-2 border-white border-solid">
-      autoplay
-      @click="handleClick"
-    ></wd-swiper>
-
-    <view class="flex bg-white py-15 rounded-10 m-15">
       <view class="flex-1 flex flex-col items-center" @click="handleIntroduction">
         <image class="w-30 h-30" src="@/static/images/home/nav-1.png" mode="aspectFill" />
         <text class="mt-8 text-14 text-#333">简介</text>
       </view>
-      <view class="flex-1 flex flex-col items-center" @click="handleInvite">
+      <!-- <view class="flex-1 flex flex-col items-center" @click="handleInvite">
         <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="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>
       </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" />
@@ -35,52 +34,68 @@
       </view>
     </view>
 
-    <view class="bg-white py-15 px-15 rounded-10 m-15" v-if="newsList.length">
+    <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="bg-white py-15 px-15 rounded-10 m-15">
       <view class="text-14 text-#333">热点新闻</view>
       <view
         class="flex mt-15"
-        v-for="(item, index) in newsList"
+        v-for="item in newsList"
-        :key="item"
+        :key="item.id"
-        @click="handleNewsDetail(item)"
+        @click="handleNewsDetail(item.id)"
       >
-        <template v-if="index === 0">
+        <image class="w-85 h-85 rounded-10" :src="item.image" mode="aspectFill" />
-          <view>
+        <view class="ml-15 flex-1 flex flex-col justify-between">
-            <image class="w-323 h-160" :src="item.cover_image" mode="aspectFill" />
+          <view text-14>{{ item.name }}</view>
-            <view class="text-14 text-#000 mt-8">
+          <view class="text-12 text-#999">{{ item.source }}</view>
-              {{ item.title }}
         </view>
       </view>
-        </template>
-        <template v-else>
-          <image class="w-85 h-85" :src="item.cover_image" mode="aspectFill" />
-          <view class="ml-10 flex-1 flex flex-col justify-between">
-            <view text-14>{{ item.title }}</view>
-            <view class="text-12 text-#999">{{ item.auther }}</view>
-          </view>
-        </template>
-      </view>
     </view>
   </view>
 </template>
 
 <script lang="ts" setup>
 import NavBar from '@/components/NavBar.vue'
-import { useListPageRequest } from '@/hooks/useListPageRequest'
+import { getIntroductionAPI } from '@/service'
-import { getBannerListAPI, getNewsListAPI } from '@/service'
+import { showModal } from '@/utils'
 
 defineOptions({
   name: 'Home',
 })
 
+const { list: newsList } = useListPageRequest((params) =>
+  getIntroductionAPI({ type: 1, ...params }),
+)
+
+// 系统公告
+const { list: announcementList } = useListPageRequest((params) =>
+  getIntroductionAPI({ type: 2, ...params }),
+)
+
 const handleIntroduction = () => {
   uni.navigateTo({
     url: '/pages-sub/introduction/index',
   })
 }
 
+const handleNewsDetail = (id: number) => {
+  uni.navigateTo({
+    url: `/pages-sub/news-detail/index?id=${id}`,
+  })
+}
+
 const handleInvite = () => {
   uni.navigateTo({
-    url: '/pages-sub/invite/index',
+    url: '/pages/invite/index',
   })
 }
 
@@ -90,26 +105,17 @@ const handleOfficialCommunity = () => {
   })
 }
 
-const handleClick = (item) => {
+const handleReward = () => {
-  console.log(item)
+  showModal(
+    `1.注册立即送5000股马尔代夫股权；\n
+2.每股马尔代夫股权价值500元；\n
+3.每邀请一人可以获得20股马尔代夫股权`,
+    {
+      title: '奖励制度',
+      confirmText: '我知道了',
+    },
+  )
 }
-
-const bannerList = ref<any[]>([])
-const { list: newsList } = useListPageRequest(getNewsListAPI)
-const handleNewsDetail = (item) => {
-  uni.navigateTo({
-    url: `/pages-sub/news-detail/index?id=${item.id}`,
-  })
-}
-
-onLoad(async () => {
-  getBannerListAPI().then((res) => {
-    bannerList.value = res.data.map((item) => ({
-      ...item,
-      type: 'image',
-    }))
-  })
-})
 </script>
 
 <style>

src/pages/invest/index.vue

@@ -1,9 +1,9 @@
 <!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page；推荐使用json5，更强大，且允许注释 -->
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationStyle: 'custom',
-    navigationBarTitleText: '投资',
+    navigationBarTitleText: '投资理财',
   },
 }
 </route>
@@ -14,44 +14,40 @@
         <view @click="onGoInvestDetail" class="text-14 text-#486CCF">投资明细</view>
       </template>
     </NavBar>
-    <view
+    <view class="flex mt-30 flex-col mx-15 rounded-10 px-40 py-32 main-content">
-      class="flex shadow-[0_1px_4px_rgba(255,255,255,0.8)] mt-100 pt-12 pb-8 flex-col mx-15 rounded-10 items-center bg-[linear-gradient(180deg,rgba(212,232,255,1),rgba(229,239,249,0.8))]"
+      <view class="text-14 text-#6784C7">我的投资金</view>
-    >
+      <view class="text-35 leading-35 mt-10 text-#BE7143 font-bold">
-      <view class="text-15 text-#486CCF">我的投资金</view>
+        {{ userStore.userInfo?.money }}
-      <view class="text-30 text-#333 font-bold">{{ userStore.userInfo.member_investment }}</view>
+      </view>
     </view>
 
-    <view class="mt-60">
+    <view class="mt-100">
       <view
-        v-for="item in fundList"
+        v-for="item in investmentList"
         :key="item.id"
         class="invest-item relative flex flex-col items-center pt-15"
       >
-        <view class="text-15 text-#3F88F6">{{ item.fund_name }}</view>
+        <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.buy_price }}</view>
+            <view class="text-22 text-#333 font-bold">{{ item.money }}</view>
-            <view class="text-12 mt-4 text-#3B81F3">投资金额</view>
+            <view class="text-12 mt-4 text-blue-red">投资金额</view>
           </view>
           <view class="flex-1 text-center">
-            <view class="text-22 text-#FF3B30 font-bold">{{ item.day_income }}</view>
+            <view class="text-22 text-#FF3B30 font-bold">{{ item.dividend }}</view>
-            <view class="text-12 mt-4 text-#3B81F3">每日分红</view>
+            <view class="text-12 mt-4 text-blue-red">每日分红</view>
           </view>
         </view>
         <view
-          class="text-center px-50 absolute bottom-0 left-0 text-12 text-#fff rounded-full py-8 bg-[linear-gradient(80deg,rgba(59,129,243,1),rgba(55,230,236,1))]"
+          class="text-center px-50 absolute bottom-0 left-0 text-12 text-#fff rounded-full py-8 bg-blue-red"
           @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-[linear-gradient(80deg,rgba(59,129,243,1),rgba(55,230,236,1))]"
+          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"
-          :class="{
-            '!bg-[linear-gradient(80deg,#E2AF74,#FFCC40)]': item.is_ai,
-            '!text-#9B6F33': item.is_ai,
-          }"
         >
-          {{ item.is_ai ? '会员产品' : '新手体验' }}
+          {{ item.label }}
         </view>
       </view>
     </view>
@@ -64,16 +60,13 @@ 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 { buyFundAPI, getFundListAPI } from '@/service'
+import { getInvestmentListAPI, submitInvestAPI } from '@/service'
 import { useUserStore } from '@/store'
 import { mergeStep, showModal } from '@/utils'
 
 defineOptions({
   name: 'Home',
 })
-
-const userStore = useUserStore()
-
 const showPayType = ref(false)
 const panels = ref([
   {
@@ -90,6 +83,10 @@ const panels = ref([
   },
 ])
 
+const { list: investmentList } = useListPageRequest(getInvestmentListAPI)
+
+const userStore = useUserStore()
+
 const onGoInvestDetail = () => {
   uni.navigateTo({
     url: '/pages-sub/invest-detail/index',
@@ -103,8 +100,9 @@ const onSelectPayType = ({ item, index }: any) => {
 
 const onInvest = mergeStep(async (item: any) => {
   await showModal('确认投资?')
-  await buyFundAPI({
+  await submitInvestAPI({
-    fund_id: item.id,
+    investid: item.id,
+    type: 3,
   })
   await userStore.loadUserInfo()
   uni.showToast({
@@ -112,13 +110,13 @@ const onInvest = mergeStep(async (item: any) => {
     icon: 'none',
   })
 })
-const { list: fundList } = useListPageRequest(getFundListAPI)
 </script>
 
 <style>
 .invest-page {
   min-height: 100vh;
   padding-bottom: 100px;
+  background-color: #ebbf92;
   background-image: url('@/static/images/invest/bg.png');
   background-repeat: no-repeat;
   background-attachment: fixed;
@@ -134,4 +132,18 @@ const { list: fundList } = useListPageRequest(getFundListAPI)
   background-position: center;
   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%;
+}
+.bg-blue-red {
+  background-image: linear-gradient(90.02deg, #8bb9ff 0.02%, #be4343 100.27%);
+}
+.text-blue-red {
+  background-image: linear-gradient(90.02deg, #8bb9ff 0.02%, #be4343 100.27%);
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
 </style>

src/pages/invite/index.vue

@@ -0,0 +1,77 @@
+<route lang="json5">
+{
+  style: {
+    navigationBarTitleText: '邀请好友',
+    navigationBarBackgroundColor: '#fff',
+    navigationStyle: 'custom',
+  },
+}
+</route>
+
+<script setup lang="ts">
+import NavBar from '@/components/NavBar.vue'
+import VueQrcode from '@chenfengyuan/vue-qrcode'
+import { useUserStore } from '@/store'
+
+const userStore = useUserStore()
+
+const qrcodeValue =
+  location.origin + '/#/pages/register/index?invite=' + userStore.userInfo?.invitecode
+
+const onCopy = (code: string) => {
+  uni.setClipboardData({
+    data: code,
+  })
+}
+const onLottery = () => {
+  uni.navigateTo({
+    url: '/pages-sub/lottery/index',
+  })
+}
+</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>
+        </view>
+        <view
+          class="btn-gradient text-white rounded-full px-15 py-4 text-12 ml-10"
+          @click="onCopy('99999')"
+        >
+          复制
+        </view>
+      </view>
+      <view class="mt-15 rounded-10 overflow-hidden flex">
+        <VueQrcode :value="qrcodeValue" :options="{ size: 200 }" />
+      </view>
+      <view
+        class="btn-gradient text-white rounded-full text-14 px-30 py-8 mt-30"
+        @click="onCopy(qrcodeValue)"
+      >
+        复制邀请链接
+      </view>
+    </view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+.invite-page {
+  background-image: url('@/static/images/page-sub/invite-bg.png');
+  background-repeat: no-repeat;
+  background-position: top;
+  background-size: 100%;
+}
+</style>

src/pages/login/index.vue

@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationBarTitleText: '登录',
@@ -10,10 +10,7 @@
 <template>
   <view class="login-container relative">
     <NavBar />
-    <view
+    <view class="mt-44 text-28 pl-32 text-gradient" style="-webkit-background-clip: text">
-      class="mt-44 text-28 pl-32 bg-[linear-gradient(180deg,#04A9F9,#23C0CF)] text-transparent"
-      style="-webkit-background-clip: text"
-    >
       登录
     </view>
     <view class="pt-45">
@@ -22,7 +19,7 @@
           <image class="w-24 h-24" src="@/static/images/login/phone.png" mode="aspectFit" />
           <input
             type="text"
-            v-model="formData.member_username"
+            v-model="formData.account"
             placeholder-class="text-#889BC6"
             class="text-right flex-1 text-14"
             placeholder="请输入用户名"
@@ -33,13 +30,13 @@
           <input
             placeholder-class="text-#889BC6"
             type="password"
-            v-model="formData.member_password"
+            v-model="formData.password"
             class="text-right flex-1 text-14"
             placeholder="请输入登录密码"
           />
         </view>
       </view>
-      <!-- <view class="ml-auto mr-0 w-fit text-#04A9F9 text-14 p-15" @click="handleEditPassword">
+      <!-- <view class="ml-auto mr-0 w-fit text-gradient text-14 p-15" @click="handleEditPassword">
         忘记密码
       </view> -->
       <view
@@ -50,7 +47,7 @@
       </view>
       <view class="mt-30 text-center text-14 text-#999">
         没有账号？
-        <text class="text-#04A9F9" @click="handleRegister">立即注册</text>
+        <text class="text-gradient" @click="handleRegister">立即注册</text>
       </view>
     </view>
     <view class="absolute bottom-15 left-50% -translate-x-50% text-#999 text-14">V1.0.0</view>
@@ -60,13 +57,13 @@
 <script lang="ts" setup>
 import NavBar from '@/components/NavBar.vue'
 import { isLogged } from '@/interceptors/route'
-import { loginAPI } from '@/service'
+import { loginUserAPI } from '@/service'
 import { useUserStore } from '@/store/user'
 
 const userStore = useUserStore()
 const formData = ref({
-  member_username: '',
+  account: '',
-  member_password: '',
+  password: '',
 })
 
 let redirect = '/'
@@ -75,15 +72,17 @@ onLoad((options) => {
 })
 
 const handleLogin = async () => {
-  if (!formData.value.member_username || !formData.value.member_password) {
+  if (!formData.value.account || !formData.value.password) {
     return uni.showToast({
       title: '请输入用户名和密码',
       icon: 'none',
     })
   }
   const {
-    data: { token },
+    data: {
-  } = await loginAPI(formData.value)
+      userinfo: { token },
+    },
+  } = await loginUserAPI(formData.value)
   userStore.setToken(token)
   uni.reLaunch({
     url: redirect,

src/pages/my/components/request.vue

@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   layout: 'demo',
   style: {

src/pages/my/index.vue

@@ -1,4 +1,4 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
   style: {
     navigationStyle: 'custom',
@@ -11,22 +11,25 @@
   <view class="my-page">
     <NavBar />
     <view class="flex flex-col items-center justify-center mt-30">
-      <Avatar
+      <Avatar class="w-80 h-80 mx-auto" :src="getImageUrl(userStore.userInfo.avatar)" />
-        class="w-80 h-80 mx-auto"
+      <view class="text-16 mt-10">{{ userStore.userInfo.nickname }}</view>
-        :src="userStore.userInfo?.member_portrait"
+      <view class="text-12 mt-8">账号：{{ userStore.userInfo.username }}</view>
-        @click="uploadAvatar"
+    </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 class="text-16 mt-10">{{ userStore.userInfo?.member_username }}</view>
-      <!-- <view class="text-12 mt-8">账号：{{ userStore.userInfo?.member_username }}</view> -->
       </view>
-    <view class="flex justify-center text-center mt-15">
+      <view class="flex-1">
-      <view class="">
+        <view class="text-30 font-bold">{{ Number(userStore.userInfo.score) }}</view>
-        <view class="text-30 font-bold">{{ userStore.userInfo?.member_dividend }}</view>
+        <view class="text-14 mt-10 text-#3B81F3">我的股数</view>
-        <view class="text-14 mt-10 text-#3B81F3">我的分红</view>
-      </view>
-      <view class="ml-30">
-        <view class="text-30 font-bold">{{ userStore.userInfo?.member_currency }}</view>
-        <view class="text-14 mt-10 text-#3B81F3">数字人民币</view>
       </view>
     </view>
 
@@ -36,33 +39,14 @@
         @click="handleWithdrawal"
       >
         <image class="w-40 h-40" src="@/static/images/my/withdrawal.png" mode="aspectFit" />
-        <view
+        <view class="text-white text-14 px-15 py-5 ml-15 rounded-full btn-gradient">提现</view>
-          class="text-white text-14 px-15 py-5 ml-15 rounded-full bg-[linear-gradient(45deg,#3B81F3_0%,#37E6EC_100%)]"
-        >
-          提现
       </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="handleWithdrawalRecord"
-      >
-        <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 bg-[linear-gradient(45deg,#3B81F3_0%,#37E6EC_100%)]"
-        >
-          提现记录
-        </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="handleRecharge"
+        @click="handleConvert"
       >
         <image class="w-40 h-40" src="@/static/images/my/top-up.png" mode="aspectFit" />
-        <view
+        <view class="text-white text-14 px-15 py-5 ml-15 rounded-full btn-gradient">转换</view>
-          class="text-white text-14 px-15 py-5 ml-15 rounded-full bg-[linear-gradient(45deg,#3B81F3_0%,#37E6EC_100%)]"
-        >
-          充值
-        </view>
       </view>
     </view>
 
@@ -70,7 +54,7 @@
       class="w-330 h-123 mx-auto mt-15 block"
       src="@/static/images/my/recommend.png"
       mode="aspectFill"
-      @click="handlePurchaseMember"
+      @click="handleInvite"
     />
 
     <view class="mt-15 grid grid-cols-2 gap-10 p-15">
@@ -100,13 +84,13 @@
         @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/kefu.png" mode="aspectFit" />
+        <image class="w-24 h-24" src="@/static/images/my/card.png" mode="aspectFit" />
         <view class="text-14 text-#333 ml-10">我的银行卡</view>
       </view>
     </view>
 
     <view
-      class="mt-50 mx-auto w-294 bg-[linear-gradient(45deg,#3B81F3,#37E6EC)] rounded-full text-center text-14 text-white py-15 mt-15"
+      class="mt-50 mx-auto w-294 btn-gradient rounded-full text-center text-14 text-white py-15 mt-15"
       @click="handleLogout"
     >
       退出登录
@@ -118,21 +102,20 @@
 import Avatar from '@/components/Avatar.vue'
 import NavBar from '@/components/NavBar.vue'
 import { loginRoute } from '@/interceptors/route'
-import { logoutAPI, updateUserAPI } from '@/service'
 import { useUserStore } from '@/store/user'
+import { getImageUrl } from '@/utils'
 
 const userStore = useUserStore()
 
-const handleLogout = async () => {
+const handleLogout = () => {
-  // logoutAPI()
   userStore.logout()
   uni.reLaunch({
     url: loginRoute,
   })
 }
-const handleRecharge = () => {
+const handleWithdrawalDetail = () => {
   uni.navigateTo({
-    url: '/pages-sub/recharge/index',
+    url: '/pages-sub/withdrawal-detail/index',
   })
 }
 
@@ -166,30 +149,17 @@ const handleBankCard = () => {
   })
 }
 
-const handlePurchaseMember = () => {
+const handleInvite = () => {
+  uni.switchTab({
+    url: '/pages/invite/index',
+  })
+}
+
+const handleConvert = () => {
   uni.navigateTo({
-    url: '/pages-sub/purchase-member/index',
+    url: '/pages-sub/convert/index',
   })
 }
-
-const handleWithdrawalRecord = () => {
-  uni.navigateTo({
-    url: '/pages-sub/withdrawal-detail/index',
-  })
-}
-
-const { data, run } = useUpload<any>()
-const uploadAvatar = () => {
-  run()
-}
-
-watch(data, async (newVal) => {
-  const path = JSON.parse(newVal)?.data?.path
-  await updateUserAPI({
-    member_portrait: path,
-  })
-  userStore.loadUserInfo()
-})
 </script>
 
 <style lang="scss" scoped>

src/pages/register/index.vue

@@ -7,6 +7,94 @@
   notNeedLogin: false,
 }
 </route>
+
+<script lang="ts" setup>
+import NavBar from '@/components/NavBar.vue'
+import { isLogged } from '@/interceptors/route'
+import { registerUserAPI } from '@/service'
+import { useUserStore } from '@/store/user'
+import { mergeStep } from '@/utils'
+
+const userStore = useUserStore()
+const form = ref({
+  username: '',
+  // member_nickname: '',
+  password: '',
+  retpassword: '',
+  invitecode: '',
+  tpassword: '',
+  rettpassword: '',
+})
+
+let redirect = '/'
+onLoad((options) => {
+  redirect = options.redirect ?? '/'
+  form.value.invitecode = options.invitecode ?? ''
+})
+
+const handleRegister = mergeStep(async () => {
+  if (!form.value.username) {
+    uni.showToast({
+      title: '请输入用户名',
+      icon: 'none',
+    })
+    return
+  }
+  if (!form.value.password) {
+    uni.showToast({
+      title: '请输入登录密码',
+      icon: 'none',
+    })
+    return
+  }
+  if (form.value.password !== form.value.retpassword) {
+    uni.showToast({
+      title: '两次输入的密码不一致',
+      icon: 'none',
+    })
+    return
+  }
+  if (!form.value.tpassword) {
+    uni.showToast({
+      title: '请输入支付密码',
+      icon: 'none',
+    })
+    return
+  }
+  if (form.value.tpassword !== form.value.rettpassword) {
+    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,
+  })
+})
+onLoad(async (options) => {
+  if (isLogged()) {
+    uni.reLaunch({
+      url: redirect,
+    })
+  }
+  form.value.invitecode = options.invite ?? ''
+})
+</script>
+
 <template>
   <view class="login-container relative">
     <NavBar />
@@ -15,7 +103,7 @@
         <view class="flex items-center py-15">
           <image class="w-24 h-24" src="@/static/images/login/phone.png" mode="aspectFit" />
           <input
-            v-model="form.member_username"
+            v-model="form.username"
             type="text"
             placeholder-class="text-#889BC6"
             class="text-right flex-1 text-14"
@@ -25,7 +113,7 @@
         <view class="flex items-center py-15">
           <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
           <input
-            v-model="form.member_password"
+            v-model="form.password"
             placeholder-class="text-#889BC6"
             type="password"
             class="text-right flex-1 text-14"
@@ -35,7 +123,7 @@
         <view class="flex items-center py-15">
           <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
           <input
-            v-model="form.confirm_member_password"
+            v-model="form.retpassword"
             placeholder-class="text-#889BC6"
             type="password"
             class="text-right flex-1 text-14"
@@ -45,7 +133,7 @@
         <view class="flex items-center py-15">
           <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
           <input
-            v-model="form.pay_password"
+            v-model="form.tpassword"
             placeholder-class="text-#889BC6"
             type="password"
             class="text-right flex-1 text-14"
@@ -55,7 +143,7 @@
         <view class="flex items-center py-15">
           <image class="w-24 h-24" src="@/static/images/login/password.png" mode="aspectFit" />
           <input
-            v-model="form.confirm_pay_password"
+            v-model="form.rettpassword"
             placeholder-class="text-#889BC6"
             type="password"
             class="text-right flex-1 text-14"
@@ -65,24 +153,13 @@
         <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.invitation_code"
+            v-model="form.invitecode"
             placeholder-class="text-#889BC6"
             type="text"
             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/message.png" mode="aspectFit" />
-          <input
-            v-model="form.verify_code"
-            type="text"
-            placeholder-class="text-#889BC6"
-            class="text-right flex-1 text-14"
-            placeholder="请输入图形验证码"
-          />
-          <image :src="codeUrl" class="ml-10 w-80 h-30" @click="handleGetCode" />
-        </view>
       </view>
       <view
         class="mt-50 text-center py-12 rounded-full mx-15 text-15 text-white btn-gradient"
@@ -94,103 +171,6 @@
   </view>
 </template>
 
-<script lang="ts" setup>
-import NavBar from '@/components/NavBar.vue'
-import { isLogged } from '@/interceptors/route'
-import { registerAPI } from '@/service'
-import { useUserStore } from '@/store/user'
-import { mergeStep } from '@/utils'
-
-const userStore = useUserStore()
-const form = ref({
-  member_username: '',
-  // member_nickname: '',
-  member_password: '',
-  confirm_member_password: '',
-  verify_code: '',
-  invitation_code: '',
-  pay_password: '',
-  confirm_pay_password: '',
-})
-
-let redirect = '/'
-onLoad((options) => {
-  redirect = options.redirect ?? '/'
-  form.value.invitation_code = options.invitation_code ?? ''
-})
-
-const handleRegister = mergeStep(async () => {
-  if (!form.value.member_username) {
-    uni.showToast({
-      title: '请输入用户名',
-      icon: 'none',
-    })
-    return
-  }
-  if (!form.value.verify_code) {
-    uni.showToast({
-      title: '请输入图形验证码',
-      icon: 'none',
-    })
-    return
-  }
-  if (!form.value.member_password) {
-    uni.showToast({
-      title: '请输入登录密码',
-      icon: 'none',
-    })
-    return
-  }
-  if (form.value.member_password !== form.value.confirm_member_password) {
-    uni.showToast({
-      title: '两次输入的密码不一致',
-      icon: 'none',
-    })
-    return
-  }
-  if (!form.value.pay_password) {
-    uni.showToast({
-      title: '请输入支付密码',
-      icon: 'none',
-    })
-    return
-  }
-  if (form.value.pay_password !== form.value.confirm_pay_password) {
-    uni.showToast({
-      title: '两次输入的支付密码不一致',
-      icon: 'none',
-    })
-    return
-  }
-  // if (!form.value.invitation_code) {
-  //   uni.showToast({
-  //     title: '请输入邀请码',
-  //     icon: 'none',
-  //   })
-  //   return
-  // }
-  const {
-    data: { token },
-  } = await registerAPI(form.value).catch(() => {
-    handleGetCode()
-    throw new Error('注册失败')
-  })
-  userStore.setToken(token)
-  uni.reLaunch({
-    url: redirect,
-  })
-})
-const { codeUrl, refreshCode: handleGetCode } = useCaptcha()
-onLoad(async (options) => {
-  if (isLogged()) {
-    uni.reLaunch({
-      url: redirect,
-    })
-  }
-  form.value.invitation_code = options.invite ?? ''
-})
-</script>
-
 <style lang="scss">
 .login-container {
   box-sizing: border-box;

src/service/index.ts

@@ -1,134 +1,150 @@
 import { http } from '@/utils/http'
 
-/** 账号登录 */
+// 注册用户
-export const loginAPI = (data) => {
+export const registerUserAPI = (data) =>
-  return http.post<{ token: string }>('/api/v1/LoginUser', data)
+  http({
-}
+    url: '/api/user/register',
+    method: 'POST',
+    data,
+  })
 
-/** 修改密码 */
+// 登录
-export const updateUserAPI = (data) => {
+export const loginUserAPI = (data) =>
-  return http.post('/api/v1/UpgradeUser', data)
+  http({
-}
+    url: '/api/user/login',
+    method: 'POST',
+    data,
+  })
 
-/** 注册账号 */
+// 获取用户信息
-export const registerAPI = (data) => {
+export const getUserInfoAPI = () =>
-  return http.post<{ token: string }>('/api/v1/RegisterUser', data)
+  http({
-}
+    url: '/api/user/index',
-/** 用户信息 */
+    method: 'GET',
-export const getUserInfoAPI = () => {
+  })
-  return http.post<IUserInfo>('/api/v1/getUserInfo')
-}
 
-/** 退出登录 */
+// 退出登录
-export const logoutAPI = () => {
+export const logoutUserAPI = () =>
-  return http.post('/api/v1/Logiout')
+  http({
-}
+    url: '/api/user/logout',
+    method: 'POST',
+  })
 
-/** 实名认证 */
+// 简介、公告、新闻
-export const createAuthUser = (data) => {
+export const getIntroductionAPI = (data) =>
-  return http.post('/api/v1/CreateAuthUser', data)
+  http({
-}
+    url: '/api/index/articlelist',
+    method: 'POST',
+    data,
+  })
 
-/** 轮播列表 */
+// 新闻详情
-export const getBannerListAPI = () => {
+export const getIntroductionDetailAPI = (data) =>
-  return http.post<any[]>('/api/v1/getSwipeList')
+  http({
-}
+    url: '/api/index/articledetails',
+    method: 'POST',
+    data,
+  })
 
-/** 新闻列表 */
+// 投资理财列表
-export const getNewsListAPI = (data) => {
+export const getInvestmentListAPI = (data) =>
-  return http.post<any[]>('/api/v1/getNewsList', data)
+  http({
-}
+    url: '/api/index/investlist',
+    method: 'POST',
+    data,
+  })
 
-/** 新闻详情 */
+// 提交投资
-export const getNewsDetailAPI = (data) => {
+export const submitInvestAPI = (data) =>
-  return http.post<any>('/api/v1/getNewsDetail', data, data)
+  http({
-}
+    url: '/api/user/submitinvest',
+    method: 'POST',
+    data,
+  })
 
-/** 公司简介 */
+// 获取投资记录
-export const getCompanyInfoAPI = () => {
+export const getInvestmentRecordAPI = (data) =>
-  return http.post<any>('/api/v1/getCompanyProfile')
+  http({
-}
+    url: '/api/user/myinvestlist',
+    method: 'POST',
+    data,
+  })
 
-/** 基金列表 */
+// 查询实名认证
-export const getFundListAPI = () => {
+export const getRealNameAuthAPI = () =>
-  return http.post<any[]>('/api/v1/getFundList')
+  http({
-}
+    url: '/api/user/finduserauth',
-/** 购买基金   */
+    method: 'POST',
-export const buyFundAPI = (data) => {
+  })
-  return http.post('/api/v1/buyFundOrder', data)
-}
 
-/** 购买基金订单列表 */
+// 实名认证
-export const getBuyFundOrderListAPI = (data) => {
+export const realNameAuthAPI = (data) =>
-  return http.post<any[]>('/api/v1/getFundOrderList', data)
+  http({
-}
+    url: '/api/user/userauth',
+    method: 'POST',
+    data,
+  })
 
-/** 房屋列表 */
+// 我的邀请
-export const getHouseListAPI = () => {
+export const getMyTeamAPI = (data) =>
-  return http.post<{ list: any[] }>('/api/v1/getHouseList')
+  http({
-}
+    url: '/api/user/inviteelist',
+    method: 'POST',
+    data,
+  })
 
-/** 购买房屋 */
+// 我的资产
-export const buyHouseAPI = (data) => {
+export const getMyAssetAPI = (data) =>
-  return http.post('/api/v1/buyHouseOrder', data)
+  http({
-}
+    url: '/api/user/myassets',
+    method: 'POST',
+    data,
+  })
 
-/** VIP列表 */
+// 股数转换
-export const getVipListAPI = () => {
+export const convertScoreAPI = (data) =>
-  return http.post<{ list: any[] }>('/api/v1/getVipList')
+  http({
-}
+    url: '/api/user/conversion',
+    method: 'POST',
+    data,
+  })
 
-/** 购买VIP */
+// 添加银行卡
-export const buyVIPAPI = (data) => {
+export const addBankCardAPI = (data) =>
-  return http.post('/api/v1/buyFundOrder', data)
+  http({
-}
+    url: '/api/user/addbank',
+    method: 'POST',
+    data,
+  })
 
-/** 我的团队 */
+// 获取银行卡
-export const getMyTeamAPI = (data) => {
+export const getBankCardAPI = (data) =>
-  return http.post<{ list: any[] }>('/api/v1/getMyTeam', data)
+  http({
-}
+    url: '/api/user/banklist',
+    method: 'POST',
+    data,
+  })
 
-/** 绑定收款卡号 */
+// 删除银行卡
-export const bindBankCardAPI = (data) => {
+export const deleteBankCardAPI = (data) =>
-  return http.post('/api/v1/CreateCardUser', data)
+  http({
-}
+    url: '/api/user/delbank',
+    method: 'POST',
+    data,
+  })
 
-/** 删除收款卡号 */
+// 提交提现
-export const deleteBankCardAPI = (data) => {
+export const submitWithdrawalAPI = (data) =>
-  return http.post('/api/v1/CannelUserCard', data)
+  http({
-}
+    url: '/api/user/withdrawal',
+    method: 'POST',
+    data,
+  })
 
-/** 获取银行卡列表 */
+// 获取提现记录
-export const getBankCardListAPI = () => {
+export const getWithdrawalRecordAPI = (data) =>
-  return http.post('/api/v1/getCardList')
+  http({
-}
+    url: '/api/user/withdrawallist',
-
+    method: 'POST',
-/** 申请提现 */
+    data,
-export const applyWithdrawalAPI = (data) => {
+  })
-  return http.post('/api/v1/CreateWithdrawal', data)
-}
-
-/** 提现记录 */
-export const getWithdrawalRecordAPI = (data) => {
-  return http.post<{ list: any[] }>('/api/v1/WithdrawalOrder', data)
-}
-
-/** 余额明细 */
-export const getBalanceRecordsAPI = (data) => {
-  return http.post<{ list: any[] }>('/api/v1/getBalanceRecords', data)
-}
-
-/** 系统充收款账号列表 */
-export const getSystemRechargeAccountAPI = (data) => {
-  return http.post<{ list: any[] }>('/api/v1/getWalletList', data)
-}
-
-/** 充值 */
-export const rechargeAPI = (data) => {
-  return http.post('/api/v1/CreateRechangeOrder', data)
-}
-
-/** 充值记录 */
-export const getRechargeRecordAPI = (data) => {
-  return http.post<{ list: any[] }>('/api/v1/getRechangeOrder', data)
-}

src/store/user.ts

@@ -1,4 +1,4 @@
-import { getUserInfoAPI } from '@/service'
+import { getUserInfoAPI, logoutUserAPI } from '@/service'
 import { mergeStep } from '@/utils'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
@@ -11,7 +11,7 @@ export const useUserStore = defineStore(
 
     const loadUserInfo = mergeStep(async () => {
       const res = await getUserInfoAPI()
-      userInfo.value = res.data
+      userInfo.value = res.data.userinfo
     })
 
     const setUserInfo = (val: IUserInfo) => {
@@ -27,7 +27,8 @@ export const useUserStore = defineStore(
     const clearToken = () => {
       token.value = ''
     }
-    const logout = () => {
+    const logout = async () => {
+      // logoutUserAPI()
       clearUserInfo()
       clearToken()
     }

src/types/auto-import.d.ts

@@ -75,7 +75,6 @@ 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']
@@ -173,7 +172,6 @@ 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/i18n.d.ts

@@ -0,0 +1,8 @@
+export {}
+
+declare module 'vue' {
+  interface ComponentCustomProperties {
+    $t: (key: string, opt?: Record<string, any>) => string
+    $tm: (key: string, opt?: Record<string, any>) => [] | { [p: string]: any }
+  }
+}

src/types/uni-pages.d.ts

@@ -6,24 +6,23 @@
 interface NavigateToOptions {
   url: "/pages/index/index" |
        "/pages/edit-password/index" |
-       "/pages/house/index" |
        "/pages/invest/index" |
+       "/pages/invite/index" |
        "/pages/login/index" |
        "/pages/my/index" |
        "/pages/register/index" |
        "/pages-sub/asset/index" |
+       "/pages-sub/convert/index" |
        "/pages-sub/demo/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/news-detail/index" |
        "/pages-sub/official-community/index" |
-       "/pages-sub/purchase-member/index" |
        "/pages-sub/realname/index" |
-       "/pages-sub/recharge/index" |
-       "/pages-sub/recharge-detail/index" |
        "/pages-sub/team/index" |
        "/pages-sub/withdrawal/index" |
        "/pages-sub/withdrawal-detail/index" |
@@ -33,7 +32,7 @@ interface NavigateToOptions {
 interface RedirectToOptions extends NavigateToOptions {}
 
 interface SwitchTabOptions {
-  url: "/pages/index/index" | "/pages/invest/index" | "/pages/house/index" | "/pages/my/index"
+  url: "/pages/index/index" | "/pages/invite/index" | "/pages/invest/index" | "/pages/my/index"
 }
 
 type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;

src/typings.ts

@@ -2,7 +2,7 @@
 
 type IResData<T> = {
   code: number
-  message: string
+  msg: string
   data: T
 }
 
@@ -16,30 +16,20 @@ type IUniUploadFileOptions = {
 }
 
 type IUserInfo = {
-  /** 用户ID   */
+  avatar: string
-  member_id: string
+  createtime: number
-  /** 用户名   */
+  expires_in: number
-  member_username: string
+  expiretime: number
-  /** 余额   */
+  id: number
-  member_balance: string
+  invitecode: string
-  /** 数字人民币   */
+  mobile: string
-  member_currency: string
+  money: string
-  /** 分红   */
+  nickname: string
-  member_dividend: string
+  point: number
-  /** 认购点   */
+  score: number
-  member_point: string
+  token: string
-  /** 投资金   */
+  user_id: number
-  member_investment: string
+  username: string
-  /** 头像地址   */
-  member_portrait: string
-  /** 用户昵称   */
-  member_nickname: string
-  /** 余额状态 1开启 0冻结   */
-  balance_status: string
-  /** 是否实名认证 1是 0否 2审核中   */
-  member_certification: number
-  /** 邀请码   */
-  invitation_code: string
 }
 
 enum TestEnum {

src/utils/http.ts

@@ -18,7 +18,7 @@ export const http = <T>(options: CustomRequestOptions) => {
           if (res.header['content-type'].includes('application/json')) {
             // 2.1 提取核心数据 res.data
             const data = res.data as IResData<T>
-            if (data.code === 200) {
+            if (data.code === 1) {
               resolve(data as IResData<T>)
             } else if (data.code === 401) {
               const userStore = useUserStore()
@@ -26,7 +26,7 @@ export const http = <T>(options: CustomRequestOptions) => {
               !options.hideErrorToast &&
                 (await uni.showModal({
                   title: '提示',
-                  content: data.message || '请求错误',
+                  content: data.msg || '请求错误',
                   showCancel: false,
                 }))
               uni.reLaunch({
@@ -38,7 +38,7 @@ export const http = <T>(options: CustomRequestOptions) => {
               !options.hideErrorToast &&
                 (await uni.showModal({
                   title: '提示',
-                  content: data.message || '请求错误',
+                  content: data.msg || '请求错误',
                   showCancel: false,
                 }))
               reject(res)
@@ -47,16 +47,25 @@ export const http = <T>(options: CustomRequestOptions) => {
             resolve(res.data as any)
           }
         } else if (res.statusCode === 401) {
-          // 401错误  -> 清理用户信息，跳转到登录页
+          const userStore = useUserStore()
-          // userStore.clearUserInfo()
+          userStore.logout()
-          // uni.navigateTo({ url: '/pages/login/login' })
+          !options.hideErrorToast &&
+            (await uni.showModal({
+              title: '提示',
+              content: res.data.msg || '请求错误',
+              showCancel: false,
+            }))
+          uni.reLaunch({
+            url: loginRoute,
+          })
+
           reject(res)
         } else {
           // 其他错误 -> 根据后端错误信息轻提示
           !options.hideErrorToast &&
             (await uni.showModal({
               title: '提示',
-              content: (res.data as IResData<T>).message || '请求错误',
+              content: (res.data as IResData<T>).msg || '请求错误',
               showCancel: false,
             }))
           reject(res)

src/utils/i18n.ts

@@ -0,0 +1,10 @@
+import { t } from '@/locale/index'
+
+/** 非vue 文件使用 i18n */
+export const testI18n = () => {
+  // 下面同样生效
+  uni.showModal({
+    title: 'i18n 测试',
+    content: t('app.name'),
+  })
+}

src/utils/index.ts

@@ -219,3 +219,11 @@ export const showModal = (
 export const formatTime = (time: string | number) => {
   return dayjs(time).format('YYYY-MM-DD HH:mm:ss')
 }
+
+/** 获取图片url */
+export const getImageUrl = (image: any) => {
+  if (typeof image === 'string') {
+    return /^http|data:/.test(image) ? image : `${import.meta.env.VITE_SERVER_BASEURL}${image}`
+  }
+  return image
+}

uno.config.ts

@@ -78,14 +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(45deg,rgba(59,129,243,1),rgba(55,230,236,1))' },
-    ],
     [
       'text-gradient',
       {
-        'background-image': 'linear-gradient(45deg,#3B81F3,#37E6EC)',
+        'background-image': 'linear-gradient(90deg,#95C3FF,#4D72F6 30%)',
         'background-clip': 'text',
         color: 'transparent',
       },

vite.config.ts

@@ -141,7 +141,7 @@ export default ({ command, mode }) => {
             [VITE_APP_PROXY_PREFIX]: {
               target: VITE_SERVER_BASEURL,
               changeOrigin: true,
-              rewrite: (path) => path.replace(new RegExp(`^${VITE_APP_PROXY_PREFIX}`), 'api'),
+              rewrite: (path) => path.replace(new RegExp(`^${VITE_APP_PROXY_PREFIX}`), ''),
             },
           }
         : undefined,