|
|
@@ -55,80 +55,86 @@ Page({
|
|
|
voyageId: this.data.id,
|
|
|
loginAccountId: wx.getStorageSync('loginAccountId'),
|
|
|
})
|
|
|
+ if (res.data.status == 0) {
|
|
|
+ let {
|
|
|
+ coordinates,
|
|
|
+ medias,
|
|
|
+ policys,
|
|
|
+ voyage,
|
|
|
+ waybills
|
|
|
+ } = res.data.result
|
|
|
+ if (coordinates.length) {
|
|
|
+ let points = []
|
|
|
+ for (let i of coordinates) {
|
|
|
+ points.push({
|
|
|
+ latitude: i.latitude,
|
|
|
+ longitude: i.longitude
|
|
|
+ })
|
|
|
+ }
|
|
|
+ let {
|
|
|
+ latitude,
|
|
|
+ longitude
|
|
|
+ } = points[points.length - 1]
|
|
|
+ this.data.latitude = latitude
|
|
|
+ this.data.longitude = longitude
|
|
|
+ this.data.polyline[0].points = points
|
|
|
+ let id = 1
|
|
|
+ for (let i of points) {
|
|
|
+ this.data.markers.push({
|
|
|
+ id: id + 1,
|
|
|
+ latitude: i.latitude,
|
|
|
+ longitude: i.longitude,
|
|
|
+ iconPath: "https://6875-huihenduo-2gx127w7f837b584-1255802371.tcb.qcloud.la/miniapp-static/red-circle.png?sign=6d208881376358fb4111aa6d7f1a7846&t=1647934972",
|
|
|
+ height: 20,
|
|
|
+ width: 20
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
- let {
|
|
|
- coordinates,
|
|
|
- medias,
|
|
|
- policys,
|
|
|
- voyage,
|
|
|
- waybills
|
|
|
- } = res.data.result
|
|
|
- if (coordinates.length) {
|
|
|
- let points = []
|
|
|
- for (let i of coordinates) {
|
|
|
- points.push({
|
|
|
- latitude: i.latitude,
|
|
|
- longitude: i.longitude
|
|
|
+ this.setData({
|
|
|
+ polyline: this.data.polyline,
|
|
|
+ markers: this.data.markers,
|
|
|
+ latitude: this.data.latitude,
|
|
|
+ longitude: this.data.longitude,
|
|
|
+ points
|
|
|
})
|
|
|
+
|
|
|
}
|
|
|
- let {
|
|
|
- latitude,
|
|
|
- longitude
|
|
|
- } = points[points.length - 1]
|
|
|
- this.data.latitude = latitude
|
|
|
- this.data.longitude = longitude
|
|
|
- this.data.polyline[0].points = points
|
|
|
- let id = 1
|
|
|
- for (let i of points) {
|
|
|
- this.data.markers.push({
|
|
|
- id: id + 1,
|
|
|
- latitude: i.latitude,
|
|
|
- longitude: i.longitude,
|
|
|
- iconPath: "https://6875-huihenduo-2gx127w7f837b584-1255802371.tcb.qcloud.la/miniapp-static/red-circle.png?sign=6d208881376358fb4111aa6d7f1a7846&t=1647934972",
|
|
|
- height: 20,
|
|
|
- width: 20
|
|
|
- })
|
|
|
+ voyage.arrivalLoadPortTime = this.subTimeStr(voyage.arrivalLoadPortTime)
|
|
|
+ voyage.loadStartTime = this.subTimeStr(voyage.loadStartTime)
|
|
|
+ voyage.loadEndTime = this.subTimeStr(voyage.loadEndTime)
|
|
|
+ voyage.setSailTime = this.subTimeStr(voyage.setSailTime)
|
|
|
+ voyage.expectedArrivalTime = this.subTimeStr(voyage.expectedArrivalTime)
|
|
|
+ let dischargePortIds = voyage.dischargePortIds.split(',')
|
|
|
+ let dischargePorts = voyage.dischargePorts.split(',')
|
|
|
+ let discLength = dischargePortIds.length
|
|
|
+
|
|
|
+ for (let item of voyage.voyageDetails) {
|
|
|
+
|
|
|
+ item.setSailTime = this.subTimeStr(item.setSailTime)
|
|
|
+ item.expectedArrivalTime = this.subTimeStr(item.expectedArrivalTime)
|
|
|
+ item.actualArrivalTime = this.subTimeStr(item.actualArrivalTime)
|
|
|
+ item.dischargeStartTime = this.subTimeStr(item.dischargeStartTime)
|
|
|
+ item.dischargeEndTime = this.subTimeStr(item.dischargeEndTime)
|
|
|
}
|
|
|
-
|
|
|
this.setData({
|
|
|
- polyline: this.data.polyline,
|
|
|
- markers: this.data.markers,
|
|
|
- latitude: this.data.latitude,
|
|
|
- longitude: this.data.longitude,
|
|
|
- points
|
|
|
+ coordinates,
|
|
|
+ medias,
|
|
|
+ policys,
|
|
|
+ ...voyage,
|
|
|
+ waybills,
|
|
|
+ currentPortId: voyage?.voyageDetails[0].portId,
|
|
|
+ dischargePortIds,
|
|
|
+ dischargePorts,
|
|
|
+ discLength
|
|
|
+ })
|
|
|
+ this.getCarLoadRecordList()
|
|
|
+ this.getDischargeList()
|
|
|
+ } else {
|
|
|
+ wx.showToast({
|
|
|
+ title: '获取详情失败!',
|
|
|
+ icon: "error"
|
|
|
})
|
|
|
-
|
|
|
- }
|
|
|
- voyage.arrivalLoadPortTime = this.subTimeStr(voyage.arrivalLoadPortTime)
|
|
|
- voyage.loadStartTime = this.subTimeStr(voyage.loadStartTime)
|
|
|
- voyage.loadEndTime = this.subTimeStr(voyage.loadEndTime)
|
|
|
- voyage.setSailTime = this.subTimeStr(voyage.setSailTime)
|
|
|
- voyage.expectedArrivalTime = this.subTimeStr(voyage.expectedArrivalTime)
|
|
|
- let dischargePortIds = voyage.dischargePortIds.split(',')
|
|
|
- let dischargePorts = voyage.dischargePorts.split(',')
|
|
|
- let discLength = dischargePortIds.length
|
|
|
-
|
|
|
- for (let item of voyage.voyageDetails) {
|
|
|
-
|
|
|
- item.setSailTime = this.subTimeStr(item.setSailTime)
|
|
|
- item.expectedArrivalTime = this.subTimeStr(item.expectedArrivalTime)
|
|
|
- item.actualArrivalTime = this.subTimeStr(item.actualArrivalTime)
|
|
|
- item.dischargeStartTime = this.subTimeStr(item.dischargeStartTime)
|
|
|
- item.dischargeEndTime = this.subTimeStr(item.dischargeEndTime)
|
|
|
}
|
|
|
- this.setData({
|
|
|
- coordinates,
|
|
|
- medias,
|
|
|
- policys,
|
|
|
- ...voyage,
|
|
|
- waybills,
|
|
|
- currentPortId: voyage?.voyageDetails[0].portId,
|
|
|
- dischargePortIds,
|
|
|
- dischargePorts,
|
|
|
- discLength
|
|
|
- })
|
|
|
- this.getCarLoadRecordList()
|
|
|
- this.getDischargeList()
|
|
|
},
|
|
|
subTimeStr(str) {
|
|
|
if (!str || typeof str != "string") return;
|