This commit is contained in:
lanzhihui 2024-09-29 16:57:45 +08:00
parent 9047f40c97
commit b9b0707544
3 changed files with 37 additions and 35 deletions

View File

@ -182,7 +182,7 @@
<!-- 访客弹框--> <!-- 访客弹框-->
</visitorModel> </visitorModel>
<canvas canvas-id="shareCanvas" class="canvas" style="width: {{width}}px; height: {{height}}px; position: fixed; top: -999999px;"></canvas> <canvas canvas-id="shareCanvas" class="canvas" style="width: {{width}}px; height: {{height}}px; position: fixed; top: -999999px;"></canvas>
<loginTips :tokenShow.sync="tokenShow" @loginCut.user="loginCut"></loginTips> <!-- <loginTips :tokenShow.sync="tokenShow" @loginCut.user="loginCut"></loginTips>-->
<chooseImageTips :chooseShow.sync="chooseShow" :jumpString.sync="jumpString" :photo.sync="user.photo" @hideCut.user="hideCut"></chooseImageTips> <chooseImageTips :chooseShow.sync="chooseShow" :jumpString.sync="jumpString" :photo.sync="user.photo" @hideCut.user="hideCut"></chooseImageTips>
<loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog> <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
@ -389,16 +389,16 @@
vm.is_base_info = getApp().$wepy.$options.globalData.is_base_info vm.is_base_info = getApp().$wepy.$options.globalData.is_base_info
// vm.getorderDetail() // vm.getorderDetail()
console.log('33333JJJJ') console.log('33333JJJJ')
if (!vm.token) { // if (!vm.token) {
vm.loginShow = true // vm.loginShow = true
wepy.$instance.pageLogin().then((data) => { // wepy.$instance.pageLogin().then((data) => {
vm.token = data.token // vm.token = data.token
vm.loginShow = false // vm.loginShow = false
vm.page = 1 // vm.page = 1
vm.onShow() // vm.onShow()
}) // })
return // return
} // }
async function timi(res) { async function timi(res) {
// await vm.getNewCount() // await vm.getNewCount()
@ -717,7 +717,9 @@
let titles = ['好友', '关注', '粉丝', '访客'], {is_base_info} = app.globalData, let titles = ['好友', '关注', '粉丝', '访客'], {is_base_info} = app.globalData,
vm = this, {id} = wx.getStorageSync('userInfo') vm = this, {id} = wx.getStorageSync('userInfo')
// 校验是否完成注册资料 // 校验是否完成注册资料
console.log(vm.$signInVerify(), 'vm.$signInVerify()===')
if (!vm.$signInVerify()) { if (!vm.$signInVerify()) {
console.log('000')
vm.loginShow = true vm.loginShow = true
return return
} }
@ -752,10 +754,10 @@
loginCut(e) { loginCut(e) {
this.loginShow = e.loginShow this.loginShow = e.loginShow
}, },
loginDialogCut(e) { // loginDialogCut(e) {
// this.$parent.getEvent(this.config.navigationBarTitleText, `点击暂不登录`) // // this.$parent.getEvent(this.config.navigationBarTitleText, `点击暂不登录`)
this.loginShow = e.loginShow // this.loginShow = e.loginShow
}, // },
hideCut(e) { hideCut(e) {
wx.showTabBar({ wx.showTabBar({
animation: true animation: true

View File

@ -17,7 +17,7 @@
</block> </block>
</view> </view>
<view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; "> <view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; ">
{{user.deadline?user.deadline+'到期':'未激活'}} {{user.deadline_str?user.deadline_str+'到期':'未激活'}}
</view> </view>
<swiper class="card-swiper" circular="true" bindchange="cardSwiper"> <swiper class="card-swiper" circular="true" bindchange="cardSwiper">
<swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}" @tap="showFn(index)"> <swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}" @tap="showFn(index)">
@ -240,15 +240,15 @@
vm.$get({url: `${service.host}/rank/list`}).then(({code, data}) => { vm.$get({url: `${service.host}/rank/list`}).then(({code, data}) => {
vm.user = data.rank_info vm.user = data.rank_info
let {type, is_subscribe} = wx.getStorageSync('userInfo') let {type, is_subscribe} = wx.getStorageSync('userInfo')
let userInfo = { // let userInfo = {
nickName: vm.user.nickname, // nickName: vm.user.nickname,
avatarUrl: vm.user.avatar, // avatarUrl: vm.user.avatar,
type, // type,
id: vm.user.id, // id: vm.user.id,
is_subscribe, // is_subscribe,
rank_id: vm.user.rank_id // rank_id: vm.user.rank_id
} // }
wx.setStorageSync('userInfo', userInfo) // wx.setStorageSync('userInfo', userInfo)
vm.specialVIP = data.ranks vm.specialVIP = data.ranks
console.log(data, 'aaaaaaaa') console.log(data, 'aaaaaaaa')
vm.rankList = [] vm.rankList = []

View File

@ -17,7 +17,7 @@
</block> </block>
</view> </view>
<view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; "> <view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; ">
{{user.deadline?user.deadline+'到期':'未开通'}} {{user.deadline_str?user.deadline_str+'到期':'未开通'}}
</view> </view>
<swiper class="card-swiper" circular="true" previous-margin="1px" bindchange="cardSwiper" current="{{cardCur}}"> <swiper class="card-swiper" circular="true" previous-margin="1px" bindchange="cardSwiper" current="{{cardCur}}">
<swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}" @tap="showFn(index)"> <swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}" @tap="showFn(index)">
@ -258,15 +258,15 @@
// vm.payData.remain_amount = data.remain_amount // vm.payData.remain_amount = data.remain_amount
// vm.payData.coin = data.coin // vm.payData.coin = data.coin
let {type, is_subscribe} = wx.getStorageSync('userInfo') let {type, is_subscribe} = wx.getStorageSync('userInfo')
let userInfo = { // let userInfo = {
nickName: data.nickname, // nickName: data.nickname,
avatarUrl: data.avatar, // avatarUrl: data.avatar,
type, // type,
id: data.id, // id: data.id,
is_subscribe, // is_subscribe,
rank_id: data.rank_id // rank_id: data.rank_id
} // }
wx.setStorageSync('userInfo', userInfo) // wx.setStorageSync('userInfo', userInfo)
console.log(data) console.log(data)
}) })
}, },