xxxrrrdddd 3 years ago
parent
commit
03024b18ca

+ 34 - 0
application/admin/lang/zh-cn/user/sub.php

@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'Id'             => 'ID',
+    'Group_id'       => '组别ID',
+    'Username'       => '用户名',
+    'Nickname'       => '昵称',
+    'Password'       => '密码',
+    'Salt'           => '密码盐',
+    'Email'          => '电子邮箱',
+    'Mobile'         => '手机号',
+    'Avatar'         => '头像',
+    'Level'          => '等级',
+    'Gender'         => '性别',
+    'Male'           => '男',
+    'FeMale'         => '女',
+    'Birthday'       => '生日',
+    'Bio'            => '格言',
+    'Score'          => '积分',
+    'Successions'    => '连续登录天数',
+    'Maxsuccessions' => '最大连续登录天数',
+    'Prevtime'       => '上次登录时间',
+    'Logintime'      => '登录时间',
+    'Loginip'        => '登录IP',
+    'Loginfailure'   => '失败次数',
+    'Joinip'         => '加入IP',
+    'Jointime'       => '加入时间',
+    'Createtime'     => '创建时间',
+    'Updatetime'     => '更新时间',
+    'Token'          => 'Token',
+    'Status'         => '状态',
+    'Hidden'         => '禁用',
+    'Leave password blank if dont want to change' => '不修改密码请留空',
+];

+ 55 - 0
application/admin/view/user/suber/add.html

@@ -0,0 +1,55 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+    {:token()}
+    <div class="form-group">
+        <label for="c-username" class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
+        <div class="col-xs-12 col-sm-4">
+            <input id="c-username" data-rule="required" class="form-control" name="row[username]" type="text" value="">
+        </div>
+    </div>
+    <input type="hidden" name="row[type]" value="1"/>
+    <div class="form-group">
+        <label for="c-nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
+        <div class="col-xs-12 col-sm-4">
+            <input id="c-nickname" data-rule="required" class="form-control" name="row[nickname]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="c-password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
+        <div class="col-xs-12 col-sm-4">
+            <input id="c-password" data-rule="password" class="form-control" name="row[password]" type="text" value="" placeholder="密码" autocomplete="new-password" />
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="c-mobile" class="control-label col-xs-12 col-sm-2">{:__('手机号')}:</label>
+        <div class="col-xs-12 col-sm-4">
+            <input id="c-mobile" data-rule="" class="form-control" name="row[mobile]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('头像')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-avatar" data-rule="" class="form-control" size="50" name="row[avatar]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-avatar" class="btn btn-danger faupload" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-avatar" class="btn btn-primary fachoose" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-avatar"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], 'normal')}
+        </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">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

+ 7 - 53
application/admin/view/user/suber/edit.html

@@ -1,38 +1,32 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     {:token()}
-    <input type="hidden" name="row[id]" value="{$row.id}">
+    <input type="hidden" name="row[id]" value="{$row.id}"/>
     <div class="form-group">
         <label for="c-username" class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-4">
-            <input id="c-username" data-rule="required" class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
+            <input id="c-username" data-rule="required" class="form-control" name="row[username]" type="text" value="{$row.username}">
         </div>
     </div>
     <div class="form-group">
         <label for="c-nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
         <div class="col-xs-12 col-sm-4">
-            <input id="c-nickname" data-rule="required" class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">
+            <input id="c-nickname" data-rule="required" class="form-control" name="row[nickname]" type="text" value="{$row.nickname}">
         </div>
     </div>
     <div class="form-group">
         <label for="c-password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
         <div class="col-xs-12 col-sm-4">
-            <input id="c-password" data-rule="password" class="form-control" name="row[password]" type="text" value="" placeholder="{:__('Leave password blank if dont want to change')}" autocomplete="new-password" />
+            <input id="c-password" data-rule="password" class="form-control" name="row[password]" type="text" value="" placeholder="密码" autocomplete="new-password" />
         </div>
     </div>
-<!--    <div class="form-group">
-        <label for="c-email" class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
-        <div class="col-xs-12 col-sm-4">
-            <input id="c-email" data-rule="" class="form-control" name="row[email]" type="text" value="{$row.email|htmlentities}">
-        </div>
-    </div>-->
     <div class="form-group">
-        <label for="c-mobile" class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
+        <label for="c-mobile" class="control-label col-xs-12 col-sm-2">{:__('手机号')}:</label>
         <div class="col-xs-12 col-sm-4">
-            <input id="c-mobile" data-rule="" class="form-control" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}">
+            <input id="c-mobile" data-rule="" class="form-control" name="row[mobile]" type="text" value="{$row.mobile}">
         </div>
     </div>
     <div class="form-group">
-        <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
+        <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('头像')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
                 <input id="c-avatar" data-rule="" class="form-control" size="50" name="row[avatar]" type="text" value="{$row.avatar}">
@@ -46,46 +40,6 @@
         </div>
     </div>
     <div class="form-group">
-        <label for="c-level" class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>
-        <div class="col-xs-12 col-sm-4">
-            <select id="c-level" data-rule="required" name="row[level]" class="form-control">
-                {foreach name='levels' item='a' key='b'}
-                <option value="{$b}"{:$b==$row.level?'selected':''}>{$a}</option>
-                {/foreach}
-            </select>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="c-gender" class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[gender]', ['1'=>__('Male'), '2'=>__('Female')], $row['gender'])}
-        </div>
-    </div>
-<!--    <div class="form-group">
-        <label for="c-birthday" class="control-label col-xs-12 col-sm-2">{:__('Birthday')}:</label>
-        <div class="col-xs-12 col-sm-4">
-            <input id="c-birthday" data-rule="" 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 for="c-bio" class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-bio" data-rule="" class="form-control" name="row[bio]" type="text" value="{$row.bio|htmlentities}">
-        </div>
-    </div>-->
-   <!-- <div class="form-group">
-        <label for="c-money" class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
-        <div class="col-xs-12 col-sm-4">
-            <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="{$row.money}">
-        </div>
-    </div>-->
-  <!--  <div class="form-group">
-        <label for="c-score" class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label>
-        <div class="col-xs-12 col-sm-4">
-            <input id="c-score" data-rule="required" class="form-control" name="row[score]" type="number" value="{$row.score}">
-        </div>
-    </div>-->
-    <div class="form-group">
         <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
             {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}

+ 0 - 10
application/common/model/User.php

@@ -293,18 +293,8 @@ class User extends Model
     {
         self::beforeWrite(function (self $user){
             $data=$user->getChangedData();
-            #升级安检员
-            if($user->mobile && $user->level==self::LEVEL_0){
-                $user->level=self::LEVEL_10;
-            }
         });
         self::afterDelete(function (self $user){
-            $user->comments()->delete();
-            $user->follow()->delete();
-            $user->userinfo()->delete();
-            $user->like()->delete();
-            VideoUserLog::where('user_id',$user['id'])->delete();
-            VideoUserView::where('user_id',$user['id'])->delete();
         });
         self::afterInsert(function (self $user){
             $user->userinfo()->save([]);

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

@@ -44,26 +44,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','echarts'], function (
                             operate: false
                         },
                         {
-                            field: 'gender',
-                            title: __('性别'),
-                            searchList: {1: __('男'), 2: __('Female')},
-                            formatter: Table.api.formatter.label
-                        },
-                        {
-                            field: 'age',
-                            title: __('年龄'),
-                            operate: "BETWEEN"
-                        },
-                        /*{
-                            field: 'city_name',
-                            title: __('地区'),
-                            searchList: function (column) {
-                                return Template('sourcetpl', {})
-                            }
-                        },*/
-                        {
-                            field: 'jointime',
-                            title: __('Jointime'),
+                            field: 'createtime',
+                            title: __('创建时间'),
                             formatter: Table.api.formatter.datetime,
                             operate: 'RANGE',
                             addclass: 'datetimerange',