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

pages/kotra/BrandEnterSetIn/components/brandInformation.vue

@@ -270,7 +270,7 @@
 			style="padding: 10px 0;" placeholder="请填写联系人"  placeholder-style="color:#CECECE;">
 		</view>
 		<view class="bottom-border">
-			<view class="label-text">品牌简介</view>
+			<view class="label-text">联系人电话</view>
 			<input type="text" v-model="model.ContactPhone"
 			style="padding: 10px 0;" placeholder="请填写联系人电话"  placeholder-style="color:#CECECE;">
 		</view>
@@ -429,7 +429,7 @@
 				// this.model.XinFeng = data.XinFeng?data.XinFeng:1;
 				// this.model.IsInChengdu = data.IsInChengdu?data.IsInChengdu:0;
 				
-				// this.model.CategoryId = data.CategoryId?data.CategoryId:'';
+				// this.model.BrandClassId= data.CategoryId?data.CategoryId:'';
 				// this.model.RanQiBZ = data.RanQiBZ?data.RanQiBZ:'';
 				// this.model.IsDianLiang = data.IsDianLiang? data.IsDianLiang:1;
 				// this.model.PaiYanBZ = data.PaiYanBZ?data.PaiYanBZ:'';
@@ -650,7 +650,7 @@
 			clickItem(x) {//类型选择
 				if(this.showType==1){
 					this.BrandClassName = x.ClassName;
-					this.model.CategoryId = x.ID;
+					this.model.BrandClassId= x.ID;
 					this.showTypeStatus=false
 				}else {
 					let list = this.model.PropertyDemandList.filter(y=>{
@@ -672,7 +672,6 @@
 				})
 			},
 			brandchildren(Id){//主页面调取方法
-				
 				this.request2({
 						url: "/api/AppletTrade/GetBrandDetailsForCompany",
 						data: {ID:Id},
@@ -707,7 +706,7 @@
 							this.model.KongTiao = data.KongTiao;
 							this.model.XinFeng = data.XinFeng;
 							this.model.IsInChengdu = data.IsInChengdu;
-							this.model.CategoryId = data.CategoryId;
+							this.model.BrandClassId= data.CategoryId;
 							this.model.RanQiBZ = data.RanQiBZ;
 							this.model.IsDianLiang = data.IsDianLiang;
 							this.model.PaiYanBZ = data.PaiYanBZ;
@@ -727,7 +726,7 @@
 								})
 							}
 							this.BrandClassList.forEach(x=>{
-								if(this.model.CategoryId == x.ID){
+								if(this.model.BrandClassId== x.ID){
 									this.BrandClassName = x.ClassName;
 								}
 							})
@@ -737,7 +736,7 @@
 			},
 			brandSubmit(){
 				
-				if(this.model.CategoryId == ''){
+				if(this.model.BrandClassId== ''){
 					uni.showToast({title: '请选择品牌分类',icon: 'none',})
 					return
 				}

pages/kotra/BrandEnterSetIn/components/buildingInformation.vue

@@ -143,7 +143,7 @@
         <view slot="addBtn" class="slot-btn" v-if="disabled == false">
           <image
             class="image"
-            src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616498310000_18.png"
+            src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappimg.png"
             mode="widthFix"
           ></image>
         </view>
@@ -514,8 +514,8 @@ export default {
       this.datas.IsComplete != undefined
     ) {
       //判断是否填写过了
-      this.model = this.datas.CarrierModel
-      let data = this.datas.CarrierModel;
+      this.model = this.datas.buildingApplyForModel
+      let data = this.datas.buildingApplyForModel;
       // this.model = this.datas.CarrierModel
 
       if (this.model.BannerList && this.model.BannerList.length > 0) {

pages/kotra/BrandEnterSetIn/components/carrierInformation.vue

@@ -287,7 +287,7 @@
         <view slot="addBtn" class="slot-btn" @click="disabled ? '' : upvideo()">
           <image
             class="image"
-            src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1616573063000_398.png"
+            src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappvideo.png"
             mode="widthFix"
           ></image>
         </view>
@@ -621,7 +621,7 @@ export default {
       this.datas.IsComplete != undefined
     ) {
       //判断是否填写过了
-      this.model = this.datas.CarrierModel
+      this.model = this.datas.EnterpriseServicesModel
 
       if (this.model.BannerList && this.model.BannerList.length > 0) {
         this.model.BannerList.forEach((x) => {

pages/kotra/BrandEnterSetIn/components/enterInformation.vue

@@ -150,7 +150,7 @@
 		</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/Test/Upload/Goods/1616498310000_18.png" mode="widthFix"></image>
+				<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>
@@ -165,7 +165,7 @@
 		<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">
 				<view slot="addBtn" class="slot-btn" v-if='disabled==false'> 
-					<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616498310000_18.png" mode="widthFix"></image>
+					<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappimg.png" mode="widthFix"></image>
 				</view>
 			</u-upload>
 		</view>
@@ -452,11 +452,11 @@
 			this.model.CompanyId = this.datas.CompanyId
 			
 			if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了
-				this.model = this.datas.BrandModel
+				this.model = this.datas.EnterpriseServicesModel
 				this.model.CompanyId = this.datas.CompanyId
-		
+				let data = this.datas.EnterpriseServicesModel
 				
-				this.glBrandName = data.BrandName
+				this.glBrandName = data.Name
 				if(this.model.BannerList && this.model.BannerList.length>0){
 					this.model.BannerList.forEach(x=>{
 						let obj ={

pages/kotra/BrandEnterSetIn/enterIndex.vue

@@ -286,7 +286,7 @@ export default {
       goodsType: [], //商品性质
       goodsTypeValue: "",
       businessLicenseDemo:
-        "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/upLoadDemo.png", //营业执照占位图片
+        "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappupbg.png", //营业执照占位图片
       businessLicenseUploadIsSuccess: false, //营业执照是否上传成功
       access_token: "", //百度ai平台token
       dataOne: {
@@ -504,7 +504,7 @@ export default {
     stepOne() {
       this.dataOne.FirstShopType = this.ChooseidentityId;
       let parms = {
-        url: "/api/AppletTrade/SetCompany",
+        url: "/api/AppletTrade/SetCompanyEnterprise",
         data: this.dataOne,
       };
       this.request2(parms, (res) => {

pages/kotra/brand/list.vue

@@ -313,9 +313,9 @@ export default {
     this.replace = uni.getStorageSync('replace_page_index')
     this.msg.BrandEnterpriseType = this.replace.state=='1'?1:2
     
-    // if (options && options.id) {
-    //   this.msg.BrandClassId = options.id;
-    // }
+    if (options && options.id) {
+      this.msg.BrandClassId = options.id;
+    }
 	// this.u = uni.getStorageSync("mall_UserInfo");
 	// if (!this.u) {
 	//   this.u = {

pages/kotra/carrier/list.vue

@@ -405,8 +405,8 @@ export default {
     this.msg.BuildingCarrierType = this.replace.state=='1'?1:2
 
     if (options && options.id) {
-      // if(this.TenantId==18) this.msg.ProjectType = options.id;
-      // else this.msg.CategoryId = options.id
+      this.msg.ProjectType = options.id;
+      this.msg.CategoryId = options.id
     }
     let c = this.$uiConfig.is_bang ? 78 : 50;
     this.contentHeight = this.$utils.calcContentHeight(c) + 40;