优化套餐组件的分页加载

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 === '') {
+				if (form.value.tieredDiscount.length && form.value.expireHours === '') {
-					return false;
+					return callback(new Error('请输入分享期限'));
+				} else if (form.value.expireHours > 72) {
+					return callback(new Error('最大不超过72小时'));
 				} else {
 					return true;
 				}

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: ''
 });