Commit af2120b34d978e31f8a85edfb155071d5bd429e7

Authored by vking
2 parents fd971ae5 b954a2f1

Merge remote-tracking branch 'origin/master'

@@ -63,7 +63,7 @@ Component({ @@ -63,7 +63,7 @@ Component({
63 } 63 }
64 this.setData({ 64 this.setData({
65 durlist:durlist, 65 durlist:durlist,
66 - time:this.data.time=='' ? (durlist.length>0 ? durlist[0].showdur : '') : this.data.time 66 + time:durlist.length>0 ? durlist[0].showdur : ''
67 }) 67 })
68 this.triggerEvent('selecttime',{time:this.data.time,action:'defalut'}) 68 this.triggerEvent('selecttime',{time:this.data.time,action:'defalut'})
69 }, 69 },
1 <swiper class="people-list" display-multiple-items="5" next-margin="46rpx"> 1 <swiper class="people-list" display-multiple-items="5" next-margin="46rpx">
2 <block wx:for="{{peoplelist}}" wx:key="{{index}}"> 2 <block wx:for="{{peoplelist}}" wx:key="{{index}}">
3 <swiper-item> 3 <swiper-item>
4 - <view class="people {{item.isactive ? 'white-font active' : 'black-font'}} font30r font-bold flex-cc" catchtap="selectpeople" data-count="{{item.count}}">{{item.count}}位</view> 4 + <view class="people {{item.isactive ? 'white-font active' : 'black-font'}} font30r font-bold flex-cc" catchtap="selectpeople" data-count="{{item.count}}">{{item.count}} 位</view>
5 </swiper-item> 5 </swiper-item>
6 </block> 6 </block>
7 </swiper> 7 </swiper>