From 24d9660bfd111464fa95199084ee72d33a1ee5fd Mon Sep 17 00:00:00 2001
From: fox <1466778434@qq.com>
Date: Mon, 28 Jul 2025 16:48:52 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=20bug=E4=BF=AE=E5=A4=8D;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/couponList/couponList.vue           | 22 ++++++++++++++++++++--
 components/couponPopup/couponPopup.vue         |  2 +-
 mixins/list.js                                 |  1 +
 pages/index/category.vue                       | 13 ++++++++-----
 pages_order/components/voucher/voucherCard.vue | 14 ++++++++++++--
 pages_order/order/createOrder.vue              |  2 +-
 pages_order/order/verifyOrder.vue              |  4 ++--
 7 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/components/couponList/couponList.vue b/components/couponList/couponList.vue
index 2b4307e..eb45a9d 100644
--- a/components/couponList/couponList.vue
+++ b/components/couponList/couponList.vue
@@ -27,6 +27,12 @@
 </template>
 
 <script>
+
+	import dayjs from 'dayjs'
+	import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
+
+	dayjs.extend(isSameOrBefore)
+
 	export default {
 		name: 'CouponList',
 		props: {
@@ -73,7 +79,11 @@
 
 				this.$emit('select', item)
 			},
-			
+			isValid(obj) {
+				const { validDate } = obj
+
+				return dayjs().isSameOrBefore(dayjs(validDate), 'day')
+			},
 			//获取优惠券列表
 			getCouponList() {
 				let params = {
@@ -91,7 +101,15 @@
 				
 				this.$api('queryVouchersList', params, res => {
 					if (res.code == 200) {
-						this.couponList = res.result.records
+						this.couponList = res.result.records.map(item => {
+							let status = item.status
+
+							if (!this.isValid(item)) {
+								status = 2
+							}
+
+							return { ...item, status }
+						})
 						this.total = res.result.total
 					}
 				})
diff --git a/components/couponPopup/couponPopup.vue b/components/couponPopup/couponPopup.vue
index b12869e..e36e840 100644
--- a/components/couponPopup/couponPopup.vue
+++ b/components/couponPopup/couponPopup.vue
@@ -7,7 +7,7 @@
 		>
 			<view class="couponPopup-wrapper">
 				<view class="main-container" @click="toCoupon">
-					<image style="width: 583rpx; height: 601rpx;" src="@/pages_order/static/home/coupon.png"></image>
+					<image style="width: 583rpx; height: 601rpx;" src="/pages_order/static/home/coupon.png"></image>
 				</view>
 			</view>
 		</uv-popup>
diff --git a/mixins/list.js b/mixins/list.js
index 726f9f1..baf6347 100644
--- a/mixins/list.js
+++ b/mixins/list.js
@@ -50,6 +50,7 @@ export default {
 			console.log(queryParams)
 			return new Promise((success, error) => {
 				if(!this.mixinsListApi){
+					uni.stopPullDownRefresh()
 					return console.error('mixinsListApi 缺失');
 				}
 				this.$api(this.mixinsListApi, 
diff --git a/pages/index/category.vue b/pages/index/category.vue
index ffa6f89..d330c22 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -106,9 +106,6 @@
 			mixinsListApi() {
 				return this.queryParams.title ? 'queryProductList' : ''
 			}
-		},
-		onShow() {
-
 		},
 		onLoad() {
 
@@ -118,10 +115,14 @@
 			if (search) {
 				this.queryParams.title = search
 				uni.setStorageSync('search', '')
+				this.getData()
+			} else {
+				this.initList()
 			}
 
-			this.initList()
-
+		},
+		onPullDownRefresh() {
+			!this.queryParams.title && this.initList()
 		},
 		methods: {
 			async fetchCategoryList() {
@@ -144,6 +145,8 @@
 				this.categoryList.forEach(async (category) => {
 					category.childrens = await this.queryProductList(category.id)
 				})
+
+				uni.stopPullDownRefresh()
 			},
 			change(e) {
 				this.current = e
diff --git a/pages_order/components/voucher/voucherCard.vue b/pages_order/components/voucher/voucherCard.vue
index 8c52db2..53860a9 100644
--- a/pages_order/components/voucher/voucherCard.vue
+++ b/pages_order/components/voucher/voucherCard.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="voucher">
-    <image class="voucher-bg" src="@/pages_order/static/voucher/voucher-bg.png" ></image>
+    <image class="voucher-bg" src="/pages_order/static/voucher/voucher-bg.png" ></image>
 
     <view class="voucher-info">
       <view class="voucher-row voucher-title">{{ data.vouchersId_dictText }}</view>
@@ -10,7 +10,7 @@
     </view>
 
     <!-- status: 0-未使用 1-已使用 -->
-    <template v-if="!readonly && data.status == 0">
+    <template v-if="!readonly && data.status == 0 && isValid">
       <button plain class="btn" @click="onClick">立即使用</button>
     </template>
   </view>
@@ -18,6 +18,11 @@
 
 <script>
 
+	import dayjs from 'dayjs'
+	import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
+
+	dayjs.extend(isSameOrBefore)
+
 export default {
   props: {
     data: {
@@ -40,6 +45,11 @@ export default {
 
       return `${startTime}-${endTime}`
     },
+    isValid() {
+      const { validDate } = this.data || {}
+
+      return dayjs().isSameOrBefore(dayjs(validDate), 'day')
+    },
   },
   methods: {
     onClick() {
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
index 5c8d09f..faba565 100644
--- a/pages_order/order/createOrder.vue
+++ b/pages_order/order/createOrder.vue
@@ -30,7 +30,7 @@
 			
 			<!-- 优惠券 -->
 			<view @click="openCoupon" class="card flex coupon">
-				<image class="icon" src="@/pages_order/static/createOrder/icon-coupon.png" mode="widthFix"></image>
+				<image class="icon" src="/pages_order/static/createOrder/icon-coupon.png" mode="widthFix"></image>
 				<!-- todo: check is selected coupon -->
 				<view class="label">优惠券<text v-if="selectedCoupon[0]" class="desc">{{ `（满减券:${coupon.discountAmount}）` }}</text></view>
 				<view v-if="selectedCoupon[0]">
diff --git a/pages_order/order/verifyOrder.vue b/pages_order/order/verifyOrder.vue
index 3e6d85d..8037768 100644
--- a/pages_order/order/verifyOrder.vue
+++ b/pages_order/order/verifyOrder.vue
@@ -4,7 +4,7 @@
 		<navbar title="核销详情" leftClick @leftClick="$utils.navigateBack" color="#fff" />
 
 		<view class="flex page-header">
-			<image class="icon" src="@/pages_order/static/verifyOrder/icon-clock.png" mode="widthFix"></image>
+			<image class="icon" src="/pages_order/static/verifyOrder/icon-clock.png" mode="widthFix"></image>
 			<text>待核销</text>
 		</view>
 
@@ -14,7 +14,7 @@
 
 			<view class="card rights" v-if="orderDetail.rights && orderDetail.rights.length">
 				<view class="flex rights-item" v-for="item in orderDetail.rights" :key="item">
-					<image class="rights-icon" src="@/pages_order/static/verifyOrder/icon-checked.png" mode="widthFix">
+					<image class="rights-icon" src="/pages_order/static/verifyOrder/icon-checked.png" mode="widthFix">
 					</image>
 					<text>{{ item }}</text>
 				</view>