From d0e9a3f0752b0ae779f6f864926a8d6942414d81 Mon Sep 17 00:00:00 2001
From: yangjie <812952667@qq.com>
Date: Tue, 8 Jun 2021 10:05:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9C=E8=AF=B7=E5=91=8A=E7=9F=A5=E3=80=82?=
 =?UTF-8?q?=E3=80=82=E3=80=82=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/coupon-details/coupon-details.vue             | 3 ++-
 pages/goods/coupons-info-details/coupons-info-details.vue | 2 +-
 pages/pay/payment/payment.vue                             | 2 ++
 pages/pay/success/success.vue                             | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/goods/coupon-details/coupon-details.vue b/pages/goods/coupon-details/coupon-details.vue
index c53155f..e48e878 100644
--- a/pages/goods/coupon-details/coupon-details.vue
+++ b/pages/goods/coupon-details/coupon-details.vue
@@ -23,10 +23,11 @@
 		</view>
 		<view class="line1 mart15"></view>
 		<view class="width90 mart10 fcor666" v-if="couponDesInfo.highUserCoupon.status  != 0">核销码(商户扫客户)</view>
+		<view class="mart20 fotct fcorred font15 marb20" v-if="couponDesInfo.highUserCoupon.status  != 0">请告知加油员用码商支付</view>
 		<view class="width90 mart20 fotct" v-if="couponDesInfo.highUserCoupon.status  != 0">
 			<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg"></image>
 		</view>
-
+		<view class="fotct fcor333 font15 marb10 mart10">{{couponDesInfo.couponCodeInfo.codeKey}}</view>
 		<view class="width90 mart20" style="height: 80px;" v-for="(store,i) in storeList" :key="i">
 			<view class="coupon-des flleft">
 				立即<br>前往
diff --git a/pages/goods/coupons-info-details/coupons-info-details.vue b/pages/goods/coupons-info-details/coupons-info-details.vue
index 59b90d7..9f7b8b5 100644
--- a/pages/goods/coupons-info-details/coupons-info-details.vue
+++ b/pages/goods/coupons-info-details/coupons-info-details.vue
@@ -26,10 +26,10 @@
 
 		<view class="line1 mart15"></view>
 		<view class="width90 mart10 fcor666" v-if="couponDesInfo.highUserCoupon.status  != 0">核销码(商户扫客户)</view>
+		<view class="mart20 fotct fcorred font15 marb20" v-if="couponDesInfo.highUserCoupon.status  != 0">请告知加油员用码商支付</view>
 		<view class="width90 mart20 fotct" v-if="couponDesInfo.highUserCoupon.status  != 0">
 			<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.couponCode.ext1"></image>
 		</view>
-
 		<!-- 	<view class="width90 mart20" style="height: 80px;" v-for="(store,i) in storeList" :key="i">
 			<view class="coupon-des flleft">
 				立即<br>前往
diff --git a/pages/pay/payment/payment.vue b/pages/pay/payment/payment.vue
index 79712e5..8abf172 100644
--- a/pages/pay/payment/payment.vue
+++ b/pages/pay/payment/payment.vue
@@ -66,7 +66,9 @@
 		orderToGoldPay
 	} from '../../../Utils/Api.js'
 	let app = getApp();
+	// #ifdef H5
 	var jweixin = require('jweixin-module');
+	// #endif
 	export default {
 		data() {
 			return {
diff --git a/pages/pay/success/success.vue b/pages/pay/success/success.vue
index 2fa0229..7dcb664 100644
--- a/pages/pay/success/success.vue
+++ b/pages/pay/success/success.vue
@@ -24,6 +24,7 @@
 			</view>
 			<view class="line1 mart15"></view>
 			<view class="width90 mart10 fcor666">核销码(商户扫客户)</view>
+			<view class="mart20 fotct fcorred font15 marb20">请告知加油员用码商支付</view>
 			<view class="width90 mart20 fotct">
 				<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg"></image>
 			</view>