添加团餐商品页面增加售价的校验逻辑；

pages/groupMeal/goods/form-step1.vue

@@ -14,7 +14,7 @@
 				</u-form-item>
 				
 				<u-form-item prop="name" label="商品名称" required borderBottom>
-					<u-input v-model="form.name" placeholder="输入商品名称" height="41" inputAlign="right"></u-input>
+					<u-input v-model="form.name" placeholder="请输入商品名称" height="41" inputAlign="right"></u-input>
 				</u-form-item>
 
 				<u-form-item prop="productImage" label="商品封面图" required labelPosition="top">
@@ -52,8 +52,8 @@
 					<text slot="right" class="input-suffix">元</text>
 				</u-form-item>
 				
-				<u-form-item prop="sellingPrice" label="售价" required :borderBottom="false">
-					<u-input v-model.number="form.sellingPrice" type="digit" height="41" :clearable="false" placeholder="商品售价" inputAlign="right"></u-input>
+				<u-form-item prop="sellingPrice" label="售价" required :borderBottom="true">
+					<u-input v-model.number="form.sellingPrice" type="digit" height="41" :clearable="false" placeholder="请输入商品售价" inputAlign="right"></u-input>
 					<text slot="right" class="input-suffix">元</text>
 				</u-form-item>
 			</u-form>
@@ -125,7 +125,17 @@ export default {
 						type: 'number',
 						message: '请输入团餐价格',
 						trigger: ['blur', 'change']
-					}
+					},
+					{
+						asyncValidator: (rule, value, callback) => {
+							if (this.form.sellingPrice && value > this.form.sellingPrice) {
+								callback(new Error('团餐价格不能大于商品售价'));
+							} else {
+								callback();
+							}
+						},
+						trigger: ['blur', 'change']
+					},
 				],
 				sellingPrice: [
 					{
@@ -133,7 +143,17 @@ export default {
 						type: 'number',
 						message: '请输入商品售价',
 						trigger: ['blur', 'change']
-					}
+					},
+					{
+						asyncValidator: (rule, value, callback) => {
+							if (this.form.price && value < this.form.price) {
+								callback(new Error('商品售价不能小于团餐价格'));
+							} else {
+								callback();
+							}
+						},
+						trigger: ['blur', 'change']
+					},
 				],
 				productImage: [
 					{

pages/groupMeal/goods/list.vue

@@ -19,6 +19,7 @@
 					padding: '0 20rpx',
 					borderLeft: '1rpx solid #DDDDDD'
 				}"
+				v-model="queryName"
 				@search="onSearch" @custom="onSearch"
 			></u-search>
 		</view>
@@ -91,7 +92,7 @@
 			</scroll-view>
 		</view>
 
-		<!-- <ListScrollView ref="listScroll0" 
+		<!-- <ListScrollView ref="listScroll" 
 			:api="api"
 			:init="{
 				...initParams,
@@ -141,6 +142,8 @@ export default {
 				url: '/groupmeal/gmMerchantPackage/pageList',
 				method: 'POST',
 			},
+			// 搜索值
+			queryName: '',
 			// 是否处于批量管理模式
 			isManaging: false, 
 			// 一级分类
@@ -196,10 +199,12 @@ export default {
 				status: 0,
 				// 审核状态: 0 审核中, 1 已审核
 				// reviewStatus: 0,
+				queryName: this.queryName,
 			}
 			// 售卖中
 			if (this.currentStatusTab == 0) {
 				params = {
+					...params,
 					status: 1,
 					reviewStatus: 1,
 				}
@@ -207,6 +212,7 @@ export default {
 			// 审核中 
 			else if (this.currentStatusTab == 1) {
 				params = {
+					...params,
 					status: 0,
 					reviewStatus: 0,
 				}
@@ -214,6 +220,7 @@ export default {
 			// 未上架
 			else if (this.currentStatusTab == 2) {
 				params = {
+					...params,
 					status: 0,
 					reviewStatus: 1,
 				}
@@ -266,9 +273,7 @@ export default {
 			}
 		},
 		onSearch(value) {
-			this.$refs[`listScroll`].reloadList({
-				queryName: value,
-			});
+			this.getData();
 		},
 		// 主分类事件
 		onTabChange(e) {

pages/groupMeal/orders/refund.vue

@@ -182,7 +182,6 @@ export default {
 					...this.query,
 					...this.rejectData
 				}
-				console.log(params)
 				this.$http.post('/groupmeal/merchantPackageOrder/refundRefuse', params).then(res => {
 					if (res.data.code == 200) {
 						uni.showToast({