diff --git a/src/components/commodity-list.vue b/src/components/commodity-list.vue index 02525bf13bad3aeb6be648386fc5d7a69ed3075d..717419fd48d024b2ae9e77ffc8416bc70271917d 100644 --- a/src/components/commodity-list.vue +++ b/src/components/commodity-list.vue @@ -141,7 +141,6 @@ export default { + \ No newline at end of file diff --git a/src/components/order-list/order-list-com.vue b/src/components/order-list/order-list-com.vue index fa0336e7ced202c03dad21d9af6631ae2ea12498..5b649140b2d504f0ffdbab22a970d5bdb2a9b08a 100644 --- a/src/components/order-list/order-list-com.vue +++ b/src/components/order-list/order-list-com.vue @@ -118,12 +118,56 @@ export default { } ], datas: [ - { id: "23123" }, - { id: "23ss123" }, - { id: "2311223" }, - { id: "2311423" }, - { id: "23131223" }, - { id: "231123" } + { + id: 0, + name: "水路货物周转量情况", + type: "基础数据服务", + creator: "贵州省交通运输厅0", + state: 1, + mapService: 1, + num: 2, + checkedSubscription: false, + specification: 1, + specificationApplication: 2, + evaluationText: "这条服条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。", + evaluationRate: 4.7, + applicationTime: "2021-04-24 15:02:00", + orderNumber: "2020042422222222000001", + getStatus: 2 + }, + { + id: 1, + name: "水路货物周转量情况水路货物周水路货物周转量情况水路货物周", + type: "基础数据服务", + creator: "贵州省交通运输厅1", + state: 1, + num: 2, + checkedSubscription: false, + specification: 1, + specificationApplication: 2, + evaluationText: "这条服务非常好务非常好非常实用这非常实用这条服务非常好非常实用。", + evaluationRate: 3.7, + applicationTime: "2020-04-24 15:02:00", + orderNumber: "202004241502000001", + getStatus: 3 + }, + { + id: 2, + name: "水路货物周转量情况水路货物周转量情况路货物周转量情况", + type: "基础数据服务", + creator: "贵州省交通运输厅2", + state: 1, + mapService: 1, + num: 2, + checkedSubscription: true, + specification: 1, + specificationApplication: 2, + evaluationText: "这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。", + evaluationRate: 3.7, + applicationTime: "2020-04-24 15:02:00", + orderNumber: "202004241502000001", + getStatus: 1 + } ] }), mounted() { @@ -173,10 +217,10 @@ export default { display: flex; justify-content: space-between; padding: 0 20px; - border-bottom: 2px #dcdfe6 solid; + border-bottom: 1px solid #e9ecf3; } .button_group { - padding: 15px 10px; + padding: 17px 10px; } .btn_actice { background-color: blue; @@ -187,10 +231,8 @@ export default { padding: 10px; } .order-pagination { - margin-top: 20px; - padding-bottom: 20px; font-size: 14px; - padding: 0 5%; + padding: 0 5% 20px; display: flex; justify-content: space-between; align-items: center; @@ -266,4 +308,11 @@ export default { border: 0; padding: 0; } +.button_group .el-button { + border: 0; +} +.button_group .el-button:hover { + background-color: #515fe7; + color: #fff; +} diff --git a/src/components/order-list/order-list-list.vue b/src/components/order-list/order-list-list.vue index cbe762a2e3ca53a7ce7eb9491549c12a01086c9a..06d5f3bc365c496f13d71d2903e04e8fa979ba2b 100644 --- a/src/components/order-list/order-list-list.vue +++ b/src/components/order-list/order-list-list.vue @@ -1,5 +1,13 @@ @@ -24,4 +32,20 @@ export default { }; \ No newline at end of file diff --git a/src/components/shopping-cart/shopping-cart-cell.vue b/src/components/shopping-cart/shopping-cart-cell.vue index 703d5a95f0f3fddcb97c1d04f4646a5d8f6b4c2e..800ffce6085cc5649434030d96b3af3960f245ad 100644 --- a/src/components/shopping-cart/shopping-cart-cell.vue +++ b/src/components/shopping-cart/shopping-cart-cell.vue @@ -42,7 +42,7 @@ >申请方式：{{ specificationApplicationBtns[cellItems.specificationApplication] }}
服务地址：
- + @@ -305,7 +312,6 @@ export default { { label: "字段名称", prop: "label", type: "input", align: "left" }, { label: "字段说明", prop: "descript", type: "input", align: "left" } ], - url: "", emptyText: "暂无数据", resultShow: false, resSuccess: false, @@ -354,11 +360,13 @@ export default { { label: "其他", value: 10 } ], optionsOrganization: [], + datasFw: [], datasQqcs: [], datasFhcs: [], request_fields: [], response_fields: [], - cover: "" + cover: "", + noSearchUrl: "" }), computed: {}, watch: {}, @@ -369,6 +377,23 @@ export default { this.select = "GET"; this.serviceUrl = ""; }, + getUrl(url) { + if (url.indexOf("?") != -1) { + this.noSearchUrl = url.substring(0, url.indexOf("?")); + let search = url.substring(url.indexOf("?") + 1); + let vars = search.split("&"); + let arr = []; + for (let i = 0; i < vars.length; i++) { + if (vars[i] != "") { + let pair = vars[i].split("="); + arr[i] = {}; + arr[i].requestEncoding = pair[0] ? pair[0] : ""; + arr[i].requestValue = pair[1] ? pair[1] : ""; + } + } + this.datasFw = arr; + } + }, clickFwcs() { let headers = {}; let requestData = {}; @@ -378,6 +403,7 @@ export default { headers.Authorization[0] = this.sqfsVal + " " + this.tokenVal; } let request = this.$refs.fwcs_sjfw_qq.getTableData(); + console.log(request); for (let i = 0; i < request.length; i++) { if ( request[i] && @@ -481,6 +507,17 @@ export default { .catch(function(response) { console.log("unkonw error"); }); + }, + changeTable(val) { + let search = "?"; + for (let i = 0; i < val.length; i++) { + if (val[i].requestEncoding != "") { + search = + search + val[i].requestEncoding + "=" + val[i].requestValue + "&"; + } + } + let searchDel = search.substring(0, search.length - 1); + this.serviceUrl = this.noSearchUrl + searchDel; } }, mounted() {}