Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz

pageProduct/add-Product/add-Product.vue

@@ -541,7 +541,7 @@
 										</view>
 									</uni-forms-item>
 								</view> -->
-								<view class="border-top-0">
+							<!-- 	<view class="border-top-0">
 									<view class="u-flex u-row-between u-p-b-24 u-p-t-20">
 										<view class="label-title">是否允许临时改价</view>
 										<my-switch v-model="FormData.isTempPrice"></my-switch>
@@ -573,7 +573,7 @@
 										<price-number-box placeholder="请输入每人限购"
 											v-model="FormData.singlePeopleLimit"></price-number-box>
 									</view>
-								</view>
+								</view> -->
 								<view>
 									<uni-forms-item label="">
 										<view class="u-flex u-row-between" @tap="toTimerPage">
@@ -1701,6 +1701,7 @@
 					let ispase = FormData.proGroupVo.length > 0 ? true : false
 					let tips = ispase ? '' : '请添加至少一种套餐'
 					for (let i in FormData.proGroupVo) {
+						FormData.proGroupVo[i].count = FormData.proGroupVo[i].goods.length
 						const item = FormData.proGroupVo[i]
 						if (item.goods.length <= 0) {
 							ispase = false