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 @@
-
-
-
-
-
-
-
- 签呈标题:{{ item.approvalBusinessVal }}
- 情况说明:{{ item.remark }}
-
-
-
-
-
-
- 签呈状态
- {{
- item.approveStatusVal
- }}
-
-
-
- 创建日期:{{ item.creationTime }}
- 终审时间:{{ item.endTime }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
-
-
-
- {{ '编号' }} :
-
-
-
-
-
-
-
- |
-
-
- {{ '发起部门' }} |
- {{ allData.signData.deptName }} |
- {{ '发起人' }} |
- {{ allData.signData.userName }} |
-
-
- {{ '主旨' }} |
-
-
- |
- {{ '日期' }} |
-
- {{ allData.signData.creationTime }}
- |
-
-
- {{ '审批流程' }} |
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
- {{ '抄送人' }} |
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
- {{ '情况说明' }} |
-
-
- |
-
-
- {{ '附件' }} |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
- {{ '注册金额' }}($) |
- {{ item.registerAmountDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '注册金额' }}({{ isLocalSymbol() }}) |
- {{ item.registerAmountLocality | toThousandthAndKeepDecimal}} |
-
+
{{ '注册业绩' }}(¥) |
{{ item.registerPv | toThousandthAndKeepDecimal}} |
-
- {{ '注册业绩' }}($) |
- {{ item.registerPvDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '注册业绩' }}({{ isLocalSymbol() }}) |
- {{ item.registerPvLocality | toThousandthAndKeepDecimal}} |
-
{{ '升级金额' }}(¥) |
{{ item.upgradeAmount | toThousandthAndKeepDecimal}} |
-
- {{ '升级金额' }}($) |
- {{ item.upgradeAmountDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '升级金额' }}({{ isLocalSymbol() }}) |
- {{ item.upgradeAmountLocality | toThousandthAndKeepDecimal}} |
-
+
{{ '升级业绩' }}(¥) |
{{ item.upgradePv | toThousandthAndKeepDecimal}} |
-
- {{ '升级业绩' }}($) |
- {{ item.upgradePvDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '升级业绩' }}({{ isLocalSymbol() }}) |
- {{ item.upgradePvLocality | toThousandthAndKeepDecimal}} |
-
+
{{ '首购金额' }}(¥) |
{{ item.firstPurchaseAmount | toThousandthAndKeepDecimal}} |
-
- {{ '首购金额' }}($) |
- {{ item.firstPurchaseAmountDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '首购金额' }}({{ isLocalSymbol() }}) |
- {{ item.firstPurchaseAmountLocality | toThousandthAndKeepDecimal}} |
-
+
{{ '首购业绩' }}(¥) |
@@ -104,109 +62,24 @@
{{ item.firstPurchasePvLocality | toThousandthAndKeepDecimal}} |
-
- {{ '三方'+'金额' }}(¥) |
- {{ item.tripartiteAmount | toThousandthAndKeepDecimal}} |
-
-
- {{ '三方'+'金额' }}($) |
- {{ item.tripartiteAmountDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '三方'+'金额' }}({{ isLocalSymbol() }}) |
- {{ item.tripartiteAmountLocality | toThousandthAndKeepDecimal}} |
-
-
-
- {{ '三方'+'业绩' }}(¥) |
- {{ item.tripartitePv | toThousandthAndKeepDecimal}} |
-
-
- {{ '三方'+'业绩' }}($) |
- {{ item.tripartitePvDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '三方'+'业绩' }}({{ isLocalSymbol() }}) |
- {{ item.tripartitePvLocality | toThousandthAndKeepDecimal}} |
-
-
-
- {{ '海粉金额' }}(¥) |
- {{ item.fansAmount | toThousandthAndKeepDecimal}} |
-
-
- {{ '海粉金额' }}($) |
- {{ item.fansAmountDollar| toThousandthAndKeepDecimal }} |
-
-
- {{ '海粉金额' }}({{ isLocalSymbol() }}) |
- {{ item.fansAmountLocality | toThousandthAndKeepDecimal}} |
-
-
-
- {{ '海粉业绩' }}(¥) |
- {{ item.hiFunPv | toThousandthAndKeepDecimal}} |
-
-
- {{ '海粉业绩' }}($) |
- {{ item.hiFunPvDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '海粉业绩' }}({{ isLocalSymbol() }}) |
- {{ item.hiFunPvLocality | toThousandthAndKeepDecimal}} |
-
-
{{ '复购金额' }}(¥) |
{{ item.repurchaseAmount | toThousandthAndKeepDecimal}} |
-
- {{ '复购金额' }}($) |
- {{ item.repurchaseAmountDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '复购金额' }}({{ isLocalSymbol() }}) |
- {{ item.repurchaseAmountLocality | toThousandthAndKeepDecimal}} |
-
-
{{ '复购业绩' }}(¥) |
{{ item.repurchasePv | toThousandthAndKeepDecimal}} |
-
- {{ '复购业绩' }}($) |
- {{ item.repurchasePvDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '复购业绩' }}({{ isLocalSymbol() }}) |
- {{ item.repurchasePvLocality | toThousandthAndKeepDecimal}} |
-
{{ '金额总计' }}(¥) |
{{ item.amountTotal | toThousandthAndKeepDecimal}} |
-
- {{ '金额总计' }}($) |
- {{ item.amountTotalDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '金额总计' }}({{ isLocalSymbol() }}) |
- {{ item.amountTotalLocality | toThousandthAndKeepDecimal}} |
-
{{ '业绩汇总' }}(¥) |
{{ item.pvTotal | toThousandthAndKeepDecimal}} |
-
- {{ '业绩汇总' }}($) |
- {{ item.pvTotalDollar | toThousandthAndKeepDecimal}} |
-
-
- {{ '业绩汇总' }}({{ isLocalSymbol() }}) |
- {{ item.pvTotalLocality | toThousandthAndKeepDecimal}} |
-
小计
@@ -704,6 +577,7 @@ export default {
margin: 20rpx;
background: #f9f9f9;
border-radius: 10px 10px 10px 10px;
+ box-shadow: 0px 2px 10px 6px rgba(204, 204, 204, .8);
}
.table_f {
display: flex;
diff --git a/src/pages/settlementCenter/sourceBonus.vue b/src/pages/settlementCenter/sourceBonus.vue
index a25ee66..9404448 100644
--- a/src/pages/settlementCenter/sourceBonus.vue
+++ b/src/pages/settlementCenter/sourceBonus.vue
@@ -1,9 +1,4 @@
-
+