Ver Fonte

修改用户资料

lizhen_gitee há 1 ano atrás
pai
commit
cbbc37ed2a

+ 28 - 1
application/admin/model/User.php

@@ -3,7 +3,7 @@
 namespace app\admin\model;
 
 use think\Model;
-
+use think\Db;
 
 class User extends Model
 {
@@ -46,6 +46,33 @@ class User extends Model
                     unset($row->password);
                 }
             }
+            //用户名重复
+            if (isset($changed['username'])) {
+                if($changed['username']){
+                    $exists = db('user')->where('username', $changed['username'])->where('id', '<>', $row->id)->find();
+                    if ($exists) {
+                        abort(500,'用户名已经存在');
+                    }
+                }
+            }
+            //手机号重复
+            if (isset($changed['mobile'])) {
+                if($changed['mobile']){
+                    $exists = db('user')->where('mobile', $changed['mobile'])->where('id', '<>', $row->id)->find();
+                    if ($exists) {
+                        abort(500,'手机号已经被使用');
+                    }
+                }
+            }
+            //邀请码重复
+            if (isset($changed['introcode'])) {
+                if($changed['introcode']){
+                    $exists = db('user')->where('introcode', $changed['introcode'])->where('id', '<>', $row->id)->find();
+                    if ($exists) {
+                        abort(500,'邀请码已经存在');
+                    }
+                }
+            }
         });
 
 

+ 15 - 174
application/admin/view/user/user/edit.html

@@ -1,11 +1,6 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Group_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-group_id" data-rule="required" min="0" data-source="group/index" class="form-control selectpage" name="row[group_id]" type="text" value="{$row.group_id|htmlentities}">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -13,35 +8,19 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-nickname" class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-password" class="form-control" name="row[password]" type="text" value="{$row.password|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Salt')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-salt" class="form-control" name="row[salt]" type="text" value="{$row.salt|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-email" class="form-control" name="row[email]" type="text" value="{$row.email|htmlentities}">
+            <input id="c-mobile" class="form-control" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}">
         </div>
     </div>
+
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-mobile" class="form-control" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}">
+            <input id="c-nickname" class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -56,96 +35,15 @@
             <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
         </div>
     </div>
+
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-level" data-rule="required" min="0" class="form-control" name="row[level]" type="number" value="{$row.level|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-gender" data-rule="required" min="0" class="form-control" name="row[gender]" type="number" value="{$row.gender|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Birthday')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-birthday" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{$row.birthday}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-bio" class="form-control" name="row[bio]" type="text" value="{$row.bio|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-score" data-rule="required" class="form-control" name="row[score]" type="number" value="{$row.score|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Successions')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-successions" data-rule="required" min="0" class="form-control" name="row[successions]" type="number" value="{$row.successions|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Maxsuccessions')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-maxsuccessions" data-rule="required" min="0" class="form-control" name="row[maxsuccessions]" type="number" value="{$row.maxsuccessions|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Prevtime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-prevtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[prevtime]" type="text" value="{:$row.prevtime?datetime($row.prevtime):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Logintime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-logintime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[logintime]" type="text" value="{:$row.logintime?datetime($row.logintime):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Loginip')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-loginip" class="form-control" name="row[loginip]" type="text" value="{$row.loginip|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Loginfailure')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-loginfailure" data-rule="required" min="0" class="form-control" name="row[loginfailure]" type="number" value="{$row.loginfailure|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Joinip')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-joinip" class="form-control" name="row[joinip]" type="text" value="{$row.joinip|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jointime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-jointime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[jointime]" type="text" value="{:$row.jointime?datetime($row.jointime):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Token')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-token" class="form-control" name="row[token]" type="text" value="{$row.token|htmlentities}">
+            <input id="c-password" class="form-control" name="row[password]" type="text" value="">
         </div>
     </div>
+
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -158,72 +56,15 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Verification')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-verification" class="form-control" name="row[verification]" type="text" value="{$row.verification|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Mini_openid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-mini_openid" class="form-control" name="row[mini_openid]" type="text" value="{$row.mini_openid|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Mini_sessionkey')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-mini_sessionkey" class="form-control" name="row[mini_sessionkey]" type="text" value="{$row.mini_sessionkey|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Unionid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-unionid" class="form-control" name="row[unionid]" type="text" value="{$row.unionid|htmlentities}">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Introcode')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-introcode" class="form-control" name="row[introcode]" type="text" value="{$row.introcode|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Last_paytime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-last_paytime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[last_paytime]" type="text" value="{:$row.last_paytime?datetime($row.last_paytime):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Intro_num')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-intro_num" data-rule="required" class="form-control" name="row[intro_num]" type="number" value="{$row.intro_num|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Intro_num_all')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-intro_num_all" data-rule="required" class="form-control" name="row[intro_num_all]" type="number" value="{$row.intro_num_all|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Intro_uid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-intro_uid" data-rule="required" class="form-control" name="row[intro_uid]" type="number" value="{$row.intro_uid|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Intro_ids')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-intro_ids" data-rule="required" data-source="intro/index" data-multiple="true" class="form-control selectpage" name="row[intro_ids]" type="text" value="{$row.intro_ids|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Intro_level')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-intro_level" data-rule="required" class="form-control" name="row[intro_level]" type="number" value="{$row.intro_level|htmlentities}">
-        </div>
-    </div>
+
+
     <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">

+ 2 - 2
application/api/controller/Money.php

@@ -19,8 +19,8 @@ class Money extends Api
         $data = [
             'score' => model('wallet')->getWallet($this->auth->id,'score'),
             'score_bufen' => model('wallet')->getWallet($this->auth->id,'shouyi'),
-            'min_withdrawal_money' => config('site.min_withdrawal_money'),
-            'max_withdrawal_money' => config('site.max_withdrawal_money'),
+            'min_withdrawal_money' => 1,
+            'max_withdrawal_money' => 50000,
             'type_1' => Db::name('user_withdraw')->where('user_id',$this->auth->id)->where('type',1)->where('status',1)->field('realname,banknumber,bankname')->find(),
             'type_2' => Db::name('user_withdraw')->where('user_id',$this->auth->id)->where('type',2)->where('status',1)->field('realname,banknumber,bankname')->find(),
             'type_3' => Db::name('user_withdraw')->where('user_id',$this->auth->id)->where('type',3)->where('status',1)->field('realname,banknumber,bankname')->find(),

+ 0 - 3
application/extra/site.php

@@ -40,9 +40,6 @@ return array (
     'category2' => '分类二',
     'custom' => '自定义',
   ),
-  'min_withdrawal_money' => '1',
-  'max_withdrawal_money' => '1000000',
   'contactus' => '400123456',
   'orderpaid_zhitui_bili' => '5',
-  'orderpaid_jiantui_bili' => '1',
 );

+ 2 - 2
public/assets/js/backend/user/user.js

@@ -7,7 +7,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 extend: {
                     index_url: 'user/user/index' + location.search,
                     add_url: 'user/user/add',
-//                    edit_url: 'user/user/edit',
+                    edit_url: 'user/user/edit',
 //                    del_url: 'user/user/del',
                     multi_url: 'user/user/multi',
                     import_url: 'user/user/import',
@@ -67,7 +67,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'intro_ids', title: __('Intro_ids')},
 //                        {field: 'intro_level', title: __('Intro_level')},
 
-//                        {field: 'operate', title: __('Operate'),table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'operate', title: __('Operate'),table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });