forked from angelo/web-retail-h5
Compare commits
4 Commits
cddf0dfc70
...
f75950fbf3
Author | SHA1 | Date |
---|---|---|
|
f75950fbf3 | |
|
5bfb23ed69 | |
|
5252879a3d | |
|
9108eb14dd |
|
@ -103,9 +103,8 @@ export default {
|
||||||
...mapGetters(['isZeroLevel']),
|
...mapGetters(['isZeroLevel']),
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
const userInfo = Object.keys(this.userInfo).length
|
this.$store.dispatch('GetInfo').then(user => {
|
||||||
? this.userInfo
|
const userInfo = user
|
||||||
: uni.getStorageSync('userInfo')
|
|
||||||
if (userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL) {
|
if (userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL) {
|
||||||
this.upgrade.name = '会员专区'
|
this.upgrade.name = '会员专区'
|
||||||
} else {
|
} else {
|
||||||
|
@ -114,6 +113,7 @@ export default {
|
||||||
this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
|
this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
|
||||||
}
|
}
|
||||||
this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
|
this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
|
||||||
|
})
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getAreaListById(areaId, list) {
|
getAreaListById(areaId, list) {
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
</swiper>
|
</swiper>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="specialAreaVisble" style="padding-bottom: 140rpx">
|
<view style="padding-bottom: 140rpx">
|
||||||
<special-area-wrapper :userInfo="userInfo" size="small" />
|
<special-area-wrapper :userInfo="userInfo" size="small" />
|
||||||
</view>
|
</view>
|
||||||
<cl-tabbar :current="0"></cl-tabbar>
|
<cl-tabbar :current="0"></cl-tabbar>
|
||||||
|
@ -128,9 +128,6 @@ export default {
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters(['priceSymbol', 'priceSymbolVisible', 'isZeroLevel']),
|
...mapGetters(['priceSymbol', 'priceSymbolVisible', 'isZeroLevel']),
|
||||||
specialAreaVisble() {
|
|
||||||
return this.userInfo && Object.keys(this.userInfo).length
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
// this.getLanguage();
|
// this.getLanguage();
|
||||||
|
|
|
@ -565,7 +565,9 @@ export default {
|
||||||
if (navigator.userAgent.includes('MicroMessenger')) {
|
if (navigator.userAgent.includes('MicroMessenger')) {
|
||||||
window.location.href = url
|
window.location.href = url
|
||||||
} else {
|
} else {
|
||||||
|
requestAnimationFrame(() => {
|
||||||
window.open(url)
|
window.open(url)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
|
@ -65,6 +65,7 @@ import { registeredAutoLogin } from '@/config/login.js'
|
||||||
import successDialog from '@/components/successDialog.vue'
|
import successDialog from '@/components/successDialog.vue'
|
||||||
import { setToken } from '@/config/auth.js'
|
import { setToken } from '@/config/auth.js'
|
||||||
import store from '@/store'
|
import store from '@/store'
|
||||||
|
import { REGIEST_AREA } from '@/util/specialAreaMap.js'
|
||||||
let paySetTimeoutFlag = null
|
let paySetTimeoutFlag = null
|
||||||
let getRegisterInfoTimeoutFlag = null
|
let getRegisterInfoTimeoutFlag = null
|
||||||
export default {
|
export default {
|
||||||
|
@ -134,7 +135,10 @@ export default {
|
||||||
if (res.data == 1) {
|
if (res.data == 1) {
|
||||||
this.payStatus = 1
|
this.payStatus = 1
|
||||||
clearTimeout(paySetTimeoutFlag)
|
clearTimeout(paySetTimeoutFlag)
|
||||||
if ([1, 7, 24].includes(Number(this.specialArea))) {
|
if (
|
||||||
|
[REGIEST_AREA.id].includes(Number(this.specialArea)) ||
|
||||||
|
this.isSharePay
|
||||||
|
) {
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title: '注册信息加载中...',
|
title: '注册信息加载中...',
|
||||||
mask: false,
|
mask: false,
|
||||||
|
|
Loading…
Reference in New Issue