修改图片路径
This commit is contained in:
小小
parent
b3fa374038
commit
977e01fa07
@ -1,27 +1,27 @@
|
||||
<template>
|
||||
<map id="mapRef" ref="mapRef" style="width: 100%;height: 100vh;" show-location :longitude="location.longitude"
|
||||
:latitude="location.latitude" :markers="markers" :scale="scale" :polygons="polygons" :polyline="polylines"
|
||||
:circles="circles" />
|
||||
:circles="circles" @markertap="fnshowBikeInfo" />
|
||||
<div v-if="!showBikeInfo" class="divMapTools" style="left: 10px;">
|
||||
<div>
|
||||
<image class="divImg" src="/static/userui/home/localtion.png" @click="refresh" />
|
||||
<image class="divImg" :src='imgPath+"static/userui/home/localtion.png"' @click="refresh" />
|
||||
</div>
|
||||
<div>
|
||||
<image class="divImg" src="/static/userui/home/fault.png" @click="reportFault" />
|
||||
<image class="divImg" :src='imgPath+"static/userui/home/fault.png"' @click="reportFault" />
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="!showBikeInfo" class="divMapTools" style="right: 10px;">
|
||||
<div>
|
||||
<image class="divImg" src="/static/userui/home/packing.png" @click="getSite" />
|
||||
<image class="divImg" :src='imgPath+"static/userui/home/packing.png"' @click="getSite" />
|
||||
</div>
|
||||
<div>
|
||||
<image class="divImg" src="/static/userui/home/mine.png" @click="getMine" />
|
||||
<image class="divImg" :src='imgPath+"static/userui/home/mine.png"' @click="getMine" />
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="hasOrder" class="divMapOrder" @click="showOrderInfo">
|
||||
<div>
|
||||
<image style="width: 15px;height: 15px;margin-left: 15px;margin-right: 10px;"
|
||||
src="/static/userui/home/speaker.png" />
|
||||
:src='imgPath+"static/userui/home/speaker.png"' />
|
||||
<label>有骑行订单未支付，请查看</label>
|
||||
</div>
|
||||
<div style="margin-right: 15px;">
|
||||
@ -37,7 +37,7 @@
|
||||
<div v-if="showOrder" class="divOrder">
|
||||
<div class="divOrderRow">
|
||||
<div class="divOrderCell">
|
||||
<image class="divOrderImg" src="/static/userui/home/money.png" />
|
||||
<image class="divOrderImg" :src='imgPath+"static/userui/home/money.png"' />
|
||||
<label>费用：</label>
|
||||
<label>{{order.money}}元</label>
|
||||
</div>
|
||||
@ -47,25 +47,24 @@
|
||||
</div>
|
||||
<div class="divOrderRow" style="font-size: 12px;">
|
||||
<div class="divOrderCell">
|
||||
<image class="divOrderImg" src="/static/userui/home/timer.png" />
|
||||
<image class="divOrderImg" :src='imgPath+"static/userui/home/timer.png"' />
|
||||
<label>计时：</label>
|
||||
<label style="color: #61D246;">{{order.time}}</label>
|
||||
</div>
|
||||
<div class="divOrderCell2">
|
||||
<image class="divOrderImg" src="/static/userui/home/bike.png" />
|
||||
<image class="divOrderImg" :src='imgPath+"static/userui/home/bike.png"' />
|
||||
<label>骑行：</label>
|
||||
<label style="color: #61D246;">{{order.mileage}}</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="divOderBtn">
|
||||
<image v-if="orderState==0" style="width: 120px;height: 40px;" src="/static/userui/home/lock.png"
|
||||
<image v-if="orderState==0" style="width: 120px;height: 40px;" :src='imgPath+"static/userui/home/lock.png"'
|
||||
@click="lockRiding" />
|
||||
<image v-if="orderState==1" style="width: 120px;height: 40px;" src="/static/userui/home/run.png"
|
||||
<image v-if="orderState==1" style="width: 120px;height: 40px;" :src=' imgPath+"static/userui/home/run.png"'
|
||||
@click="continueRiding" />
|
||||
<image style="width: 160px;height: 40px;" src="/static/userui/home/end.png" @click="endRiding" />
|
||||
<image style="width: 160px;height: 40px;" :src='imgPath+"static/userui/home/end.png"' @click="endRiding" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="showMess!=1" class="divMess">
|
||||
<uni-card>
|
||||
<uni-list border>
|
||||
@ -104,7 +103,7 @@
|
||||
</uni-card>
|
||||
</div>
|
||||
<div v-if="showBikeInfo" style="position: absolute;z-index: 2000;bottom: 0;width: 100vw;">
|
||||
<bike-info bikecode="123456"/>
|
||||
<bike-info bikecode="123456" />
|
||||
</div>
|
||||
|
||||
</template>
|
||||
@ -124,8 +123,12 @@
|
||||
callOperateApi
|
||||
} from "@/utils/api.js";
|
||||
|
||||
import { findIndex } from 'lodash';
|
||||
import {
|
||||
findIndex
|
||||
} from 'lodash';
|
||||
import config from '@/utils/config';
|
||||
|
||||
const imgPath = config.imgPath;
|
||||
|
||||
const location = ref({
|
||||
longitude: "",
|
||||
@ -162,10 +165,10 @@
|
||||
|
||||
//车辆
|
||||
let arrBikeData = [];
|
||||
const showBikeInfo=ref(false);
|
||||
const showBikeInfo = ref(false);
|
||||
|
||||
//加载数据
|
||||
function getLoalcationData () {
|
||||
function getLoalcationData() {
|
||||
uni.getLocation({
|
||||
type: 'gcj02',
|
||||
geocode: true,
|
||||
@ -175,25 +178,40 @@
|
||||
longitude
|
||||
} = res;
|
||||
location.value = {
|
||||
longitude:103.975457,latitude:30.633199
|
||||
longitude: 103.975457,
|
||||
latitude: 30.633199
|
||||
};
|
||||
const params={longitude:103.975457,latitude:30.633199};
|
||||
callOrdereApi("userOrders/bikeList",params,"post").then(res=>{
|
||||
console.log("11111111111111111","userOrders/bikeList",res);
|
||||
const{code,data,message}=res;
|
||||
if(code!=200){
|
||||
const params = {
|
||||
longitude: 103.975457,
|
||||
latitude: 30.633199
|
||||
};
|
||||
callOrdereApi("userOrders/bikeList", params, "post").then(res => {
|
||||
console.log("11111111111111111", "userOrders/bikeList", res);
|
||||
const {
|
||||
code,
|
||||
data,
|
||||
message
|
||||
} = res;
|
||||
if (code != 200) {
|
||||
showModelMessage(message);
|
||||
return;
|
||||
}
|
||||
arrBikeData=data||[];
|
||||
const arrData=markers.value||[];
|
||||
arrBikeData = data || [];
|
||||
const arrData = markers.value || [];
|
||||
arrBikeData.map((item) => {
|
||||
const{longitude,latitude}=item;
|
||||
let index=findIndex(arrData,{longitude,latitude});
|
||||
index=index==-1?arrData.length:index;
|
||||
arrData[index]=addMarker(index, longitude, latitude, "mapbike.png",true);
|
||||
const {
|
||||
longitude,
|
||||
latitude
|
||||
} = item;
|
||||
let index = findIndex(arrData, {
|
||||
longitude,
|
||||
latitude
|
||||
});
|
||||
index = index == -1 ? arrData.length : index;
|
||||
arrData[index] = addMarker(index, longitude, latitude, "mapbike.png",
|
||||
true);
|
||||
})
|
||||
markers.value =arrData ;
|
||||
markers.value = arrData;
|
||||
|
||||
})
|
||||
|
||||
@ -204,41 +222,45 @@
|
||||
});
|
||||
}
|
||||
|
||||
function clickMess () {
|
||||
function clickMess() {
|
||||
uni.setStorageSync("kbike-mess", 1);
|
||||
showMess.value = 1;
|
||||
}
|
||||
|
||||
//刷新
|
||||
function refresh () {
|
||||
function refresh() {
|
||||
getLoalcationData();
|
||||
}
|
||||
|
||||
//故障上报
|
||||
function reportFault () {
|
||||
function reportFault() {
|
||||
if (!oUser) {
|
||||
tologin();
|
||||
return;
|
||||
}
|
||||
showModelMessage("该功能暂未实现！");
|
||||
uni.navigateTo({
|
||||
url: "/pages/user/login/TroubleReportUser"
|
||||
})
|
||||
}
|
||||
|
||||
//站点
|
||||
function getSite () {
|
||||
function getSite() {
|
||||
showModelMessage("该功能暂未实现！");
|
||||
}
|
||||
|
||||
//个人中心
|
||||
function getMine () {
|
||||
function getMine() {
|
||||
if (!oUser) {
|
||||
tologin();
|
||||
return;
|
||||
}
|
||||
showModelMessage("该功能暂未实现！");
|
||||
uni.navigateTo({
|
||||
url: "/pages/user/mine/MePage"
|
||||
})
|
||||
}
|
||||
|
||||
//扫描
|
||||
function scanBike () {
|
||||
function scanBike() {
|
||||
if (!oUser) {
|
||||
tologin();
|
||||
return;
|
||||
@ -247,14 +269,14 @@
|
||||
userId
|
||||
} = oUser;
|
||||
uni.navigateTo({
|
||||
url:"/pages/user/scan/scancode?type=ride"
|
||||
url: "/pages/user/scan/scancode?type=ride"
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
//添加点
|
||||
function addMarker (id, longitude, latitude, icon,joinCluster) {
|
||||
function addMarker(id, longitude, latitude, icon, joinCluster) {
|
||||
return {
|
||||
id: id,
|
||||
latitude,
|
||||
@ -263,7 +285,7 @@
|
||||
height: 30,
|
||||
zIndex: "100",
|
||||
iconPath: "/static/userui/home/" + icon,
|
||||
joinCluster: joinCluster?true:false
|
||||
joinCluster: joinCluster ? true : false
|
||||
};
|
||||
}
|
||||
|
||||
@ -276,7 +298,7 @@
|
||||
}
|
||||
}
|
||||
//显示订单
|
||||
function showOrderInfo () {
|
||||
function showOrderInfo() {
|
||||
showOrder.value = true;
|
||||
}
|
||||
|
||||
@ -314,12 +336,11 @@
|
||||
//0-进行中 1-已取消 2-待支付 3-已支付 4-退款中 5-已退款
|
||||
orderState.value = tempLock ? 1 : 0;
|
||||
orderData = data;
|
||||
if(status==2){
|
||||
if (status == 2) {
|
||||
completeRiding();
|
||||
hasOrder.value = true;
|
||||
return;
|
||||
}
|
||||
else if(status!=0){
|
||||
} else if (status != 0) {
|
||||
completeRiding();
|
||||
return;
|
||||
}
|
||||
@ -335,7 +356,9 @@
|
||||
function getTracking() {
|
||||
const {
|
||||
bikeCode,
|
||||
createdAt,ridePoint, returnPoint
|
||||
createdAt,
|
||||
ridePoint,
|
||||
returnPoint
|
||||
} = orderData;
|
||||
const params = {
|
||||
ebikeCode: bikeCode,
|
||||
@ -351,7 +374,7 @@
|
||||
if (code != 200) {
|
||||
return;
|
||||
}
|
||||
const arrPoints =!data?[]: data.map(item => {
|
||||
const arrPoints = !data ? [] : data.map(item => {
|
||||
const {
|
||||
lngGCJ02,
|
||||
latGCJ02
|
||||
@ -361,37 +384,39 @@
|
||||
latitude: latGCJ02
|
||||
}
|
||||
})
|
||||
const lng= startPoint[0];
|
||||
const lat=startPoint[1];
|
||||
const start={
|
||||
longitude:lng,
|
||||
const lng = startPoint[0];
|
||||
const lat = startPoint[1];
|
||||
const start = {
|
||||
longitude: lng,
|
||||
latitude: lat
|
||||
}
|
||||
// const end={
|
||||
// longitude: endPoint[0],
|
||||
// latitude: endPoint[1]
|
||||
// }
|
||||
arrPoints.splice(0,0,start);
|
||||
arrPoints.splice(0, 0, start);
|
||||
// arrPoints.push(end);
|
||||
|
||||
const arrMakers=markers.value||[];
|
||||
const id=10000000;
|
||||
let index=findIndex(arrMakers,{id});
|
||||
index=index==-1?arrMakers.length:index;
|
||||
arrMakers[index]=addMarker(id,lng,lat,"mapstart.png");
|
||||
markers.value=arrMakers[index];
|
||||
polylines.value=[addLine("#168DED",arrPoints)];
|
||||
const arrMakers = markers.value || [];
|
||||
const id = 10000000;
|
||||
let index = findIndex(arrMakers, {
|
||||
id
|
||||
});
|
||||
index = index == -1 ? arrMakers.length : index;
|
||||
arrMakers[index] = addMarker(id, lng, lat, "mapstart.png");
|
||||
markers.value = arrMakers[index];
|
||||
polylines.value = [addLine("#168DED", arrPoints)];
|
||||
})
|
||||
}
|
||||
|
||||
//完成骑行
|
||||
function completeRiding(){
|
||||
if(!orderTimer) return;
|
||||
function completeRiding() {
|
||||
if (!orderTimer) return;
|
||||
clearInterval(orderTimer);
|
||||
orderTimer=null;
|
||||
orderTimer = null;
|
||||
showOrder.value = false;
|
||||
hasOrder.value = false;
|
||||
orderState.value=0;
|
||||
orderState.value = 0;
|
||||
}
|
||||
|
||||
function tologin() {
|
||||
@ -409,15 +434,24 @@
|
||||
//结束用车
|
||||
function endRiding() {
|
||||
showModelMessage("该功能暂未实现！");
|
||||
const {userId}=oUser;
|
||||
const {
|
||||
userId
|
||||
} = oUser;
|
||||
const {
|
||||
bikeCode
|
||||
} = orderData;
|
||||
const params={userId,bikeCode}
|
||||
callOrdereApi("userOrders/doneRide",params,"post").then(res=>{
|
||||
const{code,data,message}=res;
|
||||
console.log("111111111111111111111111","endRiding",res);
|
||||
if(code!=200){
|
||||
const params = {
|
||||
userId,
|
||||
bikeCode
|
||||
}
|
||||
callOrdereApi("userOrders/doneRide", params, "post").then(res => {
|
||||
const {
|
||||
code,
|
||||
data,
|
||||
message
|
||||
} = res;
|
||||
console.log("111111111111111111111111", "endRiding", res);
|
||||
if (code != 200) {
|
||||
showModelMessage(message);
|
||||
return;
|
||||
}
|
||||
@ -433,6 +467,12 @@
|
||||
//getOrder();
|
||||
}
|
||||
|
||||
//查看车辆信息
|
||||
function fnshowBikeInfo() {
|
||||
showModelMessage("该功能暂未实现！");
|
||||
showBikeInfo.value = true;
|
||||
}
|
||||
|
||||
|
||||
getLoalcationData();
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
const config = {
|
||||
apiUrl: "https://attiya.fun/ebike/",
|
||||
apiUrl: "http://192.168.2.156:10010/",
|
||||
cdnPath: "/",
|
||||
ERR_OK: 200,
|
||||
sm2PublicKey: "04f5084ee12767d932f293508e30e3b0100185042ec0f061dedaf92b793b93f79fd6179d5e47e25b7aec98e00cf90dd56df1f8191012537187e7bbfd2d1de299fc" //f8209a2ebe6691e41e1f2b667bfe71f0b511716cc0f7c4452502fc12ec3957e4
|
||||
sm2PublicKey: "04f5084ee12767d932f293508e30e3b0100185042ec0f061dedaf92b793b93f79fd6179d5e47e25b7aec98e00cf90dd56df1f8191012537187e7bbfd2d1de299fc", //f8209a2ebe6691e41e1f2b667bfe71f0b511716cc0f7c4452502fc12ec3957e4
|
||||
imgPath:"https://attiya.fun/ebike-file/cdn-bucket/maintenance/"
|
||||
}
|
||||
export default config;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user