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 @@
 </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 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 }}
         <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 d8fc158da2149f667dfe46461cfa77aa11c171ec..fada16ee9cc5c723e81fd976f26930a683c21afe 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 72443789dc7f61deaf044862ded4cccad5e64aae..0831775cc641589fa7f1d3b380757b4a8c2e4d9f 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 c51292057ee3143924f9bf5f05cef5c5077fb058..1d40e7580fe7bc10a0fc2c6438a05f3cd1888e52 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 b1959397887cfb546bd0f2e9638b7abd84852e95..55d420dd034aa2d1572fb0f353e7f67f6c68f9ac 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 ba1cd67ab30d6ff9ce3c2585dc6436cedc1a742c..66dd0349bf07ad8d99aa5d29747ef70a19d53b8a 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 d55d9aa34e545f1f8c2ee40272ac67a6a1880d95..5ca62b13aefd99985feaaf446a492e1717ac7d1c 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 90f9baeac6578dd6b2207ed75bd0b6ee5fe0fbcf..fba8b441439530029e4f48e65a07b1163d9cd374 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 df3a0b1ccb85130f87596fdb75693e9c087c7599..32ece6592e24ef25f1cf554506a2fb3f1765ecec 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 a65cea746469a653050ba1ac2526963bd5820058..f39d9ca562a1e7ce1ab96b13b1fb31800ae4f6c4 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 f33161baebeec5e0044dbe404564da2c092b988a..8e5ad8e68374e4c328d22b002d513c3feb37ecb7 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 77ac15fe254b724dc82e2f0a5556cb8eca699207..f6db41c436f1325e57a4aa68f89fb2149522dd6c 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 24c4b016cd977276356f76152defb3286b0788ce..b7e4cdae470d60afe2f5571b50645e0b2c82ef1f 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 b7c0de29cf2009c2f36d799b8caa352f8c8a502c..960ee8da1a706332d72f09dd77cd7cf9ecb89805 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 6517618e80289fc532632aa0bd774d2ab1589872..a046df283d1ee79d3d5eb45e366ed0cfb0424562 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 1f259b3a08952ef74570795713b8f6f09e1bb49f..afa1b4cab7e7970447db46d714bb356bdcc3f841 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 a8ac846218053cf15b6fc4fe7b931ddd3e3f281c..448ceac0401c3474642309463d1328e51e5204ea 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 ccb52e56763f9f23a81c9d79dfe26df67640966a..eaf1a302957ca3746dbfbf251c2a950259613582 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 1f3960b88c904605f92c1251bd53c86be5538ad0..31ff58cd7a8839c96045deb41ddcd590663617ff 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 6f8ef13094b8b1f986467332d58b0ffd0903c8d1..f17de8093507f889a73c6a9ec4a4f9b2eca530d5 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 54465370163e84551cae14d59b9edfac4236e551..299f6102a61eb462e321707eeed4120b15eda03d 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 6d75c9f658eb092e55ba6c1f2cbb50c408f45fdd..6292ae6d75ff1b26b74a7cbb1be2b3f070ef5674 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 128f991d232ef17c6497f889c5f7734de5d41a33..5154b2c58c455739dcd240bf230eddb37023110d 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) {