Merge branch 'master' of http://git.cc-lotus.info/Free-canteen/smart-canteen

pages/reserve/index.js

@@ -39,6 +39,8 @@ Page({
       lunch: { reserve: 0, list: [], },
       dinner: { reserve: 0, list: [], },
     },
+    // 时间选择范围
+    picker: {}
   },
   // 选择日期
   bindDateChange: function (e) {
@@ -217,7 +219,8 @@ Page({
   onLoad: function (options) {
     this.searchST();
     let today = moment().add(1, 'days').format('YYYY-MM-DD');
-    this.setData({ today: today })
+    let endday = moment().add(1, 'months').format('YYYY-MM-DD');
+    this.setData({ today: today, picker: { start: today, end: endday } })
     this.searchDate();
     this.searchOrder();
   },

pages/reserve/index.wxml

@@ -5,7 +5,7 @@
     <view class="one_2">
       <view>请您在前一天21点前报餐</view>
       <view>
-        <picker mode="date" value="{{today}}" start="2000-01-01" end="2100-12-31" bindchange="bindDateChange">
+        <picker mode="date" value="{{today}}" start="{{picker.start}}" end="{{picker.end}}" bindchange="bindDateChange">
           <view class="picker">{{today}}</view>
         </picker>
       </view>
@@ -39,8 +39,8 @@
                           <view class="other_2num">已售:<text>{{item.order}}</text></view>
                           <view class="other_2btn">
                             <van-stepper value="{{ item.num }}" min="0" bind:plus="onePlus" bind:minus="oneMinus"
-                              disable-input="true" bind:change="oneChange" data-data="{{item}}" data-type="breakfast" input-width="28px"
-                              button-size="20px" />
+                              disable-input="true" bind:change="oneChange" data-data="{{item}}" data-type="breakfast"
+                              input-width="28px" button-size="20px" />
                           </view>
                         </view>
                         <view class="other_3">热量:{{item.reserve}}卡</view>
@@ -62,8 +62,8 @@
                           <view class="other_2num">已售:<text>{{item.order}}</text></view>
                           <view class="other_2btn">
                             <van-stepper value="{{ item.num }}" min="0" bind:plus="onePlus" bind:minus="oneMinus"
-                              disable-input="true" bind:change="oneChange" data-data="{{item}}" data-type="lunch" input-width="28px"
-                              button-size="20px" />
+                              disable-input="true" bind:change="oneChange" data-data="{{item}}" data-type="lunch"
+                              input-width="28px" button-size="20px" />
                           </view>
                         </view>
                         <view class="other_3">热量:{{item.reserve}}卡</view>
@@ -85,8 +85,8 @@
                           <view class="other_2num">已售:<text>{{item.order}}</text></view>
                           <view class="other_2btn">
                             <van-stepper value="{{ item.num }}" min="0" bind:plus="onePlus" bind:minus="oneMinus"
-                              disable-input="true" bind:change="oneChange" data-data="{{item}}" data-type="dinner" input-width="28px"
-                              button-size="20px" />
+                              disable-input="true" bind:change="oneChange" data-data="{{item}}" data-type="dinner"
+                              input-width="28px" button-size="20px" />
                           </view>
                         </view>
                         <view class="other_3">热量:{{item.reserve}}卡</view>