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

pages/kotra/brand/detail.vue

@@ -62,15 +62,15 @@
 							<view class="brand-xinx-item-m">店铺数量</view>
 						</view>
 						<view class="brand-xinx-item" style="padding-left: 10px;">
-							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.BuiltUpArea==0">{{details.EndBuiltUpArea}}<text style="font-size: 12px;">㎡</text></view>
-							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.EndBuiltUpArea==0">{{details.BuiltUpArea}}<text style="font-size: 12px;">㎡</text></view>
+							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.BuiltUpArea==0 && details.EndBuiltUpArea!=0">{{details.EndBuiltUpArea}}<text style="font-size: 12px;">㎡</text></view>
+							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.EndBuiltUpArea==0 && details.BuiltUpArea!=0">{{details.BuiltUpArea}}<text style="font-size: 12px;">㎡</text></view>
 							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.BuiltUpArea!=0 && details.EndBuiltUpArea!=0">{{details.BuiltUpArea}}~{{details.EndBuiltUpArea}}<text style="font-size: 12px;">㎡</text></view>
 							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.BuiltUpArea==0 && details.EndBuiltUpArea==0">/</view>
 							<view class="brand-xinx-item-m">店铺面积</view>
 						</view>
 						<view class="brand-xinx-item" style="padding-left: 10px;">
-							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.AreaRequirement==0">{{details.EndAreaRequirement}}<text style="font-size: 12px;">㎡</text></view>
-							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.EndAreaRequirement==0">{{details.AreaRequirement}}<text style="font-size: 12px;">㎡</text></view>
+							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.AreaRequirement==0 && details.EndAreaRequirement!=0">{{details.EndAreaRequirement}}<text style="font-size: 12px;">㎡</text></view>
+							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.EndAreaRequirement==0 && details.AreaRequirement!=0">{{details.AreaRequirement}}<text style="font-size: 12px;">㎡</text></view>
 							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.AreaRequirement!=0 && details.EndAreaRequirement!=0">{{details.AreaRequirement}}~{{details.EndAreaRequirement}}<text style="font-size: 12px;">㎡</text></view>
 							<view class="brand-xinx-item-t" :style="{color:mainColor}" v-if="details.AreaRequirement==0 && details.EndAreaRequirement==0">/</view>
 							<view class="brand-xinx-item-m">需求面积</view>
@@ -149,16 +149,22 @@
 					<view class="brand-title">
 						<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/kotra-ggxq.png"  mode="widthFix"></image>
 					</view>
-					<view style="margin-top: 30px;">
+					<view style="margin-top: 30px;" v-if="details.Advertising!=''">
 						<h-parse :content="details.Advertising" @navigate="clickDescription"></h-parse>
 					</view>
+					<view style="margin-top: 30px;" v-if="details.Advertising==''">
+						无
+					</view>
 					<view class="brand-title" style="width: 36px;">
 						<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/kotra-qt.png" mode="widthFix"></image>
 					</view>
-					<view style="margin-top: 30px;">
+					<view style="margin-top: 30px;" v-if="details.Other!=''">
 						<h-parse :content="details.Other" @navigate="clickDescription"></h-parse>
 
 					</view>
+					<view style="margin-top: 30px;" v-if="details.Other==''">
+						无
+					</view>
 				</view>
 			</view>
 		</scroll-view>

pages/kotra/brand/list.vue

@@ -92,6 +92,12 @@
 				
 			};
 		},
+		onLoad(options) {
+			if(options && options.id){
+				this.msg.BrandClassId = options.id
+			}
+			this.GetBrandClassList()
+		},
 		created() {
 			this.mainColor = this.$uiConfig.mainColor;
 		},
@@ -99,7 +105,7 @@
 			uni.setNavigationBarTitle({
 				title: '品牌列表',
 			});
-			this.GetBrandClassList()
+			
 			
 		},
 		methods: {
@@ -111,7 +117,17 @@
 					(res) => {
 						if (res.resultCode == 1) {
 							this.typeList = res.data
-							this.msg.BrandClassId = this.typeList[0].ID
+							if(this.msg.BrandClassId ==0){
+								this.msg.BrandClassId = this.typeList[0].ID
+							}else{//指定跳入分类
+								this.typeList.map((x,i)=>{
+									if(x.ID== this.msg.BrandClassId){
+										this.active = i;
+										return
+									}
+								})
+							}
+							
 						}
 					}
 				);
@@ -202,7 +218,7 @@
 		bottom: 0;
 		right: 0;
 		width: 100%;
-		height: 100%;
+		height: 338rpx;
 		overflow: hidden;
 	}
 	
@@ -220,6 +236,7 @@
 	
 	.good_study_two .good-info {
 		padding: 15rpx;
+		height: 112rpx;
 	}
 	
 	.good_study_two .good-info .good-name {

pages/kotra/carrier/list.vue

 <template>
-	<div style="background-color: #f6f6f6;height: 100vh;padding-bottom: 90px; overflow: hidden;">
+	<div style="background-color: #f6f6f6;height: 100vh;padding-bottom: 65px; overflow: hidden;">
 		<view style="padding:5px 10px;">
 			<u-search placeholder="搜索载体名称" :focus="false" :show-action="false" :clearabled="true" radius="40" v-model="searchKey"
 			 @search="searchHandler" @custom="searchHandler" bg-color="#FFF" ></u-search>
@@ -84,27 +84,7 @@
 					Id: 4,
 					Name: '其他'
 				}],
-				dataList:[{
-					Address: null,
-					CarNum: 0,
-					CarrierMetroList: null,
-					CarrierName: "相亲活动",
-					CarrierPlan: null,
-					CarrierSize: 0,
-					CarrierTarget: null,
-					CreateDate: "2021-03-10 10:24",
-					Crowd: null,
-					Developers: null,
-					ID: 5,
-					LatAndLon: null,
-					LayersNum: null,
-					Location: null,
-					Logo: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1609316585000_250.jpg",
-					OpenTime: "",
-					ProjectType: 0,
-					ProjectTypeName: "",
-					VideoUrl: null,
-				}],
+				dataList:[],
 				msg:{
 					 pageIndex:1,
 					 pageSize:10,
@@ -114,7 +94,7 @@
 					 Developers:"",
 					 StartOpenTime:"",
 					 EndOpenTime:"",
-					 ProjectType:"",
+					 ProjectType:1,
 					 OrderBy:0
 				},
 				loading: false,
@@ -127,10 +107,17 @@
 				},
 			};
 		},
+		onLoad(options) {
+			if(options && options.id){
+				this.msg.ProjectType = options.id
+			}
+			
+			this.getTypeList()
+		},
 		created() {
 			this.mainColor = this.$uiConfig.mainColor;
-			this.getTypeList()
-			this.getCarrierPageList()
+			
+			
 		},
 		mounted() {
 			uni.setNavigationBarTitle({
@@ -145,10 +132,21 @@
 				}
 				this.request2(parms, (res) => {
 					if (res.resultCode == 1) {
-						this.pageCount = res.data.pageCount
+						// this.pageCount = res.data.pageCount
 						this.typeList = res.data
+						if(this.msg.ProjectType ==1){
+							
+						
+						}else{//指定跳入分类
+							this.typeList.map((x,i)=>{
+								if(x.Id== this.msg.ProjectType){
+									this.active = i;
+								}
+							})
+						}
 					}
 				})
+				this.getCarrierPageList()
 			},
 			// 获取载体分页列表
 			getCarrierPageList(){
@@ -159,7 +157,8 @@
 				this.request2(parms, (res) => {
 					this.loading = false;
 					if (res.resultCode == 1) {
-						this.dataList=res.data.pageData
+						this.dataList = this.dataList.concat(res.data.pageData);
+						this.pageCount = res.data.pageCount
 						if (this.pageCount == 1) {
 							this.status = "nomore";
 						}
@@ -168,7 +167,9 @@
 			},
 			changeHandler(i) {
 				this.active = i;
-				this.msg.ProjectType=i
+				this.msg.ProjectType = this.typeList[i].Id;
+				this.msg.pageIndex = 1;
+				this.dataList= [];
 				this.getCarrierPageList()
 			},
 			openGood(id,type) {

pages/kotra/firstShop/firstShop.vue

@@ -361,13 +361,29 @@
 							  title: '提交成功',
 							  icon:'none'
 							});
-							uni.reLaunch({
-								url: "/pages/kotra/firstShop/list",
-							})
+							setTimeout(()=>{
+								
+								this.showTemplate(res.data)
+							},500)
+							
+							
 						}
 					}
 				);
 			},
+			//显示模板
+			showTemplate(template) {
+				uni.requestSubscribeMessage({
+					tmplIds: template,
+					complete(res){
+						console.log(res)
+						uni.reLaunch({
+							url: "/pages/kotra/firstShop/list",
+						})
+					},
+				
+				})
+			},
 			deletebtn(){//删除
 				this.request2(
 					{