修复bug

pages/kotra/BrandEnterSetIn/components/brandInformation.vue

@@ -394,7 +394,6 @@
 			this.mainColor = this.$uiConfig.mainColor;
 			this.GetProjectTypeEnumList()//载体性质
 			this.getbrandList()
-			this.model.CompanyId = this.datas.CompanyId
 			
 			if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了
 				let data = this.datas.BrandModel

pages/kotra/BrandEnterSetIn/components/buildingInformation.vue

@@ -507,7 +507,7 @@ export default {
     this.mainColor = this.$uiConfig.mainColor;
     this.GetAuthenticationCategoryEnumList(); //首店类别
     this.GetProjectTypeEnumList(); //载体性质
-    this.model.CompanyId = this.datas.CompanyId;
+    
 
     if (
       this.datas.CompanyStatus != undefined &&
@@ -515,6 +515,7 @@ export default {
     ) {
       //判断是否填写过了
       this.model = this.datas.buildingApplyForModel
+      this.model.CompanyId = this.datas.CompanyId;
       let data = this.datas.buildingApplyForModel;
       // this.model = this.datas.CarrierModel
 

pages/kotra/BrandEnterSetIn/components/carrierInformation.vue

@@ -139,12 +139,12 @@
             overflow: hidden;
             margin-right: 5px;
           "
-          v-if="model.Address != ''"
+          v-if="model.Address"
           >{{ model.Address }}</text
         >
         <text
           style="width: 1px; flex: 1; color: #cecece"
-          v-if="model.Address == ''"
+          v-if="!model.Address"
           >请选择地址</text
         >
         <u-icon name="arrow" color="#A5A4AC" size="30"></u-icon>
@@ -249,7 +249,7 @@
           position: relative;
           margin-right: 20px;
         "
-        v-if="model.VideoUrl != ''"
+        v-if="model.VideoUrl"
       >
         <video
           id="myVideo"
@@ -272,7 +272,7 @@
             align-items: center;
             justify-content: center;
           "
-          @tap.stop="model.VideoUrl = ''"
+          @tap.stop="!model.VideoUrl"
           v-if="!disabled"
         >
           <u-icon
@@ -283,7 +283,7 @@
           ></u-icon>
         </view>
       </view>
-      <view v-if="model.VideoUrl == ''">
+      <view v-if="!model.VideoUrl">
         <view slot="addBtn" class="slot-btn" @click="disabled ? '' : upvideo()">
           <image
             class="image"
@@ -536,9 +536,9 @@ export default {
         Developers: "", //开发商
         OpenTime: "", //开业时间
         // ProjectType: 0, //项目类型
-        CarrierSize: 0, //商业体量
+        CarrierSize: null, //商业体量
         LayersNum: "", //商业层数
-        CarNum: 0, //车位数量
+        CarNum: null, //车位数量
         CarrierPlan: "", //业态规划
         // CarrierTarget: "", //招引目标
         Location: "", //定位
@@ -558,8 +558,8 @@ export default {
         // FirstShow: "", //首秀政策
         // FirstExhibition: "", //首展政策
         // ShopNum: 0, //店铺数量
-        BuiltUpArea: 0, //经营面积
-        AreaRequirement: 0, //可租赁面积
+        BuiltUpArea: null, //经营面积
+        AreaRequirement: null, //可租赁面积
         // YeJi: 0, //去年业绩
         Ascription: "",//资产权属
         VisitorsFlowrate: "",//人流量参数
@@ -614,7 +614,7 @@ export default {
     this.mainColor = this.$uiConfig.mainColor;
     this.GetAuthenticationCategoryEnumList(); //首店类别
     this.GetProjectTypeEnumList(); //载体性质
-    this.model.CompanyId = this.datas.CompanyId;
+    
 
     if (
       this.datas.CompanyStatus != undefined &&
@@ -623,7 +623,8 @@ export default {
       //判断是否填写过了
       let data = this.datas.CarrierModel
       this.model = this.datas.CarrierModel
-      // this.BrandClassName = data.ClassName
+      this.model.CompanyId = this.datas.CompanyId;
+      this.BrandClassName = data.CategoryName
 
       if (this.model.BannerList && this.model.BannerList.length > 0) {
         this.model.BannerList.forEach((x) => {
@@ -941,14 +942,9 @@ export default {
         return;
       }
 
-      if (this.model.ProjectType == 0) {
-        uni.showToast({ title: "请选择载体类型", icon: "none" });
-        return;
-      }
-
-      if (this.model.CarNum == "") {
-        this.model.CarNum = 0;
-      }
+      // if (this.model.CarNum == "") {
+      //   this.model.CarNum = 0;
+      // }
       if (this.model.OpenTime == "") {
         uni.showToast({ title: "请输入开业时间", icon: "none" });
         return;

pages/kotra/BrandEnterSetIn/components/enterInformation.vue

@@ -449,13 +449,12 @@
 			this.mainColor = this.$uiConfig.mainColor;
 			this.GetProjectTypeEnumList()//载体性质
 			this.getbrandList()
-			this.model.CompanyId = this.datas.CompanyId
+			
 			
 			if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了
 				this.model = this.datas.EnterpriseServicesModel
 				this.model.CompanyId = this.datas.CompanyId
 				let data = this.datas.EnterpriseServicesModel
-				
 				this.glBrandName = data.Name
 				if(this.model.BannerList && this.model.BannerList.length>0){
 					this.model.BannerList.forEach(x=>{

pages/kotra/BrandEnterSetIn/enterIndex.vue

@@ -100,7 +100,7 @@
                 :src="dataOne.BusinessLicense"
                 v-if="businessLicenseUploadIsSuccess"
                 class="conImage"
-                mode="heightFix"
+                mode="aspectFill"
               ></image>
               <view
                 class="reupload"