From 71bbc1c12d023336266d62da9e12e9804027cbc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Thu, 19 Nov 2020 18:37:32 +0800
Subject: [PATCH] fixed bug

---
 src/components/app-list/app-card.vue          |  4 +--
 src/components/service-info/service-info.vue  |  4 ++-
 .../service-list/commodity-card-new.vue       |  4 +--
 .../service-list/service_list-new.vue         | 11 ++----
 src/components/shop-cloud/shop-cloud-new.vue  | 34 +++++++++++++++++--
 .../shopping-cart/shopping-cart-cell.vue      |  1 +
 src/components/table/table-um.vue             |  1 +
 .../technical-support/answer-center/edit.vue  |  2 +-
 .../technical-support/answer-center/index.vue | 14 +++++---
 .../technical-support/answer-center/list.vue  |  1 +
 src/pages/workbench/fwgl/serviceDetail.vue    | 13 ++++---
 src/router/index.js                           | 13 ++++---
 12 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/src/components/app-list/app-card.vue b/src/components/app-list/app-card.vue
index e06354d..425cbd1 100644
--- a/src/components/app-list/app-card.vue
+++ b/src/components/app-list/app-card.vue
@@ -25,7 +25,7 @@
     <p class="app_card-text" v-if="cardType == 1">
       <span>
         <i class="el-icon-time"></i>
-        <span>上线时间：</span>
+        <span>部署时间：</span>
       </span>
       <span class="text_clip" v-text="getTimeText(data.created || '')"></span>
     </p>
@@ -92,7 +92,7 @@ export default {
 .app_card > .remove_btn {
   position: absolute;
   top: 10px;
-  right: 10px;
+  right: 20px;
   font-size: 20px;
   color: #8890a7;
   cursor: pointer;
diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue
index 64c7282..3fe0a4b 100644
--- a/src/components/service-info/service-info.vue
+++ b/src/components/service-info/service-info.vue
@@ -96,7 +96,9 @@
               : data.serviceRequestSpcs.spcs_type_1[0].descript
           }}
         </div>
-        <div class="commodity_information">
+        <div
+          class="commodity_information"
+        >
           <span class="guige_title">时长收费：</span>
           <span
             v-if="
diff --git a/src/components/service-list/commodity-card-new.vue b/src/components/service-list/commodity-card-new.vue
index 2b97255..514f179 100644
--- a/src/components/service-list/commodity-card-new.vue
+++ b/src/components/service-list/commodity-card-new.vue
@@ -23,7 +23,7 @@
           <p class="get_num">
             获取次数：
             <span class="com_cell_right_time">
-              {{ cellData.deploy_times }}
+              {{ cellData.get_times }}
             </span>
             <span class="ci"> 次</span>
           </p>
@@ -47,7 +47,7 @@
         </el-col>
         <el-col :span="10" class="com_other">
           <span class="name_title">业务领域：</span>
-          {{ cellData.ywly_name }}
+          {{ cellData.area_name }}
         </el-col>
         <el-col :span="14" class="com_other">
           <span class="name_title">上线时间：</span>
diff --git a/src/components/service-list/service_list-new.vue b/src/components/service-list/service_list-new.vue
index eaef673..93b1137 100644
--- a/src/components/service-list/service_list-new.vue
+++ b/src/components/service-list/service_list-new.vue
@@ -352,6 +352,7 @@ export default {
         for (let i = 0; i < val.length; i++) {
           this.filterLists[i + 1].name = val[i];
         }
+        this.activeBtn = 0;
       },
     },
   },
@@ -398,14 +399,7 @@ export default {
           businessArea: this.activeOptions[2].join(","),
           orgSource: this.activeOptions[3].join(","),
           developable: Number(this.couldTwice),
-          order:
-            this.activeBtn == 0
-              ? "search_count"
-              : this.activeBtn == 1
-              ? "create_date"
-              : this.activeBtn == 2
-              ? "apply_times"
-              : "evaluation",
+          order: this.activeBtn + 1,
           page: this.page,
           limit: this.limit,
           search: this.search,
@@ -754,6 +748,7 @@ export default {
   display: inline-block;
   margin-right: 31px;
   position: relative;
+  cursor: pointer;
 }
 .button_filter::after {
   content: "";
diff --git a/src/components/shop-cloud/shop-cloud-new.vue b/src/components/shop-cloud/shop-cloud-new.vue
index 73bbeda..f1388e8 100644
--- a/src/components/shop-cloud/shop-cloud-new.vue
+++ b/src/components/shop-cloud/shop-cloud-new.vue
@@ -128,7 +128,7 @@
                   <el-input-number
                     v-model="formNew.containerGroup"
                     controls-position="right"
-                    :min="0"
+                    :min="1"
                     :max="24"
                     placeholder="取值范围[0，24]"
                   ></el-input-number>
@@ -387,7 +387,7 @@
                     <el-input-number
                       v-model="formOld.containerGroup"
                       controls-position="right"
-                      :min="0"
+                      :min="1"
                       :max="24"
                       placeholder="取值范围[0，24]"
                     ></el-input-number>
@@ -1177,6 +1177,36 @@ export default {
       return this.amounts_payable;
     },
   },
+  watch: {
+    formNew: {
+      handler() {
+        if (this.formNew.containerGroup % 1 != 0) {
+          this.formNew.containerGroup = Math.floor(this.formNew.containerGroup)
+        }
+        if (this.formNew.dataDisk % 1 != 0) {
+          this.formNew.dataDisk = Math.floor(this.formNew.dataDisk)
+        }
+        if (this.formNew.appDuration % 1 != 0) {
+          this.formNew.appDuration = Math.floor(this.formNew.appDuration)
+        }
+      },
+      deep: true,
+    },
+    formOld: {
+      handler() {
+        if (this.formOld.containerGroup % 1 != 0) {
+          this.formOld.containerGroup = Math.floor(this.formOld.containerGroup)
+        }
+        if (this.formOld.dataDisk % 1 != 0) {
+          this.formOld.dataDisk = Math.floor(this.formOld.dataDisk)
+        }
+        if (this.formOld.appDuration % 1 != 0) {
+          this.formOld.appDuration = Math.floor(this.formOld.appDuration)
+        }
+      },
+      deep: true,
+    }
+  },
   data() {
     var checkName = (rule, value, callback) => {
       let self = this;
diff --git a/src/components/shopping-cart/shopping-cart-cell.vue b/src/components/shopping-cart/shopping-cart-cell.vue
index 1458f8e..817db74 100644
--- a/src/components/shopping-cart/shopping-cart-cell.vue
+++ b/src/components/shopping-cart/shopping-cart-cell.vue
@@ -128,6 +128,7 @@
                         {{ item.money }}金币/{{ item.spcs_count }}次
                       </el-button>
                       <el-button
+                      v-if="cellItems.service.request_spcs_info.spcs_type_2 && cellItems.service.request_spcs_info.spcs_type_2.length != 0"
                         :class="
                           specificationPop.spcs_type == 2
                             ? 'shopping_cell_specification_btn active'
diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue
index 7c96c03..dfebf4a 100644
--- a/src/components/table/table-um.vue
+++ b/src/components/table/table-um.vue
@@ -452,6 +452,7 @@ export default {
     },
     datas: {
       handler(val) {
+        console.log(val)
         this.getDataFromApiSync();
       },
       deep: true
diff --git a/src/pages/technical-support/answer-center/edit.vue b/src/pages/technical-support/answer-center/edit.vue
index b831ae8..340216d 100644
--- a/src/pages/technical-support/answer-center/edit.vue
+++ b/src/pages/technical-support/answer-center/edit.vue
@@ -88,7 +88,7 @@ export default {
                     this.editstr = ''
                     if(res.data.success){
                         this.$message.success('添加成功')
-                        this.$router.push('/technical_support/answer_center/list')
+                        this.$router.push({name: 'answerCenterList'})
                     }else{
                         this.$message.error('添加失败')
                     }
diff --git a/src/pages/technical-support/answer-center/index.vue b/src/pages/technical-support/answer-center/index.vue
index c1861c8..59bba11 100644
--- a/src/pages/technical-support/answer-center/index.vue
+++ b/src/pages/technical-support/answer-center/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="answer_container">
-    <router-view class="left_content" />
+    <router-view class="left_content" @update2="update2" />
     <div
       class="right_content"
       v-if="$route.path !== '/technical_support/answer_center/edit'"
@@ -73,11 +73,15 @@ export default {
       head_pic: require("../../../assets/imgs/img_head.png"),
     };
   },
-  created() {
-    this.getUserInfo();
-    this.getAnwerList();
-  },
+  // mounted() {
+  //   this.getUserInfo();
+  //   this.getAnwerList();
+  // },
   methods: {
+    update2() {
+      this.getUserInfo();
+      this.getAnwerList();
+    },
     getUserInfo() {
       this.$http.get("/apaas/support/qa/info").then(({ data }) => {
         if (data.success) {
diff --git a/src/pages/technical-support/answer-center/list.vue b/src/pages/technical-support/answer-center/list.vue
index 7a711c6..b3ce76b 100644
--- a/src/pages/technical-support/answer-center/list.vue
+++ b/src/pages/technical-support/answer-center/list.vue
@@ -107,6 +107,7 @@ export default {
   },
   methods: {
     getAnwerList() {
+      this.$emit("update2");
       this.$http
         .get("/apaas/support/qa/question/list", {
           params: {
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 2a2de52..a6728b9 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -316,6 +316,7 @@ import ListPagination from "@/components/comments-pagination";
 import dialogAction from "@/components/dialog-action";
 import { getRole, formatDateTime_date } from "@/utils/common";
 import { mapGetters, mapState } from "vuex";
+import helper from "@/services/helper";
 export default {
   components: {
     infoList,
@@ -342,7 +343,7 @@ export default {
       translistTotal: 0,
       transcurrentPage: 1,
       transpageSize: 10,
-      pageSizes: [10, 50, 100],
+      pageSizes: [10, 20, 50],
       responseParamUrl: "",
       codeExampleUrl: "",
       port_select_server:'',
@@ -414,13 +415,13 @@ export default {
           align: "center",
         },
         {
-          prop: "total_money",
+          prop: "total_moneys",
           label: "订单总价",
           width: "150px",
           align: "center",
         },
         {
-          prop: "trade_time",
+          prop: "trade_times",
           label: "交易时间",
           width: "160px",
           align: "center",
@@ -1242,8 +1243,8 @@ export default {
           console.log(res);
           // listTotal: 0,
           if(res.data.success){
-            this.listTotal = res.data.total
-            var temp = res.data.data||[]
+            this.translistTotal = res.data.data.total
+            var temp = res.data.data.list||[]
             temp.forEach(e => {
               if(e.spcs_type==1){
                 e.duration_name = '不限时长'
@@ -1252,6 +1253,8 @@ export default {
                 e.duration_name = e.duration+'月'
                 e.gg = `${e.single_money} 元/月`
               }
+              e.trade_times = helper.dateStringTransform(e.trade_time);
+              e.total_moneys = e.total_money + "金币";
             });
             this.trans_log_data = temp
           }
diff --git a/src/router/index.js b/src/router/index.js
index 283d1a5..df0849c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -168,20 +168,20 @@ export default new Router({
             }, // 开发文档
             {
               path: "/technical_support/doc_manage",
-              name: "technicalSupportDoc",
+              name: "technicalSupportDocManage",
               redirect: "/technical_support/doc_manage/list",
               component: () =>
                 import("@/pages/technical-support/doc-manage/index"),
               children: [
                 {
                   path: "/technical_support/doc_manage/list",
-                  name: "technicalSupportDocDetail",
+                  name: "technicalSupportDocManageList",
                   component: () =>
                     import("@/pages/technical-support/doc-manage/list"),
                 }, // 开发文档管理列表
                 {
                   path: "/technical_support/doc_manage/edit/:id",
-                  name: "technicalSupportDocDetail",
+                  name: "technicalSupportDocManageDetail",
                   component: () =>
                     import("@/pages/technical-support/doc-manage/detail"),
                 }, // 开发文档管理编辑
@@ -204,23 +204,26 @@ export default new Router({
             }, // 示例中心
             {
               path: "/technical_support/answer_center/",
-              name: "technicalSupportDoc",
+              name: "answerCenter",
               redirect: "/technical_support/answer_center/list",
               component: () =>
                 import("@/pages/technical-support/answer-center/index"),
               children: [
                 {
                   path: "/technical_support/answer_center/list",
+                  name: "answerCenterList",
                   component: () =>
                     import("@/pages/technical-support/answer-center/list"),
                 }, // 问答中心列表
                 {
                   path: "/technical_support/answer_center/edit",
+                  name: "answerCenterEdit",
                   component: () =>
                     import("@/pages/technical-support/answer-center/edit"),
                 }, // 问答中心编辑
                 {
                   path: "/technical_support/answer_center/detail/:id",
+                  name: "answerCenterDetail",
                   component: () =>
                     import("@/pages/technical-support/answer-center/detail"),
                 }, // 问答中心详情
@@ -241,7 +244,7 @@ export default new Router({
             }, // SDK中心
             {
               path: "/technical_support/sdk_manage",
-              name: "technicalSupportDoc",
+              name: "technicalSupportSDK",
               redirect: "/technical_support/sdk_manage/type",
               component: () =>
                 import("@/pages/technical-support/sdk-manage/index"),
-- 
2.26.0