Merge branch 'ldx' into dev

src/components/menu.vue

 <template>
   <div class="menu">
-    <img src="../assets/imgs/home_img_logo.png" alt class="logo" />
+    <img @click="gotopage('/services_shop')" src="../assets/imgs/home_img_logo.png" alt class="logo" />
     <div style="float:right;cursor: pointer;position:relative;" class="user_hover">
       <span
         v-if="userInfo.user_name && userInfo.user_name != ''"
@@ -94,7 +94,7 @@ export default {
       user_arr: [
         { name: "个人档案", path: "/user/user_info" },
         { name: "消息通知", path: "/user/message" },
-        { name: "收银中心", path: "" },
+        { name: "订单管理", path: "/user/order_list" },
         { name: "关于BD-aPaaS", path: "" },
         { name: "退出登录", path: "logout" }
       ],
@@ -209,6 +209,7 @@ export default {
 .logo {
   float: left;
   margin: 30px 0 0 40px;
+  cursor: pointer;
 }
 .user {
   float: right;

src/components/service-list/service_list.vue

@@ -216,7 +216,12 @@ export default {
     ],
     page: 1,
     limit: 10,
-    couldTwice: false
+    couldTwice: false,
+    refresh_app_1: false,
+    refresh_app_2: false,
+    refresh_app_3: false,
+    time_app: null,
+    times: null
   }),
   mounted() {},
   watch: {
@@ -327,6 +332,12 @@ export default {
         this.getAppType();
         this.getAppOrg();
         this.getShopList();
+        this.time_app = setInterval(() => {
+          if (this.refresh_app_1 && this.refresh_app_2 && this.refresh_app_3) {
+            this.judgeHeight();
+            clearInterval(this.time_app)
+          }
+        }, 50);
       } else {
         let query = {
           type: this.urlFilter
@@ -356,12 +367,14 @@ export default {
     judgeHeight() {
       let list = this.filterLists;
       for (let i = 0; i < list.length; i++) {
-        let offHeight = document.getElementById(list[i].id).offsetHeight;
-        if (offHeight > 60) {
-          list[i].showOpen = true;
-          this.openList[i] = "up";
-        } else {
-          list[i].showOpen = false;
+        if (list[i].childDomains.length != 0) {
+          let offHeight = document.getElementById(list[i].id).offsetHeight;
+          if (offHeight > 60) {
+            list[i].showOpen = true;
+            this.openList[i] = "up";
+          } else {
+            list[i].showOpen = false;
+          }
         }
       }
       this.$set((this.filterLists = list));
@@ -459,6 +472,7 @@ export default {
       this.$api.serviceShop.getAppArea().then(response => {
         if (response.data.success == 1) {
           this.filterLists[1].childDomains = response.data.data;
+          this.refresh_app_1 = true;
         } else {
           console.log(response.data.errMsg);
         }
@@ -468,6 +482,7 @@ export default {
       this.$api.serviceShop.getAppType().then(response => {
         if (response.data.success == 1) {
           this.filterLists[2].childDomains = response.data.data;
+          this.refresh_app_2 = true;
         } else {
           console.log(response.data.errMsg);
         }
@@ -477,6 +492,7 @@ export default {
       this.$api.serviceShop.getAppOrg().then(response => {
         if (response.data.success == 1) {
           this.filterLists[3].childDomains = response.data.data;
+          this.refresh_app_3 = true;
         } else {
           console.log(response.data.errMsg);
         }

src/components/shop-card.vue

 <template>
-  <div class="shop_card">
-    <div class="shop_car-img" v-if="showImg" @click="intoDetail">
+  <div class="shop_card" @click="intoDetail">
+    <div class="shop_car-img" v-if="showImg">
       <img :src="data.cover" width="100%" />
     </div>
     <div class="shop_card-top">
-      <p
-        class="shop_card-title text_clip_2"
-        v-text="data.name"
-        :title="data.name"
-        @click="intoDetail"
-      ></p>
+      <p class="shop_card-title text_clip_2" v-text="data.name" :title="data.name"></p>
       <p class="shop_card-text under_text">
         <span class="text_clip" v-text="data.department_name" :title="data.department_name"></span>
         <span>
@@ -87,6 +82,7 @@ export default {
   border: 1px solid #ededed;
   border-radius: 10px;
   box-sizing: border-box;
+  cursor: pointer;
 }
 .shop_car-img {
   cursor: pointer;

src/components/topology.vue

@@ -262,7 +262,7 @@ export default {
             type: "image",
             img: "./static/topology_ic_zonghefw.svg",
             size: [15, 15],
-            label: "综合服务"
+            label: "综合应用"
           }
         ]
       };

src/pages/example/example_table.vue

@@ -161,22 +161,22 @@ export default {
       {
         name: "服务类型",
         prop: "fwlx",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
       },
       {
         name: "服务领域",
         prop: "fwly",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
       },
       {
         name: "开放程度",
         prop: "kfcd",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
       },
       {
         name: "服务状态",
         prop: "fwzt",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合服务"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
       }
     ],
     params: {

src/pages/service_shop/services_shop.vue

@@ -28,7 +28,7 @@
     <!-- 热门数据 -->
     <shop-list
       name="热门数据"
-      to="/shop/data_service_list"
+      to="/shop/data_service_list/5"
       detail-path="/shop/sjfwDetail/"
       :data="hot_datas"
       :showImg="false"
@@ -37,7 +37,7 @@
     <!-- 精品地图 -->
     <shop-list
       name="精品地图"
-      to="/shop/space_time_service_list"
+      to="/shop/space_time_service_list/6"
       detail-path="/shop/skfwDetail/"
       :data="map_datas"
       :showImg="true"
@@ -46,7 +46,7 @@
     <!-- 综合应用 -->
     <shop-list
       name="综合应用"
-      to="/shop/comprehensive_app_list"
+      to="/shop/comprehensive_app_list/21"
       detail-path="/shop/zhfwDetail/"
       :data="comprehensive_datas"
       :showImg="true"

src/pages/service_shop/shop_list.vue

@@ -58,7 +58,7 @@ export default {
           this.filterNames = [];
           break;
         case "comprehensive_app_list":
-          this.name = "综合服务";
+          this.name = "综合应用";
           this.urlFilter = "21";
           this.url = "/shop/zhfwDetail";
           this.filterNames = ["服务类型", "应用领域", "服务来源组织"];

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/11">
-          综合服务
+          综合应用
         </el-breadcrumb-item>
         <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
       </el-breadcrumb>

src/pages/workbench/fwgl/serviceDetail.vue

@@ -378,7 +378,7 @@ export default {
         "时空服务",
         "视频服务",
         "感知服务",
-        "综合服务"
+        "综合应用"
       ],
       scrvice_area_arr: [
         "经济建设",

src/router/index.js

@@ -206,7 +206,7 @@ export default new Router({
           path: "/shop/zhfwDetail/:id",
           name: "zhfwDetail",
           component: () => import("@/pages/service_shop/zhfwDetail"),
-        }, // 服务超市 - 综合服务详情
+        }, // 服务超市 - 综合应用详情
         {
           path: "/shop/yysdDetail/:id",
           name: "yysdDetail",

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": [
       {

static/workpalce.json

@@ -85,7 +85,7 @@
                 "value": 50
               },
               {
-                "name": "综合服务",
+                "name": "综合应用",
                 "value": 0
               }
         ],