diff --git a/components/search-destination/search-destination.vue b/components/search-destination/search-destination.vue
index 45e4e10..149875e 100644
--- a/components/search-destination/search-destination.vue
+++ b/components/search-destination/search-destination.vue
@@ -107,7 +107,7 @@
let marker = reactive({
markers: []
})
-
+ const isshowlocation = ref(true)
const popup_mean = ref(null)
const bottom_popup = ref(false)
const bdlongitude = ref()
@@ -301,7 +301,7 @@
const goMap = (e) => {
showSearch.value = false //关闭搜索展示列表
showToast.value = true
- // console.log(e, 'eeeeeeeeeee');
+ console.log(e, 'eeeeeeeeeee');
searchStationName.value = e.stationName
searchAreaName.value = e.areaName
searchDistance.value = e.distance
@@ -359,7 +359,7 @@
icon: 'error'
});
return;
- }
+ }
// else if (uni.getStorageSync("realNameAuthFlag") != 1) {
// emit('handle_errornotify')
// return
@@ -372,10 +372,12 @@
'&distance=' +
JSON.parse(searchDistance.value) + '&searchID=' + JSON.parse(searchID.value)
})
+ bottom_popup.value.close()
}
}
}
const callouttap = (e) => {
+ // console.log(e,'弹框')
let showInf = pointsList.value.filter((item) => {
return item.id == e.detail.markerId
})
@@ -391,11 +393,17 @@
const handle_open = (showInf) => {
for (let item of pointsList.value) {
if (showInf.id == item.id) {
- // console.log(item,'平移了');
- uni.createMapContext('map').moveToLocation({
- longitude: item.longitude,
- latitude: item.latitude
- })
+ console.log(item, '平移了');
+ searchStationName.value = item.stationName
+ searchAreaName.value = item.areaName
+ searchDistance.value = item.distance
+ searchNo.value = item.stationNo
+ searchID.value = item.id
+ bottom_popup.value.open('bottom')
+ // uni.createMapContext('map').moveToLocation({
+ // longitude: item.longitude,
+ // latitude: item.latitude
+ // })
}
}
// console.log(showInf,'showInf');
diff --git a/pages/order/chargorder/detailInf/detail.vue b/pages/order/chargorder/detailInf/detail.vue
index 5164048..f3a31e0 100644
--- a/pages/order/chargorder/detailInf/detail.vue
+++ b/pages/order/chargorder/detailInf/detail.vue
@@ -32,7 +32,8 @@
已关闭
- 充电开始时间: {{detail.list.startTime==null?'--':detail.list.startTime}}
+ 充电开始时间: {{detail.list.startTime==null?'--':detail.list.startTime}}
+
@@ -63,9 +64,119 @@
充电时长
{{detail.list.chargingTime==null?'--':detail.list.chargingTime}} 分钟
+
+
+ 费用信息
+
+
+ 费用合计
+ {{detail.list.totalFee==null?'0':detail.list.totalFee / 100}}元
+
+
+
+
+ 电价费用
+ {{detail.list.elecTotalExpense==null?'0':detail.list.elecTotalExpense / 100}}元
+
+
+ 平台服务费
+ {{detail.list.cloudTotalFee==null?'0':detail.list.cloudTotalFee / 100}}元
+
+
+ 电池服务费
+ {{detail.list.batTotalFee==null?'0':detail.list.batTotalFee / 100}}元
+
+
+ 充电服务总费用
+ {{detail.list.chargeTotalFee==null?'0':detail.list.chargeTotalFee / 100}}元
+
+
+
+
+
+
+
+
+ {{item.startTime}} - {{item.endTime}} 充电
+ {{ item.electric == null? 0: item.electric }}
+ 度
+
+
+ 电 费(
+ {{item.electricityPrice == null? 0: item.electricityPrice / 100}}元 / 度 )
+
+
+ ¥{{ item.electricityExpense == null? 0: item.electricityExpense / 100 }}
+
+
+
+ 服务费(
+ {{item.servicePrice == null? 0: item.servicePrice / 100}}元/度 )
+
+
+ ¥{{item.serviceExpense == null? 0: item.serviceExpense / 100 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,6 +272,18 @@
orderType: 'recharge',
});
}
+
+ const handle_electricity = (one, two) => {
+ let ones = one == null ? 0 : one / 100
+ let twos = two == null ? 0 : two / 100
+ return ones + twos
+ }
+ //
+ const handle_power = (one, two) => {
+ let ones = one == null ? 0 : one
+ let twos = two == null ? 0 : two
+ return ones + twos
+ }
\ No newline at end of file
diff --git a/pagesCenter/login/enter.vue b/pagesCenter/login/enter.vue
index eb95cfa..6ea134b 100644
--- a/pagesCenter/login/enter.vue
+++ b/pagesCenter/login/enter.vue
@@ -117,8 +117,8 @@
})
const tips = ref('获取验证码')
const form_login = ref({
- mobile: '17625813248',
- password: '123456',
+ mobile: '17398399925',
+ password: 'mes123456',
// mobile: '',
// password: '',
code: ''