module-menu-vue 0.0.2 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,7 @@
1
1
  {
2
2
  "name": "module-menu-vue",
3
- "version": "0.0.2",
3
+ "version": "0.0.4",
4
+ "description": "城市大数据平台菜单--Vue版",
4
5
  "main": "/index.js",
5
6
  "scripts": {
6
7
  "serve": "vue-cli-service serve",
@@ -4,7 +4,7 @@
4
4
  <div class='menuIcon' @click="showMenuList = !showMenuList">
5
5
  <img class="menuIcon_img" :src="menuIconSrc" />
6
6
  </div>
7
- <div class="menu_title_content">
7
+ <div class="menu_title_content" v-show="collapse">
8
8
  <img class="menu_title_content_img" :src="getLogoAndTitle().logoSrc" alt="logo" />
9
9
  <span class="menu_title">{{getLogoAndTitle().title}}</span>
10
10
  </div>
@@ -49,6 +49,10 @@ export default {
49
49
  type: String,
50
50
  default: 'admin'
51
51
  },
52
+ collapse: {
53
+ type: Boolean,
54
+ default: true,
55
+ }
52
56
  },
53
57
  data () {
54
58
  return {
@@ -2,8 +2,8 @@
2
2
  <div className="right">
3
3
  <el-dropdown v-if="getUserName()" @command="handleClickmenu">
4
4
  <span class="el-dropdown-link">
5
- <img src="../../assets/userLogo.svg" style="vertical-align:middle;padding-right:5px"/>
6
- {{getUserName()}}
5
+ <img src="../../assets/userLogo.svg" style="vertical-align:middle;padding-right:10px"/>
6
+ <span style="color: rgba(0, 0, 0, 0.85);">{{getUserName()}}</span>
7
7
  <i class="el-icon-arrow-down el-icon--right"></i>
8
8
  </span>
9
9
  <el-dropdown-menu slot="dropdown">
@@ -103,5 +103,9 @@ export default {
103
103
  }
104
104
  .el-dropdown-link{
105
105
  font-weight: 600;
106
+ color: rgba(0, 0, 0, 0.85);
107
+ }
108
+ .el-popper{
109
+ margin-top: -2px;
106
110
  }
107
111
  </style>
@@ -3,7 +3,7 @@ import baseCof from './config';
3
3
  import getStore from './userInfo';
4
4
  import { checkToken} from './permessionUtils';
5
5
 
6
- let tokenValue='7f288e2a-deb0-44fe-af72-7345ac8a6784';
6
+ let tokenValue='6c34dfbb-030f-4de1-ac4c-0e215f1fb098';
7
7
 
8
8
  axios.interceptors.response.use(
9
9
  (response) => {
@@ -64,55 +64,27 @@ axios.interceptors.request.use(
64
64
  );
65
65
 
66
66
  function Axios(method, api, params, map) {
67
- // console.log(params)
68
-
69
- let httpDefult;
70
67
  // 几个外部特殊接口
71
68
  // 退出登录
69
+ let httpDefult = {
70
+ method: method,
71
+ params: params,
72
+ ...map,
73
+ }
72
74
  if(api === '/auth/token/logout'){
73
- httpDefult = {
74
- method: method,
75
- url: `${baseCof.baseSever}${api}`,
76
- params: params,
77
- ...map,
78
- };
79
- console.log('httpDefult', httpDefult)
75
+ httpDefult.url = `${baseCof.baseSever}${api}`;
80
76
  } else if (api === '/admin/social/logoutUri') {
81
- httpDefult = {
82
- method: method,
83
- url: api,
84
- params: params,
85
- ...map,
86
- };
87
- }else if(api.search("check_token") !== -1){
88
- httpDefult = {
89
- method: method,
90
- url: `${baseCof.baseSever}${api}`,
91
- params: params,
92
- ...map,
93
- };
94
- }else if (method === 'get') {
95
- httpDefult = {
96
- method: method,
97
- url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
98
- params: params,
99
- ...map,
100
- };
77
+ httpDefult.url = api
78
+ } else if(api.search("check_token") !== -1){
79
+ httpDefult.url = `${baseCof.baseSever}${api}`
80
+ } else if (method === 'get') {
81
+ httpDefult.url = `${baseCof.baseSever}${baseCof.basePath}${api}`
101
82
  } else if (method === 'post') {
102
- httpDefult = {
103
- method: method,
104
- url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
105
- params: params,
106
- ...map,
107
- };
83
+ httpDefult.url = `${baseCof.baseSever}${baseCof.basePath}${api}`
108
84
  } else {
109
- httpDefult = {
110
- method: method,
111
- url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
112
- params: params,
113
- ...map,
114
- };
85
+ httpDefult.url = `${baseCof.baseSever}${baseCof.basePath}${api}`
115
86
  }
87
+ console.log('httpDefult', httpDefult)
116
88
 
117
89
  return new Promise((resolve, reject) => {
118
90
  axios(httpDefult)