no message

pages/kotra/BrandEnterSetIn/components/enterInformation.vue

@@ -144,26 +144,15 @@
 			<view class="label-text">企业名称<span style='color: #E54D42;' >*</span></view>
 			<input type="text" v-model="model.Name" style="padding: 10px 0;" placeholder="请填写企业名称" :disabled="disabled|| disabled2?true:false"  placeholder-style="color:#CECECE;">
 		</view>
-		<view class="label-text" style="margin-top:20px;margin-bottom: 30rpx;">
-			<text>Logo</text>
-			<span style='color: #E54D42;' >*</span>
-		</view>
-		<view @click="disabled?'':uploadcard()">
-			<view slot="addBtn" class="slot-btn" v-if="model.Logo==''" > 
-				<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappimg.png" mode="widthFix"></image>
-			</view>
-			<view class="slot-btn" v-if="model.Logo!=''" @click="disabled?previewImage([model.Logo],1):''">
-				<image style="width: 220rpx;height: 220rpx;"  :src="model.Logo" mode="aspectFill"></image>
-			</view>
-			
-		</view>
 		<view class="label-text" style="margin-top:20px;margin-bottom: 30rpx;">
 			<text>介绍图</text>
 			<span style='color: #E54D42;' >*</span>
 			<text style="color:#999;font-weight: 400;">（最多9张,第一张为封面图）</text>
 		</view>
 		<view>
-			<u-upload  :action="action" :max-count="9" :max-size="2*1024*1024" :deletable='!disabled' :file-list="fileList" @on-remove="onRemove1"  :custom-btn="true" @on-success="uploadSuccessHandler">
+			<u-upload  :action="action" :max-count="9" :max-size="2*1024*1024" :deletable='!disabled' :file-list="fileList" 
+			@on-remove="onRemove1"  
+			:custom-btn="true" @on-success="uploadSuccessHandler">
 				<view slot="addBtn" class="slot-btn" v-if='disabled==false'> 
 					<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappimg.png" mode="widthFix"></image>
 				</view>
@@ -188,12 +177,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>
@@ -461,15 +450,17 @@
 		created() {
 			this.mainColor = this.$uiConfig.mainColor;
 			this.GetProjectTypeEnumList()//载体性质
-			this.getbrandList()
+			
 			
 			
 			if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了
 				let data = this.datas.EnterpriseServicesModel
 				this.model = this.datas.EnterpriseServicesModel
+				this.model.CompanyId = this.datas.CompanyId
+				this.CategoryName = data.CategoryName
 				if(data.OperationTime) this.model.OperationTime = formatDate(new Date(data.OperationTime),'yyyy-MM-dd')
 				if(data.HandoverDate) this.model.HandoverDate = formatDate(new Date(data.HandoverDate),'yyyy-MM-dd')
-				this.model.CompanyId = this.datas.CompanyId
+				
 				this.glBrandName = data.Name
 				if(this.model.BannerList && this.model.BannerList.length>0){
 					this.model.BannerList.forEach(x=>{
@@ -499,11 +490,10 @@
 					this.disabled2 = true
 					this.disabled3 = true
 				}
-				this.CategoryName = data.ClassName;
 			}else{
 				this.model.CompanyId = this.datas.CompanyId
 			}
-			
+			this.getbrandList()
 			
 			
 		},
@@ -596,7 +586,11 @@
 					(res) => {
 						if (res.resultCode == 1) {
 							this.BrandClassList =  res.data
-							
+							res.data.forEach(x=>{
+								if(x.ID==this.model.EType){
+									this.ETypeName = x.ClassName
+								}
+							})
 						}
 					}
 				);
@@ -630,6 +624,7 @@
 			uploadSuccessHandler(data, index, lists) {
 				let r = JSON.parse(data);
 				this.model.BannerList.push(r.data);
+				console.log(this.model.BannerList,'----333')
 			},
 			uploadcard(){
 				uni.chooseImage({
@@ -783,10 +778,6 @@
 					uni.showToast({title: '请输入企业名称',icon: 'none',})
 					return
 				}
-				if(this.model.Logo == ''){
-					uni.showToast({title: '请上传Logo',icon: 'none',})
-					return
-				}
 				if(this.model.BannerList.length == 0){
 					uni.showToast({title: '请上传企业介绍图',icon: 'none',})
 					return

pages/kotra/BrandEnterSetIn/enterIndex.vue

@@ -531,6 +531,36 @@ export default {
       }
       if (this.step <= 4) {
         if (this.step == 1) {
+          if(!this.dataOne.BusinessLicense){
+            return wx.showToast({
+									title: "请上传营业执照",
+									duration: 1000,
+            });
+          }
+          if(!this.dataOne.CompanyName){
+            return wx.showToast({
+									title: "请填写企业名称",
+									duration: 1000,
+            });
+          }
+          if(!this.dataOne.UnifiedCode){
+            return wx.showToast({
+									title: "请填写统一社会信用代码",
+									duration: 1000,
+            });
+          }
+          if(!this.dataOne.LegalPerson){
+            return wx.showToast({
+									title: "请填写法人代表",
+									duration: 1000,
+            });
+          }
+          if(!this.dataOne.Mobile){
+            return wx.showToast({
+									title: "请填写联系电话",
+									duration: 1000,
+            });
+          }
           //审核中或审核通过就不提交请求
           if (
             this.nowStatus != 3 &&