diff --git a/App.vue b/App.vue
index 543ae2c..ad5a5c9 100644
--- a/App.vue
+++ b/App.vue
@@ -128,7 +128,7 @@ export default {
color: #000;
}
-.text-zu1 {
+.text-gray {
color: #333;
}
diff --git a/components/common/address-popup.vue b/components/common/address-popup.vue
index 39cd28f..653442f 100644
--- a/components/common/address-popup.vue
+++ b/components/common/address-popup.vue
@@ -14,7 +14,7 @@
- {{item.name}}
@@ -23,21 +23,21 @@
- {{item.zi}}
+ {{item.zi}}
- {{xItem.name}}
+ {{xItem.name}}
- {{item.zi}}
+ {{item.zi}}
-
-
-
+
+
+
-
+ }
+
+
\ No newline at end of file
diff --git a/components/common/down-popup.vue b/components/common/down-popup.vue
index d08c541..0add476 100644
--- a/components/common/down-popup.vue
+++ b/components/common/down-popup.vue
@@ -3,12 +3,12 @@
- {{title}}
+ {{title}}
- {{articleTitle}}
+ {{articleTitle}}
-
+
{{contentText}}
diff --git a/components/common/home-popup.vue b/components/common/home-popup.vue
index 3480e42..751693a 100644
--- a/components/common/home-popup.vue
+++ b/components/common/home-popup.vue
@@ -16,7 +16,7 @@
¥{{dataObj.minPrice}}
- {{dataObj.name}}
+ {{dataObj.name}}
diff --git a/pages/mine_package/mine_my_team_list/mine_my_team_list.vue b/pages/mine_package/mine_my_team_list/mine_my_team_list.vue
index 5b1b425..b1c6a83 100644
--- a/pages/mine_package/mine_my_team_list/mine_my_team_list.vue
+++ b/pages/mine_package/mine_my_team_list/mine_my_team_list.vue
@@ -19,14 +19,14 @@
注:所有数据均截止到进入页面的时间,返回再进入页面数据会更新。
- 用户信息
+ 用户信息
- {{item.userName}}
+ {{item.userName}}
({{item.gradeName}})
ID:{{item.userId}}
@@ -36,11 +36,11 @@
- {{item.teamPerformance.teamAmount}}
+ {{item.teamPerformance.teamAmount}}
订单金额
- {{item.teamPerformance.teamCount}}
+ {{item.teamPerformance.teamCount}}
团队人数
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index d467c96..b7a6980 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -1,1176 +1,1176 @@
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ pItem.title }}
- {{ pItem.goodsSpece }}
-
-
-
- ¥{{ pItem.goodsAmount }}
- x{{ pItem.buyNum }}
-
-
-
-
-
- {{
- pItem.expressData.logisticsStatusDesc }}
- {{
- Array.isArray(pItem.expressData?.logisticsTraceDetailList)
- ? pItem.expressData?.logisticsTraceDetailList[
- pItem.expressData.logisticsTraceDetailList.length -
- 1
- ].desc
- : ""
- }}
-
-
-
-
-
-
-
-
- 运费:¥{{ item.postage }},商品总价:¥{{item.sumAmount}}
- 共{{ item.buyNum }}件,合计¥{{ item.sumAmount + item.postage }}
-
-
- 去付款
-
-
- 确认收货
-
-
- 查看物流
-
-
- 去签署
-
-
-
- 查看售后
-
-
-
- {{
- form.type === MINE_ORDER_TYPE.UNPAID ? "取消支付" : "去售后"
- }}
-
-
-
- 售后详情
-
-
- 删除
-
-
-
-
-
-
-
- 暂无相关订单
-
- 加载中...
-
-
-
-
-
-
-
-
-
-
- 温馨提示
- 暂未开放
-
-
- 确定
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ pItem.title }}
+ {{ pItem.goodsSpece }}
+
+
+
+ ¥{{ pItem.goodsAmount }}
+ x{{ pItem.buyNum }}
+
+
+
+
+
+ {{
+ pItem.expressData.logisticsStatusDesc }}
+ {{
+ Array.isArray(pItem.expressData?.logisticsTraceDetailList)
+ ? pItem.expressData?.logisticsTraceDetailList[
+ pItem.expressData.logisticsTraceDetailList.length -
+ 1
+ ].desc
+ : ""
+ }}
+
+
+
+
+
+
+
+
+ 运费:¥{{ item.postage }},商品总价:¥{{item.sumAmount}}
+ 共{{ item.buyNum }}件,合计¥{{ item.sumAmount + item.postage }}
+
+
+ 去付款
+
+
+ 确认收货
+
+
+ 查看物流
+
+
+ 去签署
+
+
+
+ 查看售后
+
+
+
+ {{
+ form.type === MINE_ORDER_TYPE.UNPAID ? "取消支付" : "去售后"
+ }}
+
+
+
+ 售后详情
+
+
+ 删除
+
+
+
+
+
+
+
+ 暂无相关订单
+
+ 加载中...
+
+
+
+
+
+
+
+
+
+
+ 温馨提示
+ 暂未开放
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/mine_package/mine_purse/mine_purse.vue b/pages/mine_package/mine_purse/mine_purse.vue
index 8fd1a65..940eff6 100644
--- a/pages/mine_package/mine_purse/mine_purse.vue
+++ b/pages/mine_package/mine_purse/mine_purse.vue
@@ -30,6 +30,11 @@
}}
+
+ {{ item.bonusAmount || 0 }}
+ 分红余额
+
+
{{ item.lockAmount || 0 }}
{{ item.categoty === "raffle" ? "不可用次数" : "不可用余额" }}
@@ -151,7 +156,7 @@ export default {
"&curId=" +
item.curId +
"&preId=" +
- item.preId,
+ item.preId + "&bonusId=" + item.bonusId,
});
},
// 查询余额
diff --git a/pages/mine_package/mine_purse_log/mine_purse_log.vue b/pages/mine_package/mine_purse_log/mine_purse_log.vue
index 09f53e0..bec15ef 100644
--- a/pages/mine_package/mine_purse_log/mine_purse_log.vue
+++ b/pages/mine_package/mine_purse_log/mine_purse_log.vue
@@ -31,15 +31,15 @@
- {{headerData[source[0].key]}}
+ {{headerData[source[0].key]}}
{{source[0].name}}
- {{headerData[source[2].key]}}
+ {{headerData[source[2].key]}}
{{source[2].name}}
- {{headerData[source[1].key]}}
+ {{headerData[source[1].key]}}
{{source[1].name}}
- {{headerData[source[3].key]}}
+ {{headerData[source[3].key]}}
{{source[3].name}}
@@ -47,11 +47,11 @@
- {{headerData[source[0].key]}}
+ {{headerData[source[0].key]}}
{{source[0].name}}
- {{headerData[source[1].key]}}
+ {{headerData[source[1].key]}}
{{source[1].name}}
@@ -109,9 +109,7 @@ export default {
data() {
return {
- infoList: [
-
- ],
+ infoList: [],
source: [],
headerData: {},
selInfo: "cur",
@@ -125,6 +123,7 @@ export default {
lockId: 0,
curId: 0,
preId: 0,
+ bonusId: 0,
}
},
onLoad(option) {
@@ -135,6 +134,7 @@ export default {
const lockId = option.lockId;
const curId = option.curId;
const preId = option.preId;
+ const bonusId = option.bonusId;
// 分红金额 balance
@@ -186,6 +186,10 @@ export default {
name: "锁定账户",
key: "lockAmount"
},
+ {
+ name: "分红",
+ key: "bonusAmount"
+ },
// {
// name: "预存款账户",
@@ -297,6 +301,9 @@ export default {
if (preId && preId !== 'null') {
this.preId = preId;
}
+ if (bonusId && bonusId !== 'null') {
+ this.bonusId = bonusId;
+ }
// this.onGetAcctFlowList();
@@ -370,9 +377,6 @@ export default {
selectInfo(item = null) {
- // if(item == null){
- // item.key = 'cur'
- // }
this.orderList = [];
this.form.page = 1;
this.selInfo = item.key;
@@ -387,6 +391,9 @@ export default {
if (item.key === "pre") {
id = this.preId;
}
+ if (item.key === "bonusAmount") {
+ id = this.bonusId;
+ }
this.form.id = id;
this.loadData();
diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue
index c18976a..afea4b7 100644
--- a/pages/other_package/productInfo/productInfo.vue
+++ b/pages/other_package/productInfo/productInfo.vue
@@ -169,7 +169,7 @@
- {{ item }}
+ {{ item }}
diff --git a/pages/rwa_package/account/bind.vue b/pages/rwa_package/account/bind.vue
index c811462..fab8ef0 100644
--- a/pages/rwa_package/account/bind.vue
+++ b/pages/rwa_package/account/bind.vue
@@ -4,12 +4,12 @@
- 注:请与当前登录微信信息一致
- {{type == 0 ? '支付宝账号' : '微信账号'}}
+ 注:请与当前登录微信信息一致
+ {{type == 0 ? '支付宝账号' : '微信账号'}}
- {{type == 0 ? '支付宝姓名' : '微信姓名'}}
+ {{type == 0 ? '支付宝姓名' : '微信姓名'}}
diff --git a/pages/rwa_package/account/components/account-item-two.vue b/pages/rwa_package/account/components/account-item-two.vue
index 31d6bce..40b1c54 100644
--- a/pages/rwa_package/account/components/account-item-two.vue
+++ b/pages/rwa_package/account/components/account-item-two.vue
@@ -9,7 +9,7 @@
v-else
>
- {{ dataItem.account }}
+ {{ dataItem.account }}
{{ address }}
diff --git a/pages/rwa_package/account/components/account-item.vue b/pages/rwa_package/account/components/account-item.vue
index 11204ca..76b0b4c 100644
--- a/pages/rwa_package/account/components/account-item.vue
+++ b/pages/rwa_package/account/components/account-item.vue
@@ -2,11 +2,11 @@
- {{itemData.name}}
+ {{itemData.name}}
账号:{{itemData.account}}
- 解绑
+ 解绑
diff --git a/pages/rwa_package/account/components/select-item.vue b/pages/rwa_package/account/components/select-item.vue
index e8f5d09..bb68cb5 100644
--- a/pages/rwa_package/account/components/select-item.vue
+++ b/pages/rwa_package/account/components/select-item.vue
@@ -10,7 +10,7 @@
- {{item.name}}
+ {{item.name}}
账号:{{item.account}}
diff --git a/pages/rwa_package/account/components/select-lian.vue b/pages/rwa_package/account/components/select-lian.vue
index 8a9e333..39fb6f1 100644
--- a/pages/rwa_package/account/components/select-lian.vue
+++ b/pages/rwa_package/account/components/select-lian.vue
@@ -18,7 +18,7 @@
style="min-width: 88rpx; heihgt: 88rpx"
>
- 券商登记地址
+ 券商登记地址
{{ item.addressOne }}
diff --git a/pages/rwa_package/account/components/shu-tips.vue b/pages/rwa_package/account/components/shu-tips.vue
index 059b2e0..3ec23f2 100644
--- a/pages/rwa_package/account/components/shu-tips.vue
+++ b/pages/rwa_package/account/components/shu-tips.vue
@@ -9,7 +9,7 @@
- 券商地址登记
+ 券商地址登记
通过券商兑换
@@ -17,7 +17,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{item.text}}
+
+
+ {{item.value}}
+
+
+
+
+
+
+
+ {{item.text}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/enumUtils.js b/utils/enumUtils.js
index e9d1591..72b4e20 100644
--- a/utils/enumUtils.js
+++ b/utils/enumUtils.js
@@ -261,6 +261,50 @@ export const BALANCE_TYPE = [
key: 25,
value: "加速释放转出"
},
+ {
+ key: 26,
+ value: "下级消费业绩"
+ },
+ {
+ key: 27,
+ value: "下级退货扣除奖励"
+ },
+ {
+ key: 28,
+ value: "代理商分润"
+ },
+ {
+ key: 29,
+ value: "代理商提现"
+ },
+ {
+ key: 30,
+ value: "代理商分润冻结"
+ },
+ {
+ key: 31,
+ value: "代理商取消提现"
+ },
+ {
+ key: 32,
+ value: "代理商TBC奖励"
+ },
+ {
+ key: 33,
+ value: "退货退款扣除代理商TBC奖励"
+ },
+ {
+ key: 34,
+ value: "TBC总资金池奖励"
+ },
+ {
+ key: 35,
+ value: "TBC发展基金资金池奖励"
+ },
+ {
+ key: 36,
+ value: "平级奖励"
+ }
]
/**
* 证状证件类型:1-居民身份证,2-护照