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

pages/kotra/billboard/listsignUp.vue

@@ -2,9 +2,9 @@
 	.listsignUp {
 		width: 100%;
 		height: 100vh;
-		/* overflow-y: auto; */
+		overflow-y: auto;
 		background: #F6F6F6;
-		padding: 18px;
+		
 	}
 
 	.listsignUp .single_Phone {
@@ -40,37 +40,40 @@
 	}
 </style>
 <template>
-	<view class="listsignUp" v-if="!loading">
-		<view style="width: 100%;padding: 15px;border-radius: 15px;background: #FFF;">
-			<view>
-				<view class="single_Phone" style="margin-top: 0;">
-					<span style="color:red;margin-right:5rpx;" >*</span>参与品牌/载体
-				</view>
-				<view class="single_Input" @click="show=true" style="width: 100%;display: flex;align-items: center;justify-content: space-between;">
-					<input style="width: 90%"  v-model="ObjectName" :disabled="true" placeholder="请选择" />
-					<u-icon name="arrow" color="#909399"  size="36" ></u-icon>
-					
+	<view class="listsignUp" v-if="!loading">
+		<view style="width: 100%;height: 100%;padding: 18px;">
+			<view style="width: 100%;padding: 15px;border-radius: 15px;background: #FFF;">
+				<view>
+					<view class="single_Phone" style="margin-top: 0;">
+						<span style="color:red;margin-right:5rpx;" >*</span>参与品牌/载体
+					</view>
+					<view class="single_Input" @click="show=true" style="width: 100%;display: flex;align-items: center;justify-content: space-between;">
+						<input style="width: 90%"  v-model="ObjectName" :disabled="true" placeholder="请选择" />
+						<u-icon name="arrow" color="#909399"  size="36" ></u-icon>
+						
+					</view>
+					<u-picker v-model="show" mode="selector" :range="CarrierList" range-key="Name" @confirm='confirm'></u-picker>
 				</view>
-				<u-picker v-model="show" mode="selector" :range="CarrierList" range-key="Name" @confirm='confirm'></u-picker>
-			</view>
-			<template v-for="(item,index) in dataList">
-				<singleText v-if="item.CompKey=='SingleLineText'" :CompData="item.CompData" :index='index'
-					@success="datasuccess()"></singleText>
-				<multipleText v-if="item.CompKey=='MultiLineText'" :CompData="item.CompData" :index='index'
-					@success="datasuccess()"></multipleText>
-				<selectChoice v-if="item.CompKey=='DorpDownList'" :CompData="item.CompData" :index='index'
-					@success="datasuccess()"></selectChoice>
-				<pictureUpload v-if="item.CompKey=='ImageUploadComp'" :CompData="item.CompData" :index='index'
-					@success="datasuccess()"></pictureUpload>
-				<videoUpload v-if="item.CompKey=='VideoUploadComp'" :CompData="item.CompData" :index='index' 
-					@success="datasuccess()"></videoUpload>
-				<fileType v-if="item.CompKey=='CommonUploadComp'" :CompData="item.CompData" :index='index' 
-						@success="datasuccess()"></fileType>
-			</template>
-			<view class="btn" @click="setapply()">
-				提交申请
-			</view>
-		</view>
+				<template v-for="(item,index) in dataList">
+					<singleText v-if="item.CompKey=='SingleLineText'" :CompData="item.CompData" :index='index'
+						@success="datasuccess()"></singleText>
+					<multipleText v-if="item.CompKey=='MultiLineText'" :CompData="item.CompData" :index='index'
+						@success="datasuccess()"></multipleText>
+					<selectChoice v-if="item.CompKey=='DorpDownList'" :CompData="item.CompData" :index='index'
+						@success="datasuccess()"></selectChoice>
+					<pictureUpload v-if="item.CompKey=='ImageUploadComp'" :CompData="item.CompData" :index='index'
+						@success="datasuccess()"></pictureUpload>
+					<videoUpload v-if="item.CompKey=='VideoUploadComp'" :CompData="item.CompData" :index='index' 
+						@success="datasuccess()"></videoUpload>
+					<fileType v-if="item.CompKey=='CommonUploadComp'" :CompData="item.CompData" :index='index' 
+							@success="datasuccess()"></fileType>
+				</template>
+				<view class="btn" @click="setapply()">
+					提交申请
+				</view>
+			</view>
+		</view>
+		
 		<u-modal
 		  v-model="rzshow"
 		  content="还未进行认证,现在去认证"
@@ -290,8 +293,8 @@
 				}
 				let dataList = JSON.parse((JSON.stringify(this.dataList)))
 				dataList.map(x => {
-					if (show == true) {
-						return
+					if (show == true) {
+						return
 					}
 					if(x.CompKey=='DorpDownList' && x.CompData.IsMultiple==true){
 						if(Array.isArray(x.CompData.OptionValue)){
@@ -313,13 +316,17 @@
 							uni.showToast({
 								title: '请选择' + x.CompData.Name,
 								icon: 'none'
-							})
+							})
+							show = true
 							return
 						}
 					}
 					
 				})
-				console.log('调用接口')
+				if (show == true) {
+					return
+				}
+				
 				
 				this.addMsg.Content = JSON.stringify(dataList) 
 				let that = this