diff --git a/components/myAvatar/myAvatar.vue b/components/myAvatar/myAvatar.vue index 2030b29..fa09a00 100644 --- a/components/myAvatar/myAvatar.vue +++ b/components/myAvatar/myAvatar.vue @@ -67,7 +67,7 @@ //获取头像昵称和普通会员和VIP会员 getUser() { this.$apiServe.getUser().then(res => { - // console.log('个人信息==', res.data); + console.log('个人信息==', res.data); if (res.data.msg === "登录超时,请重新登录") { this.isLoad = false } diff --git a/pages/detail/productsDetail/productsDetail.vue b/pages/detail/productsDetail/productsDetail.vue index b33298f..728a405 100644 --- a/pages/detail/productsDetail/productsDetail.vue +++ b/pages/detail/productsDetail/productsDetail.vue @@ -72,7 +72,7 @@ {{detailList.pub_time}} - + 联系客服 @@ -88,9 +88,12 @@ - - + + + + @@ -112,10 +115,12 @@ showHeart: false, detailList: [], isLoad: true, - showM: false, + showUpdate: false, + showUpdating: false, showCall: false, mobile: '', - content: '您暂无权限访问,请升级VIP访问' + updateContent: '您暂无权限访问,请升级VIP访问', + updatingContent: '升级VIP,正在审核中' } }, onLoad(option) { @@ -123,11 +128,6 @@ this.getProductDetail() this.getCsTel() this.imgUrl = uni.getStorageSync('img_url') - if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) { - this.isLoad = false - return - } - this.isLoad = true }, methods: { //获取客服电话 @@ -139,24 +139,35 @@ //获取详情信息 getProductDetail() { this.$apiServe.getProductDetail(this.id).then(res => { - console.log('产品详情', res.data); - if (res.data.msg == "没有权限访问" && uni.getStorageSync('loginToken')) { - this.showM = true + console.log('产品详情mtype', res.data.data.mytpe); + //授权登录拦截 + if (res.data.code == 0 && res.data.data.mytpe == 1) { + this.isLoad = false + } + //跳转到升级VIP页面 + if (res.data.code == 0 && res.data.data.mytpe == 2) { + this.showUpdate = true + } + //升级VIP正在审核中 + if (res.data.code == 0 && res.data.data.mytpe == 0) { + this.showUpdating = true } if (res.data.data) { let detail = res.data.data detail.pub_time = dateFormatDetail(detail.pub_time) detail.tags = detail.tags.split(',') - if (detail.is_thumb == 1) { + //点赞数 + if (detail.thumbcount !== 0 && detail.is_thumb == 0) { detail.thumb = parseInt(detail.thumb) + parseInt(detail.thumbcount) } else { - detail.thumb = parseInt(detail.thumb) - parseInt(detail.thumbcount) + if (detail.is_thumb == 1) { + detail.thumb = parseInt(detail.thumb) + parseInt(detail.thumbcount) + } else { + detail.thumb = parseInt(detail.thumb) - parseInt(detail.thumbcount) + } } this.detailList = detail } - // else { - // this.$toast.warn('没有更多详情了') - // } }).finally(_ => {}) }, //点击star收藏 @@ -231,7 +242,7 @@ }) }, // 联系客服模态框 - showModal() { + showContact() { this.showCall = true }, confirmCall() { diff --git a/static/styles/myAvatar.scss b/static/styles/myAvatar.scss index 5e37938..7245b1d 100644 --- a/static/styles/myAvatar.scss +++ b/static/styles/myAvatar.scss @@ -16,7 +16,7 @@ } .my_avatar { - margin-top: -184rpx; + margin-top: -186rpx; display: flex; flex-direction: column; align-items: center;