From e499f06e675fce77835f1465cb99b2068708bce5 Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Tue, 9 Jun 2020 10:22:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=EF=BC=8Cmenu?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=EF=BC=8C=E6=9C=8D=E5=8A=A1=E8=B6=85=E5=B8=82?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=A0=B9=E6=8D=AE=E5=90=8E=E7=AB=AF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E7=BB=84=E4=BB=B6=E9=98=B6=E6=A2=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/apass-list.vue                 |   2 +-
 src/components/menu.vue                       | 102 +++++++------
 src/components/service-list/service_list.vue  |  24 +--
 src/components/service_shop_menu.vue          |  12 +-
 .../shop-car-apply/apply_service_state.vue    |   2 +-
 .../shopping-cart/shopping-cart-cell.vue      | 139 +++++++++++++-----
 .../shopping-cart/shopping-cart-com.vue       |  27 +++-
 .../shopping-cart/shopping-cart-list.vue      |  11 +-
 src/components/{ => table}/dialog-remove.vue  |   0
 src/components/{ => table}/table-filter.vue   |   0
 src/components/{ => table}/table-input.vue    |   0
 src/components/{ => table}/table-select.vue   |   0
 src/components/{ => table}/table-um.vue       |  18 +--
 src/components/{ => table}/table-umhref.vue   |   0
 src/i18n/language-zh.js                       |   3 +
 src/pages/example/example_table.vue           |   2 +-
 src/pages/user/message.vue                    |   2 +-
 src/pages/user/order/order_detail.vue         |   2 +-
 .../workbench/fwgl/apply_service_detail.vue   |   2 +-
 .../fwgl/approval_service_detail.vue          |   2 +-
 src/pages/workbench/fwgl/serviceDetail.vue    |   2 +-
 src/pages/workbench/fwzc_fwcs.vue             |   2 +-
 src/pages/workbench/workPlace.vue             |   2 +-
 src/pages/workbench/yygl/app_detail.vue       |   2 +-
 src/pages/workbench/yygl/apply_app_detail.vue |   2 +-
 .../workbench/yygl/approval_app_detail.vue    |   2 +-
 .../workbench/yygl/deploy_app_detail.vue      |   2 +-
 src/pages/workbench/yygl/yyglList.vue         |   4 +-
 src/request/api/service_shop.js               |   3 +
 src/router/index.js                           |  31 +---
 src/store/index.js                            |   8 +
 31 files changed, 238 insertions(+), 172 deletions(-)
 rename src/components/{ => table}/dialog-remove.vue (100%)
 rename src/components/{ => table}/table-filter.vue (100%)
 rename src/components/{ => table}/table-input.vue (100%)
 rename src/components/{ => table}/table-select.vue (100%)
 rename src/components/{ => table}/table-um.vue (97%)
 rename src/components/{ => table}/table-umhref.vue (100%)

diff --git a/src/components/apass-list.vue b/src/components/apass-list.vue
index 25b0a49..46dbea1 100644
--- a/src/components/apass-list.vue
+++ b/src/components/apass-list.vue
@@ -71,7 +71,7 @@
 <script>
 import listTable from "@/components/apass-table";
 import ListPagination from "@/components/comments-pagination";
-import ListFilter from "@/components/table-filter";
+import ListFilter from "@/components/table/table-filter";
 
 export default {
   components: {
diff --git a/src/components/menu.vue b/src/components/menu.vue
index 0ef140a..c0f4c4e 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -23,17 +23,21 @@
           :key="'shopping' + index"
           class="shop_list_cell shop_line"
         >
-          <img
-            src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
-            class="shop_img"
-          />
+          <img :src="item.service.cover" class="shop_img" />
           <div class="shop_cell_msgs">
-            <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>
+            <p
+              @click="getDetail(item.id)"
+              class="shop_cell_name over_one"
+            >{{ item.service_id == 0 ? item.application.app_name : item.service.name }}</p>
+            <p
+              class="shop_cell_msg bover_one"
+            >{{ item.service_id == 0 ? item.application.ywly : item.service.sectors }}</p>
+            <p
+              class="shop_cell_msg over_one"
+            >{{ item.service_id == 0 ? item.application.org : item.service.organization_name }}</p>
           </div>
           <div>
-            <img @click="deleteItem(item.id)" src="../assets/imgs/ic_delete.png" alt />
+            <img @click.stop="deleteItem(item.id)" src="../assets/imgs/ic_delete.png" alt />
           </div>
         </div>
         <div class="shop_footer">
@@ -99,23 +103,23 @@ export default {
           children: [
             {
               name: "数据服务",
-              path: "/shop/data_service_list"
+              path: "/shop/service/5"
             },
             {
               name: "时空服务",
-              path: "/shop/space_time_service_list"
+              path: "/shop/service/6"
             },
             {
               name: "视频服务",
-              path: "/shop/video_service_list"
+              path: "/shop/service/7"
             },
             {
               name: "感知服务",
-              path: "/shop/perception_service_list"
+              path: "/shop/service/10"
             },
             {
               name: "综合应用",
-              path: "/shop/comprehensive_app_list"
+              path: "/shop/service/11"
             },
             {
               name: "云资源服务",
@@ -123,7 +127,7 @@ export default {
             },
             {
               name: "应用商店",
-              path: "/shop/app_store_list"
+              path: "/shop/service/12"
             }
           ]
         }
@@ -136,45 +140,22 @@ export default {
         { name: "关于BD-aPaaS", path: "" },
         { name: "退出登录", path: "" }
       ],
-      shopping_list: [
-        {
-          id: 0,
-          name: "水路货物周转量情况",
-          type: "基础数据服务",
-          creator: "贵州省交通运输厅0",
-          state: 1,
-          mapService: 1,
-          num: 2,
-          checkedSubscription: false,
-          specification: 1,
-          specificationApplication: 2
-        },
-        {
-          id: 1,
-          name: "水路货物周转量情况水路货物周水路货物周转量情况水路货物周",
-          type: "基础数据服务",
-          creator: "贵州省交通运输厅1",
-          state: 1,
-          num: 2,
-          checkedSubscription: false,
-          specification: 1,
-          specificationApplication: 2
-        },
-        {
-          id: 2,
-          name: "水路货物周转量情况水路货物周转量情况",
-          type: "基础数据服务",
-          creator: "贵州省交通运输厅2",
-          state: 1,
-          mapService: 1,
-          num: 2,
-          checkedSubscription: true,
-          specification: 1,
-          specificationApplication: 2
-        }
-      ]
+      shopping_list: []
     };
   },
+  mounted() {
+    this.getList();
+  },
+  computed: {
+    getMenuCartState() {
+      return this.$store.state.menuCartState;
+    }
+  },
+  watch: {
+    getMenuCartState(newVal) {
+      this.getList();
+    }
+  },
   methods: {
     gotopage(n) {
       this.$router.push(n);
@@ -182,9 +163,16 @@ export default {
     settlement() {
       this.$router.push({ name: "shoppingCart" });
     },
-    deleteItem() {},
+    deleteItem(id) {
+      let query = [id];
+      this.$api.serviceShop.delShoppingCart(query).then(response => {
+        this.getList();
+      });
+    },
     getDetail() {
       // if you want goto detail page, you should give me the type at first
+      // at here, we will goto shopping cart
+      this.$router.push({ name: "shoppingCart" });
     },
     navAction(index, path) {
       this.$router.push(path);
@@ -202,6 +190,16 @@ export default {
         }
         this.now_menu = parent;
       }
+    },
+    getList() {
+      this.$api.serviceShop.getShoppingCart().then(response => {
+        if (response.data.success == "1") {
+          console.log(response.data.data);
+          this.shopping_list = response.data.data.valid.slice(0, 3);
+        } else {
+          console.log(response.data.message);
+        }
+      });
     }
   }
 };
diff --git a/src/components/service-list/service_list.vue b/src/components/service-list/service_list.vue
index 0a2afc7..0e2d694 100644
--- a/src/components/service-list/service_list.vue
+++ b/src/components/service-list/service_list.vue
@@ -10,7 +10,7 @@
   <div>
     <div class="head_flex">
       <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
-        <el-breadcrumb-item :to="{ path: '/shop' }">服务超市</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/shop' }">{{ $t('lang.serviceShop') }}</el-breadcrumb-item>
         <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
       </el-breadcrumb>
       <div v-if="urlList" class="input_right">
@@ -35,10 +35,7 @@
                 :class="openList[index] == 'up' ? 'classification_line_hid':'classification_line_show'"
               >
                 <ul :id="item.id" class="classification_line_items_ul">
-                  <li
-                    class="classification_line_items_li"
-                    :key="'cda' + index"
-                  >
+                  <li class="classification_line_items_li" :key="'cda' + index">
                     <div class="classification_span">
                       <span
                         @click="clickAll(index)"
@@ -180,8 +177,7 @@ export default {
       }
     ],
     activeBtn: 0,
-    lists: [
-    ],
+    lists: [],
     filterLists: [
       {
         id: 10,
@@ -237,9 +233,15 @@ export default {
       this.$api.serviceShop.getServiceShopFilter(query).then(response => {
         if (response.data.success == 1) {
           let data = response.data.data;
-          this.filterLists[0].childDomains = data.serviceTypeInfo ? data.serviceTypeInfo : [];
-          this.filterLists[1].childDomains = data.serviceDomain ? data.serviceDomain : [];
-          this.filterLists[2].childDomains = data.organizations ? data.organizations : [];
+          this.filterLists[0].childDomains = data.serviceTypeInfo
+            ? data.serviceTypeInfo
+            : [];
+          this.filterLists[1].childDomains = data.serviceDomain
+            ? data.serviceDomain
+            : [];
+          this.filterLists[2].childDomains = data.organizations
+            ? data.organizations
+            : [];
           setTimeout(() => {
             this.judgeHeight();
           }, 0);
@@ -344,7 +346,7 @@ export default {
       this.getShopList();
     },
     clickAll(item) {
-      console.log(item)
+      console.log(item);
       this.activeOptions[item] = [];
       this.activeChildOptions[item] = [];
     }
diff --git a/src/components/service_shop_menu.vue b/src/components/service_shop_menu.vue
index f3a878e..c4bada7 100644
--- a/src/components/service_shop_menu.vue
+++ b/src/components/service_shop_menu.vue
@@ -24,35 +24,35 @@ export default {
         {
           id: 0,
           label: "数据服务",
-          router: "/shop/data_service_list",
+          router: "/shop/service/5",
           active: "tool_ic_shujufw_sel",
           default: "tool_ic_shujufw"
         },
         {
           id: 1,
           label: "时空服务",
-          router: "/shop/space_time_service_list",
+          router: "/shop/service/6",
           active: "tool_ic_shikongfw_sel",
           default: "tool_ic_shikongfw"
         },
         {
           id: 2,
           label: "视频服务",
-          router: "/shop/video_service_list",
+          router: "/shop/service/7",
           active: "tool_ic_shipinfw_sel",
           default: "tool_ic_shipinfw"
         },
         {
           id: 3,
           label: "感知服务",
-          router: "/shop/perception_service_list",
+          router: "/shop/service/10",
           active: "tool_ic_ganzhifw_sel",
           default: "tool_ic_ganzhifw"
         },
         {
           id: 4,
           label: "综合服务",
-          router: "/shop/comprehensive_app_list",
+          router: "/shop/service/11",
           active: "tool_ic_zongheyyfw_sel",
           default: "tool_ic_zongheyyfw"
         },
@@ -66,7 +66,7 @@ export default {
         {
           id: 6,
           label: "应用商店",
-          router: "/shop/app_store_list",
+          router: "/shop/service/12",
           active: "tool_ic_yingyongsd_sel",
           default: "tool_ic_yingyongsd"
         }
diff --git a/src/components/shop-car-apply/apply_service_state.vue b/src/components/shop-car-apply/apply_service_state.vue
index 2af8f7a..26ed19d 100644
--- a/src/components/shop-car-apply/apply_service_state.vue
+++ b/src/components/shop-car-apply/apply_service_state.vue
@@ -75,7 +75,7 @@
 
 <script>
 import uploadFile from "@/components/upload_file";
-import tableUm from "../table-um";
+import tableUm from "@/components/table/table-um";
 export default {
   props: ["data"],
   components: {
diff --git a/src/components/shopping-cart/shopping-cart-cell.vue b/src/components/shopping-cart/shopping-cart-cell.vue
index 97446ac..a57d5a9 100644
--- a/src/components/shopping-cart/shopping-cart-cell.vue
+++ b/src/components/shopping-cart/shopping-cart-cell.vue
@@ -10,23 +10,29 @@
       <el-col :span="9">
         <div class="shopping_cell_item">
           <img
-            src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+            :src="cellIsService ? cellItems.service.cover:cellItems.application.logo"
             class="shopping_cell_img"
           />
           <div class="shopping_cell_msg">
             <div class="shopping_cell_name">
-              {{ cellItems.name }}
+              {{ cellItems.service.name }}
               <span
-                v-if="cellItems.mapService"
+                v-if="cellItems.service.data_service_type1_name == '时空服务'"
                 class="tags map_service"
               >mapService</span>
-              <span v-if="cellItems.state == 1" class="tags shared">共享</span>
-              <span v-else-if="cellItems.state ==  2" class="tags restricted">受限</span>
+              <span v-if="cellItems.service.openness == 1" class="tags shared">共享</span>
+              <span v-else-if="cellItems.service.openness ==  2" class="tags restricted">受限</span>
               <span v-else class="tags sensitive">敏感</span>
             </div>
             <div class="shopping_cell_msg_other">
-              <div class="shopping_cell_type">{{ cellItems.type }}</div>
-              <div class="shopping_cell_creator">{{ cellItems.creator }}</div>
+              <div
+                v-if="cellIsService"
+                class="shopping_cell_type"
+              >{{ cellItems.service.data_service_type1_name }}{{ cellItems.service.data_service_type2_name }}{{ cellItems.service.data_service_type3_name }}</div>
+              <div v-else class="shopping_cell_type">{{ cellItems.application.ywly }}</div>
+              <div
+                class="shopping_cell_creator"
+              >{{ cellIsService ? cellItems.service.organization_name:cellItems.application.org }}</div>
             </div>
           </div>
         </div>
@@ -34,39 +40,52 @@
       <el-col :span="5">
         <div class="shopping_cell_specification">
           <div class="shopping_cell_specification_val">
-            <div
-              class="shopping_cell_specification_val_specification"
-            >规格：{{ specificationBtns[cellItems.specification] }}</div>
+            <div class="shopping_cell_specification_val_specification">规格：{{ getSpecification }}</div>
             <div
               class="shopping_cell_specification_val_type"
-            >申请方式：{{ specificationApplicationBtns[cellItems.specificationApplication - 1] }}</div>
+            >申请方式：{{ specificationApplicationBtns[cellItems.duration_method - 1].value }}</div>
             <div class="shopping_cell_specification_edit">
               <el-popover
                 placement="right-start"
                 width="280"
                 v-model="visible"
-                @after-leave="setSpecificationPop"
+                @show="setSpecificationPop"
               >
                 <div>
-                  <div class="shopping_cell_specification_title">规格：</div>
-                  <div>
-                    <el-button
-                      v-for="(item, index) in specificationBtns"
-                      :key="'specification' + index"
-                      :class="specificationPop == index ? 'shopping_cell_specification_btn active' : 'shopping_cell_specification_btn'"
-                      size="mini"
-                      @click="changeSpecification(index)"
-                    >{{ index + 1 + ". " + item }}</el-button>
+                  <div v-if="cellIsService">
+                    <div class="shopping_cell_specification_title">规格：</div>
+                    <div v-if="cellItems.service.request_spcs_info && cellItems.service.request_spcs_info.length != 0">
+                      <el-button
+                        v-for="(item, index) in cellItems.service.request_spcs_info"
+                        :key="'specification' + index"
+                        :class="specificationPop == item.id ? 'shopping_cell_specification_btn active' : 'shopping_cell_specification_btn'"
+                        size="mini"
+                        @click="changeSpecification(item.id)"
+                      >{{ index + 1 + ". " + item.des }}</el-button>
+                    </div>
+                    <div class="no_option" v-else>暂无规格</div>
+                  </div>
+                  <div v-else>
+                    <div class="shopping_cell_specification_title">规格：</div>
+                    <div>
+                      <el-button
+                        v-for="(item, index) in appSpecificationBtns"
+                        :key="'specification' + index"
+                        :class="specificationPop == item.id ? 'shopping_cell_specification_btn active' : 'shopping_cell_specification_btn'"
+                        size="mini"
+                        @click="changeSpecification(item.id)"
+                      >{{ index + 1 + ". " + item.value }}</el-button>
+                    </div>
                   </div>
                   <div class="shopping_cell_specification_title">申请方式：</div>
                   <div>
                     <el-button
                       v-for="(item, index) in specificationApplicationBtns"
                       :key="'specification' + index"
-                      :class="specificationApplicationPop == index ? 'shopping_cell_specification_btn active' : 'shopping_cell_specification_btn'"
+                      :class="specificationApplicationPop == item.id ? 'shopping_cell_specification_btn active' : 'shopping_cell_specification_btn'"
                       size="mini"
-                      @click="changeSpecificationApplication(index)"
-                    >{{ item }}购买</el-button>
+                      @click="changeSpecificationApplication(item.id)"
+                    >{{ item.value }}购买</el-button>
                   </div>
                 </div>
                 <div class="pop_footer">
@@ -93,7 +112,7 @@
       <el-col :span="4" class="shopping_cell_num">
         <el-input-number
           :disabled="readOnly"
-          v-model="cellItems.num"
+          v-model="cellItems.duration"
           @change="changeNum"
           size="mini"
           :min="1"
@@ -102,7 +121,7 @@
       <el-col :span="4" class="shopping_cell_options">
         <el-checkbox
           v-if="!readOnly"
-          v-model="cellItems.checkedSubscription"
+          v-model="cellItems.is_subscribe"
           @change="changeSubscription"
         >订阅该服务</el-checkbox>
         <div class="shopping_cell_options_del">
@@ -126,6 +145,9 @@ export default {
     readOnly: {
       type: Boolean,
       default: false
+    },
+    cellIsService: {
+      type: Boolean
     }
   },
   watch: {
@@ -146,34 +168,69 @@ export default {
     checkedSubscription: false,
     visible: false,
     specificationPop: 1,
-    specificationApplicationPop: 0,
-    specificationBtns: [
-      "访问次数：20/日  访问量：100/日",
-      "访问次数：200/日  访问量：1000/日",
-      "访问次数：无上限  访问量：无上限"
+    specificationApplicationPop: 1,
+    // specificationBtns: [
+    //   { id: 1, value: "访问次数：20/日  访问量：100/日" },
+    //   { id: 2, value: "访问次数：200/日  访问量：1000/日" },
+    //   { id: 3, value: "访问次数：无上限  访问量：无上限" }
+    // ],
+    appSpecificationBtns: [
+      { id: 1, value: "部署" },
+      { id: 2, value: "开发" }
     ],
-    specificationApplicationBtns: ["按月", "按年"]
+    specificationApplicationBtns: [
+      { id: 1, value: "按月" },
+      { id: 2, value: "按年" }
+    ]
   }),
-  computed: {},
+  computed: {
+    getSpecification() {
+      if (this.cellIsService) {
+        let arr = [];
+        if (
+          this.cellItems.service.request_spec_info &&
+          this.cellItems.service.request_spec_info.length != 0
+        ) {
+          this.cellItems.service.request_spec_info.forEach(item => {
+            arr.push(item.id);
+          });
+        }
+        let num = arr.indexOf(this.cellItems.spec_id);
+        let specification = "";
+        if (num != -1) {
+          specification = this.cellItems.service.request_spec_info[num].value;
+        }
+        return specification;
+      } else {
+        if (this.cellItems.spec_id == 1) {
+          return "部署";
+        } else {
+          return "开发";
+        }
+      }
+    }
+  },
+  mounted() {},
   methods: {
     getState(val) {
       this.$emit("changeState", { state: val, index: this.cellIndex });
     },
     changeSpecification(val) {
+      console.log(val);
       this.specificationPop = val;
     },
     changeSpecificationApplication(val) {
       this.specificationApplicationPop = val;
     },
     submitPop() {
-      this.cellItems.specification = this.specificationPop;
-      this.cellItems.specificationApplication = this.specificationApplicationPop;
+      this.cellItems.spec_id = this.specificationPop;
+      this.cellItems.duration_method = this.specificationApplicationPop;
       this.visible = false;
       this.changeCellItem();
     },
     setSpecificationPop() {
-      this.specificationPop = this.cellItems.specification;
-      this.specificationApplicationPop = this.cellItems.specificationApplication;
+      this.specificationPop = this.cellItems.spec_id;
+      this.specificationApplicationPop = this.cellItems.duration_method;
     },
     changeSubscription(val) {
       this.changeCellItem();
@@ -193,8 +250,7 @@ export default {
         data: this.cellItems
       });
     }
-  },
-  mounted() {}
+  }
 };
 </script>
 
@@ -349,6 +405,11 @@ export default {
   text-align: right;
   margin: 30px 5px 5px;
 }
+.no_option {
+  text-align: center;
+  height: 40px;
+  line-height: 40px;
+}
 </style>
 <style>
 .shopping_cell_specification_edit .el-button {
diff --git a/src/components/shopping-cart/shopping-cart-com.vue b/src/components/shopping-cart/shopping-cart-com.vue
index d611433..c950b30 100644
--- a/src/components/shopping-cart/shopping-cart-com.vue
+++ b/src/components/shopping-cart/shopping-cart-com.vue
@@ -26,7 +26,7 @@
     </div>
     <div class="shopping_list shopping_list_fail">
       <div class="expired_service">已失效服务</div>
-      <ShoppingCartList :readOnly="true" class="shopping_all_list" />
+      <ShoppingCartList :readOnly="true" :list="listIn" class="shopping_all_list" />
     </div>
     <div class="shopping_list shopping_list_options">
       <div class="shopping_cart_options">
@@ -74,7 +74,8 @@ export default {
   data: () => ({
     checkShopAll: false,
     checkList: [],
-    list: []
+    list: [],
+    listIn: []
   }),
   mounted() {
     this.getList();
@@ -93,11 +94,11 @@ export default {
       this.$api.serviceShop.getShoppingCart().then(response => {
         if (response.data.success == "1") {
           console.log(response.data.data);
-          this.list = response.data.data;
+          this.list = response.data.data.valid;
+          this.listIn = response.data.data.invalid;
           for (const index in this.list) {
             this.checkList.push(false);
           }
-          console.log(this.checkList);
         } else {
           console.log(response.data.message);
         }
@@ -109,7 +110,6 @@ export default {
     changeState(val) {
       console.log(val);
       this.$set(this.checkList, val.index, val.state);
-      console.log(this.checkList);
       if (this.checkList.indexOf(false) == -1) {
         this.checkShopAll = true;
       } else {
@@ -117,24 +117,37 @@ export default {
       }
     },
     delSelectService() {
+      let query = [];
       this.checkList.forEach((item, index) => {
         if (item === true) {
-          console.log(this.list[index]);
+          query.push(this.list[index].id);
         }
       });
+      this.$api.serviceShop.delShoppingCart(query).then(response => {
+        console.log(response);
+        this.getList()
+      });
     },
     changeCellMsg(val) {
       console.log(val);
     },
     deleteItem(val) {
       console.log(val);
+      let query = [val.data.id];
+      this.$api.serviceShop.delShoppingCart(query).then(response => {
+        console.log(response);
+        this.getList()
+      });
     },
     oneClickApplication() {
+      let arr = [];
       this.checkList.forEach((item, index) => {
         if (item === true) {
-          console.log(this.list[index]);
+          arr.push(this.list[index]);
         }
       });
+      this.$store.commit("setShoppingCart", arr);
+      this.$router.push({ name: "shopCarApply" });
     }
   }
 };
diff --git a/src/components/shopping-cart/shopping-cart-list.vue b/src/components/shopping-cart/shopping-cart-list.vue
index 1a5fb9a..c5ffac1 100644
--- a/src/components/shopping-cart/shopping-cart-list.vue
+++ b/src/components/shopping-cart/shopping-cart-list.vue
@@ -4,6 +4,7 @@
       <ShoppingCartCell
         v-for="(item, index) in list"
         :cellItem="item"
+        :cellIsService="item.service_id == 0 ? false:true"
         :cellIndex="index"
         :cellCheck="checkLists[index]"
         :key="item.id"
@@ -35,7 +36,9 @@ export default {
     },
     checkList: {
       type: Array,
-      default: ()=> {[]}
+      default: () => {
+        [];
+      }
     }
   },
   watch: {
@@ -57,14 +60,14 @@ export default {
     },
     setAllState(val) {
       for (let i = 0; i < this.checkLists.length; i++) {
-        this.$set(this.checkLists, i, val)
+        this.$set(this.checkLists, i, val);
       }
     },
     changeCellMsg(val) {
-      this.$emit("changeCellMsg", val)
+      this.$emit("changeCellMsg", val);
     },
     deleteItem(val) {
-      this.$emit("deleteItem", val)
+      this.$emit("deleteItem", val);
     }
   }
 };
diff --git a/src/components/dialog-remove.vue b/src/components/table/dialog-remove.vue
similarity index 100%
rename from src/components/dialog-remove.vue
rename to src/components/table/dialog-remove.vue
diff --git a/src/components/table-filter.vue b/src/components/table/table-filter.vue
similarity index 100%
rename from src/components/table-filter.vue
rename to src/components/table/table-filter.vue
diff --git a/src/components/table-input.vue b/src/components/table/table-input.vue
similarity index 100%
rename from src/components/table-input.vue
rename to src/components/table/table-input.vue
diff --git a/src/components/table-select.vue b/src/components/table/table-select.vue
similarity index 100%
rename from src/components/table-select.vue
rename to src/components/table/table-select.vue
diff --git a/src/components/table-um.vue b/src/components/table/table-um.vue
similarity index 97%
rename from src/components/table-um.vue
rename to src/components/table/table-um.vue
index c77b58e..d4aa394 100644
--- a/src/components/table-um.vue
+++ b/src/components/table/table-um.vue
@@ -178,9 +178,9 @@
             </el-popover>
             <!-- 排名图标替换 -->
             <span v-else-if="item.type === 'rank'">
-              <img src="../assets/imgs/list_ic_topone.png" alt v-if="scope.row[item.prop]==1" />
-              <img src="../assets/imgs/list_ic_toptwo.png" alt v-if="scope.row[item.prop]==2" />
-              <img src="../assets/imgs/list_ic_topthree.png" alt v-if="scope.row[item.prop]==3" />
+              <img src="@/assets/imgs/list_ic_topone.png" alt v-if="scope.row[item.prop]==1" />
+              <img src="@/assets/imgs/list_ic_toptwo.png" alt v-if="scope.row[item.prop]==2" />
+              <img src="@/assets/imgs/list_ic_topthree.png" alt v-if="scope.row[item.prop]==3" />
               {{ [1,2,3].indexOf(scope.row[item.prop])!==-1?'':scope.row[item.prop] }}
             </span>
             <!-- 服务添加图标 -->
@@ -188,7 +188,7 @@
               v-else-if="item.type === 'hot'"
               :style="scope.row['hot']?{marginLeft:'-10px'}:{paddingLeft:'2px'}"
             >
-              <img src="../assets/imgs/list_ic_hot.png" alt v-if="scope.row['hot']" />
+              <img src="@/assets/imgs/list_ic_hot.png" alt v-if="scope.row['hot']" />
               {{ scope.row[item.prop] }}
             </span>
             <!-- others -->
@@ -248,12 +248,12 @@
 
 <script>
 import services from "@/services";
-import TableInput from "@/components/table-input";
-import TableSelect from "@/components/table-select";
+import TableInput from "@/components/table/table-input";
+import TableSelect from "@/components/table/table-select";
 import helper from "@/services/helper";
-import DConfirm from "@/components/dialog-remove";
-import TableUmhref from "@/components/table-umhref";
-import TableFilter from "@/components/table-filter";
+import DConfirm from "@/components/table/dialog-remove";
+import TableUmhref from "@/components/table/table-umhref";
+import TableFilter from "@/components/table/table-filter";
 export default {
   components: {
     "v-apaas-table-input": TableInput,
diff --git a/src/components/table-umhref.vue b/src/components/table/table-umhref.vue
similarity index 100%
rename from src/components/table-umhref.vue
rename to src/components/table/table-umhref.vue
diff --git a/src/i18n/language-zh.js b/src/i18n/language-zh.js
index f765587..36caa85 100644
--- a/src/i18n/language-zh.js
+++ b/src/i18n/language-zh.js
@@ -11,4 +11,7 @@ export const lang={
     // unit of purchase duration
     byYear: "按年",
     byMonth: "按月",
+
+    // service shop menu item
+    serviceShop: "服务超市"
 }
\ No newline at end of file
diff --git a/src/pages/example/example_table.vue b/src/pages/example/example_table.vue
index 27612f4..df4426f 100644
--- a/src/pages/example/example_table.vue
+++ b/src/pages/example/example_table.vue
@@ -77,7 +77,7 @@
 </template>
 
 <script>
-import cesTable from "@/components/table-um";
+import cesTable from "@/components/table/table-um";
 export default {
   data: () => ({
     headers: [
diff --git a/src/pages/user/message.vue b/src/pages/user/message.vue
index 219ba05..24c4b01 100644
--- a/src/pages/user/message.vue
+++ b/src/pages/user/message.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import CesTable from "@/components/table-um";
+import CesTable from "@/components/table/table-um";
 import BlockRadius from "@/components/block-radius";
 export default {
   components: {
diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue
index b181ed2..ab6811b 100644
--- a/src/pages/user/order/order_detail.vue
+++ b/src/pages/user/order/order_detail.vue
@@ -109,7 +109,7 @@
 <script>
 import BlockRadius from "@/components/block-radius";
 import ProcessCard from "@/components/process-card";
-import TableUm from "@/components/table-um";
+import TableUm from "@/components/table/table-um";
 import InfoList from "@/components/infoList";
 export default {
   components: {
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index e2ed64a..e162773 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -22,7 +22,7 @@
 <script>
 import serviceHeader from '@/components/service-header'
 import infoList from '@/components/infoList'
-import tableUm from '@/components/table-um'
+import tableUm from '@/components/table/table-um'
 import processCard from '@/components/process-card'
 export default {
     props: {
diff --git a/src/pages/workbench/fwgl/approval_service_detail.vue b/src/pages/workbench/fwgl/approval_service_detail.vue
index b14858e..6159887 100644
--- a/src/pages/workbench/fwgl/approval_service_detail.vue
+++ b/src/pages/workbench/fwgl/approval_service_detail.vue
@@ -54,7 +54,7 @@
 <script>
 import serviceHeader from "@/components/service-header";
 import infoList from "@/components/infoList";
-import tableUm from "@/components/table-um";
+import tableUm from "@/components/table/table-um";
 import processCard from "@/components/process-card";
 export default {
   props: {},
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 8df30d5..5c0b5ec 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -138,7 +138,7 @@
 
 <script>
 import infoList from "@/components/infoList";
-import tableUm from "@/components/table-um";
+import tableUm from "@/components/table/table-um";
 import codes from "@/components/codes";
 import norCard from "@/components/card";
 import exampleIcon from "@/pages/example/example_icon";
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index b6f88b0..6e2e8ce 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -349,7 +349,7 @@
 
 <script>
 import BlockRadius from "@/components/block-radius";
-import CesTable from "@/components/table-um";
+import CesTable from "@/components/table/table-um";
 import Codes from "@/components/codes";
 import uploadFile from "@/components/upload_file";
 export default {
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index 9ef9685..8819ca2 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -238,7 +238,7 @@
 
 <script>
 import uuidv1 from "uuid/v1";
-import tableUm from "@/components/table-um";
+import tableUm from "@/components/table/table-um";
 import { getRole } from "@/utils/common";
 var echarts = require("echarts");
 export default {
diff --git a/src/pages/workbench/yygl/app_detail.vue b/src/pages/workbench/yygl/app_detail.vue
index 06c88f2..ba06b48 100644
--- a/src/pages/workbench/yygl/app_detail.vue
+++ b/src/pages/workbench/yygl/app_detail.vue
@@ -96,7 +96,7 @@
 
 <script>
 import infoList from "@/components/infoList";
-import tableUm from "@/components/table-um";
+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'
diff --git a/src/pages/workbench/yygl/apply_app_detail.vue b/src/pages/workbench/yygl/apply_app_detail.vue
index d66517d..9e0e755 100644
--- a/src/pages/workbench/yygl/apply_app_detail.vue
+++ b/src/pages/workbench/yygl/apply_app_detail.vue
@@ -42,7 +42,7 @@
 <script>
 import serviceHeader from "@/components/service-header";
 import infoList from "@/components/infoList";
-import tableUm from "@/components/table-um";
+import tableUm from "@/components/table/table-um";
 import processCard from "@/components/process-card";
 import { getRole } from "@/utils/common";
 export default {
diff --git a/src/pages/workbench/yygl/approval_app_detail.vue b/src/pages/workbench/yygl/approval_app_detail.vue
index b89889c..2cb2145 100644
--- a/src/pages/workbench/yygl/approval_app_detail.vue
+++ b/src/pages/workbench/yygl/approval_app_detail.vue
@@ -54,7 +54,7 @@
 <script>
 import serviceHeader from "@/components/service-header";
 import infoList from "@/components/infoList";
-import tableUm from "@/components/table-um";
+import tableUm from "@/components/table/table-um";
 import processCard from "@/components/process-card";
 import {getRole} from "@/utils/common"
 export default {
diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue
index 48596f3..804adc6 100644
--- a/src/pages/workbench/yygl/deploy_app_detail.vue
+++ b/src/pages/workbench/yygl/deploy_app_detail.vue
@@ -196,7 +196,7 @@
 
 <script>
 import infoList from "@/components/infoList";
-import tableUm from "@/components/table-um";
+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";
diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue
index cc8631f..a8a324c 100644
--- a/src/pages/workbench/yygl/yyglList.vue
+++ b/src/pages/workbench/yygl/yyglList.vue
@@ -86,9 +86,9 @@
 </template>
 
 <script>
-import tableFilter from "@/components/table-filter";
+import tableFilter from "@/components/table/table-filter";
 import appList from "@/components/app-list/app-list";
-import cesTable from "@/components/table-um";
+import cesTable from "@/components/table/table-um";
 import dialogAction from "@/components/dialog-action";
 import commentsPagination from "@/components/comments-pagination";
 import { mapState } from "vuex";
diff --git a/src/request/api/service_shop.js b/src/request/api/service_shop.js
index b0c6c6a..40ea988 100644
--- a/src/request/api/service_shop.js
+++ b/src/request/api/service_shop.js
@@ -15,6 +15,9 @@ serviceType2s=${params.serviceType2s}&dataDomains=${params.dataDomains}&
 organizeIds=${params.organizeIds}&orderBy=${params.orderBy}&
 Page=${params.Page}&Size=${params.Size}`);
     },
+    getAppList(params) {
+        return axios.get(``)
+    },
     getServiceShopDetail(params) {
         return axios.get(`/apaas/serviceapp/v3/servicemarket/detail?serviceId=`)
     },
diff --git a/src/router/index.js b/src/router/index.js
index 9badeaf..8e9ee8e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -114,32 +114,12 @@ export default new Router({
         {
           path: "/shop", // 服务超市
           name: "shop",
-          redirect: "/shop/data_service_list",
+          redirect: "/shop/service",
           component: () => import("@/pages/service_shop/shop"),
           children: [
             {
-              path: "/shop/data_service_list", // 数据服务列表页
-              name: "shopDataList",
-              component: () => import("@/pages/service_shop/shop_list"),
-            },
-            {
-              path: "/shop/space_time_service_list", // 时空服务列表页
-              name: "shopSpaceTimeList",
-              component: () => import("@/pages/service_shop/shop_list"),
-            },
-            {
-              path: "/shop/video_service_list", // 视频服务列表页
-              name: "shopVideoList",
-              component: () => import("@/pages/service_shop/shop_list"),
-            },
-            {
-              path: "/shop/perception_service_list", // 感知服务列表页
-              name: "shopPerceptionList",
-              component: () => import("@/pages/service_shop/shop_list"),
-            },
-            {
-              path: "/shop/comprehensive_app_list", // 综合应用列表页
-              name: "shopComAppList",
+              path: "/shop/service/:id", // 数据服务、时空、视频、感知、综合、应用列表页
+              name: "shopList",
               component: () => import("@/pages/service_shop/shop_list"),
             },
             {
@@ -153,11 +133,6 @@ export default new Router({
               component: () =>
                 import("@/pages/service_shop/service_application_successfully"),
             },
-            {
-              path: "/shop/app_store_list", // 应用商店列表页
-              name: "shopAppStoreList",
-              component: () => import("@/pages/service_shop/shop_list"),
-            },
             {
               path: "/shop/shopping_cart", // 购物车页
               name: "shoppingCart",
diff --git a/src/store/index.js b/src/store/index.js
index 801ce92..189641c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -16,6 +16,8 @@ const store = new Vuex.Store({
       ["应用仓库管理", "部署的应用", "应用审批管理"], // 组织管理员
       ["平台应用管理", "应用部署管理", "应用审批管理"], // 超级管理员
     ], // 应用管理列表，onlyRead
+    shoppingCart: [], //购物车
+    menuCartState: 0, //购物车操作都要修改这个值，menu监听这个值的变化实时获取购物车列表
   },
   modules: {},
   mutations: {
@@ -25,6 +27,12 @@ const store = new Vuex.Store({
     serviceShopMenuAct(state, newValue) {
       state.serviceShopMenu = newValue;
     },
+    setShoppingCart(state, newValue) {
+      state.shoppingCart = newValue;
+    },
+    setMenuCartState(state) {
+      state.menuCartState++;
+    }
   },
 });
 
-- 
2.26.0