lizhen_gitee 1 vuosi sitten
vanhempi
commit
f53a081e53

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

@@ -65,6 +65,6 @@ return [
     'Is_manager'       => '是否管理员',
     'Is_manager 0'     => '否',
     'Is_manager 1'     => '是',
-    'Userwallet.money' => '可用余额',
-    'Userwallet.jewel' => '钻石余额'
+    'Userwallet.money' => '余额',
+    'Userwallet.jewel' => '金币'
 ];

+ 20 - 20
application/admin/view/user/user/edit.html

@@ -3,13 +3,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('U_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-u_id" data-rule="required" data-source="u/index" class="form-control selectpage" name="row[u_id]" type="text" value="{$row.u_id|htmlentities}">
+            <input id="c-u_id" data-rule="required" disabled  class="form-control" name="row[u_id]" type="text" value="{$row.u_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">
-            <input id="c-username" class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
+            <input id="c-username" class="form-control" disabled name="row[username]" type="text" value="{$row.username|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -18,7 +18,7 @@
             <input id="c-nickname" class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<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}">
@@ -29,13 +29,13 @@
         <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">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</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}">
         </div>
-    </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">
@@ -50,7 +50,7 @@
             <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
@@ -63,7 +63,7 @@
             </div>
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
-    </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">
@@ -76,7 +76,7 @@
             <input id="c-age_id" data-rule="required" data-source="age/index" class="form-control selectpage" name="row[age_id]" type="text" value="{$row.age_id|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<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):''}">
@@ -105,8 +105,8 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-token" class="form-control" name="row[token]" type="text" value="{$row.token|htmlentities}">
         </div>
-    </div>
-    <div class="form-group">
+    </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}">
@@ -177,7 +177,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-guild_id" data-rule="required" data-source="guild/index" class="form-control selectpage" name="row[guild_id]" type="text" value="{$row.guild_id|htmlentities}">
         </div>
-    </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">
@@ -190,7 +190,7 @@
 
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Openid')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-openid" class="form-control" name="row[openid]" type="text" value="{$row.openid|htmlentities}">
@@ -225,14 +225,14 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-city_id" data-rule="required" data-source="city/index" class="form-control selectpage" name="row[city_id]" type="text" value="{$row.city_id|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Desc')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-desc" class="form-control" name="row[desc]" type="text" value="{$row.desc|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_cool')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
@@ -243,8 +243,8 @@
             </select>
 
         </div>
-    </div>
-    <div class="form-group">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Wealth_level')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-wealth_level" class="form-control" name="row[wealth_level]" type="number" value="{$row.wealth_level|htmlentities}">
@@ -267,8 +267,8 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-charm_empirical" class="form-control" name="row[charm_empirical]" type="number" value="{$row.charm_empirical|htmlentities}">
         </div>
-    </div>
-    <div class="form-group">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Job_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-job_id" data-rule="required" data-source="job/index" class="form-control selectpage" name="row[job_id]" type="text" value="{$row.job_id|htmlentities}">
@@ -297,7 +297,7 @@
             </select>
 
         </div>
-    </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/admin/view/user/user/index.html

@@ -17,7 +17,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('user/user/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
@@ -28,7 +28,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

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

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'user/user/index' + location.search,
                     add_url: 'user/user/add',
                     edit_url: 'user/user/edit',
-                    del_url: 'user/user/del',
+//                    del_url: 'user/user/del',
                     multi_url: 'user/user/multi',
                     import_url: 'user/user/import',
                     table: 'user',
@@ -29,19 +29,19 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'u_id', title: __('U_id')},
                         {field: 'username', title: __('Username'), operate: 'LIKE'},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
-                        {field: 'password', title: __('Password'), operate: 'LIKE'},
-                        {field: 'salt', title: __('Salt'), operate: 'LIKE'},
+//                        {field: 'password', title: __('Password'), operate: 'LIKE'},
+//                        {field: 'salt', title: __('Salt'), operate: 'LIKE'},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
                         {field: 'avatar', title: __('Avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+//                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'gender', title: __('Gender')},
-                        {field: 'age_id', title: __('Age_id')},
+//                        {field: 'age_id', title: __('Age_id')},
                         {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'onlinetime', title: __('Onlinetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
                         {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
-                        {field: 'token', title: __('Token'), operate: 'LIKE'},
-                        {field: 'verification', title: __('Verification'), operate: 'LIKE'},
+//                        {field: 'token', title: __('Token'), operate: 'LIKE'},
+//                        {field: 'verification', title: __('Verification'), operate: 'LIKE'},
                         {field: 'is_live', title: __('Is_live'), searchList: {"1":__('Is_live 1'),"0":__('Is_live 0')}, formatter: Table.api.formatter.normal},
                         {field: 'is_online', title: __('Is_online'), searchList: {"1":__('Is_online 1'),"0":__('Is_online 0')}, formatter: Table.api.formatter.normal},
                         {field: 'has_info', title: __('Has_info'), searchList: {"1":__('Has_info 1'),"0":__('Has_info 0')}, formatter: Table.api.formatter.normal},
@@ -49,24 +49,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'is_guild', title: __('Is_guild'), searchList: {"1":__('Is_guild 1'),"0":__('Is_guild 0'),"-1":__('Is_guild -1'),"2":__('Is_guild 2'),"3":__('Is_guild 3')}, formatter: Table.api.formatter.normal},
                         {field: 'guild_id', title: __('Guild_id')},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0'),"-1":__('Status -1')}, formatter: Table.api.formatter.status},
-                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'openid', title: __('Openid'), operate: 'LIKE'},
+//                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'openid', title: __('Openid'), operate: 'LIKE'},
                         {field: 'invite_no', title: __('Invite_no'), operate: 'LIKE'},
                         {field: 'pre_userid', title: __('Pre_userid')},
-                        {field: 'loginfailure', title: __('Loginfailure')},
-                        {field: 'province_id', title: __('Province_id')},
-                        {field: 'city_id', title: __('City_id')},
-                        {field: 'desc', title: __('Desc'), operate: 'LIKE'},
+//                        {field: 'loginfailure', title: __('Loginfailure')},
+//                        {field: 'province_id', title: __('Province_id')},
+//                        {field: 'city_id', title: __('City_id')},
+//                        {field: 'desc', title: __('Desc'), operate: 'LIKE'},
                         {field: 'is_cool', title: __('Is_cool'), searchList: {"0":__('Is_cool 0'),"1":__('Is_cool 1')}, formatter: Table.api.formatter.normal},
                         {field: 'wealth_level', title: __('Wealth_level')},
                         {field: 'wealth_empirical', title: __('Wealth_empirical')},
                         {field: 'charm_level', title: __('Charm_level')},
                         {field: 'charm_empirical', title: __('Charm_empirical')},
-                        {field: 'job_id', title: __('Job_id')},
-                        {field: 'longitude', title: __('Longitude'), operate: 'LIKE'},
-                        {field: 'latitude', title: __('Latitude'), operate: 'LIKE'},
-                        {field: 'is_manager', title: __('Is_manager'), searchList: {"0":__('Is_manager 0'),"1":__('Is_manager 1')}, formatter: Table.api.formatter.normal},
+//                        {field: 'job_id', title: __('Job_id')},
+//                        {field: 'longitude', title: __('Longitude'), operate: 'LIKE'},
+//                        {field: 'latitude', title: __('Latitude'), operate: 'LIKE'},
+//                        {field: 'is_manager', title: __('Is_manager'), searchList: {"0":__('Is_manager 0'),"1":__('Is_manager 1')}, formatter: Table.api.formatter.normal},
                         {field: 'userwallet.money', title: __('Userwallet.money'), operate:'BETWEEN'},
                         {field: 'userwallet.jewel', title: __('Userwallet.jewel')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}