From 3874bc805b6ed0200bae9466990a3b17cf7a613e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= Date: Tue, 27 Oct 2020 17:33:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=87=91=E5=B8=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=AE=A2=E5=8D=95so=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/order-list/order-list-cell.vue | 389 ++++++++-------- src/components/order-list/order-list-list.vue | 4 +- src/components/shop-cloud/shop-cloud.vue | 20 +- src/pages/user/my-coin.vue | 46 +- src/pages/user/order/order_detail.vue | 425 ++++++++++++++---- src/pages/workbench/fwzc_fwcs.vue | 6 +- src/request/api/user.js | 6 +- 7 files changed, 591 insertions(+), 305 deletions(-) diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue index 4c6a79f..2060d53 100644 --- a/src/components/order-list/order-list-cell.vue +++ b/src/components/order-list/order-list-cell.vue @@ -1,250 +1,202 @@ @@ -371,6 +544,7 @@ export default { ], }, ], + showApproval: false, header_arr: [ { prop: "name", @@ -477,15 +651,24 @@ export default { .then((response) => { if (response.data.success == 1) { let data = response.data.data || []; - for (let i = 0; i < data.length; i++) { - this.approval_arr1[i].result = data[i].apply_type_name; - this.approval_arr1[i].arr[0].info = data[i].created; - this.approval_arr1[i].arr[1].info = data[i].department_name; - this.approval_arr1[i].arr[2].info = data[i].user_name; - this.approval_arr1[i].arr[3].info = data[i].comments; + if (data.length != 0) { + for (let i = 0; i < data.length; i++) { + this.approval_arr1[i].result = data[i].apply_type_name; + this.approval_arr1[i].arr[0].info = data[i].created; + this.approval_arr1[i].arr[1].info = data[i].department_name; + this.approval_arr1[i].arr[2].info = data[i].user_name; + this.approval_arr1[i].arr[3].info = data[i].comments; + } + this.approval_arr1.splice(data.length); + } else { + this.approval_arr1[0].result = "待审批"; + this.approval_arr1[0].arr = []; + this.approval_arr1.splice(1); } - this.approval_arr1.splice(data.length); + this.showApproval = true; + console.log(this.approval_arr1); } else { + this.showApproval = false; console.log(response.data.errMsg); } }); @@ -578,6 +761,7 @@ export default { .detail { margin: 0 20px; } + .detail_head { width: 100%; background-color: #f6f7fb; @@ -586,87 +770,109 @@ export default { position: relative; margin-bottom: 20px; } + .detail_head_msg { padding: 20px; } + .detail_head_cell { display: inline-block; height: 50px; text-align: center; } + .detail_head_status { width: 160px; } + .detail_head_no { width: 360px; } + .detail_head_time { width: 240px; } + .border_right { border-right: 1px #e3e5ef solid; } + .border_left { border-left: 1px #e3e5ef solid; } + .detail_head_cell_title { font-size: 14px; color: #8890a7; line-height: 22px; } + .detail_head_cell_val { font-size: 16px; font-weight: 700; line-height: 28px; color: #242c43; } + .text_blue { color: #515fe7; } + .text_yellow { color: #ef9433; } + .text_blackblue { color: #242c43; } + .text_red { color: #e15260; } + .btn_group { position: absolute; right: 20px; top: 26px; } + .evaluation { width: 100px; background-color: #c3caf8; color: #0f2683; margin-right: 20px; } + .again { width: 100px; background-color: #0f2683; color: #f8f9fd; } + .pop_rate { padding: 0 0 0 50px; margin: 15px 0; } + .evaluation_text { padding: 15px 4px; } + .pop_cancel { color: #58617a; margin-right: 20px; } + .pop_submit { background-color: #e56600; border: 0; } + .pop_btn_group { margin-top: 10px; text-align: center; } + .detail_title { font-size: 18px; margin: 10px 0 20px; @@ -674,6 +880,7 @@ export default { position: relative; color: #58617a; } + .detail_title::before { position: absolute; content: ""; @@ -684,6 +891,7 @@ export default { left: 0; top: 4px; } + .detail_service { width: 100%; height: 100%; @@ -691,6 +899,7 @@ export default { border-radius: 8px; border: solid 1px #ededed; } + .detail_service_msg { height: 162px; padding: 20px 10px 20px 20px; @@ -698,17 +907,20 @@ export default { justify-content: space-between; border-right: 1px #ededed solid; } + .detail_service_msg_img { width: 118px; height: 118px; border-radius: 8px; border: 3px #f4f7fc solid; } + .detail_service_msg_right { width: calc(100% - 140px); margin: 0 0 0 10px; position: relative; } + .detail_service_name { width: 100%; line-height: 24px; @@ -721,6 +933,7 @@ export default { -webkit-box-orient: vertical; font-size: 16px; } + .detail_service_name_cloud { width: 100%; line-height: 24px; @@ -734,20 +947,24 @@ export default { -webkit-box-orient: vertical; font-size: 16px; } + .detail_service_msg_other { position: absolute; bottom: 2px; } + .detail_service_type { color: #8890a7; font-size: 14px; line-height: 22px; } + .detail_service_creator { color: #8890a7; font-size: 14px; line-height: 22px; } + .tags { display: inline-block; margin-left: 10px; @@ -759,26 +976,31 @@ export default { position: relative; top: -2px; } + .map_service { background-color: #626de9; border: solid 1px #626de9; color: #fff; } + .shared { background-color: #e7fdfc; border: solid 1px #8bd6d0; color: #25bdb1; } + .restricted { background-color: #fffee8; border: solid 1px #e4c884; color: #ef9433; } + .sensitive { background-color: #ffefef; border: solid 1px #d7a4a9; color: #e15260; } + .detail_service_specification { height: 162px; color: #8890a7; @@ -789,37 +1011,63 @@ export default { padding: 22px 20px; border-right: 1px #ededed solid; } + .detail_service_specification_val { color: #242c43; } + .detail_service_time { text-align: center; height: 162px; display: flex; justify-content: center; align-items: center; + border-right: 1px #ededed solid; } + .detail_service_time_title { color: #8890a7; } + +.detail_service_money { + text-align: center; + height: 162px; + display: flex; + justify-content: center; + align-items: center; +} + +.detail_service_money_title { + color: #8890a7; +} +.adhekadwn { + color: #8890a7; + display: block; + margin-top: 20px; +} + .detail_s_title { color: #8890a7; margin: 20px 0 10px; padding: 0 0 0 20px; } + .detail_app_scence { padding: 0 0 0 20px; color: #242c43; font-size: 14px; line-height: 22px; } + .detail_s_val { padding: 0 0 0 20px; } + .approval_status_btn { background-color: #e1e4fb; color: #626de9; } + .params_block { background-color: #f8f9fd; border-radius: 8px; @@ -828,47 +1076,58 @@ export default { font-size: 14px; line-height: 22px; } + .params_block_title { padding-left: 5px; color: #242c43; } + .params_block_item { padding: 10px 0 0 0; } + .params_block_item_in { display: flex; justify-content: space-between; margin-bottom: 5px; } + .params_block_item_title { color: #8890a7; width: 80px; text-align: right; } + .params_block_item_val { color: #242c43; width: calc(100% - 82px); } + .val_has_2 { margin-right: 20px; } + .margin_top_20 { display: block; margin-top: 20px; } + .evaluation_msg { height: 100%; border-top: solid 2px #e3e5ef; padding: 20px; background-color: #fff; } + .msg_title { color: #8890a7; margin: 0 0 10px; } + .msg_rate { margin: 0 0 20px 0; } + .msg_text { /* margin-left: 20px; */ color: #242c43; @@ -878,6 +1137,7 @@ export default { .pop_rate .el-rate__icon { font-size: 24px; } + .pop_rate .el-rate__text { font-size: 20px; margin-left: 20px; @@ -885,7 +1145,8 @@ export default { top: 1px; color: #58617a !important; } + .evaluation_text .el-textarea__inner { border-radius: 8px; } - \ No newline at end of file + diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue index 0b81c0b..8069516 100644 --- a/src/pages/workbench/fwzc_fwcs.vue +++ b/src/pages/workbench/fwzc_fwcs.vue @@ -1144,8 +1144,12 @@ export default { bodys = JSON.stringify(request); } else if (this.zhfwQqt == "x-www-form-urlencoded") { let request = this.$refs.fwcs_zhfw_www.getTableData().concat(); + let arr = []; request.pop(); - bodys = JSON.stringify(request); + request.forEach(item => { + arr.push({key: item.requestEncoding, val: item.requestValue, field_type: "text"}) + }); + bodys = JSON.stringify(arr); } } } diff --git a/src/request/api/user.js b/src/request/api/user.js index 6e7a07c..00a7c2d 100644 --- a/src/request/api/user.js +++ b/src/request/api/user.js @@ -71,10 +71,10 @@ const user = { // my coins getUserCoins() { - return axios.get(``) + return axios.get(`/apaas/backmgt/user/myAccount`) }, - getCoinList() { - return axios.get(``) + getCoinList(params) { + return axios.get(`/apaas/backmgt/user/rechargeRecords?start=${params.start}&end=${params.end}&limit=${params.limit}&page=${params.page}`) } } -- 2.26.0