diff --git a/.vscode/settings.json b/.vscode/settings.json index d0bd8a4..09ab764 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -40,6 +40,7 @@ "commitlint", "dcloudio", "iconfont", + "Kefu", "qrcode", "refresherrefresh", "scrolltolower", diff --git a/package.json b/package.json index ddce8fe..dd2fa93 100644 --- a/package.json +++ b/package.json @@ -1,23 +1,9 @@ { - "name": "马尔代夫国际钱包", + "name": "全民参保", "type": "commonjs", "version": "2.5.3", - "description": "unibest - 最好的 uniapp 开发模板", - "author": { - "name": "feige996", - "zhName": "菲鸽", - "email": "1020103647@qq.com", - "github": "https://github.com/feige996", - "gitee": "https://gitee.com/feige996" - }, + "description": "全民参保", "license": "MIT", - "repository": "https://github.com/feige996/unibest", - "repository-gitee": "https://gitee.com/feige996/unibest", - "repository-deprecated": "https://github.com/codercup/unibest", - "bugs": { - "url": "https://github.com/feige996/unibest/issues" - }, - "homepage": "https://feige996.github.io/unibest/", "engines": { "node": ">=18", "pnpm": ">=7.30" diff --git a/pages.config.ts b/pages.config.ts index eb1f91e..6ddcbc9 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -32,19 +32,18 @@ export default defineUniPages({ pagePath: 'pages/index/index', text: '首页', }, - + { + iconPath: 'static/tabbar/invest.png', + selectedIconPath: 'static/tabbar/investHL.png', + pagePath: 'pages/invest/index', + text: '理财', + }, { iconPath: 'static/tabbar/house.png', selectedIconPath: 'static/tabbar/houseHL.png', pagePath: 'pages/invite/index', - text: '邀请好友', + text: '社区', }, - // { - // iconPath: 'static/tabbar/invest.png', - // selectedIconPath: 'static/tabbar/investHL.png', - // pagePath: 'pages/invest/index', - // text: '理财', - // }, { iconPath: 'static/tabbar/personal.png', selectedIconPath: 'static/tabbar/personalHL.png', diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 24f94e8..6e82c30 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -15,16 +15,28 @@ - diff --git a/src/interceptors/route.ts b/src/interceptors/route.ts index f25e512..f81f4c9 100644 --- a/src/interceptors/route.ts +++ b/src/interceptors/route.ts @@ -4,7 +4,7 @@ * 可以设置路由白名单,或者黑名单,看业务需要选哪一个 * 我这里应为大部分都可以随便进入,所以使用黑名单 */ -import { getUserInfoAPI } from '@/service' +import { getRealNameAuthAPI, getUserInfoAPI } from '@/service' import { useUserStore } from '@/store' import { getNotNeedLoginPages as _getNotNeedLoginPages, diff --git a/src/pages-sub/asset/index.vue b/src/pages-sub/asset/index.vue index f1bf843..2c2d054 100644 --- a/src/pages-sub/asset/index.vue +++ b/src/pages-sub/asset/index.vue @@ -1,7 +1,7 @@ { style: { - navigationBarTitleText: '我的资产', + navigationBarTitleText: '资金明细', navigationBarBackgroundColor: '#fff', }, } @@ -13,6 +13,14 @@ import { useUserStore } from '@/store' const userStore = useUserStore() +const tabList = [ + { label: '我的余额', value: 0 }, + { label: '救济金余额', value: 1 }, + { label: '养老金余额', value: 2 }, + { label: '佣金余额', value: 3 }, +] +const tabIndex = ref(0) + const detailInfo = ref({ point: 1, score: 1000, @@ -25,11 +33,49 @@ const { list: assetList } = useListPageRequest((params) => return res.data }), ) + +onLoad((options) => { + tabIndex.value = Number(options.tabIndex ?? 0) +}) - diff --git a/src/pages-sub/convert/index.vue b/src/pages-sub/convert/index.vue index 7730d05..f171323 100644 --- a/src/pages-sub/convert/index.vue +++ b/src/pages-sub/convert/index.vue @@ -8,7 +8,7 @@ - diff --git a/src/pages-sub/official-community/index.vue b/src/pages-sub/official-community/index.vue index 9013602..50af3ee 100644 --- a/src/pages-sub/official-community/index.vue +++ b/src/pages-sub/official-community/index.vue @@ -35,7 +35,7 @@ import VueQrcode from '@chenfengyuan/vue-qrcode' - diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index eb4abc5..2f848d6 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -16,25 +16,37 @@ - + 手机号 - + 密码 + + + 验证码 + + +