Merge remote-tracking branch 'origin/master'

@@ -63,7 +63,7 @@ Component({
 			}
 			this.setData({
 				durlist:durlist,
-				time:this.data.time=='' ? (durlist.length>0 ? durlist[0].showdur : '') : this.data.time
+				time:durlist.length>0 ? durlist[0].showdur : ''
 			})
 			this.triggerEvent('selecttime',{time:this.data.time,action:'defalut'})
 		},

 <swiper class="people-list" display-multiple-items="5" next-margin="46rpx">
 	<block wx:for="{{peoplelist}}" wx:key="{{index}}">
 		<swiper-item>
-			<view class="people {{item.isactive ? 'white-font active' : 'black-font'}} font30r font-bold flex-cc" catchtap="selectpeople" data-count="{{item.count}}">{{item.count}}位</view>
+			<view class="people {{item.isactive ? 'white-font active' : 'black-font'}} font30r font-bold flex-cc" catchtap="selectpeople" data-count="{{item.count}}">{{item.count}} 位</view>
 		</swiper-item>
 	</block>
 </swiper>
\ No newline at end of file