打卡操作

@@ -603,7 +603,8 @@ class IndexController extends RestBaseController
      * @param name:work_content type:int require:1 other: desc:工作内容
      * @param name:select_time type:int require:1 other: desc:选择日期[{"date":"2018-01-02","time":"18:01"},{"date":"2018-01-02","time":"18:01"}]
      * @param name:apply_stay type:int require:1 other: desc:申请入住[{"date":"2018-01-02","idcard":"123456"},{"date":"2018-01-02","idcard":"123456"}]
-     * @param name:apply_food type:int require:1 other: desc:申请用餐[{"date":"2018-01-02","time":"18:01"},{"date":"2018-01-02","time":"18:01"}]
+     * @param name:apply_lunch_food type:int require:1 other: desc:申请午餐[{"date":"2018-01-02"},{"date":"2018-01-02"}]
+     * @param name:apply_dinner_food type:int require:1 other: desc:申请晚餐[{"date":"2018-01-02"},{"date":"2018-01-02"}]
      *
      */
     public function applyJoin(){
@@ -628,6 +629,9 @@ class IndexController extends RestBaseController
         $apply_stay=html_entity_decode(htmlspecialchars_decode(input('apply_stay')));
         $apply_food=html_entity_decode(htmlspecialchars_decode(input('apply_food')));
 
+        $apply_lunch_food=html_entity_decode(htmlspecialchars_decode(input('apply_lunch_food')));
+        $apply_dinner_food=html_entity_decode(htmlspecialchars_decode(input('apply_dinner_food')));
+
         /*判断是否未志愿者*/
         $Volunteer=new VolunteerModel();
         $where['user_id']=$userId;
@@ -659,6 +663,9 @@ class IndexController extends RestBaseController
         $data['apply_stay']=html_entity_decode(htmlspecialchars_decode(input('apply_stay')));
         $data['apply_food']=html_entity_decode(htmlspecialchars_decode(input('apply_food')));
 
+        $data['apply_lunch_food']=html_entity_decode(htmlspecialchars_decode(input('apply_lunch_food')));
+        $data['apply_dinner_food']=html_entity_decode(htmlspecialchars_decode(input('apply_dinner_food')));
+
         $result=$Join->insert($data);
         if ($result>0){
             $this->success('报名成功,请等待审核!');

@@ -84,7 +84,7 @@
                             <foreach name="$select_time" id="vo">
 
                                  <input class="form-control" type="text"
-                                        id="id_card" value="{$vo.date} {$vo.time}" readonly placeholder=""/>
+                                        id="id_card" value="{$vo.date|default=''} {$vo.time|default=''}" readonly placeholder=""/>
                             </foreach>
 
                         </td>
@@ -93,26 +93,42 @@
                         $apply_stay=json_decode($data['apply_stay'],true);
                     </php>
                      <tr>
-                        <th width="100">申请入驻<span class="form-required">*</span></th>
+                        <th width="100">申请入住<span class="form-required">*</span></th>
                         <td>
                             <foreach name="$select_time" id="vo">
 
                                  <input class="form-control" type="text"
-                                        id="id_card" value="{$vo.date}" readonly placeholder=""/>
+                                        id="id_card" value="{$vo.date|default=''}" readonly placeholder=""/>
                             </foreach>
 
                         </td>
                     </tr>
+
                     <php>
-                        $apply_food=json_decode($data['apply_food'],true);
+                        $apply_lunch_food=json_decode($data['apply_lunch_food'],true);
                     </php>
-                     <tr>
-                        <th width="100">申请用餐<span class="form-required">*</span></th>
+                    <tr>
+                        <th width="100">申请午餐<span class="form-required">*</span></th>
+                        <td>
+                            <foreach name="apply_lunch_food" id="vo">
+
+                                 <input class="form-control" type="text"
+                                        id="id_card" value="{$vo.date|default=''}{$vo.time|default=''}" readonly placeholder=""/>
+                            </foreach>
+
+                        </td>
+                    </tr>
+
+                    <php>
+                        $apply_dinner_food=json_decode($data['apply_dinner_food'],true);
+                    </php>
+                    <tr>
+                        <th width="100">申请晚餐<span class="form-required">*</span></th>
                         <td>
-                            <foreach name="apply_food" id="vo">
+                            <foreach name="apply_dinner_food" id="vo">
 
                                  <input class="form-control" type="text"
-                                        id="id_card" value="{$vo.date}{$vo.time}" readonly placeholder=""/>
+                                        id="id_card" value="{$vo.date|default=''}{$vo.time|default=''}" readonly placeholder=""/>
                             </foreach>
 
                         </td>