Przeglądaj źródła

签到时间的判断

lizhen_gitee 8 miesięcy temu
rodzic
commit
d5573a51d1

+ 1 - 2
application/admin/lang/zh-cn/trainactive.php

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

+ 1 - 6
application/admin/view/trainactive/edit.html

@@ -180,12 +180,7 @@
             <input id="c-pingjia_uid" data-source="user/user/index" data-params='{"custom[idcard_status]":"1"}' data-field="nickname" class="form-control selectpage" name="row[pingjia_uid]"  type="text" value="{$row.pingjia_uid|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_starttime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-sign_starttime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_starttime]" type="text" value="{:$row.sign_starttime?datetime($row.sign_starttime):''}">
-        </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">

+ 12 - 12
application/api/controller/Trainactive.php

@@ -16,14 +16,7 @@ class Trainactive extends Api
     protected $noNeedRight = ['test2'];
 
 
-    //获取培训详情
-    public function info()
-    {
-        $id = input('id');
-        $info = Db::name('train_active')->field('id,name,sign_endtime')->where('id',$id)->find();
 
-        $this->success('', $info);
-    }
 
     //签到成功
     public function signin(){
@@ -44,14 +37,13 @@ class Trainactive extends Api
             $this->error('该培训已下架');
         }
         if($info['userauth_status'] == 0){
-            /*if($this->auth->idcard_status != 1){
-                $this->error('您未实名,不能签到该培训活动');
-            }*/
+
             if(!in_array($this->auth->id,explode(',',$info['user_ids']))){
                 $this->error('您不在该培训活动名单');
             }
         }
 
+        //判断
         $map = [
             'train_id' => $id,
             'user_id'  => $this->auth->id,
@@ -61,6 +53,14 @@ class Trainactive extends Api
             $this->error('您已经签过到了');
         }
 
+        //判断
+        if(time() < $info['starttime']){
+            $this->error('还没到签到开始时间');
+        }
+        if(time() > $info['endtime']){
+            $this->error('已错过签到截止时间');
+        }
+
         //签到
         $status = 1;
         if(time() > $info['sign_endtime']){
@@ -78,7 +78,7 @@ class Trainactive extends Api
         $this->success('签到成功');
     }
 
-    //检测权限
+    //评价检测权限
     public function check(){
         $type = input('type','pingjia');
         $id = input('id',0);
@@ -121,7 +121,7 @@ class Trainactive extends Api
         }
 
         if($this->auth->id != $info['pingjia_uid']){
-            $this->error('您不能签到该培训活动');
+            $this->error('您不能评价该培训活动');
         }
 
         //评价

+ 0 - 1
public/assets/js/backend/trainactive.js

@@ -60,7 +60,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'pingjia_image', title: __('Pingjia_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'pingjia_time', title: __('Pingjia_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'pingjia_uid', title: __('Pingjia_uid')},
-                        {field: 'sign_starttime', title: __('Sign_starttime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'sign_endtime', title: __('Sign_endtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'usercount', title: __('Usercount')},