房间列表/创建调整

application/admin/controller/user/User.php

@@ -134,4 +134,46 @@ class User extends Backend
         $this->view->assign("row", $row);
         return $this->view->fetch();
     }
+
+    /**
+     * 编辑
+     */
+    public function infoCheck($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds)) {
+            if (!in_array($row[$this->dataLimitField], $adminIds)) {
+                $this->error(__('You have no permission'));
+            }
+        }
+        if ($this->request->isPost()) {
+            $params = $this->request->post("row/a");
+            if (!$params) {
+                $this->error(__('Parameter %s can not be empty', ''));
+            }
+            $params = $this->preExcludeFields($params);
+            $result = false;
+            try {
+                //是否采用模型验证
+                if ($this->modelValidate) {
+                    $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                    $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
+                    $row->validateFailException(true)->validate($validate);
+                }
+                $result = $row->allowField(true)->save($params);
+            } catch (ValidateException|PDOException|Exception $e) {
+                $this->error($e->getMessage());
+            }
+            if ($result == false) {
+                $this->error(__('No rows were updated'));
+            }
+            $this->success();
+        }
+        $this->view->assign("row", $row);
+        return $this->view->fetch();
+    }
 }

application/admin/view/user/user/info_check.html

@@ -0,0 +1,57 @@
+<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}">
+    <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" disabled class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">
+        </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-pre_nickname" class="form-control" name="row[pre_nickname]" type="text" value="{$row.pre_nickname|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</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}">
+                <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="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-pre_avatar" data-rule="" class="form-control" size="50" name="row[pre_avatar]" type="text" value="{$row.pre_avatar}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-pre_avatar" class="btn btn-danger faupload" data-input-id="c-pre_avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-pre_avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-pre_avatar" class="btn btn-primary fachoose" data-input-id="c-pre_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-pre_avatar"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-pre_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')], $row['status'])}
+        </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>

application/api/controller/Party.php

@@ -63,7 +63,7 @@ class Party extends Common
 
         if($room_type == 1) {
             // 2。开厅申请
-            $authInfo = \app\common\model\Guild::where(["user_id"=>$user_id])->order('id desc')->find();
+            $authInfo = model('Guild')->where(["user_id"=>$user_id])->order('id desc')->find();
             if($authInfo) {
                 if($authInfo->status == 0) {
                     $this->error("您的家族申请还在这审核中...，请耐心等待！");
@@ -168,8 +168,8 @@ class Party extends Common
                 \app\common\model\User::update(["is_guild" => 3,'guild_id'], ["id" => $user_id]);*/
                 //更新家族 party_id
                 $guildWhere['id'] = $user_id;
-                $guildWhere['status'] = ['in',[0,1]];
-                $guild = model('Guild')->where($guildWhere)->find();
+                $guildWhere['status'] = 1;
+                $guild = model('Guild')->where($guildWhere)->order('id desc')->find();
                 if (!empty($guild)) {
                     model('Guild')->where($guildWhere)->update(['party_id'=>$partyInfo['id']]);
                 }

application/common/service/RoomService.php

@@ -158,6 +158,7 @@ class RoomService
                         ];
                         $redisPartyInfo[] = [
                             "id" => $foreachData["id"],
+                            "room_type" => $v['room_type'],
                             "party_id" => $foreachData["party_id"],
                             "r_id" => $foreachData["party_id"],
                             "party_name" => $foreachData["party_name"],

public/assets/js/backend/user/user.js

@@ -72,7 +72,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     classname: 'btn btn-xs btn-primary btn-dialog',
                                     icon: 'fa fa-list',
                                     url: 'user/user/detail',
-                                },
+                                }, /*{
+                                    name: 'info_check',
+                                    title: __('信息审核'),
+                                    classname: 'btn btn-xs btn-warning btn-dialog',
+                                    icon: 'fa fa-bars',
+                                    url: 'user/user/infoCheck',
+                                    visible: function (row) {
+                                        if ((row.pre_nickname != '' && row.pre_nickname != row.nickname) || (row.pre_avatar != '' && row.pre_avatar != row.avatar)) {
+                                            return true;
+                                        } else  {
+                                            return false;
+                                        }
+                                    }
+                                },*/
                             ], table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate
                         }
                     ]