2024.07.04

- 相关页面的店铺类型增加供应商和选品会员选项；

src/views/SettleIn/enterprisesApply.vue

@@ -33,6 +33,8 @@
                 <el-radio-group v-model="personalForm.shopType" @change="(mallArrDialog = businessArrDialog = []) && (personalForm.classificationId = '')">
                   <el-radio :label="1">商城</el-radio>
                   <el-radio :label="2">商圈</el-radio>
+                  <el-radio :label="3">供应商</el-radio>
+                  <el-radio :label="2">选品会员</el-radio>
                 </el-radio-group>
               </el-form-item>
 
@@ -47,7 +49,7 @@
 								</el-form-item>
 							</div>
 
-							<div v-if="personalForm.shopType === 2" key="businessArrDialog">
+							<div v-if="[2, 3, 4].includes(personalForm.shopType)" key="businessArrDialog">
 								<el-form-item label="商圈店铺分类" prop="classificationId">
 									<el-cascader
 										size="large" placeholder="请选择店铺所属分类"

src/views/SettleIn/individualBusiness.vue

@@ -33,6 +33,8 @@
                 <el-radio-group v-model="personalForm.shopType" @change="(mallArrDialog = businessArrDialog = []) && (personalForm.classificationId = '')">
                   <el-radio :label="1">商城</el-radio>
                   <el-radio :label="2">商圈</el-radio>
+                  <el-radio :label="3">供应商</el-radio>
+                  <el-radio :label="2">选品会员</el-radio>
                 </el-radio-group>
               </el-form-item>
 
@@ -47,7 +49,7 @@
 								</el-form-item>
 							</div>
 
-							<div v-if="personalForm.shopType === 2" key="businessArrDialog">
+							<div v-if="[2, 3, 4].includes(personalForm.shopType)" key="businessArrDialog">
 								<el-form-item label="商圈店铺分类" prop="classificationId">
 									<el-cascader
 										size="large" placeholder="请选择店铺所属分类"

src/views/SettleIn/organization.vue

@@ -31,6 +31,8 @@
                 <el-radio-group v-model="personalForm.shopType">
                   <el-radio :label="1">商城</el-radio>
                   <el-radio :label="2">商圈</el-radio>
+                  <el-radio :label="3">供应商</el-radio>
+                  <el-radio :label="2">选品会员</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="是否开放使用代金卷" prop="isVoucher">

src/views/SettleIn/personal.vue

@@ -33,6 +33,8 @@
                 <el-radio-group v-model="personalForm.shopType">
                   <el-radio :label="1">商城</el-radio>
                   <el-radio :label="2">商圈</el-radio>
+                  <el-radio :label="3">供应商</el-radio>
+                  <el-radio :label="2">选品会员</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="是否开放使用代金卷" prop="isVoucher">

src/views/moblie/mEnterprise.vue

@@ -50,6 +50,8 @@
                 <van-radio-group v-model="personalForm.shopType" direction="horizontal" @change="handleShopTypeChange">
                   <van-radio name="1">商城</van-radio>
                   <van-radio name="2">商圈</van-radio>
+                  <van-radio name="3">供应商</van-radio>
+                  <van-radio name="4">选品会员</van-radio>
                 </van-radio-group>
               </div>
             </div>
@@ -68,7 +70,7 @@
 								</van-popup>
 							</div>
             </div>
-            <div v-show="personalForm.shopType === '2'">
+            <div v-show="['2', '3', '4'].includes(personalForm.shopType)">
               <div class="inputItem">
                 <div class="labelTit"><label><i>*</i>营业开始时间</label></div>
                 <input @focus="noBomBox" type="text" v-model="personalForm.startTime" placeholder="请选择营业开始时间"
@@ -704,7 +706,7 @@ export default {
 					subData.classificationId = subData.classificationIdMall
 				}
       }
-      if (subData.shopType === '2') {
+      if (['2', '3', '4'].includes(subData.shopType)) {
         if (!subData.startTime) {
           Toast.fail('请选择营业开始时间')
           return
@@ -945,7 +947,7 @@ export default {
 				}, res => {
 					this.shopCategoryMallOptions = res.data
 				})
-			} else if (name === '2') {
+			} else if (['2', '3', '4'].includes(name)) {
 				this.sendReq({
 					url: api.getCategoryList,
 					method: 'GET',
@@ -982,7 +984,7 @@ export default {
 					this.showMall = false
 					this.isQueryShopCategory = false
 				})
-			} else if (this.personalForm.shopType === '2') {
+			} else if (['2', '3', '4'].includes(this.personalForm.shopType)) {
 				this.isQueryShopCategory = true
 				this.sendReq({
 					url: api.getChildCategoryList,

src/views/moblie/mOtherOrg.vue

@@ -36,6 +36,8 @@
                 <van-radio-group v-model="personalForm.shopType" direction="horizontal">
                   <van-radio name="1">商城</van-radio>
                   <van-radio name="2">商圈</van-radio>
+                  <van-radio name="3">供应商</van-radio>
+                  <van-radio name="4">选品会员</van-radio>
                 </van-radio-group>
               </div>
             </div>

src/views/moblie/mPersonal.vue

@@ -35,6 +35,8 @@
                 <van-radio-group v-model="personalForm.shopType" direction="horizontal">
                   <van-radio name="1">商城</van-radio>
                   <van-radio name="2">商圈</van-radio>
+                  <van-radio name="3">供应商</van-radio>
+                  <van-radio name="4">选品会员</van-radio>
                 </van-radio-group>
               </div>
             </div>

src/views/moblie/mUinitBusiness.vue

@@ -57,6 +57,8 @@
                 <van-radio-group v-model="personalForm.shopType" direction="horizontal" @change="handleShopTypeChange">
                   <van-radio name="1">商城</van-radio>
                   <van-radio name="2">商圈</van-radio>
+                  <van-radio name="3">供应商</van-radio>
+                  <van-radio name="4">选品会员</van-radio>
                 </van-radio-group>
               </div>
             </div>
@@ -75,7 +77,7 @@
 								</van-popup>
 							</div>
             </div>
-            <div v-show="personalForm.shopType === '2'">
+            <div v-show="['2', '3', '4'].includes(personalForm.shopType)">
               <div class="inputItem">
                 <div class="labelTit"><label><i>*</i>营业开始时间</label></div>
                 <input @focus="noBomBox" type="text" v-model="personalForm.startTime" placeholder="请选择营业开始时间"
@@ -760,7 +762,7 @@ export default {
 					subData.classificationId = subData.classificationIdMall
 				}
       }
-      if (subData.shopType === '2') {
+      if (['2', '3', '4'].includes(subData.shopType)) {
         if (!subData.startTime) {
           Toast.fail('请选择营业开始时间')
           return
@@ -1001,7 +1003,7 @@ export default {
 				}, res => {
 					this.shopCategoryMallOptions = res.data
 				})
-			} else if (name === '2') {
+			} else if (['2', '3', '4'].includes(name)) {
 				this.sendReq({
 					url: api.getCategoryList,
 					method: 'GET',
@@ -1038,7 +1040,7 @@ export default {
 					this.showMall = false
 					this.isQueryShopCategory = false
 				})
-			} else if (this.personalForm.shopType === '2') {
+			} else if (['2', '3', '4'].includes(this.personalForm.shopType)) {
 				this.isQueryShopCategory = true
 				this.sendReq({
 					url: api.getChildCategoryList,