Merge remote-tracking branch 'origin/redesign‌-260706' into redesign‌-260706

app-ghs/controllers/ConsoleController.php

@@ -52,7 +52,7 @@ class ConsoleController extends BaseController
         util::success(['overview' => $overview]);
     }
 
-    //系统收入、客服收入、欠款
+    //系统收入、客服收入、欠款。
     public function actionStrokeCount()
     {
 

app-hd/controllers/ShopController.php

@@ -120,7 +120,7 @@ class ShopController extends BaseController
     {
         $get = Yii::$app->request->get();
         $mobile = $get['mobile'] ?? '';
-        if(empty($mobile)){
+        if (empty($mobile)) {
             util::success(['has' => 0]);
         }
         $shop = ShopClass::getByCondition(['mobile' => $mobile], true);
@@ -136,6 +136,10 @@ class ShopController extends BaseController
         $shopExt = ShopExtClass::getByCondition(['shopId' => $this->shop->id], false, false, 'reachVip');
         $shop = $this->shop->attributes;
         $shop['reachVip'] = $shopExt['reachVip'];
+
+        $shop['warning'] = '';
+        //$shop['warning'] = '明天凌晨1:00~2:00系统升级，暂停使用';
+
         util::success($shop);
     }