cad08a2d by simon

默认提交

1 parent 73f51faa
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
10 font-family: Arial; 10 font-family: Arial;
11 font-size: 14px; 11 font-size: 14px;
12 12
13
13 // 日历 14 // 日历
14 .calendar-wrap { 15 .calendar-wrap {
15 16
......
...@@ -18,25 +18,25 @@ export default { ...@@ -18,25 +18,25 @@ export default {
18 props: { 18 props: {
19 type: { 19 type: {
20 type: String, 20 type: String,
21 default() { 21 default () {
22 return "nav"; 22 return "nav";
23 } 23 }
24 }, 24 },
25 dataObj: { 25 dataObj: {
26 type: Object, 26 type: Object,
27 default() { 27 default () {
28 return {}; 28 return {};
29 } 29 }
30 }, 30 },
31 dataList: { 31 dataList: {
32 type: Array, 32 type: Array,
33 default() { 33 default () {
34 return []; 34 return [];
35 } 35 }
36 }, 36 },
37 labelProperty: { 37 labelProperty: {
38 type: String, 38 type: String,
39 default() { 39 default () {
40 return "name"; 40 return "name";
41 } 41 }
42 } 42 }
...@@ -96,6 +96,11 @@ export default { ...@@ -96,6 +96,11 @@ export default {
96 let path = item && item.path || ""; 96 let path = item && item.path || "";
97 this.$root.eventBus.$emit(item.path); 97 this.$root.eventBus.$emit(item.path);
98 if (path) { 98 if (path) {
99 console.log("path:", path);
100 // modify
101 if (path == "/custom/service?q=m5") {
102 path = "/clarms"
103 }
99 this.$router.push({ 104 this.$router.push({
100 path: path 105 path: path
101 }) 106 })
...@@ -125,10 +130,14 @@ export default { ...@@ -125,10 +130,14 @@ export default {
125 if (this.$route.name == "login") { 130 if (this.$route.name == "login") {
126 return; 131 return;
127 } else if (this.$route.name == "register" || this.$route.name == "passwordFind") { 132 } else if (this.$route.name == "register" || this.$route.name == "passwordFind") {
128 this.$router.push({ path: "/login" }); 133 this.$router.push({
134 path: "/login"
135 });
129 } else { 136 } else {
130 let callback = this.$route.fullPath; 137 let callback = this.$route.fullPath;
131 this.$router.push({ path: "/login?callback=" + callback }); 138 this.$router.push({
139 path: "/login?callback=" + callback
140 });
132 } 141 }
133 }, 142 },
134 logoutHandler() { 143 logoutHandler() {
...@@ -152,5 +161,5 @@ export default { ...@@ -152,5 +161,5 @@ export default {
152 return this.dataList[this.activeIndex][this.labelProperty]; 161 return this.dataList[this.activeIndex][this.labelProperty];
153 } 162 }
154 }, 163 },
155 created() { }, 164 created() {},
156 }; 165 };
......
1
2 <template> 1 <template>
3 <div> 2 <div>
4 <div class="navigate"> 3 <div class="navigate">
......