ss 1 year ago
parent
commit
9ac8dbdec0

+ 8 - 14
application/admin/controller/Index.php

@@ -205,13 +205,7 @@ class Index extends Auth
 
 
         $id = 500;
-        $userEndMenu = [];
-        foreach ($menus as $k=>$v){
-            if($v['id'] == $id){
-                $userEndMenu = $v['child'];
-                break;
-            }
-        }
+        $userEndMenu = Db::name('menu')->where('pid',$id)->where('enable',1)->where('del',0)->select();
 
         $threeMenu = model('Menu')->getMenuTree1($this->rolesId,$this->orgId,'');
 
@@ -1221,16 +1215,16 @@ class Index extends Auth
 
     public function searchMenu(){
         $menuName = input('menu_name');
-        $list = model('Menu')->getMenuTree1($this->rolesId,$this->orgId,$menuName);
 
-        $tlist = [];
-        foreach ($list as $k=>$v){
-            if($v['url']){
-                $tlist[] = $v;
-            }
+        if($menuName){
+            $map[] = ['title','like','%'.$menuName.'%'];
         }
+        $map[] = ['del','=',0];
+        $map[] = ['enable','=',1];
+        $map[] = ['pid','=',500];
+        $list = Db::name('menu')->where($map)->select();
 
-        $this->success('','',$tlist);
+        $this->success('','',$list);
     }
     public function indexsub(){
         $curmenu = input('curmenu',500);

+ 14 - 1
application/admin/view/index/def.html

@@ -106,7 +106,8 @@
                 curGroupId:0,
                 editurl:'',
                 delurl:'',
-                defMenuName:''
+                defMenuName:'',
+                loading:true,
             }
         },
         watch: {
@@ -182,6 +183,18 @@
 
                     this.menuList = newMenuList;
 
+                }else{
+
+                    this.cyList = cys;
+                    let curGroupId = this.curGroupId;
+                    let newMenus = [];
+                    this.menuList = [];
+                    usermenus.forEach((item) => {
+                        if(curGroupId == item.id){
+                            newMenus = item.menus;
+                        }
+                    });
+                    this.menuList = newMenus;
                 }
             },
 

+ 13 - 9
application/admin/view/index/index.html

@@ -236,19 +236,19 @@
                                 {if $download}
                                 <div class="swiper-slide">
                                     <div class="qrcode-title">APP下二维码</div>
-                                    <img src="{$download}">
+                                    <img src="{:url('Qrcode/qrcode',['code'=>$download,'type'=>1])}" alt="APP下载二维码">
                                 </div>
                                 {/if}
                                 {if $wxcode}
                                 <div class="swiper-slide">
                                     <div class="qrcode-title">小程序二维码</div>
-                                    <img src="{$wxcode}">
+                                    <img src="{$wxcode}" alt="小程序二维码">
                                 </div>
                                 {/if}
                                 {if $phcode}
                                 <div class="swiper-slide">
                                     <div class="qrcode-title">陪护二维码</div>
-                                    <img src="{$phcode}">
+                                    <img src="{:url('Qrcode/qrcode',['code'=>$phcode,'type'=>1])}" alt="陪护客户端二维码">
                                 </div>
                                 {/if}
 
@@ -264,7 +264,11 @@
                         <div class="row">
                             <div class="col-xs-5" style="padding: 0 5px!important;">
                                 <div class="loginuserbox">
-                                    <img src="" alt="">
+                                    {empty name="userInfo['head_image']"}
+                                    <img src="/img/defaulthead.png"  style="" alt="">
+                                    {else /}
+                                    <img src="{$userInfo['head_image']}"  alt="">
+                                    {/empty}
                                     <div class="loginusername">
                                         <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:;">欢迎,{:session('user_auth.real_name')} </a>
                                         <ul class="dropdown-menu animated fadeInRight m-t-xs">
@@ -281,7 +285,7 @@
                                         <a href="{if $fixedModuleAuth ==1} {:url('index/indexsub',['curmenu'=>$fixedModule['id']])} {else /}javascript:void(0){/if}">
                                             <div class="menu-info-box">
                                                 <div class="menu-icon">
-                                                    <img src="{$fixedModule.url}" alt="">
+                                                    <img src="{$fixedModule.img}" alt="">
                                                 </div>
                                                 <div class="menu-name">
                                                     <div class="title">{$fixedModule.title}</div>
@@ -296,7 +300,7 @@
                                         <a href="{if $fixedModuleAuth1 ==1} {:url('index/indexsub',['curmenu'=>$fixedModule1['id']])} {else /}javascript:void(0){/if}">
                                             <div class="menu-info-box">
                                                 <div class="menu-icon">
-                                                    <img src="{$fixedModule1.url}" alt="">
+                                                    <img src="{$fixedModule1.img}" alt="">
                                                 </div>
                                                 <div class="menu-name">
                                                     <div class="title">{$fixedModule1.title}</div>
@@ -313,7 +317,7 @@
                                         <a href="{if $fixedModuleAuth2 ==1} {:url('index/indexsub',['curmenu'=>$fixedModule2['id']])} {else /}javascript:void(0){/if}">
                                             <div class="menu-info-box">
                                                 <div class="menu-icon">
-                                                    <img src="{$fixedModule2.url}" alt="">
+                                                    <img src="{$fixedModule2.img}" alt="">
                                                 </div>
                                                 <div class="menu-name">
                                                     <div class="title">{$fixedModule2.title}</div>
@@ -326,7 +330,7 @@
                                         <a href="{if $fixedModuleAuth3 ==1} {:url('index/indexsub',['curmenu'=>$fixedModule3['id']])} {else /}javascript:void(0){/if}">
                                             <div class="menu-info-box">
                                                 <div class="menu-icon">
-                                                    <img src="{$fixedModule3.url}" alt="">
+                                                    <img src="{$fixedModule3.img}" alt="">
                                                 </div>
                                                 <div class="menu-name">
                                                     <div class="title">{$fixedModule3.title}</div>
@@ -339,7 +343,7 @@
                                         <a href="{if $fixedModuleAuth4 ==1} {:url('index/indexsub',['curmenu'=>$fixedModule4['id']])} {else /}javascript:void(0){/if}">
                                             <div class="menu-info-box">
                                                 <div class="menu-icon">
-                                                    <img src="{$fixedModule4.url}" alt="">
+                                                    <img src="{$fixedModule4.img}" alt="">
                                                 </div>
                                                 <div class="menu-name">
                                                     <div class="title">{$fixedModule4.title}</div>

+ 5 - 1
application/admin/view/index/indexsub.html

@@ -180,7 +180,11 @@
         </div>
 
         <ul class="nav navbar-top-links navbar-right" style="height: 70px">
-            <img src="{$userInfo.head_image}" alt="" class="userhead">
+            {empty name="userInfo['head_image']"}
+            <img src="/img/defaulthead.png" class="userhead" style="" alt="">
+            {else /}
+            <img src="{$userInfo['head_image']}" class="userhead"  alt="">
+            {/empty}
             <li class="dropdown" style="height: 100%">
                 <!-- {if ($isDispatch == 1)}
                  <a href="javascript:;" id="goOrder" url="{:url('Index/ordersList')}?mode=0&order_mode=1"  onclick="layer_open_dispatch(this,2)" class="glyphicon glyphicon-bell">

+ 5 - 1
application/admin/view/index/indexsub1.html

@@ -180,7 +180,11 @@
         </div>
 
         <ul class="nav navbar-top-links navbar-right" style="height: 70px">
-            <img src="{$userInfo.head_image}" alt="" class="userhead">
+            {empty name="userInfo['head_image']"}
+            <img src="/img/defaulthead.png" class="userhead" style="" alt="">
+            {else /}
+            <img src="{$userInfo['head_image']}" class="userhead"  alt="">
+            {/empty}
             <li class="dropdown" style="height: 100%">
                 <!-- {if ($isDispatch == 1)}
                  <a href="javascript:;" id="goOrder" url="{:url('Index/ordersList')}?mode=0&order_mode=1"  onclick="layer_open_dispatch(this,2)" class="glyphicon glyphicon-bell">