diff --git a/ebike-user/components/bike-pay/bike-pay.vue b/ebike-user/components/bike-pay/bike-pay.vue
index ad4c7d3..c04e86e 100644
--- a/ebike-user/components/bike-pay/bike-pay.vue
+++ b/ebike-user/components/bike-pay/bike-pay.vue
@@ -1,219 +1,247 @@
 <template>
-	<div style="padding: 15px;background-color: white;">
-		<div class="divPay">
-			<view class="flex justify-between">
-				<view class="width-65">
-					<div class="divTitle">
-						<label>
-							<image class="divImg" :src='imgPath+"static/userui/home/money.png"' />
-						</label>
-						<label>{{status==3 ? '已支付：' :'待支付：'}}</label>
-						<label>{{data.totalAmount}}元</label>
-					</div>
-					<div class="divFont">
-						{{data.createdAt}}
-					</div>
-				</view>
-				<view class="width-35 flex justify-end"> <!--已支付 v-if="status==3"-->
-					<view v-if="status==3"  @click="handleFeeAppealClick">
-						<view class="text-center">
-							<uni-icons type="help" size="20"></uni-icons>
-						</view>
-						<view class="text-center wzfysh">
-							费用申述
-						</view>
-					</view>
-					<view @click="handleFaultReportClick" style="margin-left: 10px;">
-						<view class="text-center">
-							<uni-icons custom-prefix="iconfont" color="rgb(102,102,102)" type="icon-ebikeweixiuoff" size="20"></uni-icons>
-						</view>
-						<view class="text-center wzfysh">
-							故障上报
-						</view> 
-					</view>
+  <div style="padding: 15px; background-color: white">
+    <div class="divPay">
+      <view class="flex justify-between">
+        <view class="width-65">
+          <div class="divTitle">
+            <label>
+              <image
+                class="divImg"
+                :src="imgPath + 'static/userui/home/money.png'"
+              />
+            </label>
+            <label>{{ status == 3 ? "已支付：" : "待支付：" }}</label>
+            <label>{{ data.totalAmount }}元</label>
+          </div>
+          <div class="divFont">
+            {{ data.createdAt }}
+          </div>
+        </view>
+        <view class="width-35 flex justify-end">
+          <!--已支付 v-if="status==3"-->
+          <view v-if="status == 3" @click="handleFeeAppealClick">
+            <view class="text-center">
+              <uni-icons type="help" size="20"></uni-icons>
+            </view>
+            <view class="text-center wzfysh"> 费用申述 </view>
+          </view>
+          <view @click="handleFaultReportClick" style="margin-left: 10px">
+            <view class="text-center">
+              <uni-icons
+                custom-prefix="iconfont"
+                color="rgb(102,102,102)"
+                type="icon-ebikeweixiuoff"
+                size="20"
+              ></uni-icons>
+            </view>
+            <view class="text-center wzfysh"> 故障上报 </view>
+          </view>
+        </view>
+      </view>
 
-				</view>
-
-			</view>
-
-			<div class="divTitle2">
-				费用明细
-			</div>
-			<div class="divRow divFont" v-for="(item,index) in data.details" :key="index">
-				<label>{{item.itemName}}</label>
-				<label>{{item.itemAmount}}元</label>
-			</div>
-			<!-- 		<div class="divRow divFont">
+      <div class="divTitle2">费用明细</div>
+      <div
+        class="divRow divFont"
+        v-for="(item, index) in data.details"
+        :key="index"
+      >
+        <label>{{ item.itemName }}</label>
+        <label>{{ item.itemAmount }}元</label>
+      </div>
+      <!-- 		<div class="divRow divFont">
 				<label>时长费</label>
 				<label>{{data.scf}}元</label>
 			</div> -->
-			<div class="divHJ">
-				<label>合计：</label>
-				<label>￥{{data.totalAmount}}元</label>
-			</div>
-		</div>
-		<div>
-			<div v-if="status==2" class="divBtn" @click="handlePaymentClick">
-				<label>
-					<uni-icons custom-prefix="iconfont" type="icon-ebikeweixin" color="white" size="25" />
-				</label>
-				支付
-			</div>
-		</div>
-	</div>
-
+      <div class="divHJ">
+        <label>合计：</label>
+        <label>￥{{ data.totalAmount }}元</label>
+      </div>
+    </div>
+    <div>
+      <div v-if="status == 2" class="divBtn" @click="handlePaymentClick">
+        <label>
+          <uni-icons
+            custom-prefix="iconfont"
+            type="icon-ebikeweixin"
+            color="white"
+            size="25"
+          />
+        </label>
+        支付
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup>
-	import {
-		ref,
-		onMounted
-	} from 'vue';
-	import config from '@/utils/config';
-	import * as api from '@/utils/api.js';
-	import {
-		showModelMessage
-	} from "@/utils/tools.js";
-	const imgPath = config.imgPath;
-	const props = defineProps(["orderId"]);
-	const status = ref("")
-	const data = ref({
-		hj: "2.5",
-		sj: "2025-04-03 14:15:13",
-		qbj: "2.0",
-		scf: "0.5"
-	})
+import { ref, onMounted } from "vue";
+import config from "@/utils/config";
+import * as api from "@/utils/api.js";
+import { showModelMessage } from "@/utils/tools.js";
+const imgPath = config.imgPath;
+const props = defineProps(["orderId"]);
+const status = ref("");
+const data = ref({
+  hj: "2.5",
+  sj: "2025-04-03 14:15:13",
+  qbj: "2.0",
+  scf: "0.5",
+});
 
-	onMounted(() => {
-		getInfoOrderData();
-	})
-	const getInfoOrderData = () => {
-		api.callOrdereApi("userOrders/orderDetailsInfo?orderId=" + props.orderId, {}, "get").then(res => {
-			if (res.code == 200) {
-				data.value = res.data;
-				status.value = res.data.status;
-			}
+onMounted(() => {
+  console.log("2222");
 
-		})
-	}
-	const handlePaymentClick = () => {
-		api.callPaymentApi("wxPayment/prepay?orderId=" + props.orderId, {}, "get").then(res => {
-			if (res.code == 200) {
-				wx.requestPayment({
-					"timeStamp": res.data.timeStamp,
-					"nonceStr": res.data.nonceStr,
-					"package": res.data.package,
-					"signType": res.data.signType,
-					"paySign": res.data.paySign,
-					"success": function(res) {
-						//轮询看是否支付成功
-						checkPaymentStatus();
-					},
-					"fail": function(res) {
-						console.log("fail", res)
-					},
-					"complete": function(res) {
-						console.log("complete", res)
-					}
-				})
-			} else {
-				showModelMessage("支付失败")
-			}
-		})
-	}
+  getInfoOrderData();
+});
+const getInfoOrderData = () => {
+  console.log(props.orderId, "props.orderId");
 
-	function checkPaymentStatus() {
-		api.callPaymentApi("wxPayment/queryOrderByOutTradeNo?outTradeNo=" + props.orderId, {}, "get")
-			.then(res => {
-				if (res.code == 200) {
-					gotoHome();
-				} else {
-					console.log("支付未成功，继续轮询");
-					checkPaymentStatus(); // 继续轮询
-				}
-			})
-			.catch(error => {
-				console.log("请求失败，继续轮询", error);
-				checkPaymentStatus(); // 请求失败也继续轮询
-			});
-	}
-	const gotoHome = () => {
-		uni.navigateTo({
-			url: "/pages/user/home/home"
-		})
-	}
+  api
+    .callOrdereApi(
+      "userOrders/orderDetailsInfo?orderId=" + props.orderId,
+      {},
+      "get"
+    )
+    .then((res) => {
+      if (res.code == 200) {
+        data.value = res.data;
+        status.value = res.data.status;
+      }
+    });
+};
+const handlePaymentClick = () => {
+  uni.showLoading({
+    title: "正在支付...",
+  });
+  api
+    .callPaymentApi("wxPayment/prepay?orderId=" + props.orderId, {}, "get")
+    .then((res) => {
+      if (res.code == 200) {
+        wx.requestPayment({
+          timeStamp: res.data.timeStamp,
+          nonceStr: res.data.nonceStr,
+          package: res.data.package,
+          signType: res.data.signType,
+          paySign: res.data.paySign,
+          success: function (res) {
+            uni.hideLoading();
+            //轮询看是否支付成功
+            checkPaymentStatus();
+          },
+          fail: function (res) {
+            uni.hideLoading();
+            console.log("fail", res);
+          },
+          complete: function (res) {
+            console.log("complete", res);
+          },
+        });
+      } else {
+        uni.hideLoading();
+        showModelMessage("支付失败");
+      }
+    });
+};
 
-	const handleFeeAppealClick=()=>{//费用 申述
-		uni.navigateTo({
-			url: "/pages/user/views/PaymentFeedback?orderId="+props.orderId
-		})
-	}
-	const handleFaultReportClick=()=>{// 故障上报
-		uni.navigateTo({
-			url: "/pages/user/login/TroubleReportUser?bikeCode="+data.value.bikeCode+"&orderCode="+props.orderId
-		})
-	}
+function checkPaymentStatus() {
+  api
+    .callPaymentApi("wxPayment/queryOrderStatus/" + props.orderId, {}, "get")
+    .then((res) => {
+      if (res.code == 200) {
+        gotoHome();
+      } else {
+        console.log("支付未成功，继续轮询");
+        checkPaymentStatus(); // 继续轮询
+      }
+    })
+    .catch((error) => {
+      console.log("请求失败，继续轮询", error);
+      checkPaymentStatus(); // 请求失败也继续轮询
+    });
+}
+const gotoHome = () => {
+  uni.navigateTo({
+    url: "/pages/user/home/home",
+  });
+};
+
+const handleFeeAppealClick = () => {
+  //费用 申述
+  uni.navigateTo({
+    url: "/pages/user/views/PaymentFeedback?orderId=" + props.orderId,
+  });
+};
+const handleFaultReportClick = () => {
+  // 故障上报
+  uni.navigateTo({
+    url:
+      "/pages/user/login/TroubleReportUser?bikeCode=" +
+      data.value.bikeCode +
+      "&orderCode=" +
+      props.orderId,
+  });
+};
 </script>
 
 <style scoped>
-	.divPay {
-		width: auto;
-	}
+.divPay {
+  width: auto;
+}
 
-	.divTitle {
-		line-height: 30px;
-		font-size: 14px;
-		color: #000;
-		font-weight: bold;
-	}
+.divTitle {
+  line-height: 30px;
+  font-size: 14px;
+  color: #000;
+  font-weight: bold;
+}
 
-	.divTitle2 {
-		font-size: 16px;
-		line-height: 35px;
-	}
+.divTitle2 {
+  font-size: 16px;
+  line-height: 35px;
+}
 
-	.divImg {
-		width: 15px;
-		height: 12px;
-		margin-right: 5px;
-	}
+.divImg {
+  width: 15px;
+  height: 12px;
+  margin-right: 5px;
+}
 
-	.divFont {
-		color: #000;
-		font-size: 12px;
-		opacity: 0.7;
-	}
+.divFont {
+  color: #000;
+  font-size: 12px;
+  opacity: 0.7;
+}
 
-	.divRow {
-		line-height: 20px;
-		display: flex;
-		justify-content: space-between;
-	}
+.divRow {
+  line-height: 20px;
+  display: flex;
+  justify-content: space-between;
+}
 
-	.divHJ {
-		text-align: right;
-		font-size: 14px;
-		color: red;
-		font-weight: bold;
-	}
+.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;
-	}
+.divBtn {
+  text-align: center;
+  background: #61d145;
+  color: white;
+  line-height: 40px;
+  border-radius: 5px;
+  margin-top: 20px;
+}
 
-	.width-65 {
-		width: 65%;
-	}
+.width-65 {
+  width: 65%;
+}
 
-	.width-35 {
-		width: 35%;
-	}
-	.wzfysh{
-		font-size: 10px;
-	}
-</style>
\ No newline at end of file
+.width-35 {
+  width: 35%;
+}
+.wzfysh {
+  font-size: 10px;
+}
+</style>
diff --git a/ebike-user/pages/user/home/home.vue b/ebike-user/pages/user/home/home.vue
index bb32d38..36547de 100644
--- a/ebike-user/pages/user/home/home.vue
+++ b/ebike-user/pages/user/home/home.vue
@@ -1,238 +1,303 @@
 <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" @markertap="openBikeInfo" />
-	<div v-if="showTools" class="divMapTools" style="left: 10px;">
-		<div>
-			<image class="divImg" :src='imgPath+"static/userui/home/localtion.png"' @click="refresh" />
-		</div>
-		<div>
-			<image class="divImg" :src='imgPath+"static/userui/home/fault.png"' @click="reportFault" />
-		</div>
-	</div>
-	<div v-if="showTools" class="divMapTools" style="right: 10px;">
-		<div>
-			<image class="divImg" :src='imgPath+"static/userui/home/packing.png"' @click="applySite" />
-		</div>
-		<div>
-			<image class="divImg" :src='imgPath+"static/userui/home/mine.png"' @click="getMine" />
-		</div>
-	</div>
-	<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"' />
-			<label>有骑行订单未支付，请查看</label>
-		</div>
-		<div style="margin-right: 15px;">
-			<label>查看 <label>></label></label>
-		</div>
-	</div>
-	<div class="divMapBottom">
-		<div :class="(hasOrder?'divScanBtnDis ':'')+'divScanBtn'" @click="scanBike">
-			<uni-icons type="scan" color="white" :size="25"></uni-icons>
-			<label style="margin-left: 5px;">扫码用车</label>
-		</div>
-	</div>
-	<div v-if="showOrder" class="divOrder">
-		<div class="divOrderRow">
-			<div class="divOrderCell">
-				<image class="divOrderImg" :src='imgPath+"static/userui/home/money.png"' />
-				<label>费用：</label>
-				<label>{{order.money}}元</label>
-			</div>
-			<div class="divOrderCell2">
-				<label>{{order.bikecode}}</label>
-			</div>
-		</div>
-		<div class="divOrderRow" style="font-size: 12px;">
-			<div class="divOrderCell">
-				<image class="divOrderImg" :src='imgPath+"static/userui/home/timer.png"' />
-				<label>计时：</label>
-				<label style="color: #61D246;">{{order.time}}</label>
-			</div>
-			<!-- 			<div class="divOrderCell2">
+  <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="showTools" class="divMapTools" style="left: 10px">
+    <div>
+      <image
+        class="divImg"
+        :src="imgPath + 'static/userui/home/localtion.png'"
+        @click="refresh"
+      />
+    </div>
+    <div>
+      <image
+        class="divImg"
+        :src="imgPath + 'static/userui/home/fault.png'"
+        @click="reportFault"
+      />
+    </div>
+  </div>
+  <div v-if="showTools" class="divMapTools" style="right: 10px">
+    <div>
+      <image
+        class="divImg"
+        :src="imgPath + 'static/userui/home/packing.png'"
+        @click="applySite"
+      />
+    </div>
+    <div>
+      <image
+        class="divImg"
+        :src="imgPath + 'static/userui/home/mine.png'"
+        @click="getMine"
+      />
+    </div>
+  </div>
+  <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'"
+      />
+      <label>有骑行订单未支付，请查看</label>
+    </div>
+    <div style="margin-right: 15px">
+      <label>查看 <label>></label></label>
+    </div>
+  </div>
+  <div class="divMapBottom">
+    <div
+      :class="(hasOrder ? 'divScanBtnDis ' : '') + 'divScanBtn'"
+      @click="scanBike"
+    >
+      <uni-icons type="scan" color="white" :size="25"></uni-icons>
+      <label style="margin-left: 5px">扫码用车</label>
+    </div>
+  </div>
+  <div v-if="showOrder" class="divOrder">
+    <div class="divOrderRow">
+      <div class="divOrderCell">
+        <image
+          class="divOrderImg"
+          :src="imgPath + 'static/userui/home/money.png'"
+        />
+        <label>费用：</label>
+        <label>{{ order.money }}元</label>
+      </div>
+      <div class="divOrderCell2">
+        <label>{{ order.bikecode }}</label>
+      </div>
+    </div>
+    <div class="divOrderRow" style="font-size: 12px">
+      <div class="divOrderCell">
+        <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='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='imgPath+"static/userui/home/lock.png"'
-				@click="lockRiding" />
-			<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='imgPath+"static/userui/home/endride.png"'
-				@click="endRiding" />
-		</div>
-	</div>
-	<div v-if="showMess!=1" class="divMess">
-		<uni-card>
-			<uni-list border>
-				<uni-list-item :thumb='imgPath+"static/userui/home/map1.png"' thumb-size="lg">
-					<template v-slot:body>
-						<div class="divMessTitle1">服务区域</div>
-						<div class="divMessTitle2">请在服务区域内骑行</div>
-					</template>
-				</uni-list-item>
-				<uni-list-item :thumb='imgPath+"static/userui/home/map2.png"' thumb-size="lg">
-					<template v-slot:body>
-						<div class="divMessTitle1">换车区域</div>
-						<div class="divMessTitle2">还车时确保车辆已经到达还车区域或者距你最近的停车网点</div>
-					</template>
-				</uni-list-item>
-				<uni-list-item :thumb='imgPath+"static/userui/home/map3.png"' thumb-size="lg">
-					<template v-slot:body>
-						<div class="divMessTitle1">停车网点</div>
-						<div class="divMessTitle2">还车至停车网点，时长费最多可半价优惠</div>
-					</template>
-				</uni-list-item>
-			</uni-list>
-			<div class="divMessWorn">
-				<div class="divMessWornTitle">
-					·注意事项
-				</div>
-				<div class="divMessWornContent">禁止私自加锁或破坏车辆</div>
-				<div class="divMessWornContent">未满12岁禁止骑行</div>
-				<div class="divMessWornContent">如车辆故障，及时通过app保修</div>
-			</div>
-			<div class="divMessBtn">
-				<label
-					style="color: #61D145;border: 1px solid #0000000f;padding: 5px 15px;border-radius: 5px;box-shadow: 2px 2px #0000000a;"
-					@click="clickMess">已知晓</label>
-			</div>
-		</uni-card>
-	</div>
-	<div v-if="showBikeInfo" style="position: absolute;z-index: 2000;bottom: 0;width: 100vw;">
-
-		<bike-info :bikedata="bikeData" @close="closeBikeInfo" />
-	</div>
-	<div v-if="showOrderPay" style="position: absolute;z-index: 2000;bottom: 0;width: 100vw;">
-		<bike-pay :orderId="orderData.orderId" />
-	</div>
+    </div>
+    <div class="divOderBtn">
+      <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="imgPath + 'static/userui/home/run.png'"
+        @click="continueRiding"
+      />
+      <image
+        style="width: 160px; height: 40px"
+        :src="imgPath + 'static/userui/home/endride.png'"
+        @click="endRiding"
+      />
+    </div>
+  </div>
+  <div v-if="showMess != 1" class="divMess">
+    <uni-card>
+      <uni-list border>
+        <uni-list-item
+          :thumb="imgPath + 'static/userui/home/map1.png'"
+          thumb-size="lg"
+        >
+          <template v-slot:body>
+            <div class="divMessTitle1">服务区域</div>
+            <div class="divMessTitle2">请在服务区域内骑行</div>
+          </template>
+        </uni-list-item>
+        <uni-list-item
+          :thumb="imgPath + 'static/userui/home/map2.png'"
+          thumb-size="lg"
+        >
+          <template v-slot:body>
+            <div class="divMessTitle1">换车区域</div>
+            <div class="divMessTitle2">
+              还车时确保车辆已经到达还车区域或者距你最近的停车网点
+            </div>
+          </template>
+        </uni-list-item>
+        <uni-list-item
+          :thumb="imgPath + 'static/userui/home/map3.png'"
+          thumb-size="lg"
+        >
+          <template v-slot:body>
+            <div class="divMessTitle1">停车网点</div>
+            <div class="divMessTitle2">
+              还车至停车网点，时长费最多可半价优惠
+            </div>
+          </template>
+        </uni-list-item>
+      </uni-list>
+      <div class="divMessWorn">
+        <div class="divMessWornTitle">·注意事项</div>
+        <div class="divMessWornContent">禁止私自加锁或破坏车辆</div>
+        <div class="divMessWornContent">未满12岁禁止骑行</div>
+        <div class="divMessWornContent">如车辆故障，及时通过app保修</div>
+      </div>
+      <div class="divMessBtn">
+        <label
+          style="
+            color: #61d145;
+            border: 1px solid #0000000f;
+            padding: 5px 15px;
+            border-radius: 5px;
+            box-shadow: 2px 2px #0000000a;
+          "
+          @click="clickMess"
+          >已知晓</label
+        >
+      </div>
+    </uni-card>
+  </div>
+  <div
+    v-if="showBikeInfo"
+    style="position: absolute; z-index: 2000; bottom: 0; width: 100vw"
+  >
+    <bike-info :bikedata="bikeData" @close="closeBikeInfo" />
+  </div>
+  <div
+    v-if="showOrderPay"
+    style="position: absolute; z-index: 2000; bottom: 0; width: 100vw"
+  >
+    <bike-pay :orderId="orderData.orderId" />
+  </div>
 </template>
 <script setup>
-	import {
-		ref,
-		onMounted,
-		getCurrentInstance
-	} from 'vue';
-	import {
-		showModelMessage,
-		getUrlParams,
-		jkcBaseDecode
-	} from "@/utils/tools.js";
-	import {
-		callOrdereApi,
-		callOperateApi
-	} from "@/utils/api.js";
+import { ref, onMounted, getCurrentInstance } from "vue";
+import {
+  showModelMessage,
+  getUrlParams,
+  jkcBaseDecode,
+} from "@/utils/tools.js";
+import { callOrdereApi, callOperateApi } from "@/utils/api.js";
 
-	import {
-		findIndex
-	} from 'lodash';
-	import config from '@/utils/config';
-	import {
-		onShow,
-		onUnload,
-		onLoad
-	} from "@dcloudio/uni-app";
-	import * as map from "@/utils/usermap.js";
+import { findIndex } from "lodash";
+import config from "@/utils/config";
+import { onShow, onUnload, onLoad } from "@dcloudio/uni-app";
+import * as map from "@/utils/usermap.js";
 
-	const imgPath = config.imgPath;
+const imgPath = config.imgPath;
 
-	const location = ref({
-		longitude: "",
-		latitude: ""
-	});
-	const scale = ref(15);
-	const markers = ref([]);
-	const polygons = ref([]); //面
-	const polylines = ref([]); //线
-	const circles = ref([]); //圆
-	const pointStart = 100000000000;
-	const pointEnd = 100000000001;
+const location = ref({
+  longitude: "",
+  latitude: "",
+});
+const scale = ref(15);
+const markers = ref([]);
+const polygons = ref([]); //面
+const polylines = ref([]); //线
+const circles = ref([]); //圆
+const pointStart = 100000000000;
+const pointEnd = 100000000001;
 
-	let oMap = null;
+let oMap = null;
 
-	const showTools = ref(true);
-	let oUser = null;
-	const showMess = ref(uni.getStorageSync("kbike-mess"));
-	const hasOrder = ref(false); //是否有订单
-	const showOrder = ref(false);
-	const order = ref({
-		bikecode: "",
-		money: "",
-		time: "",
-		mileage: ""
-	});
+const showTools = ref(true);
+let oUser = null;
+const showMess = ref(uni.getStorageSync("kbike-mess"));
+const hasOrder = ref(false); //是否有订单
+const showOrder = ref(false);
+const order = ref({
+  bikecode: "",
+  money: "",
+  time: "",
+  mileage: "",
+});
 
-	//订单信息
-	let orderData = {
-		bikeCode: null,
-		status: null,
-		createdAt: null,
-		orderId: null
-	};
-	let orderTimer = null;
-	const orderState = ref(0);
-	const showOrderPay = ref(false);
+//订单信息
+let orderData = {
+  bikeCode: null,
+  status: null,
+  createdAt: null,
+  orderId: null,
+};
+let orderTimer = null;
+const orderState = ref(0);
+const showOrderPay = ref(false);
 
-	//车辆
-	let arrBikeData = [];
-	const showBikeInfo = ref(false);
-	const bikeData = ref({});
-	const onLoadData = ref({})
-	let ismount = false;
-	let arrSiteData = []
+//车辆
+let arrBikeData = [];
+const showBikeInfo = ref(false);
+const bikeData = ref({});
+const onLoadData = ref({});
+let ismount = false;
+let arrSiteData = [];
 
-	onLoad((query) => {
+onLoad((query) => {
+  if (query.q) {
+    const q = decodeURIComponent(query.q); // 获取到二维码原始链接内容
+    const scancode_time = parseInt(query.scancode_time); // 获取用户扫码时间 UNIX 时间戳
+    const queryString = q.split("?")[1];
+    const params = queryString.split("&");
+    let p = {};
+    params.forEach((param) => {
+      const [key, value] = param.split("=");
+      p[key] = value;
+    });
+    onLoadData.value = p;
+  } else if (query.number) {
+    onLoadData.value["number"] = query.number;
+    onLoadData.value["_tbScancodeApproach_"] = query._tbScancodeApproach_;
+  }
+});
 
-		if (query.q) {
-			const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容
-			const scancode_time = parseInt(query.scancode_time) // 获取用户扫码时间 UNIX 时间戳
-			const queryString = q.split('?')[1];
-			const params = queryString.split('&');
-			let p = {};
-			params.forEach(param => {
-				const [key, value] = param.split('=');
-				p[key] = value;
-			});
-			onLoadData.value = p;
-		} else if (query.number) {
-			onLoadData.value['number'] = query.number;
-			onLoadData.value['_tbScancodeApproach_'] = query._tbScancodeApproach_;
-		}
-	})
-
-	onMounted(() => {
-		const instance = getCurrentInstance();
-		oMap = uni.createMapContext("mapRef", {
-			this: instance.proxy
-		});
-		ismount = true;
-		getLoalcationData();
-		if (onLoadData.value) {
-			if (onLoadData.value['_tbScancodeApproach_'] == 'scan') {
-				if (!oUser) {
-					showModelMessage("登录后开始骑行", "登录提醒", true, "去登录").then(res => {
-						if (res.confirm) {
-							tologin()
-						}
-					})
-				} 
-				checkRealName((res)=>{
-					if(!res) return;
-					getOrder((flag) => {
-						if (flag) {
-							map.addOrder(onLoadData.value["number"], false, (res) => {
-								if (res) {
-									getOrder();
-								}
-							})
-						}
-					});
-				},nLoadData.value["number"],onLoadData.value['_tbScancodeApproach_']);
-				/* else if (!oUser['realNameStatus']) {
+onMounted(() => {
+  const instance = getCurrentInstance();
+  oMap = uni.createMapContext("mapRef", {
+    this: instance.proxy,
+  });
+  ismount = true;
+  getLoalcationData();
+  if (onLoadData.value) {
+    if (onLoadData.value["_tbScancodeApproach_"] == "scan") {
+      if (!oUser) {
+        showModelMessage("登录后开始骑行", "登录提醒", true, "去登录").then(
+          (res) => {
+            if (res.confirm) {
+              tologin();
+            }
+          }
+        );
+      }
+      checkRealName(
+        (res) => {
+          if (!res) return;
+          getOrder((flag) => {
+            if (flag) {
+              map.addOrder(onLoadData.value["number"], false, (res) => {
+                if (res) {
+                  getOrder();
+                }
+              });
+            }
+          });
+        },
+        nLoadData.value["number"],
+        onLoadData.value["_tbScancodeApproach_"]
+      );
+      /* else if (!oUser['realNameStatus']) {
 					showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => {
 						if (res.confirm) {
 							uni.navigateTo({
@@ -253,118 +318,111 @@
 						}
 					});
 				} */
-			}
-		}
-	})
+    }
+  }
+});
 
-	//加载数据
-	function getLoalcationData() {
-		map.getLoalcation(res => {
-			const {
-				latitude,
-				longitude
-			} = res;
-			location.value = {
-				latitude,
-				longitude
-			};
-			oMap.moveToLocation({})
-			const params = {
-				latitude,
-				longitude,
-				radius: 1
-			};
-			callOrdereApi("userOrders/bikeList", params, "post").then(res => {
-				const {
-					code,
-					data,
-					message
-				} = res;
-				if (code != 200) {
-					showModelMessage(message);
-					return;
-				}
-				arrBikeData = data || [];
-				const arrData = markers.value || [];
-				arrBikeData.map((item, index) => {
-					const {
-						longitude,
-						latitude
-					} = item;
-					arrData.push(map.addMarker(index, longitude, latitude, "mapbike.png",
-						true));
-				})
-				markers.value = arrData;
-			});
-			getSiteList(longitude, latitude);
-		})
-		// uni.getLocation({
-		// 	type: 'gcj02',
-		// 	geocode: true,
-		// 	success(res) {
-		// 		location.value = {
-		// 			latitude,
-		// 			longitude
-		// 		};
+//加载数据
+function getLoalcationData() {
+  map.getLoalcation((res) => {
+    const { latitude, longitude } = res;
+    location.value = {
+      latitude,
+      longitude,
+    };
+    oMap.moveToLocation({});
+    const params = {
+      latitude,
+      longitude,
+      radius: 1,
+    };
+    console.log(params, "11111111111111");
+    callOrdereApi("userOrders/bikeList", params, "post").then((res) => {
+      const { code, data, message } = res;
+      if (code != 200) {
+        showModelMessage(message);
+        return;
+      }
+      console.log(res);
 
+      arrBikeData = data || [];
+      const arrData = markers.value || [];
+      arrBikeData.map((item, index) => {
+        const { longitude, latitude } = item;
+        arrData.push(
+          map.addMarker(index, longitude, latitude, "mapbike.png", true)
+        );
+      });
+      markers.value = arrData;
+    });
+    getSiteList(longitude, latitude);
+  });
+  // uni.getLocation({
+  // 	type: 'gcj02',
+  // 	geocode: true,
+  // 	success(res) {
+  // 		location.value = {
+  // 			latitude,
+  // 			longitude
+  // 		};
 
-		// 	},
-		// 	fail(res) {
+  // 	},
+  // 	fail(res) {
 
-		// 	}
-		// });
-	}
+  // 	}
+  // });
+}
 
-	function clickMess() {
-		uni.setStorageSync("kbike-mess", 1);
-		showMess.value = 1;
-	}
+function clickMess() {
+  uni.setStorageSync("kbike-mess", 1);
+  showMess.value = 1;
+}
 
-	//刷新
-	function refresh() {
-		getLoalcationData();
-	}
+//刷新
+function refresh() {
+  getLoalcationData();
+}
 
-	//故障上报
-	function reportFault() {
-		if (!oUser) {
-			tologin();
-			return;
-		} 
-		checkRealName((res)=>{
-			if(!res) return;
-			uni.navigateTo({
-				url: "/pages/user/login/TroubleReportUser"
-			})
-		})
-		// else if (!oUser['realNameStatus']) {
-			
-		// 	showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => {
-		// 		if (res.confirm) {
-		// 			uni.navigateTo({
-		// 				url: "/pages/user/views/IdentityVerification"
-		// 			})
-		// 		}
-		// 	})
-		// }
-		// uni.navigateTo({
-		// 	url: "/pages/user/login/TroubleReportUser"
-		// })
-	}
+//故障上报
+function reportFault() {
+  if (!oUser) {
+    tologin();
+    return;
+  }
+  checkRealName((res) => {
+    if (!res) return;
+    uni.navigateTo({
+      url: "/pages/user/login/TroubleReportUser",
+    });
+  });
+  // else if (!oUser['realNameStatus']) {
 
-	//申请站点
-	function applySite() {
-		if (!oUser) {
-			tologin();
-			return;
-		} 
-		checkRealName((res)=>{
-			if(!res) return;
-			uni.navigateTo({
-				url: "/pages/user/scan/applysite"
-			})
-		})
-		/* else if (!oUser['realNameStatus']) {
+  // 	showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => {
+  // 		if (res.confirm) {
+  // 			uni.navigateTo({
+  // 				url: "/pages/user/views/IdentityVerification"
+  // 			})
+  // 		}
+  // 	})
+  // }
+  // uni.navigateTo({
+  // 	url: "/pages/user/login/TroubleReportUser"
+  // })
+}
+
+//申请站点
+function applySite() {
+  if (!oUser) {
+    tologin();
+    return;
+  }
+  checkRealName((res) => {
+    if (!res) return;
+    uni.navigateTo({
+      url: "/pages/user/scan/applysite",
+    });
+  });
+  /* else if (!oUser['realNameStatus']) {
 			showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => {
 				if (res.confirm) {
 					uni.navigateTo({
@@ -376,21 +434,21 @@
 		uni.navigateTo({
 			url: "/pages/user/scan/applysite"
 		}) */
-	}
+}
 
-	//个人中心
-	function getMine() {
-		if (!oUser) {
-			tologin();
-			return;
-		} 
-		checkRealName((res)=>{
-			if(!res) return;
-			uni.navigateTo({
-				url: "/pages/user/mine/MePage"
-			})
-		})
-		/* else if (!oUser['realNameStatus']) {
+//个人中心
+function getMine() {
+  if (!oUser) {
+    tologin();
+    return;
+  }
+  checkRealName((res) => {
+    if (!res) return;
+    uni.navigateTo({
+      url: "/pages/user/mine/MePage",
+    });
+  });
+  /* else if (!oUser['realNameStatus']) {
 			showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => {
 				if (res.confirm) {
 					uni.navigateTo({
@@ -402,25 +460,23 @@
 		uni.navigateTo({
 			url: "/pages/user/mine/MePage"
 		}) */
-	}
+}
 
-	//扫描
-	function scanBike() {
-		if (!oUser) {
-			tologin();
-			return;
-		} 
-		checkRealName((res)=>{
-			if(!res) return;
-			const {
-				userId
-			} = oUser;
-			uni.navigateTo({
-				url: "/pages/user/scan/scancode?type=ride"
-			})
-		})
-		
-		/* else if (!oUser['realNameStatus']) {
+//扫描
+function scanBike() {
+  if (!oUser) {
+    tologin();
+    return;
+  }
+  checkRealName((res) => {
+    if (!res) return;
+    const { userId } = oUser;
+    uni.navigateTo({
+      url: "/pages/user/scan/scancode?type=ride",
+    });
+  });
+
+  /* else if (!oUser['realNameStatus']) {
 			showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => {
 				if (res.confirm) {
 					uni.navigateTo({
@@ -435,418 +491,394 @@
 		uni.navigateTo({
 			url: "/pages/user/scan/scancode?type=ride"
 		}) */
+}
 
-	}
+//显示订单
+function openOrderPay() {
+  showTools.value = false;
+  showOrderPay.value = true;
+}
 
-	//显示订单
-	function openOrderPay() {
-		showTools.value = false;
-		showOrderPay.value = true;
-	}
+//获取订单
+function getOrder(callBack) {
+  const { userId } = oUser;
+  callOrdereApi(
+    "userOrders/checkHistoryOrder",
+    {
+      userId,
+    },
+    "get"
+  ).then((res) => {
+    const { code, data, message } = res;
+    if (code != 200) {
+      showModelMessage(message);
+      if (callBack) callBack(true);
+      return;
+    }
+    if (!data) {
+      //订单完成
+      completeRiding();
+      if (callBack) callBack(true);
+      return;
+    }
+    const {
+      bikeCode,
+      status,
+      createdAt,
+      orderId,
+      tempLock,
+      ridePoint,
+      returnPoint,
+      endTime,
+    } = data;
+    //0-进行中 1-已取消 2-待支付 3-已支付  4-退款中 5-已退款
+    orderState.value = tempLock ? 1 : 0;
+    orderData = data;
+    if (status == 2) {
+      completeRiding();
+      hasOrder.value = true;
+      getTracking();
+      return;
+    } else if (status != 0) {
+      completeRiding();
+      return;
+    }
+    showOrder.value = true;
+    if (status == 0) {
+      // 获取订单信息
+      getOrderInfo(bikeCode);
+      order.value.bikecode = bikeCode;
+      // 设置 intervalId 变量来保存定时器 ID
+      const intervalId = setInterval(() => {
+        // 更新订单时间
+        order.value.time = timeDifference(createdAt);
+        if (!showOrder.value) {
+          // 如果 showOrder 为 false，停止轮询
+          clearInterval(intervalId); // 使用 intervalId 来停止轮询
+        }
+      }, 1000);
+    }
+    if (tempLock == 1) {
+      getTracking();
+      return;
+    }
 
-	//获取订单
-	function getOrder(callBack) {
-		const {
-			userId
-		} = oUser;
-		callOrdereApi("userOrders/checkHistoryOrder", {
-			userId
-		}, "get").then(res => {
-			const {
-				code,
-				data,
-				message
-			} = res;
-			if (code != 200) {
-				showModelMessage(message);
-				if (callBack) callBack(true)
-				return;
-			}
-			if (!data) { //订单完成
-				completeRiding();
-				if (callBack) callBack(true)
-				return;
-			}
-			const {
-				bikeCode,
-				status,
-				createdAt,
-				orderId,
-				tempLock,
-				ridePoint,
-				returnPoint,
-				endTime
-			} = data;
-			//0-进行中 1-已取消 2-待支付 3-已支付  4-退款中 5-已退款
-			orderState.value = tempLock ? 1 : 0;
-			orderData = data;
-			if (status == 2) {
-				completeRiding();
-				hasOrder.value = true;
-				getTracking();
-				return;
-			} else if (status != 0) {
-				completeRiding();
-				return;
-			}
-			showOrder.value = true;
-			if (status == 0) {
-				// 获取订单信息
-				getOrderInfo(bikeCode);
-				order.value.bikecode = bikeCode;
-				// 设置 intervalId 变量来保存定时器 ID
-				const intervalId = setInterval(() => {
-					// 更新订单时间
-					order.value.time = timeDifference(createdAt);
-					if (!showOrder.value) { // 如果 showOrder 为 false，停止轮询
-						clearInterval(intervalId); // 使用 intervalId 来停止轮询
-					}
-				}, 1000);
-			}
-			if (tempLock == 1) {
-				getTracking();
-				return;
-			}
+    getTracking();
+    // if (!orderTimer) {
+    // 	orderTimer = setInterval(getTracking, 100000);
+    // }
+  });
+}
 
-			getTracking();
-			// if (!orderTimer) {
-			// 	orderTimer = setInterval(getTracking, 100000);
-			// }
-		})
-	}
+const getOrderInfo = (bikeCode) => {
+  const params = {
+    userId: oUser.userId,
+    bikeCode: bikeCode,
+  };
+  callOrdereApi("userOrders/costCalculation", params).then((res) => {
+    if (res.code == 200) {
+      order.value.money = res.data;
+    }
+  });
+};
+//轨迹
+function getTracking() {
+  const { bikeCode, createdAt, ridePoint, returnPoint, endTime } = orderData;
+  let params = {
+    ebikeCode: bikeCode,
+    startTime: createdAt,
+  };
+  if (endTime)
+    params = {
+      ...params,
+      endTime,
+    };
 
-	const getOrderInfo = (bikeCode) => {
-		const params = {
-			"userId": oUser.userId,
-			"bikeCode": bikeCode
-		}
-		callOrdereApi("userOrders/costCalculation", params).then(res => {
-			if (res.code == 200) {
-				order.value.money = res.data;
-			}
-		})
-	}
-	//轨迹
-	function getTracking() {
-		const {
-			bikeCode,
-			createdAt,
-			ridePoint,
-			returnPoint,
-			endTime
-		} = orderData;
-		let params = {
-			ebikeCode: bikeCode,
-			startTime: createdAt
-		}
-		if (endTime) params = {
-			...params,
-			endTime
-		}
+  callOperateApi("ebikeTracking/query", params, "post").then((res) => {
+    const { code, data, message } = res;
+    if (code != 200) {
+      return;
+    }
+    const arrPoints =
+      !data || data.length == 0
+        ? []
+        : data.map((item) => {
+            const { lngGCJ02, latGCJ02 } = item;
+            return {
+              longitude: lngGCJ02,
+              latitude: latGCJ02,
+            };
+          });
 
-		callOperateApi("ebikeTracking/query", params, "post").then(res => {
-			const {
-				code,
-				data,
-				message
-			} = res;
-			if (code != 200) {
-				return;
-			}
-			const arrPoints = (!data || data.length == 0) ? [] : data.map(item => {
-				const {
-					lngGCJ02,
-					latGCJ02
-				} = item;
-				return {
-					longitude: lngGCJ02,
-					latitude: latGCJ02
-				}
-			});
+    const startPoint = ridePoint.split(",");
+    const lng = startPoint[0];
+    const lat = startPoint[1];
+    const start = {
+      longitude: lng,
+      latitude: lat,
+    };
+    const arrMakers = markers.value || [];
+    arrPoints.splice(0, 0, start);
+    let indexStart = findIndex(arrMakers, {
+      pointStart,
+    });
+    indexStart = indexStart == -1 ? arrMakers.length : indexStart;
+    arrMakers[indexStart] = map.addMarker(pointStart, lng, lat, "start.png");
+    if (data && data.length > 0) {
+      let { lngGCJ02: endlng, 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)];
+    }
+  });
+}
 
-			const startPoint = ridePoint.split(",");
-			const lng = startPoint[0];
-			const lat = startPoint[1];
-			const start = {
-				longitude: lng,
-				latitude: lat
-			}
-			const arrMakers = markers.value || [];
-			arrPoints.splice(0, 0, start);
-			let indexStart = findIndex(arrMakers, {
-				pointStart
-			});
-			indexStart = indexStart == -1 ? arrMakers.length : indexStart;
-			arrMakers[indexStart] = map.addMarker(pointStart, lng, lat, "start.png");
-			if (data && data.length > 0) {
-				let {
-					lngGCJ02: endlng,
-					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)];
-			}
-		})
-	}
+//完成骑行
+function completeRiding() {
+  if (!orderTimer) return;
+  clearInterval(orderTimer);
+  orderTimer = null;
+  showOrder.value = false;
+  hasOrder.value = false;
+  orderState.value = 0;
+}
 
-	//完成骑行
-	function completeRiding() {
-		if (!orderTimer) return;
-		clearInterval(orderTimer);
-		orderTimer = null;
-		showOrder.value = false;
-		hasOrder.value = false;
-		orderState.value = 0;
-	}
+function tologin() {
+  let url = "/pages/user/login/wx_login";
+  if (onLoadData.value) {
+    url +=
+      "?number=" + onLoadData.value["number"] + "&_tbScancodeApproach_=scan";
+  }
+  uni.navigateTo({
+    url: url,
+  });
+}
 
-	function tologin() {
-		let url = '/pages/user/login/wx_login'
-		if (onLoadData.value) {
-			url += '?number=' + onLoadData.value['number'] + "&_tbScancodeApproach_=scan"
-		}
-		uni.navigateTo({
-			url: url
-		})
-	}
+//临时锁车
+function lockRiding() {
+  const { userId } = oUser;
+  const { bikeCode } = orderData;
+  const params = {
+    userId,
+    bikeCode,
+  };
+  callOrdereApi("userOrders/tempLock", params, "post").then((res) => {
+    const { code, message, data } = res;
+    showModelMessage(message);
+    if (code == 200) {
+      if (orderTimer) {
+        clearInterval(orderTimer);
+        orderTimer = null;
+      }
+      orderState.value = 1;
+    }
+  });
+}
 
-	//临时锁车
-	function lockRiding() {
-		const {
-			userId
-		} = oUser;
-		const {
-			bikeCode
-		} = orderData;
-		const params = {
-			userId,
-			bikeCode
-		}
-		callOrdereApi("userOrders/tempLock", params, "post").then(res => {
-			const {
-				code,
-				message,
-				data
-			} = res;
-			showModelMessage(message)
-			if (code == 200) {
-				if (orderTimer) {
-					clearInterval(orderTimer);
-					orderTimer = null;
-				}
-				orderState.value = 1;
-			}
-		});
-	}
+//结束用车
+function endRiding() {
+  checkBikeEnding();
+}
 
-	//结束用车 
-	function endRiding() {
-		checkBikeEnding();
-	}
+function checkBikeEnding(callback) {
+  const { bikeCode } = orderData;
+  const params = {
+    bikeCode,
+  };
+  //运营区和停车区检查
+  const arrMethod = [
+    callOrdereApi("userOrders/checkBikeInOperation", params, "get"),
+    callOrdereApi("userOrders/checkBikeInParking", params, "get"),
+  ];
+  Promise.all(arrMethod).then(([res1, res2]) => {
+    if (res1.code != 200) {
+      showModelMessage(res1.message);
+      return;
+    }
 
-	function checkBikeEnding(callback) {
-		const {
-			bikeCode
-		} = orderData;
-		const params = {
-			bikeCode
-		}
-		//运营区和停车区检查
-		const arrMethod = [callOrdereApi("userOrders/checkBikeInOperation", params, "get"), callOrdereApi(
-			"userOrders/checkBikeInParking", params, "get")]
-		Promise.all(arrMethod).then(([res1, res2]) => {
-			if (res1.code != 200) {
-				showModelMessage(res1.message);
-				return;
-			}
+    if (res2.code != 200) {
+      showModelMessage(res2.message);
+      return;
+    }
+    doneRide();
+  });
+}
 
-			if (res2.code != 200) {
-				showModelMessage(res2.message);
-				return;
-			}
-			doneRide();
-		});
-	}
+//完成骑行
+function doneRide() {
+  uni.showLoading({
+    title: "正在结束用车",
+    mask: true,
+  });
+  const { userId } = oUser;
+  const { bikeCode } = orderData;
+  const params = {
+    userId,
+    bikeCode,
+  };
+  callOrdereApi("userOrders/doneRide", params, "post")
+    .then((res) => {
+      uni.hideLoading();
+      const { code, data, message } = res;
+      if (code != 200) {
+        showModelMessage(message);
+        return;
+      }
+      completeRiding();
+      openOrderPay();
+    })
+    .catch((err) => {
+      uni.hideLoading();
+      console.error("结束骑行失败", err);
+    });
+}
 
-	//完成骑行
-	function doneRide() {
-		const {
-			userId
-		} = oUser;
-		const {
-			bikeCode
-		} = orderData;
-		const params = {
-			userId,
-			bikeCode
-		}
-		callOrdereApi("userOrders/doneRide", params, "post").then(res => {
-			const {
-				code,
-				data,
-				message
-			} = res;
-			if (code != 200) {
-				showModelMessage(message);
-				return;
-			}
-			completeRiding();
-			openOrderPay();
-		})
-	}
+//继续骑行  需要开锁
+function continueRiding() {
+  const { 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();
+}
 
-	//继续骑行  需要开锁
-	function continueRiding() {
-		const {
-			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();
-	}
+//查看车辆信息
+function openBikeInfo(e) {
+  if (!oUser) {
+    tologin();
+    return;
+  }
+  const { markerId } = e.detail;
+  if (markerId == pointEnd || markerId == pointStart) {
+    return;
+  }
+  console.log(arrBikeData[markerId]);
 
-	//查看车辆信息
-	function openBikeInfo(e) {
-		if (!oUser) {
-			tologin();
-			return;
-		}
-		const {
-			markerId
-		} = e.detail;
-		if (markerId == pointEnd || markerId == pointStart) {
-			return;
-		}
-		bikeData.value = arrBikeData[markerId];
-		showBikeInfo.value = true;
-		showTools.value = false;
-		showOrderPay.value = false;
-	}
+  bikeData.value = arrBikeData[markerId];
+  showBikeInfo.value = true;
+  showTools.value = false;
+  showOrderPay.value = false;
+}
 
-	//关闭车辆信息
-	function closeBikeInfo() {
-		showBikeInfo.value = false;
-		showTools.value = true;
-	}
+//关闭车辆信息
+function closeBikeInfo() {
+  showBikeInfo.value = false;
+  showTools.value = true;
+}
 
-	onShow(() => {
-		if (uni.getStorageSync("wechat_user")) {
-			oUser = JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user")));
-			const {
-				userId
-			} = oUser;
-			if (userId) {
-				getOrder();
-			}
-		}
-		console.log("999999999999999999",ismount);
-		if (ismount) getLoalcationData();
-	});
+onShow(() => {
+  if (uni.getStorageSync("wechat_user")) {
+    oUser = JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user")));
+    const { userId } = oUser;
+    if (userId) {
+      getOrder();
+    }
+  }
+  console.log("999999999999999999", ismount);
+  if (ismount) getLoalcationData();
+});
 
-	onUnload(() => {})
+onUnload(() => {});
 
-	function parseDate(createTime) {
-		// 将日期字符串转换为 iOS 支持的格式
-		createTime = createTime.replace(" ", "T"); // 将空格替换为 "T"，使其符合 "yyyy-MM-ddTHH:mm:ss" 格式
-		return new Date(createTime); // 返回新的 Date 对象
-	}
+function parseDate(createTime) {
+  // 将日期字符串转换为 iOS 支持的格式
+  createTime = createTime.replace(" ", "T"); // 将空格替换为 "T"，使其符合 "yyyy-MM-ddTHH:mm:ss" 格式
+  return new Date(createTime); // 返回新的 Date 对象
+}
 
-	function timeDifference(createTime) {
-		const currentTime = new Date();
-		const createDate = parseDate(createTime); // 使用转换后的日期字符串
-		const diffInSeconds = Math.floor((currentTime - createDate) / 1000);
+function timeDifference(createTime) {
+  const currentTime = new Date();
+  const createDate = parseDate(createTime); // 使用转换后的日期字符串
+  const diffInSeconds = Math.floor((currentTime - createDate) / 1000);
 
-		if (diffInSeconds < 60) return `${diffInSeconds}秒`;
+  if (diffInSeconds < 60) return `${diffInSeconds}秒`;
 
-		const diffInMinutes = Math.floor(diffInSeconds / 60);
-		if (diffInMinutes < 60) {
-			const remainingSeconds = diffInSeconds % 60;
-			return `${diffInMinutes}分钟 ${remainingSeconds}秒`;
-		}
+  const diffInMinutes = Math.floor(diffInSeconds / 60);
+  if (diffInMinutes < 60) {
+    const remainingSeconds = diffInSeconds % 60;
+    return `${diffInMinutes}分钟 ${remainingSeconds}秒`;
+  }
 
-		const diffInHours = Math.floor(diffInMinutes / 60);
-		if (diffInHours < 24) {
-			const remainingMinutes = diffInMinutes % 60;
-			const remainingSeconds = diffInSeconds % 60;
-			return `${diffInHours}小时 ${remainingMinutes}分钟 ${remainingSeconds}秒`;
-		}
+  const diffInHours = Math.floor(diffInMinutes / 60);
+  if (diffInHours < 24) {
+    const remainingMinutes = diffInMinutes % 60;
+    const remainingSeconds = diffInSeconds % 60;
+    return `${diffInHours}小时 ${remainingMinutes}分钟 ${remainingSeconds}秒`;
+  }
 
-		const diffInDays = Math.floor(diffInHours / 24);
-		return `${diffInDays}天 ${diffInHours % 24}小时 ${diffInMinutes % 60}分钟 ${diffInSeconds % 60}秒`;
-	}
+  const diffInDays = Math.floor(diffInHours / 24);
+  return `${diffInDays}天 ${diffInHours % 24}小时 ${diffInMinutes % 60}分钟 ${
+    diffInSeconds % 60
+  }秒`;
+}
 
-	function getSiteList(lng, lat) {
-		const params = {
-			longitude: lng,
-			latitude: lat
-		}
-		callOrdereApi("userOrders/siteRegionList", params, "post").then(res => {
-			const {
-				code,
-				data,
-				message
-			} = res;
-			const arrData = [];
-			if (code == 200 && data && data.length > 0) {
-				data.map(item => {
-					const {
-						shapeType,
-						points
-					} = item;
-					if (shapeType == "2") {
-						arrData.push(map.addPolygon("#578FD4", "#c0daf54d", points));
-					}
-				});
-				polygons.value = arrData;
-			} else {
-				console.log("userOrders/siteRegionList", res);
-			}
-		})
-	}
-	
-	function checkRealName(callBack,number,_tbScancodeApproach_){
-		if (!oUser['realNameStatus']) {
-			showModelMessage("请先完成实名认证，再继续。", "实名认证", true, "去认证").then(res => {
-				if (res.confirm) {
-					let url="/pages/user/views/IdentityVerification";
-					if(number){
-						url=`${url}?number=${number}&_tbScancodeApproach_=${_tbScancodeApproach_}`;
-					}
-					uni.navigateTo({url});
-					callBack(false);
-					return;
-				}
-				callBack(false);
-			})
-			return;
-		}
-		callBack(true);
-	}
+function getSiteList(lng, lat) {
+  const params = {
+    longitude: lng,
+    latitude: lat,
+  };
+  callOrdereApi("userOrders/siteRegionList", params, "post").then((res) => {
+    const { code, data, message } = res;
+    const arrData = [];
+    if (code == 200 && data && data.length > 0) {
+      data.map((item) => {
+        const { shapeType, points } = item;
+        if (shapeType == "2") {
+          arrData.push(map.addPolygon("#578FD4", "#c0daf54d", points));
+        }
+      });
+      polygons.value = arrData;
+    } else {
+      console.log("userOrders/siteRegionList", res);
+    }
+  });
+}
 
+function checkRealName(callBack, number, _tbScancodeApproach_) {
+  if (!oUser["realNameStatus"]) {
+    showModelMessage(
+      "请先完成实名认证，再继续。",
+      "实名认证",
+      true,
+      "去认证"
+    ).then((res) => {
+      if (res.confirm) {
+        let url = "/pages/user/views/IdentityVerification";
+        if (number) {
+          url = `${url}?number=${number}&_tbScancodeApproach_=${_tbScancodeApproach_}`;
+        }
+        uni.navigateTo({ url });
+        callBack(false);
+        return;
+      }
+      callBack(false);
+    });
+    return;
+  }
+  callBack(true);
+}
 </script>
 
 <style scoped>
-	@import url("home.css");
-</style>
\ No newline at end of file
+@import url("home.css");
+</style>
diff --git a/ebike-user/pages/user/login/TroubleReportUser.vue b/ebike-user/pages/user/login/TroubleReportUser.vue
index b581835..6bf3b42 100644
--- a/ebike-user/pages/user/login/TroubleReportUser.vue
+++ b/ebike-user/pages/user/login/TroubleReportUser.vue
@@ -1,568 +1,606 @@
 <template>
-	<view class="container" :style="{ height: scrollHeight -113+ 'px' }">
-		<scroll-view class="scroll-container" :scroll-y="isScrollY" :style="{ height: scrollHeight-113 + 'px' }">
-
-			<view class="padding">
-				<uni-forms>
-					<uni-forms-item label="车辆编号">
-						<uni-easyinput :disabled="true" v-model="bikeCode" placeholder="车辆编号" />
-					</uni-forms-item>
-					<!-- <span @click="goToSH">去审核</span> -->
-				</uni-forms>
-			</view>
-			<view class="">
-				<view class="containerup">
-					<view class="titleup">
-						<view>请选择车辆损坏部位</view>
-						<view class="wzgl">上报故障车辆让出行更美好~</view>
-					</view>
-				</view>
-				<view class="chetoubox">
-					<view class="flex ">
-						<view class="cheleft">
-							<view class="text-center">
-								<view class="">
-									车头部位
-								</view>
-								<view class="cheimage">
-									<image :src="`${imgPath}static/userui/ebike/车头.png`" mode=""></image>
-								</view>
-							</view>
-						</view>
-						<view style="width: 70%;" class="flex flex-wrap">
-							<view v-for="(item,index) in ebikelingjiantop" :key="index" class="ebikelingjianclass">
-								<view :class="['boxlinjian', { selectImg: item.selected }]"
-									@click="selectParttop(index)">
-									<image :src="item.image"></image>
-									<view>{{ item.name }}</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="flex ">
-						<view class="cheleft">
-							<view class="text-center">
-								<view class="">
-									车尾部位
-								</view>
-								<view class="cheimage">
-									<image :src="`${imgPath}static/userui/ebike/车尾.png`" mode=""></image>
-								</view>
-							</view>
-						</view>
-						<view style="width: 70%;" class="flex flex-wrap">
-							<view v-for="(item,index) in ebikelingjianend" :key="index" class="ebikelingjianclass">
-								<view :class="['boxlinjian', { selectImg: item.selected }]"
-									@click="selectPartend(index)">
-									<image :src="item.image"></image>
-									<view>{{ item.name }}</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="padding">
-					<uni-easyinput type="textarea" v-model="bzxx" placeholder="其他问题" />
-				</view>
-			</view>
-			<uni-section title="上传图片" type="line">
-				<view class="example-body">
-					<uni-file-picker limit="9" @select="selectImg" @delete="delChangeImg"
-						:value="fileLists"></uni-file-picker>
-				</view>
-			</uni-section>
-
-		</scroll-view>
-		<!-- </you-touchbox> -->
-		<view class="nav-panel">
-			<uni-goods-nav :fill="true" :options="[]" :buttonGroup="navButtonGroup" @buttonClick="navButtonClick" />
-		</view>
-	</view>
+  <view class="container" :style="{ height: scrollHeight - 113 + 'px' }">
+    <scroll-view
+      class="scroll-container"
+      :scroll-y="isScrollY"
+      :style="{ height: scrollHeight - 113 + 'px' }"
+    >
+      <view class="padding">
+        <uni-forms>
+          <uni-forms-item label="车辆编号">
+            <uni-easyinput
+              :disabled="true"
+              v-model="bikeCode"
+              placeholder="车辆编号"
+            />
+          </uni-forms-item>
+          <!-- <span @click="goToSH">去审核</span> -->
+        </uni-forms>
+      </view>
+      <view class="">
+        <view class="containerup">
+          <view class="titleup">
+            <view>请选择车辆损坏部位</view>
+            <view class="wzgl">上报故障车辆让出行更美好~</view>
+          </view>
+        </view>
+        <view class="chetoubox">
+          <view class="flex">
+            <view class="cheleft">
+              <view class="text-center">
+                <view class=""> 车头部位 </view>
+                <view class="cheimage">
+                  <image
+                    :src="`${imgPath}static/userui/ebike/车头.png`"
+                    mode=""
+                  ></image>
+                </view>
+              </view>
+            </view>
+            <view style="width: 70%" class="flex flex-wrap">
+              <view
+                v-for="(item, index) in ebikelingjiantop"
+                :key="index"
+                class="ebikelingjianclass"
+              >
+                <view
+                  :class="['boxlinjian', { selectImg: item.selected }]"
+                  @click="selectParttop(index)"
+                >
+                  <image :src="item.image"></image>
+                  <view>{{ item.name }}</view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="flex">
+            <view class="cheleft">
+              <view class="text-center">
+                <view class=""> 车尾部位 </view>
+                <view class="cheimage">
+                  <image
+                    :src="`${imgPath}static/userui/ebike/车尾.png`"
+                    mode=""
+                  ></image>
+                </view>
+              </view>
+            </view>
+            <view style="width: 70%" class="flex flex-wrap">
+              <view
+                v-for="(item, index) in ebikelingjianend"
+                :key="index"
+                class="ebikelingjianclass"
+              >
+                <view
+                  :class="['boxlinjian', { selectImg: item.selected }]"
+                  @click="selectPartend(index)"
+                >
+                  <image :src="item.image"></image>
+                  <view>{{ item.name }}</view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="padding">
+          <uni-easyinput
+            type="textarea"
+            v-model="bzxx"
+            placeholder="其他问题"
+          />
+        </view>
+      </view>
+      <view style="width: 100%; padding: 0 20rpx">
+        <uni-section title="上传图片" type="line">
+          <view class="example-body">
+            <uni-file-picker
+              limit="9"
+              @select="selectImg"
+              @delete="delChangeImg"
+              :value="fileLists"
+            ></uni-file-picker>
+          </view>
+        </uni-section>
+      </view>
+    </scroll-view>
+    <!-- </you-touchbox> -->
+    <view class="nav-panel">
+      <uni-goods-nav
+        :fill="true"
+        :options="[]"
+        :buttonGroup="navButtonGroup"
+        @buttonClick="navButtonClick"
+      />
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		reactive,
-		ref,
-		onMounted
-	} from 'vue';
-	import * as api from '@/utils/api.js';
-	import {
-		showModelMessage,jkcBaseDecode
-	} from '@/utils/tools.js';
-	import {
-		onLoad
-	} from '@dcloudio/uni-app';
+import { reactive, ref, onMounted } from "vue";
+import * as api from "@/utils/api.js";
+import { showModelMessage, jkcBaseDecode } from "@/utils/tools.js";
+import { onLoad } from "@dcloudio/uni-app";
 
-	import config from '@/utils/config';
-	const imgPath = config.imgPath;
+import config from "@/utils/config";
+const imgPath = config.imgPath;
 
-	const ebikeInfo = ref({
-		bikeId: '',
-		bikeCode: '',
-		ecuId: '',
-		ecuSn: '',
-		longitude: '',
-		latitude: ''
-	});
+const ebikeInfo = ref({
+  bikeId: "",
+  bikeCode: "",
+  ecuId: "",
+  ecuSn: "",
+  longitude: "",
+  latitude: "",
+});
 
-	const bikeCode = ref("");
-	const orderCode = ref("");
-	const childComponent = ref(null);
-	const fileLists = ref([]);
-	const address = ref("");
+const bikeCode = ref("");
+const orderCode = ref("");
+const childComponent = ref(null);
+const fileLists = ref([]);
+const address = ref("");
 
-	const delChangeImg = (res) => {
-		const fileUniqueKey = fileLists.value[res.index].fileUniqueKey;
-		fileLists.value.splice(res.index, 1);
-		api.callMaintenanceApi("ebikeOrdersSystem/deletedFile?fileUniqueKey=" + fileUniqueKey, {}, "get");
-	}
-	const isScrollY = ref(true)
-	const getEndDetail = ({
-		minTop,
-		maxTop,
-		curTop
-	}) => {
-		if (curTop == maxTop) isScrollY.value = true
-		else isScrollY.value = false
-	}
-	const selectImg = (data) => {
-		const file = data.tempFiles[0]; 
-		api.fileUploadUser(file).then(res => {
-			if (res.code == 200) {
-				fileLists.value.push(res.data)
-			} else {
-				if (fileLists.value.length > 0) {
-					fileLists.value.pop();
-				} else {
-					fileLists.value = [];
-				}
-			}
-		});
-	}
+const delChangeImg = (res) => {
+  const fileUniqueKey = fileLists.value[res.index].fileUniqueKey;
+  fileLists.value.splice(res.index, 1);
+  api.callMaintenanceApi(
+    "ebikeOrdersSystem/deletedFile?fileUniqueKey=" + fileUniqueKey,
+    {},
+    "get"
+  );
+};
+const isScrollY = ref(true);
+const getEndDetail = ({ minTop, maxTop, curTop }) => {
+  if (curTop == maxTop) isScrollY.value = true;
+  else isScrollY.value = false;
+};
+const selectImg = (data) => {
+  const file = data.tempFiles[0];
+  api.fileUploadUser(file).then((res) => {
+    if (res.code == 200) {
+      fileLists.value.push(res.data);
+    } else {
+      if (fileLists.value.length > 0) {
+        fileLists.value.pop();
+      } else {
+        fileLists.value = [];
+      }
+    }
+  });
+};
 
-	const check = (item, index) => {
-		item.checked = !item.checked;
-		keys.value = keys.value == 1 ? 0 : 1;
-	}
-	const bzxx = ref("")
-	const ebikelingjiantop = ref([{
-			image: `${imgPath}static/userui/ebike/车把.png`,
-			name: '车把',
-			selected: false
-		},
-		{
-			image: `${imgPath}static/userui/ebike/车头1.png`,
-			name: '车头',
-			selected: false
-		},
-		{
-			image: `${imgPath}static/userui/ebike/车灯.png`,
-			name: '车灯',
-			selected: false
-		},
-		{
-			image: `${imgPath}static/userui/ebike/二维码.png`,
-			name: '二维码',
-			selected: false
-		},
-		{
-			image: `${imgPath}static/userui/ebike/车筐.png`,
-			name: '车筐',
-			selected: false
-		},
-		{
-			image: `${imgPath}static/userui/ebike/线路.png`,
-			name: '线路',
-			selected: false
-		}
-	]);
-	const ebikelingjianend = ref([{
-			image: `${imgPath}static/userui/ebike/车座.png`,
-			name: '车座',
-			selected: false
-		},
-		{
-			image: `${imgPath}static/userui/ebike/电池.png`,
-			name: '电池',
-			selected: false
-		},
-		{
-			image: `${imgPath}static/userui/ebike/车轮.png`,
-			name: '车轮',
-			selected: false
-		},
-		{
-			image: `${imgPath}static/userui/ebike/脚蹬.png`,
-			name: '脚蹬',
-			selected: false
-		},
-		{
-			image: `${imgPath}static/userui/ebike/车撑.png`,
-			name: '车撑',
-			selected: false
-		},
-		{
-			image: `${imgPath}static/userui/ebike/挡板.png`,
-			name: '挡板',
-			selected: false
-		}
-	]);
-	const navButtonGroup = [{
-		text: '确认提交',
-		backgroundColor: '#0078D4',
-		color: '#fff'
-	}];
-	const bikeCodeScanChange = (bikeCode) => {
-		ebikeInfo.value.bikeCode = bikeCode;
-		api.callEbikeInfo("getBikeINfoData?bikeCode=" + bikeCode).then((res) => {
-			if (res.code == 200) {
-				ebikeInfo.value.bikeId = res.data.bikeId;
-				ebikeInfo.value.ecuId = res.data.ecuId;
-				ebikeInfo.value.ecuSn = res.data.ecuSn;
-				const ecuSn = res.data.ecuSn;
-				//获取车辆经纬度
-				api.callCoreApi("gps?ecuId=" + res.data.ecuId + "&bikeId=" + ebikeInfo.value.bikeId, {}, 'get')
-					.then((res) => {
-						api.callCoreApi("gpsMsg" + "?ecuSn=" + ecuSn, {}, 'get').then((res) => {
-							currentCoordinates.value = res.data.longitude + "," + res.data
-								.latitude;
-							ebikeInfo.value.latitude = res.data.latitude;
-							ebikeInfo.value.longitude = res.data.longitude;
-						})
-					});
-			}
-		});
-	};
-	const selectParttop = (index) => {
-		ebikelingjiantop.value[index].selected = !ebikelingjiantop.value[index].selected
-	}
-	const selectPartend = (index) => {
-		ebikelingjianend.value[index].selected = !ebikelingjianend.value[index].selected
-	}
-	const gzlist = ref([]);
-	const keys = ref(0)
+const check = (item, index) => {
+  item.checked = !item.checked;
+  keys.value = keys.value == 1 ? 0 : 1;
+};
+const bzxx = ref("");
+const ebikelingjiantop = ref([
+  {
+    image: `${imgPath}static/userui/ebike/车把.png`,
+    name: "车把",
+    selected: false,
+  },
+  {
+    image: `${imgPath}static/userui/ebike/车头1.png`,
+    name: "车头",
+    selected: false,
+  },
+  {
+    image: `${imgPath}static/userui/ebike/车灯.png`,
+    name: "车灯",
+    selected: false,
+  },
+  {
+    image: `${imgPath}static/userui/ebike/二维码.png`,
+    name: "二维码",
+    selected: false,
+  },
+  {
+    image: `${imgPath}static/userui/ebike/车筐.png`,
+    name: "车筐",
+    selected: false,
+  },
+  {
+    image: `${imgPath}static/userui/ebike/线路.png`,
+    name: "线路",
+    selected: false,
+  },
+]);
+const ebikelingjianend = ref([
+  {
+    image: `${imgPath}static/userui/ebike/车座.png`,
+    name: "车座",
+    selected: false,
+  },
+  {
+    image: `${imgPath}static/userui/ebike/电池.png`,
+    name: "电池",
+    selected: false,
+  },
+  {
+    image: `${imgPath}static/userui/ebike/车轮.png`,
+    name: "车轮",
+    selected: false,
+  },
+  {
+    image: `${imgPath}static/userui/ebike/脚蹬.png`,
+    name: "脚蹬",
+    selected: false,
+  },
+  {
+    image: `${imgPath}static/userui/ebike/车撑.png`,
+    name: "车撑",
+    selected: false,
+  },
+  {
+    image: `${imgPath}static/userui/ebike/挡板.png`,
+    name: "挡板",
+    selected: false,
+  },
+]);
+const navButtonGroup = [
+  {
+    text: "确认提交",
+    backgroundColor: "#0078D4",
+    color: "#fff",
+  },
+];
+const bikeCodeScanChange = (bikeCode) => {
+  ebikeInfo.value.bikeCode = bikeCode;
+  api.callEbikeInfo("getBikeINfoData?bikeCode=" + bikeCode).then((res) => {
+    if (res.code == 200) {
+      ebikeInfo.value.bikeId = res.data.bikeId;
+      ebikeInfo.value.ecuId = res.data.ecuId;
+      ebikeInfo.value.ecuSn = res.data.ecuSn;
+      const ecuSn = res.data.ecuSn;
+      //获取车辆经纬度
+      api
+        .callCoreApi(
+          "gps?ecuId=" + res.data.ecuId + "&bikeId=" + ebikeInfo.value.bikeId,
+          {},
+          "get"
+        )
+        .then((res) => {
+          api
+            .callCoreApi("gpsMsg" + "?ecuSn=" + ecuSn, {}, "get")
+            .then((res) => {
+              currentCoordinates.value =
+                res.data.longitude + "," + res.data.latitude;
+              ebikeInfo.value.latitude = res.data.latitude;
+              ebikeInfo.value.longitude = res.data.longitude;
+            });
+        });
+    }
+  });
+};
+const selectParttop = (index) => {
+  ebikelingjiantop.value[index].selected =
+    !ebikelingjiantop.value[index].selected;
+};
+const selectPartend = (index) => {
+  ebikelingjianend.value[index].selected =
+    !ebikelingjianend.value[index].selected;
+};
+const gzlist = ref([]);
+const keys = ref(0);
 
-	const checkscan = () => {
-		if (!bikeCode.value) {
-			showModelMessage("车辆码为空！");
-			return false;
-		}
-		if (!ebikeInfo.value.bikeId) {
-			showModelMessage("车辆信息不存在!");
-			return false;
-		}
-		return true;
-	}
-	const navButtonClick = (index, content) => {
-		if (!checkscan()) {
-			return
-		}
-		uni.showModal({
-			title: '确认提交',
-			content: '您确定要进行提交操作吗？',
-			success: (res) => {
-				if (res.confirm) {
-					let faultPart = [
-						...ebikelingjiantop.value
-						.map(res => res.selected ? res.name : null)
-						.filter(name => name !== null),
-						...ebikelingjianend.value
-						.map(res => res.selected ? res.name : null)
-						.filter(name => name !== null)
-					];
-					const params = {
-						// "faultReportId": "string",
-						"bikeCode": bikeCode.value,
-						// "position": "string",
-						"faultPart": faultPart.join("|"),
-						"faultDescription": bzxx.value,
-						// "reportAt": "string",
-						// "isDeleted": "string",
-						// "updatedAt": "string",
-						// "deletedAt": "string",
-						"reportUser": wechat_user.value.userId,
-						"userMobile": wechat_user.value.mobile,
-						"reportSource": "微信小程序",
-						// "handleState": "string",
-						"longitude": Number(ebikeInfo.value.longitude),
-						"latitude": Number(ebikeInfo.value.latitude),
-						"orderCode": orderCode.value,
-						// "workorderId": "string",
-						"attachmentFiles": fileLists.value
-					}
-					api.callOrdereApi("ebikeUserFaultreport/save", params).then((res) => {
-						if (res.code == 200) {
-							uni.showToast({
-								title: '提交成功',
-								icon: 'success',
-								duration: 2000,
-								complete: function() {
-									// 在弹出提示框后再跳转到我的页面
-									uni.navigateTo({
-										url: "/pages/user/mine/MePage"
-									});
-								}
-							});
-						} else {
-							uni.showToast({
-								title: '操作失败',
-								icon: 'error',
-								duration: 2000
-							});
-						}
+const checkscan = () => {
+  if (!bikeCode.value) {
+    showModelMessage("车辆码为空！");
+    return false;
+  }
+  if (!ebikeInfo.value.bikeId) {
+    showModelMessage("车辆信息不存在!");
+    return false;
+  }
+  return true;
+};
+const navButtonClick = (index, content) => {
+  if (!checkscan()) {
+    return;
+  }
+  uni.showModal({
+    title: "确认提交",
+    content: "您确定要进行提交操作吗？",
+    success: (res) => {
+      if (res.confirm) {
+        let faultPart = [
+          ...ebikelingjiantop.value
+            .map((res) => (res.selected ? res.name : null))
+            .filter((name) => name !== null),
+          ...ebikelingjianend.value
+            .map((res) => (res.selected ? res.name : null))
+            .filter((name) => name !== null),
+        ];
+        const params = {
+          // "faultReportId": "string",
+          bikeCode: bikeCode.value,
+          // "position": "string",
+          faultPart: faultPart.join("|"),
+          faultDescription: bzxx.value,
+          // "reportAt": "string",
+          // "isDeleted": "string",
+          // "updatedAt": "string",
+          // "deletedAt": "string",
+          reportUser: wechat_user.value.userId,
+          userMobile: wechat_user.value.mobile,
+          reportSource: "微信小程序",
+          // "handleState": "string",
+          longitude: Number(ebikeInfo.value.longitude),
+          latitude: Number(ebikeInfo.value.latitude),
+          orderCode: orderCode.value,
+          // "workorderId": "string",
+          attachmentFiles: fileLists.value,
+        };
+        api.callOrdereApi("ebikeUserFaultreport/save", params).then((res) => {
+          if (res.code == 200) {
+            uni.showToast({
+              title: "提交成功",
+              icon: "success",
+              duration: 2000,
+              complete: function () {
+                // 在弹出提示框后再跳转到我的页面
+                uni.navigateTo({
+                  url: "/pages/user/mine/MePage",
+                });
+              },
+            });
+          } else {
+            uni.showToast({
+              title: "操作失败",
+              icon: "error",
+              duration: 2000,
+            });
+          }
+        });
+      } else if (res.cancel) {
+        console.log("用户取消出库");
+      }
+    },
+  });
+};
 
-					})
+const userInfo = ref(null);
+const closePopup = () => {
+  popup.value.close("center");
+};
+const gotomaintenancepage = () => {
+  uni.navigateTo({
+    url: `/pages/devops/maintenancepage/maintenancepage?bikeCode=${ebikeInfo.value.bikeCode}`,
+  });
+};
+const createTicket = () => {
+  //生成工单
+  const faultIds = gzlist.value
+    .filter((item) => item.checked === true)
+    .map((item) => item.faultReportId);
+  const params = {
+    bikeCode: ebikeInfo.value.bikeCode,
+    faultIds: faultIds,
+    receiver: userInfo.value.staffId,
+  };
 
-				} else if (res.cancel) {
-					console.log('用户取消出库');
-				}
-			}
-		});
-	}
+  api.callEbikeInfo("createWorkOrder", params).then((res) => {
+    if (res.code == 200) {
+      //工单生成成功 跳转
+      closePopup();
+      setTimeout(() => {
+        gotomaintenancepage();
+      }, 200);
+    }
+  });
+};
+const popuptextlx = ref(1);
+const typepopup = ref("center");
+const popup = ref(null);
+const wechat_user = ref(null);
+const scrollHeight = ref(0);
+const currentCoordinates = ref(null);
+onLoad((options) => {
+  userInfo.value = uni.getStorageSync("userInfo");
+  wechat_user.value = JSON.parse(
+    jkcBaseDecode(uni.getStorageSync("wechat_user"))
+  );
+  const systemInfo = uni.getSystemInfoSync();
+  const screenHeight = systemInfo.screenHeight;
+  const statusBarHeight = systemInfo.statusBarHeight;
+  scrollHeight.value = screenHeight - statusBarHeight;
+  if (options.bikeCode) {
+    bikeCode.value = options.bikeCode;
+    orderCode.value = options.orderCode;
+  }
+});
+onMounted(() => {
+  if (bikeCode.value != "") {
+    bikeCodeScanChange(bikeCode.value);
+  }
+});
 
-	const userInfo = ref(null);
-	const closePopup = () => {
-
-		popup.value.close("center");
-	}
-	const gotomaintenancepage = () => {
-		uni.navigateTo({
-			url: `/pages/devops/maintenancepage/maintenancepage?bikeCode=${ebikeInfo.value.bikeCode}`
-		})
-	}
-	const createTicket = () => {
-		//生成工单 
-		const faultIds = gzlist.value.filter(item => item.checked === true).map(item => item.faultReportId);
-		const params = {
-			"bikeCode": ebikeInfo.value.bikeCode,
-			"faultIds": faultIds,
-			"receiver": userInfo.value.staffId
-		}
-
-		api.callEbikeInfo("createWorkOrder", params).then((res) => {
-			if (res.code == 200) { //工单生成成功 跳转 
-				closePopup();
-				setTimeout(() => {
-					gotomaintenancepage();
-				}, 200);
-			}
-
-		})
-	}
-	const popuptextlx = ref(1);
-	const typepopup = ref("center");
-	const popup = ref(null);
-	const wechat_user = ref(null);
-	const scrollHeight = ref(0);
-	const currentCoordinates = ref(null);
-	onLoad((options) => {
-		userInfo.value = uni.getStorageSync('userInfo');
-		wechat_user.value =  JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user")));
-		const systemInfo = uni.getSystemInfoSync();
-		const screenHeight = systemInfo.screenHeight;
-		const statusBarHeight = systemInfo.statusBarHeight;
-		scrollHeight.value = screenHeight - statusBarHeight;
-		if (options.bikeCode) {
-			bikeCode.value = options.bikeCode;
-			orderCode.value = options.orderCode;
-		}
-	})
-	onMounted(() => {
-		if (bikeCode.value != "") {
-			bikeCodeScanChange(bikeCode.value);
-		}
-
-
-	})
-
-	const changePoint = (res) => {
-		address.value = res.address;
-		currentCoordinates.value = res.location.lng + "," + res.location.lat;
-		ebikeInfo.value.latitude = res.location.lat;
-		ebikeInfo.value.longitude = res.location.lng;
-	}
-	// const goToSH = () => {
-	// 	uni.navigateTo({
-	// 		url: "/pages/warehouse/UserReportedFaults/UserReportedFaults"
-	// 	})
-	// }
+const changePoint = (res) => {
+  address.value = res.address;
+  currentCoordinates.value = res.location.lng + "," + res.location.lat;
+  ebikeInfo.value.latitude = res.location.lat;
+  ebikeInfo.value.longitude = res.location.lng;
+};
+// const goToSH = () => {
+// 	uni.navigateTo({
+// 		url: "/pages/warehouse/UserReportedFaults/UserReportedFaults"
+// 	})
+// }
 </script>
 
 <style>
-	.container {
-		height: 100vh;
-		padding: 0px 0px;
-		background-color: #ffffff;
-	}
+.container {
+  height: 100vh;
+  padding: 0px 0px;
+  background-color: #ffffff;
+}
 
-	.example {
-		text-align: center;
-	}
+.example {
+  text-align: center;
+}
 
-	.titleup {
-		font-size: 18px;
-		letter-spacing: 2px;
-		font-weight: bold;
-		padding: 0px 10px;
-	}
+.titleup {
+  font-size: 18px;
+  letter-spacing: 2px;
+  font-weight: bold;
+  padding: 0px 10px;
+}
 
-	.titleup .wzgl {
-		color: rgb(164, 169, 172);
-		font-size: 12px;
-	}
+.titleup .wzgl {
+  color: rgb(164, 169, 172);
+  font-size: 12px;
+}
 
-	.cheliangclassbox {
-		width: 60px;
-		height: 60px;
-		border: solid 2px rgb(227, 227, 227);
-		border-radius: 50%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
+.cheliangclassbox {
+  width: 60px;
+  height: 60px;
+  border: solid 2px rgb(227, 227, 227);
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 
-	.border_color_select {
-		border: solid 2px rgb(16, 130, 255);
-	}
+.border_color_select {
+  border: solid 2px rgb(16, 130, 255);
+}
 
-	.uni-grid-item__box {
-		flex-direction: column;
-		align-items: center;
-		margin-top: 10px;
-	}
+.uni-grid-item__box {
+  flex-direction: column;
+  align-items: center;
+  margin-top: 10px;
+}
 
-	.nav-panel {
-		position: fixed;
-		bottom: 0rpx;
-		width: 100%;
-		padding-bottom: 20px;
-		background-color: #fff;
-		z-index: 105;
-	}
+.nav-panel {
+  position: fixed;
+  bottom: 0rpx;
+  width: 100%;
+  padding-bottom: 20px;
+  background-color: #fff;
+  z-index: 105;
+}
 
-	.dialog-box {
-		padding: 10px;
-	}
+.dialog-box {
+  padding: 10px;
+}
 
-	.boxcenter {
-		width: 290px;
-		padding: 15px;
-	}
+.boxcenter {
+  width: 290px;
+  padding: 15px;
+}
 
-	.buttongroup {
-		display: flex;
-		justify-content: space-between;
-	}
+.buttongroup {
+  display: flex;
+  justify-content: space-between;
+}
 
-	.buttongroup button {
-		width: 45%;
-		font-size: 16px;
-	}
+.buttongroup button {
+  width: 45%;
+  font-size: 16px;
+}
 
-	.textbox {
-		width: 100%;
-		padding: 15px 5px;
-		text-align: center;
-		font-size: 14px;
-		letter-spacing: 1px;
-	}
+.textbox {
+  width: 100%;
+  padding: 15px 5px;
+  text-align: center;
+  font-size: 14px;
+  letter-spacing: 1px;
+}
 
-	.textlist {
-		height: 180px;
-	}
+.textlist {
+  height: 180px;
+}
 
-	.gzboxlist {
-		width: 100%;
-		padding: 0px;
-		height: 50px;
-		border: solid 1px rgb(229, 229, 229);
-		align-items: center;
-		margin: 6px 0px;
-	}
+.gzboxlist {
+  width: 100%;
+  padding: 0px;
+  height: 50px;
+  border: solid 1px rgb(229, 229, 229);
+  align-items: center;
+  margin: 6px 0px;
+}
 
-	.wz14 {
-		font-size: 14px;
-		line-height: 15px;
-	}
+.wz14 {
+  font-size: 14px;
+  line-height: 15px;
+}
 
-	.wz12 {
-		font-size: 12px;
-		line-height: 15px;
-		color: rgb(191, 191, 191);
-	}
+.wz12 {
+  font-size: 12px;
+  line-height: 15px;
+  color: rgb(191, 191, 191);
+}
 
-	.unipopup .uni-popup {
-		z-index: 199;
-	}
+.unipopup .uni-popup {
+  z-index: 199;
+}
 
-	.classtb {}
+.classtb {
+}
 
-	.classwz1 {
-		font-size: 14px;
-		font-weight: bold;
-		color: black;
-	}
+.classwz1 {
+  font-size: 14px;
+  font-weight: bold;
+  color: black;
+}
 
-	.classwz2 {
-		font-size: 13px;
-		color: #5a5a5a;
-		font-weight: bold;
-		margin-left: 20px;
-	}
+.classwz2 {
+  font-size: 13px;
+  color: #5a5a5a;
+  font-weight: bold;
+  margin-left: 20px;
+}
 
-	.classwz3 {
-		font-size: 12px;
-		margin-left: 20px;
-		color: #b8b8b8;
-	}
+.classwz3 {
+  font-size: 12px;
+  margin-left: 20px;
+  color: #b8b8b8;
+}
 
-	.divmap {
-		width: 100%;
-		height: 500px;
-		margin-top: -15px;
-	}
+.divmap {
+  width: 100%;
+  height: 500px;
+  margin-top: -15px;
+}
 
-	.ebikelingjianclass {
-		width: 33%;
+.ebikelingjianclass {
+  width: 33%;
+}
 
-	}
+.chetoubox {
+  margin: 10px;
+  border-radius: 10px;
+  padding: 10px;
+  box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.3);
+}
 
-	.chetoubox {
-		margin: 10px;
-		border-radius: 10px;
-		padding: 10px;
-		box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.3)
-	}
+.cheleft {
+  width: 30%;
+}
 
-	.cheleft {
-		width: 30%;
-	}
+.cheimage image {
+  width: 60px;
+  height: 70px;
+  margin-top: 30px;
+}
 
-	.cheimage image {
-		width: 60px;
-		height: 70px;
-		margin-top: 30px;
-	}
+.boxlinjian {
+  text-align: center;
+  font-size: 12px;
+  padding-bottom: 12px;
+}
 
-	.boxlinjian {
-		text-align: center;
-		font-size: 12px;
-		padding-bottom: 12px;
-	}
+.boxlinjian image {
+  width: 50px;
+  height: 50px;
+  border: solid 3px rgb(230, 230, 230);
+  border-radius: 11px;
+  background: white;
+  padding: 7px;
+}
 
-	.boxlinjian image {
-		width: 50px;
-		height: 50px;
-		border: solid 3px rgb(230, 230, 230);
-		border-radius: 11px;
-		background: white;
-		padding: 7px;
-	}
-
-
-	.selectImg image {
-		border: solid 3px rgb(156, 235, 131);
-		background: rgb(208, 241, 196);
-	}
-</style>
\ No newline at end of file
+.selectImg image {
+  border: solid 3px rgb(156, 235, 131);
+  background: rgb(208, 241, 196);
+}
+</style>
diff --git a/ebike-user/pages/user/mine/MePage.vue b/ebike-user/pages/user/mine/MePage.vue
index 64a0126..624bb38 100644
--- a/ebike-user/pages/user/mine/MePage.vue
+++ b/ebike-user/pages/user/mine/MePage.vue
@@ -1,221 +1,232 @@
 <template>
-	<view class="container">
-		<!-- 用户信息区域 -->
-		<view class="user-info padding">
-			<view class="user-avatar">
-				<image :src="wechat_user.avatar" mode="aspectFill"></image><!-- 头像 -->
-			</view>
-			<view class="user-details">
-				<view class="nickname">{{wechat_user.nickname}}</view>
-				<view class="phone-number">{{ hidePhoneNumber(wechat_user.mobile) }}</view>
-			</view>
-		</view>
+  <view class="container">
+    <!-- 用户信息区域 -->
+    <view class="user-info padding">
+      <view class="user-avatar">
+        <image
+          :src="wechat_user.avatar || `${imgPath}static/userui/wxtouxiang.png`"
+          mode="aspectFill"
+        ></image
+        ><!-- 头像 -->
+      </view>
+      <view class="user-details">
+        <view class="nickname">{{ wechat_user.nickname || "微信用户" }}</view>
+        <view class="phone-number">{{
+          hidePhoneNumber(wechat_user.mobile)
+        }}</view>
+      </view>
+    </view>
 
-		<!-- 账户明细区域 -->
-		<view class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg radius">
-			<view v-for="(item, index) in menuItems" :key="index" class="cu-item arrow" @click="navigateTo(item.link)">
-				<view class="content flex">
-					<view class="icon-container">
-						<image class="icon-size" :src="item.icon"></image>
-					</view>
-					<text class="text-black">{{ item.label }}</text>
-				</view>
-			</view>
-			<view class=" flex flex-direction">
-				<button @click="logout" style="height: 45px;"
-					class="cu-btn bg-white margin-tb-sm lg text-red text-bold">退出登录</button>
-			</view>
-		</view>
-	</view>
+    <!-- 账户明细区域 -->
+    <view
+      class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg radius"
+    >
+      <view
+        v-for="(item, index) in menuItems"
+        :key="index"
+        class="cu-item arrow"
+        @click="navigateTo(item.link)"
+      >
+        <view class="content flex">
+          <view class="icon-container">
+            <image class="icon-size" :src="item.icon"></image>
+          </view>
+          <text class="text-black">{{ item.label }}</text>
+        </view>
+      </view>
+      <view class="flex flex-direction">
+        <button
+          @click="logout"
+          style="height: 45px"
+          class="cu-btn bg-white margin-tb-sm lg text-red text-bold"
+        >
+          退出登录
+        </button>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref
-	} from 'vue';
-	import config from '@/utils/config';
-	import {
-		onLoad
-	} from '@dcloudio/uni-app';
-	import {
-		showModelMessage,
-		jkcBaseEncode,
-		jkcBaseDecode
-	} from '@/utils/tools.js';
-	const imgPath = config.imgPath;
-	const wechat_user = ref({
-		url: `${imgPath}static/userui/wxtouxiang.png`,
-		nickname: "",
-		mobile: ""
-	});
-	onLoad((options) => {
-		wechat_user.value = JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user")));
+import { ref } from "vue";
+import config from "@/utils/config";
+import { onLoad } from "@dcloudio/uni-app";
+import {
+  showModelMessage,
+  jkcBaseEncode,
+  jkcBaseDecode,
+} from "@/utils/tools.js";
+const imgPath = config.imgPath;
+const wechat_user = ref({
+  url: `${imgPath}static/userui/wxtouxiang.png`,
+  nickname: "",
+  mobile: "",
+});
+onLoad((options) => {
+  wechat_user.value = JSON.parse(
+    jkcBaseDecode(uni.getStorageSync("wechat_user"))
+  );
+  console.log(wechat_user.value);
+});
+// 隐藏电话号码中间部分
+const hidePhoneNumber = (phoneNumber) => {
+  if (!phoneNumber || phoneNumber.length !== 11) {
+    return phoneNumber; // 如果不是有效的手机号，直接返回原始手机号
+  }
+  const firstPart = phoneNumber.substring(0, 3); // 前三位
+  const lastPart = phoneNumber.substring(7); // 后四位
+  return `${firstPart}****${lastPart}`; // 拼接隐藏的手机号
+};
 
-	})
-	// 隐藏电话号码中间部分
-	const hidePhoneNumber = (phoneNumber) => {
-		if (!phoneNumber || phoneNumber.length !== 11) {
-			return phoneNumber; // 如果不是有效的手机号，直接返回原始手机号
-		}
-		const firstPart = phoneNumber.substring(0, 3); // 前三位
-		const lastPart = phoneNumber.substring(7); // 后四位
-		return `${firstPart}****${lastPart}`; // 拼接隐藏的手机号
-	}
+const menuItems = ref([
+  {
+    icon: `${imgPath}static/userui/icon/zhhanghu.png`,
+    label: "订单明细",
+    link: "/pages/user/login/AccountDetails",
+  },
+  {
+    icon: `${imgPath}static/userui/icon/baoxiujilu.png`,
+    label: "故障反馈",
+    link: "/pages/user/login/TroubleReportUser?bikeCode=250306001002&orderCode=12039219893712864",
+  },
+  {
+    icon: `${imgPath}static/userui/icon/baoxiujilu.png`,
+    label: "报修记录",
+    link: "/pages/user/login/RepairReport",
+  },
+  {
+    icon: `${imgPath}static/userui/icon/shiminrenzheng.png`,
+    label: "微信登录",
+    link: "/pages/user/login/wx_login",
+  },
+  {
+    icon: `${imgPath}static/userui/icon/jilu.png`,
+    label: "申请还车记录",
+    link: "/pages/user/login/return-point-records",
+  },
+  {
+    icon: `${imgPath}static/userui/icon/helpinfo.png`,
+    label: "帮助中心",
+    link: "/pages/user/HelpPage/HelpPage",
+  },
+  {
+    icon: `${imgPath}static/userui/icon/helpinfo.png`,
+    label: "微信支付反馈",
+    link: "/pages/user/views/PaymentFeedback",
+  },
+  {
+    icon: `${imgPath}static/userui/icon/loginout.png`,
+    label: "账号注销",
+    link: "/pages/user/login/userLogout",
+  },
+]);
+// 退出登录的方法
+const logout = () => {
+  uni.showModal({
+    title: "退出登录",
+    content: "是否确认退出并清除缓存？",
+    success: function (res) {
+      if (res.confirm) {
+        // 清除缓存
+        uni.clearStorage("wechat_user");
 
+        // 弹出成功提示
+        uni.showToast({
+          title: "退出成功", // 提示内容
+          icon: "success", // 图标类型
+          duration: 2000, // 持续时间（单位：毫秒）
+        });
+      } else if (res.cancel) {
+        // 用户取消退出，做相应处理（可选）
+        console.log("用户取消退出");
+      }
+    },
+  });
+};
 
-	const menuItems = ref([{
-			icon: `${imgPath}static/userui/icon/zhhanghu.png`,
-			label: '订单明细',
-			link: '/pages/user/login/AccountDetails'
-		},
-		{
-			icon: `${imgPath}static/userui/icon/baoxiujilu.png`,
-			label: '故障反馈',
-			link: '/pages/user/login/TroubleReportUser?bikeCode=250306001002&orderCode=12039219893712864'
-		},
-		{
-			icon: `${imgPath}static/userui/icon/baoxiujilu.png`,
-			label: '报修记录',
-			link: '/pages/user/login/RepairReport'
-		},
-		{
-			icon: `${imgPath}static/userui/icon/shiminrenzheng.png`,
-			label: '微信登录',
-			link: '/pages/user/login/wx_login'
-		},
-		{
-			icon: `${imgPath}static/userui/icon/jilu.png`,
-			label: '申请还车记录',
-			link: '/pages/user/login/return-point-records'
-		},
-		{
-			icon: `${imgPath}static/userui/icon/helpinfo.png`,
-			label: '帮助中心',
-			link: '/pages/user/HelpPage/HelpPage'
-		},
-		{
-			icon: `${imgPath}static/userui/icon/helpinfo.png`,
-			label: '微信支付反馈',
-			link: '/pages/user/views/PaymentFeedback'
-		},
-		{
-			icon: `${imgPath}static/userui/icon/loginout.png`,
-			label: '账号注销',
-			link: '/pages/user/login/userLogout'
-		}
-	]);
-	// 退出登录的方法
-	const logout = () => {
-		uni.showModal({
-			title: '退出登录',
-			content: '是否确认退出并清除缓存？',
-			success: function(res) {
-				if (res.confirm) {
-					// 清除缓存
-					uni.clearStorage("wechat_user");
-
-					// 弹出成功提示
-					uni.showToast({
-						title: '退出成功', // 提示内容
-						icon: 'success', // 图标类型
-						duration: 2000 // 持续时间（单位：毫秒）
-					});
-
-				} else if (res.cancel) {
-					// 用户取消退出，做相应处理（可选）
-					console.log('用户取消退出');
-				}
-			}
-		});
-	}
-
-
-
-	const navigateTo = (link) => {
-
-		if (link == "") return;
-		uni.navigateTo({
-			url: link
-		});
-
-	}
+const navigateTo = (link) => {
+  if (link == "") return;
+  uni.navigateTo({
+    url: link,
+  });
+};
 </script>
 
 <style>
-	/* 容器 */
-	.container {
-		background-color: rgb(248, 248, 248);
-		height: 100vh;
-		/* 给容器添加内边距 */
-	}
+/* 容器 */
+.container {
+  background-color: rgb(248, 248, 248);
+  height: 100vh;
+  /* 给容器添加内边距 */
+}
 
-	/* 用户信息部分 */
-	.user-info {
-		display: flex;
-		margin-bottom: 20px;
-		/* 用户信息区域底部间距 */
-		align-items: center;
-	}
+/* 用户信息部分 */
+.user-info {
+  display: flex;
+  margin-bottom: 20px;
+  /* 用户信息区域底部间距 */
+  align-items: center;
+}
 
-	/* 用户头像 */
-	.user-avatar {
-		margin-right: 15px;
-		/* 头像与其他信息之间的间距 */
-	}
+/* 用户头像 */
+.user-avatar {
+  margin-right: 15px;
+  /* 头像与其他信息之间的间距 */
+}
 
-	.user-avatar image {
-		width: 50px;
-		height: 50px;
-		border-radius: 50%;
-	}
+.user-avatar image {
+  width: 50px;
+  height: 50px;
+  border-radius: 50%;
+}
 
-	/* 用户信息 */
-	.user-details {
-		display: flex;
-		flex-direction: column;
-	}
+/* 用户信息 */
+.user-details {
+  display: flex;
+  flex-direction: column;
+}
 
-	.nickname {
-		font-weight: bold;
-		font-size: 16px;
-	}
+.nickname {
+  font-weight: bold;
+  font-size: 16px;
+}
 
-	.phone-number {
-		color: #888;
-		font-size: 14px;
-	}
+.phone-number {
+  color: #888;
+  font-size: 14px;
+}
 
-	/* 账户明细部分 */
-	.account-details {
-		background-color: #f5f5f5;
-		padding: 15px;
-		border-radius: 8px;
-	}
+/* 账户明细部分 */
+.account-details {
+  background-color: #f5f5f5;
+  padding: 15px;
+  border-radius: 8px;
+}
 
-	.account-details .flex {
-		display: flex;
-		align-items: center;
-	}
+.account-details .flex {
+  display: flex;
+  align-items: center;
+}
 
-	.icon {
-		width: 30px;
-		height: 30px;
-		background-color: #ddd;
-		border-radius: 50%;
-		margin-right: 10px;
-	}
+.icon {
+  width: 30px;
+  height: 30px;
+  background-color: #ddd;
+  border-radius: 50%;
+  margin-right: 10px;
+}
 
-	.account-info {
-		font-size: 16px;
-		font-weight: bold;
-	}
+.account-info {
+  font-size: 16px;
+  font-weight: bold;
+}
 
-	.icon-container {
-		margin-right: 15px;
-	}
+.icon-container {
+  margin-right: 15px;
+}
 
-	.icon-size {
-		width: 15px;
-		height: 15px;
-	}
-</style>
\ No newline at end of file
+.icon-size {
+  width: 15px;
+  height: 15px;
+}
+</style>
diff --git a/ebike-user/pages/user/scan/inputcode.vue b/ebike-user/pages/user/scan/inputcode.vue
index 340f149..1c63c91 100644
--- a/ebike-user/pages/user/scan/inputcode.vue
+++ b/ebike-user/pages/user/scan/inputcode.vue
@@ -15,6 +15,7 @@
           :focus="focus"
           @input="changeInput"
           type="number"
+          @blur="focus = false"
           maxlength="6"
           style="height: 0; width: 0"
         />
@@ -143,6 +144,8 @@ function onTorch() {
 
 //订单
 function createRide() {
+  console.log();
+  
   addOrder(data, (res) => {});
 }
 </script>
diff --git a/ebike-user/pages/user/views/IdentityVerification.vue b/ebike-user/pages/user/views/IdentityVerification.vue
index 8e5cb00..286417f 100644
--- a/ebike-user/pages/user/views/IdentityVerification.vue
+++ b/ebike-user/pages/user/views/IdentityVerification.vue
@@ -1,159 +1,175 @@
 <template>
-	<view class="loginbox">
-		<view class="logintop flex justify-center align-center">
-			<image :src="`${imgPath}static/userui/kncxbj.png`" style="width: 100px; height: 100px;" />
-		</view>
-		<view class="input-fields padding">
-			<!-- 输入姓名 -->
-			<view class="input-item flex align-center">
-				<text class="cuIcon-peoplefill"
-					style="font-size: 20px; color: rgb(173,173,175);margin-right: 10px;"></text>
-				<input v-model="name" placeholder="请输入姓名" />
-			</view>
-			<!-- 输入身份证号 -->
-			<view class="input-item flex align-center">
-				<text class="cuIcon-card lg text-gray"
-					style="font-size: 20px; color: rgb(173,173,175);margin-right: 10px;"></text>
-				<input v-model="idCard" placeholder="请输入身份证号" />
-			</view>
-			<!-- 登录按钮 -->
-			<view class="flex flex-direction loginbotton">
-				<button @click="phonelogin" class="cu-btn lg bg-green text-white">
-					认证
-				</button>
-			</view>
-		</view>
-	</view>
-	<zero-loading v-if="isloading" color="#c1c1c0" type="wobble" mask="true"></zero-loading>
+  <view class="loginbox">
+    <view class="logintop flex justify-center align-center">
+      <image
+        :src="`${imgPath}static/userui/kncxbj.png`"
+        style="width: 100px; height: 100px"
+      />
+    </view>
+    <view class="input-fields padding">
+      <!-- 输入姓名 -->
+      <view class="input-item flex align-center">
+        <text
+          class="cuIcon-peoplefill"
+          style="font-size: 20px; color: rgb(173, 173, 175); margin-right: 10px"
+        ></text>
+        <input v-model="name" placeholder="请输入姓名" />
+      </view>
+      <!-- 输入身份证号 -->
+      <view class="input-item flex align-center">
+        <text
+          class="cuIcon-card lg text-gray"
+          style="font-size: 20px; color: rgb(173, 173, 175); margin-right: 10px"
+        ></text>
+        <input v-model="idCard" placeholder="请输入身份证号" />
+      </view>
+      <!-- 登录按钮 -->
+      <view class="flex flex-direction loginbotton">
+        <button @click="phonelogin" class="cu-btn lg bg-green text-white">
+          认证
+        </button>
+      </view>
+    </view>
+  </view>
+  <zero-loading
+    v-if="isloading"
+    color="#c1c1c0"
+    type="wobble"
+    mask="true"
+  ></zero-loading>
 </template>
 
 <script setup>
-	import {
-		ref
-	} from 'vue';
-	import * as api from '@/utils/api.js';
-	import {
-		showModelMessage,jkcBaseDecode,jkcBaseEncode
-	} from '@/utils/tools.js';
-	import config from '@/utils/config';
-	import {
-		onLoad
-	} from '@dcloudio/uni-app';
+import { ref } from "vue";
+import * as api from "@/utils/api.js";
+import {
+  showModelMessage,
+  jkcBaseDecode,
+  jkcBaseEncode,
+  showMessage,
+} from "@/utils/tools.js";
+import config from "@/utils/config";
+import { onLoad } from "@dcloudio/uni-app";
 
-	const imgPath = config.imgPath;
+const imgPath = config.imgPath;
 
-	const isloading = ref(false);
-	const name = ref(''); // 用于存储姓名
-	const idCard = ref(''); // 用于存储身份证号
-	const countdown = ref(60); // 设置倒计时时间为60秒
-	const onLoadData = ref({});
+const isloading = ref(false);
+const name = ref(""); // 用于存储姓名
+const idCard = ref(""); // 用于存储身份证号
+const countdown = ref(60); // 设置倒计时时间为60秒
+const onLoadData = ref({});
 
-	const oUser = JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user")));
+const oUser = JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user")));
 
-	onLoad((options) => {
-		if (options['number']) {
-			onLoadData.value['number'] = options['number']
-			onLoadData.value['_tbScancodeApproach_'] = options['_tbScancodeApproach_']
-		};
+onLoad((options) => {
+  if (options["number"]) {
+    onLoadData.value["number"] = options["number"];
+    onLoadData.value["_tbScancodeApproach_"] = options["_tbScancodeApproach_"];
+  }
+});
+const phonelogin = async () => {
+  if (!name.value || !idCard.value) {
+    showModelMessage("姓名和身份证号不能为空");
+    return;
+  }
+  const idCardRegex =
+    /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([12][0-9])|(3[01]))\d{3}(\d|X)$/; // 身份证号正则表达式
+  if (!idCardRegex.test(idCard.value)) {
+    showModelMessage("请输入有效的身份证号");
+    return;
+  }
+  // 如果验证通过，发起认证请求
+  isloading.value = true;
+  const { userId } = oUser;
+  const params = {
+    userId,
+    name: name.value,
+    idCard: idCard.value,
+  };
 
-	})
-	const phonelogin = async () => {
-		if (!name.value || !idCard.value) {
-			showModelMessage('姓名和身份证号不能为空');
-			return;
-		}
-		const idCardRegex =
-			/^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([12][0-9])|(3[01]))\d{3}(\d|X)$/; // 身份证号正则表达式
-		if (!idCardRegex.test(idCard.value)) {
-			showModelMessage('请输入有效的身份证号');
-			return;
-		}
-		// 如果验证通过，发起认证请求
-		isloading.value = true;
-		const {
-			userId
-		} = oUser;
-		const params = {
-			userId,
-			name: name.value,
-			idCard: idCard.value
-		}
-		api.callOrdereApi("ebikeUser/verifyRealName",params,"post").then(res=>{
-			const{message,code,data}=res;
-			if(code!=200){
-				showModelMessage(message);
-				return;
-			}
-			else{
-				showModelMessage("认证成功！");
-			}
-			isloading.value = false;
-			oUser.realNameStatus=true;
-			uni.setStorageSync('wechat_user', jkcBaseEncode(JSON
-				.stringify(oUser)));
-			// 假设成功认证后跳转
-			uni.navigateTo({
-				url: "/pages/user/home/home?number=" + onLoadData.value['number'] +
-					"&_tbScancodeApproach_=" + onLoadData.value[
-						'_tbScancodeApproach_']
-			});
-		})
-	};
+  api.callOrdereApi("ebikeUser/verifyRealName", params, "post").then((res) => {
+    console.log(res);
+    const { message, code, data } = res;
+    if (code != 200) {
+      showModelMessage(message);
+      return;
+    } else {
+      showMessage({
+        title: "认证成功",
+        icon: "success",
+        duration: 500,
+      });
+    }
+    isloading.value = false;
+    oUser.realNameStatus = true;
+    uni.setStorageSync("wechat_user", jkcBaseEncode(JSON.stringify(oUser)));
+    // 假设成功认证后跳转
+    setTimeout(() => {
+      uni.navigateTo({
+        url:
+          "/pages/user/home/home?number=" +
+          onLoadData.value["number"] +
+          "&_tbScancodeApproach_=" +
+          onLoadData.value["_tbScancodeApproach_"],
+      });
+    }, 500);
+  });
+};
 </script>
 
 <style scoped>
-	.loginbox {
-		height: 100vh;
-		background-color: #fff;
-	}
+.loginbox {
+  height: 100vh;
+  background-color: #fff;
+}
 
-	.logintop {
-		height: 280px;
-	}
+.logintop {
+  height: 280px;
+}
 
-	.input-fields {
-		margin-top: 20px;
-	}
+.input-fields {
+  margin-top: 20px;
+}
 
-	.input-item {
-		height: 45px;
-		margin-bottom: 30px;
-		position: relative;
-		background: rgb(246, 245, 248);
-		padding: 0px 15px;
-		border-radius: 20px;
-	}
+.input-item {
+  height: 45px;
+  margin-bottom: 30px;
+  position: relative;
+  background: rgb(246, 245, 248);
+  padding: 0px 15px;
+  border-radius: 20px;
+}
 
-	.input-field {
-		width: 100%;
-		padding: 10px;
-		border: 1px solid #ccc;
-		border-radius: 5px;
-	}
+.input-field {
+  width: 100%;
+  padding: 10px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+}
 
-	.get-code-text {
-		margin-left: 10px;
-		color: #4caf50;
-		font-size: 14px;
-		width: 40%;
-		cursor: pointer;
-		line-height: 40px;
-		text-align: right;
-	}
+.get-code-text {
+  margin-left: 10px;
+  color: #4caf50;
+  font-size: 14px;
+  width: 40%;
+  cursor: pointer;
+  line-height: 40px;
+  text-align: right;
+}
 
-	.get-code-text:disabled {
-		color: #ccc;
-	}
+.get-code-text:disabled {
+  color: #ccc;
+}
 
-	.get-code-text {
-		cursor: pointer;
-	}
+.get-code-text {
+  cursor: pointer;
+}
 
-	.loginbotton {
-		font-size: 14px;
-	}
+.loginbotton {
+  font-size: 14px;
+}
 
-	.is-input-border {
-		border: none;
-	}
-</style>
\ No newline at end of file
+.is-input-border {
+  border: none;
+}
+</style>
diff --git a/ebike-user/pages/user/views/OrderDetailsPage.vue b/ebike-user/pages/user/views/OrderDetailsPage.vue
index 18eef54..55b49b9 100644
--- a/ebike-user/pages/user/views/OrderDetailsPage.vue
+++ b/ebike-user/pages/user/views/OrderDetailsPage.vue
@@ -1,168 +1,158 @@
 <template>
-
-	<view >
-		<view style="height:60vh">
-			<map id="mapRef" ref="mapRef" style="width: 100%;height: 60vh;" show-location
-				:longitude="location.longitude" :latitude="location.latitude" :markers="markers" :scale="scale"
-				:polyline="polylines" />
-
-		</view>
-		<view v-if="showOrderPay"  style="height:30vh">
-			<bike-pay :orderId="orderData.orderId" /> 
-		</view>
-	</view>
+  <view>
+    <view style="height: 60vh">
+      <map
+        id="mapRef"
+        ref="mapRef"
+        style="width: 100%; height: 60vh"
+        show-location
+        :longitude="location.longitude"
+        :latitude="location.latitude"
+        :markers="markers"
+        :scale="scale"
+        :polyline="polylines"
+      />
+    </view>
+    <view v-if="showOrderPay" style="height: 30vh">
+      <bike-pay :orderId="orderData.orderId" />
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		onMounted,
-		getCurrentInstance
-	} from 'vue';
-	import {
-		showModelMessage,
-		getUrlParams,
-		jkcBaseDecode
-	} from "@/utils/tools.js";
-	import {
-		callOrdereApi,
-		callOperateApi
-	} from "@/utils/api.js";
+import { ref, onMounted, getCurrentInstance } from "vue";
+import {
+  showModelMessage,
+  getUrlParams,
+  jkcBaseDecode,
+} from "@/utils/tools.js";
+import { callOrdereApi, callOperateApi } from "@/utils/api.js";
 
-	import {
-		findIndex
-	} from 'lodash';
-	import config from '@/utils/config';
-	import {
-		onShow,
-		onUnload,
-		onLoad
-	} from "@dcloudio/uni-app";
-	import * as map from "@/utils/usermap.js"; 
+import { findIndex } from "lodash";
+import config from "@/utils/config";
+import { onShow, onUnload, onLoad } from "@dcloudio/uni-app";
+import * as map from "@/utils/usermap.js";
+import AMapWX from "@/utils/amap-wx.130.js";
 
-	const location = ref({
-		longitude: "",
-		latitude: ""
-	});
-	const scale = ref(15);
-	const markers = ref([]); 
-	const polylines = ref([]); //线 
-	const pointStart = 100000000000;
-	const pointEnd = 100000000001;
+const location = ref({
+  longitude: "",
+  latitude: "",
+});
+const scale = ref(15);
+const markers = ref([]);
+const polylines = ref([]); //线
+const pointStart = 100000000000;
+const pointEnd = 100000000001;
 
-	let oMap = null; 
-	let oUser = null; 
-	const showOrder = ref(false);
-	const order = ref({});
-	onLoad((options) => {
-		if (options.orderId) {
-			orderData.orderId = options.orderId;
-		}
+let oMap = null;
+let oUser = null;
+const showOrder = ref(false);
+const order = ref({});
+onLoad((options) => {
+  if (options.orderId) {
+    orderData.orderId = options.orderId;
+  }
+});
+//订单信息
+let orderData = {
+  bikeCode: null,
+  status: null,
+  createdAt: null,
+  orderId: null,
+};
+const showOrderPay = ref(false);
+//车辆
+let arrBikeData = [];
+const bikeData = ref({});
+const getInfoOrderData = () => {
+  callOrdereApi(
+    "userOrders/orderDetailsInfo?orderId=" + orderData.orderId,
+    {},
+    "get"
+  ).then((res) => {
+    if (res.code == 200) {
+      orderData = res.data;
+      getTracking();
+    }
+  });
+};
 
-	})
-	//订单信息
-	let orderData = {
-		bikeCode: null,
-		status: null,
-		createdAt: null,
-		orderId: null
-	};  
-	const showOrderPay = ref(false);
-	//车辆
-	let arrBikeData = []; 
-	const bikeData = ref({});
-	const getInfoOrderData = () => {
-		callOrdereApi("userOrders/orderDetailsInfo?orderId=" + orderData.orderId, {}, "get").then(res => {
-			if (res.code == 200) {
-				orderData = res.data;
-				getTracking();
-			}
-		})
-	}
+//显示订单
+function openOrderPay() {
+  showOrderPay.value = true;
+}
 
-	//显示订单
-	function openOrderPay() { 
-		showOrderPay.value = true;
-	}
+//轨迹
+function getTracking() {
+  const { bikeCode, createdAt, ridePoint, returnPoint, endTime } = orderData;
+  let params = {
+    ebikeCode: bikeCode,
+    startTime: createdAt,
+  };
+  if (endTime)
+    params = {
+      ...params,
+      endTime,
+    };
 
-	//轨迹
-	function getTracking() {
-		const {
-			bikeCode,
-			createdAt,
-			ridePoint,
-			returnPoint,
-			endTime
-		} = orderData;
-		let params = {
-			ebikeCode: bikeCode,
-			startTime: createdAt
-		}
-		if (endTime) params = {
-			...params,
-			endTime
-		}
-		callOperateApi("ebikeTracking/query", params, "post").then(res => {
-			const {
-				code,
-				data,
-				message
-			} = res;
-			if (code != 200) {
-				return;
-			}
-		
-			const arrPoints = (!data || data.length == 0) ? [] : data.map(item => {
-				const {
-					lngGCJ02,
-					latGCJ02
-				} = item;
-				return {
-					longitude: lngGCJ02,
-					latitude: latGCJ02
-				}
-			});
+  console.log(params, "params");
 
-			const startPoint = ridePoint.split(",");
-			const lng = startPoint[0];
-			const lat = startPoint[1];
-			const start = {
-				longitude: lng,
-				latitude: lat
-			}
-			location.value.latitude = lat;
-			location.value.longitude = lng; 
-			const arrMakers = markers.value || [];
-			arrPoints.splice(0, 0, start);
-			let indexStart = findIndex(arrMakers, {
-				pointStart
-			});
-			indexStart = indexStart == -1 ? arrMakers.length : indexStart; 
-			arrMakers[indexStart] = map.addMarker(pointStart, lng, lat, "start.png");
-			if (data && data.length > 0) {
-				let {
-					lngGCJ02: endlng,
-					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)];
-			}
-		})
-	}  
-	onMounted(() => {
-		const instance = getCurrentInstance();
-		oMap = uni.createMapContext("mapRef", {
-			this: instance.proxy
-		}); 
-		getInfoOrderData();
-		openOrderPay();
-	}) 
+  callOperateApi("ebikeTracking/query", params, "post").then((res) => {
+    const { code, data, message } = res;
+    if (code != 200) {
+      return;
+    }
+
+    const arrPoints =
+      !data || data.length == 0
+        ? []
+        : data.map((item) => {
+            const { lngGCJ02, latGCJ02 } = item;
+            return {
+              longitude: lngGCJ02,
+              latitude: latGCJ02,
+            };
+          });
+
+    const startPoint = ridePoint.split(",");
+    const lng = startPoint[0];
+    const lat = startPoint[1];
+    const start = {
+      longitude: lng,
+      latitude: lat,
+    };
+    location.value.latitude = lat;
+    location.value.longitude = lng;
+    const arrMakers = markers.value || [];
+    arrPoints.splice(0, 0, start);
+    let indexStart = findIndex(arrMakers, {
+      pointStart,
+    });
+    indexStart = indexStart == -1 ? arrMakers.length : indexStart;
+    arrMakers[indexStart] = map.addMarker(pointStart, lng, lat, "start.png");
+    if (data && data.length > 0) {
+      let { lngGCJ02: endlng, 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)];
+    }
+  });
+}
+onMounted(() => {
+  const instance = getCurrentInstance();
+  oMap = uni.createMapContext("mapRef", {
+    this: instance.proxy,
+  });
+  getInfoOrderData();
+  openOrderPay();
+});
 </script>
 
-<style scoped>
-   
-    
-</style>
\ No newline at end of file
+<style scoped></style>
diff --git a/ebike-user/utils/request.js b/ebike-user/utils/request.js
index 11a9663..37629aa 100644
--- a/ebike-user/utils/request.js
+++ b/ebike-user/utils/request.js
@@ -7,9 +7,11 @@ import {
 	getUrlParams
 } from './tools';
 
-export const HttpRequest = function(url, method, data) {
+export const HttpRequest = function (url, method, data) {
 	return new Promise((resolve, reject) => {
 		const token = getCache('token');
+		console.log(token, 'token');
+
 		let _header = {}
 		if (url.includes("/auth/loginByPwd") || url.includes("/auth/logout")) {
 			_header = {
@@ -39,7 +41,7 @@ export const HttpRequest = function(url, method, data) {
 				url = nurl;
 			} else {
 				let nurl = url;
-				if(data){
+				if (data) {
 					if (Object.keys(data).length > 0) {
 						nurl = url + "?";
 					}
@@ -95,25 +97,25 @@ export const HttpRequest = function(url, method, data) {
 }
 
 
-export const HttpFileUpload = function(url,file) {
+export const HttpFileUpload = function (url, file) {
 	return new Promise((resolve, reject) => {
-		 uni.uploadFile({
-		    url: url ,
-		    filePath: file.path, // 选择的文件路径
-		    name: 'multipartFile', // 后端接收文件时的字段名，通常是 'file'
-		    formData: { 
-		    },
-		    success: (res) => { 
-		      if (res.statusCode == 200) { //成功
-		      	resolve(JSON.parse(res.data));
-		      } else { //失败 
-		      	reject(res);
-		      }
-		    },
-		    fail: (err) => {
-		      console.log('上传失败:', err);
-		    }
-		  });
+		uni.uploadFile({
+			url: url,
+			filePath: file.path, // 选择的文件路径
+			name: 'multipartFile', // 后端接收文件时的字段名，通常是 'file'
+			formData: {
+			},
+			success: (res) => {
+				if (res.statusCode == 200) { //成功
+					resolve(JSON.parse(res.data));
+				} else { //失败 
+					reject(res);
+				}
+			},
+			fail: (err) => {
+				console.log('上传失败:', err);
+			}
+		});
 	})
 
 }
\ No newline at end of file
diff --git a/ebike-user/utils/usermap.js b/ebike-user/utils/usermap.js
index 65dd497..fabc154 100644
--- a/ebike-user/utils/usermap.js
+++ b/ebike-user/utils/usermap.js
@@ -97,6 +97,11 @@ export function addOrder(bikeCode, jumpFlag, callback) {
 }
 
 function saveRide(params, icnt, jumpFlag, callback) {
+	if (icnt === 1) {
+		uni.showLoading({
+			title: '正在处理中...',
+		});
+	}
 	callOrdereApi("userOrders/saveRide", params, "post").then(res => {
 		const {
 			code,
@@ -108,9 +113,11 @@ function saveRide(params, icnt, jumpFlag, callback) {
 				return;
 			}
 			showModelMessage(message);
+			uni.hideLoading()
 			if (callback) callback(false);
 			return;
 		}
+		uni.hideLoading()
 		if (callback) callback(true);
 		if (jumpFlag) {
 			setTimeout(() => {
@@ -119,7 +126,11 @@ function saveRide(params, icnt, jumpFlag, callback) {
 				})
 			}, 1000)
 		}
-	})
+	}).catch(err => {
+		uni.hideLoading();
+		showModelMessage("服务异常，请稍后再试");
+		if (callback) callback(false);
+	});
 }
 
 //添加面