Merge branch 'dev' of git.huaml.com:zhh/huahuibao into dev

app-ghs/controllers/GhsController.php

@@ -35,6 +35,25 @@ class GhsController extends BaseController
         util::complete('修改成功');
     }
 
+    //修改供货商屏蔽/删除状态 ssh 20260527
+    public function actionChangeDelStatus()
+    {
+        $get = Yii::$app->request->get();
+        $ghsId = $get['ghsId'] ?? 0;
+        $delStatus = $get['delStatus'] ?? 0;
+        $ghs = GhsClass::getById($ghsId, true);
+        if (empty($ghs)) {
+            util::fail('没有找到供货商');
+        }
+        $ownMainId = $ghs->ownMainId ?? 0;
+        if ($ownMainId != $this->mainId) {
+            util::fail('不是你的供货商，无法操作');
+        }
+        $ghs->delStatus = $delStatus;
+        $ghs->save();
+        util::complete('操作成功');
+    }
+
     public function actionModifyName()
     {
         $get = Yii::$app->request->get();
@@ -172,7 +191,11 @@ class GhsController extends BaseController
     {
         $get = Yii::$app->request->get();
         $name = isset($get['name']) && !empty($get['name']) ? $get['name'] : '';
-        $where = ['ownShopId' => $this->shopId];
+        $delStatus = isset($get['delStatus']) && is_numeric($get['delStatus']) ? $get['delStatus'] : 0;
+        $where = [
+            'ownShopId' => $this->shopId,
+            'delStatus' => $delStatus
+        ];
         if (!empty($name)) {
             if (stringUtil::isLetter($name)) {
                 $where['py'] = ['like', $name];

common/components/book.php

@@ -93,7 +93,7 @@ class book
         'changeCard' => [
             ['style' => 'info', 'value' => '目前更换银行卡和新开户，还没有开发功能出来，所以需要人工提交资料，工作量大，所以需要收取服务费。',],
             ['style' => 'miniTitle', 'value' => '更换收款银行卡，每次2元。',],
-            ['style' => 'miniTitle', 'value' => '新开收款账户，每次25元。',],
+            ['style' => 'miniTitle', 'value' => '新开收款账户，每次30元。',],
             ['style' => 'miniTitle', 'value' => '门店转让，需新开收款账户，并更换管理人员的，每次35元。',],
         ],
         'chargeStandard2' => [