diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 33da8bd..e393cb4 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -157,16 +157,15 @@
addCart(this.cartForm).then(res => {
// 购物车ID
that.checkForm.cart_id.push(res.data.cart_id);
- that.$util.Tips({
- title: "操作成功!"
- }, () => {
- orderCheck(that.checkForm).then(res => {
- uni.navigateTo({
- url: "/pages/payment/settlement?cartId=" + this.checkForm
- .cart_id + "&money=" + this.cartForm.total_amount +
- "&merName=" + this.merchantInfo.merchant.mer_name
- })
- });
+ orderCheck(that.checkForm).then(res1 => {
+ uni.navigateTo({
+ url: "/pages/payment/settlement?cartId=" + this.checkForm
+ .cart_id + "&money=" + this.cartForm.total_amount +
+ "&merName=" + this.merchantInfo.merchant.mer_name,
+ success: (res) => {
+ res.eventChannel.emit('datas', res1.data.platformConsumption);
+ }
+ })
});
}).catch((err) => {
this.$util.Tips({
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index a10405b..f60f603 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -1,916 +1,961 @@
-
-
-
-
-
-
-
- {{payForm.merName}}
-
-
+
+
+
+
+
+
+
+ {{payForm.merName}}
+
+
-
-
-
-
-
-
- {{payForm.money}}元实物提货券
-
-
- ¥{{payForm.money}}
-
-
-
-
-
+
+
+
+
+
+
+ {{payForm.money}}元实物提货券
+
+
+ ¥{{payForm.money}}
+
+
+
+
+
-
-
- 支付方式
-
-
-
-
-
- {{item.name}}
-
-
- {{item.title}}
-
- {{userInfo.now_money}}
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
- {{item.title}}
-
- {{userInfo.now_money}}
-
-
-
-
-
-
-
+
+
+ 支付方式
+
+
+
+
+
+ {{item.name}}
+
+
+ {{item.title}}
+
+ {{userInfo.now_money}}
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+ {{item.title}}
+
+ {{userInfo.now_money}}
+
+
+
+
+
+
+
-
-
- 商品总价:
- ¥{{payForm.money}}
-
+
+
+ 商品总价:
+ ¥{{payForm.money}}
+
-
- 补贴抵扣
-
-
- -¥{{consumption_money||'0.00'}}
- 有补贴补贴未选
-
-
-
-
- 暂无抵扣红包
-
-
-
-
+
+ 补贴抵扣
+
+
+ -¥{{consumption_money||'0.00'}}
+ 有补贴补贴未选
+
+
+
+
+ 暂无抵扣红包
+
+
+
+
-
-
-
+
+
+
\ No newline at end of file