diff --git a/src/components/menu.vue b/src/components/menu.vue index 5ab2356b0719ec5bb2814e5002638b7f6f7f4dbf..0ef140a4009c7c3b992a48a3b5d338137a07d8ff 100644 --- a/src/components/menu.vue +++ b/src/components/menu.vue @@ -132,7 +132,7 @@ export default { user_arr: [ { name: "个人档案", path: "/user/user_info" }, { name: "消息通知", path: "/user/message" }, - { name: "收银中心", path: "" }, + { name: "收银中心", path: "/authority" }, { name: "关于BD-aPaaS", path: "" }, { name: "退出登录", path: "" } ], @@ -194,6 +194,9 @@ export default { if (v.path) { if (v.path == "/fwgl/" || v.path == "/yygl/") { this.$router.push(v.path + this.$store.state.role); + } else if (parent == 2) { + this.$router.push(v.path); + this.$store.commit("serviceShopMenuAct", v.path); } else { this.$router.push(v.path); } diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue index e8007aace4de2d4b0c5b6b5e99242dae6ffe9504..485a385185d865f17f263ac47cc9a8c8ac32b621 100644 --- a/src/components/order-list/order-list-cell.vue +++ b/src/components/order-list/order-list-cell.vue @@ -1,9 +1,9 @@ \ No newline at end of file diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue index 3ac03d08c4f2196562de58e5c0a729e8457d7951..b6f88b04f9b99137bddc6e89cb2fdcb8af505e55 100644 --- a/src/pages/workbench/fwzc_fwcs.vue +++ b/src/pages/workbench/fwzc_fwcs.vue @@ -944,4 +944,13 @@ export default { .fwcs_tabs .el-tabs__header { margin: 20px 0; } +.zhyy_select .el-input__prefix, .el-input__suffix { + position: absolute; + top: 0; + right: 10px; + -webkit-transition: all .3s; + height: 100%; + color: #C0C4CC; + text-align: right; +} diff --git a/src/request/http.js b/src/request/http.js index 0598ab2f45e83921dde96404903f14c8966c9a2f..10ebfc56914fe30acf6ad4f69d8a12602cda60d1 100644 --- a/src/request/http.js +++ b/src/request/http.js @@ -48,13 +48,13 @@ const errorHandle = (status, other) => { }, 1000); break; case 404: tip('请求的资源不存在'); break; - case 408: tip('请求超时(408)'); - case 500: tip('服务器错误(500)'); - case 501: tip('服务未实现(501)'); - case 502: tip('网络错误(502)'); - case 503: tip('服务不可用(503)'); - case 504: tip('网络超时(504)'); - case 505: tip('HTTP版本不受支持(505)'); + case 408: tip('请求超时(408)'); break; + case 500: tip('服务器错误(500)'); break; + case 501: tip('服务未实现(501)'); break; + case 502: tip('网络错误(502)'); break; + case 503: tip('服务不可用(503)'); break; + case 504: tip('网络超时(504)'); break; + case 505: tip('HTTP版本不受支持(505)'); break; default: tip(`连接出错,${other}`); } } diff --git a/src/store/index.js b/src/store/index.js index 1cea098136128e96b79f3156eee7c13dc6c724cf..41414d74817ecf1a7e9e7141940c0849b63db98f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -5,7 +5,7 @@ Vue.use(Vuex); const store = new Vuex.Store({ state: { role: 2, // 0:普通用户,1:组织管理员,2:超级管理员 - serviceShopMenu: "shopDataList", // 服务超市侧边栏 + serviceShopMenu: "/shop/data_service_list", // 服务超市侧边栏 fwglNav: [ ["注册发布的服务", "申请的服务", "云资源服务"], // 普通用户 ["组织服务管理", "服务审批管理", "云资源管理"], // 组织管理员