后台公会

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个月',

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

@@ -3,13 +3,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Guild_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-guild_id" data-rule="required" data-source="guild/guild/index" class="form-control selectpage" name="row[guild_id]" type="text" value="{$row.guild_id|htmlentities}">
+            <input id="c-guild_id" data-rule="required" disabled data-source="guild/guild/index" class="form-control selectpage" name="row[guild_id]" type="text" value="{$row.guild_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" disabled data-source="user/user/index" data-field="username" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -24,54 +24,9 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_type')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-sign_type" data-rule="required" class="form-control selectpicker" name="row[sign_type]">
-                {foreach name="signTypeList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.sign_type"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
 
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-sign_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_time]" type="text" value="{:$row.sign_time?datetime($row.sign_time):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Wealth')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-wealth" class="form-control" name="row[wealth]" type="number" value="{$row.wealth|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Charm')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-charm" class="form-control" name="row[charm]" type="number" value="{$row.charm|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gift_num')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-gift_num" class="form-control" name="row[gift_num]" type="number" value="{$row.gift_num|htmlentities}">
-        </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">
-            
-            <div class="radio">
-            {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </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">

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

@@ -1,14 +1,5 @@
 <div class="panel panel-default panel-intro">
     
-    <div class="panel-heading">
-        {:build_heading(null,FALSE)}
-        <!--<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>-->
-    </div>
 
 
     <div class="panel-body">
@@ -17,8 +8,8 @@
                 <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-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-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>
 
                         <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>

application/api/controller/Guild.php

@@ -307,15 +307,8 @@ class Guild extends Api
         // 一个身份证号只能申请一次
         $user_id = $this->auth->id;
         // 实名认证
-        $userAuthInfo = \app\common\model\UserAuth::where(["user_id"=>$user_id])->find();
-        if($userAuthInfo) {
-            if($userAuthInfo->status == 0) {
-                $this->error("您的实名认证还在这审核中...，请耐心等待！");
-            } elseif($userAuthInfo->status == 2) {
-                $this->error("您的实名认证审核未通过，请重新审核！");
-            }
-        } else {
-            $this->error("请先申请实名认证！");
+        if($this->auth->is_auth != 2){
+            $this->error("请完成实名认证！");
         }
 
         // 获取用户实名认证信息
@@ -344,7 +337,7 @@ class Guild extends Api
         $data = [];
         $data["user_id"] = $user_id;
         $data["guild_id"] = $guild_id;
-        $data["join_time"] = $join_time;
+        //$data["join_time"] = $join_time;
         $data["user_avatar"] = $userInfo->avatar;
         $data["user_idcard"] = $authUserIdcard;
         $data["user_nickname"] = $userInfo->nickname;

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

@@ -39,7 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 
 
-                        {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}
                     ]
                 ]
             });