2024.05.07

- 完善对商城和商圈的店铺类型的判断显示逻辑；

src/api/index.js

@@ -36,6 +36,8 @@ export const api = {
   subsidiaryCompanyCheck: `${BASEURL}/check/agentCheck`,
   getCategoryList: `${BASEURL}/shopCategory/getShopCategoryLevel`,
   getChildCategoryList: `${BASEURL}/shopCategory/getShopCategorySon`,
+  getFactoryClassApi: `${BASEURL}/shopCategoryMall/getShopCategoryLevel`,
+  getFactoryNextClassApi: `${BASEURL}/shopCategoryMall/getShopCategorySon`,
   cardRecognition: `${CARDURL}/third/ocr/idOcr`, // 身份证识别
   businessRecognition: `${CARDURL}/third/ocr/baiduBusinessLicense` // 营业执照识别
 }

src/views/SettleIn/enterprisesApply.vue

@@ -29,12 +29,35 @@
               <el-form-item label="负责人电话" prop="chargePersonPhone">
                 <el-input  maxlength="100" placeholder="请输入负责人电话" v-model="personalForm.chargePersonPhone"></el-input>
               </el-form-item>
-              <el-form-item label="店铺类型" prop="isVoucher">
-                <el-radio-group v-model="personalForm.shopType">
+              <el-form-item label="店铺类型" prop="shopType">
+                <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-group>
               </el-form-item>
+
+							<div v-if="personalForm.shopType === 1" key="mallArrDialog">
+								<el-form-item label="商城店铺分类" prop="classificationId">
+									<el-cascader
+										size="large" placeholder="请选择店铺所属分类"
+										v-model="mallArrDialog"
+										:props="mallCascaderProps"
+										@change="personalForm.classificationId = mallArrDialog[mallArrDialog.length - 1]">
+									</el-cascader>
+								</el-form-item>
+							</div>
+
+							<div v-if="personalForm.shopType === 2" key="businessArrDialog">
+								<el-form-item label="商圈店铺分类" prop="classificationId">
+									<el-cascader
+										size="large" placeholder="请选择店铺所属分类"
+										v-model="businessArrDialog"
+										:props="businessCascaderProps"
+										@change="personalForm.classificationId = businessArrDialog[businessArrDialog.length - 1]">
+									</el-cascader>
+								</el-form-item>
+							</div>
+
               <el-form-item label="是否开放使用代金卷" prop="isVoucher">
                 <el-radio-group v-model="personalForm.isVoucher">
                   <el-radio :label="1">支持</el-radio>
@@ -63,12 +86,6 @@
                       :props="{ checkStrictly: true,emitPath: false, label:'name',value: 'id', lazy: true, lazyLoad: lazyLoadAddres }"
                       @change="addressChange">
                 </el-cascader>
-                <!-- <el-cascader
-                  size="large"
-                  :options="options"
-                  v-model="selectedOptions"
-                  @change="addressChange">
-                </el-cascader> -->
               </el-form-item>
               <el-form-item label="" prop="storeAddressDetail">
                 <el-input maxlength="200" resize="none" placeholder="请输入详细地址" type="textarea" :rows="3" v-model="personalForm.storeAddressDetail"></el-input>
@@ -267,6 +284,7 @@ export default {
       options: regionData,
       selectedOptions: [],
       registeredAddress: [],
+      setMealData: [],
       personalForm: {
         shopName: '', // 店铺名称
         shopPhone: '', // 手机号
@@ -292,12 +310,99 @@ export default {
         enterpriseCardPositive: '', // 身份证正面照
         enterpriseCardSide: '', // 身份证反面照
         shopType: 1, // 店铺类型 1商城 2本地
+        classificationId: '',
         isVoucher: 1, // 是否支持使用代金卷
         voucherReturn: '', // 代金卷的抵扣比例/返还比例
         areaId: '', // 区域ID
         packageId: '',
         parentId: ''
       },
+			mallArrDialog: [],
+			mallCascaderProps: {
+				lazy: true,
+				lazyLoad: (node, resolve) => {
+					const { level } = node
+					if (level === 0) {
+						this.sendReq({
+							url: api.getFactoryClassApi,
+							method: 'GET',
+							params: {
+								levelId: 1
+							}
+						}, res => {
+							resolve(res.data.map((item) => ({
+								id: item.id,
+								value: item.id,
+								label: item.storeName,
+								leaf: false
+							})))
+						})
+					} else {
+						this.sendReq({
+							url: api.getFactoryNextClassApi,
+							method: "GET",
+							params: {
+								pid: level === 0 ? 0 : node.data.id
+							}
+						}, res => {
+							resolve(res.data.map((item) => ({
+								id: item.id,
+								value: item.id,
+								label: item.storeName,
+								leaf: level >= 2
+							})))
+						}, err => {
+							this.$message({
+								message: err,
+								type: 'error'
+							})
+						})
+					}
+				}
+			},
+			businessArrDialog: [],
+			businessCascaderProps: {
+				lazy: true,
+				lazyLoad: (node, resolve) => {
+					const { level } = node
+					if (level === 0) {
+						this.sendReq({
+							url: api.getCategoryList,
+							method: 'GET',
+							params: {
+								levelId: 1
+							}
+						}, res => {
+							resolve(res.data.map((item) => ({
+								id: item.id,
+								value: item.id,
+								label: item.storeName,
+								leaf: false
+							})))
+						})
+					} else {
+						this.sendReq({
+							url: api.getChildCategoryList,
+							method: "GET",
+							params: {
+								pid: level === 0 ? 0 : node.data.id
+							}
+						}, res => {
+							resolve(res.data.map((item) => ({
+								id: item.id,
+								value: item.id,
+								label: item.storeName,
+								leaf: level >= 2
+							})))
+						}, err => {
+							this.$message({
+								message: err,
+								type: 'error'
+							})
+						})
+					}
+				}
+			},
       queryData: {
         page: 1,
         size: 20 // 策划师的角色在某个省可能会很多，但是一块区域肯定不会太多，放心大胆的写死为20！！！，不建议模仿 略略略 ψ(｀∇´)ψ
@@ -393,7 +498,6 @@ export default {
         method: 'GET',
         params: {}
       }, (res) => {
-        // console.log(res) // 获取地址选择器数据并去除空的子项
         this.options = res.data
       })
     this.sendReq({
@@ -403,9 +507,7 @@ export default {
         type: 1
       }
     }, (res) => {
-      // console.log(res) // 获取地址选择器数据并去除空的子项
       this.setMealData = res.data
-      // console.log(this.options)
     })
   },
   mounted () {
@@ -513,17 +615,19 @@ export default {
       this.$refs[formName].resetFields()
     },
     lazyLoadAddres (node, resolve) {
-        // console.log(node)
-         this.sendReq({
-          url: api.getTreeOne,
-          method: 'GET',
-          params: {
-            parentId: node.data.id
-          }
-          }, (res) => {
-             resolve(res.data)
-        })
-      }
+			const { level } = node
+			if (!(level === 0)) {
+				this.sendReq({
+					url: api.getTreeOne,
+					method: 'GET',
+					params: {
+						parentId: node.data.id
+					}
+					}, (res) => {
+						resolve(res.data)
+				})
+			}
+    }
   }
 }
 </script>

src/views/SettleIn/individualBusiness.vue

@@ -29,12 +29,35 @@
               <el-form-item label="负责人电话" prop="chargePersonPhone">
                 <el-input  maxlength="100" placeholder="请输入负责人电话" v-model="personalForm.chargePersonPhone"></el-input>
               </el-form-item>
-              <el-form-item label="店铺类型" prop="isVoucher">
-                <el-radio-group v-model="personalForm.shopType">
+              <el-form-item label="店铺类型" prop="shopType">
+                <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-group>
               </el-form-item>
+
+							<div v-if="personalForm.shopType === 1" key="mallArrDialog">
+								<el-form-item label="商城店铺分类" prop="classificationId">
+									<el-cascader
+										size="large" placeholder="请选择店铺所属分类"
+										v-model="mallArrDialog"
+										:props="mallCascaderProps"
+										@change="personalForm.classificationId = mallArrDialog[mallArrDialog.length - 1]">
+									</el-cascader>
+								</el-form-item>
+							</div>
+
+							<div v-if="personalForm.shopType === 2" key="businessArrDialog">
+								<el-form-item label="商圈店铺分类" prop="classificationId">
+									<el-cascader
+										size="large" placeholder="请选择店铺所属分类"
+										v-model="businessArrDialog"
+										:props="businessCascaderProps"
+										@change="personalForm.classificationId = businessArrDialog[businessArrDialog.length - 1]">
+									</el-cascader>
+								</el-form-item>
+							</div>
+
               <el-form-item label="是否开放使用代金卷" prop="isVoucher">
                 <el-radio-group v-model="personalForm.isVoucher">
                   <el-radio :label="1">支持</el-radio>
@@ -63,12 +86,6 @@
                       :props="{ checkStrictly: true,emitPath: false, label:'name',value: 'id', lazy: true, lazyLoad: lazyLoadAddres }"
                       @change="addressChange">
                 </el-cascader>
-                <!-- <el-cascader
-                  size="large"
-                  :options="options"
-                  v-model="selectedOptions"
-                  @change="addressChange">
-                </el-cascader> -->
               </el-form-item>
               <el-form-item label="" prop="storeAddressDetail">
                 <el-input maxlength="200" resize="none" placeholder="请输入详细地址" type="textarea" :rows="3" v-model="personalForm.storeAddressDetail"></el-input>
@@ -264,9 +281,8 @@ export default {
   components: {CentLogo},
   data () {
     return {
-      options: null,
+      options: [],
       options2: regionData,
-      selectedOptions: [],
       registeredAddress: [],
       setMealData: [],
       personalForm: {
@@ -294,12 +310,99 @@ export default {
         subjectCardPositive: '', // 身份证正面照
         subjectCardSide: '', // 身份证反面照
         shopType: 1, // 店铺类型 1商城 2本地
+        classificationId: '',
         isVoucher: 1, // 是否支持使用代金卷
         voucherReturn: '', // 代金卷的抵扣比例/返还比例
         areaId: '', // 区域ID
         packageId: '',
         parentId: ''
       },
+			mallArrDialog: [],
+			mallCascaderProps: {
+				lazy: true,
+				lazyLoad: (node, resolve) => {
+					const { level } = node
+					if (level === 0) {
+						this.sendReq({
+							url: api.getFactoryClassApi,
+							method: 'GET',
+							params: {
+								levelId: 1
+							}
+						}, res => {
+							resolve(res.data.map((item) => ({
+								id: item.id,
+								value: item.id,
+								label: item.storeName,
+								leaf: false
+							})))
+						})
+					} else {
+						this.sendReq({
+							url: api.getFactoryNextClassApi,
+							method: "GET",
+							params: {
+								pid: level === 0 ? 0 : node.data.id
+							}
+						}, res => {
+							resolve(res.data.map((item) => ({
+								id: item.id,
+								value: item.id,
+								label: item.storeName,
+								leaf: level >= 2
+							})))
+						}, err => {
+							this.$message({
+								message: err,
+								type: 'error'
+							})
+						})
+					}
+				}
+			},
+			businessArrDialog: [],
+			businessCascaderProps: {
+				lazy: true,
+				lazyLoad: (node, resolve) => {
+					const { level } = node
+					if (level === 0) {
+						this.sendReq({
+							url: api.getCategoryList,
+							method: 'GET',
+							params: {
+								levelId: 1
+							}
+						}, res => {
+							resolve(res.data.map((item) => ({
+								id: item.id,
+								value: item.id,
+								label: item.storeName,
+								leaf: false
+							})))
+						})
+					} else {
+						this.sendReq({
+							url: api.getChildCategoryList,
+							method: "GET",
+							params: {
+								pid: level === 0 ? 0 : node.data.id
+							}
+						}, res => {
+							resolve(res.data.map((item) => ({
+								id: item.id,
+								value: item.id,
+								label: item.storeName,
+								leaf: level >= 2
+							})))
+						}, err => {
+							this.$message({
+								message: err,
+								type: 'error'
+							})
+						})
+					}
+				}
+			},
       queryData: {
         page: 1,
         size: 20 // 策划师的角色在某个省可能会很多，但是一块区域肯定不会太多，放心大胆的写死为20！！！，不建议模仿 略略略 ψ(｀∇´)ψ
@@ -394,7 +497,6 @@ export default {
         method: 'GET',
         params: {}
       }, (res) => {
-        // console.log(res) // 获取地址选择器数据并去除空的子项
         this.options = res.data
       })
     this.sendReq({
@@ -404,9 +506,7 @@ export default {
         type: 1
       }
     }, (res) => {
-      // console.log(res) // 获取地址选择器数据并去除空的子项
       this.setMealData = res.data
-      // console.log(this.options)
     })
   },
   mounted () {
@@ -521,17 +621,19 @@ export default {
       this.$refs[formName].resetFields()
     },
     lazyLoadAddres (node, resolve) {
-        // console.log(node)
-         this.sendReq({
-          url: api.getTreeOne,
-          method: 'GET',
-          params: {
-            parentId: node.data.id
-          }
-          }, (res) => {
-             resolve(res.data)
-        })
-      }
+			const { level } = node
+			if (!(level === 0)) {
+				this.sendReq({
+					url: api.getTreeOne,
+					method: 'GET',
+					params: {
+						parentId: node.data.id
+					}
+					}, (res) => {
+						resolve(res.data)
+				})
+			}
+    }
   }
 }
 </script>

src/views/moblie/mEnterprise.vue

@@ -47,37 +47,52 @@
               <div class="labelTit"><label><i>*</i>店铺类型</label></div>
               <!-- <input type="text" v-model="plannerForm.email" placeholder="请选择性别"> -->
               <div class="input">
-                <van-radio-group v-model="personalForm.shopType" direction="horizontal">
+                <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-group>
               </div>
             </div>
-            <div class="time-select-container" v-show="personalForm.shopType === '2'">
+
+            <div v-show="personalForm.shopType === '1'">
+							<div class="inputItem">
+								<div class="labelTit"><label><i>*</i>商城店铺分类</label></div>
+								<input @focus="noBomBox" type="text" placeholder="请选择店铺所属分类" v-model="shopCategoryMallStr"
+									@click="showMall = true">
+								<van-popup v-model="showMall" round position="bottom">
+									<div v-show="isQueryShopCategory" class="loading-container"><van-loading color="#ee0a24" type="spinner" /></div>
+									<van-cascader v-model="personalForm.classificationIdMall" title="请选择店铺所属分类"
+										:field-names="{ text: 'storeName', value: 'id', children: 'items' }"
+										:options="shopCategoryMallOptions" @close="showMall = false"
+										@change="onShopCategoryChange" />
+								</van-popup>
+							</div>
+            </div>
+            <div v-show="personalForm.shopType === '2'">
               <div class="inputItem">
                 <div class="labelTit"><label><i>*</i>营业开始时间</label></div>
                 <input @focus="noBomBox" type="text" v-model="personalForm.startTime" placeholder="请选择营业开始时间"
                   @click="startTimeShow = true">
               </div>
-
               <div class="inputItem">
                 <div class="labelTit"><label><i>*</i>营业结束时间</label></div>
                 <input @focus="noBomBox" type="text" v-model="personalForm.endtime" placeholder="请选择营业开始时间"
                   @click="endTimeShow = true">
               </div>
+							<div class="inputItem">
+								<div class="labelTit"><label><i>*</i>商圈店铺分类</label></div>
+								<input @focus="noBomBox" type="text" placeholder="请选择店铺所属分类" v-model="shopCategoryBusinessStr"
+									@click="showBusiness = true">
+								<van-popup v-model="showBusiness" round position="bottom">
+									<div v-show="isQueryShopCategory" class="loading-container"><van-loading color="#ee0a24" type="spinner" /></div>
+									<van-cascader v-model="personalForm.classificationIdBusiness" title="请选择店铺所属分类"
+										:field-names="{ text: 'storeName', value: 'id', children: 'items' }"
+										:options="shopCategoryBusinessOptions" @close="showBusiness = false"
+										@change="onShopCategoryChange" />
+								</van-popup>
+							</div>
             </div>
-            <div class="inputItem">
-              <div class="labelTit"><label><i>*</i>店铺分类</label></div>
-              <input type="text" @focus="noBomBox" placeholder="请选择店铺所属分类" v-model="selectShopCategoryStr"
-                @click="show2 = true">
-              <van-popup v-model="show2" round position="bottom">
-                <div v-show="isQueryShopCategory" class="loading-container"><van-loading color="#ee0a24" type="spinner" />
-                </div>
-                <van-cascader v-model="personalForm.classificationId" title="请选择店铺所属分类" :field-names="categoryFieldName"
-                  :options="shopCategoryOptions" @close="show2 = false"
-                  @change="onShopCategoryChange($event, onFinishChooseShopCategory)" />
-              </van-popup>
-            </div>
+
             <div class="inputItem arrow" style="margin-top: 20px;">
               <div class="labelTit"><label><i>*</i>请选择地址</label></div>
               <div class="input" style="background-color: #a4a4a41f;  overflow: hidden; white-space: nowrap; "
@@ -351,6 +366,8 @@ export default {
       areaList: AreaList,
       areaRegionList: AreaList,
       show: false,
+      showMall: false,
+      showBusiness: false,
       regionShow: false,
       minDate: new Date(1960, 1, 1),
       maxDate: new Date(2077, 12, 31),
@@ -406,6 +423,8 @@ export default {
         packageId: '',
         startTime: "", // 营业开始时间
         endTime: '', // 营业结束时间
+        classificationIdMall: '',
+        classificationIdBusiness: '',
         perCapita: '', // 人均
         advertisement: [], // 广告图
         invitationCode: localStorage.getItem('INVITATION_CODE'), // 邀请码
@@ -413,25 +432,23 @@ export default {
         latitude: ''
       },
       show1: false,
-      show2: false,
       showSubCompany: false,
       shopCategoryOptions: [],
       showSetMeal: false,
       plannerColumns: [],
       companyLoading: false,
       options: null,
+      shopCategoryMallOptions: [],
+      shopCategoryBusinessOptions: [],
       setMealData: [],
       companyValue: '',
       fieldValue: '',
+      shopCategoryMallStr: "",
+      shopCategoryBusinessStr: "",
       setMealValue: '',
       idCardList: [],
       dictName: '证件类型',
       columns: [],
-      categoryFieldName: {
-        text: 'storeName',
-        value: 'id',
-        children: 'items',
-      },
       isQueryShopCategory: false,
       isAgreeService: false
     }
@@ -462,16 +479,7 @@ export default {
       this.setMealData = res.data
       // console.log(this.options)
     })
-
-    this.sendReq({
-      url: api.getCategoryList,
-      method: 'GET',
-      params: {
-        levelId: 1
-      }
-    }, res => {
-      this.shopCategoryOptions = res.data
-    })
+		this.handleShopTypeChange(this.personalForm.shopType)
   },
   methods: {
     getDictList() {
@@ -677,7 +685,6 @@ export default {
       var idReg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
       subData.shopPhone = subData.servicePhone
       subData.shopAdress = `${self.shopAdress}，${subData.storeAddressDetail}`
-      // alert('submit!')
       if (subData.shopName === '') {
         Toast.fail('请输入店铺名称')
         return false
@@ -689,18 +696,30 @@ export default {
         Toast.fail('客服电话号格式错误')
         return false
       }
+      if (subData.shopType === '1') {
+				if (!subData.classificationIdMall) {
+					Toast.fail('请选择商城店铺所属分类')
+					return
+				} else {
+					subData.classificationId = subData.classificationIdMall
+				}
+      }
       if (subData.shopType === '2') {
         if (!subData.startTime) {
           Toast.fail('请选择营业开始时间')
           return
         }
-
         if (!subData.endtime) {
           Toast.fail('请选择营业结束时间')
           return
         }
+				if (!subData.classificationIdBusiness) {
+					Toast.fail('请选择商圈店铺所属分类')
+					return
+				} else {
+					subData.classificationId = subData.classificationIdBusiness
+				}
       }
-
       //  代金券 人均消费 广告图都砍掉
       // if (!subData.classificationId) {
       //   Toast.fail('请选择店铺所属分类')
@@ -715,14 +734,12 @@ export default {
       //     return
       //   }
       // }
-
       // if (!subData.advertisement.length) {
       //   Toast.fail('请上传广告图')
       //   return
       // } else {
       //   subData.advertisement = subData.advertisement.join(",")
       // }
-
       if (subData.chargePersonName === '') {
         Toast.fail('请输入店铺负责人')
         return false
@@ -770,7 +787,6 @@ export default {
         Toast.fail('请上传营业执照')
         return false
       }
-
       //  按要求砍掉身份验证
       // if (subData.enterpriseOperator === '') {
       //   Toast.fail('请输入经营者姓名')
@@ -803,12 +819,10 @@ export default {
       //   Toast.fail('请上传身份证背面照')
       //   return false
       // }
-
       if (!this.isAgreeService) {
         Toast.fail('请先同意《用户服务协议》和《隐私政策》')
         return false
       }
-
       let params = {
         url: api.enterpriseCheck,
         method: 'POST',
@@ -919,49 +933,78 @@ export default {
     onSetMealChange(value) {
       // console.log(value)
     },
-    // 店铺所属分类change
-    async onShopCategoryChange(e, finishCB) {
-      try {
-        this.isQueryShopCategory = true
-        let cacheArray = []
-        const childCategoryList = await this.getChildCategory(e.value)
-        if (childCategoryList.length) {
-          e.selectedOptions[e.selectedOptions.length - 1].items = childCategoryList
-          cacheArray = this.shopCategoryOptions.map(item => {
-            return item
-          })
-          this.shopCategoryOptions = cacheArray
-        } else {
-          finishCB(e)
-        }
-        this.isQueryShopCategory = false
-      } catch (error) {
-        finishCB(e)
-        this.isQueryShopCategory = false
-
-      }
-    },
 
-    // 确认选择店铺所属分类
-    onFinishChooseShopCategory(e) {
-      this.selectShopCategoryStr = e.selectedOptions[e.selectedOptions.length - 1].storeName
-      this.show2 = false
+    handleShopTypeChange(name) {
+			if (name === '1') {
+				this.sendReq({
+					url: api.getFactoryClassApi,
+					method: 'GET',
+					params: {
+						levelId: 1
+					}
+				}, res => {
+					this.shopCategoryMallOptions = res.data
+				})
+			} else if (name === '2') {
+				this.sendReq({
+					url: api.getCategoryList,
+					method: 'GET',
+					params: {
+						levelId: 1
+					}
+				}, res => {
+					this.shopCategoryBusinessOptions = res.data
+				})
+			}
     },
 
-    // 获取子集分类
-    getChildCategory(dressing) {
-      const _this = this
-      return new Promise(async (resolve, reject) => {
-        _this.sendReq({
-          url: api.getChildCategoryList,
-          method: "GET",
-          params: {
-            dressing
-          }
-        }, res => {
-          resolve(res.data)
-        })
-      })
+    // 店铺所属分类change
+    async onShopCategoryChange(e) {
+			if (this.personalForm.shopType === '1') {
+				this.isQueryShopCategory = true
+				this.sendReq({
+					url: api.getFactoryNextClassApi,
+					method: "GET",
+					params: {
+						pid: e.value
+					}
+				}, res => {
+					if (res.data.length) {
+						e.selectedOptions[e.selectedOptions.length - 1].items = res.data
+						this.shopCategoryMallOptions = JSON.parse(JSON.stringify(this.shopCategoryMallOptions))
+					} else {
+						this.shopCategoryMallStr = e.selectedOptions.map((i) => i.storeName).join('-')
+						this.showMall = false
+					}
+					this.isQueryShopCategory = false
+				}, err => {
+					this.shopCategoryMallStr = e.selectedOptions.map((i) => i.storeName).join('-')
+					this.showMall = false
+					this.isQueryShopCategory = false
+				})
+			} else if (this.personalForm.shopType === '2') {
+				this.isQueryShopCategory = true
+				this.sendReq({
+					url: api.getChildCategoryList,
+					method: "GET",
+					params: {
+						pid: e.value
+					}
+				}, res => {
+					if (res.data.length) {
+						e.selectedOptions[e.selectedOptions.length - 1].items = res.data
+						this.shopCategoryBusinessOptions = JSON.parse(JSON.stringify(this.shopCategoryBusinessOptions))
+					} else {
+						this.shopCategoryBusinessStr = e.selectedOptions.map((i) => i.storeName).join('-')
+						this.showBusiness = false
+					}
+					this.isQueryShopCategory = false
+				}, err => {
+					this.shopCategoryBusinessStr = e.selectedOptions.map((i) => i.storeName).join('-')
+					this.showBusiness = false
+					this.isQueryShopCategory = false
+				})
+			}
     },
 
     // 删除广告图

src/views/moblie/mUinitBusiness.vue

@@ -54,39 +54,52 @@
               <div class="labelTit"><label><i>*</i>店铺类型</label></div>
               <!-- <input type="text" v-model="plannerForm.email" placeholder="请选择性别"> -->
               <div class="input">
-                <van-radio-group v-model="personalForm.shopType" direction="horizontal">
+                <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-group>
               </div>
             </div>
-            <div class="time-select-container" v-show="personalForm.shopType === '2'">
+
+            <div v-show="personalForm.shopType === '1'">
+							<div class="inputItem">
+								<div class="labelTit"><label><i>*</i>商城店铺分类</label></div>
+								<input @focus="noBomBox" type="text" placeholder="请选择店铺所属分类" v-model="shopCategoryMallStr"
+									@click="showMall = true">
+								<van-popup v-model="showMall" round position="bottom">
+									<div v-show="isQueryShopCategory" class="loading-container"><van-loading color="#ee0a24" type="spinner" /></div>
+									<van-cascader v-model="personalForm.classificationIdMall" title="请选择店铺所属分类"
+										:field-names="{ text: 'storeName', value: 'id', children: 'items' }"
+										:options="shopCategoryMallOptions" @close="showMall = false"
+										@change="onShopCategoryChange" />
+								</van-popup>
+							</div>
+            </div>
+            <div v-show="personalForm.shopType === '2'">
               <div class="inputItem">
                 <div class="labelTit"><label><i>*</i>营业开始时间</label></div>
                 <input @focus="noBomBox" type="text" v-model="personalForm.startTime" placeholder="请选择营业开始时间"
                   @click="startTimeShow = true">
               </div>
-
               <div class="inputItem">
                 <div class="labelTit"><label><i>*</i>营业结束时间</label></div>
                 <input @focus="noBomBox" type="text" v-model="personalForm.endtime" placeholder="请选择营业开始时间"
                   @click="endTimeShow = true">
               </div>
+							<div class="inputItem">
+								<div class="labelTit"><label><i>*</i>商圈店铺分类</label></div>
+								<input @focus="noBomBox" type="text" placeholder="请选择店铺所属分类" v-model="shopCategoryBusinessStr"
+									@click="showBusiness = true">
+								<van-popup v-model="showBusiness" round position="bottom">
+									<div v-show="isQueryShopCategory" class="loading-container"><van-loading color="#ee0a24" type="spinner" /></div>
+									<van-cascader v-model="personalForm.classificationIdBusiness" title="请选择店铺所属分类"
+										:field-names="{ text: 'storeName', value: 'id', children: 'items' }"
+										:options="shopCategoryBusinessOptions" @close="showBusiness = false"
+										@change="onShopCategoryChange" />
+								</van-popup>
+							</div>
             </div>
 
-            <div class="inputItem">
-              <div class="labelTit"><label><i>*</i>店铺分类</label></div>
-              <input @focus="noBomBox" type="text" placeholder="请选择店铺所属分类" v-model="selectShopCategoryStr"
-                @click="show2 = true">
-              <van-popup v-model="show2" round position="bottom">
-
-                <div v-show="isQueryShopCategory" class="loading-container"><van-loading color="#ee0a24" type="spinner" />
-                </div>
-                <van-cascader v-model="personalForm.classificationId" title="请选择店铺所属分类" :field-names="categoryFieldName"
-                  :options="shopCategoryOptions" @close="show2 = false"
-                  @change="onShopCategoryChange($event, onFinishChooseShopCategory)" />
-              </van-popup>
-            </div>
             <div class="inputItem arrow" style="margin-top: 20px;">
               <div class="labelTit"><label><i>*</i>请选择地址</label></div>
               <div class="input" style="background-color: #a4a4a41f; overflow: hidden; white-space: nowrap; "
@@ -380,7 +393,8 @@ export default {
       areaList: AreaList,
       areaRegionList: AreaList,
       show: false,
-      show2: false,
+      showMall: false,
+      showBusiness: false,
       regionShow: false,
       minDate: new Date(1960, 1, 1),
       maxDate: new Date(2077, 12, 31),
@@ -435,6 +449,8 @@ export default {
         areaId: '', // 区域ID
         packageId: '',
         classificationId: '', // 商家所属分类
+        classificationIdMall: '',
+        classificationIdBusiness: '',
         perCapita: "", // 人均消费
         invitationCode: localStorage.getItem('INVITATION_CODE'), // 邀请码
         advertisement: [],
@@ -442,26 +458,22 @@ export default {
         latitude: ''
       },
       show1: false,
-      show3: false,
       showSubCompany: false,
       showSetMeal: false,
       plannerColumns: [],
       companyLoading: false,
       options: null,
-      shopCategoryOptions: [],
+      shopCategoryMallOptions: [],
+      shopCategoryBusinessOptions: [],
       setMealData: [],
       companyValue: '',
       fieldValue: '',
-      selectShopCategoryStr: "",
+      shopCategoryMallStr: "",
+      shopCategoryBusinessStr: "",
       setMealValue: '',
       idCardList: [],
       dictName: '证件类型',
       columns: [],
-      categoryFieldName: {
-        text: 'storeName',
-        value: 'id',
-        children: 'items',
-      },
       isQueryShopCategory: false,
       isAgreeService: false
     }
@@ -493,16 +505,7 @@ export default {
       this.setMealData = res.data
       // console.log(this.options)
     })
-
-    this.sendReq({
-      url: api.getCategoryList,
-      method: 'GET',
-      params: {
-        levelId: 1
-      }
-    }, res => {
-      this.shopCategoryOptions = res.data
-    })
+		this.handleShopTypeChange(this.personalForm.shopType)
   },
   methods: {
     getDictList() {
@@ -727,7 +730,6 @@ export default {
       var idReg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
       subData.shopPhone = subData.servicePhone
       subData.shopAdress = `${self.shopAdress}，${subData.storeAddressDetail}`
-      // alert('submit!')
       if (subData.shopName === '') {
         Toast.fail('请输入店铺名称')
         return false
@@ -739,7 +741,6 @@ export default {
         Toast.fail('客服电话号格式错误')
         return false
       }
-
       if (subData.chargePersonName === '') {
         Toast.fail('请输入店铺负责人')
         return false
@@ -751,19 +752,30 @@ export default {
         Toast.fail('负责人电话式错误')
         return false
       }
-
+      if (subData.shopType === '1') {
+				if (!subData.classificationIdMall) {
+					Toast.fail('请选择商城店铺所属分类')
+					return
+				} else {
+					subData.classificationId = subData.classificationIdMall
+				}
+      }
       if (subData.shopType === '2') {
         if (!subData.startTime) {
           Toast.fail('请选择营业开始时间')
           return
         }
-
         if (!subData.endtime) {
           Toast.fail('请选择营业结束时间')
           return
         }
+				if (!subData.classificationIdBusiness) {
+					Toast.fail('请选择商圈店铺所属分类')
+					return
+				} else {
+					subData.classificationId = subData.classificationIdBusiness
+				}
       }
-
       if (subData.shopAdress === '') {
         Toast.fail('请选择所在地区')
         return false
@@ -772,12 +784,6 @@ export default {
         Toast.fail('请输入详细地址')
         return false
       }
-
-      if (!subData.classificationId) {
-        Toast.fail('请选择店铺所属分类')
-        return
-      }
-
       //  代金券 人均消费 广告图都砍掉
       // if (!subData.voucherReturn && subData.voucherReturn != 0) {
       //   Toast.fail('请输入代金券返回比例')
@@ -788,7 +794,6 @@ export default {
       //     return
       //   }
       // }
-
       // if (!subData.perCapita) {
       //   Toast.fail('请填写人均消费额')
       //   return
@@ -796,14 +801,12 @@ export default {
       //   Toast.fail('人均消费额不能小于等于0元')
       //   return
       // }
-
       // if (!subData.advertisement.length) {
       //   Toast.fail('请上传广告图')
       //   return
       // } else {
       //   subData.advertisement = subData.advertisement.join(",")
       // }
-
       if (subData.subjectName === '') {
         Toast.fail('请输入商户名称')
         return false
@@ -832,7 +835,6 @@ export default {
         Toast.fail('请上传营业执照')
         return false
       }
-
       // 按要求砍掉身份验证
       // if (subData.subjectOperator === '') {
       //   Toast.fail('请输入经营者姓名')
@@ -865,12 +867,10 @@ export default {
       //   Toast.fail('请上传身份证背面照')
       //   return false
       // }
-
       if (!this.isAgreeService) {
         Toast.fail('请先同意《用户服务协议》和《隐私政策》')
         return false
       }
-
       let params = {
         url: api.individualCheck,
         method: 'POST',
@@ -990,49 +990,77 @@ export default {
       // console.log(value)
     },
 
-    // 店铺所属分类change
-    async onShopCategoryChange(e, finishCB) {
-      try {
-        this.isQueryShopCategory = true
-        let cacheArray = []
-        const childCategoryList = await this.getChildCategory(e.value)
-        if (childCategoryList.length) {
-          e.selectedOptions[e.selectedOptions.length - 1].items = childCategoryList
-          cacheArray = this.shopCategoryOptions.map(item => {
-            return item
-          })
-          this.shopCategoryOptions = cacheArray
-        } else {
-          finishCB(e)
-        }
-        this.isQueryShopCategory = false
-      } catch (error) {
-        finishCB(e)
-        this.isQueryShopCategory = false
-
-      }
-    },
-
-    // 确认选择店铺所属分类
-    onFinishChooseShopCategory(e) {
-      this.selectShopCategoryStr = e.selectedOptions[e.selectedOptions.length - 1].storeName
-      this.show2 = false
+    handleShopTypeChange(name) {
+			if (name === '1') {
+				this.sendReq({
+					url: api.getFactoryClassApi,
+					method: 'GET',
+					params: {
+						levelId: 1
+					}
+				}, res => {
+					this.shopCategoryMallOptions = res.data
+				})
+			} else if (name === '2') {
+				this.sendReq({
+					url: api.getCategoryList,
+					method: 'GET',
+					params: {
+						levelId: 1
+					}
+				}, res => {
+					this.shopCategoryBusinessOptions = res.data
+				})
+			}
     },
 
-    // 获取子集分类
-    getChildCategory(dressing) {
-      const _this = this
-      return new Promise(async (resolve, reject) => {
-        _this.sendReq({
-          url: api.getChildCategoryList,
-          method: "GET",
-          params: {
-            dressing
-          }
-        }, res => {
-          resolve(res.data)
-        })
-      })
+    // 店铺所属分类change
+    async onShopCategoryChange(e) {
+			if (this.personalForm.shopType === '1') {
+				this.isQueryShopCategory = true
+				this.sendReq({
+					url: api.getFactoryNextClassApi,
+					method: "GET",
+					params: {
+						pid: e.value
+					}
+				}, res => {
+					if (res.data.length) {
+						e.selectedOptions[e.selectedOptions.length - 1].items = res.data
+						this.shopCategoryMallOptions = JSON.parse(JSON.stringify(this.shopCategoryMallOptions))
+					} else {
+						this.shopCategoryMallStr = e.selectedOptions.map((i) => i.storeName).join('-')
+						this.showMall = false
+					}
+					this.isQueryShopCategory = false
+				}, err => {
+					this.shopCategoryMallStr = e.selectedOptions.map((i) => i.storeName).join('-')
+					this.showMall = false
+					this.isQueryShopCategory = false
+				})
+			} else if (this.personalForm.shopType === '2') {
+				this.isQueryShopCategory = true
+				this.sendReq({
+					url: api.getChildCategoryList,
+					method: "GET",
+					params: {
+						pid: e.value
+					}
+				}, res => {
+					if (res.data.length) {
+						e.selectedOptions[e.selectedOptions.length - 1].items = res.data
+						this.shopCategoryBusinessOptions = JSON.parse(JSON.stringify(this.shopCategoryBusinessOptions))
+					} else {
+						this.shopCategoryBusinessStr = e.selectedOptions.map((i) => i.storeName).join('-')
+						this.showBusiness = false
+					}
+					this.isQueryShopCategory = false
+				}, err => {
+					this.shopCategoryBusinessStr = e.selectedOptions.map((i) => i.storeName).join('-')
+					this.showBusiness = false
+					this.isQueryShopCategory = false
+				})
+			}
     },
 
     // 删除广告图