From 784ac2ff9b0f9212fdf141a3d278f78d5b074040 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 9 Feb 2023 10:11:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8A=E7=BA=BF2.0=20=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E9=A2=86=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/externalCoupon/externalCoupon.vue | 60 ++++++++-----------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue
index 58c0678..545efda 100644
--- a/pages/goods/externalCoupon/externalCoupon.vue
+++ b/pages/goods/externalCoupon/externalCoupon.vue
@@ -16,27 +16,38 @@
 		<view class="line1 mart15"></view>
 		<button class="coupne-btn width60w mart20 marb20" v-if="userInfo == 1" lang="zh_CN"
 			@click="jumpres">点击领取</button>
-		<button class="coupne-btn width60w mart20 marb20" style="background-color: red;"
-			v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status == 1"
+		<button class="coupne-btn width60w mart20 marb20"
+			v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status == 1 && couponsDetails.highDiscount.usingRange != 8"
 			@click="receiveDiscount">点击领取</button>
-		<button class="coupne-btn width60w mart20 marb20" style="background-color: #f6f6f6;"
-			v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status != 1"
+		<button class="coupne-btn width60w mart20 marb20"
+			v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status == 1 && couponsDetails.highDiscount.usingRange == 8"
 			@click="receiveDiscount">点击领取</button>
-		<view class="width90 mart10 fcor666">去使用</view>
-		<view v-if="minecoupones == '' " class="mart60 fotct font14 fcor666">
+		<view class="alijus width90 mart20"
+			v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status != 1 && couponsDetails.highDiscount.usingRange == 8">
+
+			<view class="width40" style="margin-right: 5%;" @click="useDiscount">
+				<view class="width100 btnno fotct font16 backcor008">立即使用</view>
+			</view>
+
+			<view class="width40" style="margin-left: 5%;" @click="jumpCounlist">
+				<view class="width100 btnno fotct font16 backcor008">立即查看</view>
+			</view>
+		</view>
+
+		<view class="width90 mart10 fcor666" v-if="couponsDetails.highDiscount.usingRange != 8">去使用</view>
+		<view v-if="minecoupones == '' && couponsDetails.highDiscount.usingRange != 8"
+			class="mart60 fotct font14 fcor666">
 			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
 		</view>
 		<view class="width90 mart30" v-if="couponsDetails.highDiscount.usingRange == 8">
 			<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" v-if="couponsDetails.highDiscount.usingRange != 8">
 			<view class="product" v-for="product in minecoupones" :key="product.id"
-				@tap="toGoods(product.highCoupon.id,product.highCoupon.status)">
+				@tap="toGoods(product.highCoupon.id)">
 				<image mode="widthFix" :src="imageUrl+product.highCoupon.couponImg"></image>
 				<view class="name">{{ product.highCoupon.couponName }}</view>
 				<view class="info" v-if="product.highCoupon.payType == 1">
@@ -60,10 +71,6 @@
 			</view>
 		</view>
 		<view class="width100 height60"></view>
-		<!-- <button class="coupne-btn width100" v-if="userInfo == 1" open-type="getUserInfo" lang="zh_CN"
-			@getuserinfo="getuserinfo" withCredentials="true">点击领取</button>
-		<button class="coupne-btn width100" v-else @click="receiveDiscount">点击领取</button> -->
-		<!-- <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">请在有效期30天内使用。过期作废！</view>
@@ -357,29 +364,11 @@
 				});
 			},
 			//商品跳转
-			toGoods(e, item) {
+			toGoods(e) {
 				if (app.globalData.userInfo) {
-					if (app.globalData.openId) {
-						if (item != 2) {
-							uni.showToast({
-								icon: 'none',
-								title: '系统维护中，暂时无法购买',
-								duration: 2000
-							})
-						} else {
-							uni.navigateTo({
-								url: '../../order/confirmation?id=' + e+'&postPayType=2,'
-							})
-						}
-
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: '网络异常，请稍后重试',
-							duration: 2000
-						})
-					}
-
+					uni.navigateTo({
+						url: '../../order/confirmation?id=' + e
+					})
 				} else {
 					uni.showToast({
 						icon: 'none',
@@ -498,6 +487,7 @@
 	}
 
 	.coupne-btn {
+		background-color: red;
 		color: #FFFFFF;
 	}