From 53068d846f1bf9242caba0a1b967e84a7c8eb5c5 Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Wed, 20 May 2020 14:53:55 +0800
Subject: [PATCH] =?UTF-8?q?+=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/commodity-list.vue |   2 +-
 src/components/menu.vue           | 103 ++++++++++++++----------------
 2 files changed, 48 insertions(+), 57 deletions(-)

diff --git a/src/components/commodity-list.vue b/src/components/commodity-list.vue
index 810e378..02525bf 100644
--- a/src/components/commodity-list.vue
+++ b/src/components/commodity-list.vue
@@ -15,7 +15,7 @@
       <div class="com_page_total">共 {{ pagination.total }} 个条目</div>
       <div class="com_page_item">
         <div class="com_page_num" v-if="pageSizeShow">
-          <div>每页行数：</div>
+          <div>每页条数：</div>
           <div class="com_page_num_sel">
             <el-select
               v-model="pagination.rowsPerPage"
diff --git a/src/components/menu.vue b/src/components/menu.vue
index f1ec2e3..b0ae058 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -1,10 +1,7 @@
 <template>
   <div class="menu">
     <img src="../assets/imgs/home_img_logo.png" alt class="logo" />
-    <div
-      style="float:right;cursor: pointer;position:relative;"
-      class="user_hover"
-    >
+    <div style="float:right;cursor: pointer;position:relative;" class="user_hover">
       <span class="user">用户</span>
       <img src="../assets/imgs/home_ic_user.png" alt class="user_pic" />
       <div class="user_menu">
@@ -12,16 +9,11 @@
           v-for="(item, index) in user_arr"
           :key="index + 700"
           @click="gotopage(index)"
-        >
-          {{ item }}
-        </div>
+        >{{ item }}</div>
       </div>
       <div class="sj"></div>
     </div>
-    <div
-      style="float:right;cursor: pointer;position:relative;"
-      class="shop_hover"
-    >
+    <div style="float:right;cursor: pointer;position:relative;" class="shop_hover">
       <div class="number">99+</div>
       <img src="../assets/imgs/home_ic_shop.png" alt class="car" />
       <div class="shop_menu">
@@ -36,24 +28,16 @@
             class="shop_img"
           />
           <div class="shop_cell_msgs">
-            <p @click="getDetail(item.id)" class="shop_cell_name over_one">
-              {{ item.name }}
-            </p>
+            <p @click="getDetail(item.id)" class="shop_cell_name over_one">{{ item.name }}</p>
             <p class="shop_cell_msg bover_one">{{ item.type }}</p>
             <p class="shop_cell_msg over_one">{{ item.creator }}</p>
           </div>
           <div>
-            <img
-              @click="deleteItem(item.id)"
-              src="../assets/imgs/ic_delete.png"
-              alt
-            />
+            <img @click="deleteItem(item.id)" src="../assets/imgs/ic_delete.png" alt />
           </div>
         </div>
         <div class="shop_footer">
-          <el-button @click="settlement" size="small" class="shop_settlement">
-            去购物车申请结算
-          </el-button>
+          <el-button @click="settlement" size="small" class="shop_settlement">去购物车申请结算</el-button>
         </div>
       </div>
       <div class="shop_sj"></div>
@@ -68,24 +52,14 @@
         :style="{ color: now_menu == index ? '#fff' : '' }"
       >
         {{ item.name }}
-        <div
-          class="user_menu"
-          v-if="item.children && item.children.length"
-          style="left: 30px;"
-        >
+        <div class="user_menu" v-if="item.children && item.children.length" style="left: 30px;">
           <div
             v-for="(v, index) in item.children"
             :key="index + 700"
             @click.stop="gotoChildPage(v)"
-          >
-            {{ v.name }}
-          </div>
+          >{{ v.name }}</div>
         </div>
-        <div
-          class="sj"
-          v-if="item.children && item.children.length"
-          style="left: 60px;"
-        ></div>
+        <div class="sj" v-if="item.children && item.children.length" style="left: 60px;"></div>
         <div class="bottom_show" v-if="now_menu == index"></div>
       </div>
     </div>
@@ -100,10 +74,24 @@ export default {
         {
           name: "工作台",
           path: "/workplace",
+          children: [
+            {
+              name: "服务注册",
+              path: "/fwzc/fwcs"
+            },
+            {
+              name: "服务管理",
+              path: "/fwgl/"
+            },
+            {
+              name: "应用管理",
+              path: "/yygl/"
+            }
+          ]
         },
         {
           name: "技术支持",
-          path: "/xxx",
+          path: "/xxx"
         },
         {
           name: "服务超市",
@@ -111,34 +99,34 @@ export default {
           children: [
             {
               name: "数据服务",
-              path: "/shop/data_service_list",
+              path: "/shop/data_service_list"
             },
             {
               name: "时空服务",
-              path: "/shop/space_time_service_list",
+              path: "/shop/space_time_service_list"
             },
             {
               name: "视频服务",
-              path: "/shop/video_service_list",
+              path: "/shop/video_service_list"
             },
             {
               name: "感知服务",
-              path: "/shop/perception_service_list",
+              path: "/shop/perception_service_list"
             },
             {
               name: "综合应用",
-              path: "/shop/comprehensive_app_list",
+              path: "/shop/comprehensive_app_list"
             },
             {
               name: "云资源服务",
-              path: "/shop/cloud",
+              path: "/shop/cloud"
             },
             {
               name: "应用商店",
-              path: "/shop/app_store_list",
-            },
-          ],
-        },
+              path: "/shop/app_store_list"
+            }
+          ]
+        }
       ],
       now_menu: 2,
       user_arr: [
@@ -146,7 +134,7 @@ export default {
         "消息通知",
         "收银中心",
         "关于BD-aPaaS",
-        "退出登录",
+        "退出登录"
       ],
       shopping_list: [
         {
@@ -159,7 +147,7 @@ export default {
           num: 2,
           checkedSubscription: false,
           specification: 1,
-          specificationApplication: 2,
+          specificationApplication: 2
         },
         {
           id: 1,
@@ -170,7 +158,7 @@ export default {
           num: 2,
           checkedSubscription: false,
           specification: 1,
-          specificationApplication: 2,
+          specificationApplication: 2
         },
         {
           id: 2,
@@ -182,9 +170,9 @@ export default {
           num: 2,
           checkedSubscription: true,
           specification: 1,
-          specificationApplication: 2,
-        },
-      ],
+          specificationApplication: 2
+        }
+      ]
     };
   },
   methods: {
@@ -203,12 +191,15 @@ export default {
       this.now_menu = index;
     },
     gotoChildPage(v) {
-      console.log(v)
       if (v.path) {
-        this.$router.push(v.path);
+        if (v.path == "/fwgl/" || v.path == "/yygl/") {
+          this.$router.push(v.path + this.$store.state.role);
+        } else {
+          this.$router.push(v.path);
+        }
       }
-    },
-  },
+    }
+  }
 };
 </script>
 
-- 
2.26.0