From 2789fff9b1444aa53b2021d02f9d83425fa5da79 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Mon, 25 May 2020 11:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8C=89=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/{ => app-build-steps}/app-build-step.vue   | 0
 src/components/{ => app-build-steps}/app-build-steps.vue  | 0
 src/components/service_shop_menu.vue                      | 2 +-
 src/pages/service_shop/services_shop.vue                  | 2 +-
 src/pages/service_shop/shop_list_comprehensive_app.vue    | 2 +-
 .../service_shop/{zhyyfwDetail.vue => zhfwDetail.vue}     | 2 +-
 src/pages/workbench/app_build.vue                         | 4 ++--
 src/router/index.js                                       | 8 ++++----
 static/serviceBaseInfo.json                               | 4 ++--
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename src/components/{ => app-build-steps}/app-build-step.vue (100%)
 rename src/components/{ => app-build-steps}/app-build-steps.vue (100%)
 rename src/pages/service_shop/{zhyyfwDetail.vue => zhfwDetail.vue} (96%)

diff --git a/src/components/app-build-step.vue b/src/components/app-build-steps/app-build-step.vue
similarity index 100%
rename from src/components/app-build-step.vue
rename to src/components/app-build-steps/app-build-step.vue
diff --git a/src/components/app-build-steps.vue b/src/components/app-build-steps/app-build-steps.vue
similarity index 100%
rename from src/components/app-build-steps.vue
rename to src/components/app-build-steps/app-build-steps.vue
diff --git a/src/components/service_shop_menu.vue b/src/components/service_shop_menu.vue
index 7035f89..f3a878e 100644
--- a/src/components/service_shop_menu.vue
+++ b/src/components/service_shop_menu.vue
@@ -51,7 +51,7 @@ export default {
         },
         {
           id: 4,
-          label: "综合应用服务",
+          label: "综合服务",
           router: "/shop/comprehensive_app_list",
           active: "tool_ic_zongheyyfw_sel",
           default: "tool_ic_zongheyyfw"
diff --git a/src/pages/service_shop/services_shop.vue b/src/pages/service_shop/services_shop.vue
index ed05758..5e5fbf8 100644
--- a/src/pages/service_shop/services_shop.vue
+++ b/src/pages/service_shop/services_shop.vue
@@ -52,7 +52,7 @@
     <shop-list
       name="综合应用"
       to="/shop/comprehensive_app_list"
-      detail-path="/shop/zhyyfwDetail/"
+      detail-path="/shop/zhfwDetail/"
       :data="comprehensive_datas"
     ></shop-list>
   </div>
diff --git a/src/pages/service_shop/shop_list_comprehensive_app.vue b/src/pages/service_shop/shop_list_comprehensive_app.vue
index 2cbd1b1..fe09c59 100644
--- a/src/pages/service_shop/shop_list_comprehensive_app.vue
+++ b/src/pages/service_shop/shop_list_comprehensive_app.vue
@@ -5,7 +5,7 @@
         <service-shop-menu></service-shop-menu>
       </el-aside>
       <el-main>
-        <service-list name="综合应用" url="zhyyfwDetail" urlList="url1sss" urlFilter="urldwad2222"></service-list>
+        <service-list name="综合应用" url="zhfwDetail" urlList="url1sss" urlFilter="urldwad2222"></service-list>
       </el-main>
     </el-container>
   </div>
diff --git a/src/pages/service_shop/zhyyfwDetail.vue b/src/pages/service_shop/zhfwDetail.vue
similarity index 96%
rename from src/pages/service_shop/zhyyfwDetail.vue
rename to src/pages/service_shop/zhfwDetail.vue
index dd5a202..8352d0e 100644
--- a/src/pages/service_shop/zhyyfwDetail.vue
+++ b/src/pages/service_shop/zhfwDetail.vue
@@ -4,7 +4,7 @@
       <el-breadcrumb separator="/">
         <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
         <el-breadcrumb-item to="/shop/comprehensive_app_list"
-          >综合应用服务</el-breadcrumb-item
+          >综合服务</el-breadcrumb-item
         >
         <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
       </el-breadcrumb>
diff --git a/src/pages/workbench/app_build.vue b/src/pages/workbench/app_build.vue
index ce0cb29..1528c3e 100644
--- a/src/pages/workbench/app_build.vue
+++ b/src/pages/workbench/app_build.vue
@@ -203,8 +203,8 @@
 </template>
 
 <script>
-import appBuildSteps from "@/components/app-build-steps";
-import appBuildStep from "@/components/app-build-step";
+import appBuildSteps from "@/components/app-build-steps/app-build-steps";
+import appBuildStep from "@/components/app-build-steps/app-build-step";
 import uploadFile from "@/components/upload_file";
 import cesTable from "@/components/table-um";
 
diff --git a/src/router/index.js b/src/router/index.js
index c6307e6..493d651 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -170,10 +170,10 @@ export default new Router({
           component: () => import("@/pages/service_shop/skfwDetail"),
         }, // 服务超市 - 时空服务详情
         {
-          path: "/shop/zhyyfwDetail/:id",
-          name: "zhyyfwDetail",
-          component: () => import("@/pages/service_shop/zhyyfwDetail"),
-        }, // 服务超市 - 综合应用服务详情
+          path: "/shop/zhfwDetail/:id",
+          name: "zhfwDetail",
+          component: () => import("@/pages/service_shop/zhfwDetail"),
+        }, // 服务超市 - 综合服务详情
         {
           path: "/shop/yysdDetail/:id",
           name: "yysdDetail",
diff --git a/static/serviceBaseInfo.json b/static/serviceBaseInfo.json
index 02e66c9..d116431 100644
--- a/static/serviceBaseInfo.json
+++ b/static/serviceBaseInfo.json
@@ -89,7 +89,7 @@
     "publishTime": "2020-03-12 18:31:12",
     "updatedTime": "2020-03-12 18:31:12",
     "dataField": "经济建设",
-    "serviceType": "综合应用服务",
+    "serviceType": "综合服务",
     "resourceSummary": "提供视频监控的空间分布展示和视频监控直播的服务，MOUMOU监控服务和直播服务的新服务。",
     "specifications": [
       {
@@ -125,7 +125,7 @@
     "providedBy": "北京比格数据",
     "publishTime": "2020-03-12 18:31:12",
     "acquireCount": "9999",
-    "serviceType": "综合应用服务",
+    "serviceType": "综合服务",
     "dataField": "经济建设",
     "specifications": [
       {
-- 
2.26.0