diff --git a/src/components/e-charts/starlist.vue b/src/components/e-charts/starlist.vue
new file mode 100644
index 0000000000000000000000000000000000000000..57f83de19f7075fac0eeef6e805090b29ec57259
--- /dev/null
+++ b/src/components/e-charts/starlist.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/e-charts/toplist.vue b/src/components/e-charts/toplist.vue
new file mode 100644
index 0000000000000000000000000000000000000000..969822e37070491b2f5093569594162ff390c38a
--- /dev/null
+++ b/src/components/e-charts/toplist.vue
@@ -0,0 +1,142 @@
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ {{ option.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/block-radius.vue b/src/components/general/block-radius.vue
similarity index 100%
rename from src/components/block-radius.vue
rename to src/components/general/block-radius.vue
diff --git a/src/components/codes.vue b/src/components/general/codes.vue
similarity index 100%
rename from src/components/codes.vue
rename to src/components/general/codes.vue
diff --git a/src/components/cropper.vue b/src/components/general/cropper.vue
similarity index 100%
rename from src/components/cropper.vue
rename to src/components/general/cropper.vue
diff --git a/src/components/upload_file.vue b/src/components/general/upload_file.vue
similarity index 98%
rename from src/components/upload_file.vue
rename to src/components/general/upload_file.vue
index 7d4e96bb558b98ab7e317b866d1a9ff9151ab530..fb54bd2d1a7f0f8abb78448fd8d3f7eba4b82249 100644
--- a/src/components/upload_file.vue
+++ b/src/components/general/upload_file.vue
@@ -35,7 +35,7 @@
+
+
\ No newline at end of file
diff --git a/src/components/menu.vue b/src/components/menu.vue
index 1da649c10548c9181783ef66dc708717d2c7acff..1dc6c4f979336683cc4686ca59841b7796adcc23 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -78,19 +78,19 @@
v-for="(item, index) in menu_arr"
:key="index + 200"
class="menu_box user_hover"
- @click="navAction(index, item.visit_url)"
- :style="{ color: now_menu == index ? '#fff' : '' }"
+ @click="navAction(item.visit_url)"
+ :style="{ color: now_menu == item.visit_url ? '#fff' : '' }"
>
{{ item.menu_name }}
-
+
@@ -101,7 +101,7 @@ export default {
data() {
return {
menu_arr: [],
- now_menu: 2,
+ now_menu: "",
user_arr: [
{ name: "个人档案", path: "/user/user_info" },
{ name: "消息通知", path: "/user/message" },
@@ -155,23 +155,23 @@ export default {
// at here, we will goto shopping cart
this.$router.push({ name: "shoppingCart" });
},
- navAction(index, path) {
+ navAction(path) {
this.$router.push(path);
- this.now_menu = index;
- window.sessionStorage.setItem("menuIndex", index);
+ this.now_menu = path;
+ window.sessionStorage.setItem("menuVisitUrl", path);
},
gotoChildPage(v, parent) {
if (v.visit_url) {
if (v.visit_url == "/fwgl/" || v.visit_url == "/yygl/") {
this.$router.push(v.visit_url + this.$store.getters.level);
- } else if (parent == 2) {
+ } else if (parent == "/services_shop") {
this.$router.push(v.visit_url);
this.$store.commit("serviceShopMenuAct", v.visit_url);
} else {
this.$router.push(v.visit_url);
}
this.now_menu = parent;
- window.sessionStorage.setItem("menuIndex", parent);
+ window.sessionStorage.setItem("menuVisitUrl", parent);
}
},
getList() {
@@ -189,9 +189,9 @@ export default {
});
},
getMenuIndex() {
- let index = window.sessionStorage.getItem("menuIndex");
- console.log(index);
- this.now_menu = index ? index : 2;
+ let visit_url = window.sessionStorage.getItem("menuVisitUrl");
+ console.log(visit_url);
+ this.now_menu = visit_url ? visit_url : "/services_shop";
},
getNowMenu() {
this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
diff --git a/src/components/service-list/service_list.vue b/src/components/service-list/service_list.vue
index d8fc158da2149f667dfe46461cfa77aa11c171ec..fada16ee9cc5c723e81fd976f26930a683c21afe 100644
--- a/src/components/service-list/service_list.vue
+++ b/src/components/service-list/service_list.vue
@@ -141,7 +141,7 @@