From 49a8bfa4c7a85d77e6fefaca3aa57090c0fcda52 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Mon, 17 Jul 2023 15:03:57 +0800
Subject: [PATCH] =?UTF-8?q?7-17=E6=8F=90=E4=BA=A4=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/confirmation.vue | 21 ++++++++++++++++-----
subPages/coupon-package/coupon-package.vue | 2 +-
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 35068a4..3aa8a17 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -308,6 +308,9 @@
4.使用时请告知加油员“使用汇联通电子券支付”。
+
+ 5.由于产品特殊，每个用户（同一ID视为同一用户）每日最多购买4张电子券。
+
@@ -394,13 +397,14 @@
cardNoNumber: '', // 车牌号
- getHeight:370,
- countDown:3,
+ getHeight:420,
+ countDown:5,
isFinish:false,
isAgree:false,//我已同意
Timer:null,
payWeixin:'',//固定微信支付
+ couponSource:'',//卡券来源
};
},
onLoad(option) {
@@ -618,6 +622,7 @@
this.paytheprice = res.return_data.discountPrice;
this.saveprice = res.return_data.discountPrice;
this.orderPrice = res.return_data.salesPrice;
+ this.couponSource = res.return_data.couponSource;
this.getRebateIntegral();
this.findUser();
// this.getThirdPartyByDetail();
@@ -636,7 +641,7 @@
}
if(!this.isFinish){
- this.countDown = 3;
+ this.countDown = 5;
this.Timer = setInterval(()=>{
if(this.countDown == 0){
@@ -830,7 +835,7 @@
})
return;
}
- if(!this.isAgree){
+ if(!this.isAgree&&this.couponSource==4){
this.showPopupNeedKnow();
return;
}
@@ -846,7 +851,8 @@
})
return;
}
-
+
+
@@ -895,6 +901,11 @@
}
+ /* 显示弹窗 ，couponSource==4贵州业务*/
+ if(!this.isAgree&&this.couponSource==4){
+ this.showPopupNeedKnow();
+ return;
+ }
if (this.orderDetails) {
this.wechatPay(this.orderDetails);
diff --git a/subPages/coupon-package/coupon-package.vue b/subPages/coupon-package/coupon-package.vue
index 72dbd17..3814752 100644
--- a/subPages/coupon-package/coupon-package.vue
+++ b/subPages/coupon-package/coupon-package.vue
@@ -131,7 +131,7 @@
}
let pagenum = this.pageNum;
let params = {
- regionId: app.globalData.cityId,
+ companyId: app.globalData.companyId,
pageNum: pagenum,
pageSize: this.pageSize,
title: this.couponName