菜单统一都用后端数据，订单的服务列表

src/components/menu.vue

@@ -132,7 +132,6 @@ export default {
   },
   methods: {
     gotopage(n) {
-      console.log("function gotopage,menu test:" + n);
       if (n == "logout") {
         window.location.href = "/iam/api/logout";
       } else if (n == "login") {
@@ -157,17 +156,15 @@ export default {
       this.$router.push({ name: "shoppingCart" });
     },
     navAction(path) {
-      console.log("function navAction,menu test:" + path);
       this.now_menu = path;
       window.sessionStorage.setItem("menuVisitUrl", path);
       this.$router.push(path);
     },
     gotoChildPage(v, parent) {
-      console.log("function gotoChildPage,menu test:" + 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 == "/services_shop") {
+        } else if (parent == "/shop") {
           this.$store.commit("serviceShopMenuAct", v.visit_url);
           this.$router.push(v.visit_url);
         } else {

src/components/service-list/service_list.vue

@@ -247,13 +247,13 @@ export default {
               prop: "",
               childDomains: [
                 {
-                  id: 1,
+                  id: 2,
                   name: "平台应用",
                   prop: "",
                   childDomains: null
                 },
                 {
-                  id: 2,
+                  id: 1,
                   name: "开发者应用",
                   prop: "",
                   childDomains: null

src/pages/service_shop/shop_list.vue

@@ -37,13 +37,13 @@ export default {
           this.name = "数据服务";
           this.urlFilter = "5";
           this.url = "/shop/sjfwDetail";
-          this.filterNames = ["数据服务类型", "数据领域", "数据来源机构"];
+          this.filterNames = ["数据服务类型", "服务领域", "数据来源机构"];
           break;
         case "space_time_service_list":
           this.name = "时空服务";
           this.urlFilter = "6";
           this.url = "/shop/skfwDetail";
-          this.filterNames = ["时空服务类型", "应用领域", "服务来源组织"];
+          this.filterNames = ["时空服务类型", "服务领域", "服务来源组织"];
           break;
         case "video_service_list":
           this.name = "视频服务";
@@ -61,7 +61,7 @@ export default {
           this.name = "综合应用";
           this.urlFilter = "21";
           this.url = "/shop/zhfwDetail";
-          this.filterNames = ["服务类型", "应用领域", "服务来源组织"];
+          this.filterNames = ["服务类型", "服务领域", "服务来源组织"];
           break;
         case "app_store_list":
           this.name = "应用商店";

src/pages/user/order/order_detail.vue

@@ -323,8 +323,8 @@ export default {
       {
         prop: "name",
         label: "字段编码",
-        minWidth: "20%",
-        align: "left"
+        minWidth: "10%",
+        align: "center"
       },
       {
         prop: "show_type",
@@ -335,14 +335,20 @@ export default {
       {
         prop: "label",
         label: "字段名称",
-        minWidth: "40%",
+        minWidth: "20%",
         align: "center"
       },
       {
         prop: "descript",
         label: "字段说明",
         minWidth: "40%",
-        align: "left"
+        align: "center"
+      },
+      {
+        prop: "example",
+        label: "字段示例",
+        minWidth: "20%",
+        align: "center"
       }
     ],
     list_arr: [

src/pages/user/user.vue

 <template>
   <div class="fwgl_container">
-    <side-nav-bar title="个人中心" imgSrc="tool_fuwu" :nav-list="navList" :title-path="navList[0] && navList[0].path"></side-nav-bar>
+    <side-nav-bar
+      title="个人中心"
+      imgSrc="tool_fuwu"
+      :nav-list="navList"
+      :title-path="navList[0] && navList[0].path"
+    ></side-nav-bar>
     <div class="main_container">
       <router-view :key="'type_' + $route.params.type"></router-view>
     </div>
@@ -38,7 +43,15 @@ export default {
   },
   methods: {
     initNavList() {
-      this.navList = this.userNav;
+      this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
+        if (response.data.success == 1) {
+          let arr = response.data.data[0].Child;
+          let user_index = arr.findIndex(item => item.visit_url == "/user");
+          if (user_index != -1) {
+            this.navList = arr[user_index].Child;
+          }
+        }
+      });
     }
   },
   mounted() {

src/store/index.js

@@ -6,7 +6,7 @@ const store = new Vuex.Store({
   state: {
     role: 0, // 0：普通用户，1：组织管理员，2：超级管理员
     userInfo: null, // 用户信息
-    serviceShopMenu: "/shop/data_service_list", // 服务超市侧边栏
+    serviceShopMenu: "/shop/data_service_list/5", // 服务超市侧边栏
     fwglNav: [
       ["注册发布的服务", "申请的服务", "云资源服务"], // 普通用户
       ["组织服务管理", "服务审批管理", "云资源管理"], // 组织管理员