From 14bfd534abff2abebc2a2ac0b384b2a937b4da19 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Fri, 5 Jun 2020 15:10:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?baseurl=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/CommonHttp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/CommonHttp.js b/src/services/CommonHttp.js index c9ae297..62d6774 100755 --- a/src/services/CommonHttp.js +++ b/src/services/CommonHttp.js @@ -7,7 +7,7 @@ import commonUtils from '../utils/Common' // http://mf.kiisoo.com:58080/ // axios.defaults.baseURL = 'https://wxtk.bsdits.com/kiisoo-ic/'; axios.defaults.baseURL = - process.env.NODE_ENV === 'production' ? '/kiisoo-ic' : '/kiisoo-ic' + process.env.NODE_ENV === 'production' ? 'https://wxtk.bsdits.com/kiisoo-ic/' : '/kiisoo-ic' //响应时间 axios.defaults.timeout = 120000 From d95810955a2e173fb79bbc4833fcf9aca51188fb Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Fri, 5 Jun 2020 17:03:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 1 - src/pages/Home.vue | 14 ++++++++------ src/pages/user/RoleManager.vue | 8 +++++++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main.js b/src/main.js index 0f8ceaa..a4fcea1 100644 --- a/src/main.js +++ b/src/main.js @@ -14,7 +14,6 @@ Vue.prototype.$axios = axios; Vue.prototype.$qs = QS; Vue.prototype.$moment = moment; Vue.config.productionTip = false; -Vue.prototype.$moment = moment; Vue.prototype._ = _; import echarts from "echarts"; diff --git a/src/pages/Home.vue b/src/pages/Home.vue index 35fa918..4dd8634 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -280,12 +280,14 @@ }, //账户管理页面回调方法 - callBack(item) { - let that = this; - this.selectedMenu = "设置管理"; - this.selectedSubMenu = "账户管理"; - this.selectedItemName = this.onePermissionList[2].subMenuList[0].id; - this.$router.push({path: '/account/manager',query:item}); + callBack(val) { + this.selectedMenu = val.selectedMenu; + this.selectedSubMenu = val.selectedSubMenu; + if(val.type == 1){ + this.selectedItemName = this.onePermissionList[2].subMenuList[0].id; + this.$router.push({path: '/account/manager',query:val.data}); + } + }, setHeader(data){ let that = this; diff --git a/src/pages/user/RoleManager.vue b/src/pages/user/RoleManager.vue index 6e01101..2d82b83 100644 --- a/src/pages/user/RoleManager.vue +++ b/src/pages/user/RoleManager.vue @@ -367,7 +367,13 @@ goToAccManagerPage: function (item) { // this.$router.push({path: '/account/manager',query:item}); // 回调首页更新菜单栏选择 - this.bus.$emit("callBack",item); + let request = { + selectedMenu: "设置管理", + selectedSubMenu: "账户管理", + data: item, + type: 1 + }; + this.bus.$emit("callBack",request); }, //选中角色 selectRole: function (id) { From a227dc1a6934c441749f44f983164a5640b7a374 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Fri, 5 Jun 2020 17:20:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Home.vue | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/pages/Home.vue b/src/pages/Home.vue index 4dd8634..1764684 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -283,9 +283,24 @@ callBack(val) { this.selectedMenu = val.selectedMenu; this.selectedSubMenu = val.selectedSubMenu; - if(val.type == 1){ - this.selectedItemName = this.onePermissionList[2].subMenuList[0].id; - this.$router.push({path: '/account/manager',query:val.data}); + + let url = ""; + for (let i = 0; i < this.onePermissionList.length; i++) { + let item = this.onePermissionList[i]; + for (let k = 0; k < item.subMenuList.length; k++) { + let cItem = item.subMenuList[k]; + if(cItem.name === val.selectedSubMenu){ + this.selectedItemName = cItem.id; + url = cItem.resource; + + } + } + } + + if(val.type === 1){ + this.$router.push({path: url,query:val.data}); + }else{ + this.$router.push(url); } }, From aa1baa82d8c2950a38366847269c6abe2c8e0c4f Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Fri, 5 Jun 2020 17:36:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/activity/useTable.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/pages/activity/useTable.vue b/src/pages/activity/useTable.vue index ea43047..fc91527 100644 --- a/src/pages/activity/useTable.vue +++ b/src/pages/activity/useTable.vue @@ -157,10 +157,18 @@ export default { ActivityManager.saveActivityData(store.getters.useData, function(data) { store.commit("RSET_useData"); that.$emit("doShow", false); - that.$router.push("/activity/plan"); + // that.$router.push("/activity/plan"); that.currentStep = 0; that.modal_loading = false; that.showUse = false; + + let request = { + selectedMenu: "活动管理", + selectedSubMenu: "活动计划", + data: {}, + type: 2 + }; + that.bus.$emit("callBack",request); }); } } From 3594ca128891a092d374b291af9a986580e5e9c0 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Fri, 5 Jun 2020 17:41:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/activity/useActivityStepOne.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/activity/useActivityStepOne.vue b/src/pages/activity/useActivityStepOne.vue index 2556159..dc78059 100644 --- a/src/pages/activity/useActivityStepOne.vue +++ b/src/pages/activity/useActivityStepOne.vue @@ -175,7 +175,8 @@ export default { .text { position: relative; - left: 100px; + left: 50px; + line-height: 44px; } .inputClass {