Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/abutment/controller/Account.php

@@ -3,13 +3,12 @@
 namespace app\abutment\controller;
 
 use app\abutment\logic\Account as AccountLogic;
-use app\BaseController;
 use think\facade\Config;
 use think\facade\Validate;
 
 
 //供应商账号
-class Account extends BaseController
+class Account extends HomeBaseController
 {
 
     //供应商账号登录

app/abutment/controller/Consult.php

@@ -1,16 +1,13 @@
 <?php
 
-
 namespace app\abutment\controller;
 
-
 use app\admin\model\ActionLog;
 use app\admin\model\ProcessOrder;
-use app\BaseController;
 use think\facade\Db;
 use think\facade\Validate;
 
-class Consult extends BaseController
+class Consult extends HomeBaseController
 {
     private $noble = ['0' => '', '1' => '18K', '2' => '24K', '3' => '白银'];
 

app/abutment/controller/Good.php

@@ -5,12 +5,11 @@ namespace app\abutment\controller;
 use app\admin\model\ActionLog;
 use app\admin\model\ChangeLog;
 use app\admin\model\ProcessOrder;
-use app\BaseController;
 use app\youzan\model\PlatformYouzan;
 use think\facade\Db;
 
 //商品模块
-class Good extends BaseController
+class Good extends HomeBaseController
 {
     private $gold = [1 => '18K', 2 => '24K', 3 => '白银'];
 

app/abutment/controller/HomeBaseController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\abutment\controller;
+
+use app\abutment\middleware\homeMiddleware;
+use app\BaseController;
+
+//页面控制器base
+class HomeBaseController extends BaseController
+{
+
+    //使用的中间件
+    protected $middleware=[
+        homeMiddleware::class
+    ];
+    
+
+}

app/abutment/controller/Index.php

@@ -3,14 +3,13 @@
 namespace app\abutment\controller;
 
 use app\abutment\logic\Index as IndexLogic;
-use app\BaseController;
 use think\exception\ValidateException;
 use think\facade\Config;
 use think\facade\Db;
 use think\facade\Validate;
 
 
-class Index extends BaseController
+class Index extends HomeBaseController
 {
 
     //获取上线平台列表

app/abutment/controller/Order.php

@@ -5,13 +5,12 @@ namespace app\abutment\controller;
 use app\admin\model\ActionLog;
 use app\admin\model\GoodLog;
 use app\admin\model\ProcessOrder;
-use app\BaseController;
 use think\Exception;
 use think\facade\Db;
 use think\facade\Validate;
 
 //销售订单(对应于采销端的采购单)
-class Order extends BaseController
+class Order extends HomeBaseController
 {
 
     //列表

app/abutment/controller/Sale.php

@@ -5,14 +5,13 @@ namespace app\abutment\controller;
 use app\admin\model\ActionLog;
 use app\admin\model\GoodLog;
 use app\admin\model\ProcessOrder;
-use app\BaseController;
 use Exception;
 use think\facade\Cache;
 use think\facade\Db;
 use think\facade\Validate;
 
 
-class Sale extends BaseController
+class Sale extends HomeBaseController
 {
 
     //发货单列表

app/abutment/middleware.php

@@ -3,5 +3,5 @@
 //中间件定义
 
 return [
-    app\abutment\middleware\apiMiddleware::class,
+
 ];

app/abutment/middleware/apiMiddleware.php → app/abutment/middleware/homeMiddleware.php

@@ -11,7 +11,7 @@ use think\Response;
 use app\abutment\model\RequestLog as RequestLogModel;
 
 //中间件
-class apiMiddleware
+class homeMiddleware
 {
 
     //白名单