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

node_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue

@@ -7,7 +7,7 @@
 		<block v-for="(item, index) in list" :key="index">
 			<view @touchmove.stop.prevent @tap="itemClick(index)" :style="[itemStyle(index)]" class="u-action-sheet-item" :class="[index < list.length - 1 ? 'u-border-bottom' : '']"
 			 hover-class="u-hover-class" :hover-stay-time="150">
-				{{item.text}}
+				{{ item[name] || item['name']}}
 			</view>
 		</block>
 		<view class="u-gab" v-if="cancelBtn">
@@ -89,7 +89,12 @@
 			zIndex: {
 				type: [String, Number],
 				default: 0
-			}
+			},
+			// 读取传入的数组对象的属性
+			name: {
+				type: String,
+				default: 'text'
+			},
 		},
 		computed: {
 			// 顶部提示的样式

pages/kotra/brand/detail.vue

@@ -3,34 +3,35 @@
 		<scroll-view scroll-y="true" style="width: 100%;height: 100%;" @scroll="scroll">
 			<view style="height: 700rpx;position: relative;z-index: 1;" :style="{'opacity':(100-boxOption)+'%'}">
 				<u-swiper
-					:list="imgsList"
+					:list="details.imgs"
 					:effect3d="false"
 					:height="700"
 					:interval="5000"
 					:border-radius="0"
 					@click="previewImage"
-					name="url"
+					name='name'
 					 v-if="active==1"
 				></u-swiper>
 				<view style="background-color: #111;height: 700rpx;position: relative;" v-if="active==0">					
-					<video id="myVideo" :src="files" style="width: 100%;height: 100%;"
+					<video id="myVideo" :src="details.VideoUrl" style="width: 100%;height: 100%;"
+					object-fit ='fill'
 					:controls='controls' 
 					:show-center-play-btn='false'
 					:show-fullscreen-btn='false' 
 					@fullscreenchange='videoControl'
 					></video>
-					<view @click="enlarge(files)" style="position: absolute;left: 50%;top: 50%;margin-top: -49rpx;margin-left: -49rpx;width: 98rpx;height: 98rpx;border-radius: 20rpx;background-color: rgba(255,255,255,.4);display: flex;align-items: center;justify-content: center;">
+					<view @click="enlarge(details.VideoUrl)" style="position: absolute;left: 50%;top: 50%;margin-top: -49rpx;margin-left: -49rpx;width: 98rpx;height: 98rpx;border-radius: 20rpx;background-color: rgba(255,255,255,.4);display: flex;align-items: center;justify-content: center;">
 						<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616471847000_345.png" style="width: 37rpx;height: 44rpx;" mode=""></image>
 					</view>
 				</view>
-				<view style="width: 100px;height: 50rpx;position: absolute;background-color: rgba(255,255,255,.6);border-radius: 50rpx;left: 50%;bottom: 80px;margin-left:-50px;">
+				<view style="width: 100px;height: 50rpx;position: absolute;background-color: rgba(255,255,255,.6);border-radius: 50rpx;left: 50%;bottom: 80px;margin-left:-50px;" v-if="details.VideoUrl!=''">
 					<u-tabs bg-color="rgba(0,0,0,0)" :is-scroll="false" name="Name" :list="typeList" :active-color="mainColor"
 						:current="active" @change="changeHandler" :show-bar="true" :bold="false" height="50"
 						duration="0" font-size="24" :activeFontSize="24" :typeStyle="2"></u-tabs>
 				</view>
 				<view style="height: 50rpx;position: absolute;background-color: rgba(0,0,0,.6);border-radius: 50rpx;left: 30rpx;bottom: 80px;color:#FFF;padding:0 18rpx;display: flex;align-items: center;">
 					<u-icon name="photo-o" size="26" color="#FFF" style="margin-right: 6rpx;"></u-icon>
-					<text style="font-size: 22rpx;font-family: pingfang;">15</text>
+					<text style="font-size: 22rpx;font-family: pingfang;">{{details.BannerList.length}}</text>
 				</view>
 				<view @click="goback" :style="[titleStyle,{opacity:'100% !important'}]" style="position: fixed;top: 0;left: 0;padding-left: 6rpx;">
 					<u-icon name="arrow-left" size="44" color="#FFF" style="margin-top: 22rpx;"></u-icon>
@@ -40,55 +41,63 @@
 				<view @click="goback">
 					<u-icon name="arrow-left" size="44"></u-icon>
 				</view>
-				<view style="flex: 1;margin-left: 30rpx; text-align: left;">银泰in99</view>
+				<view style="flex: 1;margin-left: 30rpx; text-align: left;">{{details.BrandName}}</view>
 				
 			</view>
 			<view style="position: relative;z-index: 2;">
 				<view style="position: relative;top: -70px;border-top-left-radius: 30px;border-top-right-radius: 30px;height: 900px;background-color: #FFF;padding:60rpx 40rpx;">
 					<view style="font-size: 21px;color: #1F1F1F;font-weight: bold;">
-						成都拾野自然博物馆
+						{{details.FullBrandName}}
 					</view>
 					<view style="width: 100%;height: 35px;display: flex;align-items: center;justify-content: space-between;">
 						<view class="label-b" :style="{'background':mainColor}">
-							shopping mall
+							{{details.ProjectName}}
 						</view>
-						<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/kotra-love.png" style="width: 63px;height: 63px;"></image>
+						<image v-if="details.CollectId>0" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/kotra-love.png" style="width: 63px;height: 63px;" @click="getlove()"></image>
+						<image v-if="details.CollectId==0" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_509.png" style="width: 63px;height: 63px;" @click="getlove()"></image>
 					</view>
 					<view class="brand-xinx">
 						<view class="brand-xinx-item">
-							<view class="brand-xinx-item-t" :style="{color:mainColor}">2</view>
+							<view class="brand-xinx-item-t" :style="{color:mainColor}">{{details.ShopNum}}</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}">500<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}">600<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>
 						</view>
 					</view>
 					<view class="brand-x">
 						<view class="brand-x-l">拓店区域：</view>
-						<view class="brand-x-r">四川成都</view>
+						<view class="brand-x-r">{{details.StoreExpansion}}</view>
 					</view>
 					<view class="brand-x">
 						<view class="brand-x-l">品牌定位：</view>
-						<view class="brand-x-r">商业地产+体育运动的新型“SPORTMALL”的全新商业场景</view>
+						<view class="brand-x-r">{{details.BrandType}}</view>
 					</view>
 					<view class="brand-x">
 						<view class="brand-x-l">客群定位：</view>
-						<view class="brand-x-r">白领，家庭，学生等对体育有需求同时具有一定的消费能力的客户群体</view>
+						<view class="brand-x-r">{{details.CustomerType}}</view>
 					</view>
 					
 					<view style="width: 100%;position: relative;margin-top: 46px;background: rgba(252, 42, 76, 0.05);padding: 15px 0;border-radius: ;">
 						<view style="width: 150rpx;height: 150rpx;background: #FFFFFF;box-shadow: 0px 2px 15px 0px rgba(167, 167, 167, 0.39);border-radius: 10px;position: absolute;left: 0;top: -23px;">
-							<!-- 放图片 -->
+							
+							<image :src='details.Logo' style="width: 100%;height: 100%;" mode="aspectFill"></image>
 						</view>
 						<view style="width: calc(100vw - 40px - 150rpx - 20px);margin-left: 190rpx;">
 							<view style="font-size: 13px;color: #B1B1B1;">品牌名称：</view>
 							<view style="font-size: 15px;color: #1F1F1F;font-weight: bold;margin-top: 10px;">
-								拾野·自然博物馆
+								{{details.BrandName}}
 							</view>
 						</view>
 					</view>
@@ -96,24 +105,66 @@
 						<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/kotra-wyxq.png" mode="widthFix"></image>
 					</view>
 					<view class="Listbox" >
-						<view class="Listbox-item" v-for='(x,y) in EquityList' :key='y'>
-							<image :src="x.ImagePath" style="width: 74rpx;height: auto;" mode="widthFix"></image>
-							<text class="list-item-text" style="font-size: 12px;color: #424242;">{{x.Title}}</text>
+						<view class="Listbox-item" >
+							<image :src="EquityList[0].ImagePath" v-if="details.Plumbing==1" mode="widthFix"></image>
+							<image :src="EquityList[0].Image_n" v-else mode="widthFix"></image>
+							<text class="list-item-text" :style="{color:details.Plumbing==1?'#424242':'#D6D6D6'}">{{EquityList[0].Title}}</text>
+						</view>
+						<view class="Listbox-item" >
+							<image :src="EquityList[1].ImagePath" v-if="details.Sewage==1"  mode="widthFix"></image>
+							<image :src="EquityList[1].Image_n" v-else mode="widthFix"></image>
+							<text class="list-item-text" :style="{color:details.Sewage==1?'#424242':'#D6D6D6'}">{{EquityList[1].Title}}</text>
+						</view>
+						<view class="Listbox-item" >
+							<image :src="EquityList[2].ImagePath" v-if="details.RanQi==1"  mode="widthFix"></image>
+							<image :src="EquityList[2].Image_n" v-else mode="widthFix"></image>
+							<text class="list-item-text" :style="{color:details.RanQi==1?'#424242':'#D6D6D6'}">{{EquityList[2].Title}}</text>
+						</view>
+						<view class="Listbox-item" >
+							<image :src="EquityList[3].ImagePath" v-if="details.DianLiang!=''"  mode="widthFix"></image>
+							<image :src="EquityList[3].Image_n" v-else mode="widthFix"></image>
+							<text class="list-item-text" :style="{color:details.DianLiang!=''?'#424242':'#D6D6D6'}">{{EquityList[3].Title}}</text>
+						</view>
+						<view class="Listbox-item" >
+							<image :src="EquityList[4].ImagePath" v-if="details.XinFeng==1"  mode="widthFix"></image>
+							<image :src="EquityList[4].Image_n" v-else mode="widthFix"></image>
+							<text class="list-item-text" :style="{color:details.XinFeng==1?'#424242':'#D6D6D6'}">{{EquityList[4].Title}}</text>
+						</view>
+						<view class="Listbox-item" >
+							<image :src="EquityList[5].ImagePath" v-if="details.PaiYan==1"  mode="widthFix"></image>
+							<image :src="EquityList[5].Image_n" v-else mode="widthFix"></image>
+							<text class="list-item-text" :style="{color:details.PaiYan==1?'#424242':'#D6D6D6'}">{{EquityList[5].Title}}</text>
+						</view>
+						<view class="Listbox-item" >
+							<image :src="EquityList[6].ImagePath" v-if="details.KongTiao==1"  mode="widthFix"></image>
+							<image :src="EquityList[6].Image_n" v-else mode="widthFix"></image>
+							<text class="list-item-text" :style="{color:details.KongTiao==1?'#424242':'#D6D6D6'}">{{EquityList[6].Title}}</text>
+						</view>
+						<view class="Listbox-item" >
+							<image :src="EquityList[7].ImagePath" v-if="details.Caliber==1"  mode="widthFix"></image>
+							<image :src="EquityList[7].Image_n" v-else mode="widthFix"></image>
+							<text class="list-item-text" :style="{color:details.Caliber==1?'#424242':'#D6D6D6'}">{{EquityList[7].Title}}</text>
 						</view>
 					</view>
 					<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;font-size: 13px;color: #1F1F1F;">
+					<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;font-size: 13px;color: #1F1F1F;">
-						城市一、二类商圈；选择繁华的商业中心，及地标性购物中心交通便利，项目周边交通状况良好，地铁直达最佳
+					<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>
@@ -121,21 +172,16 @@
 </template>
 
 <script>
+	import hParse from "@/components/u-parse/parse.vue";
 	export default {
+		components: {
+		
+		  hParse
+		},
 		data() {
 			return {
-				imgs:[
-					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_561.png',
-					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_819.png'
-				],
-				imgsList:[
-					{
-						url:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_561.png'
-					},
-					{
-						url:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_819.png'
-					}
-				],
+				ID:0,
+				details:{},
 				typeList: [{
 					Id: 0,
 					Name: '视频'
@@ -149,43 +195,35 @@
 				active:0,
 				mainColor:'',
 				controls:false,//显示默认控件
-				files:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/SaleBefore/Goods/637516872805837677.mp4',
 				EquityList:[
-{
-"Id":11,
-"Title":"权益五",
-"ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1616056016000_64.png",
-"Content":"会员权益"
-},
-{
-"Id":10,
-"Title":"权益四",
-"ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1616056016000_955.png",
-"Content":"1对1客服"
-},
-{
-"Id":9,
-"Title":"权益三",
-"ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1616056016000_417.png",
-"Content":"会员权益"
-},
-{
-"Id":8,
-"Title":"权益二",
-"ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1616056016000_864.png",
-"Content":"会员权益"
-},
-{
-"Id":7,
-"Title":"所有权益",
-"ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1616056016000_711.png",
-"Content":"超级会员"
-}
-]
+					{"Title":"上下水","ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-sxs.png",
+						"Image_n":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-sxs-n.png",
+					},
+					{"Title":"排污","ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pw.png",
+					"Image_n":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pw-n.png"},
+					{"Title":"燃气","ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-rh.png",
+					"Image_n":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-rh-n.png"},
+					{"Title":"电量负荷","ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-dl.png",
+					"Image_n":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-dl-n.png"},
+					{"Title":"新风","ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-xf.png",
+					"Image_n":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-xf-n.png"},
+					{"Title":"排烟量","ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pyl.png",
+					"Image_n":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-pyl-n.png"},
+					{"Title":"空调","ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-kt.png",
+					"Image_n":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-kt-n.png"},
+					{"Title":"管径","ImagePath":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-gj.png",
+					"Image_n":"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/k-brand-gj-n.png"},
+
+				]
 			}
 		},
 		onLoad(options) {
 			let that=this
+			if(options && options.id){
+				this.ID = options.id
+				this.GetBrandDetails()
+			}
+			
 			uni.getSystemInfo({
 				success(res) {
 					that.titleStyle = {
@@ -198,13 +236,42 @@
 			this.mainColor = this.$uiConfig.mainColor;
 		},
 		methods: {
+			clickDescription(e) {
+			  console.log(e);
+			},
+			GetBrandDetails(){
+				this.request2(
+					{
+						url: '/api/AppletTrade/GetBrandDetails',
+						data: {ID:this.ID}
+					},
+					res => {
+						if(res.resultCode==1){
+							this.details = res.data;
+							console.log(this.details)
+							if(res.data.VideoUrl==''){
+								this.active=1
+							};
+							this.details.imgs=[]
+							this.details.BannerList.forEach(x=>{
+								let obj= {
+									name:x
+								}
+								this.details.imgs.push(obj)
+							})
+							console.log(this.details.imgs)
+							
+						}
+					}
+				);
+			},
 			changeHandler(i) {
 				this.active = i;
 			},
 			previewImage(i) {
 				console.log(i)
 				uni.previewImage({
-					urls: this.imgs,
+					urls: this.details.BannerList,
 					current: i,
 					longPressActions: {
 						itemList: ["发送给朋友", "保存图片", "收藏"],
@@ -242,6 +309,23 @@
 					this.controls=true
 				}
 			},
+			getlove(){
+				this.request2(
+					{
+						url: '/api/AppletTrade/GetCollect',
+						data: {Type:2,SourceId:this.ID,Id:this.details.CollectId}
+					},
+					res => {
+						if(res.resultCode==1){
+							uni.showToast({
+							  title: res.message,
+							  icon:'none'
+							});
+							this.GetBrandDetails()
+						}
+					}
+				);
+			}
 		}
 
 	}
@@ -334,9 +418,14 @@
 		align-items: center;
 		justify-content: center;
 	}
+	.Listbox-item image{
+		width: 74rpx;height: auto;	
+	}
+
 	 .list-item-text{
 		width: calc(100vw / 4);
 		margin-top: 5px;
 		text-align: center;
+		font-size: 12px;
 	}
 </style>

pages/kotra/brand/list.vue

 <template>
-	<div style="background-color: #f6f6f6;height: 100vh;padding-bottom: 90px;overflow: hidden;">
+	<div style="background-color: #f6f6f6;height: 100vh;padding-bottom: 50px;overflow: hidden;">
 		<view style="padding:5px 10px;">
-			<u-search placeholder="搜索品牌名称" :focus="false" :show-action="false" :clearabled="true" radius="40" v-model="searchKey"
+			<u-search placeholder="搜索品牌名称" :focus="false" :show-action="false" :clearabled="true" radius="40" v-model="msg.BrandName"
 			 @search="searchHandler" @custom="searchHandler" bg-color="#FFF" ></u-search>
 		</view>
 		<view style="display: flex; align-items: center;">
 			<view style="flex:1;overflow: hidden;">
-				<u-tabs bg-color="#f6f6f6" :is-scroll="true" name="Name" :list="typeList" :active-color="mainColor"
+				<u-tabs bg-color="#f6f6f6" :is-scroll="true" name="ClassName" :list="typeList" :active-color="mainColor"
 					:current="active" @change="changeHandler" :show-bar="true" :activeFontSize="34" :bold="true" height="100"
 					duration="0" font-size="28"></u-tabs>
 			</view>
@@ -14,246 +14,40 @@
 				<u-icon name="filter-o" color="#111" size="42"></u-icon>
 			</div>
 		</view>
-		
-		<view style="height: calc(100% - 101px);padding:2px 10px;">
-			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true"
+		<u-empty v-if="g.length == 0" text="暂无内容" mode="list"></u-empty>
+		<view style="height: calc(100% - 101px);padding:2px 10px;" v-if="g.length > 0">
+			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower"
 				style="height: 100%; padding-bottom: 0px;">
 				<u-row gutter="24">
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
+					<u-col span="6" v-for="(x, i) in g" :key="i" >
+						<view class="good_study_two" @click="openGood(x.ID)" :style="{borderRadius:'10px'}">
 							<view class="img-box">
 								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
 									<image style="
 										  width: 100%;
 										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
+										"mode="aspectFill" :src="x.BannerList[0]" />
 								</view>
 							</view>
 							<view class="good-info">
-								<view class="good-name">柴门荟</view>
+								<view class="good-name">{{x.BrandName}}</view>
 								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
-								</view>
-							</view>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="good_study_two" @click="openGood" :style="{borderRadius:'10px'}">
-							<view class="img-box">
-								<view class="img-show" :style="{'border-top-left-radius':'10px'}">
-									<image style="
-										  width: 100%;
-										  height: 100%;
-										"mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_706.png" />
-								</view>
-							</view>
-							<view class="good-info">
-								<view class="good-name">柴门荟</view>
-								<view class="good-price-info">
-									<span class="price">极致川味匠心的餐厅</span>
+									<span class="price">{{x.FullBrandName}}</span>
 								</view>
 							</view>
 						</view>
 					</u-col>
+					
 				</u-row>
+				<u-loadmore
+				  :status="status"
+				  :load-text="loadText"
+				  :font-size="24"
+				  :margin-top="20"
+				  :margin-bottom="20"
+				  bg-color="#f6f6f6"
+				/>
+				<view style="width: 100%;height: 30px;"></view>
 			</scroll-view>
 		</view>
 		<tabbars></tabbars>
@@ -271,36 +65,39 @@
 				mainColor: '',
 				active: 0,
 				searchKey:"",
-				typeList: [{
-					Id: 0,
-					Name: '全部'
-				}, {
-					Id: 1,
-					Name: '特色餐饮'
-				}, {
-					Id: 2,
-					Name: '文娱休闲'
-				}, {
-					Id: 3,
-					Name: '儿童亲子'
-				}, {
-					Id: 4,
-					Name: '便民生活'
-				}, {
-					Id: 5,
-					Name: '服装服饰'
-				}, {
-					Id: 4,
-					Name: '饮品烘焙'
-				}, {
-					Id: 4,
-					Name: '生活用品'
-				}, {
-					Id: 4,
-					Name: '其他'
-				}]
+				typeList: [],
+				msg:{
+					pageIndex:1,
+					pageSize:20,
+					BrandName:'',
+					ProjectType:'',
+					Plumbing:-1,
+					Caliber:-1,
+					Sewage:-1,
+					RanQi:-1,
+					DianLiang:-1,
+					PaiYan:-1,
+					KongTiao:-1,
+					XinFeng:-1,
+					BrandClassId:0,
+				},
+				loadText: {
+					loadmore: "轻轻上拉，加载更多",
+					loading: "努力加载中",
+					nomore: "没有更多了",
+				},
+				page_count:1,
+				status: "loadmore",
+				g: [],
+				
 			};
 		},
+		onLoad(options) {
+			if(options && options.id){
+				this.msg.BrandClassId = options.id
+			}
+			this.GetBrandClassList()
+		},
 		created() {
 			this.mainColor = this.$uiConfig.mainColor;
 		},
@@ -308,17 +105,80 @@
 			uni.setNavigationBarTitle({
 				title: '品牌列表',
 			});
+			
+			
 		},
 		methods: {
+			GetBrandClassList(){
+				this.request2({
+						url: "/api/AppletTrade/GetBrandClassList",
+						data: {},
+					},
+					(res) => {
+						if (res.resultCode == 1) {
+							this.typeList = res.data
+							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
+									}
+								})
+							}
+							
+						}
+					}
+				);
+				this.init();
+			},
+			init() {
+			  this.request2(
+			  	{
+			  		url: '/api/AppletTrade/GetBrandPageList',
+			  		data: this.msg
+			  	},
+			  	res => {
+			  		if(res.resultCode==1){
+						this.g = this.g.concat(res.data.pageData);
+						 this.page_count = res.data.pageCount;
+						 if (this.page_count == 1) {
+						   this.status = "nomore";
+					}
+			  		}
+			  	}
+			  );
+			},
+			lower(e) {
+			  if (this.msg.pageIndex < this.page_count) {
+			    this.msg.pageIndex++;
+				this.status = "loading";
+			    this.init();
+			  } else {
+			    
+				this.status = "nomore";
+			  }
+			},
 			changeHandler(i) {
 				this.active = i;
+				this.msg.BrandClassId = this.typeList[i].ID;
+				this.msg.pageIndex = 1;
+				this.g= [];
+				 this.init();
 			},
 			openGood(id) {
+				
 				uni.navigateTo({
-					url: 'pages/kotra/carrier/detail?id=' + id,
+					url: '/pages/kotra/brand/detail?id=' + id,
 				});
 			},
-			searchHandler(val){}
+			searchHandler(val){
+				this.msg.BrandName = val;
+				this.msg.pageIndex = 1;
+				this.g= [];
+				 this.init();
+			}
 		}
 	};
 </script>
@@ -358,7 +218,7 @@
 		bottom: 0;
 		right: 0;
 		width: 100%;
-		height: 100%;
+		height: 338rpx;
 		overflow: hidden;
 	}
 	
@@ -376,6 +236,7 @@
 	
 	.good_study_two .good-info {
 		padding: 15rpx;
+		height: 112rpx;
 	}
 	
 	.good_study_two .good-info .good-name {

pages/kotra/carrier/detail.vue

@@ -5,17 +5,16 @@
 				<u-swiper :list="imgsList" :effect3d="false" :height="700" :interval="5000" :border-radius="0"
 					@click="previewImage" name="url" v-if="active==1"></u-swiper>
 				<view style="background-color: #111;height: 700rpx;position: relative;" v-if="active==0">
-					<!-- <image
-						src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_211.png"
-						style="width: 100%;height: 100%;" mode="aspectFill"></image> -->
-					<video id="myVideo" :src="files" style="width: 100%;height: 100%;"
+					<video id="myVideo" :src="detailData.VideoUrl" style="width: 100%;height: 100%;"
 					:controls='controls' 
 					:show-center-play-btn='false'
 					:show-fullscreen-btn='false' 
 					@fullscreenchange='videoControl'
+					object-fit ='fill'
 					></video>
-					<view @click="enlarge(files)"
+					<view @click="enlarge"
 						style="position: absolute;left: 50%;top: 50%;margin-top: -49rpx;margin-left: -49rpx;width: 98rpx;height: 98rpx;border-radius: 20rpx;background-color: rgba(255,255,255,.4);display: flex;align-items: center;justify-content: center;">
+						<!-- 播放按钮 -->
 						<image
 							src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616471847000_345.png"
 							style="width: 37rpx;height: 44rpx;" mode=""></image>
@@ -42,7 +41,7 @@
 				<view @click="goback">
 					<u-icon name="arrow-left" size="44"></u-icon>
 				</view>
-				<view style="flex: 1;margin-left: 30rpx; text-align: left;">银泰in99</view>
+				<view style="flex: 1;margin-left: 30rpx; text-align: left;">{{detailData.CarrierName}}</view>
 
 			</view>
 			<view style="position: relative;z-index: 2;">
@@ -51,17 +50,18 @@
 					<view style="display:flex;align-items:flex-start; margin-bottom: 30rpx;">
 						<view style="flex:1;">
 							<view style="font-size: 42rpx;color:#1f1f1f;font-weight: 600;">
-								王府井购物中心
+								{{detailData.CarrierName}}
 							</view>
 							<view style="margin-top: 16rpx;">
-								<u-tag text="SHOPPING MALL" mode="dark" :bg-color="mainColor" />
+								<u-tag :text="ProjectType" mode="dark" :bg-color="mainColor" />
 							</view>
 						</view>
-						<view style="width:86px;height: 86px; margin-left: 12rpx;margin-right: -40rpx;">
-							<image v-if="!likeStatus" @click="likeStatus=true"
+						<!-- 关注 -->
+						<view style="width:86px;height: 86px; margin-left: 12rpx;margin-right: -40rpx;" @click="follow">
+							<image v-if="detailData.CollectId==0"
 								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_509.png"
 								style="width: 100%;height: 100%;"></image>
-							<image v-if="likeStatus" @click="likeStatus=false"
+							<image v-if="detailData.CollectId>0" 
 								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_370.png"
 								style="width: 100%;height: 100%;"></image>
 						</view>
@@ -69,30 +69,30 @@
 					<view style="display:flex;align-items: center; margin-bottom: 30rpx;font-weight: 500;">
 						<view style="flex:1;font-size: 26rpx;color:#a4a4a4">
 							<text style="width: 156rpx;text-align: right;">商业体量：</text>
-							<text style="color:#F30329;font-weight: bold;">9.2万㎡</text>
+							<text style="color:#F30329;font-weight: bold;">{{detailData.CarrierSize}}万㎡</text>
 						</view>
 						<view style="flex:1;font-size: 26rpx;color:#a4a4a4">
 							<text style="width: 156rpx;text-align: right;">商业层数：</text>
-							<text style="color:#F30329;font-weight: bold;">地上5层</text>
+							<text style="color:#F30329;font-weight: bold;">{{detailData.LayersNum}}</text>
 						</view>
 					</view>
 					<view style="display:flex;align-items: center; margin-bottom: 30rpx;font-weight: 500;">
 						<view style="flex:1;font-size: 26rpx;color:#a4a4a4">
 							<text style="width: 156rpx;text-align: right;">车位数量：</text>
-							<text style="color:#F30329;font-weight: bold;">/</text>
+							<text style="color:#F30329;font-weight: bold;">{{detailData.CarNum}}</text>
 						</view>
 						<view style="flex:1;font-size: 26rpx;color:#a4a4a4">
 							<text style="width: 156rpx;text-align: right;">开业时间：</text>
-							<text style="color:#F30329;font-weight: bold;">2011年12月</text>
+							<text style="color:#F30329;font-weight: bold;">{{detailData.CreateDate.slice(0,10)}}</text>
 						</view>
 					</view>
 					<view style="font-size: 26rpx;color:#a4a4a4;margin-bottom: 30rpx;font-weight: 500;">
 						<text style="width: 128rpx;text-align: right;display: inline-block;">开发商：</text>
-						<text style="color:#1F1F1F;font-weight: bold;">北京王府井百货(集团)股份有限公司</text>
+						<text style="color:#1F1F1F;font-weight: bold;">{{detailData.Developers}}</text>
 					</view>
 					<view style="font-size: 26rpx;color:#a4a4a4;margin-bottom: 30rpx;font-weight: 500;">
 						<text style="width: 156rpx;text-align: right;">地铁站点：</text>
-						<text style="color:#1F1F1F;font-weight: bold;">8号线东郊记忆站，步行700米</text>
+						<text style="color:#1F1F1F;font-weight: bold;">{{detailData.CarrierMetroList[0].MetroNum}}号线{{detailData.CarrierMetroList[0].MetroName}}站,&nbsp;步行{{detailData.CarrierMetroList[0].Distance}}米</text>
 					</view>
 					<view style="display: flex;align-items: center;">
 						<view
@@ -102,14 +102,14 @@
 								style="width:100%" mode="widthFix"></image>
 						</view>
 						<view
-							@click="goMap('银泰in99',104.06,30.67)"
+							@click="goMap(detailData.Address,LatAndLon.lon,LatAndLon.lat)"
 							style="flex:1;padding-left: 34rpx;background:rgba(252, 42, 76, .05);height: 95rpx;display: flex;align-items: center;">
 							<image
 								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_382.png"
 								style="width: 27rpx;height: 33rpx;margin-right: 26rpx;"></image>
 							<view
 								style="flex:1;font-size: 30rpx;color:#1f1f1f;white-space: nowrap;overflow: hidden;text-overflow:ellipsis;font-weight: 600;">
-								武侯区科华中路 2 号</view>
+								<!-- 武侯区科华中路 2 号 -->{{detailData.Address}}</view>
 							<u-icon name="arrow" size="22" color="#C2C2D1" style="margin:0 30rpx 0 20rpx"></u-icon>
 						</view>
 					</view>
@@ -120,10 +120,11 @@
 								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616480343000_409.png"
 								style="width: 425rpx;" mode="widthFix"></image>
 						</view>
+						
 						<view
 							style="display:inline-block;padding:32rpx 26rpx;width: 505rpx;height: 148rpx;background: #FFFFFF;box-shadow: 0px 4rpx 30rpx 0px rgba(167, 167, 167, 0.15);border-radius: 20rpx;margin-top:-30rpx;">
 							<text
-								style="font-size: 26rpx;color:#1f1f1f;line-height: 38rpx;font-weight: 600;">由餐饮、文化、娱乐和零售四大板块的业态构成</text>
+								style="font-size: 26rpx;color:#1f1f1f;line-height: 38rpx;font-weight: 600;"><!--业态规划-->{{detailData.CarrierPlan}}</text>
 						</view>
 					</view>
 					<view style="margin-bottom: 83rpx;text-align: right;">
@@ -135,7 +136,7 @@
 						<view
 							style="display:inline-block;padding:32rpx 26rpx;width: 505rpx;height: 148rpx;background: #FFFFFF;box-shadow: 0px 4rpx 30rpx 0px rgba(167, 167, 167, 0.15);border-radius: 20rpx;margin-top:-30rpx;">
 							<text
-								style="font-size: 26rpx;color:#1f1f1f;line-height: 38rpx;font-weight: 600;">餐饮类、休闲娱乐类、跨界新零售类、儿童亲子类、文创类、教育培训类</text>
+								style="font-size: 26rpx;color:#1f1f1f;line-height: 38rpx;font-weight: 600;"><!--招引目标-->{{detailData.CarrierTarget}}</text>
 						</view>
 					</view>
 					<view style="margin-bottom: 83rpx;text-align: right;">
@@ -147,7 +148,7 @@
 						<view
 							style="display:inline-block;padding:32rpx 26rpx;width: 505rpx;height: 148rpx;background: #FFFFFF;box-shadow: 0px 4rpx 30rpx 0px rgba(167, 167, 167, 0.15);border-radius: 20rpx;margin-top:-30rpx;">
 							<text
-								style="font-size: 26rpx;color:#1f1f1f;line-height: 38rpx;font-weight: 600;">最美文化阅享社区，多元化场景体验目的地</text>
+								style="font-size: 26rpx;color:#1f1f1f;line-height: 38rpx;font-weight: 600;"><!--总体定位-->{{detailData.Location}}</text>
 						</view>
 					</view>
 					<view style="margin-bottom: 83rpx;text-align: right;">
@@ -159,7 +160,7 @@
 						<view
 							style="display:inline-block;padding:32rpx 26rpx;width: 505rpx;height: 148rpx;background: #FFFFFF;box-shadow: 0px 4rpx 30rpx 0px rgba(167, 167, 167, 0.15);border-radius: 20rpx;margin-top:-30rpx;">
 							<text
-								style="font-size: 26rpx;color:#1f1f1f;line-height: 38rpx;font-weight: 600;">所有人群</text>
+								style="font-size: 26rpx;color:#1f1f1f;line-height: 38rpx;font-weight: 600;"><!--目标人群-->{{detailData.Crowd}}</text>
 						</view>
 					</view>
 				</view>
@@ -172,17 +173,8 @@
 	export default {
 		data() {
 			return {
-				imgs: [
-					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_561.png',
-					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_819.png'
-				],
-				imgsList: [{
-						url: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_561.png'
-					},
-					{
-						url: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_819.png'
-					}
-				],
+				id:0,
+				imgsList: [],
 				typeList: [{
 					Id: 0,
 					Name: '视频'
@@ -190,6 +182,7 @@
 					Id: 1,
 					Name: '图片'
 				}],
+				ProjectType:"",
 				boxOption: 0,
 				navsOption: 0,
 				titleStyle: {},
@@ -197,10 +190,18 @@
 				mainColor: '',
 				likeStatus: false,
 				controls:false,//显示默认控件
-				files:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/SaleBefore/Goods/637515953765903034.mp4',
+				LatAndLon:{
+					lon:"",
+					lat:""
+				},
+				detailData:{
+					CreateDate:""
+				}
 			}
 		},
 		onLoad(options) {
+			this.id=options.id
+			this.ProjectType=options.type
 			let that = this
 			uni.getSystemInfo({
 				success(res) {
@@ -220,7 +221,7 @@
 			previewImage(i) {
 				console.log(i)
 				uni.previewImage({
-					urls: this.imgs,
+					urls: this.detailData.BannerList,
 					current: i,
 					longPressActions: {
 						itemList: ["发送给朋友", "保存图片", "收藏"],
@@ -241,7 +242,8 @@
 					delta: 1,
 				});
 			},
-			goMap(name, lng, lat) {
+			goMap(name, lon, lat) {
+				
 				// let endPoint = JSON.stringify({ //终点
 				// 	name,
 				// 	'location': {
@@ -262,15 +264,20 @@
 				// })
 				wx.openLocation({
 				  latitude:lat,
-				  longitude:lng,
+				  longitude:lon,
 				  scale: 18,
 				  name,
-				  address:"武侯区科华中路 2 号"
+				  // address:"武侯区科华中路 2 号",
+				  success:(res)=>{
+					  // console.log(res)
+				  },
+				  fail: (err) => {
+				  	// console.log(err)
+				  }
 				})
 			},
 			enlarge(file) {
 				// 全屏
-				
 				this.videoContext = uni.createVideoContext('myVideo');
 				this.videoContext.requestFullScreen({
 					direction:0
@@ -285,6 +292,55 @@
 					this.controls=true
 				}
 			},
+			// 获取详情
+			getDetail(){
+				let parms = {
+					url: "/api/AppletTrade/GetCarrierDetails",
+					data:{ ID:this.id}
+				}
+				this.request2(parms, (res) => {
+					if (res.resultCode == 1) {
+						this.detailData=res.data
+						this.imgsList=[]
+						if(Array.isArray(res.data.BannerList)){
+							res.data.BannerList.map((e)=>{
+								let obj={
+									url:e
+								}
+								this.imgsList.push(obj)
+							})
+						}
+						if(res.data.LatAndLon!=null&&res.data.LatAndLon.length>0){
+							let LatLon=res.data.LatAndLon.split(",")
+							this.LatAndLon.lat=parseFloat(LatLon[0])
+							this.LatAndLon.lon=parseFloat(LatLon[1])
+						}
+						
+					}
+				})
+			},
+			// 关注与取消关注
+			follow(){
+				console.log("follow")
+				let that=this
+				let parms = {
+					url: "/api/AppletTrade/GetCollect",
+					data:{ 
+						 SourceId:this.id,
+						 Id:this.detailData.CollectId,
+						 Type:1,
+						 
+					}
+				}
+				this.request2(parms, (res) => {
+					if (res.resultCode == 1) {
+						that.getDetail()
+					}
+				})
+			}
+		},
+		mounted() {
+			this.getDetail()
 		}
 
 	}

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>
@@ -14,35 +14,12 @@
 				<u-icon name="filter-o" color="#111" size="42"></u-icon>
 			</div>
 		</view>
-		
-		<view style="height: calc(100% - 101px);">
-			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true"
+		<u-empty v-if="dataList.length == 0" text="暂无数据" mode="list" class="noBox"></u-empty>
+		<view style="height: calc(100% - 101px);" v-if="dataList.length > 0">
+			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower"
 				style="height: 100%; padding-bottom: 0px;">
-				<div class="good_study_one" @click="openGood(1)" :style="{
-					borderRadius:'15px'
-				}">
-					<view class="img-box">
-						<view class="img-show">
-							<image style="
-						  width: 100%;
-						  height:100%;
-						  border-radius: 10rpx 10rpx 0 0;
-						" mode='aspectFill'
-								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_427.jpg" />
-						</view>
-					</view>
-					<div class="good-info">
-						<div class="good-name">
-							<div class="span-name">银泰in99</div>
-							<div class="span-type">百货</div>
-						</div>
-						<div class="good-price-info">
-							<u-icon name="location" color="#999" size="24"></u-icon>
-							<span class="price" style="margin-left: 5px;">成都市武侯区天府大道北段1199号</span>
-						</div>
-					</div>
-				</div>
-				<div class="good_study_one" @click="openGood(1)" :style="{
+				<view v-for="(item,index) in dataList" :key="index">
+					<div class="good_study_one" @click="openGood(item.ID,typeList[item.ProjectType].Name)" :style="{
 						borderRadius:'15px'
 					}">
 						<view class="img-box">
@@ -52,166 +29,30 @@
 							  height:100%;
 							  border-radius: 10rpx 10rpx 0 0;
 							" mode='aspectFill'
-								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_427.jpg" />
+									:src="item.Logo" />
 							</view>
 						</view>
 						<div class="good-info">
 							<div class="good-name">
-							<div class="span-name">银泰in99</div>
-							<div class="span-type">百货</div>
+								<div class="span-name">{{item.CarrierName}}</div>
+								<div class="span-type">{{typeList[item.ProjectType].Name}}</div>
 							</div>
 							<div class="good-price-info">
 								<u-icon name="location" color="#999" size="24"></u-icon>
-							<span class="price" style="margin-left: 5px;">成都市武侯区天府大道北段1199号</span>
+								<span class="price" style="margin-left: 5px;">{{item.Address}}</span>
 							</div>
 						</div>
 					</div>
-				<div class="good_study_one" @click="openGood(1)" :style="{
-					borderRadius:'15px'
-				}">
-					<view class="img-box">
-						<view class="img-show">
-							<image style="
-						  width: 100%;
-						  height:100%;
-						  border-radius: 10rpx 10rpx 0 0;
-						" mode='aspectFill'
-								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_427.jpg" />
-						</view>
 				</view>
-					<div class="good-info">
-						<div class="good-name">
-							<div class="span-name">银泰in99</div>
-							<div class="span-type">百货</div>
-						</div>
-						<div class="good-price-info">
-							<u-icon name="location" color="#999" size="24"></u-icon>
-							<span class="price" style="margin-left: 5px;">成都市武侯区天府大道北段1199号</span>
-						</div>
-					</div>
-				</div>
-				<div class="good_study_one" @click="openGood(1)" :style="{
-					borderRadius:'15px'
-				}">
-					<view class="img-box">
-						<view class="img-show">
-							<image style="
-						  width: 100%;
-						  height:100%;
-						  border-radius: 10rpx 10rpx 0 0;
-						" mode='aspectFill'
-								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_427.jpg" />
-						</view>
-					</view>
-					<div class="good-info">
-						<div class="good-name">
-							<div class="span-name">银泰in99</div>
-							<div class="span-type">百货</div>
-						</div>
-						<div class="good-price-info">
-							<u-icon name="location" color="#999" size="24"></u-icon>
-							<span class="price" style="margin-left: 5px;">成都市武侯区天府大道北段1199号</span>
-						</div>
-					</div>
-				</div>
-				<div class="good_study_one" @click="openGood(1)" :style="{
-					borderRadius:'15px'
-				}">
-					<view class="img-box">
-						<view class="img-show">
-							<image style="
-						  width: 100%;
-						  height:100%;
-						  border-radius: 10rpx 10rpx 0 0;
-						" mode='aspectFill'
-								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_427.jpg" />
-						</view>
-					</view>
-					<div class="good-info">
-						<div class="good-name">
-							<div class="span-name">银泰in99</div>
-							<div class="span-type">百货</div>
-						</div>
-						<div class="good-price-info">
-							<u-icon name="location" color="#999" size="24"></u-icon>
-							<span class="price" style="margin-left: 5px;">成都市武侯区天府大道北段1199号</span>
-						</div>
-					</div>
-				</div>
-				<div class="good_study_one" @click="openGood(1)" :style="{
-					borderRadius:'15px'
-				}">
-					<view class="img-box">
-						<view class="img-show">
-							<image style="
-						  width: 100%;
-						  height:100%;
-						  border-radius: 10rpx 10rpx 0 0;
-						" mode='aspectFill'
-								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_427.jpg" />
-						</view>
-					</view>
-					<div class="good-info">
-						<div class="good-name">
-							<div class="span-name">银泰in99</div>
-							<div class="span-type">百货</div>
-						</div>
-						<div class="good-price-info">
-							<u-icon name="location" color="#999" size="24"></u-icon>
-							<span class="price" style="margin-left: 5px;">成都市武侯区天府大道北段1199号</span>
-						</div>
-					</div>
-				</div>
-				<div class="good_study_one" @click="openGood(1)" :style="{
-					borderRadius:'15px'
-				}">
-					<view class="img-box">
-						<view class="img-show">
-							<image style="
-						  width: 100%;
-						  height:100%;
-						  border-radius: 10rpx 10rpx 0 0;
-						" mode='aspectFill'
-								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_427.jpg" />
-						</view>
-					</view>
-					<div class="good-info">
-						<div class="good-name">
-							<div class="span-name">银泰in99</div>
-							<div class="span-type">百货</div>
-						</div>
-						<div class="good-price-info">
-							<u-icon name="location" color="#999" size="24"></u-icon>
-							<span class="price" style="margin-left: 5px;">成都市武侯区天府大道北段1199号</span>
-						</div>
-					</div>
-				</div>
-				<div class="good_study_one" @click="openGood(1)" :style="{
-					borderRadius:'15px'
-				}">
-					<view class="img-box">
-						<view class="img-show">
-							<image style="
-						  width: 100%;
-						  height:100%;
-						  border-radius: 10rpx 10rpx 0 0;
-						" mode='aspectFill'
-								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_427.jpg" />
-						</view>
-					</view>
-					<div class="good-info">
-						<div class="good-name">
-							<div class="span-name">银泰in99</div>
-							<div class="span-type">百货</div>
-						</div>
-						<div class="good-price-info">
-							<u-icon name="location" color="#999" size="24"></u-icon>
-							<span class="price" style="margin-left: 5px;">成都市武侯区天府大道北段1199号</span>
-						</div>
-					</div>
-				</div>
+				<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20"
+					bg-color="#F6F6F6" />
 			</scroll-view>
 		</view>
+		<!-- 加载中 -->
+		<view class="loading" v-if="loading">
+			<u-loading mode="flower" size="48"></u-loading>
+			<Text style="color: #f6f6f6; margin-top: 10rpx;">加载中...</Text>
+		</view>
 		<tabbars></tabbars>
 	</div>
 </template>
@@ -242,11 +83,41 @@
 				}, {
 					Id: 4,
 					Name: '其他'
-				}]
+				}],
+				dataList:[],
+				msg:{
+					 pageIndex:1,
+					 pageSize:10,
+					 MetroName:"",
+					 CarrierName:"",
+					 MetroNum:"",
+					 Developers:"",
+					 StartOpenTime:"",
+					 EndOpenTime:"",
+					 ProjectType:1,
+					 OrderBy:0
+				},
+				loading: false,
+				pageCount:0,
+				status: "loadmore",
+				loadText: {
+					loadmore: "轻轻上拉，加载更多",
+					loading: "努力加载中",
+					nomore: "没有更多了",
+				},
 			};
 		},
+		onLoad(options) {
+			if(options && options.id){
+				this.msg.ProjectType = options.id
+			}
+			
+			this.getTypeList()
+		},
 		created() {
 			this.mainColor = this.$uiConfig.mainColor;
+			
+			
 		},
 		mounted() {
 			uni.setNavigationBarTitle({
@@ -254,15 +125,75 @@
 			});
 		},
 		methods: {
+			// 获取载体列表
+			getTypeList(){
+				let parms = {
+					url: "/api/AppletTrade/GetProjectTypeEnumList",
+				}
+				this.request2(parms, (res) => {
+					if (res.resultCode == 1) {
+						// 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(){
+				let parms = {
+					url: "/api/AppletTrade/GetCarrierPageList",
+					data:this.msg
+				}
+				this.request2(parms, (res) => {
+					this.loading = false;
+					if (res.resultCode == 1) {
+						this.dataList = this.dataList.concat(res.data.pageData);
+						this.pageCount = res.data.pageCount
+						if (this.pageCount == 1) {
+							this.status = "nomore";
+						}
+					}
+				})
+			},
 			changeHandler(i) {
 				this.active = i;
+				this.msg.ProjectType = this.typeList[i].Id;
+				this.msg.pageIndex = 1;
+				this.dataList= [];
+				this.getCarrierPageList()
 			},
-			openGood(id) {
+			openGood(id,type) {
 				uni.navigateTo({
-					url: 'pages/kotra/carrier/detail?id=' + id,
+					url: '/pages/kotra/carrier/detail?id=' + id+"&&type="+type,
 				});
 			},
-			searchHandler(val){}
+			searchHandler(val){
+				this.msg.CarrierName=val
+				this.msg.pageIndex = 1;
+				this.dataList= [];
+				this.getCarrierPageList()
+				
+			},
+			//触底事件
+			lower(e) {
+				if (this.msg.pageIndex < this.pageCount) {
+					this.msg.pageIndex++;
+					this.status = "loading";
+					this.getCarrierPageList();
+				} else {
+					this.status = "nomore";
+				}
+			},
 		}
 	};
 </script>

pages/kotra/firstShop/firstShop.vue

@@ -3,98 +3,146 @@
 		<view style="background: #FFFFFF;box-shadow: 0px 10px 50px 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;padding:30rpx">
 			<view class="label-text" style="margin-top:0;margin-bottom: 30rpx;">
 				<text>店铺照片</text>
-				<text style="color:#999;font-weight: 400;">（上传3-5张照片）</text>
+				<text style="color:#999;font-weight: 400;">（上传3-5张照片,第一张为封面图）</text>
 			</view>
 			<view>
-				<u-upload :action="action" :max-count="5" :max-size="2*1024*1024" :file-list="fileList" @on-remove="onRemove1"  :custom-btn="true" @on-success="uploadSuccessHandler">
-					<view slot="addBtn" class="slot-btn">
+				<u-upload v-if="isdisabled==false" :action="action" :max-count="5" :max-size="2*1024*1024" :file-list="fileList" @on-remove="onRemove1"  :custom-btn="true" @on-success="uploadSuccessHandler">
+					<view slot="addBtn" class="slot-btn" > 
 						<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616498310000_18.png" mode="widthFix"></image>
 					</view>
 				</u-upload>
+				<view class="imglist" v-else >
+					<view class="imglist-item" v-for='(x,i) in model.ImageList' @click="previewImage(model.ImageList,i)">
+						<image :src="x" style="width: 100%;height: 100%;border-radius: 4px;"></image>
+					</view>
+				</view>
+			</view>
+			<view class="label-text" style="margin-top:20px;margin-bottom: 30rpx;">
+				<text>店铺视频</text>
+			</view>
+			<view style="margin-bottom: 30rpx;">
+				<view style="width: 150px; height: 200px;position: relative;margin-right: 20px;" v-if="model.VideoUrl!=''">
+					<video id="myVideo" :src="model.VideoUrl"
+						:controls='controls'
+						:show-center-play-btn='false'
+						:show-fullscreen-btn='false' 
+						@fullscreenchange='videoControl' ></video>
+						
+						<view style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: center;" @click="enlarge()">
+							<u-icon name="play-circle-o" :size="70" color="#FFF"></u-icon>
+						</view>
+						<view style="width: 50rpx;height: 50rpx;position: absolute;right: 10rpx;top:10rpx;
+							border-radius: 25rpx;
+							background: #F30329;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+						" @tap.stop="model.VideoUrl=''"
+							v-if="isdisabled==false"
+						>
+							
+							<u-icon class="u-icon" name="cross" size="30" color="#ffffff"></u-icon>
+						</view>
+				</view>
+				<view v-if="model.VideoUrl=='' && isdisabled==false">
+					<view slot="addBtn" class="slot-btn" @click="upvideo()">
+						<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1616573063000_398.png" mode="widthFix"></image>
+						
+					</view>
+				</view>
+				<view v-if="model.VideoUrl=='' && isdisabled==true">
+					无
+				</view>
 			</view>
 			<view class="bottom-border">
 				<view class="label-text">首店名称</view>
-				<u-field v-model="model.shopName" padding="10px 0px 5px 0" label-width="0" placeholder="请填写首店名称" placeholder-style="color:#CECECE;"></u-field>
+				<u-field v-model="model.Name" :disabled="isdisabled" padding="10px 0px 5px 0" label-width="0" placeholder="请填写首店名称" placeholder-style="color:#CECECE;"></u-field>
 			</view>
 			<view class="bottom-border">
 				<view class="label-text">首店类型</view>
-				<u-field v-model="model.shopType" @click="showTypeAction" :disabled="true" right-icon="arrow" padding="10px 0px 5px 0" label-width="0" placeholder="请选择首店类型" placeholder-style="color:#CECECE;"></u-field>
-				<u-action-sheet @click="clickItem" :list="typeList" v-model="showTypeStatus"></u-action-sheet>
+				<u-field v-model="TypeName" @click="isdisabled==false?showTypeStatus = true:''" :disabled="true" right-icon="arrow" padding="10px 0px 5px 0" label-width="0" placeholder="请选择首店类型" placeholder-style="color:#CECECE;"></u-field>
+				<u-action-sheet @click="clickItem" name='Name' :list="typeList" v-model="showTypeStatus"></u-action-sheet>
 			</view>
 			 <view class="bottom-border">
 				<view class="label-text">
 					<text>品牌属地</text>
 					<text style="color:#999;font-weight: 400;">（国家或地区）</text>
 				</view>
-				<u-field v-model="model.area" padding="10px 0px 5px 0" label-width="0" placeholder="请填写品牌属地" placeholder-style="color:#CECECE;"></u-field>
+				<u-field v-model="BrandTypeName" @click="isdisabled==false?showTypeStatus2 = true:''" :disabled="true" right-icon="arrow" padding="10px 0px 5px 0" label-width="0" placeholder="请选择品牌属地" placeholder-style="color:#CECECE;"></u-field>
+				<u-action-sheet @click="clickItem2" name='Name' :list="brandTypelist" v-model="showTypeStatus2"></u-action-sheet>
 			</view>
 			<view class="bottom-border">
 				<view class="label-text">首店开业时间</view>
-				<u-field v-model="model.openTime" @click="showOpenTime=true" :disabled="true" right-icon="arrow" padding="10px 0px 5px 0" label-width="0" placeholder="请选择首店开业时间" placeholder-style="color:#CECECE;"></u-field>
+				<u-field v-model="model.OpenTime" @click="isdisabled==false?showOpenTime=true:''" :disabled="true" right-icon="arrow" padding="10px 0px 5px 0" label-width="0" placeholder="请选择首店开业时间" placeholder-style="color:#CECECE;"></u-field>
 				<u-picker mode="time" v-model="showOpenTime" :params="params" @confirm="confirmOpenTime"></u-picker>
 			</view>
 			<view class="bottom-border">
 				<view class="label-text">首店地址</view>
-				<u-field v-model="model.address" padding="10px 0px 5px 0" label-width="0" placeholder="请填写首店地址" placeholder-style="color:#CECECE;"></u-field>
+				<u-field v-model="model.Address" :disabled="isdisabled" padding="10px 0px 5px 0" label-width="0" placeholder="请填写首店地址" placeholder-style="color:#CECECE;"></u-field>
 			</view>
 			<view class="bottom-border">
 				<view class="label-text">商圈</view>
-				<u-field v-model="model.shangQuan" padding="10px 0px 5px 0" label-width="0" placeholder="请填写首店所属商圈" placeholder-style="color:#CECECE;"></u-field>
+				<u-field v-model="model.TradingArea" :disabled="isdisabled" padding="10px 0px 5px 0" label-width="0" placeholder="请填写首店所属商圈" placeholder-style="color:#CECECE;"></u-field>
 			</view>
 			<view class="bottom-border">
-				<view class="label-text">业态</view>
-				<u-field v-model="model.shopType" @click="showYeTai=true" :disabled="true" right-icon="arrow" padding="10px 0px 5px 0" label-width="0" placeholder="请选择首店类型" placeholder-style="color:#CECECE;"></u-field>
-				<u-action-sheet @click="checkYetai" :list="yeTaiList" v-model="showYeTai"></u-action-sheet>
+				<view class="label-text">
+					<text>行业</text>
+				</view>
+				<u-field v-model="BusinessName" @click="isdisabled==false?showTypeStatus3 = true:''" :disabled="true" right-icon="arrow" padding="10px 0px 5px 0" label-width="0" placeholder="请选择品牌属地" placeholder-style="color:#CECECE;"></u-field>
+				<u-action-sheet @click="clickItem3" name='Name' :list="yeTaiList" v-model="showTypeStatus3"></u-action-sheet>
 			</view>
 			<view class="bottom-border">
 				<view class="label-text">
 					<text>首店业种类型</text>
 					<text style="color:#999;font-weight: 400;">（如书店，超市，川菜，日料等）</text>
 				</view>
-				<u-field v-model="model.yeZhong" padding="10px 0px 5px 0" label-width="0" placeholder="请填写首店业种类型" placeholder-style="color:#CECECE;"></u-field>
+				<u-field v-model="model.BusinessDetail" :disabled="isdisabled" padding="10px 0px 5px 0" label-width="0" placeholder="请填写首店业种类型" placeholder-style="color:#CECECE;"></u-field>
 			</view>
 			<view class="bottom-border">
 				<view class="label-text">
 					<text>所属区县</text>
-					<text style="color:#999;font-weight: 400;">（如书店，超市，川菜，日料等）</text>
+					
 				</view>
-				<u-field v-model="model.city" padding="10px 0px 5px 0" label-width="0" placeholder="请填写所属区县" placeholder-style="color:#CECECE;"></u-field>
+				<u-field v-model="model.County" :disabled="isdisabled" padding="10px 0px 5px 0" label-width="0" placeholder="请填写所属区县" placeholder-style="color:#CECECE;"></u-field>
 			</view>
 			<view class="bottom-border">
-				<view class="label-text">首店类别</view>
-				<u-field v-model="model.shenQingType" @click="showShenQingType=true" :disabled="true" right-icon="arrow" padding="10px 0px 5px 0" label-width="0" placeholder="请选择首店类型" placeholder-style="color:#CECECE;"></u-field>
-				<u-action-sheet @click="checkShenType" :list="shenList" v-model="showShenQingType"></u-action-sheet>
+				<view class="label-text">
+					<text>首店类别</text>
+				</view>
+				<u-field v-model="CategoryName" @click="isdisabled==false?showTypeStatus4 = true:'';" :disabled="true" right-icon="arrow" padding="10px 0px 5px 0" label-width="0" placeholder="请选择品牌属地" placeholder-style="color:#CECECE;"></u-field>
+				<u-action-sheet @click="clickItem4" name='Name' :list="shenList" v-model="showTypeStatus4"></u-action-sheet>
 			</view>
 			<view class="bottom-border">
 				<view class="label-text">联系人</view>
-				<u-field v-model="model.concatName" padding="10px 0px 5px 0" label-width="0" placeholder="请填写联系人" placeholder-style="color:#CECECE;"></u-field>
+				<u-field v-model="model.Contact" :disabled="isdisabled" padding="10px 0px 5px 0" label-width="0" placeholder="请填写联系人" placeholder-style="color:#CECECE;"></u-field>
 			</view>
 			<view class="bottom-border">
 				<view class="label-text">联系电话</view>
-				<u-field v-model="model.concatPhone" padding="10px 0px 5px 0" label-width="0" placeholder="请填写联系电话" placeholder-style="color:#CECECE;"></u-field>
-			</view>
-			<view class="bottom-border">
-				<view class="label-text">需求备注</view>
-				<u-field v-model="model.remark" type="textarea" padding="10px 0px 5px 0" label-width="0" placeholder="可以填写您的需求" placeholder-style="color:#CECECE;"></u-field>
+				<u-field v-model="model.ContactMobile" :disabled="isdisabled" padding="10px 0px 5px 0" label-width="0" placeholder="请填写联系电话" placeholder-style="color:#CECECE;"></u-field>
 			</view>	
 			<view class="bottom-border">
 				<view class="label-text">
 					<text>首店简介</text>
 					<text style="color:#999;font-weight: 400;">（100字以内）</text>
 				</view>
-				<u-field v-model="model.description" maxlength="100" type="textarea" padding="10px 0px 5px 0" label-width="0" placeholder="可以填写您的首店简介" placeholder-style="color:#CECECE;"></u-field>
+				<u-field v-model="model.Description" :disabled="isdisabled" maxlength="100" type="textarea" padding="10px 0px 5px 0" label-width="0" placeholder="可以填写您的首店简介" placeholder-style="color:#CECECE;"></u-field>
 			</view>
-			<view style="margin-top:40rpx">
-				<u-button shape="square" :ripple="true" :custom-style="{background:mainColor,border:'none',color:'#FFF'}">提交申请</u-button>
+			<view style="margin-top:40rpx" v-if="isdisabled == false">
+				<u-button shape="square" :ripple="true" @click='tijiao()' :custom-style="{background:mainColor,border:'none',color:'#FFF'}">提交申请</u-button>
 			</view>
+			<view style="margin-top:40rpx" v-if="isdisabled == true && model.AuditState!=2">
+				<u-button shape="square" :ripple="true" @click='showdelete=true' :custom-style="{background:'#F70027',border:'none',color:'#FFF'}">删除</u-button>
 			</view>
 		</view>
+		<u-modal v-model="showdelete" content="删除该首店认证？" :show-cancel-button='true'	 @cancel='showdelete=false' @confirm='deletebtn()'></u-modal>
+	</view>
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
+				pageTitle:'首店申请',
 				params: {
 					year: true,
 					month: true,
@@ -105,119 +153,378 @@
 				},
 				action: this.host2 + "/api/File/UploadTencent",
 				fileList:[],
-				resultFileList:[],
+				showdelete:false,
 				mainColor:"",
+				TypeName:'',//类型名称
+				BrandTypeName:'',//品牌归属地
+				BusinessName:'',//认证行业
+				CategoryName:'',//类别
 				model:{
-					shopName:"",
-					shopType:'',
-					area:"",
-					openTime:"",
-					address:"",
-					shangQuan:"",
-					yeTai:"",
-					yeZhong:"",
-					city:"",
-					shenQingType:"",
-					concatName:"",
-					concatPhone:"",
-					remark:"",
-					description:""
-				},
-				typeList: [
-					{
-						text: '全新品牌',
+					Id:0,
+					VideoUrl:'',
+					Name:"",
+					CoverImage:'',
+					ImageList:[],
+					shopType:0,
+					Type:0,
+					OpenTime:'',
+					Address:'',
+					TradingArea:'',
+					BusinessType:0,
+					BusinessDetail:'',
+					Description:'',
+					County:'',
+					Category:0,
+					Contact:'',
+					ContactMobile:'',
+					BrandType:'',
 				},
-					{
-						text: '首家旗舰店'
+				typeList: [],
+				brandTypelist:[],//品牌归属地
+				yeTaiList: [],//行业枚举
+				shenList: [],//
+				showTypeStatus:false,
+				showTypeStatus2:false,
+				showTypeStatus3:false,
+				showTypeStatus4:false,
+				showOpenTime:false,
+				showYeTai:false,
+				showShenQingType:false,
+				controls:false,//显示默认控件
+				isdisabled :false,//是否是详情过来的
+				index:0,//列表带过来的索引
+			}
 		},
-					{
-						text: '跨界店'
+		onLoad(options) {
+			if(options && options.Id){
+				this.GetAuthenticationInfo(options.Id)//首店申请详情
+				this.isdisabled=true;
+				this.index = options.index
+				uni.setNavigationBarTitle({
+					title: '申请详情'
+				});
+			}else{
+				this.GetAuthenticationTypeEnumList()//类型
+				this.GetBrandTypeEnumList()//品牌归属地枚举
+				this.GetBusinessTypeEnumList()//申请认证行业枚举
+				this.GetAuthenticationCategoryEnumList()//认证分类枚举
+				let currentPages = getCurrentPages();
+				let u = "/" + currentPages[currentPages.length - 1].route;
+				let pages = wx.getStorageSync("basedata")
+				  ? wx.getStorageSync("basedata").bar_title
+				  : [];
+				pages.forEach((x) => {
+				  if (x.value == u) {
+				    this.pageTitle = x.new_name ? x.new_name : x.name;
+				  }
+				});
+				uni.setNavigationBarTitle({
+				  title: this.pageTitle,
+				});
+			}
 		},
-					{
-						text: '概念店'
+		mounted() {
+			
+			this.mainColor = this.$uiConfig.mainColor;
+			let MallBaseId = uni.getStorageSync("mall_UserInfo").MallBaseId ? uni.getStorageSync("mall_UserInfo").MallBaseId : 1;
+			this.action = this.host2 + '/api/File/UploadTencent?MallBaseId=' + MallBaseId
 		},
+		methods: {
+			GetAuthenticationInfo(id){
+				this.request2(
 					{
-						text: '体验店'
+						url: '/api/AppletTrade/GetAuthenticationInfo',
+						data: {AuthenticationId:id}
 					},
-					{
-						text: '新场景'
+					res => {
+						if(res.resultCode==1){
+							this.model = res.data;
+							this.fileList = []
+							if(this.model.ImageList.length>0){
+								this.model.ImageList.forEach(x=>{
+									let obj ={
+										url:x
 									}
-				],
-				yeTaiList: [
-					{
-						text: '零售',
+									this.fileList.push(obj)
+								})
+							}
+							this.GetAuthenticationTypeEnumList()//类型
+							this.GetBrandTypeEnumList()//品牌归属地枚举
+							this.GetBusinessTypeEnumList()//申请认证行业枚举
+							this.GetAuthenticationCategoryEnumList()//认证分类枚举
+						}
+					}
+				);
 			},
+			GetAuthenticationTypeEnumList(){
+				this.request2(
 					{
-						text: '餐饮'
+						url: '/api/AppletTrade/GetAuthenticationTypeEnumList',
+						data: {Name:'',Id:''}
 					},
-					{
-						text: '娱乐'
+					res => {
+						if(res.resultCode==1){
+							this.typeList = res.data
+							if(this.isdisabled == true){
+								this.typeList.map(x=>{
+									if(x.Id==this.model.Type){
+										this.TypeName = x.Name
+										return
+									}
+								})
+							}
+						}
+					}
+				);
 			},
+			GetBrandTypeEnumList(){
+				this.request2(
 					{
-						text: '配套'
+						url: '/api/AppletTrade/GetBrandTypeEnumList',
+						data: {Name:'',Id:''}
+					},
+					res => {
+						if(res.resultCode==1){
+							this.brandTypelist = res.data
+							if(this.isdisabled == true){
+								this.brandTypelist.map(x=>{
+									if(x.Id==this.model.BrandType){
+										this.BrandTypeName = x.Name
+										return
 									}
-				],
-				shenList: [
-					{
-						text: '全球首店',
+								})
+							}
+						}
+					}
+				);
 			},
+			GetBusinessTypeEnumList(){
+				this.request2(
 					{
-						text: '全球旗舰店'
+						url: '/api/AppletTrade/GetBusinessTypeEnumList',
+						data: {Name:'',Id:''}
 					},
-					{
-						text: '中国内地首店'
+					res => {
+						if(res.resultCode==1){
+							this.yeTaiList = res.data
+							if(this.isdisabled == true){
+								this.yeTaiList.map(x=>{
+									if(x.Id==this.model.BusinessType){
+										this.BusinessName = x.Name
+										return
+									}
+								})
+							}
+						}
+					}
+				);
 			},
+			GetAuthenticationCategoryEnumList(){
+				this.request2(
 					{
-						text: '西部首店'
+						url: '/api/AppletTrade/GetAuthenticationCategoryEnumList',
+						data: {Name:'',Id:''}
 					},
-					{
-						text: '西南首店'
+					res => {
+						if(res.resultCode==1){
+							this.shenList = res.data
+							if(this.isdisabled == true){
+								this.shenList.map(x=>{
+									if(x.Id==this.model.Category){
+										this.CategoryName = x.Name
+										return
+									}
+								})
+							}
+						}
+					}
+				);
 			},
+			tijiao(){
+				if(this.model.ImageList.length==0){
+					uni.showToast({
+					  title: "请选择图片",
+					  icon:'none'
+					});
+					return
+				}
+				this.model.CoverImage = this.model.ImageList[0]
+				
+				this.request2(
 					{
-						text: '成都首店'
+						url: '/api/AppletTrade/SetAuthenticationInfo',
+						data: this.model
+					},
+					res => {
+						if(res.resultCode==1){
+							uni.showToast({
+							  title: '提交成功',
+							  icon:'none'
+							});
+							let that = this
+							console.log(res.data)
+							that.showTemplate(res.data)
+							
+							
+							
 						}
-				],
-				showTypeStatus:false,
-				showOpenTime:false,
-				showYeTai:false,
-				showShenQingType:false
 					}
+				);
 			},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title: '首店申请'
+			//显示模板
+			showTemplate(template) {
+				uni.requestSubscribeMessage({
+					tmplIds: template,
+					complete(res){
+						console.log(res)
+						uni.reLaunch({
+							url: "/pages/kotra/firstShop/list",
+						})
+					},
+				
+				})
+			},
+			deletebtn(){//删除
+				this.request2(
+					{
+						url: '/api/AppletTrade/DelAuthenticationInfo',
+						data: {AuthenticationId:this.model.Id}
+					},
+					res => {
+						if(res.resultCode==1){
+							uni.showToast({
+							  title: '删除成功',
+							  icon:'none'
 							});
-			this.mainColor = this.$uiConfig.mainColor;
+							let that = this
+							let pages = getCurrentPages(); // 当前页面
+							let beforePage = pages[pages.length - 2]; // 前一个页面
+							setTimeout(() => {
+								uni.navigateBack({
+									success: function() {
+										beforePage.$vm.getsplice(that.index); // 执行前一个页面的created方法
+									}
+								});
+							}, 500)
+						}
+					}
+				);
 			},
-		methods: {
 			confirmOpenTime(r){
-				this.model.openTime=r.year+"-"+r.month+"-"+r.day
-			},
-			showTypeAction() {
-				this.showTypeStatus = true;
+				this.model.OpenTime=r.year+"-"+r.month+"-"+r.day
 			},
+			
 			onRemove1(index) {
-				this.resultFileList.splice(index, 1);
+				this.model.ImageList.splice(index, 1);
 			},
-			clickItem(index) {
-				this.model.shopType = this.typeList[index].text;
+			clickItem(index) {//类型选择
+				this.TypeName = this.typeList[index].Name;
+				this.model.Type = this.typeList[index].Id;
 			},
-			checkYetai(index) {
-				this.model.yeTai = this.yeTaiList[index].text;
+			clickItem2(index){//品牌归属地
+				this.BrandTypeName = this.brandTypelist[index].Name;
+				this.model.BrandType = this.brandTypelist[index].Id;
 			},
-			checkShenType(index) {
-				this.model.shenQingType = this.shenList[index].text;
+			clickItem3(index){//行业
+				this.BusinessName = this.yeTaiList[index].Name;
+				this.model.BusinessType = this.yeTaiList[index].Id;
 			},
+			clickItem4(index){//类别
+				this.CategoryName = this.shenList[index].Name;
+				this.model.Category = this.shenList[index].Id;
+			},
+			
 			uploadSuccessHandler(data, index, lists) {
 				let r = JSON.parse(data);
-				this.resultFileList.push(r.data);
+				console.log(r)
+				this.model.ImageList.push(r.data);
+			},
+			enlarge(file) {
+				// 全屏
+				this.videoContext = uni.createVideoContext('myVideo');
+				this.videoContext.requestFullScreen({
+					direction:0
+				})
+				
+			},
+			videoControl(e){
+				if(e.detail.fullScreen==false){
+					this.videoContext.stop()
+					this.controls=false
+				}else{
+					this.videoContext.play()
+					this.controls=true
+				}
+			},
+			upvideo() {
+				let that = this
+				uni.chooseVideo({
+					count: 1,
+					sourceType: ['camera', 'album'],
+					success: function(res) {
+						console.log(res)
+						that.upFile(res.tempFilePath, 1)
+						uni.showLoading({
+							title: '上传中...'
+						})
+			
+					},
+					fail(err) {
+						console.log(err, )
+					}
+				});
+			},
+			upFile(filePath, type) {
+				let MallBaseId = uni.getStorageSync("mall_UserInfo").MallBaseId ? uni.getStorageSync("mall_UserInfo").MallBaseId :
+					1;
+				let action = this.host2 + '/api/File/UploadTencent?MallBaseId=' + MallBaseId
+				let that = this
+				uni.uploadFile({
+					url: action,
+					filePath: filePath,
+					name: 'file',
+					formData: {
+						user: 'tesdt'
+					},
+					success: (uploadFileRes) => {
+						uni.hideLoading()
+						if (uploadFileRes.statusCode == 200) {
+							let data = JSON.parse(uploadFileRes.data)
+							that.model.VideoUrl=data.data
+							
+						}
+			
+					},
+					fail: function(res) {
+						console.log(res)
+						wx.showToast({
+							title: '上传失败!',
+							icon: 'none',
+							duration: 1000
+						})
+					}
+				});
+			},
+			previewImage(imgs,i) {
+				
+				uni.previewImage({
+					urls: imgs,
+					current: i,
+					longPressActions: {
+						itemList: ["发送给朋友", "保存图片", "收藏"],
+						success: function(data) {},
+						fail: function(err) {
+							console.log(err.errMsg);
+						},
+					},
+				});
 			},
 		}
 	}
 </script>
 
 <style>
-	.first-shop{background: #f6f6f6;padding: 35rpx;min-height: 100vh;font-family: pingfang;}
+	.first-shop{background: #f6f6f6;padding: 30rpx;min-height: 100vh;font-family: pingfang;}
 	.first-shop .label-text{
 		font-size: 28rpx;
 		color: #1F1F1F;
@@ -235,8 +542,24 @@
 	}
 	.first-shop .slot-btn .image{
 		width: 54rpx;
+		height: auto;
 	}
 	.first-shop .bottom-border{
 		border-bottom: 3rpx #DADCE6 solid;
 	}
+	#myVideo{
+		width: 150px; height: 200px;
+	}
+	.imglist{
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.imglist-item{
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 4px;
+		margin-left: 15px;
+		margin-bottom: 10px;
+	}
 </style>

pages/kotra/firstShop/list.vue

 <template>
 	<view style="height: 100vh;width: 100%;overflow: hidden;background-color: #F6F6F6;">
-		<scroll-view scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" style="box-sizing: border-box;height: 100%;padding:35rpx;">
-			<view style="margin-bottom:30rpx;position: relative;background: #FFFFFF;box-shadow: 0px 10px 50rpx 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;display: flex;align-items: center;padding:30rpx;">
-				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616513250000_714.jpg" style="width: 130rpx;margin-right:30rpx;height: 130rpx;border-radius: 17rpx;" mode="aspectFill"></image>
+		<view style="flex:1;overflow: hidden;">
+			<u-tabs bg-color="#f6f6f6" name="Name" :is-scroll="false" :list="typeList" :active-color="mainColor"
+				:current="active" @change="changeHandler"  :activeFontSize="34" :bold="true" height="100"
+				duration="0" font-size="28"></u-tabs>
+		</view>
+		<u-empty v-if="g.length == 0" text="暂无认证" mode="list"></u-empty>
+		<view v-if="g.length>0">
+			<scroll-view scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" style="box-sizing: border-box;height:calc(100vh - 50px) ;padding:30rpx 30rpx 0;">
+				<view style="margin-bottom:30rpx;position: relative;background: #FFFFFF;box-shadow: 0px 10px 50rpx 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;display: flex;align-items: center;padding:30rpx;"
+					v-for="(x, i) in g" :key="i"  @click="godetails(x,i)"
+				>
+					<image :src="x.CoverImage" style="width: 130rpx;margin-right:30rpx;height: 130rpx;border-radius: 17rpx;" mode="aspectFill"></image>
 					<view style="flex:1">
-					<view style="font-size: 30rpx;font-weight: 600;color: #1F1F1F;">阿迪达斯官方旗舰店</view>
-					<view style="font-size: 24rpx;color: #999;margin-top: 30rpx;">开业时间：2021-03-23</view>
-				</view>
-				<view style="position: absolute;top: 28rpx;right: 28rpx; color: #00DFB8;font-size: 24rpx;">已通过</view>
-			</view>
-			<view style="margin-bottom:30rpx;position: relative;background: #FFFFFF;box-shadow: 0px 10px 50rpx 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;display: flex;align-items: center;padding:30rpx;">
-				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616513250000_714.jpg" style="width: 130rpx;margin-right:30rpx;height: 130rpx;border-radius: 17rpx;" mode="aspectFill"></image>
-				<view style="flex:1">
-					<view style="font-size: 30rpx;font-weight: 600;color: #1F1F1F;">阿迪达斯官方旗舰店</view>
-					<view style="font-size: 24rpx;color: #999;margin-top: 30rpx;">开业时间：2021-03-23</view>
-				</view>
-				<view style="position: absolute;top: 28rpx;right: 28rpx; color: #F70027;font-size: 24rpx;">申请失败</view>
-			</view>
-			<view style="margin-bottom:30rpx;position: relative;background: #FFFFFF;box-shadow: 0px 10px 50rpx 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;display: flex;align-items: center;padding:30rpx;">
-				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616513250000_714.jpg" style="width: 130rpx;margin-right:30rpx;height: 130rpx;border-radius: 17rpx;" mode="aspectFill"></image>
-				<view style="flex:1">
-					<view style="font-size: 30rpx;font-weight: 600;color: #1F1F1F;">阿迪达斯官方旗舰店</view>
-					<view style="font-size: 24rpx;color: #999;margin-top: 30rpx;">开业时间：2021-03-23</view>
-				</view>
-				<view style="position: absolute;top: 28rpx;right: 28rpx; color: #888;font-size: 24rpx;">审核中</view>
-			</view>
-			<view style="margin-bottom:30rpx;position: relative;background: #FFFFFF;box-shadow: 0px 10px 50rpx 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;display: flex;align-items: center;padding:30rpx;">
-				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616513250000_714.jpg" style="width: 130rpx;margin-right:30rpx;height: 130rpx;border-radius: 17rpx;" mode="aspectFill"></image>
-				<view style="flex:1">
-					<view style="font-size: 30rpx;font-weight: 600;color: #1F1F1F;">阿迪达斯官方旗舰店</view>
-					<view style="font-size: 24rpx;color: #999;margin-top: 30rpx;">开业时间：2021-03-23</view>
-				</view>
-				<view style="position: absolute;top: 28rpx;right: 28rpx; color: #00DFB8;font-size: 24rpx;">已通过</view>
-			</view>
-			<view style="margin-bottom:30rpx;position: relative;background: #FFFFFF;box-shadow: 0px 10px 50rpx 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;display: flex;align-items: center;padding:30rpx;">
-				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616513250000_714.jpg" style="width: 130rpx;margin-right:30rpx;height: 130rpx;border-radius: 17rpx;" mode="aspectFill"></image>
-				<view style="flex:1">
-					<view style="font-size: 30rpx;font-weight: 600;color: #1F1F1F;">阿迪达斯官方旗舰店</view>
-					<view style="font-size: 24rpx;color: #999;margin-top: 30rpx;">开业时间：2021-03-23</view>
-				</view>
-				<view style="position: absolute;top: 28rpx;right: 28rpx; color: #F70027;font-size: 24rpx;">申请失败</view>
-			</view>
-			<view style="margin-bottom:30rpx;position: relative;background: #FFFFFF;box-shadow: 0px 10px 50rpx 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;display: flex;align-items: center;padding:30rpx;">
-				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616513250000_714.jpg" style="width: 130rpx;margin-right:30rpx;height: 130rpx;border-radius: 17rpx;" mode="aspectFill"></image>
-				<view style="flex:1">
-					<view style="font-size: 30rpx;font-weight: 600;color: #1F1F1F;">阿迪达斯官方旗舰店</view>
-					<view style="font-size: 24rpx;color: #999;margin-top: 30rpx;">开业时间：2021-03-23</view>
-				</view>
-				<view style="position: absolute;top: 28rpx;right: 28rpx; color: #888;font-size: 24rpx;">审核中</view>
-			</view>
-			<view style="margin-bottom:30rpx;position: relative;background: #FFFFFF;box-shadow: 0px 10px 50rpx 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;display: flex;align-items: center;padding:30rpx;">
-				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616513250000_714.jpg" style="width: 130rpx;margin-right:30rpx;height: 130rpx;border-radius: 17rpx;" mode="aspectFill"></image>
-				<view style="flex:1">
-					<view style="font-size: 30rpx;font-weight: 600;color: #1F1F1F;">阿迪达斯官方旗舰店</view>
-					<view style="font-size: 24rpx;color: #999;margin-top: 30rpx;">开业时间：2021-03-23</view>
-				</view>
-				<view style="position: absolute;top: 28rpx;right: 28rpx; color: #00DFB8;font-size: 24rpx;">已通过</view>
-			</view>
-			<view style="margin-bottom:30rpx;position: relative;background: #FFFFFF;box-shadow: 0px 10px 50rpx 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;display: flex;align-items: center;padding:30rpx;">
-				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616513250000_714.jpg" style="width: 130rpx;margin-right:30rpx;height: 130rpx;border-radius: 17rpx;" mode="aspectFill"></image>
-				<view style="flex:1">
-					<view style="font-size: 30rpx;font-weight: 600;color: #1F1F1F;">阿迪达斯官方旗舰店</view>
-					<view style="font-size: 24rpx;color: #999;margin-top: 30rpx;">开业时间：2021-03-23</view>
-				</view>
-				<view style="position: absolute;top: 28rpx;right: 28rpx; color: #F70027;font-size: 24rpx;">申请失败</view>
-			</view>
-			<view style="margin-bottom:30rpx;position: relative;background: #FFFFFF;box-shadow: 0px 10px 50rpx 0px rgba(218, 220, 230, 0.85);border-radius: 30rpx;display: flex;align-items: center;padding:30rpx;">
-				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616513250000_714.jpg" style="width: 130rpx;margin-right:30rpx;height: 130rpx;border-radius: 17rpx;" mode="aspectFill"></image>
-				<view style="flex:1">
-					<view style="font-size: 30rpx;font-weight: 600;color: #1F1F1F;">阿迪达斯官方旗舰店</view>
-					<view style="font-size: 24rpx;color: #999;margin-top: 30rpx;">开业时间：2021-03-23</view>
-				</view>
-				<view style="position: absolute;top: 28rpx;right: 28rpx; color: #888;font-size: 24rpx;">审核中</view>
-			</view>
+						<view style="font-size: 30rpx;font-weight: 600;color: #1F1F1F;">{{x.Name}}</view>
+						<view style="font-size: 24rpx;color: #999;margin-top: 30rpx;">开业时间：{{x.OpenTime.split(' ')[0]}}</view>
+					</view>
+					<view style="position: absolute;top: 4rpx;right: 28rpx; color: #00DFB8;font-size: 24rpx;">{{x.AuditState==1?'未审核':(x.AuditState==2?'审核通过':'审核不通过')}}</view>
+				</view>
+				<u-loadmore
+				  :status="status"	
+				  :load-text="loadText"
+				  :font-size="24"
+				  :margin-top="20"
+				  :margin-bottom="20"
+				  bg-color="#f6f6f6"
+				/>
 			</scroll-view>
 		</view>
+		
+	</view>
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				mainColor:""
+				mainColor:"",
+				typeList:[{Id:0,Name:'全部'},{Id:1,Name:'未审核'},{Id:2,Name:'审核通过'},{Id:3,Name:'审核不通过'}],
+				active:0,
+				msg:{
+					pageIndex:1,
+					pageSize:20,
+					Name:'',
+					AuditState:0
+				},
+				loadText: {
+					loadmore: "轻轻上拉，加载更多",
+					loading: "努力加载中",
+					nomore: "没有更多了",
+				},
+				page_count:1,
+				status: "loadmore",
+				g: [],
 			}
 		},
 		mounted() {
@@ -89,19 +60,50 @@
 				title: '我的认证'
 			});
 			this.mainColor = this.$uiConfig.mainColor;
+			 this.init();
 		},
 		methods: {
+			init() {
+			  this.request2(
+			  	{
+			  		url: '/api/AppletTrade/GetAuthenticationPageList',
+			  		data: this.msg
+			  	},
+			  	res => {
+			  		if(res.resultCode==1){
+						this.g = this.g.concat(res.data.pageData);
+						 this.page_count = res.data.pageCount;
+						 if (this.page_count == 1) {
+						   this.status = "nomore";
+					}
+			  		}
+			  	}
+			  );
+			},
+			changeHandler(i) {
+				this.active = i;
+				this.msg.AuditState = this.typeList[i].Id;
+				this.msg.pageIndex = 1;
+				this.g= [];
+				 this.init();
+			},
 			lower(e) {
-				// if (this.msg.pageIndex < this.page_count) {
-				// 	this.status = "loading";
-				// 	this.msg.pageIndex++;
-				// 	this.init();
-				// } else {
-				// 	this.isover = true;
-				// 	this.status = "nomore";
-				// }
-				//TODO  分页加载
+			  if (this.msg.pageIndex < this.page_count) {
+			    this.msg.pageIndex++;
+				this.status = "loading";
+			    this.init();
+			  } else {
+				this.status = "nomore";
+			  }
 			},
+			godetails(x,i){
+				uni.navigateTo({
+					url: '/pages/kotra/firstShop/firstShop?Id='+x.Id +'&index='+i
+				})
+			},
+			getsplice(index){
+				this.g.splice(index,1)
+			}
 		}
 	}
 </script>

pages/kotra/identification.vue

@@ -14,11 +14,17 @@
 				<view v-for="(item,index) in stepOneList" :key="index">
 					<view class="itemBox">
 						<view class="name">
-							{{item.name}}
+							{{item.name}} <text class="tip" v-if="item.tip">{{item.tip}}</text>
 						</view>
 						<view class="con1" v-if="item.type==1">
-							<input class="input" type="text" v-model="dataOne[item.file]" :placeholder="item.text"
-								placeholder-style="color: #CECECEFF" />
+							<input class="input" type="text" v-model="dataOne[item.field]" :placeholder="item.text"
+								placeholder-style="color: #CECECEFF" @focus="inputFcous(item)"/>
+								<view style="width: 50rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;position: absolute;
+							top: -2rpx;
+							right: 10rpx;
+							z-index: 10;" @click="delInputText(item.field)">
+									<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/delete.png" v-if="item.delIcon" class="delIcon" mode="widthFix" ></image>
+								</view>
 							
 						</view>
 						<view class="con2" v-if="item.type==2">
@@ -39,22 +45,33 @@
 				<view v-for="(item,index) in stepTwoList" :key="index">
 					<view class="itemBox">
 						<view class="name">
-							{{item.name}}
+							{{item.name}}&nbsp; <text class="tip" v-if="item.tip">{{item.tip}}</text>
 						</view>
 						<view class="con1" v-if="item.type==1">
-							<input class="input" type="text" v-model="dataTwo[item.file]" :placeholder="item.text"
-								placeholder-style="color: #CECECEFF" />
+							<input class="input" type="text" v-model="dataTwo[item.field]" :placeholder="item.text"
+								placeholder-style="color: #CECECEFF" @focus="inputFcous(item)"/>
+								<view style="width: 50rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;position: absolute;
+								top: -2rpx;
+								right: 10rpx;
+								z-index: 10;" @click="delInputText(item.field)">
+										<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/delete.png" v-if="item.delIcon" class="delIcon" mode="widthFix" ></image>
+									</view>
 						</view>
 						<view class="con3" v-if="item.type==2">
 							<view class="numberBbox">
 								<image class="numberImg" :src="reduceIcon" mode="widthFix" @click="reduce"></image>
-								<input class="numberInput" type="number" disabled v-model.number="dataTwo[item.file]" />
+								<input class="numberInput" type="number" disabled v-model.number="dataTwo[item.field]" />
 								<image class="numberImg" :src="addIcon" mode="widthFix" @click="add"></image>
 							</view>
 						</view>
 						<view class="con3" v-if="item.type==3">
 							<!-- 区间滑块 -->
-							
+							<view class="sliderCurNumBox">
+								<view style="display: flex; align-items: baseline;" v-if="dataTwo.BuiltUpArea>0">
+									<input class="sliderCurNum" disabled type="text" v-model="dataTwo.BuiltUpArea" />-
+								</view>
+								<input class="sliderCurNum" disabled type="text" v-model="dataTwo.EndBuiltUpArea" />m²
+							</view>
 							<rangeSlider :width="592" :height="120" :liveMode="true" background-color="#DADCE6D9"
 								:block-size="36" active-color="#F95771FF" :min="rangeSliderMin" :max="rangeSliderMax"
 								:values="builtArea" @rangechange="rangechange"></rangeSlider>
@@ -72,7 +89,7 @@
 									</view>
 								</view>
 							</view>
-							<input type="text" v-model="addCustomType" placeholder="以上都不合适，可在此输入客户群体"
+							<input type="text" class="customTypeInput" v-model="dataTwo.CustomerOtherType" placeholder="以上都不合适，可在此输入客户群体"
 								placeholder-style="color: #CECECEFF" />
 						</view>
 					</view>
@@ -82,21 +99,34 @@
 				<view v-for="(item,index) in stepThreeList" :key="index">
 					<view class="itemBox">
 						<view class="name">
-							{{item.name}}
+							{{item.name}}&nbsp; <text class="tip" v-if="item.tip">{{item.tip}}</text>
 						</view>
 						<view class="con1" v-if="item.type==1">
-							<input class="input" type="text" v-model="dataThree[item.file]" :placeholder="item.text"
-								placeholder-style="color: #CECECEFF" />
+							<input class="input" type="text" v-model="dataThree[item.field]" :placeholder="item.text"
+								placeholder-style="color: #CECECEFF" @focus="inputFcous(item)"/>
+								<view style="width: 50rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;position: absolute;
+								top: -2rpx;
+								right: 10rpx;
+								z-index: 10;" @click="delInputText(item.field)">
+										<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/delete.png" v-if="item.delIcon" class="delIcon" mode="widthFix" ></image>
+									</view>
 						</view>
 						<view class="con6" v-if="item.type==2">
-							<u-radio-group v-model="dataThree[item.file]">
-								<u-radio v-for="(item1, index1) in goodsType" :key="index1" :name="item1.Name"
+							<u-radio-group v-model="dataThree[item.field]">
+								<u-radio v-for="(item1, index1) in goodsType" :key="index1" :name="item1.Id"
 									shape="circle" @change="radioChange">
 									<image :src="goodsTypeImg[item1.Id]" mode="widthFix" class="goodsTypeImg"></image>
 								</u-radio>
 							</u-radio-group>
 						</view>
 						<view class="con3" v-if="item.type==3">
+							<view class="sliderCurNumBox">
+								<view style="display: flex; align-items: baseline;" v-if="dataThree.AreaRequirement>0">
+								<input class="sliderCurNum" disabled type="text" v-model="dataThree.AreaRequirement" />-
+								</view>
+								<input class="sliderCurNum" disabled type="text"
+									v-model="dataThree.EndAreaRequirement" />m²
+							</view>
 							<!-- 区间滑块 -->
 							<rangeSlider :width="592" :height="120" :liveMode="true" background-color="#DADCE6D9"
 								:block-size="36" active-color="#F95771FF" :min="rangeSliderMin" :max="rangeSliderMax"
@@ -114,7 +144,7 @@
 				<text v-if="step==3">完成</text>
 			</view>
 			<view class="skip" v-if="step==3">
-				<text @click="nextStep">跳过</text>
+				<text @click="finish">跳过</text>
 			</view>
 		</view>
 	</view>
@@ -125,81 +155,96 @@
 	export default {
 		components: {
 			rangeSlider
+		},
+		computed: {
+
 		},
 		data() {
 			return {
+				pageTitle: "企业认证",
 				step: 1,
 				nextIcon: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/next.png",
 				percent: 33.33,
-				stepName: "企业基础资料",
+				stepName: "第1步 企业基础资料",
 				nextSepName: "第2步",
+				// type=1：输入框，2：照片
 				stepOneList: [{
-					name: "营业执照 （点击图片上传营业执照)",
+					name: "营业执照",
+					tip:"(点击图片上传营业执照)",
 					type: 2
 				}, {
 					name: "企业名称",
 					text: "请输入企业名称",
-					file: "CompanyName",
+					field: "CompanyName",
+					delIcon:false,
 					type: 1
 				}, {
 					name: "统一社会信用代码",
 					text: "输入18位社会信用代码",
-					file: "UnifiedCode",
+					field: "UnifiedCode",
+					delIcon:false,
 					type: 1
 				}, {
 					name: "法人代表",
 					text: "请输入法人姓名",
-					file: "LegalPerson",
+					field: "LegalPerson",
+					delIcon:false,
 					type: 1
 				}, {
 					name: "联系电话",
 					text: "请输入11位手机或者带区号座机号码",
-					file: "Mobile",
+					field: "Mobile",
+					delIcon:false,
 					type: 1
 				}, ],
 				//type=1：输入框，2：步进器，3：多选
 				stepTwoList: [{
 					name: "品牌名称",
 					text: "请输入品牌名称",
-					file: "BrandName",
+					field: "BrandName",
+					delIcon:false,
 					type: 1
 				}, {
 					name: "店铺数量",
 					text: "",
-					file: "ShopNum",
+					field: "ShopNum",
 					type: 2
 				}, {
 					name: "店铺面积",
 					text: "",
-					file: "",
+					field: "",
 					type: 3
 				}, {
 					name: "品牌定位",
 					text: "请输入品牌定位",
-					file: "FullBrandName",
+					field: "FullBrandName",
+					delIcon:false,
 					type: 1
 				}, {
 					name: "客户群体",
+					tip:"(可多选)",
 					text: "",
-					file: "CustomerType",
+					field: "CustomerType",
 					type: 4,
 				}],
-				addCustomType: "", //添加客户群体
 				customList: [], //客户群体
+				//type=1：输入框，2：单选，3：范围
 				stepThreeList: [{
 					name: "扩店区域",
-					text: "请输入品牌全名",
-					file: " StoreExpansion",
+					text: "请输入扩店区域",
+					field: "StoreExpansion",
+					delIcon:false,
 					type: 1
 				}, {
-					name: "商品性质",
+					name: "商品性质 ",
+					tip:"(单选)",
 					text: "",
-					file: "ProjectType",
+					field: "ProjectType",
 					type: 2
 				}, {
 					name: "面积要求",
 					text: "",
-					file: "",
+					field: "",
 					type: 3
 				}],
 				goodsType: [], //商品性质
@@ -220,10 +265,11 @@
 					CompanyId: 0,
 					BrandName: "",
 					ShopNum: 0,
-					BuiltUpArea: "",
-					EndBuiltUpArea: "",
+					BuiltUpArea: 0,
+					EndBuiltUpArea: 0,
 					FullBrandName: "",
 					CustomerType: "",
+					CustomerOtherType:""
 				},
 				reduceIcon: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/reduceIcon.png",
 				addIcon: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/addIcon.png",
@@ -231,10 +277,10 @@
 				rangeSliderMin: 0, //区间滑块最小值
 				rangeSliderMax: 100, //区间滑块最大值
 				dataThree: {
-					StoreExpansion:"",//扩展区域
-					ProjectType:"",//商品性质
-					AreaRequirement:"",//面积要求
-					EndAreaRequirement:"",//面积要求
+					StoreExpansion: "", //扩展区域
+					ProjectType: "", //商品性质
+					AreaRequirement: 0, //面积要求
+					EndAreaRequirement: 0, //面积要求
 				},
 				goodsTypeImg: {
 					1: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/goodstype-baihuo.png",
@@ -242,12 +288,25 @@
 					3: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/goodstype-center.png",
 					4: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/goodstype-other.png"
 				},
-				AreaRequire:[],
-				AreaRequireMin:0,
-				AreaRequireMax:100,
+				AreaRequire: [],
+				AreaRequireMin: 0,
+				AreaRequireMax: 100,
 			}
 		},
 		methods: {
+			// 输入框获取焦点
+			inputFcous(e){
+				e.delIcon=true
+			},
+			delInputText(field){
+				this.dataOne[field]=""
+				this.dataTwo[field]=""
+				this.dataThree[field]=""
+			},
+			// 输入框失去焦点
+			inputBlur(e){
+				e.delIcon=false
+			},
 			// 获取客户群体枚举
 			getCustomerTypeEnumList() {
 				let parms = {
@@ -331,7 +390,6 @@
 						image: data,
 					},
 					success(res) {
-						console.log(res)
 						resCall(res)
 					},
 					fail(res) {
@@ -351,7 +409,7 @@
 				uni.uploadFile({
 					url: action,
 					filePath: img,
-					name: 'file',
+					name: 'field',
 					formData: {
 						user: 'test'
 					},
@@ -388,6 +446,7 @@
 			},
 			//步骤一
 			stepOne() {
+				
 				let parms = {
 					url: "/api/AppletTrade/SetCompany",
 					data: this.dataOne
@@ -399,6 +458,7 @@
 						this.nextSepName = "第3步"
 						this.step++
 						this.percent += this.percent
+						this.showTemplate(res.data.template_message_list)
 					}
 				})
 			},
@@ -416,7 +476,10 @@
 				this.dataTwo.CustomerType = ids.toString()
 				let parms = {
 					url: "/api/AppletTrade/SetBrand",
-					data: this.dataTwo
+					data: {
+						...this.dataTwo,
+						...this.dataThree
+					}
 				}
 				this.request2(parms, (res) => {
 					if (res.resultCode == 1) {
@@ -428,66 +491,75 @@
 				})
 			},
 			//步骤三
-			stepThree(){
-				this.dataThree.CompanyId = this.dataOne.CompanyId
+			stepThree() {
+				let that = this
 				this.dataThree.AreaRequirement = this.AreaRequire[0]
 				this.dataThree.EndAreaRequirement = this.AreaRequire[1]
 				let parms = {
 					url: "/api/AppletTrade/SetBrand",
-					data: this.dataThree
+					data: {
+						...this.dataTwo,
+						...this.dataThree
+					}
 				}
 				this.request2(parms, (res) => {
-					console.log("333")
 					if (res.resultCode == 1) {
-						this.stepName = "第3步 扩店需求"
-						this.nextSepName = "完成"
-						this.step++
-						this.percent += this.percent
+						 that.finish()
 					}
 				})
 			},
+			finish(){
+				 uni.navigateTo({
+				 	url:"/pages/user-center/user-center"
+				 })
+			 },
 			//下一步
 			nextStep() {
-				console.log(this.step)
-				if (this.step < 3 && this.percent <= 100) {
+				if (this.percent > 100) {
+					this.percent = 100
+				}
+				if (this.step <= 3) {
 					if (this.step == 1) {
-						console.log("...",this.step)
-						if (this.dataOne.CompanyStatus == 2||undefined||"") {
-							this.stepOne()
-						} else {
+						//审核中或审核通过就不提交请求
+						if (this.dataOne.CompanyStatus == 0 || this.dataOne.CompanyStatus == 1) {
 							this.stepName = "第2步 品牌信息"
 							this.nextSepName = "第3步"
 							this.step++
 							this.percent += this.percent
+						} else {
+							this.stepOne()
 						}
 					} else if (this.step == 2) {
-						if (this.dataOne.CompanyStatus == 2||undefined||"") {
-							this.stepTwo()
-						} else {
+						//审核中或审核通过就不提交请求
+						if (this.dataOne.CompanyStatus == 0 || this.dataOne.CompanyStatus == 1) {
 							this.stepName = "第3步 扩店需求"
 							this.nextSepName = "完成"
 							this.step++
 							this.percent += this.percent
+						} else {
+							this.stepTwo()
 						}
-
 					} else if (this.step == 3) {
-						console.log("...",this.step)
+						//审核中或审核通过就不提交请求
+						if (this.dataOne.CompanyStatus == 0 || this.dataOne.CompanyStatus == 1) {
+							this.finish()
+						}else{
 							this.stepThree()
-						// if (this.dataOne.CompanyStatus == 2) {
-						// 	this.stepThree()
-						// } else {
-						// }
+						}
 					}
 				}
 			},
 			chooseType(item) { //选择客户群体
 				item.checked = !item.checked
 			},
+			// 店铺面积范围
 			rangechange(e) {
 				this.builtArea[0] = parseInt(e.minValue)
 				this.builtArea[1] = parseInt(e.maxValue)
-				console.log(this.builtArea)
+				this.dataTwo.BuiltUpArea = parseInt(e.minValue)
+				this.dataTwo.EndBuiltUpArea = parseInt(e.maxValue)
 			},
+			// 减号按钮
 			reduce() {
 				if (this.dataTwo.ShopNum > 0) {
 					this.dataTwo.ShopNum--
@@ -496,6 +568,7 @@
 				}
 
 			},
+			// 加号按钮
 			add() {
 				this.dataTwo.ShopNum++
 			},
@@ -506,17 +579,16 @@
 					url: "/api/AppletTrade/GetUserCompany",
 				}
 				this.request2(parms, (res) => {
-					if (res.resultCode == 1) {
+					if (res.resultCode == 1&&res.data!=null) {
 						this.dataOne = res.data
 						this.businessLicenseUploadIsSuccess = true
-						// if(res.data.CompanyStatus==2){
 						that.getUserCompanyBrand(res.data.CompanyId)
-						// }
 					}
 				})
 			},
 			// 根据公司id获取公司品牌
 			getUserCompanyBrand(id) {
+				let that = this
 				let parms = {
 					url: "/api/AppletTrade/GetUserCompanyBrand",
 					data: {
@@ -525,16 +597,52 @@
 				}
 				this.request2(parms, (res) => {
 					if (res.resultCode == 1) {
-
+						that.dataTwo.BrandName = res.data.BrandName
+						that.dataTwo.ShopNum = res.data.ShopNum
+						that.dataTwo.BuiltUpArea = res.data.BuiltUpArea
+						that.dataTwo.EndBuiltUpArea = res.data.EndBuiltUpArea
+						that.dataTwo.FullBrandName = res.data.FullBrandName
+						that.dataTwo.CustomerType = res.data.CustomerType
+						that.dataTwo.CustomerOtherType = res.data.CustomerOtherType
+						that.customList.map((e) => {
+							if (e.Id == res.data.CustomerType) {
+								e.checked = true
+							}
+						})
+						that.dataThree.StoreExpansion = res.data.StoreExpansion
+						that.dataThree.ProjectType = res.data.ProjectType
+						that.dataThree.AreaRequirement = res.data.AreaRequirement
+						that.dataThree.EndAreaRequirement = res.data.EndAreaRequirement
 					}
 				})
 			},
+			// 单选
 			radioChange(e) {
-				console.log(e,this.dataThree);
+				// console.log(e);
 			},
-			AreaRequireChange(e){
+			// 面积要求范围
+			AreaRequireChange(e) {
 				this.AreaRequire[0] = parseInt(e.minValue)
 				this.AreaRequire[1] = parseInt(e.maxValue)
+				this.dataThree.AreaRequirement = parseInt(e.minValue)
+				this.dataThree.EndAreaRequirement = parseInt(e.maxValue)
+			},
+			//显示模板
+			showTemplate(template) {
+				uni.requestSubscribeMessage({
+					tmplIds: template,
+					success(res) {
+						console.log(res)
+						
+					},
+					fail(err) {
+						console.log(err)
+						// uni.showToast({
+						// 	title: '！',
+						// 	icon: 'none'
+						// })
+					}
+				})
 			}
 
 		},
@@ -543,6 +651,9 @@
 			this.GetProjectTypeEnumList()
 			this.getAccess_token()
 			this.getUserCompany()
+			uni.setNavigationBarTitle({
+				title: this.pageTitle,
+			});
 		}
 	}
 </script>
@@ -607,18 +718,33 @@
 						font-weight: bold;
 						color: #1F1F1F;
 						margin-bottom: 38rpx;
+						.tip{
+							font-weight: 400;
+							color: #AAAAAAFF;
+							margin-left: 10rpx;
+						}
 					}
 
 					.con1 {
 						height: 60rpx;
-
+						position: relative;
 						.input {
+							// width: 100%;
 							font-size: 32rpx;
 							font-family: PingFang SC;
 							font-weight: bold;
 							color: #000000;
 							border-bottom: 1rpx solid #DADCE6;
 							padding-bottom: 24rpx;
+							vertical-align:baseline;
+							padding-right: 50rpx;
+						}
+						.delIcon{
+							width: 32rpx;
+							height: 32rpx;
+							// width: 100%;
+							// height: 100%;
+							
 						}
 
 					}
@@ -679,8 +805,8 @@
 
 						.customTypeBox {
 							display: flex;
-							flex-wrap: wrap;
-							// justify-content: space-between;
+							// flex-wrap: wrap;
+							justify-content: space-between;
 							margin-bottom: 20rpx;
 
 							.customName {
@@ -696,13 +822,20 @@
 								font-size: 28rpx;
 								font-weight: bold;
 								color: #000000;
-								margin-right: 50rpx;
+								// margin-right: 50rpx;
 								margin-bottom: 20rpx;
 							}
 
 							& :nth-child(4n)>.customName {
 								margin-right: 0rpx !important;
 							}
+							
+						}
+						.customTypeInput{
+								font-size: 32rpx;
+								font-family: PingFang SC;
+								font-weight: bold;
+								color: #000000;
 							}
 					}
 
@@ -797,4 +930,18 @@
 		right: 17rpx;
 		z-index: 10;
 	}
+
+	.sliderCurNumBox {
+		display: flex;
+		justify-content: center;
+		align-items: baseline;
+
+		.sliderCurNum {
+			width: 100rpx;
+			text-align: center;
+			font-size: 40rpx;
+			font-weight: 800;
+			color: #F70027;
+		}
+	}
 </style>

pages/user-center/user-center.vue

 <template>
 	<scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;">
-		<view class="userStyle" v-if="meueData.user_center && meueData.user_center.is_ppenmiai==0" :class="{'dark':isCompany}">
+		<view class="userStyle" v-if="meueData.user_center && meueData.user_center.is_ppenmiai==0" :class="{'dark':isCompany}"><!-- 修改 -->
 			<view class="headStatus" v-if="scrollTop > 50" :style="[headStyle,
 			    {
 			      zIndex: scrollTop < 10 ? 'unset' : 2,
@@ -19,11 +19,27 @@
 						<view style="display: flex;flex-direction: column;justify-content: center;height: 50px;margin-left: 20rpx">
 							<Text  class="nickname" style="color: #FFF;font-size: 40rpx;font-weight:800;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;"
 							 @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
+							 <view style="display: flex; align-items: center;">
 								 <view class="member" v-if="is_icon_members_grade == 1&& user_info.nickname">
 								 	<image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image>
 								 	<Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text>
+								 	<!-- 公司认证状态 -->
+								 	
+								 </view>
+							 	<view class="componyStatusBox" @click="goIdentification" v-if="is_show_korea==1">
+							 		<view class="renzhen" v-if="companyStatus==2 " >
+							 			未认证
+							 		</view>
+							 		<view class="renzhen" v-if="companyStatus==0"  :style="{'border':'1px solid '+mainColor,'color':mainColor}">
+							 			认证审核中
+							 		</view>
+							 		<view class="companyName" v-if="companyStatus==1">
+							 			{{companyName}}
+							 		</view>
 							 	</view>
 							 </view>
+							
+						</view>
 					</view>
 					<view style="display: flex;flex-direction: column;align-items: center;margin-top: 23px;margin-bottom: 5px;" v-if="meueData.user_center.top_style == 2">
 						<u-avatar :src="user_info.avatar" shape="circle" size="120"></u-avatar>
@@ -167,7 +183,7 @@
 			<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 			<tabbars></tabbars>
 		</view>
-		<view  v-if="meueData.user_center && meueData.user_center.is_ppenmiai==1 && isloading== true">
+		<view  v-if="meueData.user_center && meueData.user_center.is_ppenmiai==1 && isloading== true"><!-- 修改 -->
 			<blinddate
 			:meueData='meueData'
 			:user_info ='user_info'
@@ -215,7 +231,10 @@
 				IsEducation: 0, //1是0否是网课模式
 				PointNum:0,
 				setting: {},
-				isCompany:true //TODO 完成动态加载系统所属类型
+				isCompany:true, //TODO 完成动态加载系统所属类型
+				companyStatus:2,
+				companyName:"",
+				is_show_korea:0,//是否显示认证标识
 			};
 		},
 		components: {
@@ -232,7 +251,7 @@
 				0;
 			this.userinfo();
 			this.setting = uni.getStorageSync("basedata").mall.setting;
-			this.isCompany=uni.getStorageSync("user_type")?uni.getStorageSync("user_type")=="company":true; 完成动态加载系统所属类型
+			this.isCompany=uni.getStorageSync("user_type")?uni.getStorageSync("user_type")=="company":true; //完成动态加载系统所属类型
 		},
 		onLoad() {
 			this.navHeight = this.$navHeight - 2;
@@ -246,6 +265,7 @@
 			}
 		},
 		mounted() {
+			this.getComponyStatus()
 			let currentPages = getCurrentPages();
 			let c = this.$uiConfig.is_bang ? 80 : 52;
 			this.bottommargin = c + 10 + 'px';
@@ -259,13 +279,17 @@
 
 			this.is_icon_members_grade = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_icon_members_grade :
 				0;
+			this.is_show_korea= uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_show_korea :
+					0;
 			let u = '/' + currentPages[currentPages.length - 1].route;
 			let pages = wx.getStorageSync('basedata') ? wx.getStorageSync('basedata').bar_title : [];
 			uni.setNavigationBarTitle({
 				title: '用户中心'
 			});
+			
 		},
 		onShow() {
+			
 			this.userinfo(2);
 			if (this.mall_UserInfo) {
 				this.getUserPoint()
@@ -355,6 +379,7 @@
 							this.getLogin()
 						}
 						this.isloading= true
+						
 					}
 				);
 				let u = uni.getStorageSync("mall_UserInfo");
@@ -453,6 +478,26 @@
 					url: '/pages/appointment/personal/pointBalance'
 				});
 			},
+			// 获取公司认证信息
+			getComponyStatus(){
+				let that = this
+				let parms = {
+					url: "/api/AppletTrade/GetUserCompany",
+				}
+				this.request2(parms, (res) => {
+					if (res.resultCode == 1&&res.data!=null) {
+						// 获取公司名字和认证状态
+						that.companyStatus=res.data.CompanyStatus
+						that.companyName=res.data.CompanyName
+					}
+				})
+			},
+			//去认证页
+			goIdentification(){
+				uni.navigateTo({
+					url: '/pages/kotra/identification' 
+				})
+			}
 		}
 	};
 </script>
@@ -654,7 +699,7 @@
 
 	.userStyle .member {
 		background: #3b3641;
-		width: 80px;
+		/* width: 80px; */
 		font-size: 10px;
 		color: #fff;
 		height: 18px;
@@ -782,4 +827,13 @@
 	.userBox .paike{
 		margin-top: 15px;display: flex;flex-direction: row;align-items: center;justify-content: space-between;
 	}
+	.componyStatusBox .renzhen{
+		height: 15px;font-size: 10px;margin-top: 10px;color: #555555;border-radius: 7px;border: 1px solid #999999;display: flex;align-items: center;justify-content: center; padding: 0 10rpx; margin-left: 10rpx;
+	}
+	.componyStatusBox .companyName{
+		font-size: 26rpx;
+		font-weight: 500;
+		color: #888888;
+		/* background-color: #F6F6F6FF */
+	}
 </style>
\ No newline at end of file