签到活动修改

application/admin/controller/Trainactive.php

@@ -169,7 +169,7 @@ class Trainactive extends Backend
             2 => 'yellow',
         ];
         foreach($user_yingdao as $key => $val){
-            $user_yingdao[$key]['sign_time'] = empty($val['sign_time']) ? '' : date('Y--m-d H:i:s',$val['sign_time']);
+            $user_yingdao[$key]['sign_time'] = empty($val['sign_time']) ? '' : date('Y-m-d H:i:s',$val['sign_time']);
             $user_yingdao[$key]['sign_image'] = localpath_to_netpath($val['sign_image']);
             $user_yingdao[$key]['status_text'] = isset($status_arr[$val['status']]) ? $status_arr[$val['status']] : '未到';
             $user_yingdao[$key]['status_color'] = isset($status_color[$val['status']]) ? $status_color[$val['status']] : 'red';
@@ -183,7 +183,7 @@ class Trainactive extends Backend
             ->order('user_train.id desc')->select();
 //        dump($user_train);
         foreach($user_train as $key => $val){
-            $user_train[$key]['sign_time'] = empty($val['sign_time']) ? '' : date('Y--m-d H:i:s',$val['sign_time']);
+            $user_train[$key]['sign_time'] = empty($val['sign_time']) ? '' : date('Y-m-d H:i:s',$val['sign_time']);
             $user_train[$key]['sign_image'] = localpath_to_netpath($val['sign_image']);
 //            $user_train[$key]['status_text'] = isset($status_arr[$val['status']]) ? $status_arr[$val['status']] : '';
 //            $user_train[$key]['status_color'] = isset($status_color[$val['status']]) ? $status_color[$val['status']] : 'red';

application/admin/lang/zh-cn/trainactive.php

@@ -28,7 +28,7 @@ return [
     'Pingjia_image'     => '评价电子签',
     'Pingjia_time'      => '评价时间',
     'Pingjia_uid'       => '评价用户ID',
-    'Sign_endtime'      => '签到迟到分界时间',
+    'Sign_endtime'      => '签到截止时间',
     'User_ids'          => '可参与人员',
     'Createtime'        => '发布时间',
     'Status'            => '状态',

application/admin/view/trainactive/qrcode.html

@@ -8,18 +8,25 @@
         </div>
     </div>
 
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Endtime')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-endtime" disabled class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[endtime]" type="text" value="{:$row.endtime?datetime($row.endtime):''}">
         </div>
+    </div>-->
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_endtime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sign_endtime" disabled class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_endtime]" type="text" value="{:$row.sign_endtime?datetime($row.sign_endtime):''}">
+        </div>
     </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">签到二维码:</label>
         <div class="col-xs-12 col-sm-8">
             <img width="200px" height="200px" src="{$row.sign_qrcode}">
-            <span style="display: block; width:200px;text-align: center">培训截止:{$row.endtime|date="Y-m-d H:i",###}</span>
+            <span style="display: block; width:200px;text-align: center">签到截止:{$row.sign_endtime|date="Y-m-d H:i",###}</span>
         </div>
     </div>
 

application/api/controller/Trainactive.php

@@ -64,7 +64,7 @@ class Trainactive extends Api
         //签到
         $status = 1;
         if(time() > $info['sign_endtime']){
-            $status = 0;//迟到
+            $status = 2;//迟到
         }
 
         $data = [