修改提示文字

crmeb/app/adminapi/controller/v1/setting/SystemConfig.php

@@ -287,6 +287,19 @@ class SystemConfig extends AuthController
         if (isset($post['wss_open'])) {
             $this->services->saveSslFilePath((int)$post['wss_open'], $post['wss_local_pk'] ?? '', $post['wss_local_cert'] ?? '');
         }
+        if (isset($post['store_brokerage_price']) && $post['store_brokerage_statu'] == 3) {
+            if ($post['store_brokerage_price'] === '') {
+                return app('json')->fail('满额分销最低金额不能为空！');
+            }
+            if ($post['store_brokerage_price'] < 0) {
+                return app('json')->fail('满额分销最低金额不能小于0！');
+            }
+        }
+        if (isset($post['store_brokerage_binding_time']) && $post['store_brokerage_binding_status'] == 2) {
+            if (!preg_match("/^[0-9][0-9]*$/", $post['store_brokerage_binding_time'])) {
+                return app('json')->fail('绑定有效期请填写正整数！');
+            }
+        }
         if (isset($post['weixin_ckeck_file'])) {
             $from = public_path() . $post['weixin_ckeck_file'];
             $to = public_path() . array_reverse(explode('/', $post['weixin_ckeck_file']))[0];

crmeb/app/adminapi/validate/setting/SystemAdminValidata.php

@@ -36,7 +36,7 @@ class SystemAdminValidata extends Validate
      */
     protected $message = [
         'account.require' => '请填写管理员账号',
-        'account.alphaDash' => '管理员账号为应为和字母',
+        'account.alphaDash' => '管理员账号为英文字母',
         'conf_pwd.require' => '请输入确认密码',
         'pwd.require' => '请输入密码',
         'real_name.require' => '请输管理员姓名',

crmeb/app/adminapi/validate/setting/SystemConfigValidata.php

@@ -36,7 +36,7 @@ class SystemConfigValidata extends Validate
         'extract_time' => 'number|between:0,180',
         'replenishment_num' => 'number',
         'store_stock' => 'number',
-        'store_brokerage_price' => 'float|egt:0',
+        'store_brokerage_price' => 'float',
         'integral_ratio' => 'float|egt:0|elt:1000|regex:float_two',
         'integral_max_num' => 'number|egt:0',
         'order_give_integral' => 'float|egt:0|elt:1000',

crmeb/app/api/controller/v1/user/UserExtractController.php

@@ -68,7 +68,7 @@ class UserExtractController
             if (!preg_match('/^([1-9]{1})(\d{15}|\d{16}|\d{18})$/', $extractInfo['cardnum']))
                 return app('json')->fail('银行卡号输入有误');
         if ($extractInfo['extract_type'] == 'alipay') {
-            if (!$extractInfo['alipay_code']) return app('json')->fail('请输入支付宝账号');
+            if (trim($extractInfo['name']) == '') return app('json')->fail('请输入支付宝账号');
         } else if ($extractInfo['extract_type'] == 'bank') {
             if (!$extractInfo['cardnum']) return app('json')->fail('请输入银行卡账号');
             if (!$extractInfo['bankname']) return app('json')->fail('请输入开户行信息');