添加打包模块路由

修改登录权限判断

.gitignore

@@ -1,5 +1,6 @@
 .env
-runtime/*
+runtime/
 vendor/*
 /.idea
-/.vscode
+/.vscode
+vendor.zip

app/admin/command/TaskDy.php

@@ -128,11 +128,4 @@ class TaskDy extends Command
         // 指令输出
         $output->writeln('ok');
     }
-
-
-
-
- 
-
-
 }

app/api/controller/Worker.php

@@ -26,11 +26,11 @@ class Worker extends Base
      */
     protected function _initialize()
     {
-        if(strpos($this->userinfo->role, "4") === false){
-            $this->error(__('没有权限'));
+        parent::_initialize();
+        if(!str_contains($this->userinfo['role'], "4")){
+            $this->error(__('没有权限' . $this->userinfo['role']));
         }
     }
-
     //首页
     public function index(StockConfig $stockConfig)
     {
@@ -46,17 +46,19 @@ class Worker extends Base
         $data = $this->request->post();
         $result = false;
         Db::startTrans();
+        $insert_data = [];
         try {
             validate(WorkerValidate::class)->scene('scan')->check($data);
 
             //$resData = $stockService::setGoOutStock($this->userinfo['id'], $data);
 
-            $result = $scanLog->save([
+            $insert_data = [
                 'user_id'    => $this->userinfo['id'],
                 'code'       => $data['code'],
                 'order_status' => 0,
-                'remark' => 0,
-            ]);
+                'remark' => '未找到单号',
+            ];
+            $result = $scanLog->save($insert_data);
             Db::commit();
         }catch (ValidateException $e) {
             return $this->error($e->getError());
@@ -67,7 +69,7 @@ class Worker extends Base
         if ($result === false) {
             $this->error(__('没有新增任何数据'));
         }
-        $this->success();
+        $this->success('', $insert_data);
     }
 
     //扫描记录

app/api/route/route.php

@@ -6,8 +6,6 @@ use app\api\middleware\AllowCrossDomain;
 
 // 定义 API 路由组
 Route::group('user', function () {
-
-     
     Route::rule('login','user/login','POST');
     Route::rule('userinfo','user/userinfo','GET|POST');
     Route::rule('logout','user/logout','GET|POST');
@@ -64,9 +62,15 @@ Route::group('user', function () {
     Route::rule('getAllUser','User/getAllUser','POST');
     //支收总览
     Route::rule('getMoneyCountAll','MoneyLog/getCountAll','POST');
-
-
   })->middleware(AllowCrossDomain::class);
 
+// 定义 API 路由组
+Route::group('worker', function () {
+    Route::rule('index','worker/index','POST');
+    //扫码
+    Route::rule('scan','worker/scan','POST');
+    //扫码记录
+    Route::rule('scanlog','worker/scanlog','POST');
+})->middleware(AllowCrossDomain::class);
 
 

app/api/service/auth/ApiAuthService.php

@@ -22,6 +22,7 @@ class ApiAuthService
             throw new \Exception('账号或密码错误');
         }
         if($user->password!=md5(md5($password.$user->salt))){
+            //throw new \Exception('账号或密码错误' . md5(md5($password.$user->salt)));
             throw new \Exception('账号或密码错误');
         }
         if($user->status!='normal'){
@@ -38,7 +39,19 @@ class ApiAuthService
         $user->save();
 
         Cache::store('redis')->set('user_info_'.$user->id, $user->toArray(), Config::get('app.user_login.keepalive_time'));
-        return ['userinfo'=>$user,'token'=>$token, 'page' => 'worker'];
+        $data = [
+            'userinfo' => $user,
+            'token' => $token,
+            'page' => '',//page:stock_clerk 仓库管理员 worker:打包员工
+         ];
+        $role_arr = explode(',', $user->role);
+        if(in_array('3', $role_arr)){
+            $data['page'] = 'stock_clerk';//仓库管理员
+        }else if(in_array('4', $role_arr)){
+            $data['page'] = 'worker';//打包员工
+        }
+
+        return $data;
     }
 
    

runtime/cache/8c/40d7ddd6021313ae0fc9a4f3c5632f.php

@@ -1,4 +1,4 @@
 <?php
 //000000000000
  exit();?>
-a:6:{s:8:"sitename";s:12:"我的网站";s:4:"logo";s:20:"/assets/img/logo.png";s:10:"logo_white";s:26:"/assets/img/logo-white.png";s:11:"forbiddenip";s:0:"";s:7:"version";s:5:"1.4.2";s:9:"copyright";s:36:"贵阳云起信息科技有限公司";}
+a:6:{s:8:"sitename";s:9:"乐番田";s:4:"logo";s:20:"/assets/img/logo.png";s:10:"logo_white";s:26:"/assets/img/logo-white.png";s:11:"forbiddenip";s:0:"";s:7:"version";s:4:"1.01";s:9:"copyright";s:42:"深圳优码灵创网络科技有限公司";}