Procházet zdrojové kódy

Merge branch 'training-m' into transfer-master

liugc před 1 rokem
rodič
revize
7aec22d16e

+ 0 - 2
app/workerapi/controller/TrainingController.php

@@ -20,8 +20,6 @@ use app\workerapi\validate\MasterWokerValidate;
 
 class TrainingController extends BaseApiController
 {
-    public array $notNeedLogin = ['examStatistics'];
-
     /**
      * 获取培训信息
      * @return \think\response\Json

+ 1 - 1
app/workerapi/logic/TrainingLogic.php

@@ -39,7 +39,7 @@ class TrainingLogic extends  BaseLogic
             if (!$task->isEmpty()) {
                 $task_info = $task->toArray();
                 // 0 不展示按钮 1 去学习 2 已学完
-                $task_info['learning_status'] = $task_info['shop_orders_id']>0?($task_info['training_status'] <2?1:2):0;
+                $task_info['learning_status'] = $task_info['shop_orders_id']>0?1:0;
                 $task_info['operate_status'] = empty($task_info['lead_master_worker_id'])?0:($task_info['operate_status']?1:2);
                 $task_info['bank_status'] = BankAccount::where('worker_id',$masterWorkerId)->where('audit_state',1)->value('id')?1:0;
                 $masterWorker = MasterWorker::where('id',$masterWorkerId)->find();