Merge branch 'xym' into dev

src/components/service-tabs/service-tabs.vue

@@ -5,30 +5,39 @@
     v-model="tabName"
     :stretch="true"
   >
+
+    <!-- 服务详情信息 -->
     <el-tab-pane :label="detailTitle" name="detail" v-if="detailUrl">
       <service-tab-detail
         class="service_info"
         :url="detailUrl"
       ></service-tab-detail>
     </el-tab-pane>
+
+    <!-- 规格定价 -->
     <el-tab-pane :label="specificationTitle" name="specification" v-if="specificationUrl">
       <service-tab-specification
         class="service_info"
         :url="specificationUrl"
       ></service-tab-specification>
     </el-tab-pane>
+
+    <!-- 提供机构 -->
     <el-tab-pane :label="providerTitle" name="provider" v-if="providerUrl">
       <service-tab-provider
         class="service_info"
         :url="providerUrl"
       ></service-tab-provider>
     </el-tab-pane>
+
+    <!-- 服务评价信息 -->
     <el-tab-pane :label="commentsTitle" name="comments" v-if="commentsUrl">
       <service-tab-comments
         class="service_info"
         :url="commentsUrl"
       ></service-tab-comments>
     </el-tab-pane>
+
   </el-tabs>
 </template>
 

src/components/table-um.vue

@@ -837,6 +837,10 @@ em {
   border: 0;
   padding: 0;
 }
+.ces_toolbar_inp .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+}
 </style>
 <style scoped>
 .ces-table {

src/pages/service_shop/sjfwDetail.vue

@@ -3,9 +3,9 @@
     <div class="sevice_breadcrumb">
       <el-breadcrumb separator="/">
         <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
-        <el-breadcrumb-item to="/shop/data_service_list"
-          >数据服务</el-breadcrumb-item
-        >
+        <el-breadcrumb-item to="/shop/data_service_list">
+          数据服务
+        </el-breadcrumb-item>
         <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
       </el-breadcrumb>
     </div>

src/pages/service_shop/skfwDetail.vue

@@ -3,9 +3,9 @@
     <div class="sevice_breadcrumb">
       <el-breadcrumb separator="/">
         <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
-        <el-breadcrumb-item to="/shop/space_time_service_list"
-          >时空服务</el-breadcrumb-item
-        >
+        <el-breadcrumb-item to="/shop/space_time_service_list">
+          时空服务
+        </el-breadcrumb-item>
         <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
       </el-breadcrumb>
     </div>

src/pages/service_shop/zhfwDetail.vue

@@ -3,9 +3,9 @@
     <div class="sevice_breadcrumb">
       <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 to="/shop/comprehensive_app_list">
+          综合服务
+        </el-breadcrumb-item>
         <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
       </el-breadcrumb>
     </div>

src/pages/workbench/fwgl/fwglList.vue

@@ -10,10 +10,10 @@
       <ces-table
         class="r_yhgl_table"
         size="mini"
-        url="tableData"
         :detailsUrl="detailsUrl"
         :border="false"
         :headers="headers"
+        :datas="datas"
         :searchShow="true"
         :autoAdd="false"
         :emptyText="emptyText"
@@ -48,6 +48,7 @@ export default {
     level: 0, // 用户等级
     type: 0, // 访问的页面
     headers: [],
+    datas: [],
     url: "",
     confirmOptions: {
       title: "",
@@ -117,6 +118,39 @@ export default {
     dialogAction,
   },
   methods: {
+    initFilter() {
+      /* this.$http
+        .get("/apaas/serviceapp/v3/servicemarket/list", {
+          params: {},
+        })
+        .then(({ data }) => {
+          console.log(data);
+        })
+        .catch((error) => {
+          console.log(error);
+        }); */
+    },
+    initDatas() {
+      this.$http
+        .get("/apaas/service/v3/service/manager/list", {
+          params: {
+            data_service_type: 0,
+            sectors: 0,
+            openness: 0,
+            state: "",
+            keyword: "",
+            page: 1,
+            size: 20,
+          },
+        })
+        .then(({ data }) => {
+          this.datas = data.data.data;
+          // console.log(this.datas);
+        })
+        .catch((error) => {
+          console.log(error);
+        });
+    },
     initHeader() {
       let level = this.level;
       let type = this.type;
@@ -125,16 +159,31 @@ export default {
       if (level == 0 && type == 0) {
         this.headers = [
           { label: "服务名称", prop: "name", type: "href", align: "left" },
-          { label: "服务领域", prop: "date", type: "", align: "center" },
-          { label: "开放程度", prop: "address", type: "", align: "center" },
-          { label: "服务描述", prop: "address", type: "", align: "left" },
+          {
+            label: "服务领域",
+            prop: "sectors_name",
+            type: "",
+            align: "center",
+          },
+          {
+            label: "开放程度",
+            prop: "openness_name",
+            type: "",
+            align: "center",
+          },
+          { label: "服务描述", prop: "descript", type: "", align: "left" },
           {
             label: "注册发布时间",
-            prop: "address",
+            prop: "create_time",
+            type: "",
+            align: "center",
+          },
+          {
+            label: "服务类型",
+            prop: "data_service_type1_name",
             type: "",
             align: "center",
           },
-          { label: "服务类型", prop: "address", type: "", align: "center" },
           {
             label: "操作",
             type: "Button",
@@ -458,7 +507,9 @@ export default {
   created() {
     this.level = parseInt(this.$route.params.level);
     this.type = parseInt(this.$route.params.type);
+    this.initFilter();
     this.initHeader();
+    this.initDatas();
   },
 };
 </script>

static/serviceInfo.json

@@ -72,13 +72,13 @@
               "align": "center"
             },
             {
-              "prop": "zdlx",
-              "label": "字段类型",
+              "prop": "zdmc",
+              "label": "字段名称",
               "align": "center"
             },
             {
-              "prop": "zdmc",
-              "label": "字段名称",
+              "prop": "zdlx",
+              "label": "字段类型",
               "align": "center"
             },
             {
@@ -186,15 +186,15 @@
               "label": "字段编码",
               "align": "center"
             },
+            {
+              "prop": "zdmc",
+              "label": "字段名称"
+            },
             {
               "prop": "zdlx",
               "label": "字段类型",
               "align": "center"
             },
-            {
-              "prop": "zdmc",
-              "label": "字段名称"
-            },
             {
               "prop": "zdsm",
               "label": "字段说明"