diff --git a/.env.development b/.env.development index 73d5f81..a131d50 100644 --- a/.env.development +++ b/.env.development @@ -4,4 +4,4 @@ ENV = 'development' # base api VUE_APP_BASE_API = 'https://leyitest.ali251.langye.net' -#VUE_APP_BASE_API = 'https://leyiyuyue.szgmbwg.org.cn' \ No newline at end of file +#VUE_APP_BASE_API = 'https://leyiyuyue.szgmbwg.org.cn' diff --git a/src/api/order/parkorder.js b/src/api/order/parkorder.js index ab0da87..f64827b 100644 --- a/src/api/order/parkorder.js +++ b/src/api/order/parkorder.js @@ -17,3 +17,15 @@ export function get(id) { } }) } + + +export function appointment(id) { + return request({ + url: '/api/admin/carpark/appointment', + method: 'get', + params: { + id + } + }) +} + diff --git a/src/views/order/parkorder.vue b/src/views/order/parkorder.vue index 5a77404..ecffd62 100644 --- a/src/views/order/parkorder.vue +++ b/src/views/order/parkorder.vue @@ -42,6 +42,9 @@
+ +
小车位
@@ -58,6 +61,11 @@ {{parameters.status_list[scope.row[column.field]]}}
+
+ + {{(scope.row[column.field]==null?'失败':'成功')}} + +
{{scope.row[column.field]}} @@ -128,7 +136,8 @@ import LxHeader from "@/components/LxHeader/index.vue"; import { listparkorder, - get + get, + appointment } from "../../api/order/parkorder.js"; export default { components: { @@ -238,6 +247,14 @@ { field: "teamunit", title: "团队名称", + width: 320, + }, + { + field: "orderno", + title: "第三方状态", + type: "format", + width: 120, + align: "center" }, { field: "status", @@ -271,6 +288,16 @@ var topHeight = 50; //页面 头部 let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20; that.tableHeight = tableHeight; + }, + appointmentOrder(row){ + appointment(row.id).then(res => { + console.log(res) + this.$Message.success('请求成功'); + this.load(); + }).catch(error => { + console.log(error) + //reject(error) + }) }, load() { var that = this;