master-rewrite-addnew

@@ -63,7 +63,7 @@ Component({
           ddate_solt:-1,
           ddate_solt:-1,
           timeDur:'0-0'
           timeDur:'0-0'
         })
         })
-      };
+      }
       this.triggerEvent('event',{
       this.triggerEvent('event',{
         time:this.dur_list[this.dur_list_checked].time,
         time:this.dur_list[this.dur_list_checked].time,
         ddate_solt:parseInt(this.ddate_solt)+1,
         ddate_solt:parseInt(this.ddate_solt)+1,

@@ -13,7 +13,7 @@
             <view bindtap="calendarClose">{{ddate_solt==1?'午市':ddate_solt==2?'晚市':'早市'}}</view>
             <view bindtap="calendarClose">{{ddate_solt==1?'午市':ddate_solt==2?'晚市':'早市'}}</view>
         </view>
         </view>
         <view class="flex-ll" style="flex-wrap:wrap">
         <view class="flex-ll" style="flex-wrap:wrap">
-            <view class="time-item {{index==dur_list_checked?'checked':''}}"
+            <view class="time-item {{index==dur_list_checked?'checked':''}} {{item.disabled?'disabled':''}}"
                   style="{{(index+1)%3==0?'margin-right:0;':''}}"
                   style="{{(index+1)%3==0?'margin-right:0;':''}}"
                   wx:for="{{dur_list}}" wx:key="listkey"
                   wx:for="{{dur_list}}" wx:key="listkey"
                   catchtap="bindTimePickerChange"
                   catchtap="bindTimePickerChange"

@@ -35,6 +35,11 @@
     background-color: #199095;
     background-color: #199095;
     color:#fefefe;
     color:#fefefe;
 }
 }
+.timePicker .time-item.disabled{
+    background-color:#999999;
+    color: #efefef;
+    border: 2rpx solid #999999;
+}
 .timePicker .close{
 .timePicker .close{
     width: 50rpx;
     width: 50rpx;
     height: 50rpx;
     height: 50rpx;

@@ -148,18 +148,19 @@ Component({
         }
         }
       }
       }
 
 
-      let dur,timeCheckedIndex=0,list=[];
+      let dur,timeCheckedIndex=this.type==2?-1:0,list=[];
       for(dur=parseInt(min);dur<=max;dur+=1800){
       for(dur=parseInt(min);dur<=max;dur+=1800){
         let t={
         let t={
           hasChecked:time<=dur,
           hasChecked:time<=dur,
           time:dur,
           time:dur,
-          disabled:this.dateIndex==0,//disabled 今天过期时间?
+          disabled:this.dateIndex==0 && this.type==1 && time>dur,//disabled 今天过期时间?
         }
         }
         list.push(t)
         list.push(t)
         if(dur<=time){
         if(dur<=time){
           timeCheckedIndex++
           timeCheckedIndex++
         }
         }
       }
       }
+      timeCheckedIndex=timeCheckedIndex>=list.length?list.length-1:timeCheckedIndex
       console.log('add-time-dur.tindex',list,timeCheckedIndex)
       console.log('add-time-dur.tindex',list,timeCheckedIndex)
       return {list:list,listIndex:timeCheckedIndex}
       return {list:list,listIndex:timeCheckedIndex}
     },
     },

@@ -569,7 +569,7 @@
 					"scene": null
 					"scene": null
 				},
 				},
 				{
 				{
-					"id": -1,
+					"id": 70,
 					"name": "无参数 pack-book/pages/book/b_addnew",
 					"name": "无参数 pack-book/pages/book/b_addnew",
 					"pathName": "pack-book/pages/book/b_addnew",
 					"pathName": "pack-book/pages/book/b_addnew",
 					"query": "",
 					"query": "",