diff --git a/components/common/top-safe.nvue b/components/common/top-safe.nvue
index 71c5be7..3a110a2 100644
--- a/components/common/top-safe.nvue
+++ b/components/common/top-safe.nvue
@@ -1,35 +1,34 @@
-
+
diff --git a/components/shop/ping-item.vue b/components/shop/ping-item.vue
index f8d89a8..3de8c5c 100644
--- a/components/shop/ping-item.vue
+++ b/components/shop/ping-item.vue
@@ -8,7 +8,7 @@
- {{ obj.buyDeductionValue }}抵扣券
+ {{ obj.buyDeductionValue }}数字积分
+{{ obj.price }}元
兑换
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index e92ab3a..a40a08e 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -88,7 +88,7 @@
(快递动态跟进请复制单号至[快递100官网] 查询)
共{{ item.buyNum }}件,合计¥{{ item.sumAmount }}
-->
- 共{{ item.buyNum }}件,合计抵扣券{{item.buyDeductionValue}} +¥{{item.sumAmount}}
+ 共{{ item.buyNum }}件,合计数字积分{{item.buyDeductionValue}} +¥{{item.sumAmount}}
运费:¥{{ item.postage }},商品总价:¥{{item.sumAmount}}
共{{ item.buyNum }}件,合计¥{{ item.sumAmount + item.postage }}
diff --git a/pages/mine_package/mine_order_info/mine_order_info.vue b/pages/mine_package/mine_order_info/mine_order_info.vue
index 43ff289..6665967 100644
--- a/pages/mine_package/mine_order_info/mine_order_info.vue
+++ b/pages/mine_package/mine_order_info/mine_order_info.vue
@@ -106,7 +106,7 @@
商品总价
¥{{ orderInfo.sumAmount }}
- 抵扣券{{ orderInfo.buyDeductionValue }} +¥{{ orderInfo.sumAmount }}
+ 数字积分{{ orderInfo.buyDeductionValue }} +¥{{ orderInfo.sumAmount }}
快递运费
@@ -114,8 +114,8 @@
- 抵扣券
- {{ orderInfo.buyDeductionValue }}抵扣券
+ 数字积分
+ {{ orderInfo.buyDeductionValue }}数字积分
diff --git a/pages/order_package/order_submit/order_submit.vue b/pages/order_package/order_submit/order_submit.vue
index fb97e0e..efdda48 100644
--- a/pages/order_package/order_submit/order_submit.vue
+++ b/pages/order_package/order_submit/order_submit.vue
@@ -133,12 +133,12 @@
- 抵扣券余额
+ 数字积分余额
{{ couponData.balance || 0 }}
- 实付抵扣券
+ 实付数字积分
{{ buyCouponvalue }}
@@ -169,7 +169,7 @@
商品总价
- {{ `${buyCouponvalue}抵扣券+${orderInfo.amount - (orderInfo.postage || 0) +
+ {{ `${buyCouponvalue}数字积分+${orderInfo.amount - (orderInfo.postage || 0) +
(orderInfo.enterpriseAmount
|| 0)}元` }}
@@ -183,8 +183,8 @@
- 抵扣券
- {{ buyCouponvalue }}抵扣券
+ 数字积分
+ {{ buyCouponvalue }}数字积分
企业用户优惠
@@ -366,8 +366,8 @@ export default {
isCoupon: false, // 是否优惠卷
couponData: {}, // 优惠卷数据
allOrderInfo: {}, // 所有订单信息
- buyCouponvalue: 0, // 实付抵扣券积分
- buyCouponAmount: 0, // 实付抵扣券对应的钱
+ buyCouponvalue: 0, // 实付数字积分积分
+ buyCouponAmount: 0, // 实付数字积分对应的钱
};
},
async onLoad(option) {
@@ -415,12 +415,12 @@ export default {
methods: {
getValue,
assembleAddress,
- // 实付抵扣券
+ // 实付数字积分
onBuyCouponvalue(currentQuantity) {
this.buyCouponvalue = Number((this.allOrderInfo.buyDeductionValue * (currentQuantity || 1)).toFixed(2)) || 0;
},
- // 实付抵扣券对应的钱
+ // 实付数字积分对应的钱
onBuyCouponAmount() {
this.buyCouponAmount = Number((this.sed.goodsNum * this.allOrderInfo.buyDeduction).toFixed(2)) || 0;
},
diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue
index 32e0b71..911a049 100644
--- a/pages/other_package/productInfo/productInfo.vue
+++ b/pages/other_package/productInfo/productInfo.vue
@@ -31,11 +31,11 @@
">
- {{ orderInfo.buyDeductionValue }}抵扣券
+ {{ orderInfo.buyDeductionValue }}数字积分
+{{ orderInfo.minPrice }}元
- 兑后抵扣券不退
+ 兑后数字积分不退
@@ -190,7 +190,7 @@
- {{ orderInfo.buyDeductionValue }}抵扣券
+ {{ orderInfo.buyDeductionValue }}数字积分
+{{ selectSpecificationTempl.price }}元
diff --git a/pages/rwa_package/shop/fen-shop.vue b/pages/rwa_package/shop/fen-shop.vue
index c6dc89a..5d799b8 100644
--- a/pages/rwa_package/shop/fen-shop.vue
+++ b/pages/rwa_package/shop/fen-shop.vue
@@ -1,14 +1,17 @@
-
-
+
-
- 抵扣券专区: {{ balanceData.curAmount || 0 }}
+
-
+
@@ -184,6 +187,24 @@ export default {