后台名称家族

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

@@ -1,15 +1,15 @@
 <?php
 
 return [
-    'G_id'             => '公会搜索ID',
-    'User_id'          => '公会长ID',
-    'User.nickname'    => '公会长昵称',
-    'Party_id'         => '公会房间',
-    'Name'             => '公会名称',
-    'Image'            => '公会logo',
-    'Desc'             => '公会简介',
-    'Notice'           => '公会公告',
-    'Status'           => '公会状态',
+    'G_id'             => '家族搜索ID',
+    'User_id'          => '家族长ID',
+    'User.nickname'    => '家族长昵称',
+    'Party_id'         => '家族房间',
+    'Name'             => '家族名称',
+    'Image'            => '家族logo',
+    'Desc'             => '家族简介',
+    'Notice'           => '家族公告',
+    'Status'           => '家族状态',
     'Status 0'         => '待审核',
     'Status -1'        => '已解散',
     'Status 1'         => '正常',
@@ -17,5 +17,5 @@ return [
     'Updatetime'       => '最后更新时间',
     'Createtime'       => '创建时间',
     'Party.party_name' => '派对名称',
-    'Auth.realname'    => '公会长真实姓名',
+    'Auth.realname'    => '家族长真实姓名',
 ];

application/admin/lang/zh-cn/guild/joinin.php

@@ -2,7 +2,7 @@
 
 return [
     'User_id'       => '申请用户ID',
-    'Guild_id'      => '申请加入的公会',
+    'Guild_id'      => '申请加入的家族',
     'Join_time'     => '申请签约时长',
     'Join_time 1'   => '3个月',
     'Join_time 2'   => '6个月',
@@ -10,12 +10,12 @@ return [
     'User_avatar'   => '用户头像',
     'User_idcard'   => '用户身份证号',
     'User_nickname' => '用户昵称',
-    'Guild_name'    => '公会名称',
+    'Guild_name'    => '家族名称',
     'Status'        => '审核状态',
     'Status -1'     => '审核拒绝',
     'Status 0'      => '未审核',
     'Status 1'      => '审核通过',
     'Createtime'    => '申请时间',
     'Updatetime'    => '审核时间',
-    'Guild.name'    => '公会名称'
+    'Guild.name'    => '家族名称'
 ];

application/admin/lang/zh-cn/guild/joininlog.php

@@ -5,9 +5,9 @@ return [
     'Operator'       => '处理人ID',
     'User_nickname'  => '用户昵称',
     'User_u_id'      => '用户展示ID',
-    'Guild_id'       => '公会ID',
-    'Guild_name'     => '公会名称',
-    'Guild_g_id'     => '公会展示ID',
+    'Guild_id'       => '家族ID',
+    'Guild_name'     => '家族名称',
+    'Guild_g_id'     => '家族展示ID',
     'Sign_time_slot' => '签约时间段',
     'Status'         => '签约状态',
     'Status 1'       => '已同意',

application/admin/lang/zh-cn/guild/member.php

@@ -1,11 +1,11 @@
 <?php
 
 return [
-    'Guild_id'      => '公会ID',
+    'Guild_id'      => '家族ID',
     'User_id'       => '用户ID',
     'Role'          => '角色',
     'Role 0'        => '普通成员',
-    'Role 1'        => '公会管理员',
+    'Role 1'        => '家族管理员',
     'Role 2'        => '工会长',
     'Sign_type'     => '签约类型',
     'Sign_type 1'   => '三个月',
@@ -19,6 +19,6 @@ return [
     'Status 1'      => '签约中',
     'Status 2'      => '已解约',
     'Createtime'    => '加入时间',
-    'Guild.name'    => '公会名称',
+    'Guild.name'    => '家族名称',
     'User.nickname' => '昵称'
 ];

application/admin/view/guild/member/index.html

@@ -2,12 +2,12 @@
     
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
-        <ul class="nav nav-tabs" data-field="status">
+        <!--<ul class="nav nav-tabs" data-field="status">
             <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
             {foreach name="statusList" item="vo"}
             <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
             {/foreach}
-        </ul>
+        </ul>-->
     </div>
 
 
@@ -18,7 +18,7 @@
                     <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-edit btn-disabled disabled {:$auth->check('guild/member/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('guild/member/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>
+                        <!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('guild/member/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>
 
                         <div class="dropdown btn-group {:$auth->check('guild/member/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
@@ -26,7 +26,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>

public/assets/js/backend/guild/member.js

@@ -28,12 +28,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'guild_id', title: __('Guild_id')},
                         {field: 'user_id', title: __('User_id')},
                         {field: 'role', title: __('Role'), searchList: {"0":__('Role 0'),"1":__('Role 1'),"2":__('Role 2')}, formatter: Table.api.formatter.normal},
-                        {field: 'sign_type', title: __('Sign_type'), searchList: {"1":__('Sign_type 1'),"2":__('Sign_type 2'),"3":__('Sign_type 3')}, formatter: Table.api.formatter.normal},
-                        {field: 'sign_time', title: __('Sign_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        /*{field: 'sign_type', title: __('Sign_type'), searchList: {"1":__('Sign_type 1'),"2":__('Sign_type 2'),"3":__('Sign_type 3')}, formatter: Table.api.formatter.normal},
+                        {field: 'sign_time', title: __('Sign_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},*/
                         {field: 'wealth', title: __('Wealth')},
                         {field: 'charm', title: __('Charm')},
                         {field: 'gift_num', title: __('Gift_num')},
-                        {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
+                        //{field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'guild.name', title: __('Guild.name'), operate: 'LIKE'},
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},