From ab711b1bae4cd61607949a352f0a2cb624c1274f Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 10 十月 2024 16:26:03 +0800
Subject: [PATCH] update

---
 sub_pages/customer/coupon/coupon-self.vue |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/sub_pages/customer/coupon/coupon-self.vue b/sub_pages/customer/coupon/coupon-self.vue
index 23a6e2b..d1a5f3f 100644
--- a/sub_pages/customer/coupon/coupon-self.vue
+++ b/sub_pages/customer/coupon/coupon-self.vue
@@ -9,7 +9,7 @@
 			<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
 
 			<view v-for="(item,index) of list" :key="index" class="coupont-item" :class="[query.status]"
-				@click="selectCoupon(item)">
+				@click.stop="selectCoupon(item)">
 				<view class="flex container img100">
 					<view class="info-price">
 						<view class="price1">
@@ -18,20 +18,29 @@
 						<view class="price2">{{item.minOrderAmount?(`满¥${item.minOrderAmount}可用`):'无门槛'}}</view>
 					</view>
 					<view class="info flex1">
-						<view class="title">
+						<view class="title flex">
 							{{item.couponName||'-'}}
-							<radio :checked="cache_coupon.id===item.id" v-if="source==='shopping'" class="select-coupon"></radio>
+						<!-- 	<radio  :checked="cache_coupon.id===item.id"
+							v-if="source==='shopping'"
+								class="select-coupon"></radio> -->
+							<view :style="{ 'margin-right': '20rpx'}" v-if="source==='shopping'"
+								  class="component-radio m-l-a" :class="[cache_coupon.id===item.id?'cur':'']">
+							
+							</view>
 
 						</view>
 						<view class="time">
-							{{item.effectiveStart&&(item.effectiveStart+' 生效,') || ''}}
+							<!-- {{item.effectiveStart&&(item.effectiveStart+' 生效,') || ''}} -->
 							{{item.effectiveEnd&&('有效期至 '+item.effectiveEnd) || '长久有效'}}
 						</view>
+					</view>
+					<view class="img-out">
+						
 					</view>
 				</view>
 				<view class="tip">
 					<span
-						class="t-red">*</span>{{item.couponDescription || '此券每人限领1张。仅限用于花满芜鲜花交易平台鲜切花花款满额使用,不可与其他优惠同享、不可叠加使用'}}
+						class="t-red">*</span>{{item.couponDescription || '此券每人限领1张。仅限用于花满芫鲜花交易平台鲜切花花款满额使用,不可与其他优惠同享、不可叠加使用'}}
 				</view>
 			</view>
 		</view>
@@ -71,13 +80,17 @@
 					status: 'unused'
 				},
 				list: [],
-				source: ''
+				source: '',
+				paymoney: -1
 
 			}
 		},
 		async onLoad(options) {
 			if (options.source) {
 				this.source = options.source || ''
+			}
+			if (options.paymoney) {
+				this.paymoney = parseFloat(options.paymoney).toFixed(2)
 			}
 			if (this.source === 'shopping') {
 				//只展示可用的
@@ -98,6 +111,39 @@
 		methods: {
 			async selectCoupon(item) {
 				if (this.source == 'shopping') {
+					if (this.cache_coupon.id === item.id) {
+						await this.$message.confirm('是否取消使用此优惠券')
+						await this.$store.dispatch('cache_coupon_select', {})
+						uni.navigateBack()
+						return
+					}
+					console.log('paymoney',this.paymoney)
+					if (this.paymoney >= 0) {
+						//判断是否可以选择使用
+						if (item.couponDiscountType === 'zero') {
+							// if (this.cache_coupon.couponDiscountValue > this.paymoney) {
+							// 	this.$message.showToast('订单价格小于优惠券优惠额度')
+							// 	return
+							// }
+						} else if (item.minOrderAmount && item.minOrderAmount > 0) {
+							// if (this.cache_coupon.minOrderAmount > this.paymoney) {
+							// 	this.$message.showToast('订单价格')
+							// 	return
+							// }
+							if (this.paymoney < item.minOrderAmount) {
+								this.$message.showToast('订单价格不满足使用条件')
+								this.$nextTick(()=>{
+									this.$forceUpdate()
+								})
+								return
+							}
+						} else {
+							// if (this.cache_coupon.couponDiscountValue > this.paymoney) {
+							// 	this.$message.showToast('订单价格小于优惠券优惠额度')
+							// 	return
+							// }
+						}
+					}
 					await this.$store.dispatch('cache_coupon_select', item)
 					uni.navigateBack()
 				}

--
Gitblit v1.9.3