Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/pages/service_shop/shop_list.vue

@@ -55,7 +55,7 @@ export default {
         case "video_service_list":
           this.name = "视频服务";
           this.urlFilter = "7";
-          this.url = "";
+          this.url = "/shop/spfwDetail";
           this.filterNames = ["", "服务领域", "服务来源组织"];
           break;
         case "perception_service_list":

src/pages/service_shop/spfwDetail.vue

+<template>
+  <div class="sevice_detail">
+    <div class="apass_breadcrumb">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
+        <el-breadcrumb-item to="/shop/data_service_list/5">
+          视频服务
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
+
+    <service-info :data="baseInfo" v-if="baseInfo"></service-info>
+
+    <service-tabs
+      :detail-data="detailData"
+      :provider-data="providerData"
+      :comments-data="commentsData"
+      :comments-url="commentsUrl"
+    ></service-tabs>
+  </div>
+</template>
+
+<script>
+import serviceInfo from "@/components/service-info/service-info";
+import serviceTabs from "@/components/service-tabs/service-tabs";
+
+export default {
+  components: {
+    serviceInfo,
+    serviceTabs,
+  },
+  data: () => ({
+    baseInfo: null,
+    detailData: null,
+    providerData: null,
+    commentsData: null,
+  }),
+  computed: {
+    id() {
+      return this.$route.params.id;
+    },
+    commentsUrl() {
+      return `/apaas/serviceapp/v3/servicemarket/estimates?serviceId=${this.id}`;
+    },
+  },
+  methods: {
+    init() {
+      this.$http
+        .get("/apaas/serviceapp/v3/servicemarket/detail", {
+          params: {
+            serviceId: this.id,
+          },
+        })
+        .then(({ data }) => {
+          let datas = data.data;
+          this.baseInfo = {
+            service_id: this.id,
+            app_id: 0,
+            name: datas.name,
+            // type: "",
+            openness: datas.openness,
+            view_count: datas.view_count,
+            apply_count: datas.apply_count,
+            cover: datas.cover,
+            organization_name: datas.organization_name,
+            create_time: datas.create_time,
+            update_date: datas.update_date,
+            sectors_name: datas.sectors_name,
+            data_service_type: [
+              datas.data_service_type1_name,
+              datas.data_service_type2_name,
+              datas.data_service_type3_name,
+            ],
+            descript: datas.descript,
+            serviceRequestSpcs: datas.serviceRequestSpcs,
+            scoreDetail: datas.scoreDetail,
+            month_sale: data.month_sale,
+          };
+
+          this.detailData = [
+            {
+              name: "获取流程",
+              type: "step",
+              value: ["服务申请", "信息填写", "审核确认", "服务获取"],
+            },
+            {
+              name: "服务描述",
+              type: "text",
+              value: datas.descript,
+            },
+            {
+              name: "请求方式",
+              type: "text",
+              value: ["-", "GET", "POST", "PUT", "DELETE"][datas.req_type || 0],
+            },
+            {
+              name: "编码格式",
+              type: "text",
+              value: datas.encode_method,
+            },
+            {
+              name: "请求参数",
+              type: "table",
+              value: {
+                datas: this.getTableData(datas.req_fields),
+                columns: [
+                  {
+                    prop: "name",
+                    label: "字段编码",
+                    width: 240,
+                  },
+                  {
+                    prop: "label",
+                    label: "字段名称",
+                    align: "center",
+                    width: 180,
+                  },
+                  {
+                    prop: "field_type",
+                    label: "字段类型",
+                    align: "center",
+                    width: 180,
+                  },
+                  {
+                    prop: "descript",
+                    label: "字段说明",
+                  },
+                  {
+                    prop: "is_must",
+                    label: "是否必须",
+                    align: "center",
+                    width: 180,
+                  },
+                  {
+                    prop: "example",
+                    label: "示例值",
+                    align: "center",
+                    width: 180,
+                  },
+                ],
+              },
+            },
+            {
+              name: "响应参数",
+              type: "table",
+              value: {
+                datas: this.getTableData(datas.res_fields),
+                columns: [
+                  {
+                    prop: "name",
+                    label: "字段编码",
+                    width: 240,
+                  },
+                  {
+                    prop: "label",
+                    label: "字段名称",
+                    align: "center",
+                    width: 180,
+                  },
+                  {
+                    prop: "field_type",
+                    label: "字段类型",
+                    align: "center",
+                    width: 180,
+                  },
+                  {
+                    prop: "descript",
+                    label: "字段说明",
+                  },
+                ],
+              },
+            },
+          ];
+          this.providerData = {
+            organization_name: datas.organization_name,
+            picture_path: datas.organization_picture,
+            user_name: datas.register_user_info.user_name,
+            phone: datas.register_user_info.phone,
+          };
+          this.commentsData = datas.scoreDetail;
+        })
+        .catch(function(error) {
+          console.log(error);
+        });
+    },
+    getTableData(tableStr) {
+      let tabledata = (tableStr && JSON.parse(tableStr)) || [];
+      let addRowId = (data, baseId = "") => {
+        data.forEach((item, index) => {
+          let rowId = baseId + (index + 1) + "";
+
+          item.rowId = rowId;
+
+          if (item.children && item.children.length) {
+            addRowId(item.children, rowId);
+          }
+        });
+      };
+
+      addRowId(tabledata);
+
+      return tabledata;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>

src/pages/workbench/fwzc_fwcs.vue

@@ -636,8 +636,9 @@
                 "
                 class="next_one"
                 @click="nextOne"
-                >下一步</el-button
               >
+                下一步
+              </el-button>
             </div>
           </div>
         </block-radius>
@@ -719,20 +720,20 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="is_map != 0" class="btn_footer">
-              <el-button class="previous" @click="goBack('map')">{{
-                is_map == 1 ? "返回智能制图" : "返回Web应用程序"
-              }}</el-button>
-              <el-button class="registe" @click="registeMap"
-                >服务发布</el-button
-              >
+              <el-button class="previous" @click="goBack('map')">
+                {{ is_map == 1 ? "返回智能制图" : "返回Web应用程序" }}
+              </el-button>
+              <el-button class="registe" @click="registeMap">
+                服务发布
+              </el-button>
             </el-form-item>
             <el-form-item v-else-if="process_id != ''" class="btn_footer">
-              <el-button class="previous" @click="goBack('process')"
-                >返回流程管理</el-button
-              >
-              <el-button class="registe" @click="registeProcess"
-                >服务发布</el-button
-              >
+              <el-button class="previous" @click="goBack('process')">
+                返回流程管理
+              </el-button>
+              <el-button class="registe" @click="registeProcess">
+                服务发布
+              </el-button>
             </el-form-item>
             <el-form-item v-else class="btn_footer">
               <el-button class="previous" @click="previous">上一步</el-button>
@@ -1428,7 +1429,7 @@ export default {
     registePt() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          if (this.activeBtn == 3 && this.jkwds.length == 0) {
+          if ((this.activeBtn == 2 && this.jkwds.length == 0) || (this.activeBtn == 3 && this.jkwds.length == 0)) {
             this.$message.error("请上传接口文档");
           } else {
             if (this.cover.length != 0) {
@@ -1436,7 +1437,7 @@ export default {
               if (this.activeBtn == 1 && !this.is_portal) {
                 this.addPortalItem();
               } else {
-                if (this.activeBtn == 0 || this.activeBtn == 3) {
+                if (this.activeBtn == 0 || this.activeBtn == 2 || this.activeBtn == 3) {
                   contentType = this.sjfwQqt;
                 } else if (this.activeBtn == 4) {
                   if (this.activeZh == "1") {

src/router/index.js

@@ -338,6 +338,11 @@ export default new Router({
           name: "skfwDetail",
           component: () => import("@/pages/service_shop/skfwDetail"),
         }, // 服务超市 - 时空服务详情
+        {
+          path: "/shop/spfwDetail/:id",
+          name: "spfwDetail",
+          component: () => import("@/pages/service_shop/spfwDetail"),
+        }, // 服务超市 - 视频服务详情
         {
           path: "/shop/gzfwDetail/:id",
           name: "sjfwDetail",