Commit 25ffc8fb authored by 罗超's avatar 罗超

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

parents e8372d36 235a9f70
...@@ -50,7 +50,8 @@ ...@@ -50,7 +50,8 @@
background-color: #F6F6F6; background-color: #F6F6F6;
width:100%; width:100%;
position: fixed; position: fixed;
top: 65px; top: 0;
/* top: 65px; */
left: 0; left: 0;
overflow: auto; overflow: auto;
flex:1; flex:1;
...@@ -70,9 +71,10 @@ ...@@ -70,9 +71,10 @@
} }
</style> </style>
<template> <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"> <template v-if="isShowSign">
<view class="tradeTop"> <view class="tradeTop" style="margin-top:23%;">
<text class="Top_LEFT"></text> <text class="Top_LEFT"></text>
请选择你要报名的活动 请选择你要报名的活动
</view> </view>
...@@ -134,7 +136,6 @@ ...@@ -134,7 +136,6 @@
this.mc = this.$uiConfig.mainColor; this.mc = this.$uiConfig.mainColor;
}, },
created() { created() {
}, },
onShow() { onShow() {
}, },
......
...@@ -106,24 +106,27 @@ ...@@ -106,24 +106,27 @@
}, },
created() { created() {
if(this.multiple == true){ if(this.multiple == true){
this.value = [] if(this.value!=''){
this.value= this.value.split(',')
}else{
this.value = []
}
} }
console.log(this.value,'value')
}, },
methods: { methods: {
getmorendata(){
console.log('进来了')
},
get_value(val){ // 将数组值转换为以,隔开的字符串 get_value(val){ // 将数组值转换为以,隔开的字符串
if(val || val===0){ if(val || val===0){
if(Array.isArray(val)){ if(Array.isArray(val)){
let chooseAttr = [] let chooseAttr = []
val.forEach(item=>{ val.forEach(item=>{
let choose = this.list.find(temp => { let choose = this.list.find(temp => {
let val_val = this.getValueKeyValue(temp) let val_val = this.getValueKeyValue(temp)
return item === val_val 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(',') let values = chooseAttr.map(temp => this.getLabelKeyValue(temp)).join(',')
return values return values
...@@ -165,7 +168,10 @@ ...@@ -165,7 +168,10 @@
return this.value === val return this.value === val
} }
}, },
getLabelKeyValue(item){ // 获取label getLabelKeyValue(item){ // 获取label
if(item==undefined){
return
}
return item[this.labelKey] return item[this.labelKey]
}, },
getValueKeyValue(item){ // 获取value getValueKeyValue(item){ // 获取value
......
...@@ -25,15 +25,7 @@ ...@@ -25,15 +25,7 @@
} }
}, },
created() { 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:{ methods:{
selectChange(e){ selectChange(e){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment