Merge branch 'master-server' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -860,6 +860,7 @@ class ProductLogic extends  BaseLogic
      */
      */
     public function getSearchCategoryList()
     public function getSearchCategoryList()
     {
     {
+        $data = [];
         $categoryModel = new Category();
         $categoryModel = new Category();
         $this->param['deleted_at'] = null;
         $this->param['deleted_at'] = null;
         $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
         $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
@@ -869,7 +870,6 @@ class ProductLogic extends  BaseLogic
         unset($this->param['featured_status']);
         unset($this->param['featured_status']);
         $list = $categoryModel->list($this->param, ['sort', 'id'], ['id', 'pid', 'title']);
         $list = $categoryModel->list($this->param, ['sort', 'id'], ['id', 'pid', 'title']);
         if (!empty($list)) {
         if (!empty($list)) {
-            $data = [];
             foreach ($list as $v) {
             foreach ($list as $v) {
                 $v = (array)$v;
                 $v = (array)$v;
                 if ($v['pid'] == 0) {
                 if ($v['pid'] == 0) {

@@ -169,7 +169,7 @@ return [
     ],
     ],
     //操作日志
     //操作日志
     'operator_log' =>[
     'operator_log' =>[
-        'log'=>false,//true开启
+        'log'=>true,//true开启
         'action' => [],//不需要写入日志的方法
         'action' => [],//不需要写入日志的方法
     ],
     ],
 ];
 ];