angelo
/
web-zk-h5
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of 47.94.45.65:angelo/web-zk-h5 into test

This commit is contained in:
woody 2025-10-10 11:15:11 +08:00
parent dcfcaab6b7 b95209de91
commit f63b32ff23
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/area-product-list/special-area-wrapper.vue
View File

@ -103,7 +103,6 @@ export default {
}, },
created() { created() {
this.getAreaListById(UPGRADE_AREA.id, this.upgradeList) this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
this.getAreaListById(REISSUE_AREA.id, this.rescissionList)
this.getAreaListById(REGIEST_AREA.id, this.registList) this.getAreaListById(REGIEST_AREA.id, this.registList)
this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList) this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
this.getAreaListById(HALF_PRICE_AREA.id, this.halfPriceList) this.getAreaListById(HALF_PRICE_AREA.id, this.halfPriceList)

12
pages/index/index.vue
View File

@ -49,7 +49,7 @@
ref="child2" ref="child2"
@childMethodTrigger="callChildMethod" @childMethodTrigger="callChildMethod"
></znNewsPopup> ></znNewsPopup>
<!-- <RegionSelect v-if="userInfo.memberCode != 'BF66886688'" /> --> <!-- <RegionSelect v-if="userInfo.memberCode != 'ZK66886688'" /> -->
<!-- 直推排行弹窗 <!-- 直推排行弹窗
<directrank-popup <directrank-popup
@callznMethodTrigger="callznMethod" @callznMethodTrigger="callznMethod"
@ -140,11 +140,11 @@ export default {
uni.getStorageSync('showInfo') == 0 uni.getStorageSync('showInfo') == 0
) { ) {
} }
this.getAreaGoods( // this.getAreaGoods(
this.userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL // this.userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL
? REPURCHASE_AREA.id // ? REPURCHASE_AREA.id
: REGIEST_AREA.id // : REGIEST_AREA.id
) // )
}, },
// onPullDownRefresh() { // onPullDownRefresh() {
// let that = this // let that = this

2
pages/mine/balance/index.vue
View File

@ -148,7 +148,7 @@ export default {
}, },
methods: { methods: {
ifCodeName() { ifCodeName() {
if (this.userInfo.memberCode == 'BF66886688') { if (this.userInfo.memberCode == 'ZK66886688') {
this.ifshowBtn = true this.ifshowBtn = true
} else { } else {
this.ifshowBtn = false this.ifshowBtn = false

2
pages/mine/index.vue
View File

@ -402,7 +402,7 @@ export default {
if (res.code == 200) { if (res.code == 200) {
this.userInfo = res.data this.userInfo = res.data
if (this.userInfo.memberCode != 'BF66886688') { if (this.userInfo.memberCode != 'ZK66886688') {
this.otherMenuList = this.otherMenuList.map(item => { this.otherMenuList = this.otherMenuList.map(item => {
item.ifshow = true item.ifshow = true
return item return item

2
pages/pay/index.vue
View File

@ -40,7 +40,7 @@
<u-collapse-item <u-collapse-item
name="1" name="1"
v-if=" v-if="
!isRecharge && !isShare && userInfo.memberCode != 'BF66886688' !isRecharge && !isShare && userInfo.memberCode != 'ZK66886688'
" "
> >
<view slot="title" class="pf"> <view slot="title" class="pf">

2
pages/pay/treePay.vue
View File

@ -21,7 +21,7 @@
accordion accordion
:border="false" :border="false"
> >
<u-collapse-item name="1" v-if="userInfo.memberCode != 'BF66886688'"> <u-collapse-item name="1" v-if="userInfo.memberCode != 'ZK66886688'">
<view slot="title" class="pf"> <view slot="title" class="pf">
<img src="@/static/images/yhkzf.jpg" alt="" /> <img src="@/static/images/yhkzf.jpg" alt="" />
<view>{{ '钱包支付' }}</view> <view>{{ '钱包支付' }}</view>