diff --git a/src/directive/permission/hasButtons.js b/src/directive/permission/hasButtons.js index 5374f72..d177245 100644 --- a/src/directive/permission/hasButtons.js +++ b/src/directive/permission/hasButtons.js @@ -16,7 +16,7 @@ export default { const permissions = buttons || [] if (value && value instanceof Array && value.length > 0) { const permissionFlag = value - const hasPermissions = permissions.some(permission => { + const hasPermissions = permissions?.some(permission => { return all_permission === permission || permissionFlag.includes(permission) }) if (!hasPermissions) { diff --git a/src/pages.json b/src/pages.json index 2cb2d97..d911479 100644 --- a/src/pages.json +++ b/src/pages.json @@ -93,20 +93,6 @@ "navigationBarBackgroundColor": "#fff" } }, - { - "path": "pages/information/dailyApplication/index", - "style": { - "navigationBarTitleText": "日常申请", - "navigationBarBackgroundColor": "#fff" - } - }, - { - "path": "pages/information/dailyApplication/onlineSign", - "style": { - "navigationBarTitleText": "在线签呈", - "navigationBarBackgroundColor": "#fff" - } - }, { "path": "pages/information/cancleProduct/index", "style": { diff --git a/src/pages/information/dailyApplication/index.vue b/src/pages/information/dailyApplication/index.vue deleted file mode 100644 index a187a68..0000000 --- a/src/pages/information/dailyApplication/index.vue +++ /dev/null @@ -1,481 +0,0 @@ - - - - - - diff --git a/src/pages/information/dailyApplication/onlineSign.vue b/src/pages/information/dailyApplication/onlineSign.vue deleted file mode 100644 index 83f4644..0000000 --- a/src/pages/information/dailyApplication/onlineSign.vue +++ /dev/null @@ -1,535 +0,0 @@ - - - - - - - diff --git a/src/pages/settlementCenter/bonusDetail.vue b/src/pages/settlementCenter/bonusDetail.vue index a30b943..f47690c 100644 --- a/src/pages/settlementCenter/bonusDetail.vue +++ b/src/pages/settlementCenter/bonusDetail.vue @@ -51,229 +51,93 @@ {{ '直推收益' }}({{isLocalSymbol() }}) {{ item.directIncomeOri }} - - {{ '直推收益' }}($) - {{ item.directIncome }} - + {{ '拓展收益' }}({{isLocalSymbol() }}) {{ item.expandIncomeOri }} - - {{ '拓展收益' }}($) - {{ item.expandIncome }} - + {{ '辅导收益' }}({{isLocalSymbol() }}) {{ item.coachIncomeOri }} - - {{ '辅导收益' }}($) - {{ item.coachIncome }} - + {{ '分红收益' }}({{isLocalSymbol() }}) {{ item.shareIncomeOri }} - - {{ '分红收益' }}($) - {{ item.shareIncome }} - + {{ '报单收益' }}({{isLocalSymbol() }}) {{ item.serviceIncomeOri }} - - {{ '服务收益' }}($) - {{ item.serviceIncome }} - - - {{ '云代直推收益' }}({{isLocalSymbol() }}) - {{ item.cloudDirectIncomeOri }} - - - - {{ '云代直推收益' }}($) - {{ item.cloudDirectIncome }} - - - - {{ '云代首购收益' }}({{isLocalSymbol() }}) - {{ item.cloudPurIncomeOri }} - - - - {{ '云代首购收益' }}($) - {{ item.cloudPurIncome }} - - - - {{ '云代复购收益' }}({{isLocalSymbol() }}) - {{ item.cloudRepurIncomeOri }} - - - - {{ '云代复购收益' }}($) - {{ item.cloudRepurIncome }} - - - {{ '复购推荐收益' }}({{isLocalSymbol() }}) - {{ item.repurPushIncomeOri }} - - - {{ '复购推荐收益' }}($) - {{ item.repurPushIncome }} - + + + {{ '复购级差收益' }}({{isLocalSymbol() }}) {{ item.repurRangeIncomeOri }} - - {{ '复购级差收益' }}($) - {{ item.repurRangeIncome }} - {{ '复购拓展收益' }}({{isLocalSymbol() }}) {{ item.repurExpandIncomeOri }} - - - {{ '复购拓展收益' }}($) - {{ item.repurExpandIncome }} + + + {{ '复购辅导收益' }}({{isLocalSymbol() }}) + {{ item.repurCoachIncome }} - {{ '复购券' }}({{isLocalSymbol() }}) {{ item.repurCouponOri }} - - {{ '复购券' }}($) - {{ item.repurCoupon }} - + {{ '复购券均分' }} {{ item.repurCouponShareOri }} - - {{ '复购券均分' }}($) - {{ item.repurCouponShare }} - - + {{ '商城重消' }}({{isLocalSymbol() }}) {{ item.backPointsOri }} - - {{ '商城重消' }}($) - {{ item.backPoints }} - + {{ '平台服务费' }}({{isLocalSymbol() }}) {{ item.serviceSpendOri }} - - {{ '平台服务费' }}($) - {{ item.serviceSpend }} - + - {{ '环球积分' }} + 直推级差({{isLocalSymbol() }}) {{ item.globalPointsOri }} - - {{ '环球积分' }}($) - {{ item.globalPoints }} - + {{ '车奖积分' }} {{ item.carAwardPointsOri }} - - {{ '车奖积分' }}($) - {{ item.carAwardPoints }} - - - {{ '店铺收益' }} - {{ item.storeIncomeOri }} - - - {{ '店铺收益' }}($) - {{ item.storeIncome }} - - - {{ '嗨粉推荐收益' }}({{isLocalSymbol() }}) - {{ item.hiFunIncomeOri }} - - - {{ '嗨粉推荐收益' }}($) - {{ item.hiFunIncome }} - - - {{ '创客空间直推收益' }}({{isLocalSymbol() }}) - {{ item.makerDirectIncomeOri }} - - - {{ '创客空间直推收益' }}($) - {{ item.makerDirectIncome }} - - - {{ '创客共享收益' }}({{isLocalSymbol() }}) - {{ item.makerShareIncomeOri }} - - - {{ '创客共享收益' }}($) - {{ item.makerShareIncome }} - + {{ '首购实发小计' }}({{isLocalSymbol() }}) {{ item.purRealSubtotalOri }} - - {{ '首购实发小计' }}($) - {{ item.purRealSubtotal }} - - - {{ '云代实发小计' }}({{isLocalSymbol() }}) - {{ item.cloudRealSubtotalOri }} - - - {{ '云代实发小计' }}($) - {{ item.cloudRealSubtotal }} - + {{ '复购实发小计' }}({{isLocalSymbol() }}) {{ item.repurRealSubtotalOri }} - - {{ '复购实发小计' }}($) - {{ item.repurRealSubtotal }} - {{ '复购券实发小计' }}({{isLocalSymbol() }}) {{ item.repurCouponSubtotalOri }} - - {{ '复购券实发小计' }}($) - {{ item.repurCouponSubtotal }} - - - {{ '创客空间实发小计' }}({{isLocalSymbol() }}) - {{ item.makerRealSubtotalOri }} - - - {{ '创客空间实发小计' }}($) - {{ item.makerRealSubtotal }} - + {{ '实发收益总计' }}({{isLocalSymbol() }}) {{ item.realIncomeTotalOri }} - - {{ '实发收益总计' }}($) - {{ item.realIncomeTotal }} - @@ -353,219 +217,89 @@ {{ '直推收益' }}({{isLocalSymbol() }}) {{ item.directIncomeOri }} - - {{ '直推收益' }}($) - {{ item.directIncome }} - + {{ '拓展收益' }}({{isLocalSymbol() }}) {{ item.expandIncomeOri }} - - {{ '拓展收益' }}($) - {{ item.expandIncome }} - + {{ '辅导收益' }}({{isLocalSymbol() }}) {{ item.coachIncomeOri }} - - {{ '辅导收益' }}($) - {{ item.coachIncome }} - + {{ '分红收益' }}({{isLocalSymbol() }}) {{ item.shareIncomeOri }} - - {{ '分红收益' }}($) - {{ item.shareIncome }} - + {{ '报单收益' }}({{isLocalSymbol() }}) {{ item.serviceIncomeOri }} - - {{ '服务收益' }}($) - {{ item.serviceIncome }} - - - {{ '云代直推收益' }}({{isLocalSymbol() }}) - {{ item.cloudDirectIncomeOri }} - - - - {{ '云代直推收益' }}($) - {{ item.cloudDirectIncome }} - - - - {{ '云代首购收益' }}({{isLocalSymbol() }}) - {{ item.cloudPurIncomeOri }} - - - - {{ '云代首购收益' }}($) - {{ item.cloudPurIncome }} - - - - {{ '云代复购收益' }}({{isLocalSymbol() }}) - {{ item.cloudRepurIncomeOri }} - - - - {{ '云代复购收益' }}($) - {{ item.cloudRepurIncome }} - + {{ '复购推荐收益' }}({{isLocalSymbol() }}) {{ item.repurPushIncomeOri }} - - {{ '复购推荐收益' }}($) - {{ item.repurPushIncome }} - + {{ '复购级差收益' }}({{isLocalSymbol() }}) {{ item.repurRangeIncomeOri }} - - {{ '复购级差收益' }}($) - {{ item.repurRangeIncome }} - {{ '复购拓展收益' }}({{isLocalSymbol() }}) {{ item.repurExpandIncomeOri }} - - {{ '复购拓展收益' }}($) - {{ item.repurExpandIncome }} - + {{ '复购券' }}({{isLocalSymbol() }}) {{ item.repurCouponOri }} - - {{ '复购券' }}($) - {{ item.repurCoupon }} - + {{ '复购券均分' }} {{ item.repurCouponShareOri }} - - {{ '复购券均分' }}($) - {{ item.repurCouponShare }} - + {{ '商城重消' }}({{isLocalSymbol() }}) {{ item.backPointsOri }} - - {{ '商城重消' }}($) - {{ item.backPoints }} - + {{ '平台服务费' }}({{isLocalSymbol() }}) {{ item.serviceSpendOri }} - - {{ '平台服务费' }}($) - {{ item.serviceSpend }} - - {{ '环球积分' }} + 直推级差({{isLocalSymbol() }}) {{ item.globalPointsOri }} - - {{ '环球积分' }}($) - {{ item.globalPoints }} - + - {{ '车奖积分' }} - {{ item.carAwardPointsOri }} - - - {{ '车奖积分' }}($) - {{ item.carAwardPoints }} + {{ '车奖积分' }} + {{ item.carAwardPointsOri }} - - {{ '店铺收益' }} - {{ item.storeIncomeOri }} - - - {{ '店铺收益' }}($) - {{ item.storeIncome }} - - - {{ '嗨粉推荐收益' }}({{isLocalSymbol() }}) - {{ item.hiFunIncomeOri }} - - - {{ '嗨粉推荐收益' }}($) - {{ item.hiFunIncome }} - - - {{ '创客空间直推收益' }}({{isLocalSymbol() }}) - {{ item.makerDirectIncomeOri }} - - - {{ '创客空间直推收益' }}($) - {{ item.makerDirectIncome }} - - - {{ '创客共享收益' }}({{isLocalSymbol() }}) - {{ item.makerShareIncomeOri }} - - - {{ '创客共享收益' }}($) - {{ item.makerShareIncome }} - {{ '首购实发小计' }}({{isLocalSymbol() }}) {{ item.purRealSubtotalOri }} - - {{ '首购实发小计' }}($) - {{ item.purRealSubtotal }} - - - {{ '云代实发小计' }}({{isLocalSymbol() }}) - {{ item.cloudRealSubtotalOri }} - - - {{ '云代实发小计' }}($) - {{ item.cloudRealSubtotal }} - + {{ '复购实发小计' }}({{isLocalSymbol() }}) {{ item.repurRealSubtotalOri }} - - {{ '复购实发小计' }}($) - {{ item.repurRealSubtotal }} - + - {{ '复购券实发小计' }}({{isLocalSymbol() }}) - {{ item.repurCouponSubtotalOri }} - - - {{ '复购券实发小计' }}($) - {{ item.repurCouponSubtotal }} - - - {{ '创客空间实发小计' }}({{isLocalSymbol() }}) - {{ item.makerRealSubtotalOri }} + {{ '复购券实发小计' }}({{isLocalSymbol() }}) + {{ item.repurCouponSubtotalOri }} - - {{ '创客空间实发小计' }}($) - {{ item.makerRealSubtotal }} - + + {{ '实发收益总计' }}({{isLocalSymbol() }}) {{ item.realIncomeTotalOri }} @@ -626,7 +360,7 @@ - { @@ -1014,7 +748,6 @@ export default { } } }) - console.log('obj', obj) this.totalPrice = [obj] }) }, @@ -1022,7 +755,7 @@ export default { this.tableData = [] this.queryParams.pageNum = 1 this.isTop = false - this.getMemberList() + this.getList() }, reset() { this.select = {} diff --git a/src/pages/settlementCenter/performanceTotal.vue b/src/pages/settlementCenter/performanceTotal.vue index ebf3e1b..99ac50c 100644 --- a/src/pages/settlementCenter/performanceTotal.vue +++ b/src/pages/settlementCenter/performanceTotal.vue @@ -1,9 +1,3 @@ -