From 3ec55768d099ba99f4af4d9c36321333762e6073 Mon Sep 17 00:00:00 2001
From: tx <2622874537@qq.com>
Date: Thu, 31 Oct 2024 17:47:13 +0800
Subject: [PATCH] 111
---
page_user/mapSele.vue | 92 ++++++++++++++++++++++++----------------
page_user/ordder.vue | 2 +-
page_user/user_order.vue | 79 ++++++++++++++++++++++++++++++----
pages/index/index.vue | 13 +++++-
pages/my.vue | 19 +++++----
5 files changed, 149 insertions(+), 56 deletions(-)
diff --git a/page_user/mapSele.vue b/page_user/mapSele.vue
index 1faf6dd..5953fec 100644
--- a/page_user/mapSele.vue
+++ b/page_user/mapSele.vue
@@ -102,7 +102,7 @@
取车地点
- 距最近店铺727m
+ 距最近店铺 {{returnKm(shopList[0])}}
@@ -162,7 +162,7 @@
-
+
@@ -667,45 +667,65 @@
});
},
getshopList() {
- let data = {
- // phoneLon:this.gps.latitude,
- phoneLon: 120.257144,
- // phoneLat:this.gps.longitude,
- phoneLat: 27.105719,
- isFreeCar: true
- }
- this.$u.post(`app/getStoreListByLocation`, data).then((res) => {
- if (res.code == 200) {
- this.shopList = res.data;
- this.shopList.forEach(item => {
- this.markers.push({
- id: parseFloat(item.storeId),
- latitude: parseFloat(item.lat),
- longitude: parseFloat(item.lng),
- width: 5,
- height: 5,
- iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/uzNZFrhZypy1CdYMHlhi',
- label: {
- content: '￥69 起', // 修改为你想要显示的文字内容
- color: '#fff', // 文字颜色
- fontSize: 12, // 文字大小
- borderRadius: 16, // 圆角
- bgColor: '#4297F3', // 背景颜色
- padding: 2, // 内边距
- borderWidth: 2, // 边框宽度
- borderColor: '#FFFFFF', // 边框颜色
- display: 'ALWAYS', // 一直显示
- },
- });
- })
- } else {
+ let that=this
+ uni.getLocation({
+ type: 'gcj02',
+ success: function(lb) {
+
+
+ let data = {
+ // phoneLon:this.gps.latitude,
+ phoneLon: lb.longitude,
+ // phoneLat:this.gps.longitude,
+ phoneLat: lb.latitude,
+ isFreeCar: true
+ }
+ that.$u.post(`app/getStoreListByLocation`, data).then((res) => {
+ if (res.code == 200) {
+ that.shopList = res.data;
+ that.shopList.forEach(item => {
+ that.markers.push({
+ id: parseFloat(item.storeId),
+ latitude: parseFloat(item.lat),
+ longitude: parseFloat(item.lng),
+ width: 5,
+ height: 5,
+ iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/uzNZFrhZypy1CdYMHlhi',
+ label: {
+ content: '￥69 起', // 修改为你想要显示的文字内容
+ color: '#fff', // 文字颜色
+ fontSize: 12, // 文字大小
+ borderRadius: 16, // 圆角
+ bgColor: '#4297F3', // 背景颜色
+ padding: 2, // 内边距
+ borderWidth: 2, // 边框宽度
+ borderColor: '#FFFFFF', // 边框颜色
+ display: 'ALWAYS', // 一直显示
+ },
+ });
+ })
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ });
+ },
+ fail: function(error) {
uni.showToast({
- title: res.msg,
+ title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
icon: 'none',
duration: 2000
});
+ // that.getmarks()
+ // 在这里处理获取位置信息失败的情况
}
- });
+
+ })
+
+
},
chooseData(item, index) {
this.dataInfo = item
diff --git a/page_user/ordder.vue b/page_user/ordder.vue
index 33630a8..c1b874d 100644
--- a/page_user/ordder.vue
+++ b/page_user/ordder.vue
@@ -97,7 +97,7 @@
-
+
diff --git a/page_user/user_order.vue b/page_user/user_order.vue
index 9934546..d699297 100644
--- a/page_user/user_order.vue
+++ b/page_user/user_order.vue
@@ -55,7 +55,7 @@
-
+
还车方式
@@ -73,7 +73,7 @@
取车地址
-
@@ -180,6 +180,9 @@
请在{{orderInfo.pickupTime}}前取车，超出时间将无法保证 车辆库存。
+
+ 超出租车时间,每{{timetype(orderInfo.rule.outUnit)}}收费{{orderInfo.rule.outPrice}}元
+
@@ -273,7 +276,7 @@
去还车
-
+
确认上门
@@ -518,6 +521,57 @@
});
return
}
+
+ uni.showLoading({
+ title: '加载中'
+ });
+
+ uni.getLocation({
+ type: 'gcj02',
+ success: (lb) => {
+ let data = {
+ returnType: 1,
+ returnMethod:this.orderInfo.returnMethod,
+ returnStoreId: this.chooseBackInfo.storeId,
+ orderNo: this.orderInfo.orderNo,
+ returnLon: lb.longitude,
+ returnLat: lb.latitude
+ };
+ this.$u.post(`/appVerify/returnVehicle`, data).then((res) => {
+ uni.hideLoading();
+ if (res.code == 200) {
+ uni.redirectTo({
+ url: '/pages/my'
+ })
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ });
+ },
+ fail: (error) => {
+ uni.hideLoading();
+ uni.showToast({
+ title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+ icon: 'none',
+ duration: 2000
+ });
+ // 在这里处理获取位置信息失败的情况
+ }
+ });
+ },
+ subBack2() {
+ if (!this.orderInfo.returnAddress) {
+ uni.showToast({
+ title: '请输入或选择还车地址',
+ icon: 'none',
+ duration: 1000
+ });
+ return
+ }
uni.showLoading({
title: '加载中'
@@ -527,11 +581,10 @@
type: 'gcj02',
success: (lb) => {
let data = {
- returnType: this.orderInfo.returnMethod,
- returnStoreId: this.chooseBackInfo.storeId,
+ returnType: 1,
+ returnMethod:this.orderInfo.returnMethod,
orderNo: this.orderInfo.orderNo,
- returnLon: lb.longitude,
- returnLat: lb.latitude
+
};
this.$u.post(`/appVerify/returnVehicle`, data).then((res) => {
uni.hideLoading();
@@ -960,11 +1013,14 @@
})
},
orderCancel() {
-
+ uni.showLoading({
+ title:'加载中...'
+ })
this.$u.post(`appVerify/orderCancel?orderNo=` + this.orderInfo.orderNo).then((res) => {
+ uni.hideLoading()
if (res.code == 200) {
this.getOrderInfo()
-
+
} else {
uni.showToast({
title: res.msg,
@@ -1115,6 +1171,11 @@
if (this.orderInfo.status == 0) {
this.startCountdown(this.orderInfo.autoCancelTime);
}
+ if(this.orderInfo.returnMethod==2){
+ this.choosetype=2
+ }else{
+ this.choosetype=1
+ }
} else {
uni.showToast({
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 51d64cd..593f9ee 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -26,7 +26,7 @@
取车地点
- 距最近店铺727m
+ 距最近店铺 {{returnKm(shopList[0])}}
@@ -78,7 +78,7 @@
- {{item.distance}}m
+ {{returnKm(item)}}
{{item.simpleAddress}}
@@ -235,6 +235,15 @@
},
methods: {
+ returnKm(item) {
+ let distance = item.distance
+ if (distance < 1000) {
+ return `${distance.toFixed(0)}m`; // 小于1000米，保留整数并拼接'm'
+ } else {
+ return `${(distance / 1000).toFixed(1)}km`; // 大于等于1000米，转换为千米并保留两位小数
+ }
+ },
+
getsn(){
if(this.userInfo.userId){
let data = {
diff --git a/pages/my.vue b/pages/my.vue
index 0c8efb1..4c0e5d3 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -13,7 +13,7 @@
待支付
- 已完成
+ 已结束
@@ -48,7 +48,7 @@
- 用户地址：{{item.pickupLoc}}
+ 用户地址：{{item.returnAddress}}
{{item.payFee}}元
@@ -142,11 +142,14 @@
}
},
todetail(item){
- if(item.status!=5&&item.status!=6){
- uni.navigateTo({
- url:'/page_user/user_order?orderNo='+item.orderNo
- })
- }
+ // if(item.status!=5&&item.status!=6){
+ // uni.navigateTo({
+ // url:'/page_user/user_order?orderNo='+item.orderNo
+ // })
+ // }
+ uni.navigateTo({
+ url:'/page_user/user_order?orderNo='+item.orderNo
+ })
},
typeReturn(num) {
@@ -173,7 +176,7 @@
result.text = '已取消';
result.color = '#ccc'; // 已取消颜色
} else if (num == 7) {
- result.text = '已完成';
+ result.text = '待审核';
result.color = '#3D3D3D'; // 已完成颜色
} else if (num == 8) {
result.text = '已结束';