diff --git a/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue b/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
index 7c0454e..74807b6 100644
--- a/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
+++ b/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
@@ -173,7 +173,8 @@
findUser,
unionPay,
cardPay,
- getUserOrderPreList,
+ getUserOrderPreList,
+ cancel,
getRebateIntegral
} from '../../Utils/Api.js';
let app = getApp();
@@ -234,7 +235,7 @@
let datas = {
platformId: this.showType,
- regionId: app.globalData.cityId,
+ "companyId": app.globalData.companyId,
productType: 3
}
getThirdPartyByDetail(datas).then(res => {
@@ -531,13 +532,15 @@
icon: 'none',
title: '工会卡余额不足',
duration: 2000,
- });
+ });
+ that.cancel();
return;
}
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../../pages/login/updatePas/updatePas'
- })
+ })
+ that.cancel();
return;
}
if (!that.user.isSetHltCard) {
@@ -552,7 +555,8 @@
})
}, 1000)
}
- });
+ });
+ that.cancel();
return;
}
that.$refs.paymentPassword.modalFun('show');
@@ -589,6 +593,17 @@
}
});
});
+ },
+ //取消订单
+ cancel() {
+ let params = {
+ orderNo: this.orderId,
+ }
+ cancel(params).then(res => {
+ if (res.return_code == '000000') {
+ this.orderId = '';
+ }
+ })
},
submitHandle(e) {
uni.showLoading({
@@ -640,7 +655,8 @@
title: res.return_msg,
icon: 'none',
duration: 2000
- });
+ });
+ that.cancel();
})
return;
}
diff --git a/high-unionPay/pages/goods/goods-list/goods-list.vue b/high-unionPay/pages/goods/goods-list/goods-list.vue
index e3e5156..600b223 100644
--- a/high-unionPay/pages/goods/goods-list/goods-list.vue
+++ b/high-unionPay/pages/goods/goods-list/goods-list.vue
@@ -99,14 +99,14 @@
title: '商品列表'
});
this.getCouponListArea();
- this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
+ this.getCmsContent('CMS_BANNER_COUPON');
}
if (option.id == 2) {
uni.setNavigationBarTitle({
title: '积分列表'
});
this.getCouponListArea();
- this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
+ this.getCmsContent('CMS_BANNER_COUPON');
}
if (option.id == 3) {
uni.setNavigationBarTitle({
@@ -124,7 +124,7 @@
uni.setNavigationBarTitle({
title: '优选商品'
});
- this.getCmsContent('CMS_PRE_LIST');
+ this.getCmsContent('CMS_DISCOUNT_PACKAGE_BANNER');
this.getBrandCouponList();
}
},
@@ -176,7 +176,7 @@
}
getCmsContent(params).then(res => {
if (res.return_code == '000000') {
- this.swiperList = res.return_data;
+ this.swiperList = res.return_data.childCategory;
}
});
},
diff --git a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
index eb9c25d..66d5359 100644
--- a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -155,7 +155,7 @@
-
+
银联支付
@@ -165,7 +165,7 @@
-
+
油卡支付余额: {{oilPirce}}元
@@ -175,7 +175,7 @@
-
+
汇联通工会卡余额: {{tongCardPrice}}元
@@ -530,7 +530,8 @@
"saleCount": 1,
}],
"payGold": this.priceValue[1],
- "promoteCode": this.identificationCode,
+ "promoteCode": this.identificationCode,
+ "companyId": app.globalData.companyId,
"payPwd": this.PaymentPassword
}
create(goods).then(res => {
@@ -694,7 +695,8 @@
}],
"payGold": this.priceValue[1],
"promoteCode": this.identificationCode,
- "payPwd": this.PaymentPassword,
+ "payPwd": this.PaymentPassword,
+ "companyId": app.globalData.companyId,
"memDiscountId": this.memDiscountId
}
create(goods).then(res => {
diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue
index f6988ad..9b370d6 100644
--- a/high-unionPay/pages/order/confirmation.vue
+++ b/high-unionPay/pages/order/confirmation.vue
@@ -161,7 +161,7 @@
-
+