diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue index 0f93c68f..a96fd94f 100644 --- a/src/pages/home/detail.vue +++ b/src/pages/home/detail.vue @@ -76,11 +76,14 @@ 查看微信 - + - qdadafafafadawd + ************* 成为 @@ -88,7 +91,18 @@ 免费解锁 - 解锁 + + 解锁 + + + + + + {{ userWechatInfo.wechatNum }} + + + 复制 + @@ -198,10 +212,12 @@ import { formatDate } from '@/sheep/helper/utils'; const userCity = computed(() => sheep.$store('user').userCity); + const userInfo = computed(() => sheep.$store('user').userInfo); const scrollTop = ref(0); - const userDetail = ref({}); + const userDetail = ref({}); // 用户详情 const actionShow = ref(false); + // 朋友圈列表参数 const params = reactive({ scene: 'DYNAMIC_RECOMMEND', province: '', @@ -215,12 +231,18 @@ scoreSk: 0, // 爽快评分 scoreYq: 0, // 有趣评分 }); + // 浏览记录参数 const viewRecord = reactive({ bizType: '', bizId: '', viewStartTime: new Date().getTime(), viewEndTime: '', }); + // 用户微信信息 + const userWechatInfo = reactive({ + wechatNum: '', + wechatQrCode: '', + }); const photoListUrls = computed( () => @@ -281,6 +303,30 @@ scrollTop.value = e.detail.scrollTop; } + // 解锁微信 + const unlockWeChat = async () => { + const vip = userInfo.value?.memberVip.vip; + if (!vip) return uni.showToast({ title: '请先开通vip会员', icon: 'none' }); + if (!params.memberId) return uni.showToast({ title: '用户id不存在', icon: 'none' }); + + const { code, data } = await RecentApi.unlockWeChat({ memberId: params.memberId }); + if (code === 0) { + uni.showToast({ title: '解锁成功', icon: 'none' }); + Object.assign(userWechatInfo, data); + } + }; + + // 复制微信号 + const copyWechatNum = () => { + uni.setClipboardData({ + data: userWechatInfo.wechatNum, + showToast: false, + success: () => { + uni.showToast({ title: '微信号已复制', icon: 'success' }); + }, + }); + }; + // 相册预览 const previewPhoto = (current: number) => { uni.previewImage({ diff --git a/src/pages/home/report.vue b/src/pages/home/report.vue index fd6106e4..8f7ec7b1 100644 --- a/src/pages/home/report.vue +++ b/src/pages/home/report.vue @@ -15,7 +15,7 @@ v-for="(item, index) in reportTypeList" :key="index" > - + {{ item }} @@ -64,7 +64,7 @@ const reportTypeList = ref([]); const form = reactive({ memberId: '', - reportType: '', + reportType: -1, reportDescription: '', }); const reportImages = ref([]); @@ -79,24 +79,27 @@ const { data = null } = await RecentApi.reportType(); if (data?.reportTypeList && data.reportTypeList.length > 0) { reportTypeList.value = data.reportTypeList; - form.reportType = data.reportTypeList[0]; + form.reportType = 0; return; } reportTypeList.value = []; }); const submitReport = async () => { - if (!form.memberId || !form.reportType) - return uni.showToast({ title: '用户id不存在', icon: 'none' }); - console.log(form); + if (!form.memberId) return uni.showToast({ title: '用户id不存在', icon: 'none' }); + if (!form.reportDescription) return uni.showToast({ title: '请填写问题描述', icon: 'none' }); const { code } = await RecentApi.recentOperate({ action: 'MEMBER_REPORT', ...form, + reportType: form.reportType.toString(), reportPic: reportPic.value, }); if (code === 0) { uni.showToast({ title: '举报成功', icon: 'none' }); + setTimeout(() => { + back(); + }, 500); } }; diff --git a/src/pages/message/chat-box.vue b/src/pages/message/chat-box.vue index 503866a7..89e7f45f 100644 --- a/src/pages/message/chat-box.vue +++ b/src/pages/message/chat-box.vue @@ -984,28 +984,10 @@ this.isSending = true; const reqData = this.reqQueue.shift(); - // RecentApi.sendPrivateMsg(reqData.msgInfo) - // .then((res) => { - // if (res.code === 0) { - // reqData.resolve(res); - // } - // }) - // .catch((e) => { - // reqData.reject(e); - // }) - // .finally(() => { - // this.isSending = false; - // // 发送下一条请求 - // this.processReqQueue(); - // }); - - this.$http({ - url: this.messageAction, - method: 'post', - data: reqData.msgInfo, - }) + // 私聊 有会员次数限制 + RecentApi.sendPrivateMsg(reqData.msgInfo) .then((res) => { - reqData.resolve(res); + reqData.resolve(res.data); }) .catch((e) => { reqData.reject(e); @@ -1015,6 +997,26 @@ // 发送下一条请求 this.processReqQueue(); }); + + // 私聊 无限制 + // this.$http({ + // url: this.messageAction, + // method: 'post', + // data: reqData.msgInfo, + // }) + // .then((res) => { + // console.log(res); + + // reqData.resolve(res); + // }) + // .catch((e) => { + // reqData.reject(e); + // }) + // .finally(() => { + // this.isSending = false; + // // 发送下一条请求 + // this.processReqQueue(); + // }); } }, reCalChatMainHeight() { diff --git a/src/pages/message/chat-group-video.vue b/src/pages/message/chat-group-video.vue deleted file mode 100644 index f94d8709..00000000 --- a/src/pages/message/chat-group-video.vue +++ /dev/null @@ -1,141 +0,0 @@ - - - - - diff --git a/src/pages/message/chat-private-video.vue b/src/pages/message/chat-private-video.vue deleted file mode 100644 index 22152fac..00000000 --- a/src/pages/message/chat-private-video.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - - - diff --git a/src/pages/profile/apply-vip.vue b/src/pages/profile/apply-vip.vue index 80042a91..fd399e84 100644 --- a/src/pages/profile/apply-vip.vue +++ b/src/pages/profile/apply-vip.vue @@ -119,6 +119,8 @@ import { onLoad } from '@dcloudio/uni-app'; import RecentApi from '@/sheep/api/member/recent'; import { useMessage } from '@/uni_modules/wot-design-uni'; + // @ts-ignore + import $store from '@/sheep/store'; const messageBox = useMessage(); @@ -170,6 +172,10 @@ const { code } = await RecentApi.memberOpenTypePay({ openTypeId: curOpenTypeId.value }); if (code !== 0) return uni.showToast({ title: '开通失败', icon: 'fail' }); uni.showToast({ title: '开通成功', icon: 'success' }); + $store('user').getInfo(); + setTimeout(() => { + uni.navigateBack(); + }, 500); }) .catch(() => {}); }; diff --git a/src/pages/profile/face-verify.vue b/src/pages/profile/face-verify.vue index b06c4d7e..b3e3c9f9 100644 --- a/src/pages/profile/face-verify.vue +++ b/src/pages/profile/face-verify.vue @@ -54,7 +54,7 @@