Merge branch 'master' of http://114.215.101.231:8099/miniprogram/volunteer

@@ -46,6 +46,7 @@ Page({
     arr: [],
     arr: [],
     lunch: [],
     lunch: [],
     dinner: [],
     dinner: [],
+    select_time:'',
   },
   },
 
 
   //日历
   //日历
@@ -425,10 +426,8 @@ Page({
     let zindex = e.detail.value
     let zindex = e.detail.value
     console.log(e.detail.value)
     console.log(e.detail.value)
     this.setData({
     this.setData({
-
-
-
-
+      select_time:this.data.time_arr[zindex],
+      [`t_arr[${index}].time`]: this.data.time_arr[zindex]
     })
     })
     // this.judge_status(1, index)
     // this.judge_status(1, index)
   },
   },
@@ -643,6 +642,14 @@ Page({
       })
       })
       return
       return
     }
     }
+    if(that.data.select_time==''){
+      wx.showModal({
+        title: '提示', //提示文字
+        content: '请选择参加时间',
+        showCancel: false, //是否显示取消按钮
+      })
+      return
+    }
     if (that.data.zhiyuan == 2) {
     if (that.data.zhiyuan == 2) {
       wx.showModal({
       wx.showModal({
         title: '提示', //提示文字
         title: '提示', //提示文字
@@ -690,11 +697,10 @@ Page({
       apply_stay: JSON.stringify(that.data.arr),
       apply_stay: JSON.stringify(that.data.arr),
       // apply_food: JSON.stringify(that.data.e_arr)
       // apply_food: JSON.stringify(that.data.e_arr)
       apply_lunch_food: JSON.stringify(that.data.lunch),
       apply_lunch_food: JSON.stringify(that.data.lunch),
-      apply_dinner_food: JSON.stringify(that.data.dinner)
-
-
-
+      apply_dinner_food: JSON.stringify(that.data.dinner),
+      select_date_time:that.data.select_time
     }
     }
+
     let header = {
     let header = {
       'XX-Token': wx.getStorageSync('token')
       'XX-Token': wx.getStorageSync('token')
     }
     }

 const app = getApp();
 const app = getApp();
 
 
 Page({
 Page({
-
   /**
   /**
    * 页面的初始数据
    * 页面的初始数据
    */
    */