diff --git a/src/App.vue b/src/App.vue index 03fc49b7..b2762013 100644 --- a/src/App.vue +++ b/src/App.vue @@ -437,10 +437,10 @@ this.userStore .loadUser() .then((userInfo) => { - uni.showToast({ - title: '连接已断开,尝试重新连接...', - icon: 'none', - }); + // uni.showToast({ + // title: '连接已断开,尝试重新连接...', + // icon: 'none', + // }); // 重新连接 let loginInfo = uni.getStorageSync('loginInfo'); wsApi.reconnect(CHAT_ENV.WS_URL, loginInfo.accessToken); diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue index f10be50c..d1e3f60e 100644 --- a/src/pages/home/home.vue +++ b/src/pages/home/home.vue @@ -14,46 +14,59 @@ - + + + + + diff --git a/src/pages/moments/components/scroll-moment.vue b/src/pages/moments/components/scroll-moment.vue index 1a2a3d8f..6982a53f 100644 --- a/src/pages/moments/components/scroll-moment.vue +++ b/src/pages/moments/components/scroll-moment.vue @@ -7,28 +7,18 @@ :scroll-top="scrollTop" > - - - - - + + + ([]); onMounted(() => { refreshList(); + getBannerList(); }); + const getBannerList = async () => { + const { code, data = null } = await RecentApi.getBannerList(); + if (code !== 0) return; + bannerList.value = data ?? []; + }; + watch( () => userCity.value, async (city) => { diff --git a/src/pages/profile/apply-vip.vue b/src/pages/profile/apply-vip.vue index fd399e84..28b416b0 100644 --- a/src/pages/profile/apply-vip.vue +++ b/src/pages/profile/apply-vip.vue @@ -80,9 +80,7 @@ 开通即视为同意 - 《VIP会员协议》 - 和 - 《会员充值协议》 + 《荷塘月色会员协议》 - + - - {{ item.title }} - {{ item.desc }} + + + {{ item.desc }} + {{ item.subDesc }} @@ -137,11 +136,12 @@ createTime: number; } - const benefits = [ - { title: '无限次打招呼', desc: '每天畅聊不设上限,优先曝光给心仪的人' }, - { title: '优先展示', desc: '在附近和推荐列表中获得更高权重' }, - { title: '查看谁喜欢我', desc: '查看所有喜欢你的用户' }, - { title: '专属身份标识', desc: '昵称后展示 VIP 标识,提升可信度' }, + const benefits: any = [ + { icon: 'chat-filled', desc: '解锁微信', subDesc: '每天10个' }, + { icon: 'chatboxes-filled', desc: '无限畅聊', subDesc: '每天10个' }, + { icon: 'vip-filled', desc: '尊贵身份', subDesc: '专属标识' }, + { icon: 'locked-filled', desc: '个人身份', subDesc: '安全保密' }, + { icon: 'medal-filled', desc: '更多特权', subDesc: '敬请期待' }, ]; const payMethod = ref<'alipay' | 'wechat'>('alipay'); // 支付方式:alipay / wechat const openTypeList = ref([]); // 会员类型列表 diff --git a/src/pages/profile/profile.vue b/src/pages/profile/profile.vue index de8b494f..9fec82c4 100644 --- a/src/pages/profile/profile.vue +++ b/src/pages/profile/profile.vue @@ -27,11 +27,13 @@ ID: {{ userInfo.id }} - - VIP - + + VIP + 尊享vip免费特权 + + + + + + + + + 邀请福利 + 邀请用户领会员 + + + 查看福利 + + + + - + { + return request({ + url: '/promotion/banner/list', + method: 'GET', + params: { position: '6' }, // 轮播图位置写死6代表动态页面的轮播图 + custom: { + showLoading: true, + loadingMsg: '加载中', + }, + }); + }, // 查看我的评价 myEvaluate: () => { return request({ diff --git a/src/sheep/components/user-card/user-card.vue b/src/sheep/components/user-card/user-card.vue index 71b3f1ca..9b68f8fa 100644 --- a/src/sheep/components/user-card/user-card.vue +++ b/src/sheep/components/user-card/user-card.vue @@ -1,11 +1,16 @@