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

components/tradeActivity/index.vue

@@ -50,7 +50,8 @@
 		background-color: #F6F6F6;
 		width:100%;
 		position: fixed;
-		top: 65px;
+		top: 0;
+		/* top: 65px; */
 		left: 0;
 		overflow: auto;
 		flex:1;
@@ -70,9 +71,10 @@
 	}
 </style>
 <template>
-	<view class="trade-activity" :style="{height:!isShowSign?'0':'calc(100vh  - '+pagePaddingBottom+')'}" :class="{'tradeActive':isShowSign}">
+	<!-- <view class="trade-activity" :style="{height:!isShowSign?'0':'calc(100vh  - '+pagePaddingBottom+')'}" :class="{'tradeActive':isShowSign}"> -->
+	<view class="trade-activity" :style="{height:!isShowSign?'0':'calc(100vh)'}" :class="{'tradeActive':isShowSign}">
 		<template v-if="isShowSign">
-			<view class="tradeTop">
+			<view class="tradeTop" style="margin-top:23%;">
 				<text class="Top_LEFT"></text>
 				请选择你要报名的活动
 			</view>
@@ -134,7 +136,6 @@
 			this.mc = this.$uiConfig.mainColor;
 		},
 		created() {
-			
 		},
 		onShow() {
 		},

pages/kotra/billboard/components/ld-select.vue

@@ -106,24 +106,27 @@
 		},
 		created() {
 			if(this.multiple == true){
-				this.value = []
+				if(this.value!=''){
+					this.value= this.value.split(',')
+				}else{
+					this.value = []
+				}
 			}
-			console.log(this.value,'value')
+			
 		},
-		methods: {
-			getmorendata(){
-				console.log('进来了')
-			},
+		methods: {
 			get_value(val){ // 将数组值转换为以,隔开的字符串
 				if(val || val===0){
 					if(Array.isArray(val)){
 						let chooseAttr = []
 						val.forEach(item=>{
 							let choose = this.list.find(temp => {
-								let val_val = this.getValueKeyValue(temp)
+								let val_val = this.getValueKeyValue(temp)
 								return item === val_val
-							})
-							chooseAttr.push(choose)
+							})
+							console.log(choose,'choose')
+							chooseAttr.push(choose)
+							console.log(chooseAttr)
 						})
 						let values = chooseAttr.map(temp => this.getLabelKeyValue(temp)).join(',')
 						return values
@@ -165,7 +168,10 @@
 					return this.value === val
 				}
 			},
-			getLabelKeyValue(item){ // 获取label
+			getLabelKeyValue(item){ // 获取label
+				if(item==undefined){
+					return
+				}
 				return item[this.labelKey]
 			},
 			getValueKeyValue(item){ // 获取value

pages/kotra/billboard/plugin/selectChoice.vue

@@ -25,15 +25,7 @@
 			}
 		},
 		created() {
-			console.log(this.CompData,'CompData')
-			if(this.CompData.OptionValue && this.CompData.OptionValue!=''){
-				
-				if (Object.keys(this.$refs).length > 0 && this.$refs.ldselect) {
-				  //判断
-				  console.log(this.$refs.ldselect,'ldselect')
-				  ; 
-				}
-			}
+			
 		},
 		methods:{
 			selectChange(e){