From 396e00db7d00ca7cce8ca7949abd8d3cc5acd03f Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 22 Dec 2025 09:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A5=97=E9=A4=90=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=88=86=E9=A1=B5=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageMarket/packagePopularize/addGoods.vue             | 10 +++++-----
 pageMarket/packagePopularize/components/goodsList.vue |  9 ++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pageMarket/packagePopularize/addGoods.vue b/pageMarket/packagePopularize/addGoods.vue
index cd9d21e..e9255cc 100644
--- a/pageMarket/packagePopularize/addGoods.vue
+++ b/pageMarket/packagePopularize/addGoods.vue
@@ -537,7 +537,7 @@ const rules = ref({
 			validator: (rule, value, callback) => {
 				if (form.value.packageContent.length == 0) {
 					uni.showToast({
-						title: `请添加套餐组`,
+						title: `请添加菜品组`,
 						icon: 'none'
 					});
 					return false;
@@ -633,12 +633,12 @@ const rules = ref({
 	],
 	expireHours: [
 		{
-			required: true,
 			trigger: ['blur'],
-			message: '请输入',
 			validator: (rule, value, callback) => {
-				if (form.value.expireHours === '') {
-					return false;
+				if (form.value.tieredDiscount.length && form.value.expireHours === '') {
+					return callback(new Error('请输入分享期限'));
+				} else if (form.value.expireHours > 72) {
+					return callback(new Error('最大不超过72小时'));
 				} else {
 					return true;
 				}
diff --git a/pageMarket/packagePopularize/components/goodsList.vue b/pageMarket/packagePopularize/components/goodsList.vue
index e8da594..108dba2 100644
--- a/pageMarket/packagePopularize/components/goodsList.vue
+++ b/pageMarket/packagePopularize/components/goodsList.vue
@@ -7,9 +7,12 @@
 					suffixIcon="search"
 					shape="circle"
 					clearable
-					v-model="queryForm.wareName"
+					v-model="queryForm.packageName"
 					@confirm="resetGetList()"
-					@clear="resetGetList()"
+					@clear="
+						queryForm.packageName = '';
+						resetGetList();
+					"
 				></u-input>
 			</view>
 			<div class="ipt" @click="showStatusSheet = true">
@@ -81,7 +84,7 @@ const props = defineProps({
 
 const showStatusSheet = ref(false);
 const queryForm = reactive({
-	wareName: '',
+	packageName: '',
 	onlineStatusLabel: '',
 	onlineStatus: ''
 });