From cabe0865160b7f6b33464379b4cc8756ed7e4186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F?= <736883394@qq.com>
Date: Tue, 15 Apr 2025 14:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=91=E8=A1=8C=E7=AB=AF=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bike-info/bike-info.vue        |  54 +++++----
 .../components/bike-pay/bike-pay.vue          | 110 +++++++++++++++++-
 ebike-maintenance/pages/user/home/home.vue    |  41 ++++---
 ebike-maintenance/static/iconfont.css         |   6 +-
 ebike-maintenance/static/iconfont.ttf         | Bin 18152 -> 18416 bytes
 5 files changed, 173 insertions(+), 38 deletions(-)

diff --git a/ebike-maintenance/components/bike-info/bike-info.vue b/ebike-maintenance/components/bike-info/bike-info.vue
index 7cb76f7..2b63401 100644
--- a/ebike-maintenance/components/bike-info/bike-info.vue
+++ b/ebike-maintenance/components/bike-info/bike-info.vue
@@ -6,63 +6,77 @@
 			</div>
 			<div>
 				<label>状态：</label>
-				<label class="lbImg"><uni-icons custom-prefix="iconfont" type="icon-ebikexuanzhong" :color="color" size="16"/></label>
+				<label class="lbImg"><uni-icons custom-prefix="iconfont" type="icon-ebikexuanzhong" :color="color"
+						size="16" /></label>
 				<label>正常</label>
 			</div>
 		</div>
 		<div class="divRow">
 			<div class="lbTitle">剩余电量：</div>
 			<div>
-				<label class="lbImg"><uni-icons custom-prefix="iconfont" type="icon-ebikeelectricity-full" :color="color" size="16"/></label>
+				<label class="lbImg"><uni-icons custom-prefix="iconfont" type="icon-ebikeelectricity-full"
+						:color="color" size="16" /></label>
 				<label>{{data.dl}}</label>
 			</div>
 		</div>
 		<div class="divRow">
 			<div class="lbTitle">可骑行距离：</div>
 			<div>
-				<label class="lbImg"><uni-icons custom-prefix="iconfont" type="icon-ebikeditu2" :color="color" size="16"/></label>
+				<label class="lbImg"><uni-icons custom-prefix="iconfont" type="icon-ebikeditu2" :color="color"
+						size="16" /></label>
 				<label>{{data.jl}}</label>
 			</div>
-			
+
 		</div>
 		<div style="margin-top: 30px;margin-bottom: 30px;">
-			<label style="margin-right: 15px;"><uni-icons custom-prefix="iconfont" type="icon-ebikejinggao" color="#FF7200" size="12"/></label>
+			<label style="margin-right: 15px;"><uni-icons custom-prefix="iconfont" type="icon-ebikejinggao"
+					color="#FF7200" size="12" /></label>
 			<label style="font-size: 10px;">安全骑行，遵守交通规则</label>
 		</div>
 		<div>
-			<div @click="$emit('close')">关闭</div>
+			<div class="divBtn" @click="$emit('close')">关闭</div>
 		</div>
 	</div>
 </template>
 
 <script setup>
-	import { ref } from 'vue';
-	const props=defineProps(["bikecode"]);
-	const methods=defineEmits(["close"])
-	const color=ref("#61D145");
-	const data=ref({
-		bikeCode:props.bikecode,
-		zt:1,
-		dl:"86%",
-		jl:"50km"
+	import {
+		ref,onMounted
+	} from 'vue';
+	import {
+		showModelMessage
+	} from "@/utils/tools.js";
+	const props = defineProps(["bikecode"]);
+	const methods = defineEmits(["close"])
+	const color = ref("#61D145");
+	const data = ref({
+		bikeCode: props.bikecode,
+		zt: 1,
+		dl: "86%",
+		jl: "50km"
 	})
 	
+	onMounted(()=>{
+		showModelMessage("该功能暂未实现！")
+	})
 </script>
 
 <style scoped>
-	.divRow{
+	.divRow {
 		font-size: 12px;
 		color: #000;
 		line-height: 25px;
 		display: flex;
 	}
-	
-	.lbTitle{
+
+	.lbTitle {
 		text-align: right;
 		width: 80px;
 	}
-	
-	.lbImg{
+
+	.lbImg {
 		margin-right: 5px;
 	}
+
+	
 </style>
\ No newline at end of file
diff --git a/ebike-maintenance/components/bike-pay/bike-pay.vue b/ebike-maintenance/components/bike-pay/bike-pay.vue
index 02409e3..76b9695 100644
--- a/ebike-maintenance/components/bike-pay/bike-pay.vue
+++ b/ebike-maintenance/components/bike-pay/bike-pay.vue
@@ -1,8 +1,114 @@
 <template>
+	<div style="padding: 15px;background-color: white;">
+		<div class="divPay">
+			<div class="divTitle">
+				<label>
+					<image class="divImg" :src='imgPath+"static/userui/home/money.png"' />
+				</label>
+				<label>待支付：</label>
+				<label>{{data.hj}}元</label>
+			</div>
+			<div class="divFont">
+				{{data.sj}}
+			</div>
+			<div class="divTitle2">
+				费用明细
+			</div>
+			<div class="divRow divFont">
+				<label>起步价</label>
+				<label>{{data.qbj}}元</label>
+			</div>
+			<div class="divRow divFont">
+				<label>时长费</label>
+				<label>{{data.scf}}元</label>
+			</div>
+			<div class="divHJ">
+				<label>合计：</label>
+				<label>{{data.hj}}元</label>
+			</div>
+		</div>
+		<div>
+			<div class="divBtn">
+				<label>
+					<uni-icons custom-prefix="iconfont" type="icon-ebikeweixin" color="white" size="25" />
+				</label>
+				支付
+			</div>
+		</div>
+	</div>
+
 </template>
 
-<script>
+<script setup>
+	import {
+		ref,onMounted
+	} from 'vue';
+	import config from '@/utils/config';
+	import {
+		showModelMessage
+	} from "@/utils/tools.js";
+	const imgPath = config.imgPath;
+	const props = defineProps(["orderid"]);
+	const data = ref({
+		hj: "2.5",
+		sj: "2025-04-03 14:15:13",
+		qbj: "2.0",
+		scf: "0.5"
+	})
+	
+	onMounted(()=>{
+		showModelMessage("该功能暂未实现！")
+	})
 </script>
 
-<style>
+<style scoped>
+	.divPay {
+		width: 260px;
+	}
+
+	.divTitle {
+		line-height: 30px;
+		font-size: 14px;
+		color: #000;
+		font-weight: bold;
+	}
+
+	.divTitle2 {
+		font-size: 16px;
+		line-height: 35px;
+	}
+
+	.divImg {
+		width: 15px;
+		height: 12px;
+		margin-right: 5px;
+	}
+
+	.divFont {
+		color: #000;
+		font-size: 12px;
+		opacity: 0.7;
+	}
+
+	.divRow {
+		line-height: 20px;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.divHJ {
+		text-align: right;
+		font-size: 14px;
+		color: red;
+		font-weight: bold;
+	}
+
+	.divBtn {
+		text-align: center;
+		background: #61D145;
+		color: white;
+		line-height: 40px;
+		border-radius: 5px;
+		margin-top: 20px;
+	}
 </style>
\ No newline at end of file
diff --git a/ebike-maintenance/pages/user/home/home.vue b/ebike-maintenance/pages/user/home/home.vue
index 7bfe0c6..5262980 100644
--- a/ebike-maintenance/pages/user/home/home.vue
+++ b/ebike-maintenance/pages/user/home/home.vue
@@ -2,7 +2,7 @@
 	<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" @markertap="openBikeInfo" />
-	<div v-if="!showBikeInfo" class="divMapTools" style="left: 10px;">
+	<div v-if="showTools" class="divMapTools" style="left: 10px;">
 		<div>
 			<image class="divImg" :src='imgPath+"static/userui/home/localtion.png"' @click="refresh" />
 		</div>
@@ -10,7 +10,7 @@
 			<image class="divImg" :src='imgPath+"static/userui/home/fault.png"' @click="reportFault" />
 		</div>
 	</div>
-	<div v-if="!showBikeInfo" class="divMapTools" style="right: 10px;">
+	<div v-if="showTools" class="divMapTools" style="right: 10px;">
 		<div>
 			<image class="divImg" :src='imgPath+"static/userui/home/packing.png"' @click="getSite" />
 		</div>
@@ -18,7 +18,7 @@
 			<image class="divImg" :src='imgPath+"static/userui/home/mine.png"' @click="getMine" />
 		</div>
 	</div>
-	<div v-if="hasOrder" class="divMapOrder" @click="showOrderInfo">
+	<div v-if="hasOrder" class="divMapOrder" @click="openOrderPay">
 		<div>
 			<image style="width: 15px;height: 15px;margin-left: 15px;margin-right: 10px;"
 				:src='imgPath+"static/userui/home/speaker.png"' />
@@ -105,6 +105,9 @@
 	<div v-if="showBikeInfo" style="position: absolute;z-index: 2000;bottom: 0;width: 100vw;">
 		<bike-info bikecode="123456" @close="closeBikeInfo"/>
 	</div>
+	<div v-if="showOrderPay" style="position: absolute;z-index: 2000;bottom: 0;width: 100vw;">
+		<bike-pay :orderid="orderData.orderId"/>
+	</div>
 
 </template>
 
@@ -141,7 +144,8 @@
 	const circles = ref([]); //圆
 
 	let oMap = null;
-
+	
+	const showTools=ref(true);
 	const oUser = uni.getStorageSync("wechat_user");
 	const showMess = ref(uni.getStorageSync("kbike-mess"));
 	const hasOrder = ref(false); //是否有订单
@@ -161,6 +165,7 @@
 	};
 	let orderTimer = null;
 	const orderState = ref(0);
+	const showOrderPay=ref(false);
 
 
 	//车辆
@@ -178,12 +183,12 @@
 					longitude
 				} = res;
 				location.value = {
-					longitude: 103.975457,
-					latitude: 30.633199
+					latitude,
+					longitude
 				};
 				const params = {
-					longitude: 103.975457,
-					latitude: 30.633199
+					latitude,
+					longitude
 				};
 				callOrdereApi("userOrders/bikeList", params, "post").then(res => {
 					console.log("11111111111111111", "userOrders/bikeList", res);
@@ -212,7 +217,6 @@
 							true);
 					})
 					markers.value = arrData;
-
 				})
 
 			},
@@ -298,8 +302,9 @@
 		}
 	}
 	//显示订单
-	function showOrderInfo() {
-		showOrder.value = true;
+	function openOrderPay() {
+		showTools.value=false;
+		showOrderPay.value=true;
 	}
 
 	//获取订单
@@ -339,6 +344,7 @@
 			if (status == 2) {
 				completeRiding();
 				hasOrder.value = true;
+				getTracking();
 				return;
 			} else if (status != 0) {
 				completeRiding();
@@ -346,7 +352,6 @@
 			}
 			showOrder.value = true;
 			if (!orderTimer) {
-				console.log("5555555555555555555555555555555");
 				orderTimer = setInterval(getTracking, 10000);
 			}
 		})
@@ -362,8 +367,7 @@
 		} = orderData;
 		const params = {
 			ebikeCode: bikeCode,
-			//startTime: createdAt
-			startTime: '2025-04-02 09:00:00'
+			startTime: createdAt
 		}
 		callOperateApi("ebikeTracking/query", params, "post").then(res => {
 			const {
@@ -468,19 +472,26 @@
 	}
 
 	//查看车辆信息
-	function openBikeInfo() {
+	function openBikeInfo(e) {
 		showModelMessage("该功能暂未实现！");
+		if(!oUser){
+			tologin();
+		}
+		console.log("33333333333333333",e);
 		showBikeInfo.value = true;
+		showTools.value=false;
 	}
 
 	//关闭车辆信息
 	function closeBikeInfo(){
 		showBikeInfo.value =false;
+		showTools.value=true;
 	}
 
 	getLoalcationData();
 
 	onMounted(() => {
+		console.log("7777777777777777777777",oUser)
 		const instance = getCurrentInstance();
 		oMap = uni.createMapContext("mapRef", {
 			this: instance.proxy
diff --git a/ebike-maintenance/static/iconfont.css b/ebike-maintenance/static/iconfont.css
index 306b80f..bdba0da 100644
--- a/ebike-maintenance/static/iconfont.css
+++ b/ebike-maintenance/static/iconfont.css
@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4868066 */
-  src: url('iconfont.ttf?t=1744624163365') format('truetype');
+  src: url('iconfont.ttf?t=1744696432017') format('truetype');
 }
 
 .iconfont {
@@ -11,6 +11,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-ebikeweixin:before {
+  content: "\e608";
+}
+
 .icon-ebikeditu2:before {
   content: "\e620";
 }
diff --git a/ebike-maintenance/static/iconfont.ttf b/ebike-maintenance/static/iconfont.ttf
index 6c88f510f704e183df02b099aa6dc97c6aeb2d91..a1ccf56e3ed321ed88dad778271d99f43f4e7e56 100644
GIT binary patch
delta 2246
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

delta 1952
zcmbW2TWl0n9LB#hv$M0)?#}LZx4Z3byS>qF+ieS7dcg|i5=bB+fe;I!5}_Ah2`wO^
zDe<yRcz_@xWGg~qB1+^zqY_Jq4<zznyo6u~Q9~jTO~`2x5uy-%Xm|aF6E*tinf&J5
z=Ir^O@Bhut{a3~GE8<vP)&#^609%Ge2lniK&bSR|p8`f^`^f%n5BCr520U*7kA*W^
z2ZmEOHZJC~Kaj2r2Rs{Gt!!T;b26j*#;#u~+~e>4%>MO}-9rQYr&hkr^)2l08XXwh
zBZfta^JVN;?;0508aNYMcn(-fwC#I#KeO-qdlPqn<$OT9a{OZ5;w}h2OPcl9PHpxt
ze28Kf2Y_3(htK>~7akU#bsf+TvhRWBjIucEx^fBev~cB)iLJU;n90r4nsW8pg{B*i
zW+A?X{;1W$x`<oefJ?l~b*r%i2E5YDY5E#r<<{!Qv(7KBMnAUj+J?;E*9iX41<Xej
zVfbO9lzVANq7F?6pcrvfpqvr8(aAk+RG|T$URVsV9w7u#gI08)1U`6ChBT^Ci#9YO
zf;nhLJLX|7T985vm2e@!$lbZOT>0E3VdUO4+*v2xPU!?BD+h)HNy!`-7$jwMV2F^q
zg26&keFugOX()IANVkGVfpq4GlL~1mcsxi-?2zS2A&V6}Go)9+(?dF&5b6LKQcw{{
zClEqyAe{{fRf3Ets28NuCsYnHrg(J7YPN}!YdMGe^9BkF*{q<%kaHCj8?s$NJ3*!u
z)F0AOi8yAFj(UVSfn20ub|9B4m?y|J3T6y)odT`2l6*qJG(v7rFrkne6-+JUfPzVe
z98)mekgqG4c*yq@sAm1Xf@Xlcrl2h#Zz*UHOfjgbEN}D*rWm;cU4yBVg8sqOM+!O#
zQ=cp7DNOe%=q^m}RM2ObKBS=IF#WND-otIC!GSKs?Gp<65!pMG(7~}L%UN6#UXc+e
zwSYE98`pl)hxIR93D;^@ziYx+W?VC7+~ej4p3|0Q-6+~yeBXQ4=k^Wzq@A|^@GtZK
z8dw&%5Ns}KDLE0^7rGSQ7M_TBB2PtK(UIuaWedu$#@ga`{A9&p?nPS`*8He{qE}JA
zF7#jxHuHrZr8gS<BH3VzNR<{;wFuUCb~MzwD}@<!>e661(p_&v9v9ucqBGc`o55~9
z*d5FTijvumUXf0Suq|ragg)u@-(BP@vwYqa#vxC@ZCMlfTfP$SccFMF>KA@7&t(|*
zz5b;ivds1sk6XcDQMNdo?i*g8E`6uEyT)e?4q84oy8Y#qG24z+mix7DiuC5N;f<9U
z5iS3FlkO=AXl?ml);@3fHu<a<YPF0V3fZ%J{b9YiPqb(yUhQZgf1yf*s%9sIoyb2B
zUq&Z=_W9CeOL~2K`}%aM@iO<QC=VQYIT(xAbXSl0%l-cHgmZ&lm?@lh8Tw$(U0j{L
zn;$J(y0kpMtIX_~r`NalnE8q&EbFw-Qi()rwx@YjDz(bHcwD^XB$e-eVcZ3MoR+QT
z=cG2-MtM7^Tz6MGnh?=Q*tCV|4vC~0ZI22Kna!JyCL0@*M>lQ0`cE^Hzj<ioWm9B#
zjQ@8^J*8dA-#obTvRmwc^B({@OgqgNdM@~-5)F$)N1LdtskH^umk{%7(!GLXjDz<E
zJ?!RO1C!asnMkP_{P%!<-4kn#&pe2?J{e;}_r_aeo{~tUKkS?N%?^isy3Y=uv&`Ak
zre&Gh7Sj?}3~Pu_#ad(e1CQ$XkYyCrM*@-he1S`B@uH6lqxo~r60w%|$(`P>7KpA~
P&x#R&$#W}~Xaau%tCyB=