Commit b36c72843567cccb8c1494f943872e85ad7e0623

Authored by vking
1 parent a4916c93

master-rewrite-addnew

@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <view class="time-item {{index==dur_list_checked?'checked':''}} {{item.disabled?'disabled':''}}" 16 <view class="time-item {{index==dur_list_checked?'checked':''}} {{item.disabled?'disabled':''}}"
17 style="{{(index+1)%3==0?'margin-right:0;':''}}" 17 style="{{(index+1)%3==0?'margin-right:0;':''}}"
18 wx:for="{{dur_list}}" wx:key="listkey" 18 wx:for="{{dur_list}}" wx:key="listkey"
19 - catchtap="bindTimePickerChange" 19 + catchtap="{{item.disabled?'miss':'bindTimePickerChange'}}"
20 data-index="{{index}}" 20 data-index="{{index}}"
21 >{{util.unixtoTime(item.time,"HH:II")}}</view> 21 >{{util.unixtoTime(item.time,"HH:II")}}</view>
22 </view> 22 </view>
@@ -128,27 +128,6 @@ @@ -128,27 +128,6 @@
128 </view> 128 </view>
129 </view> 129 </view>
130 <tabBar></tabBar> 130 <tabBar></tabBar>
131 -<view class="calendar-mask" bindtap="calendarClose"  
132 - style="height:100%;" wx:if="{{timePickerMask}}">  
133 - <view class="timePicker">  
134 - <view class="flex-rr">  
135 - <image class="close" src="http://qn.colorcun.com/custom/lite-yd/image/add-act.png" bindtap="calendarClose"></image>  
136 - </view>  
137 - <view class="flex-cc" style="margin-bottom: 56rpx; font-size: 30rpx;">  
138 - <view bindtap="calendarClose">{{form.time==1?'午市':form.time==2?'晚市':'早市'}}</view>  
139 - </view>  
140 - <view class="flex-ll" style="flex-wrap:wrap">  
141 - <view class="time-item {{timePickerIndex[form.time]==index?'checked':''}}"  
142 - style="{{(index+1)%3==0?'margin-right:0;':''}}"  
143 - wx:for="{{timePickerArray[form.time]}}" wx:key=""  
144 - bindtap="bindTimePickerChange"  
145 - data-time-index="{{form.time}}"  
146 - data-val="{{index}}"  
147 - >{{item}}</view>  
148 - </view>  
149 - </view>  
150 -</view>  
151 -  
152 <view class="calendar-mask" bindtap="CustomRemarkMore" 131 <view class="calendar-mask" bindtap="CustomRemarkMore"
153 style="height:100%;" wx:if="{{CustomRemarkMoreMask}}"> 132 style="height:100%;" wx:if="{{CustomRemarkMoreMask}}">
154 <view class="timePicker" catchtap="catchtap"> 133 <view class="timePicker" catchtap="catchtap">