1

pages/kotra/brandInformation.vue

@@ -299,16 +299,15 @@
 		<view class="bottom-border">
 			<view class="label-text">开店意愿<span style='color: #E54D42;' >*</span></view>
 			<view class="bottom-border_r " style="padding: 10px 0;height: 42px;display: flex;">
-				 <radio-group @change="radioChange2($event)" style="display: flex;">
+				<!-- <radio-group @change="radioChange2($event)" style="display: flex;">
 					<label v-for="(item, index) in radiolist" :key="index" style="display: flex;margin-right: 10px;">
 						<view style="transform:scale(0.7)">
 							<radio :value="item.Id" :checked="item.Id == ShopWish" :disabled="disabled" color='#2979ff'/>
 						</view>
 						<view>{{item.name}}</view>
 					</label>
-				</radio-group>
+				</radio-group> -->
 				<u-rate
-				v-if='ShopWish==1'
 					:disabled="disabled"
 					v-model="model.OpenShopWish"
 					:current="model.OpenShopWish?model.OpenShopWish:'5'"
@@ -432,16 +431,22 @@
 			if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了
 				this.model = this.datas.BrandModel
 				this.model.CompanyId = this.datas.CompanyId
-				if(this.model.OpenShopWish==-1){
-					this.ShopWish == 0;
-				};
-				if(this.model.BannerList.length>0){
+				// if(this.model.OpenShopWish==-1){
+				// 	this.ShopWish == 0;
+				// };
+				if(this.model.BannerList && this.model.BannerList.length>0){
 					this.model.BannerList.forEach(x=>{
 						let obj ={
 							url:x
 						}
 						this.fileList.push(obj)
 					})
+				}else{
+					this.model.BannerList = [];
+					this.fileList= []
+				}
+				if(!this.model.Logo){
+					this.model.Logo = ''
 				}
 				this.BrandClassName = this.model.ClassName;
 				

pages/kotra/carrierInformation.vue

@@ -292,13 +292,19 @@
 			if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了
 				this.model = this.datas.CarrierModel
 				this.MetroList = this.model.CarrierMetroList
-				if(this.model.BannerList.length>0){
+				if(this.model.BannerList && this.model.BannerList.length>0){
 					this.model.BannerList.forEach(x=>{
 						let obj ={
 							url:x
 						}
 						this.fileList.push(obj)
 					})
+				}else{
+					this.model.BannerList = [];
+					this.fileList= []
+				}
+				if(!this.model.Logo){
+					this.model.Logo = ''
 				}
 				if(this.datas.CompanyStatus==0 &&  this.datas.IsComplete==1){//审核中
 					this.disabled = true

pages/kotra/wish/list.vue

 <template>
 	<view style="width: 100%;height: 100vh;">
-		<view class="fbanniu" @click="btnclick">
+		<view class="fbanniu" @click="btnclick" v-if="companyStatus == 5">
 			<u-icon name="plus" color="#FFF" size='30'></u-icon>
 			<!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/fabupyq.png" style="height: 26rpx;" mode="aspectFit"></image> -->
 			<text style="font-size: 10px;color: #FFF;">新增</text>
@@ -78,11 +78,11 @@
 					loading: "努力加载中",
 					nomore: "没有更多了",
 				},
-				contentHeight:0
+				contentHeight:0,
+				companyStatus:0,
+				FirstShopType:1
 			};
 		},
-	
-	
 		onLoad(options) {
 			if(options && options.id){
 				this.msg.ProjectType = options.id
@@ -93,6 +93,7 @@
 		},
 		created() {
 			this.mainColor = this.$uiConfig.mainColor;
+			
 		},
 		mounted() {
 			uni.setNavigationBarTitle({
@@ -100,6 +101,7 @@
 			});
 			this.msg.UserId = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserId:'0'
 			this.getCarrierPageList()
+			this.getComponyStatus()
 		},
 		methods: {
 			
@@ -125,6 +127,20 @@
 					}
 				})
 			},
+			// 获取公司认证信息
+			getComponyStatus(){
+				let that = this
+				let parms = {
+					url: "/api/AppletTrade/GetCommpanyStatus",
+				}
+				this.request2(parms, (res) => {
+					if (res.resultCode == 1&&res.data!=null) {
+						// 获取公司名字和认证状态
+						that.companyStatus=res.data.CompanyStatus
+						this.FirstShopType = res.data.FirstShopType
+					}
+				})
+			},
 		
 			//触底事件
 			lower(e) {

pages/user-center/user-center.vue

@@ -336,6 +336,7 @@
 			if (this.mall_UserInfo) {
 				this.getUserPoint()
 			}
+			this.getComponyStatus()//首店获取认证状态
 			let basedata =uni.getStorageSync("basedata")?uni.getStorageSync("basedata"):'';
 			this.isAttestationEdu = basedata.user_info.isAttestationEdu ? basedata.user_info.isAttestationEdu:0
 		},
@@ -407,6 +408,14 @@
 							flag = false;
 						}
 						break;	
+					case "/pages/kotra/wish/list":
+					console.log('asdas ',this.FirstShopType)
+						if(this.FirstShopType == 1){
+							flag = true;
+						}else{
+							flag = false;
+						}
+						break;	
 				}
 				return flag;
 			},