From b36f7cbdd4e2321d82a6b2d1fe7b1e6123926923 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 14 May 2020 16:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=9C=8D=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/side-nav-bar.vue |  2 +-
 src/pages/fwgl.vue              |  2 +-
 src/pages/fwglList.vue          | 34 ++++++++++++++++++++++-----------
 src/router/index.js             | 20 +++++++++----------
 4 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/components/side-nav-bar.vue b/src/components/side-nav-bar.vue
index d66d854..c4af1a3 100644
--- a/src/components/side-nav-bar.vue
+++ b/src/components/side-nav-bar.vue
@@ -9,9 +9,9 @@
       <span v-text="title"></span>
     </h3>
     <ul class="side_nav_bar_list">
+      <!-- active-class="current" -->
       <router-link
         tag="li"
-        active-class="current"
         v-for="(nav, index) in navList"
         :class="{ current: $route.path.indexOf(nav.path) > -1 }"
         :key="'nav' + index"
diff --git a/src/pages/fwgl.vue b/src/pages/fwgl.vue
index f3ae8e8..588fcbb 100644
--- a/src/pages/fwgl.vue
+++ b/src/pages/fwgl.vue
@@ -39,7 +39,7 @@ export default {
 
       this.navList = this.fwglNav[level].map((item, index) => ({
         name: item,
-        path: `/fwgl/list/${level}/${index}`,
+        path: `/fwgl/${level}/${index}`,
       }));
     },
   },
diff --git a/src/pages/fwglList.vue b/src/pages/fwglList.vue
index e2de7d3..d5a578d 100644
--- a/src/pages/fwglList.vue
+++ b/src/pages/fwglList.vue
@@ -9,7 +9,7 @@
         class="r_yhgl_table"
         size="mini"
         url="tableData"
-        :detailsUrl="`/fwgl/servicedetail/${level}/`"
+        :detailsUrl="detailsUrl"
         :border="false"
         :headers="headers"
         :searchShow="true"
@@ -24,7 +24,7 @@
         @action-sold-out="soldOutItem"
         @action-sold-out-2="soldOutItem2"
         @action-cancel="cancelItem"
-        @action-examine="examineItem"
+        @action-approval="approvalItem"
         @action-detail="detailItem"
         @action-allot="allotItem"
       ></ces-table>
@@ -47,7 +47,6 @@ export default {
     type: 0, // 访问的页面
     headers: [],
     url: "",
-    detailsUrl: "ss/",
     confirmOptions: {
       title: "",
       message: "",
@@ -99,6 +98,17 @@ export default {
     pathName() {
       return this.fwglNav[this.level][this.type];
     },
+    detailsUrl() {
+      let url = "";
+
+      if (this.level == 0 && this.type == 0) {
+        url = `/fwgl/${this.level}/${this.type}/servicedetail/`;
+      } else if (this.level == 0 && this.type == 1) {
+        url = `/fwgl/${this.level}/${this.type}/applyserviceedit/`;
+      }
+
+      return url;
+    },
   },
   components: {
     cesTable,
@@ -173,7 +183,7 @@ export default {
       // 普通用户 --- 审批的服务
       else if (level == 0 && type == 2) {
         this.headers = [
-          { label: "服务名称", prop: "name", type: "href", align: "left" },
+          { label: "服务名称", prop: "name", type: "", align: "left" },
           { label: "服务领域", prop: "address", type: "", align: "center" },
           { label: "开放程度", prop: "address", type: "", align: "center" },
           { label: "请求方式", prop: "address", type: "", align: "center" },
@@ -188,7 +198,7 @@ export default {
             width: 160,
             btnList: [
               {
-                type: "action-examine",
+                type: "action-approval",
                 label: "审批",
                 line: "|",
               },
@@ -203,7 +213,7 @@ export default {
       // 普通用户 --- 云资源服务
       else if (level == 0 && type == 3) {
         this.headers = [
-          { label: "工作区域", prop: "name", type: "href", align: "center" },
+          { label: "工作区域", prop: "name", type: "", align: "center" },
           { label: "网络环境", prop: "name", type: "", align: "center" },
           { label: "CPU（核）", prop: "name", type: "", align: "center" },
           { label: "内存（GB）", prop: "name", type: "", align: "center" },
@@ -257,7 +267,7 @@ export default {
             width: 160,
             btnList: [
               {
-                type: "action-examine",
+                type: "action-approval",
                 label: "审批",
                 line: "|",
               },
@@ -347,7 +357,7 @@ export default {
             width: 160,
             btnList: [
               {
-                type: "action-examine",
+                type: "action-approval",
                 label: "审批",
                 line: "|",
               },
@@ -400,7 +410,7 @@ export default {
     },
     editItem(item) {
       this.$router.push(
-        `/fwgl/serviceedit/${this.$route.params.level}/${item.id}`
+        `/fwgl/${this.level}/${this.type}/serviceedit/${item.id}`
       );
     },
     soldOutItem(item) {
@@ -429,8 +439,10 @@ export default {
     cancelItem(item) {
       console.log("cancelItem - " + item.name);
     },
-    examineItem(item) {
-      console.log("examineItem - " + item.name);
+    approvalItem(item) {
+      this.$router.push(
+        `/fwgl/${this.level}/${this.type}/approvalserviceedit/${item.id}`
+      );
     },
     detailItem(item) {
       console.log("detailItem - " + item.name);
diff --git a/src/router/index.js b/src/router/index.js
index d9c43bd..819d452 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -40,34 +40,34 @@ export default new Router({
         {
           path: "/fwgl/:level", // 服务管理 level：用户等级
           name: "fwgl",
-          redirect: "/fwgl/list/:level/0",
+          redirect: "/fwgl/:level/0",
           component: () => import("@/pages/fwgl"),
           children: [
             {
-              path: "/fwgl/list/:level/:type", // 服务管理/我的服务
+              path: "/fwgl/:level/:type", // 服务管理列表页
               name: "fwglList",
               component: () => import("@/pages/fwglList"),
             },
             {
-              path: "/fwgl/servicedetail/:level/:id",
+              path: "/fwgl/:level/:type/servicedetail/:id",
               name: "servicedetail",
               component: () => import("@/pages/serviceDetail"),
-            },
+            }, // 注册发布的服务 - 详情
             {
-              path: "/fwgl/serviceedit/:level/:id",
+              path: "/fwgl/:level/:type/serviceedit/:id",
               name: "serviceedit",
               component: () => import("@/pages/serviceEdit"),
-            },
+            }, // 注册发布的服务 - 编辑
             {
-              path: "/fwgl/applyserviceedit/:id",
+              path: "/fwgl/:level/:type/applyserviceedit/:id",
               name: "applyserviceedit",
               component: () => import("@/pages/apply_service_detail"),
-            },
+            }, // 申请的服务 - 详情
             {
-              path: "/fwgl/approvalserviceedit/:id",
+              path: "/fwgl/:level/:type/approvalserviceedit/:id",
               name: "approvalserviceedit",
               component: () => import("@/pages/approval_service_detail"),
-            },
+            }, // 审批的服务 - 详情
           ],
         },
         {
-- 
2.26.0