Просмотр исходного кода

Merge branch 'sh-send' into dev

shish 1 год назад
Родитель
Сommit
8e46db5fe4
2 измененных файлов с 4 добавлено и 2 удалено
  1. 3 1
      app-ghs/controllers/MainController.php
  2. 1 1
      app-ghs/controllers/RenewController.php

+ 3 - 1
app-ghs/controllers/MainController.php

@@ -233,7 +233,9 @@ class MainController extends BaseController
         $money = $main->money ?? 0;
         $money = $main->money ?? 0;
         $cashAccount = $main->cashAccount ?? '';
         $cashAccount = $main->cashAccount ?? '';
         $sj = isset($this->sj) && !empty($this->sj) ? $this->sj->attributes : [];
         $sj = isset($this->sj) && !empty($this->sj) ? $this->sj->attributes : [];
-        $shopImg = imgUtil::groupImg($shop->avatar);
+
+        $shopImg = !empty($shop->avatar) ? imgUtil::groupImg($shop->avatar) : imgUtil::groupImg('');
+
         $smallShopImg = imgUtil::groupImg($shop->avatar) . "?x-oss-process=image/resize,m_fill,h_80,w_80";
         $smallShopImg = imgUtil::groupImg($shop->avatar) . "?x-oss-process=image/resize,m_fill,h_80,w_80";
 
 
         $deadline = $sj['deadline'] ?? '';
         $deadline = $sj['deadline'] ?? '';

+ 1 - 1
app-ghs/controllers/RenewController.php

@@ -106,7 +106,7 @@ class RenewController extends BaseController
         if (getenv('YII_ENV') == 'production') {
         if (getenv('YII_ENV') == 'production') {
             $unitPrice = $pfLevel == 0 ? 1580 : 2580;
             $unitPrice = $pfLevel == 0 ? 1580 : 2580;
             if ($mainId == 50) {
             if ($mainId == 50) {
-                //$unitPrice = $pfLevel == 0 ? 0.1 : 0.2;
+                $unitPrice = $pfLevel == 0 ? 0.5 : 1;
             }
             }
         } else {
         } else {
             $unitPrice = $pfLevel == 0 ? 0.1 : 0.2;
             $unitPrice = $pfLevel == 0 ? 0.1 : 0.2;