重置密码

application/admin/controller/trade/MoneyIn.php

@@ -80,11 +80,11 @@ class MoneyIn extends Backend
         }
         $result = false;
         try {
-            $result = $row->allowField(true)->save(['status' => $this->model::Success]);
+            $result = $row->allowField(true)->save(['status' => $status]);
             //累积充值金额
             //(new Users())->where('id', $row->user_id)->setInc('money_in_sum', $row->amount);
 
-        } catch (ValidateException|PDOException|Exception $e) {
+        } catch (ValidateException|PDOException $e) {
             $this->error($e->getMessage());
         }
         if (false === $result) {

application/admin/controller/user/User.php

@@ -324,7 +324,6 @@ class User extends Backend
      */
     public function del($ids = null)
     {
-
         $row = $this->model->get($ids);
         if (!$row) {
             $this->error(__('No Results were found'));

application/admin/lang/vn/trade/mongyout.php

@@ -17,4 +17,6 @@ return [
     '用户类型'     => 'loại người dùng',
     '真人'         => 'người thực',
     '假人'         => 'đồ giả',
+    '通过'          => 'vượt qua',
+    '驳回'          => 'từ chối',
 ];

application/admin/lang/vn/user/user.php

@@ -44,4 +44,5 @@ return [
     'Fund pwd'              => '资金密码',
     'Task num'              => 'Số lượng nhiệm vụ hiện tại',
     'Pwd title'             => 'Để trống để không thực hiện thay đổi',
+    '一键清空'               => 'Xóa bằng một cú nhấp chuột',
 ];

application/admin/lang/zh-cn/trade/money_in.php

@@ -17,11 +17,13 @@ return [
     'Update_time'  => '更新时间',
     'Confirm review'=> '确定执行该操作吗?',
 
-    '待支付'           => '待支付',
-    '待处理'           => '待处理',
-    '成功'             => '成功',
-    '取消'             => '失败',
-    '用户类型'      => '用户类型',
-    '真人'          => '真人',
-    '假人'          => '假人',
+    '待支付'            => '待支付',
+    '待处理'            => '待处理',
+    '成功'              => '成功',
+    '取消'              => '失败',
+    '用户类型'          => '用户类型',
+    '真人'              => '真人',
+    '假人'              => '假人',
+    '通过'              => '通过',
+    '取消'              => '取消',
 ];

application/admin/lang/zh-cn/trade/money_out.php

@@ -21,7 +21,12 @@ return [
     'Pending'       => '待处理',
     'Success'       => '成功',
     'Fail'          => '失败',
+    'Cancel'        => '取消',
     '用户类型'      => '用户类型',
     '真人'          => '真人',
     '假人'          => '假人',
+    '通过'          => '通过',
+    '驳回'          => '驳回',
+
+    
 ];

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

@@ -49,5 +49,5 @@ return [
     'Fund pwd'              => '资金密码',
     'Task num'              => '当前任务数',
     'Pwd title'             => '留空则不修改',
-
+    '一键清空'               => '一键清空',
 ];

application/admin/view/user/user/cardslip.html

@@ -5,26 +5,26 @@
     <div class="form-group">
         <label for="c-which_start" class="control-label col-xs-12 col-sm-2">{:__('Which start')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-which_start" data-rule="required" class="form-control" name="row[which_start]" type="number" value="{$row.which_start|htmlentities}">
+            <input id="c-which_start" class="form-control" name="row[which_start]" type="number" value="{$row.which_start|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label for="c-min_amount" class="control-label col-xs-12 col-sm-2">{:__('Min amount')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-min_amount" data-rule="required" class="form-control" name="row[min_amount]" type="text" value="{$row.min_amount|htmlentities}">
+            <input id="c-min_amount" class="form-control" name="row[min_amount]" type="text" value="{$row.min_amount|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label for="c-max_amount" class="control-label col-xs-12 col-sm-2">{:__('Max amount')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-max_amount" data-rule="required" class="form-control" name="row[max_amount]" type="number" value="{$row.max_amount|htmlentities}">
+            <input id="c-max_amount" class="form-control" name="row[max_amount]" type="number" value="{$row.max_amount|htmlentities}">
         </div>
     </div>
 
     <div class="form-group">
         <label for="c-income_multiple" class="control-label col-xs-12 col-sm-2">{:__('Income multiple')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-income_multiple" data-rule="required" class="form-control" name="row[income_multiple]" type="number" value="{$row.income_multiple|htmlentities}">
+            <input id="c-income_multiple" class="form-control" name="row[income_multiple]" type="number" value="{$row.income_multiple|htmlentities}">
         </div>
     </div>
  
@@ -32,8 +32,8 @@
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed ">{:__('OK')}</button>
-            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+            <button type="submit" class="btn btn-primary btn-embossed">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed btn-clear">{:__('一键清空')}</button>
         </div>
     </div>
     </div>

application/api/controller/User.php

@@ -254,41 +254,40 @@ class User extends Api
 
     public function reset_pwd()
     {
-        $token          = $this->request->post('token');
+        $mobile         = $this->request->post('mobile');
         $new_pwd        = $this->request->post("new_pwd", '', null);
         $confirm_pwd    = $this->request->post("confirm_pwd", '', null);
-
         $rule = [
+            'mobile'        => 'require|mobile',
             'new_pwd'       => 'require|regex:\S{6,30}',
             'confirm_pwd'   => 'require|regex:\S{6,30}|confirm:new_pwd',
         ];
 
         $msg = [
+            'mobile.mobile'   => __('Mobile is incorrect'), 
             'new_pwd.confirm' => __('Password and confirm password don\'t match')
         ];
         $data = [
+            'mobile'        => $mobile,
             'new_pwd'       => $new_pwd,
             'confirm_pwd'   => $confirm_pwd,
         ];
         $field = [
-            'new_pwd'   => __('新资金密码'),
-            'confirm_pwd' => __('新密码')
+            'mobile'        => __('手机号码'),
+            'new_pwd'       => __('新资金密码'),
+            'confirm_pwd'   => __('新密码')
         ];
         $validate = new Validate($rule, $msg, $field);
         $result = $validate->check($data);
         if (!$result) {
             $this->error(__($validate->getError()));
         }
-
-        $info = Cache::get($token);
-        if(empty($info)){
-            $this->error(__('操作超时'));
-        }
+        dump(111);die;
         Db::startTrans();
         try {
             $salt = Random::alnum();
             $new_password = $this->auth->getEncryptPassword($new_pwd, $salt);
-            UserModel::where($info)
+            UserModel::where('mobile', $mobile)
                 ->update([
                     'login_pwd' => $new_password,
                     'salt' => $salt

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

@@ -43,7 +43,9 @@ return [
     '新密码'                                 => '新密码',
     '确认密码'                               => '确认密码',
     '登录密码'                               => '登录密码',
-    '新资金密码'                              => '新资金密码',
-    '资金密码重置成功'                         => '资金密码重置成功',
-    '资金密码重置失败'                         => '资金密码重置失败',
+    '新资金密码'                             => '新资金密码',
+    '资金密码重置成功'                        => '资金密码重置成功',
+    '资金密码重置失败'                        => '资金密码重置失败',
+    '手机号码'                               => '手机号码',
+
 ];

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

@@ -47,18 +47,29 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'operate', title: __('Operate'),
                             table: table,
                             buttons: [{
-                                name: "operate",
-                                text:  __('Review'),
+                                name: "success",
+                                text:  __('通过'),
+                                classname: 'btn btn-xs btn-success btn-magic btn-ajax',
+                                confirm: __('Confirm review'),
+                                url: 'trade/money_in/review/status/200',
+                                visible: function (row) {
+                                    if(row.status == 100) return true;
+                                    return false;
+                                },
+                                refresh: true
+                            },{
+                                name: "cancel",
+                                text:  __('取消'),
                                 classname: 'btn btn-xs btn-danger btn-magic btn-ajax',
                                 confirm: __('Confirm review'),
-                                url: 'trade/money_in/review',
+                                url: 'trade/money_in/review/status/500',
                                 visible: function (row) {
-                                    //if(row.status == 0 && parseFloat(row.users.balance) >= parseFloat(row.amount)){
-                                        return true;
-                           
+                                    if(row.status == 100) return true;
+                                    return false;
                                 },
                                 refresh: true
-                            }],
+                            },
+                        ],
                             events: Table.api.events.operate, formatter: Table.api.formatter.operate
                         }
                     ]

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

@@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'real_amount', title: __('Real_amount'), operate:'BETWEEN'},
                         {field: 'status', title: __('Status')},
                         {field: 'status', title: __("Status"), 
-                            searchList: {0:__('Pending'), 1:__('Success'), 2:__('Fail')}, 
+                            searchList: {100:__('Pending'), 200:__('Success'), 400:__('Fail'), 500:__('Cancel')}, 
                             formatter: Table.api.formatter.status
                         },
                         {field: 'user_type', title: __("用户类型"), 
@@ -51,24 +51,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             table: table,
                             buttons: [{
                                 name: "operate",
-                                text:  __('Success'),
+                                text:  __('成功'),
                                 classname: 'btn btn-xs btn-success btn-magic btn-ajax',
                                 confirm: __('Confirm review'),
-                                url: 'trade/money_out/review/status/1',
+                                url: 'trade/money_out/review/status/200',
                                 visible: function (row) {
-                                    if(row.status == 0) return true;
+                                    if(row.status == 100) return true;
                                     return false;
                                 },
                                 refresh: true
                             },
                             {
                                 name: "operate",
-                                text:  __('Fail'),
+                                text:  __('驳回'),
                                 classname: 'btn btn-xs btn-danger btn-magic btn-ajax',
                                 confirm: __('Confirm review'),
-                                url: 'trade/money_out/review/status/2',
+                                url: 'trade/money_out/review/status/400',
                                 visible: function (row) {
-                                    if(row.status == 0) return true;
+                                    if(row.status == 100) return true;
                                     return false;
                                 },
                                 refresh: true

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

@@ -20,8 +20,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
-                pk: 'id',
-                sortName: 'id',
+                pk: 'a.id',
+                sortName: 'a.id',
                 columns: [
                     [
                         {checkbox: true},
@@ -33,15 +33,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'balance', title: __('Balance'), operate: false},
                         {field: 'freeze', title: __('Freeze'), operate: false},
                         {field: 'task_num', title: __('Task'), operate: false},
-                        {field: 'open_task', title: __('抢单开关'), formatter: Table.api.formatter.toggle,
-                            searchList: {0: __('关'), 1: __('开')}
-                        },
-                        {field: 'is_limit_task', title: __('卡单开关'), formatter: Table.api.formatter.toggle,
-                            searchList: {0: __('关'), 1: __('开')}
-                        },
-                        {field: 'recharge', title: __('Recharge'), operate: false},
-                        {field: 'withdraw', title: __('Withdrawal'), operate: false},
-                        {field: 'bonus_sum', title: __('Income'), operate: false},
+
+                        {field: 'id', title: __('Recharge'), operate: false},
+                        {field: 'id', title: __('Withdrawal'), operate: false},
+                        {field: 'id', title: __('Income'), operate: false},
 
                         {field: 'invitation_code', title: __('Invitation_code'), operate: false},
                         {field: 'is_agent', title: __('Is_agent'), searchList: {1: __('Yes'), 0: __('No')}, formatter: Table.api.formatter.status},
@@ -52,14 +47,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'is_lock', title: __('Status'), formatter: Table.api.formatter.toggle, 
                             searchList: {0: __('Normal'), 1: __('Locking')}
                         },
-                        {field: 'is_delete', title: __('是否删除'), searchList: {1: __('Yes'), 0: __('No')}, formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), table: table,
                             buttons: [
                                 {
                                     name: "account",
                                     text:  __('Account change'),
                                     classname: 'btn btn-xs btn-info btn-magic btn-dialog',
-                                    extend: 'data-area=\'["80%","80%"]\'',
                                     url: 'trade/money_log/index',
                                     refresh: true
                             },{
@@ -83,14 +76,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 name: "edit",
                                 text:  __('Edit'),
                                 classname: 'btn btn-xs btn-warning btn-magic btn-dialog',
-                                url: 'user/user/edit',
+                                url: 'user/user/edit/ids/{id}',
                                 refresh: true
                             },{
                                 name: "del",
                                 text:  __('Del'),
                                 classname: 'btn btn-xs btn-danger btn-magic btn-ajax',
                                 confirm: __('Confirm review'),
-                                url: 'user/user/del',
+                                url: 'user/user/del/ids/{id}',
                                 refresh: true
                             }],
                             events: Table.api.events.operate, formatter: Table.api.formatter.operate
@@ -126,6 +119,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         cardslip: function () {
             //卡单
             Controller.api.bindevent();
+            //一键清空
+            $(document).on('click','.btn-clear',function () {
+                $('.form-horizontal .form-control').attr('value', '')
+            });
         },
         collection: function () {
             //收款