Browse Source

fix: more

tokumeikoi 4 years ago
parent
commit
c7d7dfda28

+ 2 - 3
app/Http/Requests/Admin/OrderFetch.php

@@ -14,9 +14,9 @@ class OrderFetch extends FormRequest
     public function rules()
     {
         return [
-            'filter.*.key' => 'required|in:email,trade_no,status,commission_status,user_id',
+            'filter.*.key' => 'required|in:email,trade_no,status,commission_status,user_id,invite_user_id',
             'filter.*.condition' => 'required|in:>,<,=,>=,<=,模糊,!=',
-            'filter.*.value' => 'required'
+            'filter.*.value' => ''
         ];
     }
 
@@ -27,7 +27,6 @@ class OrderFetch extends FormRequest
             'filter.*.key.in' => '过滤键参数有误',
             'filter.*.condition.required' => '过滤条件不能为空',
             'filter.*.condition.in' => '过滤条件参数有误',
-            'filter.*.value.required' => '过滤值不能为空'
         ];
     }
 }

File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/umi.js


+ 1 - 1
resources/lang/en-US/user.php

@@ -104,7 +104,7 @@ return [
         ],
         'stripeCard' => [
             'currency_convert_timeout' => 'Currency conversion has timed out, please try again later',
-            'was_problem' => 'Oops, there's a problem... Please refresh the page and try again later',
+            'was_problem' => "Oops, there's a problem... Please refresh the page and try again later",
             'deduction_failed' => 'Payment failed. Please check your credit card information'
         ]
     ],

Some files were not shown because too many files changed in this diff