红包 提现

app-ghs/controllers/ProductController.php

@@ -545,7 +545,7 @@ class ProductController extends BaseController
             util::fail("无效花材");
         }
         if (isset($productData['variety']) && $productData['variety'] != 0) {
-            util::fail('特殊花材无法复制');
+            util::fail('特殊花材不能复制');
         }
         //去除无用的字段
         unset($productData['stock']); //库存去掉

app-hd/controllers/ShopYeChangeController.php

@@ -16,13 +16,15 @@ class ShopYeChangeController extends BaseController
     {
         $get = Yii::$app->request->get();
         $status = $get['status'] ?? 0;
-        $tx = $get['tx'] ?? dict::getDict('yeTx', 'canNot');
         $where = [];
         if (!empty($status)) {
             $where['status'] = $status;
         }
         $where['shopId'] = $this->shopId;
-        $where['tx'] = $tx;
+        $tx = $get['tx'] ?? 0;
+        if (!empty($tx)) {
+            $where['tx'] = $tx;
+        }
         $list = ShopYeChangeClass::getChangeList($where);
         util::success($list);
     }