diff --git a/components/logistiComptent/logistiCard/logistiCard.vue b/components/logistiComptent/logistiCard/logistiCard.vue index d44ced1..12000be 100644 --- a/components/logistiComptent/logistiCard/logistiCard.vue +++ b/components/logistiComptent/logistiCard/logistiCard.vue @@ -12,8 +12,10 @@

收货人姓名:  {{fuzzyName(goodsInfo.receiver_name)}}

-

- 收货人姓名:  {{fuzzyName(goodsInfo.receiver_name)}}

+

+ 收货人姓名:  {{fuzzyName(goodsInfo.receiver_name)}} + 已取消 +

diff --git a/static/img/logistics/my_destination.png b/static/img/home/YZ.png similarity index 100% rename from static/img/logistics/my_destination.png rename to static/img/home/YZ.png diff --git a/static/img/logistics/my_position.png b/static/img/logistics/WZ.png similarity index 100% rename from static/img/logistics/my_position.png rename to static/img/logistics/WZ.png diff --git a/static/server/server.js b/static/server/server.js index 8fedc2f..3e1550b 100644 --- a/static/server/server.js +++ b/static/server/server.js @@ -246,7 +246,7 @@ export const oaHomeData = [{ }, { text: '驿站', - icon: '../../static/img/home/GRCW.png', + icon: '../../static/img/home/YZ.png', url: '/pages/logistics/post', // captain: true }, diff --git a/subpkg/property/vehicle.vue b/subpkg/property/vehicle.vue index b1634e2..cb3b440 100644 --- a/subpkg/property/vehicle.vue +++ b/subpkg/property/vehicle.vue @@ -6,11 +6,12 @@ - + + @@ -35,23 +36,37 @@ {{address.transfer.address}} - + - 车辆状态:已完成 + 车辆状态: + 已完成 未开始 - 进行中 + 进行中 - - + + + 标题 + 确认抵达目的地了吗 + + + + 取消 + + 确认 + + + + + @@ -84,14 +99,14 @@ id: 1, latitude: 28.8733, longitude: 105.445717, - iconPath: '../../static/img/logistics/my_destination.png', //显示的图标 + iconPath: '../../static/img/logistics/WZ.png', //显示的图标 }, // 当前所在位置 { id: 2, latitude: undefined, longitude: undefined, - iconPath: '../../static/img/logistics/my_position.png', //显示的图标 + iconPath: '../../static/img/logistics/QS.png', //显示的图标 } ], polyline: [], @@ -257,10 +272,8 @@ taskAddTricycleCoordinate(data).then(() => { uni.hideLoading() Toast('上传成功!') - if (this.status == 1) { - this.initPosition(); - this.locationFn(); - } + this.initPosition(); + this.locationFn(); }) } }, @@ -313,6 +326,61 @@