diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1817432..a42e698 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -98,7 +98,7 @@
ref="child2"
@childMethodTrigger="callChildMethod"
>
-
+
@@ -383,7 +387,7 @@ export default {
name: '奖金明细',
imgurl: '../../static/images/mark2.png',
menuKey: 'incomeDetail',
- ifshow: true,
+ ifshow: false,
},
{
url: '/pages/ticket/index',
@@ -405,42 +409,42 @@ export default {
name: '个人推广',
imgurl: '../../static/images/list.svg',
menuKey: 'share',
- ifshow: true,
+ ifshow: false,
},
{
url: '/pages/userSecure/index',
name: '账号安全',
imgurl: '../../static/images/my_icon8.png',
- menuKey: '',
+ menuKey: 'userSecure',
ifshow: true,
},
{
url: '/pages/addressList/index',
name: '地址管理',
imgurl: '../../static/images/my_icon9.png',
- menuKey: '',
+ menuKey: 'addressList',
ifshow: true,
},
{
url: '/pages/mine/directPush/index',
name: '直推列表',
imgurl: '../../static/images/mark5.png',
- menuKey: '',
- ifshow: true,
+ menuKey: 'directPush',
+ ifshow: false,
},
{
url: '/pages/mine/bindBank/index',
name: '银行信息',
imgurl: '../../static/images/my_icon10.png',
- menuKey: '',
+ menuKey: 'bankInfo',
ifshow: true,
},
{
url: '/pages/bonus/regional-assessment/index',
name: '区域考核',
imgurl: '../../static/images/mark5.png',
- menuKey: '',
- ifshow: true,
+ menuKey: 'areaAssessment',
+ ifshow: false,
},
// {
// url: '/pages/mine/addNewPv/index',
@@ -462,11 +466,16 @@ export default {
marketDynamicBoxInfo: {},
totalSumPv: 0,
smallAreaPv: 0,
+ isNormal: false,
}
},
onShow() {
- this.getInfo().finally(() => {
+ this.getInfo().then(isNormal => {
this.orderNum()
+ if (!isNormal) {
+ return
+ }
+ this.isNormal = isNormal
this.getRegionSelect()
this.getMemberBoxCount()
this.getMarketDynamicBoxCount()
@@ -636,12 +645,16 @@ export default {
api.getInfo().then(res => {
if (res.code == 200) {
this.userInfo = res.data
- resolve()
- if (this.userInfo.memberCode == 'CN68880628') {
- this.ifSpecial = true
- } else {
- this.ifSpecial = false
+
+ if (this.userInfo.memberCode != 'BF66886688') {
+ this.otherMenuList = this.otherMenuList.map(item => {
+ item.ifshow = true
+ return item
+ })
+ resolve(true)
+ return
}
+ resolve(false)
} else {
reject()
}
diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index c955103..48ae254 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -29,7 +29,7 @@
>
diff --git a/pages/pay/treePay.vue b/pages/pay/treePay.vue
index fc85061..7082278 100644
--- a/pages/pay/treePay.vue
+++ b/pages/pay/treePay.vue
@@ -1,174 +1,223 @@
-
-
-
-
- {{'待支付金额'}}
-
- {{ userInfo.currencyIcon }}{{ objTree.amount | numberToCurrency }}
+
+
+
+ {{ '待支付金额' }}
+
+ {{ userInfo.currencyIcon }}{{ objTree.amount | numberToCurrency }}
+
+
+
+
+
+
+ {{ '钱包支付' }}
-
-
-
-
- {{'钱包支付'}}
-
-
- {{'消费账户'}}
-
-
- {{ account.consumeBalance | numberToCurrency | isLocal }}
-
-
- -{{ account.consumeDeduct | numberToCurrency | isLocal }}
-
-
-
-
- {{'奖金账户'}}
-
-
- {{ account.bonusBalance | numberToCurrency | isLocal}}
-
-
- -{{ account.bonusDeduct | numberToCurrency | isLocal}}
-
-
-
-
- {{'政策账户'}}
-
-
- {{ payDetail.account3 | numberToCurrency | isLocal}}
-
-
- -{{ payDetail.payAccount3 | numberToCurrency | isLocal}}
-
-
-
-
- {{'现金账户'}}
-
-
- {{ account.cashBalance | numberToCurrency | isLocal}}
-
-
- -{{ account.cashDeduct | numberToCurrency | isLocal}}
-
-
-
-
-
-
- {{'重消账户'}}
-
-
- {{ payDetail.account5 | numberToCurrency | isLocal}}
-
-
- -{{ payDetail.payAccount5 | numberToCurrency | isLocal}}
-
-
-
-
- {{'积分账户'}}
-
-
- {{ payDetail.account6 | numberToCurrency | isLocal }}
-
-
- -{{ payDetail.payAccount6 | numberToCurrency | isLocal}}
-
-
-
-
- {{'鼓励账户'}}
-
-
- {{ payDetail.account7 | numberToCurrency | isLocal}}
-
-
- -{{ payDetail.payAccount7 | numberToCurrency | isLocal}}
-
-
-
-
- {{'复购券账户'}}
-
-
- {{ payDetail.account8 | numberToCurrency | isLocal}}
-
-
- -{{ payDetail.payAccount8 | numberToCurrency | isLocal}}
-
-
-
-
- {{'全球积分'}}
-
-
- {{ payDetail.account9 | numberToCurrency | isLocal}}
-
-
- -{{ payDetail.payAccount9 | numberToCurrency | isLocal}}
-
-
-
-
- {{'车奖积分'}}
-
-
- {{ payDetail.account10 | numberToCurrency | isLocal}}
-
-
- -{{ payDetail.payAccount10 | numberToCurrency | isLocal}}
-
-
-
-
-
-
-
-
-
-
- {{'支付验证'}}
-
-
- {{'请输入短信验证码'}}
- {{'请输入密码'}}
-
-
- {{'立即支付'}}
-
-
-
-
+
+
+
+
+ {{ '支付验证' }}
+
+ {{ '请输入短信验证码' }}
+ {{ '请输入密码' }}
+
+
+ {{ '立即支付' }}
+
+
+
+
+
+
+
+
+
+ {{ '微信支付' }}
+
+
+
+
+
+
\ No newline at end of file
+