diff --git a/.env.development b/.env.development
index 64674e4..4f95d8a 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,6 @@ VITE_APP_ENV = 'development'
# 开发环境
VITE_APP_BASE_API = 'http://192.168.5.213:9100/gateway'
#VITE_APP_BASE_API = 'http://192.168.5.14:9100/gateway'
-#VITE_APP_BASE_API = 'http://192.168.7.152:9100/gateway'
#VITE_APP_BASE_API = '/dev-api'
#VITE_APP_BASE_API = 'https://api.evo-techina.com'
diff --git a/src/api/order/replabatt.ts b/src/api/order/replabatt.ts
index f641269..2a71288 100644
--- a/src/api/order/replabatt.ts
+++ b/src/api/order/replabatt.ts
@@ -138,3 +138,14 @@ export function paystatus(outTradeNo:string) {
}
},false)
}
+
+
+//订单详情
+export function oderdetails(orderNo:string) {
+ return server.request({
+ url: '/cloud/order/swap/'+orderNo,
+ method: 'get',
+
+
+ },false)
+}
\ No newline at end of file
diff --git a/src/api/order/reservation.ts b/src/api/order/reservation.ts
index 0e1012a..c8482df 100644
--- a/src/api/order/reservation.ts
+++ b/src/api/order/reservation.ts
@@ -28,7 +28,7 @@ interface Addobj{
export function addhdz(data:Addobj) {
return server.request({
- url: '/cloud/order/swap/pre/add',
+ url: '/cloud/order/per/add',
method: 'post',
data
})
@@ -56,7 +56,7 @@ interface Querydata{
}
export function getyylist(params:Querydata) {
return server.request({
- url: '/cloud/order/swap/pre/list',
+ url: '/cloud/order/per/list',
method: 'get',
params
})
@@ -65,7 +65,7 @@ export function getyylist(params:Querydata) {
//取消预约
export function delhdz(id:string) {
return server.request({
- url: '/cloud/order/swap/pre/cancel',
+ url: '/cloud/order/per/cancel',
method: 'post',
data:{
id
diff --git a/src/views/order/replabatt/index.vue b/src/views/order/replabatt/index.vue
index 1603bcc..c3ec84f 100644
--- a/src/views/order/replabatt/index.vue
+++ b/src/views/order/replabatt/index.vue
@@ -102,9 +102,9 @@
-
+
-
+
{{scope.row.amount/100}}
@@ -129,6 +129,8 @@
换电量
+
+
+
+
+
+
+
+
+
+
+
-
+
订单金额：
{{xqobj.amount/100}}元
+
+
+
+ 换电费用：
+ {{xqobj.orderFee/100}}元
+
+
+
+
+ 服务费：
+ {{xqobj.serviceFee/100}}元
+
+
+
+
+
+
计费方式：
{{feetype(xqobj.feeType)}}
-
-
- 基础费用：
- {{xqobj.basicFee/100}}元
-
-
-
-
-
服务开始时间：
@@ -544,15 +557,10 @@
{{xqobj.serviceTimeEnd}}
-
-
- 服务费：
- {{xqobj.serviceFee/100}}元
-
-
+
-
+
上次租赁电池时车辆里程：
@@ -565,21 +573,29 @@
{{xqobj.nowReturnBatCarOdo}}公里
-
+
-
-
-
+
+
- 总充电量：
- {{xqobj.electAmount}}度
+ 租用电池包SOC：
+ {{xqobj.rentBatSoc}}
+
+
+ 归还电池包SOC：
+ {{xqobj.returnBatSoc}}
+
+
+
+
+
租借电池包仓位：
@@ -593,50 +609,51 @@
-
-
+
+
- 租用电池包SOC：
- {{xqobj.rentBatSoc}}
+ 归还电池包仓位：
+ {{xqobj.returnBatNo}}
归还电池包编码：
- {{xqobj.returnBatCode}}
-
-
-
-
- 归还电池包仓位：
- {{xqobj.returnBatNo}}
+ {{xqobj.returnBatCode}}
-
-
-
+
+
- 归还电池包SOC：
-
+ 总充电量：
+ {{xqobj.electAmount}}度
-
+
+
+
+
+
+
-
+
换电模式：
@@ -698,7 +715,8 @@
update,
delhdz,
jsfeiy,
- gethdbz
+ gethdbz,
+ oderdetails
} from '@/api/order/replabatt'
import {
@@ -727,7 +745,7 @@
}
}else if(n == 2){
return {
- name:'车辆到达指定位置',
+ name:'车辆到位',
icon:'LocationFilled'
}
}else if(n == 3){
@@ -1164,8 +1182,12 @@
let hdbz = ref([])
let xqobj = ref({})
function getdetails(n:any) {
- xqobj.value = n
+ //xqobj.value = n
drawer.value = true
+ oderdetails(n.orderNo).then((rps:any) => {
+ xqobj.value = rps.data
+ })
+
gethdbz(n.orderNo).then((rps:any) => {
hdbz.value.splice(0)
if(rps.data){
diff --git a/src/views/order/replabatt/payment.vue b/src/views/order/replabatt/payment.vue
index ffdd9d0..388e1d0 100644
--- a/src/views/order/replabatt/payment.vue
+++ b/src/views/order/replabatt/payment.vue
@@ -77,7 +77,11 @@
-
+
+
+ {{scope.row.amount/100}}
+
+
已创建
@@ -455,6 +459,7 @@
openpop.value = false
handBtnqu()
}
+
})
},5000)
})