bug修改 新内容增加
This commit is contained in:
parent
99507381ba
commit
f238087239
|
|
@ -6,9 +6,12 @@ const install = (Vue, vm) => {
|
||||||
// baseUrl: 'http://61.174.243.28:15861',
|
// baseUrl: 'http://61.174.243.28:15861',
|
||||||
// baseUrl: 'http://192.168.2.46:8080',
|
// baseUrl: 'http://192.168.2.46:8080',
|
||||||
// baseUrl: 'https://che.chuangtewl.com/prod-api',
|
// baseUrl: 'https://che.chuangtewl.com/prod-api',
|
||||||
|
// 测试环境
|
||||||
// baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
|
// baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
|
||||||
|
// 俞山岛
|
||||||
baseUrl: 'https://dche.ccttiot.com/prod-api',
|
baseUrl: 'https://dche.ccttiot.com/prod-api',
|
||||||
loadingText: '努力加载中~',
|
// 创特
|
||||||
|
loadingText: '努力加载中~',
|
||||||
loadingTime: 10000,
|
loadingTime: 10000,
|
||||||
// 设置自定义头部content-type
|
// 设置自定义头部content-type
|
||||||
header: {
|
header: {
|
||||||
|
|
|
||||||
|
|
@ -429,6 +429,22 @@
|
||||||
|
|
||||||
that.check()
|
that.check()
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
|
|
||||||
|
// let data={
|
||||||
|
// orderNo
|
||||||
|
// }
|
||||||
|
// that.$u.get("/appVerify/queryResultByOrderNo?" + data).then((res) => {
|
||||||
|
|
||||||
|
// if (res.code == 200) {
|
||||||
|
|
||||||
|
// } else {
|
||||||
|
// // uni.showToast({
|
||||||
|
// // title: res.msg,
|
||||||
|
// // icon: 'none',
|
||||||
|
// // duration: 2000
|
||||||
|
// // });
|
||||||
|
// }
|
||||||
|
// });
|
||||||
}, 4000)
|
}, 4000)
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,41 @@
|
||||||
|
|
||||||
<view class="cont">
|
<view class="cont">
|
||||||
<view class="card1">
|
<view class="card1">
|
||||||
|
<view class="card_txt">
|
||||||
|
不使用骑行卡
|
||||||
|
</view>
|
||||||
|
<image src="https://lxnapi.ccttiot.com/bike/img/static/u2RancJg66W4KNy3NVOW" mode=""></image>
|
||||||
|
<!-- <image src="https://lxnapi.ccttiot.com/bike/img/static/u534UfvcSJmYAoPtTP4V" mode=""></image> -->
|
||||||
|
</view>
|
||||||
|
<view class="tips">
|
||||||
|
可用骑行卡
|
||||||
|
</view>
|
||||||
|
<view class="card2">
|
||||||
|
<view class="txt1">
|
||||||
|
电单车15天5次卡 | 剩余5次
|
||||||
|
</view>
|
||||||
|
<view class="txt2">
|
||||||
|
有效期至2024-08-04
|
||||||
|
</view>
|
||||||
|
<view class="btn1">
|
||||||
|
满5.00元可使用
|
||||||
|
</view>
|
||||||
|
<view class="imgs">
|
||||||
|
<!-- <image src="https://lxnapi.ccttiot.com/bike/img/static/u2RancJg66W4KNy3NVOW" mode=""></image> -->
|
||||||
|
<image src="https://lxnapi.ccttiot.com/bike/img/static/u534UfvcSJmYAoPtTP4V" mode=""></image>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="card3">
|
||||||
|
<view class="txt4">
|
||||||
|
有效期至2024-08-28
|
||||||
|
</view>
|
||||||
|
<view class="imgs">
|
||||||
|
<!-- <image src="https://lxnapi.ccttiot.com/bike/img/static/ug8PuJqm4gM8NTod9QhV" mode=""></image> -->
|
||||||
|
<image src="https://lxnapi.ccttiot.com/bike/img/static/udiSbHYWZQYLoapdWOyc" mode=""></image>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="sub_btn">
|
||||||
|
确定
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -41,14 +75,136 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
.card1{
|
.sub_btn{
|
||||||
|
position: fixed;
|
||||||
|
bottom: 48rpx;
|
||||||
|
left: 34rpx;
|
||||||
|
width: 680rpx;
|
||||||
|
height: 90rpx;
|
||||||
|
background: #64B6A7;
|
||||||
|
border-radius: 54rpx 54rpx 54rpx 54rpx;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 40rpx;
|
||||||
|
color: #FFFFFF;
|
||||||
|
}
|
||||||
|
.tips {
|
||||||
|
margin-left: 36rpx;
|
||||||
|
margin-top: 60rpx;
|
||||||
|
width: 100%;
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 36rpx;
|
||||||
|
color: #808080;
|
||||||
|
}
|
||||||
|
.card3 {
|
||||||
|
position: relative;
|
||||||
|
margin-top: 18rpx;
|
||||||
|
width: 680rpx;
|
||||||
|
height: 410rpx;
|
||||||
|
background-image: url('https://lxnapi.ccttiot.com/bike/img/static/uZCTchd4XbAwsmNDuGun');
|
||||||
|
background-size: cover;
|
||||||
|
/* 背景图片等比缩放以覆盖整个容器 */
|
||||||
|
background-position: center;
|
||||||
|
/* 背景图片居中显示 */
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
/* 防止背景图片重复 */
|
||||||
|
.txt4{
|
||||||
|
position: absolute;
|
||||||
|
top: 72rpx;
|
||||||
|
right: 78rpx;
|
||||||
|
font-weight: 400;
|
||||||
|
font-size: 24rpx;
|
||||||
|
color: #F5C164;
|
||||||
|
}
|
||||||
|
.imgs{
|
||||||
|
position: absolute;
|
||||||
|
top: 192rpx;
|
||||||
|
right: 54rpx;
|
||||||
|
width: 66rpx;
|
||||||
|
height: 66rpx;
|
||||||
|
image{
|
||||||
|
width: 66rpx;
|
||||||
|
height: 66rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
.card2 {
|
||||||
|
// display: flex;
|
||||||
|
// flex-wrap: wrap;
|
||||||
|
position: relative;
|
||||||
|
padding: 22rpx 46rpx;
|
||||||
|
margin-top: 44rpx;
|
||||||
|
width: 680rpx;
|
||||||
|
height: 226rpx;
|
||||||
|
background-image: url('https://lxnapi.ccttiot.com/bike/img/static/uc3Hj4vMSljiPB1JCYZH');
|
||||||
|
background-size: cover;
|
||||||
|
/* 背景图片等比缩放以覆盖整个容器 */
|
||||||
|
background-position: center;
|
||||||
|
/* 背景图片居中显示 */
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
.imgs{
|
||||||
|
position: absolute;
|
||||||
|
top: 80rpx;
|
||||||
|
right: 54rpx;
|
||||||
|
width: 66rpx;
|
||||||
|
height: 66rpx;
|
||||||
|
image{
|
||||||
|
width: 66rpx;
|
||||||
|
height: 66rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.txt1 {
|
||||||
|
width: 100%;
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 32rpx;
|
||||||
|
color: #FFFFFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
.txt2 {
|
||||||
|
width: 100%;
|
||||||
|
margin-top: 10rpx;
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 24rpx;
|
||||||
|
color: #FFFFFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn1 {
|
||||||
|
margin-top: 34rpx;
|
||||||
|
display: inline-flex;
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 24rpx;
|
||||||
|
color: #FFFFFF;
|
||||||
|
padding: 12rpx 18rpx;
|
||||||
|
border-radius: 10rpx 10rpx 10rpx 10rpx;
|
||||||
|
border: 2rpx solid #FFFFFF;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.card1 {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
justify-content: space-between;
|
||||||
padding: 44rpx 48rpx;
|
padding: 44rpx 48rpx;
|
||||||
width: 680rpx;
|
width: 680rpx;
|
||||||
height: 142rpx;
|
height: 142rpx;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
|
box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
|
||||||
|
|
||||||
|
.card_txt {
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 40rpx;
|
||||||
|
color: #808080;
|
||||||
|
}
|
||||||
|
|
||||||
|
image {
|
||||||
|
width: 66rpx;
|
||||||
|
height: 66rpx;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -295,7 +295,7 @@
|
||||||
<view class="mac" v-if="orderinfo.sn ">
|
<view class="mac" v-if="orderinfo.sn ">
|
||||||
NO.{{orderinfo.sn}}
|
NO.{{orderinfo.sn}}
|
||||||
</view>
|
</view>
|
||||||
<view class="mac" v-if="!orderinfo.sn " style="color: red;">
|
<view class="mac" v-if="!orderinfo.sn&&rderinfo.orderNo " style="color: red;">
|
||||||
换车开锁失败，请点击换车按钮重新换车
|
换车开锁失败，请点击换车按钮重新换车
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -328,11 +328,11 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="btn" style=" margin-right: 16rpx;"
|
<view class="btn" style=" margin-right: 16rpx;"
|
||||||
v-if="orderinfo.sn && (OrderdeviceInfos.status == 3 || OrderdeviceInfos.status == 6)"
|
v-if="orderinfo.sn && (OrderdeviceInfos.lockStatus ==1 )"
|
||||||
@click="taploadmask (2)">
|
@click="taploadmask (2)">
|
||||||
临时锁车
|
临时锁车
|
||||||
</view>
|
</view>
|
||||||
<view class="btn" style=" margin-right: 16rpx;" v-if="OrderdeviceInfos.status==4"
|
<view class="btn" style=" margin-right: 16rpx;" v-if="OrderdeviceInfos.lockStatus==0"
|
||||||
@click=" taploadmask(3)">
|
@click=" taploadmask(3)">
|
||||||
解锁用车
|
解锁用车
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -1999,61 +1999,68 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
const markerExists = this.listData.some(item => item.sn == e.markerId);
|
const markerExists = this.listData.some(item => item.sn == e.markerId);
|
||||||
|
if(this.orderinfo.sn){
|
||||||
if (markerExists) {
|
uni.showToast({
|
||||||
this.sn = e.markerId;
|
title: '有进行中的订单，无法查看',
|
||||||
this.deviceInfo(0);
|
icon: 'none'
|
||||||
|
});
|
||||||
// Revert the last clicked marker to the default image and zIndex
|
}else{
|
||||||
if (this.lastClickedMarkerId !== null) {
|
if (markerExists) {
|
||||||
|
this.sn = e.markerId;
|
||||||
|
this.deviceInfo(0);
|
||||||
|
|
||||||
|
// Revert the last clicked marker to the default image and zIndex
|
||||||
|
if (this.lastClickedMarkerId !== null) {
|
||||||
|
this.markers = this.markers.map(marker => {
|
||||||
|
if (marker.id === this.lastClickedMarkerId) {
|
||||||
|
return {
|
||||||
|
...marker,
|
||||||
|
iconPath: this.defaultMarkerIconPath,
|
||||||
|
width: 40,
|
||||||
|
height: 28,
|
||||||
|
// zIndex: 1 // Reset to default zIndex
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return marker;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
this.lastClickedMarkerId = e.markerId;
|
||||||
|
// Update the clicked marker's image and zIndex
|
||||||
this.markers = this.markers.map(marker => {
|
this.markers = this.markers.map(marker => {
|
||||||
if (marker.id === this.lastClickedMarkerId) {
|
if (marker.id === e.markerId) {
|
||||||
return {
|
return {
|
||||||
...marker,
|
...marker,
|
||||||
iconPath: this.defaultMarkerIconPath,
|
iconPath: this.clickedMarkerIconPath,
|
||||||
width: 40,
|
width: 50,
|
||||||
height: 28,
|
height: 35
|
||||||
// zIndex: 1 // Reset to default zIndex
|
// zIndex: 999 // Higher zIndex to bring it to the front
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return marker;
|
return marker;
|
||||||
});
|
});
|
||||||
}
|
|
||||||
this.lastClickedMarkerId = e.markerId;
|
// Store the ID of the currently clicked marker
|
||||||
// Update the clicked marker's image and zIndex
|
|
||||||
this.markers = this.markers.map(marker => {
|
|
||||||
if (marker.id === e.markerId) {
|
// Get the latitude and longitude of the clicked marker
|
||||||
return {
|
const clickedMarker = this.markers.find(marker => marker.id === e.markerId);
|
||||||
...marker,
|
if (clickedMarker) {
|
||||||
iconPath: this.clickedMarkerIconPath,
|
const {
|
||||||
width: 50,
|
latitude,
|
||||||
height: 35
|
longitude
|
||||||
// zIndex: 999 // Higher zIndex to bring it to the front
|
} = clickedMarker;
|
||||||
};
|
console.log(`Clicked marker location - Latitude: ${latitude}, Longitude: ${longitude}`);
|
||||||
|
this.routePlanning(latitude, longitude)
|
||||||
|
// Find nearby markers
|
||||||
|
// this.getNearbyMarkers(latitude, longitude);
|
||||||
}
|
}
|
||||||
return marker;
|
|
||||||
});
|
// console.log(this.markers, 'Updated markers');
|
||||||
|
} else {
|
||||||
// Store the ID of the currently clicked marker
|
console.log('Marker ID does not exist in the list data');
|
||||||
|
|
||||||
|
|
||||||
// Get the latitude and longitude of the clicked marker
|
|
||||||
const clickedMarker = this.markers.find(marker => marker.id === e.markerId);
|
|
||||||
if (clickedMarker) {
|
|
||||||
const {
|
|
||||||
latitude,
|
|
||||||
longitude
|
|
||||||
} = clickedMarker;
|
|
||||||
console.log(`Clicked marker location - Latitude: ${latitude}, Longitude: ${longitude}`);
|
|
||||||
this.routePlanning(latitude, longitude)
|
|
||||||
// Find nearby markers
|
|
||||||
// this.getNearbyMarkers(latitude, longitude);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// console.log(this.markers, 'Updated markers');
|
|
||||||
} else {
|
|
||||||
console.log('Marker ID does not exist in the list data');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Prevent event bubbling
|
// Prevent event bubbling
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
上个月
|
上个月
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="top_card">
|
<view class="top_card" v-if="false">
|
||||||
<view class="tit">
|
<view class="tit">
|
||||||
<image src="https://lxnapi.ccttiot.com/bike/img/static/uR7EhQMLnjuRoi0G3tA6" mode=""></image>
|
<image src="https://lxnapi.ccttiot.com/bike/img/static/uR7EhQMLnjuRoi0G3tA6" mode=""></image>
|
||||||
收入相关
|
收入相关
|
||||||
|
|
@ -71,6 +71,9 @@
|
||||||
<span style="color: #3D3D3D;" v-else>￥--</span>
|
<span style="color: #3D3D3D;" v-else>￥--</span>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="top_info_box">
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="cont_box">
|
<view class="cont_box">
|
||||||
<view class="cont_info">
|
<view class="cont_info">
|
||||||
|
|
@ -370,7 +373,11 @@
|
||||||
|
|
||||||
.page {
|
.page {
|
||||||
width: 750rpx;
|
width: 750rpx;
|
||||||
|
.top_info_box{
|
||||||
|
background: #FFFFFF;
|
||||||
|
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0,0,0,0.2);
|
||||||
|
border-radius: 20rpx 20rpx 0 0;
|
||||||
|
}
|
||||||
.lines {
|
.lines {
|
||||||
width: 748rpx;
|
width: 748rpx;
|
||||||
height: 22rpx;
|
height: 22rpx;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user