3
0
Fork 0

Compare commits

..

No commits in common. "f75950fbf354fe676d1b45b599ec112d26c3d40c" and "cddf0dfc70040c99f8b0af316f0d12a63ac64115" have entirely different histories.

4 changed files with 17 additions and 20 deletions

View File

@ -103,17 +103,17 @@ export default {
...mapGetters(['isZeroLevel']),
},
created() {
this.$store.dispatch('GetInfo').then(user => {
const userInfo = user
if (userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL) {
this.upgrade.name = '会员专区'
} else {
this.getAreaListById(REISSUE_AREA.id, this.rescissionList)
this.getAreaListById(REGIEST_AREA.id, this.registList)
this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
}
this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
})
const userInfo = Object.keys(this.userInfo).length
? this.userInfo
: uni.getStorageSync('userInfo')
if (userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL) {
this.upgrade.name = '会员专区'
} else {
this.getAreaListById(REISSUE_AREA.id, this.rescissionList)
this.getAreaListById(REGIEST_AREA.id, this.registList)
this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
}
this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
},
methods: {
getAreaListById(areaId, list) {

View File

@ -29,7 +29,7 @@
</swiper>
</view>
</view>
<view style="padding-bottom: 140rpx">
<view v-if="specialAreaVisble" style="padding-bottom: 140rpx">
<special-area-wrapper :userInfo="userInfo" size="small" />
</view>
<cl-tabbar :current="0"></cl-tabbar>
@ -128,6 +128,9 @@ export default {
},
computed: {
...mapGetters(['priceSymbol', 'priceSymbolVisible', 'isZeroLevel']),
specialAreaVisble() {
return this.userInfo && Object.keys(this.userInfo).length
},
},
onLoad() {
// this.getLanguage();

View File

@ -565,9 +565,7 @@ export default {
if (navigator.userAgent.includes('MicroMessenger')) {
window.location.href = url
} else {
requestAnimationFrame(() => {
window.open(url)
})
window.open(url)
}
})
},

View File

@ -65,7 +65,6 @@ import { registeredAutoLogin } from '@/config/login.js'
import successDialog from '@/components/successDialog.vue'
import { setToken } from '@/config/auth.js'
import store from '@/store'
import { REGIEST_AREA } from '@/util/specialAreaMap.js'
let paySetTimeoutFlag = null
let getRegisterInfoTimeoutFlag = null
export default {
@ -135,10 +134,7 @@ export default {
if (res.data == 1) {
this.payStatus = 1
clearTimeout(paySetTimeoutFlag)
if (
[REGIEST_AREA.id].includes(Number(this.specialArea)) ||
this.isSharePay
) {
if ([1, 7, 24].includes(Number(this.specialArea))) {
uni.showLoading({
title: '注册信息加载中...',
mask: false,