修复入驻bug

pages/kotra/BrandEnterSetIn/components/carrierInformation.vue

@@ -392,13 +392,13 @@
       />
     </view>
     <view class="bottom-border">
-      <view class="label-text">业态规则</view>
+      <view class="label-text">业态规划</view>
       <input
         type="text"
         v-model="model.CarrierPlan"
         :disabled="disabled"
         style="padding: 10px 0"
-        placeholder="请填写业态规则"
+        placeholder="请填写业态规划"
         placeholder-style="color:#CECECE;"
       />
     </view>
@@ -460,7 +460,7 @@
           placeholder="请填写人管理公司及管理费"
           placeholder-style="color:#CECECE;"
         />
-        <span>元/m²</span>
+        // <span>元/m²</span>
       </view>
     </view>
     <view class="bottom-border">

pages/kotra/BrandEnterSetIn/enterIndex.vue

@@ -342,7 +342,8 @@ export default {
 		  {name:'商业',image:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638696228042986140.png',id:2},
 		  {name:'企业',image:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638696228219050268.png',id:3},
 		  {name:'楼宇',image:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638696228045398333.png',id:4},
-	  ]
+	  ],
+	  isEnterType: false
     };
   },
   methods: {
@@ -503,6 +504,8 @@ export default {
     //企业认证
     stepOne() {
       this.dataOne.FirstShopType = this.ChooseidentityId;
+      // this.dataOne.CompanyId = 283;
+      // this.dataOne.CompanyStatus = -1;    
       let parms = {
         url: "/api/AppletTrade/SetCompanyEnterprise",
         data: this.dataOne,
@@ -511,7 +514,13 @@ export default {
         if (res.resultCode == 1) {
           this.dataOne.CompanyId = res.data.CompanyId;
           this.dataOne.CompanyStatus = -1;
-          this.showTemplate(res.data.template_message_list);
+          if(!this.isEnterType) this.showTemplate(res.data.template_message_list);
+          else {
+            this.step = 3
+            this.stepName = this.companyTypes[this.ChooseidentityId-1].name+'认证信息';
+            this.nextSepName = "完成";
+            this.percent += this.percent;
+          }
         }
       });
     },
@@ -574,16 +583,22 @@ export default {
           ) {
 			this.step++;
 			if(this.ChooseidentityId!=-1){
-				this.step = 3;
-				this.percent = 100;
-				this.stepName = this.companyTypes[this.ChooseidentityId-1].name+'认证信息';
-				this.nextSepName = "完成";
-				return
+				if(this.isEnterType&&(!this.dataOne.CompanyId||this.dataOne.CompanyId=="")){
+					this.stepOne()
+					return
+				}else{
+					this.step = 3;
+					this.percent = 100;
+					this.stepName = this.companyTypes[this.ChooseidentityId-1].name+'认证信息';
+					this.nextSepName = "完成";
+					return
+				}
+				
 			}
 			this.ChooseidentityId=1
-            this.stepName = "第2步 选择身份";
-            this.nextSepName = "第3步";
-            this.percent += this.percent;
+			this.stepName = "第2步 选择身份";
+			this.nextSepName = "第3步";
+			this.percent += this.percent;
           } else {
             //审核中的去查看
             if (this.nowStatus == 2) {
@@ -596,7 +611,7 @@ export default {
               this.nextSepName = "完成";
             }
           }
-        } else if (this.step == 2) {
+        }else if (this.step == 2) {
           this.stepOne();
         }
       }
@@ -648,14 +663,18 @@ export default {
             this.nowStatus = 2;
           }
           this.ChooseidentityId = this.dataOne.FirstShopType;
-          if (this.dataOne.FirstShopType && this.dataOne.FirstShopType == 1) {
-            this.pageTitle = "品牌信息";
-          } else if (
-            this.dataOne.FirstShopType &&
-            this.dataOne.FirstShopType == 2
-          ) {
-            this.pageTitle = "载体信息";
+          if(this.dataOne.FirstShopType ){
+            if (this.dataOne.FirstShopType == 1) {
+              this.pageTitle = "品牌信息";
+            } else if(this.dataOne.FirstShopType == 2) {
+              this.pageTitle = "载体信息";
+            } else if(this.dataOne.FirstShopType == 3) {
+              this.pageTitle = "企业信息";
+            } else if(this.dataOne.FirstShopType == 4) {
+              this.pageTitle = "楼宇信息";
+            }
           }
+          
         }
         that.loading = true;
       });
@@ -690,6 +709,7 @@ export default {
     }
 	if(options && options.t){
 		this.ChooseidentityId=options.t
+		this.isEnterType = true
 	}else{
 		this.ChooseidentityId=-1
 	}