用户隐身相关调整

application/admin/controller/user/User.php

@@ -37,6 +37,7 @@ class User extends Backend
             'genderList' => $this->model->getGenderList(),
             'isCoolList' => $this->model->getIsCoolList(),
             'isManagerList' => $this->model->getIsManagerList(),
+            'isStealthList' => $this->model->getIsStealthList(),
         ];
         $this->view->assign($typeList);
         $this->assignconfig($typeList);

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

@@ -49,6 +49,9 @@ return [
     'Is_manager'                                  => '管理员',
     'Is_manager 0'                                => '否',
     'Is_manager 1'                                => '是',
+    'Is_stealth'                                  => '隐身',
+    'Is_stealth 0'                                => '否',
+    'Is_stealth 1'                                => '是',
     'Status'                                      => '状态',
     'Leave password blank if dont want to change' => '不修改密码请留空',
 ];

application/admin/model/User.php

@@ -21,6 +21,7 @@ class User extends Model
         'logintime_text',
         'is_cool_text',
         'is_manager_text',
+        'is_stealth_text',
     ];
 
     public function getOriginData()
@@ -127,6 +128,18 @@ class User extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
+    public function getIsStealthList()
+    {
+        return ['0' =>__('Is_stealth 0'), '1' =>__('Is_stealth 1')];
+    }
+
+    public function getIsStealthTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['is_stealth']) ? $data['is_stealth'] : '');
+        $list = $this->getIsStealthList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
     public function noble()
     {
         return $this->belongsTo('app\admin\model\noble\Level', 'noble', 'id', [], 'LEFT')->setEagerlyType(0);

application/admin/view/user/user/add.html

@@ -53,6 +53,16 @@
             </select>
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_stealth')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <select id="c-is_stealth" data-rule="required" class="form-control selectpicker" name="row[is_stealth]">
+                {foreach name="isStealthList" item="vo"}
+                <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+        </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/user/user/edit.html

@@ -54,6 +54,16 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_stealth')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <select id="c-is_stealth" data-rule="required" class="form-control selectpicker" name="row[is_stealth]">
+                {foreach name="isStealthList" item="vo"}
+                <option value="{$key}" {in name="key" value="$row.is_stealth"}selected{/in}>{$vo}</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'), '0'=>__('Female')], $row['gender'])}

application/api/controller/Party.php

@@ -583,7 +583,7 @@ class Party extends Common
         if($res) $user_ids = array_values($res);
         // 获取用户列表信息
         if($user_ids){
-            $userList = \app\common\model\User::field("id,avatar,nickname,level,gender")->where(["id"=>["in",$user_ids],'is_manager'=>0])->limit($pageStart,$pageNum)->select();
+            $userList = \app\common\model\User::field("id,avatar,nickname,level,gender")->where(["id"=>["in",$user_ids],'is_stealth'=>0])->limit($pageStart,$pageNum)->select();
         }
 
         $this->success("获取成功！",$userList);

application/api/controller/Usercenter.php

@@ -47,7 +47,7 @@ class UserCenter extends Common
         $where = [];
         $where["id"] = $user_id;
         $userInfo = $this->userModel->field("id,nickname,pre_nickname,image,mobile,avatar,pre_avatar,gender,money,age,u_id,level,jewel,
-        age_id,constellation_id,province_id,city_id,desc,ipaddress,is_cool,is_manager")->where($where)->find();
+        age_id,constellation_id,province_id,city_id,desc,ipaddress,is_cool,is_manager,is_stealth")->where($where)->find();
         $userInfo['nickname_status'] = $userInfo['avatar_status'] = 0;
         if (!empty($userInfo['pre_nickname']) && $userInfo['pre_nickname'] != $userInfo['nickname']) {
             $userInfo['nickname_status'] = 1;

application/common/library/Auth.php

@@ -492,7 +492,7 @@ class Auth
                 $v["type"] == 4 && $userandroidpop = $v["android_image"];
             }
         }
-        $userField = 'id,pay_password,openid,is_cool,is_manager,nickname,pre_nickname,avatar,pre_avatar';
+        $userField = 'id,pay_password,openid,is_cool,is_manager,is_stealth,nickname,pre_nickname,avatar,pre_avatar';
         $user = model('User')->field($userField)->where(["id" => $this->_user->id])->with(['useralipay','userbank'])->find();
         // 获取我的推荐人的邀请码
         $preUserField = 'id,invite_no';
@@ -523,6 +523,7 @@ class Auth
         $userinfo['bind_bank'] = !empty($userBank) ? 1 : 0;
         $userinfo['is_cool'] = isset($user['is_cool']) ? $user['is_cool'] : 0;
         $userinfo['is_manager'] = isset($user['is_manager']) ? $user['is_manager'] : 0;
+        $userinfo['is_stealth'] = isset($user['is_stealth']) ? $user['is_stealth'] : 0;
         //家族信息
         $guildField = 'g.id,g.g_id,g.user_id,g.party_id,g.name,g.image,g.desc,g.member,g.status';
         $guildWhere['gm.user_id'] = $this->_user->id;

application/common/service/RoomService.php

@@ -220,7 +220,7 @@ class RoomService
             $userIds = $this->redis->zRange("party_user_".$partyId,0,-1);
             $field = 'id,avatar,nickname';
             $userWhere['id'] = ['in', $userIds];
-            $userWhere['is_manager'] = 0;
+            $userWhere['is_stealth'] = 0;
             $userModel = new \app\common\model\User();
             $userData = $userModel->field($field)->where($userWhere)->select();
             $userDatas = [];

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

@@ -62,6 +62,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'constellation.name', title: __('Constellation_id'), operate: false},
                         {field: 'is_cool', title: __('Is_cool'), searchList:Config.isCoolList, formatter: Table.api.formatter.status},
                         {field: 'is_manager', title: __('Is_manager'), searchList:Config.isManagerList, formatter: Table.api.formatter.status},
+                        {field: 'is_stealth', title: __('Is_stealth'), searchList:Config.isStealthList, formatter: Table.api.formatter.status},
                         {field: 'logintime', title: __('Logintime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         {field: 'loginip', title: __('Loginip'), formatter: Table.api.formatter.search},
                         {field: 'createtime', title: __('Jointime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},