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

application/admin/controller/trade/MoneyIn.php

@@ -25,6 +25,7 @@ class MoneyIn extends Backend
     protected $model  = null;
 
     protected $mapType = null;
+    protected $relationSearch = true;
 
     public function _initialize()
     {
@@ -89,7 +90,7 @@ class MoneyIn extends Backend
                 (new MoneyLog())->change($row->user_id, $row->amount, MoneyLog::Recharge, $row->user_id, '充值');
             }
 
-            $result = $row->allowField(true)->save(['status' => $status]);
+            $result = $row->allowField(true)->save(['status' => $status, 'admin_id'=>$this->auth->id]);
             //累积充值金额
             //(new Users())->where('id', $row->user_id)->setInc('money_in_sum', $row->amount);
             Db::commit();

application/admin/controller/trade/MoneyOut.php

@@ -25,6 +25,7 @@ class MoneyOut extends Backend
     protected $model = null;
 
     protected $mapType = null;
+    protected $relationSearch = true;
 
     public function _initialize()
     {
@@ -64,6 +65,8 @@ class MoneyOut extends Backend
             ->where($this->mapType)
             ->order($sort, $order)
             ->paginate($limit);
+
+
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
@@ -95,7 +98,7 @@ class MoneyOut extends Backend
                 (new MoneyLog())->change($row->user_id, $amount, MoneyLog::Reject, '', '驳回');
             }
 
-            $result = $row->allowField(true)->save(['status'=>$status]);
+            $result = $row->allowField(true)->save(['status'=>$status, 'admin_id'=>$this->auth->id]);
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {
             Db::rollback();

application/admin/controller/user/User.php

@@ -51,7 +51,7 @@ class User extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model->with('parent')
-                ->where($where)
+                ->where($where)->where('users.is_delete', 0)
                 ->order($sort, $order)
                 ->paginate($limit);
 
@@ -60,15 +60,13 @@ class User extends Backend
             $path= model('UsersPath');
             foreach ($list as &$item) {
                 $item->agent = $this->model
-                    ->where('id', '=',
-                        $path->where('user_id', $item->id)->where('is_agent', 1)->order('distance', 'desc')->value('parent_id')
-                    )
+                    ->where('id', '=', $path->where('user_id', $item->id)->where('is_agent', 1)->order('distance', 'desc')->value('parent_id'))
                     ->value('mobile');
                 $item->recharge = $in::where('status', 200)->where('user_id', $item->id)->sum('amount');
                 $item->withdraw = $out::where('status', 200)->where('user_id', $item->id)->sum('amount');
-            }  
-            $result = array("total" => $list->total(), "rows" => $list->items());
+            }
 
+            $result = array("total" => $list->total(), "rows" => $list->items());
             return json($result);
         }
         return $this->view->fetch();

application/api/controller/User.php

@@ -219,8 +219,8 @@ class User extends Api
         $code           = $this->request->post('country_code');
         $mobile         = $this->request->post('mobile');
         $captcha        = $this->request->post('captcha');
-        $token          = $this->request->post('token');
-
+        $token          = $this->request->post('token', ip2long($this->request->ip()));
+        //   $id = $this->request->ip();
         if(!captcha_check($captcha,$token)){
             $this->error(__('验证码错误'));
         };
@@ -254,12 +254,12 @@ class User extends Api
 
     public function reset_pwd()
     {
-        $code           = $this->request->post('code');
+        $code           = $this->request->post('country_code');
         $mobile         = $this->request->post('mobile');
         $new_pwd        = $this->request->post("new_pwd", '', null);
         $confirm_pwd    = $this->request->post("confirm_pwd", '', null);
         $rule = [
-            'code'          => 'require',
+            'country_code'  => 'require',
             'mobile'        => 'require|regex:^1\d{10}$',
             'new_pwd'       => 'require|regex:\S{6,30}',
             'confirm_pwd'   => 'require|regex:\S{6,30}|confirm:new_pwd',
@@ -269,13 +269,13 @@ class User extends Api
             'new_pwd.confirm' => __('Password and confirm password don\'t match')
         ];
         $data = [
-            'code'        => $code,
+            'country_code'  => $code,
             'mobile'        => $mobile,
             'new_pwd'       => $new_pwd,
             'confirm_pwd'   => $confirm_pwd,
         ];
         $field = [
-            'code'          => __('区号'),
+            'country_code'  => __('区号'),
             'mobile'        => __('手机号码'),
             'new_pwd'       => __('新资金密码'),
             'confirm_pwd'   => __('新密码')

application/api/controller/Validate.php

@@ -30,10 +30,9 @@ class Validate extends Api
      */
     public function get_captcha()
     {
-
         $captcha = new Captcha(['codeSet' => '0123456789', 'length' => 4]);
-        $id = uniqid();
-        return $captcha->entry();
+        $id = ip2long($this->request->ip());
+        return $captcha->entry($id);
 
 //        $id = uniqid();
 //        $src = $_SERVER['REQUEST_SCHEME'].'://'.$this->request->host() . captcha_src($id);

public/assets/js/backend/goods/goods.js

@@ -25,13 +25,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
+                        {field: 'id', title: __('Id'), operate: false},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
-                        {field: 'price', title: __('Price'), operate:'BETWEEN'},
-                        {field: 'img_url', title: __('Img_url'), events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'price', title: __('Price'), operate: false},
+                        {field: 'img_url', title: __('Img_url'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Enable'),"0":__('Off shelf')}, formatter: Table.api.formatter.toggle},
                         {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
-                        {field: 'updatetime', title: __('Updatetime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
+                        {field: 'updatetime', title: __('Updatetime'), formatter: Table.api.formatter.datetime, operate: false, addclass: 'datetimerange', sortable: true},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

public/assets/js/backend/news/lists.js

@@ -25,16 +25,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
+                        {field: 'id', title: __('Id'), operate: false},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
                         {field: 'types.title', title: __('Type_id')},
-                        {field: 'img_url', title: __('Img_url'), events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'img_url', title: __('Img_url'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false},
                         {field: 'status', title: __('Status'), 
                             searchList: {"1":__('Enable'),"0":__('Off shelf')}, 
                             formatter: Table.api.formatter.toggle
                         },
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'update_time', title: __('Update_time'), operate: false, addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]

public/assets/js/backend/trade/money_in.js

@@ -22,17 +22,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
+                        {field: 'id', title: __('Id'), operate: false},
                         {field: 'order_type', title: __("Order_type"), 
                             searchList: {1:__('Usdt'), 2:__('Bank')}, 
-                            formatter: Table.api.formatter.status
+                            formatter: Table.api.formatter.status, operate: false
                         },
                         {field: 'users.mobile', title: __('User_id')},
-                        {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'usdt_address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'bank_name', title: __('Bank_name'), operate: 'LIKE'},
                         {field: 'bank_card', title: __('Bank_card'), operate: 'LIKE'},
-                        {field: 'account_name', title: __('Account_name'), operate: 'LIKE'},
-                        {field: 'amount', title: __('Amount'), operate:'BETWEEN'},
+                        {field: 'account_name', title: __('Account_name'), operate: false},
+                        {field: 'amount', title: __('Amount'), operate: false},
                         {field: 'status', title: __("Status"), 
                             searchList: {0:__('待支付'), 100:__('待处理'), 200:__('成功'), 400:__('失败'), 500:__('取消')},
                             formatter: Table.api.formatter.status
@@ -41,9 +41,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             searchList: {0:__('假人'), 1:__('真人')}, 
                             formatter: Table.api.formatter.status
                         },
-                        {field: 'admins.nickname', title: __('Admin_id')},
-                        {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'admins.nickname', title: __('Admin_id'), operate: false},
+                        {field: 'create_time', title: __('Create_time'), operate: 'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'update_time', title: __('Update_time'), operate: false, addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'),
                             table: table,
                             buttons: [{

public/assets/js/backend/trade/money_out.js

@@ -22,20 +22,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
+                        {field: 'id', title: __('Id'), operate: false},
                         {field: 'order_type', title: __("Order_type"), 
                             searchList: {1:__('Usdt'), 2:__('Bank')}, 
-                            formatter: Table.api.formatter.status
+                            formatter: Table.api.formatter.status, operate: false
                         },
                         {field: 'users.mobile', title: __('User_id')},
-                        {field: 'users.balance', title: __('当前余额')},
+                        {field: 'users.balance', title: __('当前余额'), operate: false},
                         {field: 'usdt_address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'bank_name', title: __('Bank_name'), operate: 'LIKE'},
                         {field: 'bank_card', title: __('Bank_card'), operate: 'LIKE'},
-                        {field: 'account_name', title: __('Account_name'), operate: 'LIKE'},
-                        {field: 'amount', title: __('Amount'), operate:'BETWEEN'},
-                        {field: 'fee', title: __('Fee'), operate:'BETWEEN'},
-                        {field: 'real_amount', title: __('Real_amount'), operate:'BETWEEN'},
+                        {field: 'account_name', title: __('Account_name'), operate: false},
+                        {field: 'amount', title: __('Amount'), operate: false},
+                        {field: 'fee', title: __('Fee'), operate: false},
+                        {field: 'real_amount', title: __('Real_amount'), operate: false},
                         {field: 'status', title: __("Status"), 
                             searchList: {100:__('Pending'), 200:__('Success'), 400:__('Fail'), 401:__('驳回'), 500:__('Cancel')},
                             formatter: Table.api.formatter.status
@@ -44,9 +44,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             searchList: {0:__('假人'), 1:__('真人')}, 
                             formatter: Table.api.formatter.status
                         },
-                        {field: 'admins.nickname', title: __('Admin_id')},
+                        {field: 'admins.nickname', title: __('Admin_id'), operate: false},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'update_time', title: __('Update_time'), operate: false, addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'),
                             table: table,
                             buttons: [{

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

@@ -1,20 +1,6 @@
 define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function ($, undefined, Backend, Table, Form, undefined) {
     //读取选中的条目
-    $.jstree.core.prototype.get_all_checked = function (full) {
-        var obj = this.get_selected(), i, j;
-        for (i = 0, j = obj.length; i < j; i++) {
-            obj = obj.concat(this.get_node(obj[i]).parents);
-        }
-        obj = $.grep(obj, function (v, i, a) {
-            return v != '#';
-        });
-        obj = obj.filter(function (itm, i, a) {
-            return i == a.indexOf(itm);
-        });
-        return full ? $.map(obj, $.proxy(function (i) {
-            return this.get_node(i);
-        }, this)) : obj;
-    };
+
     var Controller = {
         index: function () {
             // 初始化表格参数配置
@@ -36,15 +22,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
-                        {field: 'mobile', title: __('Mobile')},
+                        {field: 'id', title: __('Id'), operate: false},
+                        {field: 'mobile', title: __('Mobile'), operate: 'Like'},
                         {field: 'invitation_code', title: __('Invitation_code')},
                         {field: 'agent_in_usdt', title: __('Agent_in_usdt'), searchList: {0: __('Close'), 1: __('Open')} , formatter: Table.api.formatter.status},
                         {field: 'agent_in_bank', title: __('Agent_in_bank'), searchList: {0: __('Close'), 1: __('Open')}, formatter: Table.api.formatter.status},
                         {field: 'agent_out_usdt', title: __('Agent_out_usdt'), searchList: {0: __('Close'), 1: __('Open')}, formatter: Table.api.formatter.status},
                         {field: 'agent_out_bank', title: __('Agent_out_bank'), searchList: {0: __('Close'), 1: __('Open')}, formatter: Table.api.formatter.status},
-                        {field: 'service_link', title: __('Service_link')},
-                        {field: 'team_num', title: __('Team')},
+                        {field: 'service_link', title: __('Service_link'), operate: false},
+                        {field: 'team_num', title: __('Team'), operate: 'Like'},
                         {field: 'operate', title: __('Operate'), table: table,
                             buttons: [{
                                 name: "edit",