Merge branch 'main' of https://jihulab.com/tou-biao/api-system

application/admin/lang/zh-cn/user/user.php

@@ -11,7 +11,7 @@ return [
     'Invitation_code'       => '邀请码',
     'Is_agent'              => '代理',
     'User_type'             => '用户类型(真人/假人)',
-    'Status'                => '状态(是/否)',
+    '锁定'                   => '锁定',
     '抢单开关'                => '抢单开关',
     '卡单开关'                => '卡单开关',
     '开'                     => '开',

application/common/model/MoneyLog.php

@@ -86,7 +86,7 @@ class MoneyLog extends Model
         //余额
         $balance = bcadd($user->balance, $amount, 2);
         //只有支付订单或系统调整的时候，可以余额为负数
-        if(($action != self::Pay || $action != self::SystemChange) && $balance < 0){
+        if(($action != self::Pay && $action != self::SystemChange) && $balance < 0){
             throw new Exception(__('余额不足'));
         }
 

public/assets/js/backend/user/user.js

@@ -50,7 +50,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user_type', title: __('User_type'), formatter: Table.api.formatter.toggle,
                             searchList: {0: __('Dummy'), 1: __('Real person')}
                         },
-                        {field: 'is_lock', title: __('Status'), formatter: Table.api.formatter.toggle, 
+                        {field: 'is_lock', title: __('锁定'), formatter: Table.api.formatter.toggle,
                             searchList: {0: __('Normal'), 1: __('Locking')}
                         },
                         {field: 'operate', title: __('Operate'), table: table,