diff --git a/src/components/menu.vue b/src/components/menu.vue index 4cb40cdbef2cb41626ea693a7ea7096fb3d43ce6..817232a9ed191484491d56220514daffbf6955ff 100644 --- a/src/components/menu.vue +++ b/src/components/menu.vue @@ -400,6 +400,7 @@ export default { font-size: 14px; display: none; z-index: 1; + text-align: center; } .shop_menu { width: 280px; @@ -435,7 +436,7 @@ export default { height: 44px; line-height: 44px; padding: 0 30px; - text-align: left; + text-align: center; color: #0d1847; } .user_menu div:hover { diff --git a/src/components/new-com/apassTable.vue b/src/components/new-com/apassTable.vue index f027bb7b853924c5a855251b7425e5d4d72383ff..2d3378864e7127383136b4307249d4111f38163e 100644 --- a/src/components/new-com/apassTable.vue +++ b/src/components/new-com/apassTable.vue @@ -246,6 +246,11 @@ export default { { length: this.data.length }, (item, index) => (item = 0) ); + let self = this; + window.gotodetail = (val) => { + console.log(val) + self.$emit("gotodetail", val) + } }, methods: { toggleSelection(rows) { @@ -348,6 +353,10 @@ export default { this.$refs.multipleTable.clearSelection(); this.$emit("selectnum", { select: [], rows: [] }); }, + gotodetail(val) { + console.log(val) + this.$emit("gotodetail", val) + } }, }; diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue index 0c95d4a5ef04095202f36398134a8ab4b271f9e5..5ee4b8a5c7c6252b8569094a51706bf6225923b0 100644 --- a/src/components/service-info/service-info.vue +++ b/src/components/service-info/service-info.vue @@ -82,8 +82,9 @@ 计次收费规格： 暂无时长收费规格： 暂无 ({ types: [], - type: 0, // 购买方式 1：按月，2：按年 + type: 1, // 购买方式 1：按月，2：按年 specification: {}, // 规格 duration: 1, // 时长 showTime: false, @@ -193,7 +195,13 @@ export default { computed: { actionDisabled() { let a = this.data.serviceRequestSpcs; - return a.spcs_type_1.length == 0 && a.spcs_type_2.length == 0; + return ( + a && + a.spcs_type_1 && + a.spcs_type_1.length == 0 && + a.spcs_type_2 && + a.spcs_type_2.length == 0 + ); }, }, watch: {}, @@ -250,6 +258,7 @@ export default { query: { service_id: parseFloat(this.data.service_id), spec_id: this.specification.id, + spcs_type: this.specification.spcs_type, duration: this.duration, duration_unit: this.type, }, @@ -294,9 +303,17 @@ export default { } // 初始化规格 - if (this.data.serviceRequestSpcs.spcs_type_1.length > 0) { + if ( + this.data.serviceRequestSpcs && + this.data.serviceRequestSpcs.spcs_type_1 && + this.data.serviceRequestSpcs.spcs_type_1.length > 0 + ) { this.specification = this.data.serviceRequestSpcs.spcs_type_1[0]; - } else if (this.data.serviceRequestSpcs.spcs_type_2.length > 0) { + } else if ( + this.data.serviceRequestSpcs && + this.data.serviceRequestSpcs.spcs_type_2 && + this.data.serviceRequestSpcs.spcs_type_2.length > 0 + ) { this.specification = this.data.serviceRequestSpcs.spcs_type_2[0]; } }, diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue index f5943b86b194ed99bb3c487f77aebcfed9c94a2d..2cb6c83df710a010a81fb0e5d4994d8e3ac25a66 100644 --- a/src/components/shop-cloud/shop-cloud.vue +++ b/src/components/shop-cloud/shop-cloud.vue @@ -639,7 +639,7 @@

- + 余额不足，请联系超级管理员进行充值 费用总计： @@ -651,12 +651,12 @@ 查看费用明细 - 账户余额：20,000 金币 + 账户余额：{{ userInfo.account_balance }} 金币

提交申请 @@ -951,11 +951,11 @@

- 升级费用：2000000000 金币 + 升级费用：{{ amounts_payable }} 金币

-

+

费用总计：

@@ -964,7 +964,7 @@

- 账户余额：2000 金币 + 账户余额：{{ userInfo.account_balance }} 金币

@@ -995,7 +995,7 @@ :datas="jifeiList1" :maxheight="260" > -
+ { @@ -1439,7 +1441,7 @@ export default { name: "数据盘", num: "0个数据盘，每个数据盘0GB", time: "0个月", - sum: "2000金币", + sum: "金币", }, ], }; @@ -1565,7 +1567,7 @@ export default { sum: "2000金币", }, ]; - this.deductions = 20000; + this.deductions = this.userInfo.account_balance; } else { this.formShow = false; } diff --git a/src/components/shopping-cart/shopping-cart-cell.vue b/src/components/shopping-cart/shopping-cart-cell.vue index 1b3268fd8915312ea92a271245535b1278dbde94..fd0863615c3417d46b1adaa01ee01f50342bc26f 100644 --- a/src/components/shopping-cart/shopping-cart-cell.vue +++ b/src/components/shopping-cart/shopping-cart-cell.vue @@ -75,10 +75,25 @@
-
+
- 计次收费：{{ getSpecification }} + {{ + cellItems.service.spcs_info.spcs_type == 1 + ? "计次收费" + : "时长收费" + }}：{{ cellItems.service.spcs_info.money }}金币/{{ + cellItems.service.spcs_info.spcs_type == 1 + ? cellItems.service.spcs_info.spcs_count + "次" + : "月" + }}
- {{ - index + - 1 + - ". " + - "访问次数：" + - item.pv + - "/日，" + - "访问量：" + - item.count + - "/日" - }} + {{ item.money }}金币/{{ item.spcs_count }}次 -
-
暂无规格
-
-
-
规格：
-
{{ + cellItems.service.request_spcs_info.spcs_type_2[0] + .money + }}金币/月 - {{ index + 1 + ". " + item.value }} -
+
暂无规格
@@ -166,9 +168,22 @@
+
+ {{ cellItems.application.price }}金币/月 +
+
+ {{ + cellItems.service.request_spcs_info.spcs_type_2 && + cellItems.service.request_spcs_info.spcs_type_2.length != 0 + ? cellItems.service.request_spcs_info.spcs_type_2[0].money + : 0 + }}金币/月 +
-
不限时长
+
+ 不限时长 +
- - 200000000金币 + + {{ + cellItems.service_id != 0 + ? (cellItems.service.spcs_info.money * cellItems.duration).toFixed( + 2 + ) + : (cellItems.application.price * cellItems.duration).toFixed(2) + }}金币 + { - arr.push(item.id); - }); - } - let num = arr.indexOf(this.cellItems.spec_id); - let specification = ""; - if (num != -1) { - specification = - "访问次数：" + - this.cellItems.service.request_spcs_info[num].pv + - "/日，" + - "访问量：" + - this.cellItems.service.request_spcs_info[num].count + - "/日"; - } - return specification; - } else { - if (this.cellItems.spec_id == 1) { - return "部署"; - } else { - return "开发"; - } + console.log(); + }, + getSumMoney() { + let sum = 0; + if (this.cellItems.app_id != 0) { + sum += this.cellItems.application.price * this.cellItems.duration; + } else if (this.cellItems.service_id != 0) { } + return sum; }, }, mounted() {}, methods: { getState(val) { - this.$emit("changeState", { state: val, index: this.cellIndex }); + if ( + this.cellItems.service_id != 0 && + !this.cellItems.service.spcs_info.id + ) { + this.$message({ + message: "该服务暂不支持购买", + type: "error", + }); + this.checkedItem = false; + } else { + this.$emit("changeState", { state: val, index: this.cellIndex }); + } }, changeSpecification(val) { this.specificationPop = val; @@ -303,15 +315,19 @@ export default { this.specificationApplicationPop = val; }, submitPop() { - this.cellItems.spec_id = this.specificationPop; - this.cellItems.duration_method = this.specificationApplicationPop; - this.visible = false; - this.changeCellItem(); + this.cellItems.service.spcs_info = + this.specificationPop.spcs_type == 1 + ? this.cellItems.service.request_spcs_info.spcs_type_1[val] + : this.specificationPop.spcs_type == 2 + ? this.cellItems.service.request_spcs_info.spcs_type_2[val] + : ""; + this.updateShoppingCart(); this.updateShoppingCart(); }, setSpecificationPop() { - this.specificationPop = this.cellItems.spec_id; - this.specificationApplicationPop = this.cellItems.duration_method; + this.specificationPop = this.cellItems.service.spcs_info; + console.log(this.specificationPop) + // this.specificationApplicationPop = this.cellItems.duration_method; }, changeSubscription(val) { this.changeCellItem(); @@ -319,7 +335,6 @@ export default { }, changeNum(val) { this.changeCellItem(); - this.updateShoppingCart(); }, changeCellItem() { this.$emit("changeCellMsg", { @@ -463,8 +478,8 @@ export default { } .shopping_cell_specification { width: 80%; - height: 100px; - margin: 0 10%; + height: 70px; + margin: 15px 10%; background-color: #f9fafc; border-radius: 8px; padding: 10px; diff --git a/src/components/shopping-cart/shopping-cart-com.vue b/src/components/shopping-cart/shopping-cart-com.vue index fad1a9e96e60489a0c466631682289395c633def..72892923ee31c88fe106147a3dba8eb816910d06 100644 --- a/src/components/shopping-cart/shopping-cart-com.vue +++ b/src/components/shopping-cart/shopping-cart-com.vue @@ -60,7 +60,7 @@

- + 余额不足，请联系超级管理员进行充值 费用总计： @@ -72,22 +72,24 @@

共 {{ list.length }} 项服务，已选择 {{ getNum }} 项 - 账户余额：20,000 金币 + 账户余额：{{ userInfo.account_balance }} 金币

一键申请 一键申请 @@ -99,6 +101,8 @@ diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue index 87667b964afa4afe1967116ead6f541456e16cc5..78466c422110934bbc72333813f636a188be51b1 100644 --- a/src/pages/service_shop/sjfwDetail.vue +++ b/src/pages/service_shop/sjfwDetail.vue @@ -75,6 +75,7 @@ export default { descript: datas.descript, serviceRequestSpcs: datas.serviceRequestSpcs, scoreDetail: datas.scoreDetail, + month_sale: data.month_sale, }; this.detailData = [ diff --git a/src/pages/service_shop/skfwDetail.vue b/src/pages/service_shop/skfwDetail.vue index b53901c68c7373161712d5cc34006861fad7763c..ead5ccfa65646d466962ebb4bf13e991b331128e 100644 --- a/src/pages/service_shop/skfwDetail.vue +++ b/src/pages/service_shop/skfwDetail.vue @@ -95,6 +95,7 @@ export default { descript: datas.descript, serviceRequestSpcs: specificationData, scoreDetail: datas.scoreDetail, + month_sale: data.month_sale, }; this.detailData = [ diff --git a/src/pages/service_shop/zhfwDetail.vue b/src/pages/service_shop/zhfwDetail.vue index 1e7075ab8c6e52450d7d46e1350d93d7d1f9844d..dc0a036846e346b9765971399a98034ce4502e63 100644 --- a/src/pages/service_shop/zhfwDetail.vue +++ b/src/pages/service_shop/zhfwDetail.vue @@ -90,6 +90,7 @@ export default { descript: datas.descript, serviceRequestSpcs: specificationData, scoreDetail: datas.scoreDetail, + month_sale: data.month_sale, }; this.detailData = [ { diff --git a/src/pages/user/questions-answers/community.vue b/src/pages/user/questions-answers/community.vue index ef737ecf91b2327d9fdcc82d3c23957dc21f7141..a08271028ab510634cc6e954efb9773e812fc610 100644 --- a/src/pages/user/questions-answers/community.vue +++ b/src/pages/user/questions-answers/community.vue @@ -31,6 +31,7 @@ v-if="tableData.length" :data="tableData" :header="table_header" + @gotodetail="gotodeta" > { - query.items.push({ id: item.id, reason: this.reason_form.reason }); + items.push({ id: item.id, reason: this.reason_form.reason }); }); - this.$api.user.delQuestions(query).then((response) => { + this.$api.user.delQuestions(items).then((response) => { if (response.data.success == 1) { this.$message({ message: "删除成功", @@ -269,13 +271,11 @@ export default { }); }, delA() { - let query = { - items: [], - }; + let items = []; this.selected_date.forEach((item) => { - query.items.push({ id: item.id, reason: this.reason_form.reason }); + items.push({ id: item.id, reason: this.reason_form.reason }); }); - this.$api.user.delAnswers(query).then((response) => { + this.$api.user.delAnswers(items).then((response) => { if (response.data.success == 1) { this.$message({ message: "删除成功", @@ -284,7 +284,11 @@ export default { } }); }, + gotodeta(val) { + this.$router.push("/technical_support/answer_center/detail/" + val); + }, changeState(val) { + this.tableData = []; this.table_header = []; if (val == "/qa/questions") { this.form_data[1].label = "发布人搜索"; @@ -296,7 +300,7 @@ export default { align: "left", type: "html", getHtml: (str) => { - return `${str.title}`; + return `${str.title}`; }, }, { @@ -359,7 +363,7 @@ export default { align: "left", type: "html", getHtml: (str) => { - return `${str.content}`; + return `${str.answer}`; }, }, { @@ -372,15 +376,15 @@ export default { }, }, { - prop: "content", + prop: "question_content", label: "问题内容", align: "left", type: "html", getHtml: (str) => { - return `${str.content.replace(/<[^<>]+>/g, "")}`; + )}">${str.question_content.replace(/<[^<>]+>/g, "")}`; }, }, { diff --git a/src/pages/user/questions-answers/my-qa.vue b/src/pages/user/questions-answers/my-qa.vue index 288dd9d8154a0a299e53126fe5fd4946b1c01764..eb1b4678059a68e40ffe0fa471826407f41ee347 100644 --- a/src/pages/user/questions-answers/my-qa.vue +++ b/src/pages/user/questions-answers/my-qa.vue @@ -70,11 +70,18 @@

{{ item.answer }}

-

+

{{ item.title }}

- {{ item.content.replace(/<[^<>]+>/g, "") }} + {{ + item.answer + ? item.question_content.replace(/<[^<>]+>/g, "") + : item.content.replace(/<[^<>]+>/g, "") + }}

@@ -189,21 +196,7 @@ export default { label: "50", }, ], - data_list: [ - { - id: 1, - title: "平台的流程引擎怎么样", // 标题 - content: "我们想用流程引擎，不会用，求大神指点", // 内容 - created_by: "abc", // 发布人的userid - created: "2020-10-21T14:28:10+08:00", // 发布时间 - updated: "2020-10-21T14:28:10+08:00", // 更新时间 - view: 0, // 浏览量 - answer_num: 2, // 回答数, - user_name: "普通neo", // 发布人 - picture_path: - "/apaas/static/docs/image/image/blob_18f512d3-ee8f-4112-89a9-b2e7bfdfdec1.blob", // 头像 - }, - ], + data_list: [], user_info: { user_name: "", role: "", @@ -218,6 +211,12 @@ export default { watch: { activeName: { handler(val) { + this.data_list = []; + this.total = 0; + this.pagination = { + rowsPerPage: 10, + page: 1, + }; if (val == "0") { this.getQList(); } else if (val == "1") { @@ -239,7 +238,13 @@ export default { this.refreshData(); }, refreshData() { - this.$emit("refresh", this.pagination); + if (this.activeName == "0") { + this.getQList(); + } else if (this.activeName == "1") { + this.getAList(); + } else if (this.activeName == "2") { + this.getDeleteList(); + } }, pageResize() { let listWidth = this.$refs.commodityCardIn.clientWidth; @@ -304,6 +309,9 @@ export default { } }); }, + gotodeta(val) { + this.$router.push("/technical_support/answer_center/detail/" + val); + }, cancelDel() { this.diaDelItem = false; }, @@ -315,10 +323,9 @@ export default { } }, delQ() { - let query = { - items: [{ id: this.delItem.id }], - }; - this.$api.user.delQuestions(query).then((response) => { + let items = [{ id: this.delItem.id }]; + console.log(items); + this.$api.user.delQuestions(items).then((response) => { if (response.data.success == 1) { this.$message({ message: "删除成功", @@ -328,10 +335,8 @@ export default { }); }, delA() { - let query = { - items: [{ id: this.delItem.id }], - }; - this.$api.user.delAnswers(query).then((response) => { + let items = [{ id: this.delItem.id }]; + this.$api.user.delAnswers(items).then((response) => { if (response.data.success == 1) { this.$message({ message: "删除成功", @@ -343,7 +348,7 @@ export default { }, mounted() { this.getUserQA(); - // this.getQList(); + this.getQList(); }, }; diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue index 997d8140bfc278dca2de496d91d674829d16fcaf..e4d9db389ddeea38ab42205a0651169a2bb96f26 100644 --- a/src/pages/workbench/fwgl/cloud-detail.vue +++ b/src/pages/workbench/fwgl/cloud-detail.vue @@ -342,6 +342,10 @@ export default { title: "剩余使用天数：", info: "1000天", }, + { + title: "支付总价：", + info: "0 金币", + }, { title: "到期时间：", info: "2020-06-02 15:54:21", @@ -698,7 +702,8 @@ export default { this.list_arr[3].url = data.apply_file; // application file url this.list_arr[6].info = data.bgn_time; // get time this.list_arr[7].info = data.time_remaining; // remaining days - this.list_arr[8].info = data.end_time; // maturity time + this.list_arr[8].info = data.amounts_payable; + this.list_arr[9].info = data.end_time; // maturity time this.list_arr_my[0].info = data.first_level_time || "暂未提交"; // submit application time this.list_arr_my[1].info = data.second_level_time || "暂未获取"; // super get time this.super_status = data.second_level; // super status diff --git a/src/request/api/user.js b/src/request/api/user.js index 00a7c2d84a3e4fcae5e596ae2ff5523ad76a0946..5fb567a5c8fcdc78fe0925d389efbb662f2ddd4d 100644 --- a/src/request/api/user.js +++ b/src/request/api/user.js @@ -59,11 +59,11 @@ const user = { getDeleteList() { return axios.get(`/apaas/support/qa/deleted`); }, - delQuestions(params) { - return axios.delete(`/apaas/support/qa/question/delete`, params); + delQuestions(items) { + return axios.delete(`/apaas/support/qa/question/delete`, { data: { items } }); }, - delAnswers(params) { - return axios.delete(`/apaas/support/qa/answer/delete`, params); + delAnswers(items) { + return axios.delete(`/apaas/support/qa/answer/delete`, { data: { items } }); }, getUserQA() { return axios.get(`/apaas/support/qa/info`)