Merge branch 'master' into master-pro

pages/groupMeal/goods/list.vue

@@ -80,16 +80,16 @@
 								</view>
 								<!-- 根据模式和状态显示不同操作 -->
 								<view class="goods-actions">
-									<u-button 
-										v-if="!isManaging && currentStatusTab === 2" 
-										type="primary" plain
-										@click="editGoods(goods)"
-									>编辑</u-button>
 									<u-checkbox v-if="isManaging" :name="goods.id" shape="circle" v-model="goods.checked" @change="onSelect"></u-checkbox>
 								</view>
 							</view>
 							<!-- 其它操作 -->
 							<view class="other-actions">
+								<u-button
+									v-if="!isManaging && currentStatusTab === 2" 
+									type="primary" plain
+									@click="editGoods(goods)"
+								>编辑</u-button>
 								<u-button 
 									v-if="!isManaging && currentStatusTab === 2 && goods.reviewStatus == 1" 
 									type="primary" plain

pages/groupMeal/orders/order-alist.vue

@@ -210,7 +210,7 @@ export default {
 			if(result && result.length > 0){
 				result.forEach(item => {
 					item.merchantPackageOrderDTOS.forEach(sub => {
-						arr.push(sub.merchantOrderId)
+						arr.push(sub.merchantOrderIds)
 					})
 				})
 				this.selectedOrders = arr;
@@ -224,7 +224,7 @@ export default {
 				let arr = []
 				allOrders.forEach(item => {
 					item.merchantPackageOrderDTOS.forEach(sub => {
-						arr.push(sub.merchantOrderId)
+						arr.push(sub.merchantOrderIds)
 					})
 				})
 				this.selectedOrders = arr;