diff --git a/env/.env b/env/.env index 9cbe363..222a72a 100644 --- a/env/.env +++ b/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://sapi.foxmail555.cc' -VITE_UPLOAD_BASEURL = 'https://sapi.foxmail555.cc/api/common/upload' +VITE_SERVER_BASEURL = 'https://yapi.foxmail555.cc' +VITE_UPLOAD_BASEURL = 'https://yapi.foxmail555.cc/api/common/upload' # h5是否需要配置代理 VITE_APP_PROXY=false diff --git a/pages.config.ts b/pages.config.ts index 4755d34..afafdbb 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -18,7 +18,7 @@ export default defineUniPages({ }, tabBar: { color: '#999999', - selectedColor: '#0E57A2', + selectedColor: '#D3B389', backgroundColor: '#ffffff', borderStyle: '#E7E7E7', height: '56px', @@ -33,16 +33,22 @@ export default defineUniPages({ text: '首页', }, { - iconPath: 'static/tabbar/invest.png', - selectedIconPath: 'static/tabbar/investHL.png', - pagePath: 'pages/invest/index', - text: '保障', + iconPath: 'static/tabbar/invite.png', + selectedIconPath: 'static/tabbar/inviteHL.png', + pagePath: 'pages/invite/index', + text: '邀请福利', + }, + { + iconPath: 'static/tabbar/bank.png', + selectedIconPath: 'static/tabbar/bankHL.png', + pagePath: 'pages/bank/index', + text: '银行卡', }, { iconPath: 'static/tabbar/house.png', selectedIconPath: 'static/tabbar/houseHL.png', - pagePath: 'pages/invite/index', - text: '社区', + pagePath: 'pages/invest/index', + text: '资产平移', }, { iconPath: 'static/tabbar/personal.png', diff --git a/src/App.vue b/src/App.vue index 051d51c..714b811 100644 --- a/src/App.vue +++ b/src/App.vue @@ -131,4 +131,11 @@ uni-modal { } } } +::-webkit-scrollbar { + display: none; +} +@font-face { + font-family: 'FARRINGTON-7B'; + src: url('@/static/FARRINGTON-7B.ttf'); +} diff --git a/src/components/Avatar.vue b/src/components/Avatar.vue index d4987b7..d15515b 100644 --- a/src/components/Avatar.vue +++ b/src/components/Avatar.vue @@ -14,7 +14,7 @@ defineProps({ rounded-full p-4 shadow-lg - style="background: linear-gradient(45deg, #3b81f3 0%, #37e6ec 100%)" + style="background: linear-gradient(45deg, #ffdd99 0%, #efb85a 100%)" > diff --git a/src/pages-sub/introduction/index.vue b/src/pages-sub/introduction/index.vue index 60304b4..ce317bb 100644 --- a/src/pages-sub/introduction/index.vue +++ b/src/pages-sub/introduction/index.vue @@ -15,9 +15,7 @@ :src="introductionDetail.image" mode="aspectFill" /> - - {{ introductionDetail.content }} - + diff --git a/src/pages-sub/realname/index.vue b/src/pages-sub/realname/index.vue index cf31773..7b04b93 100644 --- a/src/pages-sub/realname/index.vue +++ b/src/pages-sub/realname/index.vue @@ -3,19 +3,21 @@ style: { navigationBarTitleText: '实名认证', navigationBarBackgroundColor: '#fff', + navigationStyle: 'custom', }, } - + + + 下载APP + + - + 最新时讯 @@ -47,7 +62,7 @@ indicator-dots autoplay circular - class="h-240 mt-10" + class="h-200 mt-10" > - 系统公告 - + 系统公告 + - - 公告{{ ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十'][index] }}: - - + + 公告{{ ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十'][index] }} + + { userStore.loadUserInfo() // showModal('开通个人养老账户时,需邀请一名用户') } + +// 获取轮播图 +const bannerList = ref([]) +const getBanner = async () => { + const res = await getBannerAPI() + bannerList.value = res.data +} +onLoad(getBanner) diff --git a/src/pages/invite/index.vue b/src/pages/invite/index.vue index 9e31227..c4b9850 100644 --- a/src/pages/invite/index.vue +++ b/src/pages/invite/index.vue @@ -1,4 +1,4 @@ - + { style: { navigationBarTitleText: '社区', @@ -68,40 +68,40 @@ onShow(async () => { const taskList = computed(() => { if (!inviteInfo.value) return [] - // const inviteTask = Object.keys(inviteInfo.value.jianglitiaojian) - // const inviteTaskList = inviteTask.map((key) => ({ - // title: `邀请${key}人(${inviteInfo.value.num}/${key})`, - // desc: `每月额外领取${inviteInfo.value.jianglitiaojian[key]}元社保金`, - // level: key, - // status: Number(inviteInfo.value.num) >= Number(key), - // open: false, - // })) - // // 查找最后一个完成的任务,并设置open为true - // const lastCompletedTask = inviteTaskList.findLast((item) => item.status) - // if (lastCompletedTask) { - // lastCompletedTask.open = inviteInfo.value.open - // } + const inviteTask = Object.keys(inviteInfo.value.jianglitiaojian) + const inviteTaskList = inviteTask.map((key) => ({ + title: `邀请${key}人(${inviteInfo.value.num}/${key})`, + desc: `赠送${inviteInfo.value.jianglitiaojian[key]}元`, + level: key, + status: Number(inviteInfo.value.num) >= Number(key), + open: false, + })) + // 查找最后一个完成的任务,并设置open为true + const lastCompletedTask = inviteTaskList.findLast((item) => item.status) + if (lastCompletedTask) { + lastCompletedTask.open = inviteInfo.value.open + } return [ - { - title: '注册实名', - desc: `领取${inviteInfo.value.realrewards}元社保金`, - // status: inviteInfo.value.isuserauth, - status: false, - open: false, - }, // { - // title: '签到有礼', - // desc: `每日签到送${inviteInfo.value.qiandaojiang}元社保金`, + // title: '注册实名', + // desc: `领取${inviteInfo.value.realrewards}元`, + // // status: inviteInfo.value.isuserauth, // status: false, // open: false, // }, - { - title: '邀请有礼', - desc: `每邀请1人并实名认证获得${inviteInfo.value.yaoqingjiang}元养老金`, - status: 0, - open: false, - }, - // ...inviteTaskList, + // { + // title: '签到有礼', + // desc: `每日签到送${inviteInfo.value.qiandaojiang}元`, + // status: false, + // open: false, + // }, + // { + // title: '邀请有礼', + // desc: `每邀请1人并实名认证获得${inviteInfo.value.yaoqingjiang}元养老金`, + // status: 0, + // open: false, + // }, + ...inviteTaskList, ] }) @@ -115,7 +115,7 @@ async function onGetReward(level) {