diff --git a/src/pages/tabBar/welcome.wpy b/src/pages/tabBar/welcome.wpy index 4122326..a46d4e0 100644 --- a/src/pages/tabBar/welcome.wpy +++ b/src/pages/tabBar/welcome.wpy @@ -42,6 +42,9 @@ wepy.page({ }, onShow() { setTimeout(() => { + // if (wx.getStorageSync('logoutCode')) { + // return + // } wx.switchTab({url: `/pages/tabBar/home`}) }, 100) }, diff --git a/src/pages/users/logout.wpy b/src/pages/users/logout.wpy index 2244020..57f6706 100644 --- a/src/pages/users/logout.wpy +++ b/src/pages/users/logout.wpy @@ -195,6 +195,7 @@ data = { type: 'ALLSEX', reason: vm.value + // convert_marriage: 0 } if (vm.throttling) { vm.throttling = false diff --git a/src/pages/users/unmarri.wpy b/src/pages/users/unmarri.wpy index 4607706..5f6a579 100644 --- a/src/pages/users/unmarri.wpy +++ b/src/pages/users/unmarri.wpy @@ -421,7 +421,9 @@ ensureData(data) { // 保存 this.$put({url: `${service.host}/user/base/profile`, data}).then(({code, data}) => { console.log('参数保存成功!') - this.$gotoBack(1) + wx.navigateBack({ + delta: 1 + }) }) }, diff --git a/src/pages/users/upgradeVIP.wpy b/src/pages/users/upgradeVIP.wpy index 66b5154..e30c2d7 100644 --- a/src/pages/users/upgradeVIP.wpy +++ b/src/pages/users/upgradeVIP.wpy @@ -180,10 +180,10 @@ this.rankList = [] this.system = app.globalData.systemInfo.system.split(' ')[0] console.log(this.system, '2224') - if (this.system == 'iOS') { - this.$redirectTo(`/pages/users/upgradeVIP2?chat_user_id=${this.chat_user_id}`) - return - } + // if (this.system == 'iOS') { + // this.$redirectTo(`/pages/users/upgradeVIP2?chat_user_id=${this.chat_user_id}`) + // return + // } // share_type console.log(this.system) this.getPageData() @@ -257,6 +257,7 @@ vm.rankList.push(item) // } }) + console.log(vm.rankList, 'rankList-====') if (vm.system == 'iOS') { vm.rankList = [ {pic: 'https://images.ufutx.com/202004/11/3ccfd5478ea792e8793c7eebbf152511.png'}, @@ -356,7 +357,7 @@ pay_type: this.wxPayShow } that.$post({url: url, data}).then(({code, data}) => { - that.trade_no = data.trade_no + that.trade_no = data.order.trade_no if (data.length == 0) { that.$post({url: `${service.host}/order/${that.trade_no}/callback`}).then(({code, data}) => { that.getUserData() diff --git a/src/utils/util.js b/src/utils/util.js index 646e06e..ebd4644 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -52,6 +52,9 @@ const wx_login = () => { wx.setStorageSync('openid', (data.openid)) wx.setStorageSync('user_id', data.user.id) // 用户id wx.setStorageSync('mobile', data.user.mobile) // 用户手机号 + if (data.user.hidden_profile !== 'NONE' && data.frozen_state !== 1) { // 资料是否关闭 + wx.redirectTo({url: '/pages/users/logoutDefault'}) + } let userInfo = { is_moment_admin: data.is_moment_admin, is_base_profile: data.is_base_profile,