1

app/admin/controller/Login.php

@@ -103,6 +103,136 @@ class Login extends Controller
             $this->success('登录成功', sysuri('admin/index/index'));
         }
     }
+    public function ship(){
+        if ($this->app->request->isGet()) {
+            if (AdminService::isLogin()) {
+                $this->redirect(sysuri('admin/index/index'));
+            } else {
+                // 当前运行模式
+                $this->developMode = SystemService::checkRunMode();
+                // 后台背景处理
+                $images = str2arr(sysconf('login_image') ?: '', '|') ?: [
+                    SystemService::uri('/static/theme/img/login/bg1.jpg'), SystemService::uri('/static/theme/img/login/bg2.jpg'),
+                ];
+                $this->loginStyle = sprintf('style="background-image:url(%s)" data-bg-transition="%s"', $images[0], join(',', $images));
+                // 登录验证令牌
+                $this->captchaType = 'LoginCaptcha';
+                $this->captchaToken = CodeExtend::uniqidDate(18);
+                if (!$this->app->session->get('LoginInputSessionError')) {
+                    $this->app->session->set($this->captchaType, $this->captchaToken);
+                }
+                // 更新后台域名
+                if ($this->request->domain(true) !== sysconf('base.site_host')) {
+                    sysconf('base.site_host', $this->request->domain(true));
+                }
+                // 加载登录模板
+                $this->title = '系统登录';
+                $this->fetch();
+            }
+        } else {
+            $data = $this->_vali([
+                'username.require' => '登录账号不能为空!',
+                'username.min:4'   => '登录账号不能少于4位字符!',
+                'password.require' => '登录密码不能为空!',
+                'password.min:4'   => '登录密码不能少于4位字符!',
+                'verify.require'   => '图形验证码不能为空!',
+                'uniqid.require'   => '图形验证标识不能为空!',
+                'usertype.require' => ''
+            ]);
+
+            if (!CaptchaService::instance()->check($data['verify'], $data['uniqid'])) {
+                $this->error('图形验证码验证失败，请重新输入!');
+            }
+            /*! 用户信息验证 */
+            $map = ['username' => $data['username'],'usertype'=>$data['usertype'], 'is_deleted' => 0];
+            $user = SystemUser::mk()->where($map)->findOrEmpty();
+            if ($user->isEmpty()) {
+                $this->app->session->set('LoginInputSessionError', true);
+                $this->error('登录账号或密码错误，请重新输入!');
+            }
+            if (empty($user['status'])) {
+                $this->app->session->set('LoginInputSessionError', true);
+                $this->error('账号已经被禁用，请联系管理员!');
+            }
+            if (md5("{$user['password']}{$data['uniqid']}") !== $data['password']) {
+                $this->app->session->set('LoginInputSessionError', true);
+                $this->error('登录账号或密码错误，请重新输入!');
+            }
+            $this->app->session->set('user', $user->toArray());
+            $this->app->session->delete('LoginInputSessionError');
+            $user->inc('login_num')->update([
+                'login_at' => date('Y-m-d H:i:s'),
+                'login_ip' => $this->app->request->ip(),
+            ]);
+            sysoplog('系统用户登录', '登录系统后台成功');
+            $this->success('登录成功', sysuri('admin/index/index'));
+        }
+    }
+    public function shipyard(){
+        if ($this->app->request->isGet()) {
+            if (AdminService::isLogin()) {
+                $this->redirect(sysuri('admin/index/index'));
+            } else {
+                // 当前运行模式
+                $this->developMode = SystemService::checkRunMode();
+                // 后台背景处理
+                $images = str2arr(sysconf('login_image') ?: '', '|') ?: [
+                    SystemService::uri('/static/theme/img/login/bg1.jpg'), SystemService::uri('/static/theme/img/login/bg2.jpg'),
+                ];
+                $this->loginStyle = sprintf('style="background-image:url(%s)" data-bg-transition="%s"', $images[0], join(',', $images));
+                // 登录验证令牌
+                $this->captchaType = 'LoginCaptcha';
+                $this->captchaToken = CodeExtend::uniqidDate(18);
+                if (!$this->app->session->get('LoginInputSessionError')) {
+                    $this->app->session->set($this->captchaType, $this->captchaToken);
+                }
+                // 更新后台域名
+                if ($this->request->domain(true) !== sysconf('base.site_host')) {
+                    sysconf('base.site_host', $this->request->domain(true));
+                }
+                // 加载登录模板
+                $this->title = '系统登录';
+                $this->fetch();
+            }
+        } else {
+            $data = $this->_vali([
+                'username.require' => '登录账号不能为空!',
+                'username.min:4'   => '登录账号不能少于4位字符!',
+                'password.require' => '登录密码不能为空!',
+                'password.min:4'   => '登录密码不能少于4位字符!',
+                'verify.require'   => '图形验证码不能为空!',
+                'uniqid.require'   => '图形验证标识不能为空!',
+                'usertype.require' => ''
+            ]);
+
+            if (!CaptchaService::instance()->check($data['verify'], $data['uniqid'])) {
+                $this->error('图形验证码验证失败，请重新输入!');
+            }
+            /*! 用户信息验证 */
+            $map = ['username' => $data['username'],'usertype'=>$data['usertype'], 'is_deleted' => 0];
+            $user = SystemUser::mk()->where($map)->findOrEmpty();
+            if ($user->isEmpty()) {
+                $this->app->session->set('LoginInputSessionError', true);
+                $this->error('登录账号或密码错误，请重新输入!');
+            }
+            if (empty($user['status'])) {
+                $this->app->session->set('LoginInputSessionError', true);
+                $this->error('账号已经被禁用，请联系管理员!');
+            }
+            if (md5("{$user['password']}{$data['uniqid']}") !== $data['password']) {
+                $this->app->session->set('LoginInputSessionError', true);
+                $this->error('登录账号或密码错误，请重新输入!');
+            }
+            $this->app->session->set('user', $user->toArray());
+            $this->app->session->delete('LoginInputSessionError');
+            $user->inc('login_num')->update([
+                'login_at' => date('Y-m-d H:i:s'),
+                'login_ip' => $this->app->request->ip(),
+            ]);
+            sysoplog('系统用户登录', '登录系统后台成功');
+            $this->success('登录成功', sysuri('admin/index/index'));
+        }
+    }
 
     /**
      * 生成验证码
@@ -127,8 +257,16 @@ class Login extends Controller
      */
     public function out()
     {
+        $uid = AdminService::getUserId();
+        $usertype = SystemUser::mk()->where('id',$uid)->value('usertype');
         $this->app->session->clear();
         $this->app->session->destroy();
-        $this->success('退出登录成功!', sysuri('admin/login/index'));
+        if($usertype == 'admin'){
+            $this->success('退出登录成功!', sysuri('admin/login/index'));
+        }elseif($usertype == 'shop'){
+            $this->success('退出登录成功!', sysuri('admin/login/ship'));
+        }else{
+            $this->success('退出登录成功!', sysuri('admin/login/shipyard'));
+        }
     }
 }

app/admin/view/best_knowledge/index2.html

@@ -31,6 +31,9 @@
             cols: [[
                 {field: 'id', title: 'ID', align: 'center'},
                 {field: 'title', title: '标题', align: 'center'},
+                {field: 'uuid', title: '用户', align: 'center',templet(d){
+                    return d.user.nickname
+                }},
                 {field: 'class_id', title: '类别', align: 'center',templet(d){
                     return d.classTo.name
                 }},

app/admin/view/login/index.html

@@ -21,11 +21,12 @@
         <ul>
             <li class="type">
                 <label class="label-required-null">
-                    <select name="usertype" lay-filter="usertype">
-                        <option value="admin">后台</option>
-                        <option value="shop">商家</option>
-                        <option value="shipyard">船厂</option>
-                    </select>
+<!--                    <select name="usertype" lay-filter="usertype">-->
+<!--                        <option value="admin">后台</option>-->
+<!--                        <option value="shop">商家</option>-->
+<!--                        <option value="shipyard">船厂</option>-->
+<!--                    </select>-->
+                    <input class="layui-input" type="hidden" name="usertype" value="admin">
                 </label>
             </li>
             <li class="username">

app/admin/view/login/ship.html

@@ -0,0 +1,67 @@
+{extend name="index/index"}
+
+{block name='style'}
+<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1">
+<script>if (location.href.indexOf('#') > -1) location.replace(location.href.split('#')[0])</script>
+<link rel="stylesheet" href="__ROOT__/static/theme/css/login.css">
+{/block}
+
+{block name="body"}
+<div class="login-container" {$loginStyle|raw}>
+  <div class="header notselect layui-hide-xs">
+    <a href="{:url('@')}" class="title">{:sysconf('app_name')}<span>{:sysconf('app_version')}</span></a>
+    {notempty name='developMode'}
+    <a class="pull-right layui-anim layui-anim-fadein" target="_blank" href='https://gitee.com/zoujingli/ThinkAdmin'>
+      <img src='https://gitee.com/zoujingli/ThinkAdmin/widgets/widget_1.svg' alt='Fork me on Gitee'>
+    </a>
+    {/notempty}
+  </div>
+  <form data-login-form onsubmit="return false" method="post" class="layui-anim layui-anim-upbit" autocomplete="off">
+    <h2 class="notselect">{:sysconf('login_name')?:'系统管理'}</h2>
+    <ul>
+      <li class="type">
+        <label class="label-required-null">
+          <!--                    <select name="usertype" lay-filter="usertype">-->
+          <!--                        <option value="admin">后台</option>-->
+          <!--                        <option value="shop">商家</option>-->
+          <!--                        <option value="shipyard">船厂</option>-->
+          <!--                    </select>-->
+          <input class="layui-input" type="hidden" name="usertype" value="shop">
+        </label>
+      </li>
+      <li class="username">
+        <label class="label-required-null">
+          <i class="layui-icon layui-icon-username"></i>
+          <input class="layui-input" required pattern="^\S{4,}$" name="username" autofocus autocomplete="off" placeholder="登录账号" title="请输入登录账号">
+        </label>
+      </li>
+      <li class="password">
+        <label class="label-required-null">
+          <i class="layui-icon layui-icon-password"></i>
+          <input class="layui-input" required pattern="^\S{4,}$" name="password" maxlength="32" type="password" autocomplete="off" placeholder="登录密码" title="请输入登录密码">
+        </label>
+      </li>
+      <li class="verify layui-hide">
+        <label class="inline-block relative label-required-null">
+          <i class="layui-icon layui-icon-picture-fine"></i>
+          <input class="layui-input" required pattern="^\S{4,}$" name="verify" maxlength="4" autocomplete="off" placeholder="验证码" title="请输入验证码">
+        </label>
+        <label data-captcha="{:url('admin/login/captcha',[],false)}" data-field-verify="verify" data-field-uniqid="uniqid" data-captcha-type="{$captchaType}" data-captcha-token="{$captchaToken}"></label>
+      </li>
+      <li class="text-center padding-top-20">
+        <button type="submit" class="layui-btn layui-disabled full-width" data-form-loaded="立即登入">正在载入</button>
+      </li>
+    </ul>
+  </form>
+  <div class="footer notselect">
+    <p class="layui-hide-xs">推荐使用 <a target="_blank" href="https://www.google.cn/chrome">Google Chrome</a> 或 <a target="_blank" href="https://www.microsoft.com/zh-cn/edge#platform">Microsoft Edge</a> 浏览器访问</p>
+    {:sysconf('site_copy')}
+    {if sysconf('beian')}<span class="padding-5">|</span><a target="_blank" href="https://beian.miit.gov.cn/">{:sysconf('beian')}</a>{/if}
+    {if sysconf('miitbeian')}<span class="padding-5">|</span><a target="_blank" href="https://beian.miit.gov.cn/">{:sysconf('miitbeian')}</a>{/if}
+  </div>
+</div>
+{/block}
+
+{block name='script'}
+<script src="__ROOT__/static/login.js"></script>
+{/block}

app/admin/view/login/shipyard.html

@@ -0,0 +1,67 @@
+{extend name="index/index"}
+
+{block name='style'}
+<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1">
+<script>if (location.href.indexOf('#') > -1) location.replace(location.href.split('#')[0])</script>
+<link rel="stylesheet" href="__ROOT__/static/theme/css/login.css">
+{/block}
+
+{block name="body"}
+<div class="login-container" {$loginStyle|raw}>
+  <div class="header notselect layui-hide-xs">
+    <a href="{:url('@')}" class="title">{:sysconf('app_name')}<span>{:sysconf('app_version')}</span></a>
+    {notempty name='developMode'}
+    <a class="pull-right layui-anim layui-anim-fadein" target="_blank" href='https://gitee.com/zoujingli/ThinkAdmin'>
+      <img src='https://gitee.com/zoujingli/ThinkAdmin/widgets/widget_1.svg' alt='Fork me on Gitee'>
+    </a>
+    {/notempty}
+  </div>
+  <form data-login-form onsubmit="return false" method="post" class="layui-anim layui-anim-upbit" autocomplete="off">
+    <h2 class="notselect">{:sysconf('login_name')?:'系统管理'}</h2>
+    <ul>
+      <li class="type">
+        <label class="label-required-null">
+          <!--                    <select name="usertype" lay-filter="usertype">-->
+          <!--                        <option value="admin">后台</option>-->
+          <!--                        <option value="shop">商家</option>-->
+          <!--                        <option value="shipyard">船厂</option>-->
+          <!--                    </select>-->
+          <input class="layui-input" type="hidden" name="usertype" value="shipyard">
+        </label>
+      </li>
+      <li class="username">
+        <label class="label-required-null">
+          <i class="layui-icon layui-icon-username"></i>
+          <input class="layui-input" required pattern="^\S{4,}$" name="username" autofocus autocomplete="off" placeholder="登录账号" title="请输入登录账号">
+        </label>
+      </li>
+      <li class="password">
+        <label class="label-required-null">
+          <i class="layui-icon layui-icon-password"></i>
+          <input class="layui-input" required pattern="^\S{4,}$" name="password" maxlength="32" type="password" autocomplete="off" placeholder="登录密码" title="请输入登录密码">
+        </label>
+      </li>
+      <li class="verify layui-hide">
+        <label class="inline-block relative label-required-null">
+          <i class="layui-icon layui-icon-picture-fine"></i>
+          <input class="layui-input" required pattern="^\S{4,}$" name="verify" maxlength="4" autocomplete="off" placeholder="验证码" title="请输入验证码">
+        </label>
+        <label data-captcha="{:url('admin/login/captcha',[],false)}" data-field-verify="verify" data-field-uniqid="uniqid" data-captcha-type="{$captchaType}" data-captcha-token="{$captchaToken}"></label>
+      </li>
+      <li class="text-center padding-top-20">
+        <button type="submit" class="layui-btn layui-disabled full-width" data-form-loaded="立即登入">正在载入</button>
+      </li>
+    </ul>
+  </form>
+  <div class="footer notselect">
+    <p class="layui-hide-xs">推荐使用 <a target="_blank" href="https://www.google.cn/chrome">Google Chrome</a> 或 <a target="_blank" href="https://www.microsoft.com/zh-cn/edge#platform">Microsoft Edge</a> 浏览器访问</p>
+    {:sysconf('site_copy')}
+    {if sysconf('beian')}<span class="padding-5">|</span><a target="_blank" href="https://beian.miit.gov.cn/">{:sysconf('beian')}</a>{/if}
+    {if sysconf('miitbeian')}<span class="padding-5">|</span><a target="_blank" href="https://beian.miit.gov.cn/">{:sysconf('miitbeian')}</a>{/if}
+  </div>
+</div>
+{/block}
+
+{block name='script'}
+<script src="__ROOT__/static/login.js"></script>
+{/block}

app/data/controller/shop/Send.php

@@ -40,7 +40,11 @@ class Send extends Controller
         $this->address = sysdata('ordersend');
         // 状态数据统计
         $this->total = ['t0' => 0, 't1' => 0, 't2' => 0, 'ta' => 0];
-        $db = ShopOrder::mk()->whereIn('status', [4, 5, 6])->where(['truck_type' => 1]);
+        if($admin_id){
+            $db = ShopOrder::mk()->whereIn('status', [4, 5, 6])->where(['truck_type' => 1,'admin_id'=>$admin_id]);
+        }else{
+            $db = ShopOrder::mk()->whereIn('status', [4, 5, 6])->where(['truck_type' => 1]);
+        }
         $query = ShopOrderSend::mk()->whereRaw("order_no in {$db->field('order_no')->buildSql()}");
         foreach ($query->fieldRaw('status,count(1) total')->group('status')->cursor() as $vo) {
             $this->total["t{$vo['status']}"] = $vo['total'];

app/ship/controller/Index.php

@@ -26,6 +26,6 @@ class Index extends Controller
 {
     public function index()
     {
-        return 'ship';
+        $this->redirect(sysuri('admin/login/ship'));
     }
 }

app/shipyard/controller/Index.php

@@ -0,0 +1,31 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2022 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// | 免费声明 ( https://thinkadmin.top/disclaimer )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\shipyard\controller;
+
+use think\admin\Controller;
+
+/**
+ * Class Index
+ * @package app\index\controller
+ */
+class Index extends Controller
+{
+    public function index()
+    {
+        $this->redirect(sysuri('admin/login/shipyard'));
+    }
+}

public/ship.php

@@ -0,0 +1,28 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2022 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// | 免费声明 ( https://thinkadmin.top/disclaimer )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\admin\service\SystemService;
+
+require __DIR__ . '/../vendor/jpush/jpush/autoload.php';
+// 加载基础文件
+require __DIR__ . '/../vendor/autoload.php';
+
+
+
+// WEB应用初始化
+SystemService::instance()->doInit();

public/shipyard.php

@@ -0,0 +1,28 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2022 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// | 免费声明 ( https://thinkadmin.top/disclaimer )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\admin\service\SystemService;
+
+require __DIR__ . '/../vendor/jpush/jpush/autoload.php';
+// 加载基础文件
+require __DIR__ . '/../vendor/autoload.php';
+
+
+
+// WEB应用初始化
+SystemService::instance()->doInit();