Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/kotra/BrandEnterSetIn/components/brandInformation.vue

@@ -310,40 +310,15 @@
 				model:{
 					ID: 0,
 					CompanyId:0,//认证Id
-					// ExistBrandId:0,//绑定已有的品牌Id
 					Logo: "", //Logo
 					BannerList: [], //品牌介绍图
 					VideoUrl: "", //品牌视频
 					FullBrandName: "", //品牌全名
 					BrandName: "", //品牌名
 					ShopNum: "", //店铺数量
-					// BuiltUpArea: 0, //建筑面积小
-					// EndBuiltUpArea: 0, //建筑面积大
 					CustomerType: "", //客群定位
 					BrandType: "", //品牌定位
-					// StoreExpansion: "", //扩店区域
-					// ProjectType: 0, //商铺性质
-					AreaRequirement: 0, //
-					// EndAreaRequirement: 0, //
-					// Advertising: "", //广告
-					// Other: "", //其他 9-27  改为招引需求
-					// ShopSize: 1, //店铺开口尺寸
-					// Plumbing: 1, //上下水
-					// Caliber: 1, //管径
-					// Sewage: 1, //排污
-					// RanQi: 1, //燃气
-					// DianLiang: "", //电量
-					// PaiYan: 1, //排烟量
-					// KongTiao: 1, //空调
-					// XinFeng: 1, //新风
-					// BrandClassId: '', //品牌分类Id
-					// RanQiBZ: "", //燃气备注
-					// IsDianLiang: 1, //电量（0-否1-有）
-					// PaiYanBZ: "", //排烟量备注
-					// ShopSize: "", //店铺开口尺寸
-					// IsShopSize: 1, //店铺开口尺寸（0-否1-有）
-					// OpenShopWish:5,//开店意愿
-					// IsInChengdu:0,//是否在成都落地
+					AreaRequirement: 0, //需求面积
 					
 					CategoryId: null,
 					Introduce: "",//品牌简介/企业简介
@@ -431,6 +406,8 @@
 					this.disabled3 = true
 				}
 				this.BrandClassName = data.ClassName;
+			}else{
+				this.model.CompanyId = this.datas.CompanyId
 			}
 			
 			

pages/kotra/BrandEnterSetIn/components/buildingInformation.vue

@@ -324,18 +324,25 @@
       />
     </view>
     <view class="bottom-border">
-			<view class="label-text">物业费(元/㎡)</view>
+			<view class="label-text">物业费</view>
+      <view
+        class="bottom-border_r"
+        style="padding: 10px 0; height: 42px; display: flex"
+      >
         <input
           type="number"
           v-model="model.PropertyFee"
           :disabled="disabled"
-				style="padding: 10px 0"
+          style="padding: 10px 0;flex: 1;margin-right: 10px"
           placeholder="请填写物业费"
           placeholder-style="color:#CECECE;"
         />
+        <span>元/m²</span>
+      </view>
+				
 		</view>
 		<view class="bottom-border">
-			<view class="label-text">月租金(元/㎡)</view>
+			<view class="label-text">月租金</view>
 				<input
 				type="number"
 				v-model="model.RentFee"
@@ -344,6 +351,7 @@
 				placeholder="请填写月租金"
 				placeholder-style="color:#CECECE;"
 			/>
+      <span>元/m²</span>
 		</view>
     <view class="bottom-border">
 			<view class="label-text">产业方向</view>
@@ -556,6 +564,7 @@ export default {
         this.glCarrierName = this.model.CarrierName;
       }
     } else {
+      this.model.CompanyId = this.datas.CompanyId
     }
   },
   methods: {

pages/kotra/BrandEnterSetIn/components/carrierInformation.vue

@@ -445,14 +445,20 @@
     </view>
     <view class="bottom-border">
       <view class="label-text">管理公司及管理费</view>
+      <view
+        class="bottom-border_r"
+        style="padding: 10px 0; height: 42px; display: flex"
+      >
         <input
           type="text"
           v-model="model.ManagementCompany"
           :disabled="disabled"
-        style="padding: 10px 0"
+          style="padding: 10px 0;flex: 1;margin-right: 10px"
           placeholder="请填写人管理公司及管理费"
           placeholder-style="color:#CECECE;"
         />
+        <span>元/m²</span>
+      </view>
     </view>
     <view class="bottom-border">
       <view class="label-text">目标招商业态及品牌需求</view>
@@ -502,7 +508,7 @@
 </template>
 
 <script>
-import {gegerateDates, dateEqual,formatDate} from '../../../appointment/components/zzx-calendar/generateDates.js';
+import {formatDate} from '../../../appointment/components/zzx-calendar/generateDates.js';
 export default {
   props: {
     datas: {
@@ -624,7 +630,7 @@ export default {
       //判断是否填写过了
       let data = this.datas.CarrierModel
       this.model = this.datas.CarrierModel
-      this.model.OpenTime = formatDate(new Date(this.model.OpenTime),'yyyy-MM-dd')
+      if(this.model.OpenTime) this.model.OpenTime = formatDate(new Date(this.model.OpenTime),'yyyy-MM-dd')
       this.model.CompanyId = this.datas.CompanyId;
       this.BrandClassName = data.CategoryName
 
@@ -665,6 +671,7 @@ export default {
         this.glCarrierName = this.model.CarrierName;
       }
     } else {
+      this.model.CompanyId = this.datas.CompanyId;
     }
   },
   methods: {

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>
@@ -285,26 +274,39 @@
 			/>
 		</view>
 		<view class="bottom-border">
-			<view class="label-text">物业费(元/㎡)</view>
+			<view class="label-text">物业费</view>
+			<view
+				class="bottom-border_r"
+				style="padding: 10px 0; height: 42px; display: flex"
+			>
 				<input
 					type="number"
 					v-model="model.PropertyFee"
 					:disabled="disabled"
-				style="padding: 10px 0"
+					style="padding: 10px 0;flex: 1;margin-right: 10px"
 					placeholder="请填写物业费"
 					placeholder-style="color:#CECECE;"
 				/>
+				<span>元/㎡</span>
+			</view>
 		</view>
 		<view class="bottom-border">
-			<view class="label-text">月租金(元/㎡)</view>
+			<view class="label-text">月租金</view>
+			<view
+				class="bottom-border_r"
+				style="padding: 10px 0; height: 42px; display: flex"
+			>
 				<input
 					type="number"
 					v-model="model.RentFee"
 					:disabled="disabled"
-				style="padding: 10px 0"
+					style="padding: 10px 0;flex: 1;margin-right: 10px"
 					placeholder="请填写月租金"
 					placeholder-style="color:#CECECE;"
 				/>
+				<span>元/㎡</span>
+			</view>
+				
 		</view>
 		<view class="bottom-border">
 			<view class="label-text">企业简介</view>
@@ -364,7 +366,7 @@
 </template>
 
 <script>
-	import {gegerateDates, dateEqual,formatDate} from '../../../appointment/components/zzx-calendar/generateDates.js';
+	import {formatDate} from '../../../appointment/components/zzx-calendar/generateDates.js';
 	export default{
 		props: {
 		    datas: {
@@ -448,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.OperationTime = formatDate(new Date(data.OperationTime),'yyyy-MM-dd')
-				this.model.HandoverDate = formatDate(new Date(data.HandoverDate),'yyyy-MM-dd')
 				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.glBrandName = data.Name
 				if(this.model.BannerList && this.model.BannerList.length>0){
 					this.model.BannerList.forEach(x=>{
@@ -486,9 +490,10 @@
 					this.disabled2 = true
 					this.disabled3 = true
 				}
-				this.CategoryName = data.ClassName;
+			}else{
+				this.model.CompanyId = this.datas.CompanyId
 			}
-			
+			this.getbrandList()
 			
 			
 		},
@@ -581,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
+								}
+							})
 						}
 					}
 				);
@@ -615,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({
@@ -768,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 &&