shish 4 роки тому
батько
коміт
cb1d8de3f6

+ 6 - 1
app-ghs/controllers/AdminController.php

@@ -210,6 +210,10 @@ class AdminController extends BaseController
         $skCustomId = $this->shop->skCustomId ?? 0;
         $apiHost = Yii::$app->params['ghsHost'];
         $imgUploadApi = $apiHost . '/upload/save-file';
+        //使用手册
+        $cacheKey = 'close_book_' . $this->shopAdminId;
+        $hasClose = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
+        $showBook = !empty($hasClose) ? 0 : 1;
         util::success([
             'token' => '',
             'admin' => $admin,
@@ -222,7 +226,8 @@ class AdminController extends BaseController
             'update' => 0,
             'skCustomId' => $skCustomId,
             'apiHost' => $apiHost,
-            'imgUploadApi' => $imgUploadApi
+            'imgUploadApi' => $imgUploadApi,
+            'showBook' => $showBook,
         ]);
     }
 

+ 10 - 1
app-ghs/controllers/AuthController.php

@@ -256,7 +256,10 @@ class AuthController extends PublicController
         $skCustomId = $shop->skCustomId ?? 0;
         $apiHost = Yii::$app->params['ghsHost'];
         $imgUploadApi = $apiHost . '/upload/save-file';
-
+        //使用手册
+        $cacheKey = 'close_book_' . $this->shopAdminId;
+        $hasClose = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
+        $showBook = !empty($hasClose) ? 0 : 1;
         //注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
         util::success([
             'token' => $token,
@@ -271,6 +274,7 @@ class AuthController extends PublicController
             'skCustomId' => $skCustomId,
             'apiHost' => $apiHost,
             'imgUploadApi' => $imgUploadApi,
+            'showBook' => $showBook,
         ]);
     }
 
@@ -311,6 +315,10 @@ class AuthController extends PublicController
         $skCustomId = $shop->skCustomId ?? 0;
         $apiHost = Yii::$app->params['ghsHost'];
         $imgUploadApi = $apiHost . '/upload/save-file';
+        //使用手册
+        $cacheKey = 'close_book_' . $this->shopAdminId;
+        $hasClose = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
+        $showBook = !empty($hasClose) ? 0 : 1;
 
         //注意这里的输出内容有多个地方一样,要修改需要同步修改,请搜索关键词loginOK!!!!!!!!
         util::success([
@@ -326,6 +334,7 @@ class AuthController extends PublicController
             'skCustomId' => $skCustomId,
             'apiHost' => $apiHost,
             'imgUploadApi' => $imgUploadApi,
+            'showBook' => $showBook,
         ]);
     }
 

+ 0 - 12
app-ghs/controllers/ConsoleController.php

@@ -86,24 +86,12 @@ class ConsoleController extends BaseController
             ];
         }
 
-        //已经关闭手册或注册满60天不显示
-        $cacheKey = 'close_book_' . $this->shopAdminId;
-        $hasClose = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
-        $showBook = 1;
-        //$shopAddTime = $this->shop->addTime;
-        //$shopTime = strtotime($shopAddTime) + 90 * 24 * 60 * 60;
-        //if (!empty($hasClose) || $shopTime < time()) {
-        if (!empty($hasClose)) {
-            $showBook = 0;
-        }
-
         util::success([
             'asset' => $shopInfo,
             'notice' => $notice,
             'todayData' => $todayData,
             'incomeStat' => $incomeStat,
             'menu' => $menu,
-            'showBook' => $showBook,
         ]);
     }