diff --git a/src/components/app-list/app-card.vue b/src/components/app-list/app-card.vue index e06354d74a3376d4996a447c8688802a5f10dabf..425cbd1bc7390410da829e243b0ee81e1a40d995 100644 --- a/src/components/app-list/app-card.vue +++ b/src/components/app-list/app-card.vue @@ -25,7 +25,7 @@

- 上线时间： + 部署时间：

@@ -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 64c7282a4965bcff0cadd0f993253c4f6005827e..3fe0a4b8950f338b189ccb102d9fade1a63150f0 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 }} -
+
时长收费： 获取次数： - {{ cellData.deploy_times }} + {{ cellData.get_times }} 次

@@ -47,7 +47,7 @@ 业务领域： - {{ cellData.ywly_name }} + {{ cellData.area_name }} 上线时间： diff --git a/src/components/service-list/service_list-new.vue b/src/components/service-list/service_list-new.vue index eaef673c07dbe8a34e5d6a000895fdb7846baa79..93b1137cb008bbfd263b946604a61a0d94fd73f7 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 73bbedab17d86ebf4429486751cd7f505527abfe..f1388e80df5fbaded21afeaf96be7377e0f2e177 100644 --- a/src/components/shop-cloud/shop-cloud-new.vue +++ b/src/components/shop-cloud/shop-cloud-new.vue @@ -128,7 +128,7 @@ @@ -387,7 +387,7 @@ @@ -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 1458f8e379b7d7a57e30a953c8181126d7bee420..817db743f1487e43c1037b36c8b66107c9fbcd76 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 }}次 - +
{ if (data.success) { diff --git a/src/pages/technical-support/answer-center/list.vue b/src/pages/technical-support/answer-center/list.vue index 7a711c65e3cdbf38de9519d9bdf4e7c745da0cbe..b3ce76b3287c50cff4ea11ce1253da7d755df81d 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 2a2de52f613e00a4f3a792f221da79f7b8b87548..a6728b9f60c0f0fb2d943c038bd79742f5ea908c 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 283d1a5657cf2566e27528275df547c1208160a0..df0849c4d577f652e985d866284c6b420201a433 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"),