diff --git a/.env b/.env index e35b4528..49218084 100644 --- a/.env +++ b/.env @@ -6,8 +6,8 @@ SHOPRO_API_PATH=/app-api # 后端接口 - 测试环境（通过 process.env.NODE_ENV == development） # SHOPRO_DEV_BASE_URL=http://127.0.0.1:48083 -SHOPRO_DEV_BASE_URL = https://chatapi.zianxin.com -# SHOPRO_DEV_BASE_URL=https://rj4jv5rwqs.by.takin.cc +# SHOPRO_DEV_BASE_URL = https://chatapi.zianxin.com +SHOPRO_DEV_BASE_URL=https://rj4jv5rwqs.by.takin.cc # 后端接口 - 正式环境（通过 process.env.NODE_ENV != development） SHOPRO_BASE_URL=https://chatapi.zianxin.com diff --git a/src/pages.json b/src/pages.json index c9f0aa8c..e0299f9e 100644 --- a/src/pages.json +++ b/src/pages.json @@ -265,6 +265,13 @@ "navigationStyle": "custom" } }, + { + "path": "apply-vip-record", + "style": { + "navigationBarTitleText": "历史记录", + "navigationStyle": "custom" + } + }, { "path": "apply-vip", "style": { @@ -1039,4 +1046,4 @@ ] // #endif } -} +} \ No newline at end of file diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue index 708cded7..1c58b590 100644 --- a/src/pages/home/detail.vue +++ b/src/pages/home/detail.vue @@ -4,20 +4,15 @@ - + - - - + + + {{ userDetail.member?.memberNickname }} - + {{ item.tagTitle }} - + {{ getGender(userDetail.member.memberSex) }} · {{ userDetail.member.memberAge }}岁 - + {{ userDetail.member.memberHeight }}cm - + {{ userDetail.member.memberWeight }}kg - + {{ userDetail.member.memberOcc }} @@ -94,50 +60,37 @@ - - + 查看微信 - + {{ userDetail.member.wechatNum || '*************' }} - + 成为 VIP 免费解锁 + + 已解锁对方微信 + - + 解锁 - - - - - {{ userWechatInfo.wechatNum }} - - - 复制 + + 查看 - 相册 - + 相册暂无照片 @@ -168,323 +121,369 @@ - + - + - + 私聊 - - + + 喜欢 - - + + + + + + + + + + {{ userDetail.member.wechatNum || '*************' }} + + + + + 今日vip特权已使用4/10次 + + 使用VIP特权免费解锁 + + + + + + {{ userDetail.member.wechatNum || '*************' }} + + + 解锁微信只能展示24小时 + 添加备注"荷塘月色App"会快速通过哟 + + 复制微信号 + + 搜索不到微信?点击【 + 立即举报 + 】退还次数 + + + + + + \ No newline at end of file diff --git a/src/pages/profile/apply-vip-record.vue b/src/pages/profile/apply-vip-record.vue new file mode 100644 index 00000000..0e9842a7 --- /dev/null +++ b/src/pages/profile/apply-vip-record.vue @@ -0,0 +1,56 @@ + + + \ No newline at end of file diff --git a/src/pages/profile/apply-vip.vue b/src/pages/profile/apply-vip.vue index 10d68c9b..d2efe47a 100644 --- a/src/pages/profile/apply-vip.vue +++ b/src/pages/profile/apply-vip.vue @@ -5,7 +5,23 @@ + + + + 历史记录 + + + + + + @@ -219,9 +235,6 @@ const handleOpenVip = () => { uni.showToast({ title: `不支持${payMethodItem.title}支付`, icon: 'none' }); return; } - - jumpToWechatPage(); - return; messageBox .confirm({ msg: '确认开通？', @@ -250,7 +263,7 @@ const disposeWechatPay = async (openTypeId: any) => { uni.showToast({ title: '创建订单失败', icon: 'none' }); throw new Error('创建订单失败'); } - sheep.$platform.pay(payMethod.value, 'recharge', data); + await sheep.$platform.pay(payMethod.value, 'recharge', data); // 更新用户信息 $store('user').getInfo(); uni.showToast({ title: '支付成功', icon: 'success' }); diff --git a/src/pages/profile/recharge-record.vue b/src/pages/profile/recharge-record.vue index da01e270..1ddbf5b1 100644 --- a/src/pages/profile/recharge-record.vue +++ b/src/pages/profile/recharge-record.vue @@ -18,7 +18,7 @@ 支付 - {{ fen2yuan(v.payPrice) }}元 + {{ fen2yuan(v.payPrice) }}元 获得 {{ fen2yuanSimple(v.totalPrice) }} 砖石 @@ -31,9 +31,11 @@ diff --git a/src/pages/profile/recharge.vue b/src/pages/profile/recharge.vue index 7d5849aa..25238da7 100644 --- a/src/pages/profile/recharge.vue +++ b/src/pages/profile/recharge.vue @@ -121,7 +121,6 @@ const rechargePackag = ref<{ id: number; name: string; payPrice: number; bonusPr const userWallet = computed(() => sheep.$store('user').userWallet); onLoad((params) => { - console.log("onLoad:", params); if (params) { if (params.packageId && params.payMethod) { payMethod.value = params.payMethod; @@ -133,6 +132,8 @@ onLoad((params) => { onShow(async () => { const { data } = await RecentApi.getWalletRechargePackage(); rechargePackag.value = data ?? []; + // 查询钱包余额 + getWallet(); }); const getWallet = () => { diff --git a/src/pages/tabbar/profile.vue b/src/pages/tabbar/profile.vue index db4fa09a..9df4e491 100644 --- a/src/pages/tabbar/profile.vue +++ b/src/pages/tabbar/profile.vue @@ -68,15 +68,16 @@ VIP 尊享vip免费特权 - - + + 立即开通 + + VIP 开通成功 + - - VIP 开通成功 - + diff --git a/src/pages/wechat-tabbar/index.vue b/src/pages/wechat-tabbar/index.vue index 51f0e69c..9257a923 100644 --- a/src/pages/wechat-tabbar/index.vue +++ b/src/pages/wechat-tabbar/index.vue @@ -14,10 +14,17 @@ - {{ userInfo.nickname }} + + {{ userInfo.nickname }} + + ID: {{ userInfo.id }} - + + + VIP + diff --git a/src/sheep/api/member/recent.ts b/src/sheep/api/member/recent.ts index ab3e80ba..ea5c1d2d 100644 --- a/src/sheep/api/member/recent.ts +++ b/src/sheep/api/member/recent.ts @@ -223,6 +223,18 @@ const RecentApi = { }, }); }, + // 开通会员记录 + openTypeUserPage: (data: any) => { + return request({ + url: '/member/open-type-user/page', + method: 'GET', + data, + custom: { + showLoading: true, + loadingMsg: '加载中', + }, + }); + }, // 提交反馈 feedback: (data: any) => { return request({ @@ -415,6 +427,17 @@ const RecentApi = { }); }, // 解锁微信信息 + lookWechatCount: (data: any) => { + return request({ + url: '/member/recent/look-wechat-count', + method: 'GET', + data, + custom: { + showLoading: false, + }, + }); + }, + // 解锁微信信息 unlockWeChat: (data: any) => { return request({ url: '/member/recent/look-wechat', diff --git a/src/sheep/platform/pay.js b/src/sheep/platform/pay.js index a0b3cbba..bd05ee16 100644 --- a/src/sheep/platform/pay.js +++ b/src/sheep/platform/pay.js @@ -377,7 +377,8 @@ export function getPayMethods(channels) { // 支付结果跳转,success:成功，fail:失败 export function goPayResult(id, orderType, resultType) { - const url = `/pages/pay/result?id=${id}&orderType=${orderType}&payState=${resultType}`; + // const url = `/pages/pay/result?id=${id}&orderType=${orderType}&payState=${resultType}`; + const url = `/pages/profile/pay-result?id=${id}&orderType=${orderType}&payState=${resultType}`; uni.redirectTo({ url: url }) } diff --git a/src/static/icon/self/iconfont.css b/src/static/icon/self/iconfont.css index e5d50cfd..74ecae03 100644 --- a/src/static/icon/self/iconfont.css +++ b/src/static/icon/self/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 5079650 */ - src: url('//at.alicdn.com/t/c/font_5079650_q7e82zvyi4j.woff2?t=1764739737667') format('woff2'), - url('//at.alicdn.com/t/c/font_5079650_q7e82zvyi4j.woff?t=1764739737667') format('woff'), - url('//at.alicdn.com/t/c/font_5079650_q7e82zvyi4j.ttf?t=1764739737667') format('truetype'); + src: url('//at.alicdn.com/t/c/font_5079650_0eztc033f38b.woff2?t=1765772507380') format('woff2'), + url('//at.alicdn.com/t/c/font_5079650_0eztc033f38b.woff?t=1765772507380') format('woff'), + url('//at.alicdn.com/t/c/font_5079650_0eztc033f38b.ttf?t=1765772507380') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-weixin:before { + content: "\e63d"; +} + .icon-huiyuan:before { content: "\e67e"; }