From df4ced97dfc01ce0d77818f725c48dea4fc55713 Mon Sep 17 00:00:00 2001
From: "USER-20200413TQ\\Administrator" <812952667@qq.com>
Date: Wed, 19 Oct 2022 17:18:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81=E9=A2=86?=
 =?UTF-8?q?=E5=88=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |  2 +-
 pages.json                                    |  2 +-
 pages/goods/externalCoupon/externalCoupon.vue | 38 ++++++++++---------
 pages/user/coupon/coupon.vue                  | 11 ++++--
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/manifest.json b/manifest.json
index 1d876a3..82fa52b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -87,7 +87,7 @@
         },
         "devServer" : {
             "port" : "",
-            "https" : false
+            "https" : true
         },
         "domain" : "https://hsgcs.dctpay.com",
         "template" : "index.html"
diff --git a/pages.json b/pages.json
index 0eb5fc6..f917d8a 100644
--- a/pages.json
+++ b/pages.json
@@ -29,7 +29,7 @@
 				"backgroundColorTop": "#0083f5",
 				"enablePullDownRefresh": false
 			}
-
+		
 		}, {
 			"path": "pages/user/bindingCardList/bindingCardList",
 			"style": {
diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue
index 957a1ee..bcbca16 100644
--- a/pages/goods/externalCoupon/externalCoupon.vue
+++ b/pages/goods/externalCoupon/externalCoupon.vue
@@ -43,13 +43,13 @@
 					 <button class="download btn" style="height:50px;width:100%;border:none;">立即使用</button>
 				</script>
 			</wx-open-launch-weapp> -->
-			
+
 			<view class="width40" style="margin-right: 5%;" @click="useDiscount">
-				<view class="width100 btnno fotct font16 ">立即使用</view>
+				<view class="width100 btnno fotct font16 backcor008">立即使用</view>
 			</view>
-			
+
 			<view class="width40" style="margin-left: 5%;" @click="jumpCounlist">
-				<view class="width100 btnno fotct font16 ">立即查看</view>
+				<view class="width100 btnno fotct font16 backcor008">立即查看</view>
 			</view>
 		</view>
 
@@ -59,10 +59,14 @@
 			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
 		</view>
 		<view class="width90 mart30" v-if="couponsDetails.highDiscount.usingRange == 5">
-			 <image :src="imagewxUrl+imgadres1" mode="widthFix" class="width100" v-if="couponsDetails.highDiscountAgentCode.status ==1"></image>
-			 <image :src="imagewxUrl+imgadres2" mode="widthFix" class="width100" v-if="couponsDetails.highDiscountAgentCode.status != 1"></image>
+			<image :src="imagewxUrl+imgadres3" mode="widthFix" class="width100"
+				v-if="couponsDetails.highDiscountAgentCode.status ==1"></image>
+			<image :src="imagewxUrl+imgadres1" mode="widthFix" class="width100"
+				v-if="couponsDetails.highDiscountAgentCode.status != 1"></image>
+			<image :src="imagewxUrl+imgadres2" mode="widthFix" class="width100 mart10"
+				v-if="couponsDetails.highDiscountAgentCode.status != 1"></image>
 		</view>
-		<view class="product-list mart20 width90">
+		<view class="product-list mart20 width90" v-if="couponsDetails.highDiscount.usingRange != 5">
 			<view class="product" v-for="product in minecoupones" :key="product.id"
 				@tap="toGoods(product.highCoupon.id)">
 				<image mode="widthFix" :src="imageUrl+product.highCoupon.couponImg"></image>
@@ -94,11 +98,11 @@
 		<!-- <authorize></authorize> -->
 		<view :style="{display: usercouFeedbackHidden}" class="popup_content">
 			<view class="popup_title font18 fcor333 fontwig6 paddtop10">温馨提示</view>
-			<view class="popup_title font16 fcor666 paddtop20 height60">领取优惠券后请在有效期三十天内使用</view>
+			<view class="popup_title font16 fcor666 paddtop20 height60">请在有效期30天内使用。过期作废！</view>
 			<view class="width100 bor-botm1 mart10"></view>
 			<view class="alijus width90 mart20">
 				<view class="width40" style="margin-right: 5%;" @click="hideDiv()">
-					<view class="width100 btnno font16 ">取消</view>
+					<view class="width100 btnno font16 backcor99">取消</view>
 				</view>
 				<wx-open-launch-weapp style="width: 40%;margin-left: 5%;" id="launch-btn" username="gh_5fb54244cdbb">
 					<script type="text/wxtag-template">
@@ -116,7 +120,7 @@
 							 <button class="download" style="height:40px;line-height: 40PX;width:100%;border:none;">立即使用</button>
 						</script>
 				</wx-open-launch-weapp>
-		
+
 			</view>
 		</view>
 		<view class="popup_overlay" :style="{display: usercouFeedbackHidden}" @click="hideDiv()"></view>
@@ -148,6 +152,7 @@
 				imgadres: 'noorder.png',
 				imgadres1: 'noCoupon.jpg',
 				imgadres2: 'onCoupon.jpg',
+				imgadres3: 'showCoupon.jpg',
 				pageNum: 1,
 				pageSize: 10,
 				isNoMoreData: false,
@@ -398,9 +403,9 @@
 				}
 			},
 			//跳转列表
-			jumpCounlist(){
+			jumpCounlist() {
 				uni.reLaunch({
-					url:'/pages/user/coupon/coupon'
+					url: '/pages/user/coupon/coupon'
 				})
 			}
 		}
@@ -412,7 +417,7 @@
 	.coupon-mes {
 		// margin-right: 90px;
 	}
-	
+
 	.popup_content {
 		position: fixed;
 		top: 40%;
@@ -427,17 +432,17 @@
 		overflow: auto;
 		border-radius: 20upx;
 	}
-	
+
 	.popup_title {
 		display: flex;
 		justify-content: center;
 		text-align: center;
 		width: 480upx;
 	}
-	
+
 	// 弹窗
 	.popup_overlay {
-	
+
 		position: fixed;
 		top: 0%;
 		left: 0%;
@@ -517,6 +522,5 @@
 		display: flex;
 		justify-content: center;
 		color: #ffffff;
-		background: #999999;
 	}
 </style>
diff --git a/pages/user/coupon/coupon.vue b/pages/user/coupon/coupon.vue
index 18a653e..4239ef7 100644
--- a/pages/user/coupon/coupon.vue
+++ b/pages/user/coupon/coupon.vue
@@ -131,7 +131,7 @@
 		</view>
 		<view :style="{display: usercouFeedbackHidden}" class="popup_content">
 			<view class="popup_title font18 fcor333 fontwig6 paddtop10">温馨提示</view>
-			<view class="popup_title font16 fcor666 paddtop20 height60">领取优惠券后请在有效期三十天内使用</view>
+			<view class="popup_title font16 fcor666 paddtop20 height60">请在有效期30天内使用。过期作废！</view>
 			<view class="width100 bor-botm1 mart10"></view>
 			<view class="alijus width90 mart20">
 				<view class="width40" style="margin-right: 5%;" @click="hideDiv()">
@@ -332,6 +332,10 @@
 					uni.navigateTo({
 						url: '/member-Recharge/choicepage/choicepage'
 					})
+				}else if (e.highDiscount.useScope == 7) {
+					uni.navigateTo({
+						url: '/pages/goods/refuel/refuel'
+					})
 				} else if (e.highDiscount.usingRange == 5) {
 					this.useDiscount(e.discountAgentCodeId);
 				} else {
@@ -347,11 +351,10 @@
 				}
 				useDiscount(datas).then(res => {
 					if (res.return_code == '000000') {
-						this.onhiddle();
 						// #ifdef MP
 						uni.showModal({
 							title: '温馨提示',
-							content: '领取优惠券后请在有效期三十天内使用',
+							content: '请在有效期30天内使用。过期作废！',
 							success: function(res) {
 								if (res.confirm) {
 									uni.navigateToMiniProgram({
@@ -366,9 +369,9 @@
 								}
 							}
 						})
-					
 						// #endif
 						// #ifdef H5
+						this.onhiddle();
 						// #endif
 					} else {
 						uni.showToast({