From 61d20690bbe522701df532200d20cb9933eaff14 Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Thu, 2 Jul 2020 14:43:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9+general=E7=BB=84=E4=BB=B6=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/{ => general}/block-radius.vue |  0
 src/components/{ => general}/codes.vue        |  0
 src/components/{ => general}/cropper.vue      |  0
 src/components/{ => general}/upload_file.vue  |  2 +-
 src/components/menu.vue                       | 26 +++++++++----------
 src/components/service-list/service_list.vue  |  2 +-
 .../shop-car-apply/apply_service_state.vue    |  2 +-
 src/components/shop-cloud/shop-cloud.vue      |  4 +--
 .../organization/organizationedit.vue         |  2 +-
 src/pages/authority/user/organizationuser.vue |  2 +-
 src/pages/data-analysis/my-service.vue        |  2 +-
 src/pages/example/example_code.vue            |  2 +-
 src/pages/example/example_com_list.vue        |  2 +-
 src/pages/example/example_commodity.vue       |  2 +-
 src/pages/example/example_upload.vue          |  2 +-
 .../service_application_successfully.vue      |  2 +-
 src/pages/user/message.vue                    |  2 +-
 src/pages/user/order/order_detail.vue         |  2 +-
 src/pages/user/user_info.vue                  |  4 +--
 src/pages/workbench/app_build.vue             |  2 +-
 src/pages/workbench/fwgl/serviceDetail.vue    |  2 +-
 src/pages/workbench/fwgl/serviceEdit.vue      |  2 +-
 src/pages/workbench/fwzc_fwcs.vue             |  6 ++---
 src/pages/workbench/yygl/app_detail.vue       |  2 +-
 src/pages/workbench/yygl/app_edit.vue         |  2 +-
 .../workbench/yygl/deploy_app_detail.vue      |  2 +-
 src/pages/workbench/yygl/deployment.vue       |  2 +-
 27 files changed, 40 insertions(+), 40 deletions(-)
 rename src/components/{ => general}/block-radius.vue (100%)
 rename src/components/{ => general}/codes.vue (100%)
 rename src/components/{ => general}/cropper.vue (100%)
 rename src/components/{ => general}/upload_file.vue (98%)

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 7d4e96b..fb54bd2 100644
--- a/src/components/upload_file.vue
+++ b/src/components/general/upload_file.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import cropper from "@/components/cropper";
+import cropper from "@/components/general/cropper";
 export default {
   components: {
     cropper
diff --git a/src/components/menu.vue b/src/components/menu.vue
index 1da649c..1dc6c4f 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 }}
         <div class="user_menu" v-if="item.Child && item.Child.length" style="left: 30px;">
           <div
             v-for="(v, indexs) in item.Child"
             :key="indexs + 700"
-            @click.stop="gotoChildPage(v, index)"
+            @click.stop="gotoChildPage(v, item.visit_url)"
           >{{ v.menu_name }}</div>
         </div>
         <div class="sj" v-if="item.Child && item.Child.length" style="left: 60px;"></div>
-        <div class="bottom_show" v-if="now_menu == index"></div>
+        <div class="bottom_show" v-if="now_menu == item.visit_url"></div>
       </div>
     </div>
   </div>
@@ -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 d8fc158..fada16e 100644
--- a/src/components/service-list/service_list.vue
+++ b/src/components/service-list/service_list.vue
@@ -141,7 +141,7 @@
 
 <script>
 import CommodityList from "@/components/service-list/commodity-list.vue";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     "commodity-list": CommodityList,
diff --git a/src/components/shop-car-apply/apply_service_state.vue b/src/components/shop-car-apply/apply_service_state.vue
index 7244378..0831775 100644
--- a/src/components/shop-car-apply/apply_service_state.vue
+++ b/src/components/shop-car-apply/apply_service_state.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import tableUm from "@/components/table/table-um";
 export default {
   props: ["data", "idx"],
diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue
index c512920..1d40e75 100644
--- a/src/components/shop-cloud/shop-cloud.vue
+++ b/src/components/shop-cloud/shop-cloud.vue
@@ -699,8 +699,8 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
-import uploadFile from "@/components/upload_file";
+import BlockRadius from "@/components/general/block-radius";
+import uploadFile from "@/components/general/upload_file";
 export default {
   components: {
     BlockRadius,
diff --git a/src/pages/authority/organization/organizationedit.vue b/src/pages/authority/organization/organizationedit.vue
index b195939..55d420d 100644
--- a/src/pages/authority/organization/organizationedit.vue
+++ b/src/pages/authority/organization/organizationedit.vue
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import { getRole, formatDateTime_date } from "@/utils/common";
 export default {
   props: {},
diff --git a/src/pages/authority/user/organizationuser.vue b/src/pages/authority/user/organizationuser.vue
index ba1cd67..66dd034 100644
--- a/src/pages/authority/user/organizationuser.vue
+++ b/src/pages/authority/user/organizationuser.vue
@@ -166,7 +166,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import { getRole, formatDateTime_date } from "@/utils/common";
 import { mapGetters, mapState } from "vuex";
 export default {
diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue
index d55d9aa..5ca62b1 100644
--- a/src/pages/data-analysis/my-service.vue
+++ b/src/pages/data-analysis/my-service.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 import Dashboard from "@/components/e-charts/dashboard";
 export default {
   components: {
diff --git a/src/pages/example/example_code.vue b/src/pages/example/example_code.vue
index 90f9bae..fba8b44 100644
--- a/src/pages/example/example_code.vue
+++ b/src/pages/example/example_code.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import codes from "@/components/codes";
+import codes from "@/components/general/codes";
 export default {
   data() {
     return {};
diff --git a/src/pages/example/example_com_list.vue b/src/pages/example/example_com_list.vue
index df3a0b1..32ece65 100644
--- a/src/pages/example/example_com_list.vue
+++ b/src/pages/example/example_com_list.vue
@@ -10,7 +10,7 @@
 <script>
 // @ is an alias to /src
 import CommodityList from "@/components/service-list/commodity-list.vue";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     "commodity-list": CommodityList,
diff --git a/src/pages/example/example_commodity.vue b/src/pages/example/example_commodity.vue
index a65cea7..f39d9ca 100644
--- a/src/pages/example/example_commodity.vue
+++ b/src/pages/example/example_commodity.vue
@@ -11,7 +11,7 @@
 <script>
 // @ is an alias to /src
 import Commodity from "@/components/service-list/commodity.vue";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     Commodity,
diff --git a/src/pages/example/example_upload.vue b/src/pages/example/example_upload.vue
index f33161b..8e5ad8e 100644
--- a/src/pages/example/example_upload.vue
+++ b/src/pages/example/example_upload.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 export default {
   data() {
     return {
diff --git a/src/pages/service_shop/service_application_successfully.vue b/src/pages/service_shop/service_application_successfully.vue
index 77ac15f..f6db41c 100644
--- a/src/pages/service_shop/service_application_successfully.vue
+++ b/src/pages/service_shop/service_application_successfully.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     BlockRadius
diff --git a/src/pages/user/message.vue b/src/pages/user/message.vue
index 24c4b01..b7e4cda 100644
--- a/src/pages/user/message.vue
+++ b/src/pages/user/message.vue
@@ -25,7 +25,7 @@
 
 <script>
 import CesTable from "@/components/table/table-um";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     CesTable,
diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue
index b7c0de2..960ee8d 100644
--- a/src/pages/user/order/order_detail.vue
+++ b/src/pages/user/order/order_detail.vue
@@ -229,7 +229,7 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 import ProcessCard from "@/components/process-card";
 import TableUm from "@/components/table/table-um";
 import InfoList from "@/components/infoList";
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index 6517618..a046df2 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -176,8 +176,8 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
-import UploadFile from "@/components/upload_file";
+import BlockRadius from "@/components/general/block-radius";
+import UploadFile from "@/components/general/upload_file";
 export default {
   components: {
     BlockRadius,
diff --git a/src/pages/workbench/app_build.vue b/src/pages/workbench/app_build.vue
index 1f259b3..afa1b4c 100644
--- a/src/pages/workbench/app_build.vue
+++ b/src/pages/workbench/app_build.vue
@@ -274,7 +274,7 @@
 import appBuildSteps from "@/components/app-build-steps/app-build-steps";
 import appBuildStep from "@/components/app-build-steps/app-build-step";
 import apassTable from "@/components/apass-table";
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import apassDialog from "@/components/apass-dialog";
 
 export default {
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index a8ac846..448ceac 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -166,7 +166,7 @@
 <script>
 import infoList from "@/components/infoList";
 import tableUm from "@/components/table/table-um";
-import codes from "@/components/codes";
+import codes from "@/components/general/codes";
 import norCard from "@/components/card";
 import exampleIcon from "@/pages/example/example_icon";
 import Topology from "@/components/topology.vue";
diff --git a/src/pages/workbench/fwgl/serviceEdit.vue b/src/pages/workbench/fwgl/serviceEdit.vue
index ccb52e5..eaf1a30 100644
--- a/src/pages/workbench/fwgl/serviceEdit.vue
+++ b/src/pages/workbench/fwgl/serviceEdit.vue
@@ -146,7 +146,7 @@
 </template>
 
 <script>
-import uploadFile from '@/components/upload_file'
+import uploadFile from '@/components/general/upload_file'
 import { getRole } from "@/utils/common";
 import { mapGetters,mapState } from 'vuex'
 export default {
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index 1f3960b..31ff58c 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -350,10 +350,10 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 import CesTable from "@/components/table/table-um";
-import Codes from "@/components/codes";
-import uploadFile from "@/components/upload_file";
+import Codes from "@/components/general/codes";
+import uploadFile from "@/components/general/upload_file";
 export default {
   components: {
     BlockRadius,
diff --git a/src/pages/workbench/yygl/app_detail.vue b/src/pages/workbench/yygl/app_detail.vue
index 6f8ef13..f17de80 100644
--- a/src/pages/workbench/yygl/app_detail.vue
+++ b/src/pages/workbench/yygl/app_detail.vue
@@ -152,7 +152,7 @@ import infoList from "@/components/infoList";
 import tableUm from "@/components/table/table-um";
 import serviceHeader from "@/components/service-header";
 import dialogAction from "@/components/dialog-action";
-import uploadFile from '@/components/upload_file'
+import uploadFile from '@/components/general/upload_file'
 import serviceTabComments from '@/components/service-tabs/service-tab-comments'
 import { getRole } from "@/utils/common";
 import { mapGetters,mapState } from 'vuex'
diff --git a/src/pages/workbench/yygl/app_edit.vue b/src/pages/workbench/yygl/app_edit.vue
index 5446537..299f610 100644
--- a/src/pages/workbench/yygl/app_edit.vue
+++ b/src/pages/workbench/yygl/app_edit.vue
@@ -97,7 +97,7 @@
 </template>
 
 <script>
-import uploadFile from '@/components/upload_file'
+import uploadFile from '@/components/general/upload_file'
 import { getRole } from "@/utils/common";
 import { mapGetters,mapState } from 'vuex'
 export default {
diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue
index 6d75c9f..6292ae6 100644
--- a/src/pages/workbench/yygl/deploy_app_detail.vue
+++ b/src/pages/workbench/yygl/deploy_app_detail.vue
@@ -169,7 +169,7 @@ import infoList from "@/components/infoList";
 import tableUm from "@/components/table/table-um";
 import serviceHeader from "@/components/service-header";
 import dialogAction from "@/components/dialog-action";
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import norCard from "@/components/card";
 import exampleIcon from "@/pages/example/example_icon";
 import Topology from "@/components/topology.vue";
diff --git a/src/pages/workbench/yygl/deployment.vue b/src/pages/workbench/yygl/deployment.vue
index 128f991..5154b2c 100644
--- a/src/pages/workbench/yygl/deployment.vue
+++ b/src/pages/workbench/yygl/deployment.vue
@@ -226,7 +226,7 @@
 <script>
 import appBuildSteps from "@/components/app-build-steps/app-build-steps";
 import appBuildStep from "@/components/app-build-steps/app-build-step";
-import codes from "@/components/codes";
+import codes from "@/components/general/codes";
 import yaml from "js-yaml";
 var checkNumber = (rule, value, callback) => {
   if (!value) {
-- 
2.26.0