Merge branch 'master' into dev

app-ghs/controllers/MainController.php

@@ -246,9 +246,11 @@ class MainController extends BaseController
             $showAd = 0;
         }
         //没有登录不显示广告
-        if(empty($this->mainId)){
+        if (empty($this->mainId)) {
             $showAd = 0;
         }
+        //是否展示终身版套餐
+        $lifelong = 0;
 
         $deadline = $sj['deadline'] ?? '';
         $relation = isset($this->shopAdmin) && !empty($this->shopAdmin) ? $this->shopAdmin->attributes : [];
@@ -278,6 +280,7 @@ class MainController extends BaseController
             'fast1' => '17189513228',
             'fast2' => '15280215347',
             'showAd' => $showAd,
+            'lifelong' => $lifelong,
         ];
         util::success($data);
     }