Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-h5 into bd-test
This commit is contained in:
commit
c0af6ff148
|
@ -356,7 +356,7 @@ export default {
|
||||||
})
|
})
|
||||||
// sangelxiu1
|
// sangelxiu1
|
||||||
this.newShareMember = uni.getStorageSync('User')?.loginType !== 0
|
this.newShareMember = uni.getStorageSync('User')?.loginType !== 0
|
||||||
if(this.newShareMember){
|
if (this.newShareMember) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:
|
url:
|
||||||
'/pages/regiest/shareRegister?specialArea=' +
|
'/pages/regiest/shareRegister?specialArea=' +
|
||||||
|
@ -364,7 +364,7 @@ export default {
|
||||||
'&shoppArr=' +
|
'&shoppArr=' +
|
||||||
JSON.stringify(shoppArr),
|
JSON.stringify(shoppArr),
|
||||||
})
|
})
|
||||||
}else{
|
} else {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:
|
url:
|
||||||
'/pages/regiest/index?specialArea=' +
|
'/pages/regiest/index?specialArea=' +
|
||||||
|
@ -586,10 +586,12 @@ export default {
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
this.shopCarList = res.data
|
this.shopCarList = res.data
|
||||||
if(this.newShareMember){
|
if (this.newShareMember) {
|
||||||
if(this.shopCarList){
|
if (this.shopCarList) {
|
||||||
this.shopCarList = this.shopCarList.filter(car => car.specialArea === 41);
|
this.shopCarList = this.shopCarList.filter(
|
||||||
let subCar = this.shopCarList.find(car => car.specialArea === 41)
|
car => car.specialArea === 1
|
||||||
|
)
|
||||||
|
let subCar = this.shopCarList.find(car => car.specialArea === 1)
|
||||||
this.$set(subCar, 'specialAreaVal', '会员专区')
|
this.$set(subCar, 'specialAreaVal', '会员专区')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue