asd26269546 2 жил өмнө
parent
commit
41fedb9d62

+ 1 - 1
src/components/main/components/side-menu/collapsed-menu.vue

@@ -4,7 +4,7 @@
     <DropdownMenu ref="dropdown" slot="list">
       <template v-for="child in children">
         <collapsed-menu v-if="showChildren(child)" :icon-size="iconSize" :parent-item="child" :key="`drop-${child.name}`"></collapsed-menu>
-        <DropdownItem v-else :key="`drop-${child.name}`" :name="child.name"><common-icon :size="iconSize" :type="child.icon"/><span class="menu-title">{{ showTitle(child) }}</span></DropdownItem>
+        <DropdownItem v-else :key="`drop-${child.name}`" :name="child.name"><common-icon :size="iconSize" :type="child.icon"/><span class="menu-title">{{ child.name }}</span></DropdownItem>
       </template>
     </DropdownMenu>
   </Dropdown>

+ 15 - 10
src/components/main/components/side-menu/side-menu.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="side-menu-wrapper">
 		<slot></slot>
-		<Menu theme="dark"  v-show="!collapsed" width="auto" active-name="1">
+		<Menu theme="dark"  v-show="!collapsed" width="auto" active-name="1"  @on-select="handleSelect">
 			<div v-for="i in menuList" :key="i.id">
 				<MenuItem :name="i.id" v-if="!i.children || i.children.length == 0">
 					<Icon type="ios-paper" />
@@ -36,14 +36,17 @@
         </template>
       </template>
     </Menu> -->
-		<!-- <div class="menu-collapsed" v-show="collapsed" :list="menuList">
-      <template v-for="item in menuList">
-        <collapsed-menu v-if="item.children && item.children.length > 1" @on-click="handleSelect" hide-title :root-icon-size="rootIconSize" :icon-size="iconSize" :theme="theme" :parent-item="item" :key="`drop-menu-${item.name}`"></collapsed-menu>
-        <Tooltip transfer v-else :content="showTitle(item.children && item.children[0] ? item.children[0] : item)" placement="right" :key="`drop-menu-${item.name}`">
-          <a @click="handleSelect(getNameOrHref(item, true))" class="drop-menu-a" :style="{textAlign: 'center'}"><common-icon :size="rootIconSize" :color="textColor" :type="item.icon || (item.children[0] && (item.children[0].icon || ''))"/></a>
-        </Tooltip>
-      </template>
-    </div> -->
+		<div class="menu-collapsed" v-show="collapsed" :list="menuList">
+			<div  v-for="item in menuList" :key="item.id">
+				<template>
+					<collapsed-menu v-if="item.children && item.children.length > 1" @on-click="handleSelect" hide-title :root-icon-size="rootIconSize" :icon-size="iconSize" :theme="theme" :parent-item="item" :key="`drop-menu-${item.name}`"></collapsed-menu>
+					<Tooltip transfer v-else :content="item.name" placement="right" :key="`drop-menu-${item.name}`">
+					<a @click="handleSelect(getNameOrHref(item, true))" class="drop-menu-a" :style="{textAlign: 'center'}">123</a>
+					</Tooltip>
+				</template>
+			</div>
+			
+		</div>
 	</div>
 </template>
 <script>
@@ -97,7 +100,9 @@ export default {
 		}
 	},
 	methods: {
-		handleSelect(name) {
+		handleSelect(name) { 
+			console.log(name)
+			return
 			this.$emit('on-select', name)
 		},
 		getOpenedNamesByActiveName(name) {

+ 1 - 1
src/components/main/main.vue

@@ -176,7 +176,7 @@ export default {
     ]),
     getMenu(){
       this.$get('/api/blade-system/menu/routes').then((res) => {
-        this.menuList = res.data
+        this.menuList = res.data[2].children
         console.log(res)
   
       })

+ 1 - 0
src/libs/http.js

@@ -8,6 +8,7 @@ axios.interceptors.request.use(
     config => {
         // const token = getCookie('名称');注意使用的时候需要引入cookie方法,推荐js-cookie
         var userJson = window.localStorage.getItem("token")
+        console.log(userJson)
         if(!userJson){
             var userData = false
             var token;