attiya/ebike-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

骑行端桌面

Browse Source
This commit is contained in:
小小 2025-04-24 13:54:30 +08:00
parent a9d9a42a1a
commit c7f263fb13
5 changed files with 217 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ebike-maintenance/pages/home/home.css
View File

@ -5,18 +5,17 @@
padding-left: 10px; padding-left: 10px;
font-size: 16px; font-size: 16px;
color: #d8d3d3db; color: #d8d3d3db;
display: flex;
justify-content: space-evenly;
} }
.divHead label { .divHead label {
margin-right: 20px; margin-right: 30px;
padding-bottom: 3px;
border-bottom: 2px solid #bdb9b9a1;
} }
.divHeadSel { .divHeadSel {
margin-right: 20px;
padding-bottom: 3px; border-bottom: 2px solid white !important;
border-bottom: 2px solid white;
font-weight: bold; font-weight: bold;
color: white !important; color: white !important;
} }

257
ebike-maintenance/pages/user/home/home.vue
View File

@ -62,7 +62,8 @@
@click="lockRiding" /> @click="lockRiding" />
<image v-if="orderState==1" style="width: 120px;height: 40px;" :src=' imgPath+"static/userui/home/run.png"' <image v-if="orderState==1" style="width: 120px;height: 40px;" :src=' imgPath+"static/userui/home/run.png"'
@click="continueRiding" /> @click="continueRiding" />
<image style="width: 160px;height: 40px;" :src='imgPath+"static/userui/home/end.png"' @click="endRiding" /> <image style="width: 160px;height: 40px;" :src='imgPath+"static/userui/home/endride.png"'
@click="endRiding" />
</div> </div>
</div> </div>
<div v-if="showMess!=1" class="divMess"> <div v-if="showMess!=1" class="divMess">
@ -104,10 +105,10 @@
</div> </div>
<div v-if="showBikeInfo" style="position: absolute;z-index: 2000;bottom: 0;width: 100vw;"> <div v-if="showBikeInfo" style="position: absolute;z-index: 2000;bottom: 0;width: 100vw;">
<bike-info bikecode="123456" @close="closeBikeInfo"/> <bike-info bikecode="123456" @close="closeBikeInfo" />
</div> </div>
<div v-if="showOrderPay" style="position: absolute;z-index: 2000;bottom: 0;width: 100vw;"> <div v-if="showOrderPay" style="position: absolute;z-index: 2000;bottom: 0;width: 100vw;">
<bike-pay :orderid="orderData.orderId"/> <bike-pay :orderid="orderData.orderId" />
</div> </div>
</template> </template>
@ -131,7 +132,10 @@
findIndex findIndex
} from 'lodash'; } from 'lodash';
import config from '@/utils/config'; import config from '@/utils/config';
import {onShow} from "@dcloudio/uni-app"; import {
onShow,
onUnload
} from "@dcloudio/uni-app";
import * as map from "@/utils/usermap.js"; import * as map from "@/utils/usermap.js";
const imgPath = config.imgPath; const imgPath = config.imgPath;
@ -145,10 +149,12 @@
const polygons = ref([]); //面 const polygons = ref([]); //面
const polylines = ref([]); //线 const polylines = ref([]); //线
const circles = ref([]); //圆 const circles = ref([]); //圆
const pointStart=100000000000;
const pointEnd=100000000001;
let oMap = null; let oMap = null;
const showTools=ref(true); const showTools = ref(true);
let oUser = null; let oUser = null;
const showMess = ref(uni.getStorageSync("kbike-mess")); const showMess = ref(uni.getStorageSync("kbike-mess"));
const hasOrder = ref(false); //是否有订单 const hasOrder = ref(false); //是否有订单
@ -168,7 +174,8 @@
}; };
let orderTimer = null; let orderTimer = null;
const orderState = ref(0); const orderState = ref(0);
const showOrderPay=ref(false); const showOrderPay = ref(false);
//车辆 //车辆
@ -177,57 +184,65 @@
//加载数据 //加载数据
function getLoalcationData() { function getLoalcationData() {
uni.getLocation({ map.getLoalcation(res=>{
type: 'gcj02', const {
geocode: true, latitude,
success(res) { longitude
} = res;
location.value = {
latitude,
longitude
};
oMap.moveToLocation({})
const params = {
latitude,
longitude,
radius: 20
};
callOrdereApi("userOrders/bikeList", params, "post").then(res => {
console.log("11111111111111111", "userOrders/bikeList", res);
const { const {
latitude, code,
longitude data,
message
} = res; } = res;
location.value = { if (code != 200) {
latitude, showModelMessage(message);
longitude return;
}; }
const params = { arrBikeData = data || [];
latitude, const arrData = markers.value || [];
longitude, arrBikeData.map((item) => {
radius:20
};
callOrdereApi("userOrders/bikeList", params, "post").then(res => {
console.log("11111111111111111", "userOrders/bikeList", res);
const { const {
code, longitude,
data, latitude
message } = item;
} = res; let index = findIndex(arrData, {
if (code != 200) { longitude,
showModelMessage(message); latitude
return; });
} index = index == -1 ? arrData.length : index;
arrBikeData = data || []; arrData[index] = map.addMarker(index, longitude, latitude, "mapbike.png",
const arrData = markers.value || []; true);
arrBikeData.map((item) => {
const {
longitude,
latitude
} = item;
let index = findIndex(arrData, {
longitude,
latitude
});
index = index == -1 ? arrData.length : index;
arrData[index] = map.addMarker(index, longitude, latitude, "mapbike.png",
true);
})
markers.value = arrData;
}) })
markers.value = arrData;
});
})
// uni.getLocation({
// type: 'gcj02',
// geocode: true,
// success(res) {
// location.value = {
// latitude,
// longitude
// };
},
fail(res) {
} // },
}); // fail(res) {
// }
// });
} }
function clickMess() { function clickMess() {
@ -258,7 +273,7 @@
return; return;
} }
uni.navigateTo({ uni.navigateTo({
url:"/pages/user/scan/applysite" url: "/pages/user/scan/applysite"
}) })
} }
@ -293,8 +308,8 @@
//显示订单 //显示订单
function openOrderPay() { function openOrderPay() {
showTools.value=false; showTools.value = false;
showOrderPay.value=true; showOrderPay.value = true;
} }
//获取订单 //获取订单
@ -342,9 +357,14 @@
return; return;
} }
showOrder.value = true; showOrder.value = true;
if (!orderTimer) { if(tempLock==1){
orderTimer = setInterval(getTracking, 10000); getTracking();
return;
} }
getTracking();
// if (!orderTimer) {
// orderTimer = setInterval(getTracking, 100000);
// }
}) })
} }
@ -361,10 +381,14 @@
ebikeCode: bikeCode, ebikeCode: bikeCode,
startTime: createdAt startTime: createdAt
} }
if(endTime) params={...params,endTime} if (endTime) params = {
...params,
endTime
}
console.log("7777777777777",params); console.log("7777777777777", params);
callOperateApi("ebikeTracking/query", params, "post").then(res => { callOperateApi("ebikeTracking/query", params, "post").then(res => {
console.log("7777777777777", "ebikeTracking/query", res);
const { const {
code, code,
data, data,
@ -373,7 +397,7 @@
if (code != 200) { if (code != 200) {
return; return;
} }
const arrPoints = !data ? [] : data.map(item => { const arrPoints = (!data || data.length == 0) ? [] : data.map(item => {
const { const {
lngGCJ02, lngGCJ02,
latGCJ02 latGCJ02
@ -382,29 +406,29 @@
longitude: lngGCJ02, longitude: lngGCJ02,
latitude: latGCJ02 latitude: latGCJ02
} }
}) });
if(data){
let {lngGCJ02:endlng,latGCJ02:endlat}=data[data.length-1]; const startPoint = ridePoint.split(",");
arrMakers[index+1] = map.addMarker(id, endlng, endlat, "end.png");
}
const startPoint=ridePoint.split(",");
const lng = startPoint[0]; const lng = startPoint[0];
const lat = startPoint[1]; const lat = startPoint[1];
const start = { const start = {
longitude: lng, longitude: lng,
latitude: lat latitude: lat
} }
arrPoints.splice(0, 0, start);
const arrMakers = markers.value || []; const arrMakers = markers.value || [];
const id = 10000000; arrPoints.splice(0, 0, start);
let index = findIndex(arrMakers, { let indexStart = findIndex(arrMakers, {pointStart});
id indexStart = indexStart == -1 ? arrMakers.length : indexStart;
}); arrMakers[indexStart] = map.addMarker(pointStart, lng, lat, "start.png");
index = index == -1 ? arrMakers.length : index; if (data && data.length > 0) {
arrMakers[index] = map.addMarker(id, lng, lat, "start.png"); let {
markers.value =arrMakers; lngGCJ02: endlng,
if(arrPoints.length>1){ latGCJ02: endlat
} = data[data.length - 1];
arrMakers[indexStart + 1] = map.addMarker(pointEnd, endlng, endlat, "end.png");
}
markers.value = arrMakers;
if (arrPoints.length > 1) {
polylines.value = [map.addLine("#168DED", arrPoints)]; polylines.value = [map.addLine("#168DED", arrPoints)];
} }
}) })
@ -428,25 +452,35 @@
//临时锁车 //临时锁车
function lockRiding() { function lockRiding() {
showModelMessage("该功能暂未实现！");
const { const {
userId userId
} = oUser; } = oUser;
const{bikeCode}=orderData; const {
const params={ bikeCode
} = orderData;
const params = {
userId, userId,
bikeCode bikeCode
} }
callOrdereApi("userOrders/tempLock",params,"post").then(res=>{ callOrdereApi("userOrders/tempLock", params, "post").then(res => {
const{code,message,data}=res; const {
console.log("6666666666666666","lockRiding",res); code,
message,
data
} = res;
showModelMessage(message)
if(code==200){
if(orderTimer) {
clearInterval(orderTimer);
orderTimer=null;
}
orderState.value = 1;
}
}); });
orderState.value = 1;
} }
//结束用车 //结束用车
function endRiding() { function endRiding() {
showModelMessage("该功能暂未实现！");
const { const {
userId userId
} = oUser; } = oUser;
@ -463,50 +497,75 @@
data, data,
message message
} = res; } = res;
console.log("111111111111111111111111", "endRiding", res);
if (code != 200) { if (code != 200) {
showModelMessage(message); showModelMessage(message);
return; return;
} }
completeRiding(); completeRiding();
openOrderPay();
}) })
} }
//继续骑行 需要开锁 //继续骑行 需要开锁
function continueRiding() { function continueRiding() {
showModelMessage("该功能暂未实现！"); const {
orderState.value = 0; userId
} = oUser;
const {
bikeCode
} = orderData;
const params = {
userId,
bikeCode
}
callOrdereApi("userOrders/continueCycling", params, "post").then(res => {
const {
code,
message,
data
} = res;
showModelMessage(message)
if(code==200){
if(orderTimer) {
clearInterval(orderTimer);
orderTimer=null;
}
orderState.value = 0;
}
});
//getOrder(); //getOrder();
} }
//查看车辆信息 //查看车辆信息
function openBikeInfo(e) { function openBikeInfo(e) {
showModelMessage("该功能暂未实现！"); showModelMessage("该功能暂未实现！");
if(!oUser){ if (!oUser) {
tologin(); tologin();
return; return;
} }
console.log("33333333333333333",e); console.log("33333333333333333", e);
showBikeInfo.value = true; showBikeInfo.value = true;
showTools.value=false; showTools.value = false;
} }
//关闭车辆信息 //关闭车辆信息
function closeBikeInfo(){ function closeBikeInfo() {
showBikeInfo.value =false; showBikeInfo.value = false;
showTools.value=true; showTools.value = true;
} }
getLoalcationData(); onMounted(()=>{
onShow(() => {
oUser=uni.getStorageSync("wechat_user");
console.log("7777777777777777777777",oUser)
const instance = getCurrentInstance(); const instance = getCurrentInstance();
oMap = uni.createMapContext("mapRef", { oMap = uni.createMapContext("mapRef", {
this: instance.proxy this: instance.proxy
}); });
})
onShow(() => {
oUser = uni.getStorageSync("wechat_user");
console.log("7777777777777777777777","oUser", oUser)
getLoalcationData();
const { const {
userId userId
} = oUser; } = oUser;
@ -515,6 +574,10 @@
} }
}); });
onUnload(() => {
console.log("9999999999999999999", "onUnload",orderTimer);
})
</script> </script>
<style scoped> <style scoped>

28
ebike-maintenance/pages/user/scan/scancode.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<image class="img" :src="`${imgPath}static/userui/scan/back.png`" /> <image class="img" :src="`${imgPath}static/userui/scan/back.png`" />
<div class="divBox"> <div class="divBox">
<div class="divScan"> <div class="divScan">
<div class="divScanTitle">请扫码车身的二维码进行解锁</div> <div class="divScanTitle">请扫码车身的二维码进行解锁</div>
@ -23,11 +23,11 @@
</div> </div>
<div class="divBottom"> <div class="divBottom">
<div class="divBtn" @click="openCode"> <div class="divBtn" @click="openCode">
<image :src="`${imgPath}static/userui/scan/code.png`" /> <image :src="`${imgPath}static/userui/scan/code.png`" />
<div>输入车辆编号</div> <div>输入车辆编号</div>
</div> </div>
<div class="divBtn" @click="clickLight"> <div class="divBtn" @click="clickLight">
<image :src="`${imgPath}static/userui/scan/light.png`" /> <image :src="`${imgPath}static/userui/scan/light.png`" />
<div>{{openLight=="off"?"打开":"关闭"}}手电筒</div> <div>{{openLight=="off"?"打开":"关闭"}}手电筒</div>
</div> </div>
</div> </div>
@ -53,7 +53,9 @@
callOrdereApi callOrdereApi
} from "@/utils/api.js"; } from "@/utils/api.js";
import config from '@/utils/config'; import config from '@/utils/config';
import {addOrder} from "@/utils/usermap.js"; import {
addOrder
} from "@/utils/usermap.js";
const imgPath = config.imgPath; const imgPath = config.imgPath;
@ -81,19 +83,19 @@
showModelMessage("无效的车辆二维码"); showModelMessage("无效的车辆二维码");
return; return;
} }
if(bikeCode) return; if (bikeCode) return;
const options = getUrlParams(result); const options = getUrlParams(result);
bikeCode = options["number"]; bikeCode = options["number"];
if (type == "ride") { if (type == "ride") {
addOrder(bikeCode,(res)=>{ addOrder(bikeCode, (res) => {
if(!res){ console.log("00000000000000000000", res);
setTimeout(()=>{ if (!res) {
bikeCode=null; setTimeout(() => {
},1000); bikeCode = null;
}, 1000);
return; return;
} } else {
else{ showWorn.value = true;
showWorn.value=true;
} }
}) })
} }

11
ebike-maintenance/utils/usermap.js
View File

@ -72,7 +72,7 @@ export function addLine(scolor, arrPoints) {
} }
//创建订单 //创建订单
export function addOrder(bikeCode, icnt, callback) { export function addOrder(bikeCode, callback) {
const oUser = uni.getStorageSync("wechat_user"); const oUser = uni.getStorageSync("wechat_user");
if (!oUser) { if (!oUser) {
uni.navigateTo({ uni.navigateTo({
@ -102,14 +102,15 @@ function saveRide(params, icnt, callback) {
return; return;
} }
showModelMessage(message); showModelMessage(message);
callback(false); if(callback) callback(false);
return; return;
} }
callback(true); if(callback)callback(true);
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ uni.switchTab({
url: "/pages/user/home/home" url: "/pages/user/home/home"
}) })
}, 1000); }, 1000)
}) })
} }

42
ebike-operate/src/utils/authority.js
View File

@ -1,26 +1,26 @@
export function getCache(name) { export function getCache(name) {
if (name == undefined || name == "") { if (name == undefined || name == "") {
return ""; return "";
}
let result = localStorage.getItem(name);
if (result!= null) {
if ((result.startsWith("{") && result.endsWith("}")) || (result.startsWith("[") && result.endsWith("]"))) {
result = JSON.parse(result);
}
}
return result;
} }
let result = sessionStorage.getItem(name);
if (result != null) {
if ((result.startsWith("{") && result.endsWith("}")) || (result.startsWith("[") && result.endsWith("]"))) {
result = JSON.parse(result);
}
}
return result;
}
export function setCache(name, value) { export function setCache(name, value) {
if (name == undefined || name == "") { if (name == undefined || name == "") {
return false; return false;
}
if(typeof value === 'object') {
value = JSON.stringify(value);
}
let result = localStorage.setItem(name, value);
return result;
} }
export function clearStorage() { if (typeof value === 'object') {
localStorage.clear(); value = JSON.stringify(value);
} }
let result = sessionStorage.setItem(name, value);
return result;
}
export function clearStorage() {
sessionStorage.clear();
}