Browse Source

一些功能

Kirin 4 years ago
parent
commit
be97b16728

+ 1 - 1
app/admin/controller/setting/SystemAdmin.php

@@ -177,7 +177,7 @@ class SystemAdmin extends AuthController
         $adminInfo = $this->adminInfo;//获取当前登录的管理员
         $adminInfo = $this->adminInfo;//获取当前登录的管理员
         $this->assign('adminInfo', $adminInfo);
         $this->assign('adminInfo', $adminInfo);
         $front = User::where('admin_id', $adminInfo['id'])->find();
         $front = User::where('admin_id', $adminInfo['id'])->find();
-        $this->assign('front', $front ? ($front['nickname'] . '|' . $front['uid']) : '');
+//        $this->assign('front', $front ? ($front['nickname'] . '|' . $front['uid']) : '');
         return $this->fetch();
         return $this->fetch();
     }
     }
 
 

+ 3 - 0
app/admin/model/system/SystemAdmin.php

@@ -6,6 +6,7 @@
 
 
 namespace app\admin\model\system;
 namespace app\admin\model\system;
 
 
+use app\admin\model\user\User;
 use crmeb\traits\ModelTrait;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
 use crmeb\basic\BaseModel;
 use think\facade\Session;
 use think\facade\Session;
@@ -169,6 +170,8 @@ class SystemAdmin extends BaseModel
         $model = $model->where('level', $where['level'])->where('is_del', 0);
         $model = $model->where('level', $where['level'])->where('is_del', 0);
         return self::page($model, function ($admin) {
         return self::page($model, function ($admin) {
             $admin->roles = SystemRole::where('id', 'IN', $admin->roles)->column('role_name', 'id');
             $admin->roles = SystemRole::where('id', 'IN', $admin->roles)->column('role_name', 'id');
+            $front = User::where('admin_id', $admin->id)->find();
+            $admin->front = $front ? ($front['nickname'] . '|' . $front['uid']) : '';
         }, $where);
         }, $where);
     }
     }
 }
 }

+ 1 - 23
app/admin/view/setting/system_admin/admin_info.php

@@ -36,7 +36,7 @@
                         <div class="col-sm-10">
                         <div class="col-sm-10">
                             <div class="row">
                             <div class="row">
                                 <div class="col-md-6">
                                 <div class="col-md-6">
-                                    <input type="text" class="form-control" name="account" value="{$adminInfo.account}" validate=""/>
+                                    <input type="text" class="form-control" name="account" value="{$adminInfo.account}" validate="" disabled/>
                                 </div>
                                 </div>
                             </div>
                             </div>
                         </div>
                         </div>
@@ -91,14 +91,6 @@
                             <button class="btn btn-primary add" type="button">提交</button>
                             <button class="btn btn-primary add" type="button">提交</button>
                         </div>
                         </div>
                     </div>
                     </div>
-                    {if condition="$front"}
-                    前台账户:{$front}
-                    <div class="form-group" style="text-align: center;">
-                        <div class="col-sm-4 col-sm-offset-2">
-                            <button class="btn btn-primary unbind" type="button">解绑</button>
-                        </div>
-                    </div>
-                    {/if}
                 </form>
                 </form>
             </div>
             </div>
 
 
@@ -135,19 +127,5 @@
                 }
                 }
             })
             })
     })
     })
-    $('.unbind').on('click',function (e) {
-        var url=layList.U({c:'setting.system_admin',a:'unbind',q:{id:data.id}});
-        $eb.$swal('delete',function(){
-            $eb.axios.get(url).then(function(res){
-                if(res.status == 200 && res.data.code == 200) {
-                    $eb.$swal('success',res.data.msg);
-                    obj.del();
-                }else
-                    return Promise.reject(res.data.msg || '解绑失败')
-            }).catch(function(err){
-                $eb.$swal('error',err);
-            });
-        })
-    })
 </script>
 </script>
 {/block}
 {/block}

+ 4 - 1
app/admin/view/setting/system_admin/index.php

@@ -56,6 +56,7 @@
                             <th class="text-center">最后一次登陆时间</th>
                             <th class="text-center">最后一次登陆时间</th>
                             <th class="text-center">最后一次登陆ip</th>
                             <th class="text-center">最后一次登陆ip</th>
                             <th class="text-center">开启</th>
                             <th class="text-center">开启</th>
+                            <th class="text-center">前台账户</th>
                             <th class="text-center">操作</th>
                             <th class="text-center">操作</th>
                         </tr>
                         </tr>
                         </thead>
                         </thead>
@@ -80,7 +81,9 @@
                             <td class="text-center">
                             <td class="text-center">
                                 <i class="fa {eq name='vo.status' value='1'}fa-check text-navy{else/}fa-close text-danger{/eq}"></i>
                                 <i class="fa {eq name='vo.status' value='1'}fa-check text-navy{else/}fa-close text-danger{/eq}"></i>
                             </td>
                             </td>
-
+                            <td class="text-center">
+                                {$vo.front}
+                            </td>
                             <td class="text-center">
                             <td class="text-center">
                                 <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('编辑','{:Url('edit',array('id'=>$vo['id']))}')"><i class="fa fa-edit"></i> 编辑</button>
                                 <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('编辑','{:Url('edit',array('id'=>$vo['id']))}')"><i class="fa fa-edit"></i> 编辑</button>
                                 <button class="btn btn-danger btn-xs" data-url="{:Url('delete',array('id'=>$vo['id']))}" type="button"><i class="fa fa-times"></i> 删除
                                 <button class="btn btn-danger btn-xs" data-url="{:Url('delete',array('id'=>$vo['id']))}" type="button"><i class="fa fa-times"></i> 删除