From 2a9de15785f97883430a9c7f4d6eaa92276aab72 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Fri, 11 Apr 2025 18:23:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=B5=E5=8A=A8=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.interceptor.js                   |    2 +-
 components/tab-bar/tab-bar.vue               |   22 +-
 page_fenbao/index.vue                        |    2 +-
 page_fenbao/renlian.vue                      |    4 +-
 page_fenbao/storedlist/trueorder.vue         | 1013 +++++++++++-------
 page_shanghu/gongzuotai/AccountDetails.vue   |    8 +-
 page_shanghu/gongzuotai/ChargingTemplate.vue |    2 +-
 page_shanghu/gongzuotai/shgl.vue             |   17 +-
 page_shanghu/gongzuotai/woke_deviceMgmt.vue  |    7 +
 page_shanghu/guanli/admin_order.vue          |    4 +-
 page_shanghu/guanli/bike_track.vue           |    6 +-
 page_shanghu/guanli/device_detail.vue        |  633 ++++++-----
 page_shanghu/guanli/order_detail.vue         |    9 +-
 page_shanghu/guanli/yunying.vue              |   28 +-
 page_user/guzhang/index.vue                  |  149 ++-
 page_user/hcshenhe.vue                       |  144 ++-
 page_user/huanbike.vue                       |  108 +-
 page_user/returnbike.vue                     |    3 +-
 page_user/shiming.vue                        |   52 +-
 page_user/yijian.vue                         |   50 +-
 pages/index/index.vue                        |    4 +-
 pages/login/login.vue                        |   13 +-
 pages/my.vue                                 |   32 +-
 pages/myorder/returned/index.vue             |  137 +--
 pages/nearbystores/index.vue                 |  911 +++++++++++-----
 25 files changed, 2199 insertions(+), 1161 deletions(-)

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index df58bbc..c0b1ffe 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -1,7 +1,7 @@
 const install = (Vue, vm) => {
     uni.setStorageSync('deptId', 100);
     Vue.prototype.$u.http.setConfig({
-        // baseUrl: 'http://192.168.2.35:4101', //键辉本地
+        // baseUrl: 'http://192.168.2.46:4101', //键辉本地
 		// baseUrl: 'http://192.168.0.102:4101', //景森本地
         baseUrl: 'https://ele.ccttiot.com/prod-api', //线上
         loadingText: '努力加载中~',  
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index 1030c1f..b447168 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -23,8 +23,8 @@
 			<!-- 地图 -->
 		</div>
 		<div  @tap.stop="changeTabbar(2)">
-			<image style="width: 102rpx;height: 102rpx;position: fixed;left: 50%;transform: translateX(-50%);bottom:130rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uL8iMlSwXNfldMjGZK7n" mode="" v-show="indexs!=2"></image>
-			<image style="width: 102rpx;height: 102rpx;position: fixed;left: 50%;transform: translateX(-50%);bottom:130rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uL8iMlSwXNfldMjGZK7n" mode="" v-show="indexs==2"></image>
+			<image style="width: 102rpx;height: 102rpx;position: fixed;left: 50%;transform: translateX(-50%);bottom:98rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uPWK1kW1mCc2CPVyO7JM" mode="" v-show="indexs!=2"></image>
+			<image style="width: 102rpx;height: 102rpx;position: fixed;left: 50%;transform: translateX(-50%);bottom:98rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uPWK1kW1mCc2CPVyO7JM" mode="" v-show="indexs==2"></image>
 			<div class="txt" style="margin-top: 60rpx;color: #979797;font-size: 26rpx;color: #808080;">扫码用车</div>
 		</div> 
 		<div class="tab" @tap.stop="changeTabbar(3)">
@@ -158,9 +158,21 @@
 							this.sn = getQueryParam(decodedValue, 's')
 							this.$u.get(`/app/device/availableDetail?sn=${this.sn}`).then((res) => {
 								  if (res.code == 200) {
-									  this.modelId = res.data.modelId
-									  uni.navigateTo({
-									  	url:'/page_fenbao/storedlist/trueorder?modelId=' + this.modelId + '&sn=' + this.sn
+									  if(res.data){
+										  this.modelId = res.data.modelId
+										  uni.navigateTo({
+										  	url:'/page_fenbao/storedlist/trueorder?modelId=' + this.modelId + '&sn=' + this.sn
+										  })
+									  }else{
+										  uni.showToast({
+										  	title: '当前车辆不可用',
+										  	icon: 'none'
+										  })
+									  }
+								  }else{
+									  uni.showToast({
+									  	title: res.msg,
+									  	icon: 'none'
 									  })
 								  }
 							})
diff --git a/page_fenbao/index.vue b/page_fenbao/index.vue
index f473862..183f970 100644
--- a/page_fenbao/index.vue
+++ b/page_fenbao/index.vue
@@ -44,7 +44,7 @@
 							})
 						}else{
 							uni.showToast({
-								title:'车辆暂不可用',
+								title:'当前车辆不可用',
 								icon: 'none',
 								duration:2000
 							})
diff --git a/page_fenbao/renlian.vue b/page_fenbao/renlian.vue
index b042c86..b0e9450 100644
--- a/page_fenbao/renlian.vue
+++ b/page_fenbao/renlian.vue
@@ -20,9 +20,7 @@
              handleGetMessage:function(e){
              	console.log(e)
              	if(e.detail.data[0].result == 'success'){
-             		uni.redirectTo({
-             			url:'/page_fenbao/renlianzhongzhuan'
-             		})
+             		uni.navigateBack()
              	}
              },
 			 
diff --git a/page_fenbao/storedlist/trueorder.vue b/page_fenbao/storedlist/trueorder.vue
index fcfbc59..5042202 100644
--- a/page_fenbao/storedlist/trueorder.vue
+++ b/page_fenbao/storedlist/trueorder.vue
@@ -1,35 +1,39 @@
 <template>
 	<view class="page">
-		<u-navbar :title="tit" :border-bottom="false" :background="bgc" back-icon-color="#3D3D3D" title-color='#3D3D3D'
+		<u-navbar title="确认订单页" :border-bottom="false" :background="bgc" back-icon-color="#3D3D3D" title-color='#3D3D3D'
 			title-size='36' height='50' id="navbar" :custom-back="btnfh">
 		</u-navbar>
-        <view class="jieshao">
-        	<view class="lt">
-        		<view class="name">
-        			车牌号：{{bikeobj.vehicleNum == null ? '--' : bikeobj.vehicleNum}}
-        		</view>
+		<view class="jieshao">
+			<view class="lt">
+				<view class="name">
+					车牌号：{{bikeobj.vehicleNum == null ? '--' : bikeobj.vehicleNum}}
+				</view>
 				<!-- <view class="biaoqian">
 					<view class="" v-for="(item,index) in bqlist" :key="index">
 						{{item}}
 					</view>
 				</view> -->
-				<view class="" style="margin-top: 10rpx;">
-					归属运营区：{{bikeobj.areaName == null ? '--' : bikeobj.areaName}} 
-				</view>
-				<view class="" style="margin-top: 10rpx;">
+				<view class="" style="margin-top: 10rpx;color: #ccc;font-size: 24rpx;">
 					车辆SN：{{bikeobj.sn == null ? '--' : bikeobj.sn}}
 				</view>
+				<!-- <view class="" style="margin-top: 10rpx;">
+					归属运营区：{{bikeobj.areaName == null ? '--' : bikeobj.areaName}}
+				</view> -->
+				
 				<view class="" style="margin-top: 10rpx;">
-					车辆电量：{{bikeobj.remainingPower == null ? '--' : bikeobj.remainingPower + '%'}} 
+					电量：{{bikeobj.remainingPower == null ? '--' : bikeobj.remainingPower + '%'}}
+					<view class="speed">
+						<view class="speeds" :style="{ width: bikeobj.remainingPower + '%' }"></view>
+					</view>
 				</view>
 				<view class="" style="margin-top: 10rpx;">
-					车辆续航：{{bikeobj.remainEndurance == null ? '--' : bikeobj.remainEndurance + 'KM'}}
+					续航：{{bikeobj.remainEndurance == null ? '--' : bikeobj.remainEndurance + 'KM'}}
 				</view>
-        	</view>
+			</view>
 			<view class="rt">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uK5bAmrXLEHVxbH6FcFD" mode=""></image>
 			</view>
-        </view>
+		</view>
 		<view class="quche" v-if="false">
 			<view class="name">
 				自行前往门店
@@ -55,10 +59,11 @@
 				<view class="rt">
 					<view class="one">
 						<view class="qtime">
-							2024年09月04日 16:00 
+							2024年09月04日 16:00
 						</view>
 						<view class="gtime">
-							更改时间 <image src="https://api.ccttiot.com/smartmeter/img/static/uX3GfXzwzS4GY1J55raG" mode=""></image>
+							更改时间 <image src="https://api.ccttiot.com/smartmeter/img/static/uX3GfXzwzS4GY1J55raG"
+								mode=""></image>
 						</view>
 					</view>
 					<view class="two">
@@ -71,7 +76,9 @@
 						<view class="shuom">
 							取车后开始计算订单时长
 						</view>
-						<image @click="btndaohang" src="https://api.ccttiot.com/smartmeter/img/static/uqn6bQ0cKfT7YpZLzJSc" class="img" mode=""></image>
+						<image @click="btndaohang"
+							src="https://api.ccttiot.com/smartmeter/img/static/uqn6bQ0cKfT7YpZLzJSc" class="img"
+							mode=""></image>
 					</view>
 					<view class="thr">
 						<view class="time">
@@ -87,13 +94,16 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="zcfangan">
 			<view class="name">
 				选择套餐
 			</view>
 			<view class="fanganlist">
-				<view style="display: flex;justify-content: space-between;align-items: center;padding: 20rpx;box-sizing: border-box;" v-for="(item,index) in taocanlist" :key="index" :class="['fanganlist_item', fanganindex == index ? 'gaoliang' : '']" @click="btnfa(index,item)" >
+				<view
+					style="display: flex;justify-content: space-between;align-items: center;padding: 20rpx;box-sizing: border-box;"
+					v-for="(item,index) in taocanlist" :key="index"
+					:class="['fanganlist_item', fanganindex == index ? 'gaoliang' : '']" @click="btnfa(index,item)">
 					<view class="">
 						<view class="shi">
 							{{item.name}}
@@ -104,12 +114,14 @@
 					</view>
 					<view class="">
 						<view class="">
-							起步价格：{{'￥' + item.startRule.startingPrice}}（含{{item.startRule.startingTime}} <text v-if="item.rentalUnit == 'hours'">小时</text><text v-else>分钟</text> ）
+							起步价格：{{'￥' + item.startRule.startingPrice}}（含{{item.startRule.startingTime}} <text
+								v-if="item.rentalUnit == 'hours'">小时</text><text v-else>分钟</text> ）
 						</view>
-                        <view class="">
-                        	超出价格：{{'￥' + item.startRule.timeoutPrice}}（每{{item.startRule.timeoutTime}} <text v-if="item.rentalUnit == 'hours'">小时</text><text v-else>分钟</text>）
-                        </view>
-  					</view>
+						<view class="">
+							超出价格：{{'￥' + item.startRule.timeoutPrice}}（每{{item.startRule.timeoutTime}} <text
+								v-if="item.rentalUnit == 'hours'">小时</text><text v-else>分钟</text>）
+						</view>
+					</view>
 				</view>
 				<view class="wei" v-if="taocanlist.length == 0">
 					当前车辆未配置套餐
@@ -148,9 +160,9 @@
 					.......................................................
 				</view>
 				<view class="huan">
-						<view class="">
-							还车后
-						</view>	
+					<view class="">
+						还车后
+					</view>
 				</view>
 			</view>
 			<view class="tuihuan">
@@ -247,10 +259,11 @@
 				</view>
 			</view>
 		</view>
-        <view class="zhifu">
-        	<view class="xieyi">
-        	    <u-checkbox v-model="checked" shape="circle"></u-checkbox>已阅读并同意<text @click="btnxy(2)">《电动车租赁协议》</text><text @click="btnxy(3)">《享权须知》</text>
-        	</view>
+		<view class="zhifu">
+			<view class="xieyi">
+				<u-checkbox v-model="checked" shape="circle"></u-checkbox>已阅读并同意<text
+					@click="btnxy(2)">《电动车租赁协议》</text><text @click="btnxy(3)">《享权须知》</text>
+			</view>
 			<view class="bot">
 				<view class="lt">
 					<view class="money">
@@ -267,7 +280,7 @@
 					支付
 				</view>
 			</view>
-        </view>
+		</view>
 		<view class="mingxitc" v-if="!mxflag">
 			<view class="title">
 				订单明细
@@ -285,13 +298,24 @@
 		<view class="mask" v-if="!mxflag"></view>
 		<view class="logotc" v-if="logoflag">
 			<view class="imgbox">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/uQkjyQiBXFErIeRf0Oi8" mode=""></image>
+				<view class="ts">
+					温馨提示
+				</view>
+				<view class="cont">
+					您当前未登录，是否登录？
+				</view>
+				<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
+					style="margin-top: 30rpx;">
+					快捷登录
+				</button>
+				<view class="zb" @click="logoflag = false">
+					暂不登录
+				</view>
 			</view>
-			<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
-				style="margin-top: 30rpx;">
-				快捷登录
-			</button>
 		</view>
+		
+		<view style="width: 100%;height: 100vh;position: fixed;top: 0;left: 0;background-color: #fff;z-index: 99;" v-if="zhezhaoflag"></view>
+		
 	</view>
 </template>
 <script>
@@ -299,307 +323,439 @@
 	export default {
 		data() {
 			return {
-                bgc: {
-                	backgroundColor: "#CCE5FF",
-                },
-				bqlist:['含电池','含头盔','含充电器','含瓶装水','含竹篮'],
-				fanganindex:0,
-				zutime:1,
-				checked:false,
-				mxflag:true,
-				modelId:'',
-				taocanlist:[],
-				chesn:'',
-				bikeobj:{},
-				yucun:'',
-				suitId:'',
-				yucobj:{},
-				channelId:'',
-				sn:'',
-				tit:'确认订单页',
-				logoflag:false,
-				devicesarr:[],
-				ver_dataflag:1,
-				deviceId:'',
-				name:'',
-				mac:''
+				bgc: {
+					backgroundColor: "#CCE5FF",
+				},
+				bqlist: ['含电池', '含头盔', '含充电器', '含瓶装水', '含竹篮'],
+				fanganindex: 0,
+				zutime: 1,
+				checked: false,
+				mxflag: true,
+				modelId: '',
+				taocanlist: [],
+				chesn: '',
+				bikeobj: {},
+				yucun: '',
+				suitId: '',
+				yucobj: {},
+				channelId: '',
+				sn: '',
+				tit: '',
+				logoflag: false,
+				devicesarr: [],
+				ver_dataflag: 1,
+				deviceId: '',
+				name: '',
+				mac: '',
+				zhezhaoflag:true
 			}
 		},
 		onLoad(option) {
-			wx.openBluetoothAdapter({
-			  success: function (res) {
-			    console.log('蓝牙适配器初始化成功')
-				xBlufi.initXBlufi(1)
-				xBlufi.notifyStartDiscoverBle({'isStart': true})
-				xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
-			  },
-			  fail: function (err) {
-			    console.error('蓝牙适配器初始化失败，可能是因为没有权限', err)
-			  }
-			})
 			console.log(option)
-		   if(option.modelId){
-			   this.modelId = option.modelId
-			   this.chesn = option.sn
-			   this.gettaocan()
-			   this.getcheliang()
-		   }else{
-			   // 判断是用户直接从微信扫描二维码进来
-			   function getQueryParam(url, paramName) {
-			   	let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
-			   	let results = regex.exec(url)
-			   	return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
-			   }
-			   let sceneValue = option.q
-			   let decodedValue = decodeURIComponent(sceneValue)
-			   this.sn = getQueryParam(decodedValue, 's')
-			   this.$u.get(`/app/device/availableDetail?sn=${this.sn}`).then((res) => {
-			   	  if (res.code == 200) {
-			   	      this.bikeobj = res.data
-					  this.modelId = res.data.modelId
-					  this.gettaocan()
-					  this.getcheliang()
-			   	  }
-			   })
-		   }
+			if (option.modelId) {
+				this.zhezhaoflag = false
+				this.modelId = option.modelId
+				this.chesn = option.sn
+				this.gettaocan()
+				this.getcheliang()
+			} else {
+				this.zhezhaoflag = true
+				uni.showLoading({
+					title: '加载中...',
+					mask: true
+				})
+				this.$u.get("/app/orderDevice/mineUsing").then((res) => {
+					if (res.code == 200) {
+						if (res.data) {
+							uni.switchTab({
+								url:'/pages/nearbystores/index'
+							})
+							this.zhezhaoflag = false
+							uni.hideLoading()
+						} else {
+							this.zhezhaoflag = false
+							uni.hideLoading()
+							// 判断是用户直接从微信扫描二维码进来
+							function getQueryParam(url, paramName) {
+								let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
+								let results = regex.exec(url)
+								return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
+							}
+							let sceneValue = option.q
+							let decodedValue = decodeURIComponent(sceneValue)
+							this.sn = getQueryParam(decodedValue, 's')
+							this.$u.get(`/app/device/availableDetail?sn=${this.sn}`).then((res) => {
+								if (res.code == 200) {
+									if (res.data) {
+										this.bikeobj = res.data
+										this.modelId = res.data.modelId
+										this.gettaocan()
+										this.getcheliang()
+									} else {
+										uni.showToast({
+											title: '当前车辆不可用',
+											icon: 'none',
+											duration: 2000
+										})
+										setTimeout(() => {
+											if (this.chesn == '') { //判断是直接从微信扫码进来的点击返回回到首页
+												uni.switchTab({
+													url: '/pages/nearbystores/index'
+												})
+											} else { //不是则返回上一级
+												uni.navigateBack()
+											}
+										}, 1500)
+									}
+								}
+							})
+						}
+					}else{
+						this.zhezhaoflag = false
+						uni.hideLoading()
+						// 判断是用户直接从微信扫描二维码进来
+						function getQueryParam(url, paramName) {
+							let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
+							let results = regex.exec(url)
+							return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
+						}
+						let sceneValue = option.q
+						let decodedValue = decodeURIComponent(sceneValue)
+						this.sn = getQueryParam(decodedValue, 's')
+						this.$u.get(`/app/device/availableDetail?sn=${this.sn}`).then((res) => {
+							if (res.code == 200) {
+								if (res.data) {
+									this.bikeobj = res.data
+									this.modelId = res.data.modelId
+									this.gettaocan()
+									this.getcheliang()
+								} else {
+									uni.showToast({
+										title: '当前车辆不可用',
+										icon: 'none',
+										duration: 2000
+									})
+									setTimeout(() => {
+										if (this.chesn == '') { //判断是直接从微信扫码进来的点击返回回到首页
+											uni.switchTab({
+												url: '/pages/nearbystores/index'
+											})
+										} else { //不是则返回上一级
+											uni.navigateBack()
+										}
+									}, 1500)
+								}
+							}
+						})
+					}
+				})
+			}
 		},
 		methods: {
 			// 点击跳转到协议
-			btnxy(num){
+			btnxy(num) {
 				uni.navigateTo({
-					url:'/page_user/wenzhang?num=' + num
+					url: '/page_user/wenzhang?num=' + num
 				})
 			},
 			// 点击控制返回
-			btnfh(){
-				if(this.chesn == ''){ //判断是直接从微信扫码进来的点击返回回到首页
+			btnfh() {
+				if (this.chesn == '') { //判断是直接从微信扫码进来的点击返回回到首页
 					uni.switchTab({
-						url:'/pages/index/index'
+						url: '/pages/index/index'
 					})
-				}else{ //不是则返回上一级
+				} else { //不是则返回上一级
 					uni.navigateBack()
 				}
 			},
 			// 点击进行支付
-			btnzhifu(){
-				if(this.bikeobj.areaAuthentication == true){ //判断是否需要实名认证
-					this.$u.get("/getInfo").then(res =>{
-						if(res.code == 200){
-							if(res.user.isReal == false){ //未实名需要去实名才能进行下单
+			btnzhifu() {
+				if (this.bikeobj.areaAuthentication == true) { //判断是否需要实名认证
+					this.$u.get("/getInfo").then(res => {
+						if (res.code == 200) {
+							if (res.user.isReal == false) { //未实名需要去实名才能进行下单
 								uni.showModal({
 									title: '提示',
 									content: '您当前还未实名认证，是否前去实名认证？',
 									showCancel: true,
-									success: function (res) {
+									success: function(res) {
 										if (res.confirm) {
-											uni.reLaunch({
-												url:'/page_user/shiming'
+											uni.navigateTo({
+												url: '/page_user/shiming'
 											})
 										} else if (res.cancel) {
-											uni.switchTab({
-												url:'/pages/index/index'
-											})
+
 										}
 									}
 								})
+							}else{
+								if (this.checked == false) {
+									let that = this
+									uni.showModal({
+										title: '提示',
+										content: '《电动车租赁协议》《享权须知》您是否已阅读并同意？',
+										showCancel: true,
+										success: function(res) {
+											if (res.confirm) {
+												that.checked = true
+												uni.showLoading({
+													title: '加载中...',
+													mask: true
+												})
+												that.$u.get(`/app/channel/list?appId=${that.$store.state.appid}`).then((
+												res) => {
+													if (res.code == 200) {
+														that.channelId = res.data[0].channelId
+														that.getzf()
+													} else if (res.code == 401) {
+														uni.hideLoading()
+														that.logoflag = true
+													} else {
+														uni.showToast({
+															title: res.msg,
+															icon: 'none',
+															duration: 2000
+														})
+													}
+												})
+											} else if (res.cancel) {
+												console.log('取消') // 用户点击取消
+											}
+										}
+									})
+								} else {
+									uni.showLoading({
+										title: '加载中...',
+										mask: true
+									})
+									this.$u.get(`/app/channel/list?appId=${this.$store.state.appid}`).then((res) => {
+										if (res.code == 200) {
+											this.channelId = res.data[0].channelId
+											this.getzf()
+										} else if (res.code == 401) {
+											uni.hideLoading()
+											this.logoflag = true
+										} else {
+											uni.showToast({
+												title: res.msg,
+												icon: 'none',
+												duration: 2000
+											})
+										}
+									})
+								}
 							}
+						}else if(res.code == 401){
+							this.logoflag = true
 						}
 					})
-				}else if(this.checked == false){
+				} else if (this.checked == false) {
 					let that = this
 					uni.showModal({
 						title: '提示',
 						content: '《电动车租赁协议》《享权须知》您是否已阅读并同意？',
 						showCancel: true,
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								that.checked = true
 								uni.showLoading({
-								  title: '加载中...', 
-								  mask: true         
+									title: '加载中...',
+									mask: true
 								})
-								that.$u.get(`/app/channel/list?appId=${that.$store.state.appid}`).then((res) => {
+								that.$u.get(`/app/channel/list?appId=${that.$store.state.appid}`).then((
+								res) => {
 									if (res.code == 200) {
-									    that.channelId = res.data[0].channelId
+										that.channelId = res.data[0].channelId
 										that.getzf()
-									}else{
+									} else if (res.code == 401) {
 										uni.hideLoading()
+										that.logoflag = true
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 2000
+										})
 									}
 								})
 							} else if (res.cancel) {
-							    console.log('取消') // 用户点击取消
+								console.log('取消') // 用户点击取消
 							}
 						}
 					})
-				}else{
+				} else {
 					uni.showLoading({
-					  title: '加载中...', 
-					  mask: true         
+						title: '加载中...',
+						mask: true
 					})
 					this.$u.get(`/app/channel/list?appId=${this.$store.state.appid}`).then((res) => {
 						if (res.code == 200) {
-						    this.channelId = res.data[0].channelId
+							this.channelId = res.data[0].channelId
 							this.getzf()
-						}else{
+						} else if (res.code == 401) {
 							uni.hideLoading()
+							this.logoflag = true
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							})
 						}
 					})
 				}
 			},
-			
+
 			// 下单
-			getzf(){
+			getzf() {
 				let data = {
-					deviceId:this.bikeobj.id,
-					suitId:this.suitId,
-					price:this.yucobj
+					deviceId: this.bikeobj.id,
+					suitId: this.suitId,
+					price: this.yucobj,
+					appId: this.$store.state.appid,
+					channelId: this.channelId
 				}
-				this.$u.post(`/app/order`,data).then((resp) => {
+				uni.showLoading({
+					title: '加载中...',
+					mask: true
+				})
+				this.$u.post(`/app/order`, data).then((resp) => {
 					if (resp.code == 200) {
-						if(this.yucun == 0){
-							uni.switchTab({
-								url:'/pages/myorder/returned/index'
-							})
-						}else{
-							let datas = {
-								no:resp.data.no,
-								appId:this.$store.state.appid,
-								channelId:this.channelId
-							}
-							this.$u.post(`/app/order/pay`,datas).then((respb) => {
-								if (respb.code == 200) {
-								    uni.requestPayment({
-								    	provider: 'wxpay',
-								    	timeStamp: respb.data.payParams.timeStamp,
-								    	nonceStr: respb.data.payParams.nonceStr,
-								    	package: respb.data.payParams.packageVal,
-								    	signType: respb.data.payParams.signType,
-								    	paySign: respb.data.payParams.paySign,
-								    	success: (respc) => {
-											uni.showLoading({
-											  title: '加载中...', 
-											  mask: true         
-											})
-								    		console.log(respc, '支付成功')
-											this.$u.put(`/app/pay/refreshPayResult?no=${respb.data.pay.no}`).then((res) => {
-												setTimeout(()=>{
-													uni.switchTab({
-														url:'/pages/myorder/returned/index?orderid=' + resp.data.id
-													})
-													uni.hideLoading()
-												},1000)
-											}) //刷新支付结果
-								    	},
-								    	fail(err) {
-											setTimeout(()=>{
-												uni.hideLoading()
-											},1000)
-											console.log('取消或者支付失败')
-								    	}
-								    })
-								}else{
+						uni.requestPayment({
+							provider: 'wxpay',
+							timeStamp: resp.data.payParams.timeStamp,
+							nonceStr: resp.data.payParams.nonceStr,
+							package: resp.data.payParams.packageVal,
+							signType: resp.data.payParams.signType,
+							paySign: resp.data.payParams.paySign,
+							success: (respc) => {
+								console.log(respc, '支付成功')
+								this.$u.put(`/app/pay/refreshPayResult?no=${resp.data.pay.no}`).then((
+									res) => {
+									setTimeout(() => {
+										uni.switchTab({
+											url: '/pages/myorder/returned/index?orderid=' +
+												resp.data.pay.bstId
+										})
+										uni.hideLoading()
+									}, 1000)
+								}) //刷新支付结果
+							},
+							fail(err) {
+								setTimeout(() => {
 									uni.hideLoading()
-									uni.showToast({
-										title: respb.msg,
-										icon: 'none',
-										duration:2000
-									})
-								}
-							})
-						}
-					}else{
+								}, 1000)
+								console.log('取消或者支付失败')
+							}
+						})
+					} else {
 						uni.hideLoading()
 						uni.showToast({
 							title: resp.msg,
 							icon: 'none',
-							duration:2000
+							duration: 2000
 						})
 					}
+				}).catch(e => {
+					uni.hideLoading()
 				})
 			},
 			// 根据sn获取车辆信息
-			getcheliang(){
-				if(this.chesn == ''){
+			getcheliang() {
+				if (this.chesn == '') {
 					this.$u.get(`/app/device/availableDetail?sn=${this.sn}`).then((res) => {
 						if (res.code == 200) {
-						    this.bikeobj = res.data
+							this.bikeobj = res.data
+							if (res.data.onlineStatus == 0) {
+								wx.openBluetoothAdapter({
+									success: function(res) {
+										console.log('蓝牙适配器初始化成功')
+										xBlufi.initXBlufi(1)
+										xBlufi.notifyStartDiscoverBle({
+											'isStart': true
+										})
+										xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+									},
+									fail: function(err) {
+										console.error('蓝牙适配器初始化失败，可能是因为没有权限', err)
+									}
+								})
+							}
 						}
 					})
-				}else{
+				} else {
 					this.$u.get(`/app/device/availableDetail?sn=${this.chesn}`).then((res) => {
 						if (res.code == 200) {
-						    this.bikeobj = res.data
+							this.bikeobj = res.data
+							if (res.data.onlineStatus == 0) {
+								wx.openBluetoothAdapter({
+									success: function(res) {
+										console.log('蓝牙适配器初始化成功')
+										xBlufi.initXBlufi(1)
+										xBlufi.notifyStartDiscoverBle({
+											'isStart': true
+										})
+										xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+									},
+									fail: function(err) {
+										console.error('蓝牙适配器初始化失败，可能是因为没有权限', err)
+									}
+								})
+							}
 						}
 					})
 				}
 			},
 			// 根据车型获取套餐
-			gettaocan(){
+			gettaocan() {
 				this.$u.get(`/app/suit/listByModel?modelId=${this.modelId}`).then((res) => {
 					if (res.code == 200) {
-					    this.taocanlist = res.data
+						this.taocanlist = res.data
 						this.suitId = res.data[0].id
 						this.getjisuan()
-					}else if(res.code == 401){
-						let that = this
-							uni.showModal({
-								title: '提示',
-								content: '您当前未登录，是否登录？',
-								showCancel: true,
-								success: function (res) {
-									if (res.confirm) {
-										that.logoflag = true
-										that.tit = '登录'
-									} else if (res.cancel) {
-										uni.switchTab({
-											url:'/pages/index/index'
-										})
-									}
-								}
-							})
-						}
+					}
 				})
 			},
-			getjisuan(){
+			getjisuan() {
 				let data = {
-					suitId:this.suitId
+					suitId: this.suitId
 				}
-				this.$u.post(`/app/order/calculatePrice`,data).then(res => {
+				this.$u.post(`/app/order/calculatePrice`, data).then(res => {
 					if (res.code == 200) {
-					    this.yucun = res.data.depositPrice
+						this.yucun = res.data.depositPrice
 						this.yucobj = res.data
 					}
 				})
 			},
 			// 点击租车时长加减
-			btndj(num){
-				if(num == 1){
-					if(this.zutime == 1){
+			btndj(num) {
+				if (num == 1) {
+					if (this.zutime == 1) {
 						uni.showToast({
 							title: '租车时长不能为0',
 							icon: 'none',
-							duration:2000
+							duration: 2000
 						})
-					}else{
+					} else {
 						this.zutime = this.zutime - 1
 					}
-				}else{
+				} else {
 					this.zutime = this.zutime + 1
 				}
 			},
 			// 点击租车方案
-			btnfa(index,item){
+			btnfa(index, item) {
 				this.fanganindex = index
 				this.suitId = item.id
 				this.getjisuan()
 			},
 			// 点击进行导航
-			btndaohang(){
+			btndaohang() {
 				uni.openLocation({
 					latitude: 11, //纬度-目的地/坐标点
 					longitude: 11, //经度-目的地/坐标点
 					name: 11, //地点名称
-					address:11 //详细地点名称
+					address: 11 //详细地点名称
 				})
 			},
 			// 点击进行登录
@@ -626,26 +782,26 @@
 					})
 				}
 				wxLoginAsync().then(async (data) => {
-						let datas = {
-							mobileCode:data.mobileCode,
-							loginCode:data.jscode,
-							appId:this.$store.state.appid
+					let datas = {
+						mobileCode: data.mobileCode,
+						loginCode: data.jscode,
+						appId: this.$store.state.appid
+					}
+					this.$u.post("/wxLogin", datas).then((res) => {
+						if (res.code == 200) {
+							wx.setStorageSync('token', res.token)
+							this.gettaocan()
+							this.tit = '确认订单页'
+							this.logoflag = false
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							})
 						}
-						this.$u.post("/wxLogin",datas).then((res) => {
-							if (res.code == 200) {
-								wx.setStorageSync('token', res.token)
-								this.gettaocan()
-								this.tit = '确认订单页'
-                                this.logoflag = false
-							} else {
-								uni.showToast({
-									title: res.msg,
-									icon: 'none',
-									duration: 2000
-								})
-							}
-						})
 					})
+				})
 			},
 		}
 	}
@@ -653,38 +809,44 @@
 
 <style lang="scss">
 	/deep/ .u-title,
-	/deep/ .u-iconfont{
+	/deep/ .u-iconfont {
 		padding-bottom: 22rpx !important;
 	}
-	/deep/ .u-iconfont{
+
+	/deep/ .u-iconfont {
 		padding-bottom: 0 !important;
 	}
-	/deep/ .u-checkbox{
+
+	/deep/ .u-checkbox {
 		width: 40rpx;
 	}
-	
-	.gaoliang{
+
+	.gaoliang {
 		background: #DCEDFF !important;
 		border: 2rpx solid #4297F3 !important;
 	}
+
 	@keyframes fadeIn {
-	  from {
-	    opacity: 0;
-		bottom:-300rpx;
-	  }
-	  to {
-	    opacity: 1;
-		bottom:180rpx;
-	  }
+		from {
+			opacity: 0;
+			bottom: -300rpx;
+		}
+
+		to {
+			opacity: 1;
+			bottom: 180rpx;
+		}
 	}
-	.logotc{
+
+	.logotc {
 		position: fixed;
 		top: 0;
 		left: 0;
 		z-index: 99;
 		width: 100%;
 		height: 100vh;
-		background-color: #fff;
+		background-color: rgba(0, 0, 0, .3);
+
 		.button {
 			margin-top: 200rpx;
 			width: 586rpx;
@@ -695,19 +857,38 @@
 			font-size: 40rpx;
 			color: #FFFFFF;
 		}
-		
+
 		.imgbox {
-			margin-top: 0rpx;
-			width: 750rpx;
-			height: 1274rpx;
-			z-index: 0;
-			image {
-				width: 750rpx;
-				height: 1274rpx;
+			.ts{
+				font-size: 36rpx;
+				font-weight: 600;
+				width: 100%;
+				text-align: center;
 			}
+			.cont{
+				font-size: 26rpx;
+				margin-top: 30rpx;
+			}
+			.zb{
+				margin-top: 30rpx;
+				color: #ccc;
+				font-size: 32rpx;
+			}
+			position: fixed;
+			left: 50%;
+			transform: translateX(-50%);
+			top: 35%;
+			border-radius: 20rpx;
+			padding:40rpx 20rpx;
+			box-sizing: barcode;
+			text-align: center;
+			width: 680rpx;
+			z-index: 0;
+			background-color: #fff;
 		}
 	}
-	.mingxitc{
+
+	.mingxitc {
 		position: fixed;
 		left: 0;
 		bottom: 180rpx;
@@ -723,24 +904,28 @@
 		padding-bottom: 30rpx;
 		box-sizing: border-box;
 		animation: fadeIn 0.5s ease-in-out forwards;
-		.cha{
+
+		.cha {
 			font-size: 60rpx;
 			font-weight: 600;
 			position: absolute;
 			top: 10rpx;
 			right: 36rpx;
 		}
-		.zujin{
+
+		.zujin {
 			display: flex;
 			justify-content: space-between;
 			margin-top: 22rpx;
-			view{
+
+			view {
 				font-weight: 600;
 				font-size: 32rpx;
 				color: #3D3D3D;
 			}
 		}
-		.title{
+
+		.title {
 			font-weight: 600;
 			font-size: 40rpx;
 			color: #3D3D3D;
@@ -749,62 +934,74 @@
 			margin-bottom: 16rpx;
 		}
 	}
-	.mask{
+
+	.mask {
 		position: fixed;
 		width: 100%;
 		height: 100vh;
-		background-color: rgba(0,0,0,0.3);
+		background-color: rgba(0, 0, 0, 0.3);
 		z-index: 98;
 		top: 0;
 		left: 0;
 		animation: fadeIn 0.5s ease-in-out forwards;
 	}
-	.zhifu{
+
+	.zhifu {
 		width: 750rpx;
-		height: 198rpx;
+		height: 238rpx;
 		background: #FFFFFF;
-		box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0,0,0,0.3);
+		box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 0, 0, 0.3);
 		border-radius: 0rpx 0rpx 0rpx 0rpx;
 		position: fixed;
 		left: 0;
 		bottom: 0;
 		z-index: 99;
-		.xieyi{
+        padding-bottom: 50rpx;
+		box-sizing: border-box;
+		.xieyi {
 			display: flex;
 			align-items: flex-end;
 			padding: 28rpx;
 			box-sizing: border-box;
-			text{
+
+			text {
 				color: #4297F3;
 			}
 		}
-		.bot{
+
+		.bot {
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
 			padding: 0 28rpx;
 			box-sizing: border-box;
-			.lt{
+
+			.lt {
 				display: flex;
 				align-items: center;
-				.money{
+
+				.money {
 					font-weight: 600;
 					font-size: 36rpx;
 					color: #FF1C1C;
-					text{
+
+					text {
 						font-size: 52rpx;
 					}
 				}
-				.mx{
+
+				.mx {
 					font-size: 28rpx;
 					color: #4297F3;
 					margin-left: 32rpx;
-					text{
+
+					text {
 						margin-left: 8rpx;
 					}
 				}
 			}
-			.rt{
+
+			.rt {
 				width: 340rpx;
 				height: 84rpx;
 				background: #4297F3;
@@ -817,7 +1014,8 @@
 			}
 		}
 	}
-	.zuchexz{
+
+	.zuchexz {
 		width: 698rpx;
 		max-height: 1062rpx;
 		background: #FFFFFF;
@@ -826,23 +1024,27 @@
 		padding: 18rpx 24rpx;
 		box-sizing: border-box;
 		border-radius: 20rpx;
-		.twoname{
+
+		.twoname {
 			font-weight: 600;
 			font-size: 28rpx;
 			color: #3D3D3D;
 			margin-top: 26rpx;
 		}
-		.twobg{
+
+		.twobg {
 			width: 648rpx;
 			max-height: 522rpx;
 			background: #fff;
 			border-radius: 20rpx;
 			overflow: hidden;
 			margin-top: 20rpx;
-			.bot{
+
+			.bot {
 				display: flex;
 				justify-content: space-between;
-				view{
+
+				view {
 					margin-top: 2rpx;
 					margin-right: 2rpx;
 					flex-wrap: wrap;
@@ -857,10 +1059,12 @@
 					color: #3D3D3D;
 				}
 			}
-			.top{
+
+			.top {
 				display: flex;
 				justify-content: space-between;
-				view{
+
+				view {
 					margin-right: 2rpx;
 					width: 50%;
 					height: 93rpx;
@@ -873,17 +1077,20 @@
 				}
 			}
 		}
-		.biaoge{
+
+		.biaoge {
 			width: 648rpx;
 			max-height: 522rpx;
 			background: #fff;
 			border-radius: 20rpx;
 			overflow: hidden;
 			margin-top: 20rpx;
-			.bot{
+
+			.bot {
 				display: flex;
 				justify-content: space-between;
-				view{
+
+				view {
 					margin-top: 2rpx;
 					margin-right: 2rpx;
 					flex-wrap: wrap;
@@ -897,10 +1104,12 @@
 					color: #3D3D3D;
 				}
 			}
-			.top{
+
+			.top {
 				display: flex;
 				justify-content: space-between;
-				view{
+
+				view {
 					margin-right: 2rpx;
 					width: 50%;
 					height: 93rpx;
@@ -913,24 +1122,28 @@
 				}
 			}
 		}
-		.name{
+
+		.name {
 			font-weight: 600;
 			font-size: 28rpx;
 			color: #3D3D3D;
 		}
-		.qcxz{
+
+		.qcxz {
 			font-weight: 600;
 			font-size: 28rpx;
 			color: #3D3D3D;
 			margin-top: 16rpx;
 		}
-		.tishi{
+
+		.tishi {
 			font-size: 28rpx;
 			color: #3D3D3D;
 			margin-top: 16rpx;
 		}
 	}
-	.yajin{
+
+	.yajin {
 		margin: auto;
 		margin-top: 16rpx;
 		width: 698rpx;
@@ -939,12 +1152,14 @@
 		border-radius: 20rpx;
 		padding: 18rpx 24rpx;
 		box-sizing: border-box;
-		.sixia{
+
+		.sixia {
 			font-size: 28rpx;
 			color: #808080;
 			margin-top: 18rpx;
 		}
-		.jiaoya{
+
+		.jiaoya {
 			width: 642rpx;
 			height: 156rpx;
 			background: #EFFDF4;
@@ -953,40 +1168,47 @@
 			padding-top: 30rpx;
 			padding-left: 34rpx;
 			box-sizing: border-box;
-			.ts{
-				text{
+
+			.ts {
+				text {
 					padding-bottom: 0 !important;
 				}
+
 				display: flex;
 				align-items: center;
 				font-weight: 600;
 				font-size: 32rpx;
 				color: #3D3D3D;
 			}
-			.sm{
+
+			.sm {
 				font-size: 28rpx;
 				color: #3D3D3D;
 				margin-top: 14rpx;
 			}
 		}
-		.tuihuan{
+
+		.tuihuan {
 			display: flex;
 			justify-content: space-between;
 			box-sizing: border-box;
 			margin-top: 14rpx;
-			view{
+
+			view {
 				font-size: 30rpx;
 				color: #3D3D3D;
 			}
 		}
-		.liucheng{
+
+		.liucheng {
 			display: flex;
 			justify-content: space-between;
 			padding: 0 20rpx;
 			box-sizing: border-box;
 			margin-top: 50rpx;
-			.huan{
-				view{
+
+			.huan {
+				view {
 					width: 108rpx;
 					height: 50rpx;
 					border-radius: 26rpx 26rpx 26rpx 26rpx;
@@ -997,37 +1219,44 @@
 					color: #808080;
 				}
 			}
-			.dian{
+
+			.dian {
 				color: #D8D8D8;
 			}
 		}
-		.name{
+
+		.name {
 			display: flex;
 			justify-content: space-between;
-			.lt{
+
+			.lt {
 				font-weight: 600;
 				font-size: 28rpx;
 				color: #3D3D3D;
 			}
-			.rt{
+
+			.rt {
 				display: flex;
 				align-items: center;
 				font-size: 24rpx;
 				color: #3D3D3D;
-				image{
+
+				image {
 					width: 24rpx;
 					height: 27rpx;
 				}
 			}
 		}
 	}
+
 	page {
-		background:#F7F7F7;
+		background: #F7F7F7;
 		border-radius: 0rpx 0rpx 0rpx 0rpx;
 		padding-bottom: 230rpx;
 		box-sizing: border-box;
 	}
-	.zcfangan{
+
+	.zcfangan {
 		margin: auto;
 		padding: 18rpx 24rpx;
 		padding-right: 0 !important;
@@ -1037,27 +1266,32 @@
 		background: #FFFFFF;
 		border-radius: 20rpx;
 		margin-top: 16rpx;
-		.shichang{
+
+		.shichang {
 			display: flex;
 			justify-content: space-between;
 			margin-top: 48rpx;
 			align-items: center;
-			.zcsc{
+
+			.zcsc {
 				font-size: 28rpx;
 				color: #3D3D3D;
 			}
-			.jisuan{
+
+			.jisuan {
 				display: flex;
 				align-items: center;
 				padding-right: 24rpx;
 				box-sizing: border-box;
-				.zong{
+
+				.zong {
 					font-weight: 600;
 					font-size: 28rpx;
 					color: #3D3D3D;
 					margin-right: 10rpx;
 				}
-				.jibu{
+
+				.jibu {
 					width: 229rpx;
 					height: 56rpx;
 					border: 1rpx solid #808080;
@@ -1067,10 +1301,12 @@
 					padding: 0 24rpx;
 					box-sizing: border-box;
 					justify-content: center;
-					text{
+
+					text {
 						font-size: 32rpx;
 					}
-					input{
+
+					input {
 						width: 120rpx;
 						height: 56rpx;
 						border-left: 1rpx solid #808080;
@@ -1081,21 +1317,25 @@
 				}
 			}
 		}
-		.name{
+
+		.name {
 			font-size: 28rpx;
 			color: #3D3D3D;
 			font-weight: 600;
 		}
-		.fanganlist{
+
+		.fanganlist {
 			display: flex;
 			flex-wrap: wrap;
-			.wei{
+
+			.wei {
 				margin-top: 30rpx;
 				width: 100%;
 				text-align: center;
 				color: #ccc;
 			}
-			.fanganlist_item{
+
+			.fanganlist_item {
 				margin-top: 16rpx;
 				margin-right: 16rpx;
 				border: 2rpx solid #fff;
@@ -1105,21 +1345,25 @@
 				height: 150rpx;
 				background: #F0F5F6;
 				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				.shi{
+
+				.shi {
 					font-size: 28rpx;
 					color: #3D3D3D;
 				}
-				.price{
+
+				.price {
 					font-size: 32rpx;
 					color: #FF1C1C;
-					text{
+
+					text {
 						font-size: 44rpx;
 					}
 				}
 			}
 		}
 	}
-	.quche{
+
+	.quche {
 		margin: auto;
 		width: 696rpx;
 		max-height: 488rpx;
@@ -1128,56 +1372,69 @@
 		border-radius: 20rpx;
 		padding: 26rpx 20rpx;
 		box-sizing: border-box;
-		.liucheng{
+
+		.liucheng {
 			display: flex;
 			margin-top: 36rpx;
-			.rt{
+
+			.rt {
 				width: 100%;
-				.one{
+
+				.one {
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					.qtime{
+
+					.qtime {
 						font-weight: 600;
 						font-size: 32rpx;
 						color: #3D3D3D;
 					}
-					.gtime{
+
+					.gtime {
 						display: flex;
 						align-items: center;
 						font-weight: 600;
 						font-size: 28rpx;
 						color: #808080;
-						image{
+
+						image {
 							width: 22rpx;
 							height: 28rpx;
 						}
 					}
 				}
-				.thr{
+
+				.thr {
 					margin-top: 20rpx;
-					.time{
+
+					.time {
 						font-weight: 600;
 						font-size: 32rpx;
 						color: #3D3D3D;
 					}
-					.juli{
+
+					.juli {
 						margin-top: 8rpx;
 					}
-					.dizhi{
+
+					.dizhi {
 						font-size: 28rpx;
 						color: #3D3D3D;
-						text{
+
+						text {
 							font-weight: 600;
 							display: inline-block;
 							margin-right: 10rpx;
 						}
 					}
 				}
-				.two{
+
+				.two {
 					margin-top: 8rpx;
 					position: relative;
-					.img{
+
+					.img {
 						position: absolute;
 						top: 0;
 						right: 0;
@@ -1185,15 +1442,18 @@
 						width: 166rpx;
 						height: 166rpx;
 					}
-					.shuom{
+
+					.shuom {
 						margin-top: 8rpx;
 						font-size: 28rpx;
 						color: #4297F3;
 					}
-					.dizhi{
+
+					.dizhi {
 						font-size: 28rpx;
 						color: #3D3D3D;
-						text{
+
+						text {
 							font-weight: 600;
 							display: inline-block;
 							margin-right: 10rpx;
@@ -1201,9 +1461,11 @@
 					}
 				}
 			}
-			.lt{
+
+			.lt {
 				margin-right: 18rpx;
-				.huan{
+
+				.huan {
 					width: 68rpx;
 					height: 40rpx;
 					border-radius: 8rpx 8rpx 8rpx 8rpx;
@@ -1213,7 +1475,8 @@
 					font-size: 22rpx;
 					color: #16BC32;
 				}
-				.time{
+
+				.time {
 					padding: 0 10rpx;
 					box-sizing: border-box;
 					height: 32rpx;
@@ -1224,7 +1487,8 @@
 					font-size: 20rpx;
 					color: #4297F3;
 				}
-				.qu{
+
+				.qu {
 					width: 68rpx;
 					height: 40rpx;
 					border-radius: 8rpx 8rpx 8rpx 8rpx;
@@ -1234,9 +1498,11 @@
 					font-size: 22rpx;
 					color: #4297F3;
 				}
-				.dian{
+
+				.dian {
 					width: 68rpx;
-					text{
+
+					text {
 						display: block;
 						margin: auto;
 						width: 4rpx;
@@ -1248,16 +1514,18 @@
 				}
 			}
 		}
-		.name{
+
+		.name {
 			font-weight: 600;
 			font-size: 40rpx;
 			color: #3D3D3D;
 			margin-left: 10rpx;
 		}
 	}
-	.jieshao{
+
+	.jieshao {
 		width: 698rpx;
-		height: 260rpx;
+		height: 250rpx;
 		background: #FFFFFF;
 		border-radius: 20rpx 20rpx 20rpx 20rpx;
 		margin: auto;
@@ -1266,25 +1534,42 @@
 		box-sizing: border-box;
 		display: flex;
 		justify-content: space-between;
-		.rt{
-			width: 156rpx;
+
+		.rt {
+			width: 206rpx;
 			padding-top: 20rpx;
 			box-sizing: border-box;
-			image{
-				width: 156rpx;
-				height: 120rpx;
+
+			image {
+				width: 206rpx;
+				height: 170rpx;
 			}
 		}
-		.lt{
-			.name{
+
+		.lt {
+			.speed {
+				margin-top: 18rpx;
+				width: 226rpx;
+				height: 22rpx;
+				background: #ccc;
+				border-radius: 16rpx 16rpx 16rpx 16rpx;
+				.speeds {
+					height: 100%;
+					background: #4297F3;
+					border-radius: 16rpx 16rpx 16rpx 16rpx;
+				}
+			}
+			.name {
 				font-weight: 600;
 				font-size: 32rpx;
 				color: #3D3D3D;
 			}
-			.biaoqian{
+
+			.biaoqian {
 				display: flex;
 				flex-wrap: wrap;
-				view{
+
+				view {
 					margin-top: 12rpx;
 					margin-right: 12rpx;
 					padding: 4rpx 12rpx;
diff --git a/page_shanghu/gongzuotai/AccountDetails.vue b/page_shanghu/gongzuotai/AccountDetails.vue
index 697d858..825b1fe 100644
--- a/page_shanghu/gongzuotai/AccountDetails.vue
+++ b/page_shanghu/gongzuotai/AccountDetails.vue
@@ -9,7 +9,7 @@
 					账户总余额
 				</view>
 				<view class="num">
-					{{userInfo.balance == null ? '0.00' : userInfo.balance.toFixed(2)}}元
+					￥{{userInfo.balance == null ? '0.00' : userInfo.balance.toFixed(2)}}元
 				</view>
 			</view>	
 			<view class="li_box">
@@ -17,7 +17,7 @@
 					待结算金额
 				</view>
 				<view class="num">
-					{{userInfo.settlementAmount == null ? '0.00' : userInfo.settlementAmount}}元
+					￥{{waitDivideAmount == null ? '0.00' : waitDivideAmount.toFixed(2)}}元
 				</view>
 			</view>
 		</view>
@@ -161,7 +161,8 @@
 				listflag: true,
 				channelId:'',
 				objobj:{},
-				total:0
+				total:0,
+				waitDivideAmount:''
 			}
 		},
 		onLoad(e) {
@@ -208,6 +209,7 @@
 				this.$u.get(`/getInfo`).then((res) => {
 					if (res.code == 200) {
 						this.userInfo = res.user
+						this.waitDivideAmount = res.stat.bonus.waitDivideAmount
 					} 
 				})
 			},
diff --git a/page_shanghu/gongzuotai/ChargingTemplate.vue b/page_shanghu/gongzuotai/ChargingTemplate.vue
index 93312cb..b5baf56 100644
--- a/page_shanghu/gongzuotai/ChargingTemplate.vue
+++ b/page_shanghu/gongzuotai/ChargingTemplate.vue
@@ -10,7 +10,7 @@
 			<view class="info">
 				<view class="lis">
 					<view class="info_li">
-						说明：<span>{{item.instructions}}</span>
+						说明：<span>{{item.instructions == null ? '--' : item.instructions}}</span>
 					</view>
 					<view>
 						<view v-if="item.ridingRule==1">
diff --git a/page_shanghu/gongzuotai/shgl.vue b/page_shanghu/gongzuotai/shgl.vue
index 03a6259..4ad4eeb 100644
--- a/page_shanghu/gongzuotai/shgl.vue
+++ b/page_shanghu/gongzuotai/shgl.vue
@@ -71,6 +71,7 @@
 			};
 		},
 		onShow() {
+			this.pageNum = 1
 			this.getlist();
 		},
 		onReachBottom() {
@@ -93,7 +94,7 @@
 					id:item.id,
 					handle:num
 				}
-				this.$u.put('/app/fault', data).then((res) => {
+				this.$u.put('/bst/fault/handle', data).then((res) => {
 					if (res.code === 200) {
 						uni.showToast({
 							title: '操作成功',
@@ -159,12 +160,10 @@
 				clearTimeout(timerId1);
 				timerId1 = setTimeout(() => {
 					// 搜索时重置页码并重新获取数据
-					this.pageNum = 1;
-					this.list = []; // 清空当前列表
-					this.getlist();
-				
-				
-				}, 500);
+					this.pageNum = 1
+					this.list = [] // 清空当前列表
+					this.getlist()
+				}, 500)
 			
 			},
 			todetail() {
@@ -238,8 +237,6 @@
 		.tips {
 			margin-top: 24rpx;
 			width: 100%;
-			// display: flex;
-			// justify-content: center;
 			text-align: center;
 			font-weight: 400;
 			font-size: 28rpx;
@@ -283,7 +280,7 @@
 				margin-top: 10rpx;
 				background: #D8D8D8;
 				width: 256rpx;
-				height: 134rpx;
+				height: 256rpx;
 			}
 
 		}
diff --git a/page_shanghu/gongzuotai/woke_deviceMgmt.vue b/page_shanghu/gongzuotai/woke_deviceMgmt.vue
index 8350f58..dc6a121 100644
--- a/page_shanghu/gongzuotai/woke_deviceMgmt.vue
+++ b/page_shanghu/gongzuotai/woke_deviceMgmt.vue
@@ -198,6 +198,9 @@ export default {
 			{
 				value: '8',
 				label: '下线'
+			},{
+				value: '9',
+				label: '强制锁车'
 			}],
 			tit: '全部',
 			typeidx: '',
@@ -409,6 +412,8 @@ export default {
 				return '#986cf0' // 调度中状态为紫色
 			} else if (item.status == 7) {
 				return '#343a40' // 未绑定状态为黑色
+			}else if (item.status == 9) {
+				return '#ff7429' // 未绑定状态为黑色
 			}
 		},
 		getStatusColors(item) {
@@ -459,6 +464,8 @@ export default {
 				return '未绑定'
 			} else if (item.status == 8) {
 				return '禁用中'
+			} else if (item.status == 9) {
+				return '强制锁车'
 			}
 		},
 		statuss(item) {
diff --git a/page_shanghu/guanli/admin_order.vue b/page_shanghu/guanli/admin_order.vue
index 265026b..c179294 100644
--- a/page_shanghu/guanli/admin_order.vue
+++ b/page_shanghu/guanli/admin_order.vue
@@ -290,7 +290,7 @@
 				let data = {}
 				if (this.typeidx == 1) {
 					data = {
-						phonenumber: this.searchKeyword,
+						userPhone: this.searchKeyword,
 						status: this.zhuangtai,
 						createDateRange:this.firsTime == '' ? '' : this.lasTime == '' ? '' : this.firsTime + ',' + this.lasTime,
 						areaId: this.areaId,
@@ -299,7 +299,7 @@
 					};
 				} else if (this.typeidx == 2) { // 修改条件为 this.typeidx == 2
 					data = {
-						vehicleNum: this.searchKeyword,
+						deviceVehicleNum: this.searchKeyword,
 						type: '1',
 						status:this.zhuangtai,
 						createDateRange:this.firsTime == '' ? '' : this.lasTime == '' ? '' : this.firsTime + ',' + this.lasTime,
diff --git a/page_shanghu/guanli/bike_track.vue b/page_shanghu/guanli/bike_track.vue
index d528b56..406c5e9 100644
--- a/page_shanghu/guanli/bike_track.vue
+++ b/page_shanghu/guanli/bike_track.vue
@@ -307,7 +307,7 @@ export default {
 					points: points,
 					fillColor: colors[num].fill,
 					strokeColor: colors[num].stroke,
-					strokeWidth: 2,
+					strokeWidth: 1,
 					zIndex: 1
 				}
 			}).filter(Boolean)
@@ -355,7 +355,7 @@ export default {
 				points: points,
 				fillColor: "#55888840",
 				strokeColor: "#22FF00",
-				strokeWidth: 2,
+				strokeWidth: 1,
 				zIndex: 1
 			}
 		},
@@ -384,7 +384,7 @@ export default {
 			// 更新轨迹线
 			this.currentPolyline = [{
 				points: this.trackPoints.slice(0, index + 1),
-				width: 8,
+				width: 4,
 				arrowLine: true,
 				color: '#00AF99'
 			}]
diff --git a/page_shanghu/guanli/device_detail.vue b/page_shanghu/guanli/device_detail.vue
index 820fe00..ec7ff51 100644
--- a/page_shanghu/guanli/device_detail.vue
+++ b/page_shanghu/guanli/device_detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="设备详情" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
+		<u-navbar title="车辆详情" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
 			height='45'></u-navbar>
 		<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
 			:show-location="true" :markers="markers" :polygons="polyline">
@@ -8,191 +8,193 @@
 				<cover-image class="img" src="https://lxnapi.ccttiot.com/bike/img/static/uRiYQZQEb3l2LsltEsyW"
 					mode=""></cover-image>
 			</cover-view>
-			<cover-view class="track" @click="toTrack">
+			<!-- <cover-view class="track" @click="toTrack">
 				<cover-image class="img" src="https://lxnapi.ccttiot.com/bike/img/static/ufaAAtlirJYs1QwJF25P"
 					mode=""></cover-image>
-			</cover-view>
+			</cover-view> -->
 		</map>
-		<view class="info_card">
-			<view class="info_tit">
-				设备信息
-			</view>
-			<view class="lines"></view>
-			<view class="cont">
-				<view class="info_li">
-					<view class="half_infoli">
-						SN：<span>{{deviceInfos.sn}}</span>
+		
+		<view class="new_infocard">
+			<view class="topsn">
+				<view class="lt">
+					SN：{{deviceInfos.sn}}
+				</view>
+				<view class="rt">
+					<view class="stutas">
+						<span style="background-color: #979797;" v-if="deviceInfos.status == 0">仓库中</span>
+						<span style="background-color: #4c97e7;" v-if="deviceInfos.status == 1">待租</span>
+						<span style="background-color: #28c445;" v-if="deviceInfos.status == 2">预约中</span>
+						<span style="background-color: #ffc757;" v-if="deviceInfos.status == 3">骑行中</span>
+						<span style="background-color: #ff7429;" v-if="deviceInfos.status == 4">临时锁车中</span>
+						<span style="background-color: #986cf0;" v-if="deviceInfos.status == 6">调度中</span>
+						<span style="background-color: #343a40;" v-if="deviceInfos.status == 8">下线</span>
+						<span style="background-color: #ff7429;" v-if="deviceInfos.status == 9">强制锁车</span>
 					</view>
-					<view class="half_infoli">
+					<view class="issuo" v-if="deviceInfos.lockStatus == 0">
+						锁已关
+					</view>
+					<view class="issuo" style="background-color: #4C97E7;color: #fff;" v-if="deviceInfos.lockStatus == 1">
+						锁已开
+					</view>
+				</view>
+			</view>
+			<view class="bikexx">
+				<view class="dianliang">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/ucFiREWFvUepgFX0LR1h" mode=""></image>
+					<view class="dl">
+						电量：<span>{{deviceInfos.remainingPower == null ? '--' : deviceInfos.remainingPower}}%</span>
+					</view>
+					<view class="dy">
+						电压：<span>{{deviceInfos.voltage == null ? '--' : deviceInfos.voltage.toFixed(2)}}V</span>
+					</view>
+				</view>
+				<view class="xuhang">
+					<view class="">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uBueutMzheLZWktEFWVR" mode=""></image> 续航  {{deviceInfos.remainEndurance == null ? '--' : deviceInfos.remainEndurance}}km
+					</view>
+					<view class="" style="margin-top: 20rpx;">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/ur7Q7YC9AOkkTpvaLEUU" mode=""></image> 车型  {{deviceInfos.modelName}}
+					</view>
+				</view>
+				<view class="ewm">
+					<view class="" @click="generateQrcode()">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uiCssXpb4SpuFAQYOp2A" mode=""></image> 二维码
+					</view>
+					<view class="" style="margin-top: 14rpx;" @click="toTrack">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uJtMZ16iR2q8agQ4iLm3" mode=""></image> 轨迹
+					</view>
+					<view class="" style="margin-top: 14rpx;" @click="btndaohang">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/u3De0EsfW6ZctTFCH9p7" mode=""></image> 导航
+					</view>
+				</view>
+			</view>
+			<view class="caozuoanniu">
+				<view class="dangeanniu" @click="checkbtn(0)">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uuHHQU2Yg2sReTadF51Y" mode=""></image>
+					</view>
+					开锁
+				</view>
+				<!-- <view class="btn" @click="lanya(1)">
+					蓝牙开锁
+				</view>
+				<view class="btn" @click="lanya(2)">
+					蓝牙关锁
+				</view>
+				<view class="btn" @click="lanya(3)">
+					蓝牙响铃
+				</view> -->
+				<view class="dangeanniu" @click="checkbtn(1)">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uKear247uKM7Axwgh3Jc" mode=""></image>
+					</view>
+					关锁
+				</view>
+				<view class="dangeanniu" @click="btn(4)">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uE7zUe5bXdtGGyWA9WGG" mode=""></image>
+					</view>
+					响铃寻车
+				</view>
+				<view class="dangeanniu" v-if="this.deviceInfos.hardwareVersion && this.deviceInfos.hardwareVersion.toLowerCase().includes('x')" @click="btn(9)">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/ujhsaJeL6KVrYgFSEKkj" mode=""></image>
+					</view>
+					坐垫锁
+				</view>
+				<view class="dangeanniu" @click="btn(8)">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uWnOOwRQYpZxB14stYl8" mode=""></image>
+					</view>
+					重启
+				</view>
+				<view class="dangeanniu" @click="btn(2)" v-if="deviceInfos.status!=8">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/u1PlutiYn3alAcF2VuTH" mode=""></image>
+					</view>
+					禁用
+				</view>
+				<view class="dangeanniu" @click="btn(3)" v-if="deviceInfos.status==8">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/u1PlutiYn3alAcF2VuTH" mode=""></image>
+					</view>
+					解禁
+				</view>
+				<view class="dangeanniu" @click="btn(5)" v-if="deviceInfos.status!=0">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uJvI9lLyEkA2QdSr74LX" mode=""></image>
+					</view>
+					回仓
+				</view>
+				<view class="dangeanniu" @click="btn(6)" v-if="deviceInfos.status==0">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uJvI9lLyEkA2QdSr74LX" mode=""></image>
+					</view>
+					出仓
+				</view>
+				<view class="dangeanniu" @click="btn(7)">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/u277Tj0k5M7I8EO4V3ki" mode=""></image>
+					</view>
+					车牌修改
+				</view>
+				<view class="dangeanniu" @click="changeShwoList">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/ua7Xl6Eew8AvjeKJFKXI" mode=""></image>
+					</view>
+					修改车型
+				</view>
+				<view class="dangeanniu" v-if="this.deviceInfos.hardwareVersion && this.deviceInfos.hardwareVersion.toLowerCase().includes('x')" @click="btnjingyin">
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uUJGVRpPIRC34vF7240K" mode=""></image>
+					</view>
+					静音:{{jytxt}}
+				</view>
+				<view class="dangeanniu" @click="btn(10)"> 
+					<view class="pic">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uuuFxDo4XNzXJDTOQIeZ" mode=""></image>
+					</view>
+					定位更新
+				</view>
+			</view>
+			<view class="bikejcxx">
+				<view class="wai">
+					<view class="lt">
 						MAC：<span>{{deviceInfos.mac}}</span>
 					</view>
-				</view>
-				<view class="info_li">
-					<view class="half_infoli">
-						车牌号：<span v-if="deviceInfos.vehicleNum">{{deviceInfos.vehicleNum}}</span>
-						<span v-else>--</span>
-					</view>
-					<view class="half_infoli">
-						车辆型号：
-						<span v-if="deviceInfos.modelName">{{deviceInfos.modelName}}</span>
-						<span v-else>--</span>
+					<view class="lt">
+						网络状态：<span v-if="deviceInfos.onlineStatus==0">离线</span><span v-if="deviceInfos.onlineStatus==1">在线</span>
 					</view>
 				</view>
-				<view class="info_li">
-					运营区域：
-					<span v-if="deviceInfos.areaName">{{deviceInfos.areaName}}</span>
-					<span v-else>--</span>
-				</view>
-			</view>
-			<view class="lines"></view>
-			<view class="cont">
-				<view class="info_li">
-					<view class="half_infoli">
-						车辆状态：<span v-if="deviceInfos.status == 0">仓库中</span>
-						<span v-if="deviceInfos.status == 1">待租</span>
-						<span v-if="deviceInfos.status == 2">预约中</span>
-						<span v-if="deviceInfos.status == 3">骑行中</span>
-						<span v-if="deviceInfos.status == 4">临时锁车中</span>
-						<span v-if="deviceInfos.status == 6">调度中</span>
-						<span v-if="deviceInfos.status == 8">下线</span>
+				<view class="wai">
+					<view class="lt">
+						车牌号：<span>{{deviceInfos.vehicleNum}}</span>
 					</view>
-					<view class="half_infoli" v-if="deviceInfos.onlineStatus==0">
-						网络状态：<span>离线</span>
-					</view>
-					<view class="half_infoli" v-if="deviceInfos.onlineStatus==1">
-						网络状态：<span>在线</span>
+					<view class="lt">
+						续航里程：<span>{{deviceInfos.remainEndurance == null ? '--' : deviceInfos.remainEndurance}}km</span>
 					</view>
 				</view>
-				<view class="info_li">
-					<view class="half_infoli">
-						电池电量：
-						<span>{{deviceInfos.remainingPower == null ? '--' : deviceInfos.remainingPower}}%</span>
+				<view class="wai">
+					<view class="lt">
+						运营区域：<span>{{deviceInfos.areaName}}</span>
 					</view>
-					<view class="half_infoli">
-						续航里程：
-						<span>{{deviceInfos.remainEndurance == null ? '--' : deviceInfos.remainEndurance}} KM</span>
-					</view>
-				</view>
-				<view class="info_li">
-					<view class="half_infoli">
-						电池电压：
-						<span>{{deviceInfos.voltage == null ? '--' : deviceInfos.voltage}}V</span>
-					</view>
-					<view class="half_infoli">
-						4G信号：
-						<span>{{deviceInfos.satellites == null ? '--' : deviceInfos.satellites}}</span>
+					<view class="lt">
+						4G信号/GPS：<span>{{deviceInfos.signalStrength == null ? '--' : deviceInfos.signalStrength}}/{{deviceInfos.satellites == null ? '--' : deviceInfos.satellites}}</span>
 					</view>
 				</view>
 			</view>
-			<view class="lines"></view>
-			<view class="cont">
-				<view class="info_li">
-					最后定位坐标：
-					<span v-if="deviceInfos.latitude">{{deviceInfos.latitude}},{{deviceInfos.longitude}}</span>
-					<span v-else>--</span>
+			<view class="zuche">
+				<view class="one">
+					最近租车人：<image src="https://api.ccttiot.com/smartmeter/img/static/uCa86z0tr5WHiymtRJYt" mode=""></image> <span>--</span>
 				</view>
-				<view class="info_li" style="flex-wrap: wrap;display: inline-block;">
-					最后定位地址：
-					<span v-if="deviceInfos.location">{{deviceInfos.location}}</span>
-					<span v-else>--</span>
+				<view class="">
+					最后定位坐标：<span>{{deviceInfos.latitude}},{{deviceInfos.longitude}}</span>
 				</view>
-				<view class="info_li">
-					最后定位时间：
-					<span v-if="deviceInfos.lastTime">{{deviceInfos.lastTime}}</span>
-					<span v-else>--</span>
+				<view class="">
+					最后定位时间：<span>{{deviceInfos.lastTime}}</span>
 				</view>
 			</view>
 		</view>
-		<!-- <view class="info_card" style="margin-top: 20rpx;" v-if="deviceInfos.etOrders[0]&&deviceInfos.sn">
-			<view class="info_tit">
-				最后订单信息
-			</view>
-			<view class="lines"></view>
-			<view class="cont">
-				<view class="info_li">
-					最后用户姓名：
-					<span v-if="deviceInfos.etOrders[0].realName &&deviceInfos.sn">{{deviceInfos.etOrders[0].realName}}</span>
-					<span v-else>--</span>
-				</view>
-				<view class="info_li">
-					最后用户电话：
-					<span v-if="deviceInfos.etOrders[0].phonenumber &&deviceInfos.sn">{{deviceInfos.etOrders[0].phonenumber}}</span>
-					<span v-else>--</span>
-				</view>
-				<view class="info_li" style="flex-wrap: wrap;display: inline-block;">
-					最后订单编号：
-					<span v-if="deviceInfos.etOrders[0].orderNo &&deviceInfos.sn">{{deviceInfos.etOrders[0].orderNo}}</span>
-					<span v-else>--</span>
-				</view>
-				<view class="info_li">
-					订单开始时间：
-					<span v-if="deviceInfos.etOrders[0].createTime&&deviceInfos.sn">{{deviceInfos.etOrders[0].createTime}}</span>
-					<span v-else>--</span>
-				</view>
-				<view class="info_li">
-					<view class="info_li" v-if="deviceInfos.sn">
-						订单状态：<span>{{statuss()}}</span>
-					</view>
-				</view>
-			</view>
-		</view> -->
-		<view class="bot_btn">
-			<view class="btn" @click="checkbtn(0)">
-				开锁
-			</view>
-			<view class="btn" @click="checkbtn(1)">
-				关锁
-			</view>
-			<view class="btn" @click="btn(4)">
-				响铃寻车
-			</view>
-			<!-- <view class="btn" @click="lanya(1)">
-				蓝牙开锁
-			</view>
-			<view class="btn" @click="lanya(2)">
-				蓝牙关锁
-			</view>
-			<view class="btn" @click="lanya(3)">
-				蓝牙响铃
-			</view> -->
-			<view class="btn" @click="btn(8)">
-				设备重启
-			</view>
-			<view class="btn" @click="btn(2)" v-if="deviceInfos.status!=8">
-				车辆禁用
-			</view>
-			<view class="btn" @click="btn(3)" v-if="deviceInfos.status==8">
-				车辆解禁
-			</view>
-			<view class="btn" @click="btn(5)" v-if="deviceInfos.status!=0">
-				车辆回仓
-			</view>
-			<view class="btn" @click="btn(6)" v-if="deviceInfos.status==0">
-				车辆出仓
-			</view>
-			<view class="btn" @click="btn(7)">
-				车牌修改
-			</view>
-			<view class="btn"
-				v-if="this.deviceInfos.hardwareVersion && this.deviceInfos.hardwareVersion.toLowerCase().includes('x')"
-				@click="btn(9)">
-				坐垫锁
-			</view>
-			<view class="btn" @click="btn(10)">
-				定位更新
-			</view>
-			<view class="btn" @click="changeShwoList">
-				修改车型
-			</view>
-			<view class="btn" @click="generateQrcode()">
-				设备二维码
-			</view>
-			<view class="btn"
-				v-if="this.deviceInfos.hardwareVersion && this.deviceInfos.hardwareVersion.toLowerCase().includes('x')"
-				@click="btnjingyin">
-				静音：{{jytxt}}
-			</view>
-		</view>
 		<u-mask :show="false" @click="show = false" :z-index='100' />
 		<u-mask :show="maskloading" :z-index='100' duration='0' />
 		<view class="maskloadpage" v-if="maskloading">
@@ -394,6 +396,16 @@
 			}
 		},
 		methods: {
+			// 点击进行导航
+			btndaohang(){
+				uni.openLocation({
+					latitude: this.deviceInfos.latitude, //纬度-目的地/坐标点
+					longitude: this.deviceInfos.longitude, //经度-目的地/坐标点
+					name: '', //地点名称
+					address:'' //详细地点名称
+				})
+			},
+			// 连接蓝牙
 			lanya(num) {
 				if (num == 1) {
 					xBlufi.notifySendCustomData({
@@ -990,7 +1002,7 @@
 									display: 'ALWAYS', // 修改为气泡的显示策略
 								}
 							})
-						} else if (this.deviceInfos.status == 4) {
+						} else if (this.deviceInfos.status == 4 || this.deviceInfos.status == 9) {
 							this.markers.push({
 								id: parseFloat(this.deviceInfos.sn),
 								latitude: this.deviceInfos.latitude,
@@ -1272,6 +1284,198 @@
 	.page {
 		padding-bottom: 400rpx;
 		width: 750rpx;
+		
+		.new_infocard{
+			width: 750rpx;
+			max-height: 1384rpx;
+			overflow: scroll;
+			background: #FFFFFF;
+			border-radius: 30rpx;
+			padding: 30rpx;
+			box-sizing: border-box;
+			position: absolute;
+			z-index: 99;
+			top: 900rpx;
+			.zuche{
+				margin-top: 26rpx;
+				.one{
+					display: flex;
+					align-items: center;
+					image{
+						width: 32rpx;
+						height: 32rpx;
+						margin-right: 4rpx;
+					}
+					span{
+						font-size: 28rpx;
+						color: #4C97E7;
+					}
+				}
+				view{
+					font-size: 28rpx;
+					color: #808080;
+					margin-bottom: 26rpx;
+					span{
+						color: #3D3D3D;
+					}
+				}
+			}
+			.bikejcxx{
+				margin-top: 26rpx;
+				border-bottom: 1rpx solid #D8D8D8;
+				.wai{
+					display: flex;
+					justify-content: space-between;
+					margin-bottom: 26rpx;
+					.lt{
+						width: 46%;
+						text-align: left;
+						font-size: 28rpx;
+						color: #808080;
+						span{
+							color: #3D3D3D;
+						}
+					}
+				}
+			}
+			.caozuoanniu{
+				display: flex;
+				flex-wrap: wrap;
+				margin-top: 26rpx;
+				border-bottom: 1rpx solid #D8D8D8;
+				.dangeanniu{
+					width: 20%;
+					text-align: center;
+					margin-bottom: 28rpx;
+					.pic{
+						width: 88rpx;
+						height: 88rpx;
+						background: #F1F1F1;
+						border-radius: 6rpx 6rpx 6rpx 6rpx;
+						margin: auto;
+						margin-bottom: 14rpx;
+						image{
+							width: 32rpx;
+							height: 32rpx;
+							margin-top: 28rpx;
+						}
+					}
+				}
+			}
+			.ewm{
+				view{
+					width: 140rpx;
+					height: 44rpx;
+					background: #4C97E7;
+					border-radius: 6rpx 6rpx 6rpx 6rpx;
+					font-size: 24rpx;
+					color: #FFFFFF;
+					display: flex;
+					align-items: center;
+					padding: 0 8rpx;
+					padding-left: 18rpx !important;
+					text-align: center;
+					box-sizing: border-box;
+					image{
+						width: 26rpx;
+						height: 26rpx;
+						margin-right: 10rpx;
+					}
+				}
+			}
+			.xuhang{
+				view{
+					width: 284rpx;
+					height: 70rpx;
+					background: #F1F1F1;
+					border-radius: 8rpx 8rpx 8rpx 8rpx;
+					display: flex;
+					align-items: center;
+					font-size: 24rpx;
+					color: #3D3D3D;
+					padding-left: 18rpx;
+					box-sizing: border-box;
+					image{
+						width: 32rpx;
+						height: 32rpx;
+						margin-right: 14rpx;
+					}
+				}
+			}
+			.bikexx{
+				margin-top: 26rpx;
+				display: flex;
+				justify-content: space-between;
+				border-bottom: 1rpx solid #D8D8D8;
+				padding-bottom: 26rpx;
+				box-sizing: border-box;
+				.dianliang{
+					position: relative;
+					.dl{
+						margin-top: 66rpx;
+					}
+					.dy{
+						margin-top: 2rpx;
+					}
+					view{
+						padding-left: 14rpx;
+						box-sizing: border-box;
+						font-size: 24rpx;
+						color: #3D3D3D;
+						span{
+							font-size: 32rpx;
+						}
+					}
+					image{
+						position: absolute;
+						width: 222rpx;
+						height: 160rpx;
+						z-index: -1;
+					}
+				}
+			}
+			.topsn{
+				display: flex;
+				justify-content: space-between;
+				border-bottom: 1rpx solid #D8D8D8;
+				padding-bottom: 26rpx;
+				box-sizing: border-box;
+				.lt{
+					font-weight: 600;
+					font-size: 32rpx;
+					color: #3D3D3D;
+				}
+				.rt{
+					display: flex;
+					.issuo{
+						width: 104rpx;
+						height: 42rpx;
+						background: #F1F1F1;
+						border-radius: 6rpx 6rpx 6rpx 6rpx;
+						text-align: center;
+						line-height: 42rpx;
+						margin-left: 28rpx;
+						font-size: 24rpx;
+						color: #3D3D3D;
+					}
+					.stutas{
+						span{
+							display: inline-block;
+							width: 104rpx;
+							height: 42rpx;
+							// background: #DBFDD6;
+							border-radius: 6rpx 6rpx 6rpx 6rpx;
+							text-align: center;
+							line-height: 42rpx;
+							margin-left: 28rpx;
+							font-size: 24rpx;
+							color: #fff;
+						}
+					}
+				}
+			}
+		}
+		
 
 		.tip_box {
 			position: fixed;
@@ -1385,101 +1589,6 @@
 			}
 		}
 
-		.info_card {
-			background: #FFFFFF;
-			margin: 20rpx;
-			border-radius: 16rpx;
-			box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
-			overflow: hidden;
-
-			.info_tit {
-				display: flex;
-				flex-wrap: nowrap;
-				padding: 28rpx 32rpx;
-				font-weight: 600;
-				font-size: 32rpx;
-				color: #2C3E50; // 更深的标题颜色
-
-				.money {
-					margin-left: auto;
-					font-weight: 500;
-					font-size: 32rpx;
-					color: #3498DB; // 更新强调色
-				}
-			}
-
-			.lines {
-				width: 100%;
-				border-bottom: 1rpx solid #EEF2F6; // 更细更柔和的分割线
-			}
-
-			.cont {
-				padding: 32rpx;
-
-				.info_li {
-					width: 100%;
-					display: flex;
-					flex-wrap: nowrap;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #94A3B8; // 更新次要文字颜色
-					margin-bottom: 16rpx; // 增加行间距
-
-					span {
-						color: #334155; // 更新主要文字颜色
-						margin-left: 8rpx;
-					}
-
-					.half_infoli {
-						display: flex;
-						flex-wrap: nowrap;
-						width: 50%;
-						font-weight: 400;
-						font-size: 28rpx;
-						color: #94A3B8;
-
-						span {
-							color: #334155;
-							margin-left: 8rpx;
-						}
-					}
-				}
-			}
-		}
-
-		.bot_btn {
-			position: fixed;
-			bottom: 0;
-			display: flex;
-			flex-wrap: wrap;
-			padding: 24rpx;
-			width: 750rpx;
-			background: rgba(255, 255, 255, 0.98);
-			backdrop-filter: blur(10rpx);
-			box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.05);
-
-			.btn {
-				margin: 8rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 160rpx;
-				height: 72rpx;
-				background: #F1F5F9; // 更柔和的按钮背景色
-				border-radius: 12rpx;
-				border: 1rpx solid #E2E8F0;
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #475569;
-				transition: all 0.3s ease;
-
-				&:active {
-					transform: scale(0.98);
-					background: #E2E8F0;
-				}
-			}
-		}
-
 		.map {
 			position: relative;
 			width: 750rpx;
diff --git a/page_shanghu/guanli/order_detail.vue b/page_shanghu/guanli/order_detail.vue
index d24e715..23c92e6 100644
--- a/page_shanghu/guanli/order_detail.vue
+++ b/page_shanghu/guanli/order_detail.vue
@@ -110,7 +110,7 @@
 							记录{{index + 1}}
 						</view>
 						<view class="two">
-							{{item.startTime}}
+							{{item.startTime == null ? '--' : item.startTime}}
 						</view>
 					</view>
 					<view class="bianhao">
@@ -125,9 +125,10 @@
 						</view>
 					</view>
 					<view class="imgs">
-						<view class="" v-for="(img, imgidx) in item.pictures" :key="imgidx">
-							<image :src="img" mode="aspectFill" @click="preview(img, item)"></image>
-						</view>
+						<!-- <view class="" v-for="(img, imgidx) in item.pictures" :key="imgidx"> -->
+							<!-- <image :src="img" mode="aspectFill" @click="preview(img, item)"></image> -->
+							<video v-if="item.finishPicture != null" :src="item.finishPicture"></video>
+						<!-- </view> -->
 					</view>
 				</view>
 				<view class="btn_cont" v-if="orderxqobj.status == 'WAIT_VERIFY'">
diff --git a/page_shanghu/guanli/yunying.vue b/page_shanghu/guanli/yunying.vue
index 21c50da..24beac7 100644
--- a/page_shanghu/guanli/yunying.vue
+++ b/page_shanghu/guanli/yunying.vue
@@ -20,10 +20,10 @@
 						账户余额（元）
 					</view>
 					<view class="price">
-						{{infoobj.balance == null ? '--' : '￥' + qbobj.user.balance}}
+						{{infoobj.balance == null ? '￥0.00' : '￥' + infoobj.balance.toFixed(2)}}
 					</view>
 					<view class="ljtx">
-						累积提现：3456.23
+						累积提现：{{successAmount == null ? '￥0.00' : '￥' + successAmount.toFixed(2)}}
 					</view>
 				</view>
 				<view class="rt">
@@ -46,7 +46,7 @@
 				</view>
 				<view class="li">
 					<view class="top">
-						{{(Number(qbobj.bonus.amount) - Number(qbobj.bonusRefund.amount)).toFixed(2) == null ? '--' : '￥' +  (Number(qbobj.bonus.amount) - Number(qbobj.bonusRefund.amount)).toFixed(2)}}
+						{{(Number(qbobj.bonus.amount) - Number(qbobj.bonusRefund.amount)).toFixed(2) == null ? '￥0.00' : '￥' +  (Number(qbobj.bonus.amount) - Number(qbobj.bonusRefund.amount)).toFixed(2)}}
 					</view>
 					<view class="bot">
 						累计分成
@@ -54,7 +54,7 @@
 				</view>
 				<view class="li">
 					<view class="top">
-						{{(Number(qbobj.order.payAmount) - Number(qbobj.orderRefund.amount)).toFixed(2) == null ? '--' : '￥' +  (Number(qbobj.order.payAmount) - Number(qbobj.orderRefund.amount)).toFixed(2)}}
+						{{(Number(qbobj.order.payAmount) - Number(qbobj.orderRefund.amount)).toFixed(2) == null ? '￥0.00' : '￥' +  (Number(qbobj.order.payAmount) - Number(qbobj.orderRefund.amount)).toFixed(2)}}
 					</view>
 					<view class="bot">
 						订单金额 
@@ -62,7 +62,7 @@
 				</view>
 				<view class="li">
 					<view class="top">
-						{{qbobj.order.count == null ? '--' : qbobj.order.count + '笔'}}
+						{{qbobj.order.count == null ? '0' : qbobj.order.count + '笔'}}
 					</view>
 					<view class="bot">
 						订单数量
@@ -107,7 +107,7 @@
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uUjJxrOO6zHPzjT0Srl4" mode=""></image>
 					<view class="top">
 						<view class="topwz">
-							{{yunyingobj.order.count == null ? '--' : yunyingobj.order.count + '笔'}}
+							{{yunyingobj.order.count == null ? '0' : yunyingobj.order.count + '笔'}}
 						</view>
 						<view class="botwz">
 							订单数量
@@ -115,7 +115,7 @@
 					</view>
 					<view class="top">
 						<view class="topwz">
-							{{yunyingobj.order.payAmount == null ? '--' : '￥' + yunyingobj.order.payAmount.toFixed(2)}}
+							{{yunyingobj.order.payAmount == null ? '￥0.00' : '￥' + yunyingobj.order.payAmount.toFixed(2)}}
 						</view>
 						<view class="botwz">
 							订单金额
@@ -134,7 +134,7 @@
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uCWFSrIsbEaQdKHWZv7U" mode=""></image>
 					<view class="top">
 						<view class="topwz">
-							{{yunyingobj.bonus.count == null ? '--' : yunyingobj.bonus.count + '笔'}}
+							{{yunyingobj.bonus.count == null ? '0' : yunyingobj.bonus.count + '笔'}}
 						</view>
 						<view class="botwz">
 							分成数量
@@ -142,7 +142,7 @@
 					</view>
 					<view class="top">
 						<view class="topwz">
-							{{(Number(yunyingobj.bonus.amount) - Number(yunyingobj.bonusRefund.amount)).toFixed(2) == null ? '--' : '￥' + (Number(yunyingobj.bonus.amount) - Number(yunyingobj.bonusRefund.amount)).toFixed(2)}}
+							{{(Number(yunyingobj.bonus.amount) - Number(yunyingobj.bonusRefund.amount)).toFixed(2) == null ? '￥0.00' : '￥' + (Number(yunyingobj.bonus.amount) - Number(yunyingobj.bonusRefund.amount)).toFixed(2)}}
 						</view>
 						<view class="botwz">
 							分成金额
@@ -387,6 +387,7 @@
                 	backgroundColor: "#fff",
                 },
 				index:0,
+				successAmount:'',
 				riqiindex:0,
 				oneparams: {
 					year: true,
@@ -417,10 +418,8 @@
 
 		},
 		onShow() {
-			this.getqb()
 			this.getinfo()
 			this.getCurrentDate(this.riqiindex)
-			this.gettongji()
 		},
 		methods: {
 			// 请求个人信息
@@ -428,13 +427,16 @@
 			    this.$u.get(`/getInfo`).then(res => {
 			        if (res.code == 200) {
 			            this.infoobj = res.user
+						this.successAmount = res.stat.withdraw.successAmount
+						this.gettongji()
+						this.getqb()
 			        }
 			    })
 			}, 
 			// 请求全部运营统计数据
 			getqb() {
 			    let StatKeys = 'order_user_count,order_count,order_pay_amount,order_refund_amount,bonus_count,bonus_amount,bonus_refund_amount,bonus_refund_amount,user_balance'
-			    this.$u.get(`/dashboard/stat?keys=${StatKeys}&dateRange=`).then(res => {
+			    this.$u.get(`/dashboard/stat?keys=${StatKeys}&dateRange=&bonusUserId=${this.infoobj.userId}`).then(res => {
 			        if (res.code == 200) {
 			            this.qbobj = res.data
 			        }
@@ -443,7 +445,7 @@
 			// 请求筛选运营统计数据
 			gettongji() {
 			    let StatKeys = 'order_user_count,order_count,order_pay_amount,order_refund_amount,bonus_count,bonus_amount,bonus_refund_amount,bonus_refund_amount,user_balance'
-			    this.$u.get(`/dashboard/stat?keys=${StatKeys}&dateRange=${this.kstime + ',' + this.jstime}`).then(res => {
+			    this.$u.get(`/dashboard/stat?keys=${StatKeys}&dateRange=${this.kstime + ',' + this.jstime}&bonusUserId=${this.infoobj.userId}`).then(res => {
 			        if (res.code == 200) {
 			            this.yunyingobj = res.data
 			        }
diff --git a/page_user/guzhang/index.vue b/page_user/guzhang/index.vue
index 44a4386..d020037 100644
--- a/page_user/guzhang/index.vue
+++ b/page_user/guzhang/index.vue
@@ -28,17 +28,18 @@
 		</view>
 		<view class="cardbox">
 			<view class="tip">
-			请对故障部位拍照
+				请对故障部位拍照
 			</view>
 			<view class="icon">
-			
+
 				<view class="imgbox" v-for="(item,index) in imglist " :key="index">
-					<image :src="item" mode=""></image>
+					<image :src="item" mode="aspectFill"></image>
 				</view>
 				<view class="imgbox" @click="btn">
-					<image src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode="aspectFill"></image>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode="aspectFill">
+					</image>
 				</view>
-			
+
 			</view>
 		</view>
 		<view class="btn" @click="sub()">
@@ -57,15 +58,16 @@
 				bgc: {
 					backgroundColor: "#fff",
 				},
-				cbgz: ['车头','车灯'],
-				csgz: ['车座','车把','轮胎'],
+				cbgz: ['车头', '车灯'],
+				csgz: ['车座', '车把', '轮胎'],
 				tsgz: ['其他'],
 				textValue: '',
 				currentCount: 0,
 				imglist: [],
 				token: '',
-				sn:'',
-				upurl:''
+				sn: '',
+				upurl: '',
+				btnflag: true
 			}
 		},
 		onShow() {
@@ -102,47 +104,52 @@
 		},
 		methods: {
 			// 点击跳转到故障记录
-			btnzgjl(){
+			btnzgjl() {
 				uni.navigateTo({
-					url:'/page_user/guzhang/guzhanglv'
+					url: '/page_user/guzhang/guzhanglv'
 				})
 			},
-			sub(){
-				 let data = {
-						faultDetail:this.textValue,
-						vehicleCode:this.sn,
-				        faultSite:'',
-						picture:this.imglist.join(',')
-				    }
-					console.log(data,'dadadad');
-					this.$u.post("/app/fault",data).then((res) => {
+			sub() {
+				if (this.btnflag == true) {
+					this.btnflag = false
+					let data = {
+						faultDetail: this.textValue,
+						vehicleCode: this.sn,
+						faultSite: '',
+						picture: this.imglist.join(',')
+					}
+					console.log(data, 'dadadad');
+					this.$u.post("/app/fault", data).then((res) => {
 						if (res.code == 200) {
 							uni.showToast({
 								title: '提交成功',
 								icon: 'success',
 								duration: 1000
 							})
-							setTimeout(()=>{
-								 uni.navigateBack({
-								        delta: 1,
-								    })
-							},1100)
-						}else if(res.code == 401){
+							setTimeout(() => {
+								this.btnflag = true
+								uni.navigateBack({
+									delta: 1,
+								})
+							}, 1100)
+						} else if (res.code == 401) {
+							this.btnflag = true
 							uni.showModal({
 								title: '提示',
 								content: '您当前未登录，是否前去登录？',
 								showCancel: true,
-								success: function (res) {
+								success: function(res) {
 									if (res.confirm) {
 										uni.reLaunch({
-											url:'/pages/login/login'
+											url: '/pages/login/login'
 										})
 									} else if (res.cancel) {
-										
+
 									}
 								}
 							})
-						} else{
+						} else {
+							this.btnflag = true
 							uni.showToast({
 								title: res.msg,
 								icon: 'none',
@@ -150,22 +157,32 @@
 							})
 						}
 					})
+				}
 			},
 			getQiniuToken() {
 				this.$u.get("/common/qiniuToken").then((res) => {
 					if (res.code == 200) {
-					this.token=res.data
-					console.log(res,'resres')
+						this.token = res.data
+						console.log(res, 'resres')
 					}
 				})
 			},
-			getlist(){
+			getlist() {
 				// checked
 				this.$u.get("/appVerify/fault/allList?dictType=et_fault_type").then((res) => {
 					if (res.code == 200) {
-						 this.cbgz = res.data.headstock.map(item => ({...item, checked: false}))
-					    this.csgz = res.data.body.map(item => ({...item, checked: false}))
-					    this.tsgz = res.data.special.map(item => ({...item, checked: false}))
+						this.cbgz = res.data.headstock.map(item => ({
+							...item,
+							checked: false
+						}))
+						this.csgz = res.data.body.map(item => ({
+							...item,
+							checked: false
+						}))
+						this.tsgz = res.data.special.map(item => ({
+							...item,
+							checked: false
+						}))
 					} else {
 						uni.showToast({
 							title: '未登录，请登录后尝试',
@@ -179,10 +196,10 @@
 				this.cbgz[index].checked = !this.cbgz[index].checked
 				this.$forceUpdate()
 			},
-			csCheckbox(index){
+			csCheckbox(index) {
 				this.csgz[index].checked = !this.csgz[index].checked
 			},
-			tsCheckbox(index){
+			tsCheckbox(index) {
 				this.tsgz[index].checked = !this.tsgz[index].checked
 			},
 			hidePlaceholder() {
@@ -201,13 +218,13 @@
 						let sn = null;
 						let queryParams = res.result.split('?')[1]
 						if (queryParams) {
-						    let params = queryParams.split('&')
-						    params.forEach(param => {
-						        let [key, value] = param.split('=')
-						        if (key === 's') {
-						            sn = value
-						        }
-						    })
+							let params = queryParams.split('&')
+							params.forEach(param => {
+								let [key, value] = param.split('=')
+								if (key === 's') {
+									sn = value
+								}
+							})
 						}
 						this.sn = sn
 					},
@@ -237,10 +254,10 @@
 								key: 'smartmeter/img/' + math
 							},
 							success: function(res) {
-								console.log(res,'resres');
+								console.log(res, 'resres');
 								let str = JSON.parse(res.data)
 								console.log(str.key)
-								_this.userImgs = 'https://api.ccttiot.com/'+ str.key
+								_this.userImgs = 'https://api.ccttiot.com/' + str.key
 								console.log(_this.userImgs)
 								_this.imglist.push(_this.userImgs)
 							}
@@ -270,7 +287,8 @@
 	.page {
 		width: 750rpx;
 		padding-bottom: 200rpx;
-		.sbjl{
+
+		.sbjl {
 			width: 750rpx;
 			margin-top: 20rpx;
 			justify-content: center;
@@ -278,12 +296,14 @@
 			align-items: center;
 			font-size: 28rpx;
 			color: #3D3D3D;
-			image{
+
+			image {
 				width: 40rpx;
 				height: 40rpx;
 			}
 		}
-		.btn{
+
+		.btn {
 			position: fixed;
 			left: 34rpx;
 			bottom: 80rpx;
@@ -299,6 +319,7 @@
 			font-size: 40rpx;
 			color: #FFFFFF;
 		}
+
 		.cardbox {
 			margin: 30rpx auto;
 			width: 680rpx;
@@ -306,6 +327,7 @@
 			background: #FFFFFF;
 			box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
+
 			.tip {
 				display: flex;
 				flex-wrap: nowrap;
@@ -313,6 +335,7 @@
 				font-size: 32rpx;
 				color: #3D3D3D;
 				line-height: 44rpx;
+
 				.ipnt {
 					margin-top: 10rpx;
 					margin-right: 12rpx;
@@ -320,6 +343,7 @@
 					font-size: 48rpx;
 				}
 			}
+
 			.iptbox {
 				display: flex;
 				align-items: center;
@@ -328,10 +352,12 @@
 				height: 80rpx;
 				border-radius: 20rpx 20rpx 20rpx 20rpx;
 				border: 2rpx solid #979797;
+
 				.ips {
 					margin-left: 30rpx;
 					width: 80%;
 				}
+
 				.iptbtn {
 					display: flex;
 					align-items: center;
@@ -340,25 +366,30 @@
 					height: 80rpx;
 					background: #4C97E7;
 					border-radius: 20rpx 20rpx 20rpx 20rpx;
+
 					image {
 						width: 37rpx;
 						height: 37rpx;
 					}
 				}
 			}
+
 			.txt {
 				margin-top: 18rpx;
 				font-weight: 400;
 				font-size: 28rpx;
 				color: #3D3D3D;
 			}
+
 			.icon {
 				display: flex;
 				flex-wrap: wrap;
 				align-items: center;
 				margin-top: 40rpx;
+
 				.imgbox {
 					width: 33%;
+
 					image {
 						width: 142rpx;
 						height: 142rpx;
@@ -366,13 +397,14 @@
 					}
 				}
 			}
+
 			.checkbox {
 				display: flex;
 				flex-wrap: wrap;
 
 				.check_li {
 					position: relative;
-					 margin-right: 10rpx;
+					margin-right: 10rpx;
 					margin-top: 18rpx;
 					display: flex;
 					align-items: center;
@@ -381,7 +413,8 @@
 					height: 65rpx;
 					border-radius: 20rpx 20rpx 20rpx 20rpx;
 					border: 2rpx solid #C7C7C7;
-					image{
+
+					image {
 						position: absolute;
 						right: 0;
 						bottom: 0;
@@ -389,15 +422,18 @@
 						height: 20rpx;
 					}
 				}
+
 				.check_li:nth-child(4n) {
-				  margin-right: 0;
+					margin-right: 0;
 				}
+
 				.act1 {
 					width: 142rpx;
 					height: 65rpx;
-					 border: 2rpx solid #1E807A;
+					border: 2rpx solid #1E807A;
 				}
 			}
+
 			.input-container {
 				position: relative;
 				width: 612rpx;
@@ -411,7 +447,7 @@
 				box-sizing: border-box;
 				border: 2rpx solid #C7C7C7;
 			}
-			
+
 			.placeholder {
 				position: absolute;
 				top: 18rpx;
@@ -421,6 +457,7 @@
 				pointer-events: none;
 				/* 确保点击事件可以穿透到textarea上 */
 			}
+
 			.custom-textarea {
 				width: 100%;
 				height: 100%;
@@ -431,7 +468,7 @@
 				box-sizing: border-box;
 				border: 1px solid #ccc;
 			}
-			
+
 			.word-count {
 				position: absolute;
 				right: 10px;
diff --git a/page_user/hcshenhe.vue b/page_user/hcshenhe.vue
index 79098f8..b4e26e7 100644
--- a/page_user/hcshenhe.vue
+++ b/page_user/hcshenhe.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="拍照还车" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' height='45'
+		<u-navbar title="还车" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' height='45'
 			back-icon-color='#fff'></u-navbar>
 		<view class="tip_box">
 			请将车辆正确停放指定停车点后，环绕车拍摄视 频，押金将在审核通过后退还账户
@@ -10,23 +10,39 @@
 				我们将在12小时内完成审核
 			</view>
 			<view class="vadio_png1">
-				<image class="backimg" src="https://lxnapi.ccttiot.com/bike/img/static/uEP0UPJw6a1WuxA7ZlMo" mode="" v-if="videoUrl==''"></image>
-				<image  @click="recordVideo" class="tip_img" src="https://lxnapi.ccttiot.com/bike/img/static/uXFG7Vee8MWx5y7pha2U" mode="" v-if="videoUrl==''"></image>
+				<image @click="recordVideo" class="backimg" src="https://api.ccttiot.com/smartmeter/img/static/uTwV4aH6HbxqmM1ssvTs" mode="" v-if="videoUrl==''"></image>
 				<video class="vad" :src="videoUrl" controls="controls" style="width: 100%;" v-if="videoUrl!=''"></video>
-				<!-- <view class="glass" v-if="videoUrl!=''"></view>
-				<image class="tip_img" src="https://lxnapi.ccttiot.com/bike/img/static/uXFG7Vee8MWx5y7pha2U" mode="" v-if="videoUrl!=''"></image> -->
 			</view>
-			<view class="tip_txt" style="font-weight: 500;font-size: 32rpx;color: #3D3D3D;">
+			<view class="tip_txt" style="font-weight: 500;font-size: 32rpx;color: #3D3D3D;margin-top: 30rpx;">
 				保持车辆录像的完整清晰,不要随意拍摄，确保视频中车辆出境，并且出现车牌号
 			</view>
 			<view class="vadio_png">
-				<image src="https://lxnapi.ccttiot.com/bike/img/static/uVuGMvfe3xlz3x8WSmcC" mode=""></image>
+				<image src="https://api.ccttiot.com/smartmeter/img/static/unL4myQWRXAKWCmKof4j" mode=""></image>
 			</view>
 			
 			<view class="btn" @click="sub" :class='videoUrl!="" ? "act1": ""'>
 				还车
 			</view>
 		</view>
+		<!-- 扫码用车未在停车点内还车弹窗 -->
+		<view class="tingchetc" v-if="fjflag">
+			<view class="topname">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uDfEXjApmdS6ByM88pv3" mode=""></image> {{fajinobj.manageFee > 0 ? '不在运营区' : fajinobj.dispatchFee > 0 ? '不在停车点' : ''}}
+			</view>
+			<view class="shuom">
+				需支付<text>{{fajinobj.manageFee > 0 ? fajinobj.manageFee : fajinobj.dispatchFee > 0 ? fajinobj.dispatchFee : ''}}元</text>，你可查看<text @click="btntcd">最近停车点</text>
+			</view>
+			<image src="https://api.ccttiot.com/smartmeter/img/static/uzRrRFiToK3bb3IurIHU" class="tcimg" mode=""></image>
+			<view class="btnan">
+				<view class="fj" @click="btnfajin">
+					缴纳罚金还车
+				</view>
+				<view class="qx" @click="fjflag = false">
+					继续骑行
+				</view>
+			</view>
+		</view>
+		<view class="mask" v-if="fjflag"></view>
 	</view>
 </template>
 
@@ -43,18 +59,32 @@
 				upurl:'',
 				orderinfo:{},
 				userId:'',
-				videoUrl:''
-				
+				videoUrl:'',
+				fjflag:false,
+				fajinobj:{},
+				orderAreaId:''
 			}
 		},
 		onLoad(e) {
             this.orderId = e.orderid
+			this.orderAreaId = e.orderAreaId
 		},
 		onShow() {
 			this.getQiniuToken()
 			// this.getuserInfo()
 		},
 		methods: {
+			// 点击缴纳罚金继续还车
+			btnfajin(){
+				this.fjflag = false
+				this.gethc()
+			},
+			// 点击跳转到最近停车点
+			btntcd(){
+				uni.navigateTo({
+					url:'/pages/myorder/returned/tingche?areaId=' + this.orderAreaId
+				})
+			},
 			sub(){
 				uni.getLocation({
 					type: 'wgs84', 
@@ -70,7 +100,27 @@
 					}
 				})
 			},
+			// 点击还车判断是否需要另外缴费
 			getfeiyong(){
+				let data = {
+					orderId:this.orderId,
+					lon:this.lat,
+					lat:this.lon
+				}
+				this.$u.post(`/app/order/calcFee`,data).then(res =>{
+					if(res.code == 200){
+						this.fajinobj = res.data
+						if(res.data.manageFee > 0 || res.data.dispatchFee > 0){
+							this.fjflag = true 
+							// this.gethc()
+						}else{
+							// this.fjflag = true 
+							this.gethc()
+						}
+					}
+				})
+			},
+			gethc(){
 				let data = {
 					orderId:this.orderId,
 					picture:this.videoUrl,
@@ -209,7 +259,81 @@
 	page {
 		background-color: #F7FAFE;
 	}
-
+    .mask{
+    	width: 100%;
+    	height: 100vh;
+    	position: fixed;
+    	top: 0;
+    	left: 0;
+    	background-color: rgba(0, 0, 0, .3);
+    	z-index: 9;
+    }
+    .tingchetc{
+    	width: 624rpx;
+    	height: 610rpx;
+    	background: #FFFFFF;
+    	border-radius: 20rpx 20rpx 20rpx 20rpx;
+    	position: fixed;
+    	left: 50%;
+    	transform: translateX(-50%);
+    	top: 572rpx;
+    	z-index: 10;
+    	padding: 28rpx 36rpx;
+    	box-sizing: border-box;
+    	.btnan{
+    		display: flex;
+    		justify-content: space-between;
+    		margin-top: 40rpx;
+    		.fj{
+    			width: 252rpx;
+    			height: 72rpx;
+    			border-radius: 45rpx 45rpx 45rpx 45rpx;
+    			border: 2rpx solid #808080;
+    			font-weight: 600;
+    			font-size: 32rpx;
+    			color: #808080;
+    			text-align: center;
+    			line-height: 72rpx;
+    		}
+    		.qx{
+    			width: 252rpx;
+    			height: 72rpx;
+    			background: #4C97E7;
+    			border-radius: 45rpx 45rpx 45rpx 45rpx;
+    			text-align: center;
+    			line-height: 72rpx;
+    			box-sizing: border-box;
+    			font-weight: 600;
+    			font-size: 32rpx;
+    			color: #FFFFFF;
+    		}
+    	}
+    	.tcimg{
+    		width: 552rpx;
+    		height: 300rpx;
+    		margin-top: 28rpx;
+    	}
+    	.shuom{
+    		font-size: 26rpx;
+    		color: #3D3D3D;
+    		margin-top: 18rpx;
+    		text{
+    			color: #4C97E7;
+    		}
+    	}
+    	.topname{
+    		font-weight: 600;
+    		font-size: 36rpx;
+    		color: #3D3D3D;
+    		display: flex;
+    		align-items: center;
+    		image{
+    			width: 48rpx;
+    			height: 48rpx;
+    			margin-right: 14rpx;
+    		}
+    	}
+    }
 	.page {
 		// width: 750rpx;
 		width: 750rpx;
diff --git a/page_user/huanbike.vue b/page_user/huanbike.vue
index 4dbf609..dcf0903 100644
--- a/page_user/huanbike.vue
+++ b/page_user/huanbike.vue
@@ -85,15 +85,22 @@
 		<view class="cont_box" v-show="checkIdx == 2 || orderobj.orderAreaReturnVerify == true">
 			<view class="tit">
 				<image src="https://lxnapi.ccttiot.com/bike/img/static/uByIrgaV23PDGZWReKHW" mode=""></image>
-				请对车辆部位拍照
+				请对车辆部位拍摄视频
 			</view>
-			<view class="icon">
+			<!-- <view class="icon">
 				<view class="imgbox" v-for="(item, index) in imglist " :key="index">
 					<image :src="item" mode=""></image>
 				</view>
 				<view class="imgbox" @click="btn">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode=""></image>
 				</view>
+			</view> -->
+			<view class="vadio_png1">
+				<image @click="recordVideo" class="backimg" src="https://api.ccttiot.com/smartmeter/img/static/uTwV4aH6HbxqmM1ssvTs" mode="" v-if="videoUrl==''"></image>
+				<video class="vad" :src="videoUrl" controls="controls" style="width: 100%;" v-if="videoUrl!=''"></video>
+			</view>
+			<view class="tip_txt" style="font-weight: 500;font-size: 32rpx;color: #3D3D3D;margin-top: 30rpx;">
+				保持车辆录像的完整清晰,不要随意拍摄，确保视频中车辆出境，并且出现车牌号
 			</view>
 		</view>
 
@@ -124,7 +131,9 @@ export default {
 			feiyong:'',
 			timeRemaining: "",
 			latitude:'',
-			longitude:''
+			longitude:'',
+			videoPath:'',
+			
 		}
 	},
 	onLoad(e) {
@@ -151,6 +160,48 @@ export default {
 		
 	},
 	methods: {
+		recordVideo() {
+			// 调用录像API
+			uni.chooseVideo({
+				sourceType: ['camera'], // 指定使用相机录像
+				camera: 'back', // 指定使用后置摄像头，可选值有front、back
+				maxDuration: 15, // 最大录制时长（秒）
+				success: (res) => {
+					// 获取视频录制文件的临时路径
+					this.videoPath = res.tempFilePath;
+					console.log(res.tempFilePath);
+					this.upload()
+				},
+				fail: (err) => {
+					console.log('录像失败：', err);
+				}
+			});
+		},
+		upload(){
+			uni.showLoading({
+				title:'上传中'
+			})
+			let _this=this
+			let math='static/'+_this.$u.guid(20)
+			wx.uploadFile({
+				url: 'https://up-z2.qiniup.com', 
+				name: 'file',
+				filePath: this.videoPath,
+				formData: {
+					token: _this.token, //后端返回的token
+					key:'bike/video/'+math
+				},
+				success: function(res) {
+					uni.hideLoading()
+					console.log(res,'resres');
+					let str = JSON.parse(res.data)
+					console.log(str.key)
+					_this.videoUrl = 'https://api.ccttiot.com/' + str.key
+					// console.log(_this.userImgs)
+					// _this.imglist.push(_this.userImgs)
+				}
+			});
+		},
 		// 点击进行换车
 		subs(){
 			uni.showLoading({
@@ -163,15 +214,15 @@ export default {
 			}else{
 				reason = 'DEVICE_FAULT'
 			}
-			if(this.imglist.length > 0){
-				faultPicture = this.imglist.join(',')
-			}
+			// if(this.imglist.length > 0){
+			// 	faultPicture = this.imglist.join(',')
+			// }
 			let data = {
 				orderId:this.orderid,
 				deviceSn:this.bikesn,
 				reason:reason,
 				faultDetail:this.textValue,
-				faultPicture:faultPicture,
+				faultPicture:this.videoUrl,
 				lat:this.latitude,
 				lon:this.longitude
 			}
@@ -707,7 +758,48 @@ page {
 		background: #FFFFFF;
 		box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
 		border-radius: 20rpx 20rpx 20rpx 20rpx;
-
+        .vadio_png1{
+        	position: relative;
+        	width: 100%;
+        	height: 340rpx;
+        	margin-top: 30rpx;
+        	.backimg{
+        		
+        		width: 100%;
+        		height: 340rpx;
+        		
+        	}
+        	.tip_img{
+        		position: absolute;
+        		top: 72rpx;
+        		left: 210rpx;
+        		width: 252rpx;
+        		height: 194rpx;
+        			z-index: 11;
+        	}
+        	.vad{
+        		width: 100%;
+        		height: 370rpx;
+        		border-radius: 40rpx;
+        		z-index: 1;
+        	}
+        	.glass{
+        		position: absolute;
+        		top: 0;
+        		left: 0;
+        		width: 100%;
+        		height: 340rpx;
+        		background: rgba(255, 255, 255, 0.2);
+        		border-radius: 40rpx;
+        		// box-shadow: 0 rgba(0, 0, 0, 0.1);
+        		backdrop-filter: blur(10rpx);
+        		-webkit-backdrop-filter: blur(10rpx); /* For Safari */
+        		// border: 1rpx solid rgba(255, 255, 255, 0.3);
+        		z-index: 10;
+        		  
+        	}
+        	
+        }
 		.tit {
 			width: 100%;
 			display: flex;
diff --git a/page_user/returnbike.vue b/page_user/returnbike.vue
index c773207..2c2b5e1 100644
--- a/page_user/returnbike.vue
+++ b/page_user/returnbike.vue
@@ -42,7 +42,8 @@
 					</view>
 					<view class="img">
 						<view class="" v-for="(img, imgidx) in parsePictures(pic.finishPicture)" :key="imgidx">
-							<image :src="img" mode="aspectFill" @click="preview(img, pic)"></image>
+							<!-- <image :src="img" mode="aspectFill" @click="preview(img, pic)"></image> -->
+							<video :src="img"></video>
 						</view>
 					</view>
 				</view>
diff --git a/page_user/shiming.vue b/page_user/shiming.vue
index 06b7bb3..d8aaa70 100644
--- a/page_user/shiming.vue
+++ b/page_user/shiming.vue
@@ -54,7 +54,8 @@
 				tel:'',
 				name:'',
 				zfzh:'',
-				isReal:false
+				isReal:false,
+				backData: null
 			}
 		},
 		onLoad(option) {
@@ -66,12 +67,54 @@
 				this.zfzh = JSON.parse(option.user).realIdCard
 			}
 		},
+		onShow() {
+			 if (this.backData == true) {
+			    console.log('接收数据:', this.backData);
+			    this.getshuaxin();
+			    this.backData = null; // 重置
+			  }
+		},
 		methods: {
+			// 刷新人脸识别是否成功
+			getshuaxin(){
+				this.$u.get('/app/realName/refreshRealName').then(res => {
+					if(res.code == 200){
+						if(res.data.pass == true){
+							let realNameType = res.data.realNameType
+							let infoId = res.data.infoId
+							uni.showModal({
+								title: '温馨提示',
+								content: `人脸认证成功`,
+								showCancel: false,
+								success: function(res) {
+									uni.navigateBack()
+								}
+							})
+						}else{
+							uni.showModal({
+								title: '温馨提示',
+								content: `人脸认证失败`,
+								showCancel: false,
+								success: function(res) {
+									uni.navigateBack()
+								}
+							})
+						}
+					}else{
+						uni.showModal({
+							title: '温馨提示',
+							content: `人脸认证失败`,
+							showCancel: false,
+							success: function(res) {
+								uni.navigateBack()
+							}
+						})
+					}
+				})
+			},
 			// 自定义返回
 			btnfh(){
-				uni.switchTab({
-					url:'/pages/my'
-				})
+				uni.navigateBack()
 			},
 			// 点击进行实名认证
 			btnshiming(){
@@ -83,6 +126,7 @@
 				this.$u.put(`/app/realName/realName`,data).then(res =>{
 					if(res.code == 200){
 						let https = encodeURIComponent(res.data.jumpUrl)
+						this.backData = true
 						uni.navigateTo({
 							url:'/page_fenbao/renlian?https=' + https
 						})
diff --git a/page_user/yijian.vue b/page_user/yijian.vue
index c781e92..cda82e3 100644
--- a/page_user/yijian.vue
+++ b/page_user/yijian.vue
@@ -74,7 +74,8 @@
 				token: '',
 				contact: '',
 				picdomain:'',
-				userId:''
+				userId:'',
+				btnflag:true
 			}
 		},
 		computed: {
@@ -135,25 +136,8 @@
 				this.currentCount = this.textValue.trim().replace(/\s+/g, '').length
 			},
 			sub() {
-				if (this.cutidx == -1) {
-					uni.showToast({
-						title: '请选择反馈类型',
-						icon: 'none',
-						duration: 2000
-					})
-				} else if (this.textValue == '') {
-					uni.showToast({
-						title: '请输入问题描述',
-						icon: 'none',
-						duration: 2000
-					})
-				} else if (this.contact == '') {
-					uni.showToast({
-						title: '请输入联系方式',
-						icon: 'none',
-						duration: 2000
-					})
-				}  else {
+				if(this.btnflag == true){
+					this.btnflag = false
 					var imgString = this.imglist.join(',')
 					let data = {
 						userId:this.userId,
@@ -170,11 +154,35 @@
 								duration: 2000
 							})
 							setTimeout(()=>{
+								this.btnflag = true
 								uni.navigateBack()
 							},1500)
+						}else if(res.code == 401){
+							this.btnflag = true
+							uni.showModal({
+								title: '提示',
+								content: '您当前未登录，是否前去登录？',
+								showCancel: true,
+								success: function(res) {
+									if (res.confirm) {
+										uni.reLaunch({
+											url: '/pages/login/login'
+										})
+									} else if (res.cancel) {
+							
+									}
+								}
+							})
+						}else{
+							this.btnflag = true
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							})
 						}
 					})
-				}
+			    }
 			},
 			btn() {
 				let _this = this
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4eb261b..874f6f3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -198,8 +198,8 @@
 			getlunbo(){
 				this.$u.get("/app/ad").then(res => {
 					if(res.code == 200){
-						if(res.rows.length > 0 && res.rows[0] != null){
-							res.rows.forEach(item =>{
+						if(res.data.length > 0 && res.data[0] != null){
+							res.data.forEach(item =>{
 								this.lists.push({
 									image:item.picture,
 									title: item.adId
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 8fba56d..2969f3d 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -13,10 +13,10 @@
 				style="margin-top: 30rpx;">
 				快捷登录
 			</button>
-
-			<!-- <view class="tipss"  @click="pageindex=1" style="width: 100%;text-align: center;margin-top: 50rpx;color: #ccc;">
-				手机号登录
-			</view> -->
+            
+			<view class="tipss"  @click="bdl" style="width: 100%;text-align: center;margin-top: 50rpx;color: #333;position: fixed;z-index: 99;bottom: 60rpx;">
+				暂不登录
+			</view>
 		</view>
 		<view class="page3" v-if="pageindex == 2">
 			<view class="tit">
@@ -279,6 +279,11 @@
 			},
 		},
 		methods: {
+			bdl(){
+				uni.switchTab({
+					url:'/pages/index/index'
+				})
+			},
 			page3(){
 				this.pageindex=3
 				this.phone1=''
diff --git a/pages/my.vue b/pages/my.vue
index 0b2498c..0252092 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -68,7 +68,8 @@
 				</view>
 			</view>
 			<view class="gg">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/uTZBBRuyRexKd6c4VE9d" mode=""></image>
+				<!-- <image src="https://api.ccttiot.com/smartmeter/img/static/uTZBBRuyRexKd6c4VE9d" mode=""></image> -->
+				<u-swiper :list="lists"></u-swiper>
 			</view>
 		</view>
 		
@@ -153,7 +154,8 @@
 				guanliflag:false,
 				adminflag:false,
 				user:{},
-				kefulist:[]
+				kefulist:[],
+				lists:[]
 			}
 		},
 		onLoad() {
@@ -162,8 +164,29 @@
 		onShow() {
 			this.getareaList()
 			this.getkefu()
+			this.getlunbo()
 		},
 		methods: {
+			// 获取广告轮播图
+			getlunbo(){
+				this.$u.get("/app/ad").then(res => {
+					if(res.code == 200){
+						if(res.data.length > 0 && res.data[0] != null){
+							res.data.forEach(item =>{
+								this.lists.push({
+									image:item.picture,
+									title: item.adId
+								})
+							})
+						}else{
+							this.lists.push({
+								image:"https://api.ccttiot.com/smartmeter/img/static/uTZBBRuyRexKd6c4VE9d",
+								title: ""
+							})
+						}
+					}
+				})
+			},
 			// 请求客服
 			getkefu(){
 				this.$u.get(`/app/customerService/list?pageNum=1&pageSize=999`).then(res =>{
@@ -347,6 +370,9 @@
 </script>
 
 <style lang="scss">
+	/deep/ wx-swiper{
+		height: 286rpx !important;
+	}
 	page {
 		background: linear-gradient( 180deg, #CCE5FF 0%, rgba(204,229,255,0) 40%);
 	}
@@ -550,7 +576,7 @@
 		.li{
 			display: flex;
 			justify-content: space-between;
-			height: 80rpx;
+			height: 100rpx;
 			align-items: center;
 			.lt{
 				display: flex;
diff --git a/pages/myorder/returned/index.vue b/pages/myorder/returned/index.vue
index cadfbc3..ed9ba5b 100644
--- a/pages/myorder/returned/index.vue
+++ b/pages/myorder/returned/index.vue
@@ -50,7 +50,7 @@
 				</view>
 				<view class="" @click="btnqd">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uqTfyigsAuNX67k5QY4m" mode=""></image>
-					{{deivceobj.deviceLockStatus == 0 ? '已锁车' : '已开启'}}
+					{{deivceobj.deviceLockStatus == 0 ? '点击开锁' : '临时锁车'}}
 				</view>
 				<view class="" @click="btndaohang">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uNYGQSPt1pxciP1CDp1b" mode=""></image>
@@ -106,22 +106,6 @@
 					</view>
 				</view>
 			</view>
-			<!-- 还车牌照 -->
-			<!-- <view class="cont_box" v-if="orderAreaReturnVerify">
-				<view class="tit">
-					<image src="https://lxnapi.ccttiot.com/bike/img/static/uByIrgaV23PDGZWReKHW" mode=""></image>
-					还车请拍摄车辆照片
-				</view>
-				<view class="icon">
-					<view class="imgbox" v-for="(item, index) in imglist " :key="index">
-						<image :src="item" @click="previewImage(index)" mode="aspectFill"></image>
-						<image @click="btnscpic(index)" src="https://api.ccttiot.com/smartmeter/img/static/uupDDn1ykO99dIgh961m" class="text" mode=""></image>
-					</view>
-					<view class="imgbox" @click="btn">
-						<image src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode=""></image>
-					</view>
-				</view>
-			</view> -->
 			<!-- 还车，换车按钮 -->
 			<view class="anniuhc">
 				<view class="huanche" style="background-color: #fff;border: 1px solid #4297F3;color: #4297F3;" @click="btnghbike">
@@ -163,7 +147,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "rgb(235,240,254)",
+					backgroundColor: "",
 				},
 				cheflag:true,
 				qdtxt:'已关闭',
@@ -190,7 +174,6 @@
 			}
 		},
 		onShow() {
-			this.getQiniuToken()
 			setTimeout(()=>{
 				this.getorderdevice()
 			},100)
@@ -226,52 +209,6 @@
 					}
 				})
 			},
-			// 点击预览图片
-			previewImage(index) {
-			    uni.previewImage({
-			        current: this.imglist[index],
-			        urls: this.imglist    
-			    })
-			},
-			// 点击删除拍摄的照片
-			btnscpic(index){
-				this.imglist.splice(index, 1)
-			},
-			// 请求七牛云上传
-			getQiniuToken() {
-				this.$u.get("/common/qiniuToken").then((res) => {
-					if (res.code == 200) {
-						this.token = res.data
-					}
-				})
-			},
-			// 上传照片
-			btn() {
-				let _this = this
-				let math = 'static/' + _this.$u.guid(20)
-				uni.chooseImage({
-					count: 9,
-					type: 'all',
-					success(res) {
-						const tempFilePaths = res.tempFiles
-						wx.uploadFile({
-							url: 'https://up-z2.qiniup.com',
-							name: 'file',
-							filePath: tempFilePaths[0].path,
-							formData: {
-								token: _this.token, //后端返回的token
-								key: 'smartmeter/img/' + math
-							},
-							success: function (res) {
-								let str = JSON.parse(res.data)
-								let userImgs = 'https://api.ccttiot.com/' + str.key
-								console.log(userImgs)
-								_this.imglist.push(userImgs)
-							}
-						})
-					}
-				})
-			},
 			// 点击去进行换车
 			btnghbike(){
 				uni.navigateTo({
@@ -300,7 +237,7 @@
 			btnhc(){
 				if(this.orderAreaReturnVerify == true){
 					uni.navigateTo({
-						url:'/page_user/hcshenhe?sn=' + this.deivceobj.deviceSn + '&orderid=' + this.deivceobj.orderId
+						url:'/page_user/hcshenhe?sn=' + this.deivceobj.deviceSn + '&orderid=' + this.deivceobj.orderId + '&orderAreaId=' + this.deivceobj.orderAreaId
 					})
 				}else{
 					uni.getLocation({
@@ -421,14 +358,14 @@
 					let that = this
 					uni.showModal({
 						title: '提示',
-						content: '您是否要开启车辆？',
+						content: '您是否要解锁车辆？',
 						showCancel: true,
 						success: function (res) {
 							if (res.confirm) {
 								that.$u.put(`/app/order/openDevice?orderId=${that.deivceobj.orderId}`).then((res) => {
 									if (res.code == 200) {
 									    uni.showToast({
-									    	title: '开启成功',
+									    	title: '解锁成功',
 									    	icon: 'success',
 									    	duration: 2000
 									    })
@@ -447,17 +384,28 @@
 						}
 					})
 				}else if(this.deivceobj.deviceLockStatus == 1){
+					uni.getLocation({
+						type: 'wgs84', 
+						success: (res) => {
+							console.log(res);
+							this.lat = res.latitude
+							this.lon = res.longitude
+						},
+						fail: (err) => {
+							console.error('获取位置失败：', err)
+						}
+					})
 					let that = this
 					uni.showModal({
 						title: '提示',
-						content: '您是否要临时关闭车辆？',
+						content: '您是否要临时锁车？',
 						showCancel: true,
 						success: function (res) {
 							if (res.confirm) {
-								that.$u.put(`/app/order/closeDevice?orderId=${that.deivceobj.orderId}`).then((res) => {
+								that.$u.put(`/app/order/closeDevice?orderId=${that.deivceobj.orderId}&lat=${that.lat}&lon=${that.lon}`).then((res) => {
 									if (res.code == 200) {
 									    uni.showToast({
-									    	title: '临时关闭成功',
+									    	title: '临时锁车成功',
 									    	icon: 'success',
 									    	duration: 2000
 									    })
@@ -544,49 +492,6 @@
 		padding-bottom: 240rpx;
 		box-sizing: border-box;
 	}
-    .cont_box {
-    	margin: 0 auto;
-    	padding: 24rpx 32rpx;
-    	width: 680rpx;
-    	margin-top: 38rpx;
-    	background: #FFFFFF;
-    	box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
-    	border-radius: 20rpx 20rpx 20rpx 20rpx;
-        .icon {
-        	display: flex;
-        	flex-wrap: wrap;
-        	align-items: center;
-        	margin-top: 40rpx;
-        	.imgbox {
-        		width: 200rpx;
-				position: relative;
-				margin-top: 20rpx !important;
-				.text{
-					width: 40rpx;
-					height: 40rpx;
-					position: absolute;
-					top: -10rpx;
-					right: 10rpx;
-				}
-        		image {
-        			width: 180rpx;
-        			height: 180rpx;
-					border-radius: 10rpx;
-        		}
-        	}
-        }
-    	.tit {
-    		width: 100%;
-    		display: flex;
-    		flex-wrap: nowrap;
-    		align-items: center;
-    		image {
-    			margin-right: 12rpx;
-    			width: 24rpx;
-    			height: 24rpx;
-    		}
-    	}
-	}
 	.mask{
 		width: 100%;
 		height: 100vh;
@@ -666,6 +571,10 @@
 		margin-top: 24rpx;
 		padding: 0 26rpx;
 		box-sizing: border-box;
+		height: 78vh;
+		overflow: scroll;
+		padding-bottom: 80rpx;
+		box-sizing: border-box;
 		.anniuhc{
 			display: flex;
 			justify-content: space-between;
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index 022c700..5af58aa 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -1,24 +1,34 @@
 <template>
 	<view class="page">
 		<!-- 地图 -->
-		<image class="picimg" v-if="iconflag"
-				src="https://api.ccttiot.com/smartmeter/img/static/uEAmNMMt65U10qwijrsJ" mode=""></image>
-		<map class='map' id="map" :latitude="latitude" :longitude="longitude" :markers="covers" @markertap="handleMarkerClick" @regionchange="regionchange" :polygons="polyline" :show-location="true"/>
+		<image class="picimg" v-if="iconflag" src="https://api.ccttiot.com/smartmeter/img/static/uEAmNMMt65U10qwijrsJ"
+			mode=""></image>
+		<map class='map' id="map" :latitude="latitude" :longitude="longitude" :markers="covers"
+			@markertap="handleMarkerClick" @regionchange="regionchange" :polygons="polyline" :show-location="true" />
 		<!-- 左侧图标 -->
 		<view class="lticon">
-			<image src="https://api.ccttiot.com/smartmeter/img/static/u8WwVFtQy59eGWWQ9cfy" @click="btnbz" mode=""></image>
+			<image src="https://api.ccttiot.com/smartmeter/img/static/u8WwVFtQy59eGWWQ9cfy" @click="btnbz" mode="">
+			</image>
 			<!-- <image src="https://api.ccttiot.com/smartmeter/img/static/ulCxXq0nQDSfdDWg5Ttw" @click="kefuflag = true" mode=""></image> -->
-			<image src="https://api.ccttiot.com/smartmeter/img/static/uDnm3dpbwMh9jLBRMeZw" @click="btnhuiz" mode=""></image>
+			<image src="https://api.ccttiot.com/smartmeter/img/static/uDnm3dpbwMh9jLBRMeZw" @click="btnhuiz" mode="">
+			</image>
 		</view>
 		<!-- 右侧图标 -->
 		<view class="rticon">
-			<image v-if="rtindex != 1" src="https://api.ccttiot.com/smartmeter/img/static/uyNPBYUMjYxybfRLHyu9" @click="btntap(1)" mode=""></image>
-			<image v-if="rtindex == 1" src="https://api.ccttiot.com/smartmeter/img/static/u8zXd0xYhLKD0BvgZDVv" @click="btntap(1)" mode=""></image>
-			<image v-if="rtindex != 2" src="https://api.ccttiot.com/smartmeter/img/static/unoWsjJjeFKVrivp7MMF" @click="btntap(2)" mode=""></image>
-			<image v-if="rtindex == 2" src="https://api.ccttiot.com/smartmeter/img/static/ukCjlSRsRoqMNNNxcFJ9" @click="btntap(2)" mode=""></image>
-			<image v-if="rtindex != 3" src="https://api.ccttiot.com/smartmeter/img/static/uwIWeuTVbjFLNmLTGPOh" @click="btntap(3)" mode=""></image>
-			<image v-if="rtindex == 3" src="https://api.ccttiot.com/smartmeter/img/static/uEWVQFGBf10XJn8aTlaZ" @click="btntap(3)" mode=""></image>
-			<image style="width: 80rpx;height: 80rpx;" @click="toggleIconAndCallout" src="https://api.ccttiot.com/smartmeter/img/static/uZT6o9OqOdZeXHLYszIg" mode=""></image>
+			<image v-if="rtindex != 1" src="https://api.ccttiot.com/smartmeter/img/static/uyNPBYUMjYxybfRLHyu9"
+				@click="btntap(1)" mode=""></image>
+			<image v-if="rtindex == 1" src="https://api.ccttiot.com/smartmeter/img/static/u8zXd0xYhLKD0BvgZDVv"
+				@click="btntap(1)" mode=""></image>
+			<image v-if="rtindex != 2" src="https://api.ccttiot.com/smartmeter/img/static/unoWsjJjeFKVrivp7MMF"
+				@click="btntap(2)" mode=""></image>
+			<image v-if="rtindex == 2" src="https://api.ccttiot.com/smartmeter/img/static/ukCjlSRsRoqMNNNxcFJ9"
+				@click="btntap(2)" mode=""></image>
+			<image v-if="rtindex != 3" src="https://api.ccttiot.com/smartmeter/img/static/uwIWeuTVbjFLNmLTGPOh"
+				@click="btntap(3)" mode=""></image>
+			<image v-if="rtindex == 3" src="https://api.ccttiot.com/smartmeter/img/static/uEWVQFGBf10XJn8aTlaZ"
+				@click="btntap(3)" mode=""></image>
+			<image style="width: 80rpx;height: 80rpx;" @click="toggleIconAndCallout"
+				src="https://api.ccttiot.com/smartmeter/img/static/uZT6o9OqOdZeXHLYszIg" mode=""></image>
 		</view>
 		<!-- 点击地图门店弹窗 -->
 		<view class="shoptc" v-if="shoptcflag" @click="btnmendain">
@@ -27,7 +37,8 @@
 					云行租车（汇丰公寓）
 				</view>
 				<view class="zu">
-					1辆可租 <image src="https://api.ccttiot.com/smartmeter/img/static/uX3GfXzwzS4GY1J55raG" mode=""></image>
+					1辆可租 <image src="https://api.ccttiot.com/smartmeter/img/static/uX3GfXzwzS4GY1J55raG" mode="">
+					</image>
 				</view>
 			</view>
 			<view class="juli">
@@ -50,19 +61,19 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 车辆弹窗 -->
 		<view class="biketc" v-if="taocanflag">
 			<view class="topfor">
 				<view class="biketop">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/u6u6mWzrgiVCHICU1IWg" mode=""></image>
 					<view class="bianh">
-						<view class="bh">
-							车辆编号：{{cheobj.sn == null ? '--' : cheobj.sn}}
-						</view>
 						<view class="">
 							车牌号：{{cheobj.vehicleNum == null ? '--' : cheobj.vehicleNum}}
 						</view>
+						<view class="bh" style="color: #808080;">
+							车辆编号：{{cheobj.sn == null ? '--' : cheobj.sn}}
+						</view>
 					</view>
 					<view class="bikebeep" @click="btnxlxc">
 						响铃寻车
@@ -74,7 +85,8 @@
 							剩余骑行
 						</view>
 						<view class="bikegongli">
-							<image src="https://api.ccttiot.com/smartmeter/img/static/uLybsyJqWL4siF7mXkXh" mode=""></image> {{cheobj.remainEndurance == null ? '--' : cheobj.remainEndurance}}公里
+							<image src="https://api.ccttiot.com/smartmeter/img/static/uLybsyJqWL4siF7mXkXh" mode="">
+							</image> {{cheobj.remainEndurance == null ? '--' : cheobj.remainEndurance}}公里
 						</view>
 					</view>
 					<view class="bikert">
@@ -82,32 +94,11 @@
 							剩余电量
 						</view>
 						<view class="bikegongli">
-							<image src="https://api.ccttiot.com/smartmeter/img/static/u9y1tZIJBWLsO0DRoweT" mode=""></image> {{cheobj.remainingPower == null ? '--' : cheobj.remainingPower}}%
+							<image src="https://api.ccttiot.com/smartmeter/img/static/u9y1tZIJBWLsO0DRoweT" mode="">
+							</image> {{cheobj.remainingPower == null ? '--' : cheobj.remainingPower}}%
 						</view>
 					</view>
 				</view>
-				<!-- <view class="biketaocan">
-					<view :class="['bikelist',tcindex == index ? 'active' : '']" v-for="(item,index) in taocaolist" :key="index" @click="btntcxz(index)">
-						<view class="bike_item">
-							<image src="https://api.ccttiot.com/smartmeter/img/static/uGddSTtK7UhfNpLzQJDc" mode=""></image>
-							<view class="name">
-								{{item.name == null ? '--' : item.name}}
-							</view>
-							<view class="qibu">
-								<text>起步价</text> <text>{{item.ridingRule == null ? '--' : item.ridingRule}}元</text>(含免费骑行5分钟)
-							</view>
-							<view class="qibu">
-								<text>时长费</text> <text>1.0元/10分钟</text>
-							</view>
-							<view class="qibu">
-								<text>预存费</text> <text>10元</text>
-							</view>
-							<view class="ckxq">
-								查看详情
-							</view>
-						</view>
-					</view>
-				</view> -->
 				<view class="bikeyc" @click="btncheyc">
 					×
 				</view>
@@ -117,10 +108,11 @@
 			</view>
 		</view>
 		<view class="clmask" v-if="taocanflag"></view>
-		
+
 		<!-- 平台客服弹窗 -->
 		<view class="kefutc" v-if="kefuflag">
-			<image src="https://api.ccttiot.com/smartmeter/img/static/umtjJg2CJLiOS6hfAEzo" mode="" @click="kefuflag = false"></image>
+			<image src="https://api.ccttiot.com/smartmeter/img/static/umtjJg2CJLiOS6hfAEzo" mode=""
+				@click="kefuflag = false"></image>
 			<view class="box">
 				<view class="" style="max-height: 170rpx;overflow: scroll;">
 					<view class="top" v-for="(item,index) in kefulist" :key="index">
@@ -147,7 +139,49 @@
 			</view>
 		</view>
 		<view class="mask" v-if="kefuflag"></view>
-		
+         
+		 <!-- 有订单弹窗 -->
+		<view class="conts_box" v-if="orderAreaId != ''" @click="btntz">
+			<view class="orderzt">
+				<view class="" style="font-size: 32rpx;font-weight: 600;">
+					订单状态
+				</view>
+				<view class="">
+					<view style="color: #333;">订单进行中<u-icon name="arrow-right" color="#333" size="28"></u-icon></view>
+				</view>
+			</view>
+		 	<view class="cont_li">
+				<view class="right">
+					<image src="https://lxnapi.ccttiot.com/bike/img/static/uqKmFMF9YHTX8lAQARSd" mode="aspectFill"></image>
+					<view class="NO">
+						SN：{{orderobj.deviceSn == null ? '--' : orderobj.deviceSn}}
+					</view>
+				</view>
+		 		<view class="left">
+		 			<view class="km">
+		 				可继续行驶{{orderobj.deviceRemainEndurance == null ? '--' : orderobj.deviceRemainEndurance}}公里
+		 			</view>
+		 			<view class="speed">
+		 				<view class="speeds" :style="{ width: orderobj.deviceRemainingPower + '%' }"></view>
+		 			</view>
+		 			<view class="NO">
+		 				电量{{orderobj.deviceRemainingPower == null ? '--' : orderobj.deviceRemainingPower}}%
+		 			</view>
+		 		</view>
+		 	</view>
+		 	<view class="" style="display: flex;width: 100%;padding: 0 20rpx;box-sizing: border-box;justify-content: space-between;">
+		 		<view class="dh" @click.stop="danghang">
+		 		     导航 <u-icon name="arrow-right" color="#333" size="28"></u-icon>
+		 		</view>
+		 		<view class="suocheanniu">
+		 			<view class="lssc" @click.stop="btnqd">
+		 				{{orderobj.deviceLockStatus == 1 ? '临时锁车' : '开锁'}}
+		 			</view>
+		 		</view>
+		 	</view>
+		 </view>
+
+
 		<tab-bar :indexs='1'></tab-bar>
 	</view>
 </template>
@@ -156,63 +190,274 @@
 	export default {
 		data() {
 			return {
-               bgc: { 
-               	backgroundColor: "",
-               },
-			   latitude:'',
-			   longitude:'',
-			   rtindex:2,
-			   covers:[],
-			   shoptcflag:false,
-			   iconPath:'',
-			   tcindex:0,
-			   taocanflag:false,
-			   kefuflag:false,
-			   iconflag:false,
-			   cheobj:{},
-			   jingweidu:'',
-			   taocaolist:[],
-			   polyline:[],
-			   kefulist:[]
+				bgc: {
+					backgroundColor: "",
+				},
+				latitude: '',
+				longitude: '',
+				lat:'',
+				lng:'',
+				latsc:'',
+				lngsc:'',
+				rtindex: 2,
+				covers: [],
+				shoptcflag: false,
+				iconPath: '',
+				tcindex: 0,
+				taocanflag: false,
+				kefuflag: false,
+				iconflag: false,
+				cheobj: {},
+				jingweidu: '',
+				taocaolist: [],
+				polyline: [],
+				kefulist: [],
+				orderAreaId: '',
+				areaId: '',
+				orderobj:{},
+				orderAreaReturnVerify:'',
+
+				socketTask: null,
+				reconnectTimer: null,
+				heartbeatTimer: null,
+				dataList: [],
 			}
-		},  
+		},
 		onLoad() {
 
 		},
 		onShow() {
 			this.getMyLocation()
 			this.getkefu()
+			this.getorderdevice()
 			this.polyline = []
 		},
+		onUnload() {
+		    this.socketTask?.close()
+		    this.stopHeartbeat()
+		},
 		methods: {
+			// 使用websocket获取数据
+			initWebSocket() {
+				this.socketTask = uni.connectSocket({
+					url: 'wss://your-websocket-server.com',
+				})
+				this.socketTask.onOpen(() => {
+					console.log('WebSocket 已连接')
+					this.startHeartbeat()
+					this.socketTask.send({
+						data: JSON.stringify({
+							action: 'subscribe'
+						}),
+					})
+				})
+				this.socketTask.onMessage((res) => {
+					// this.covers.push(JSON.parse(res.data))
+				})
+				this.socketTask.onClose(() => {
+					console.log('WebSocket 断开，尝试重连...')
+					this.reconnect()
+				})
+				this.socketTask.onError((err) => {
+					console.error('WebSocket 错误:', err)
+					this.reconnect()
+				})
+			},
+			reconnect() {
+				if (this.reconnectTimer) clearTimeout(this.reconnectTimer)
+				this.reconnectTimer = setTimeout(() => {
+					this.initWebSocket()
+				}, 3000)
+			},
+			startHeartbeat() {
+				this.heartbeatTimer = setInterval(() => {
+					if (this.socketTask?.readyState === 1) {
+						this.socketTask.send({
+							data: 'ping'
+						})
+					}
+				}, 30000)
+			},
+			stopHeartbeat() {
+				clearInterval(this.heartbeatTimer)
+			},
+			// 点击跳转到车辆
+			btntz(){
+				uni.switchTab({
+					url:'/pages/myorder/returned/index'
+				})
+			},
+            // 点击跳转导航
+            danghang(){
+            	uni.openLocation({
+            		latitude: this.orderobj.latitude, //纬度-目的地/坐标点
+            		longitude: this.orderobj.longitude, //经度-目的地/坐标点
+            		name: '', //地点名称
+            		address:'' //详细地点名称
+            	})
+            },
+            // 点击启动and关闭
+            btnqd(){
+            	if(this.orderobj.deviceLockStatus == 0){
+            		let that = this
+            		uni.showModal({
+            			title: '提示',
+            			content: '您是否要解锁车辆？',
+            			showCancel: true,
+            			success: function (res) {
+            				if (res.confirm) {
+            					that.$u.put(`/app/order/openDevice?orderId=${that.orderobj.orderId}`).then((res) => {
+            						if (res.code == 200) {
+            						    uni.showToast({
+            						    	title: '解锁成功',
+            						    	icon: 'success',
+            						    	duration: 2000
+            						    })
+            							that.getorderdevice()
+            						}else{
+            							uni.showToast({
+            								title: res.msg,
+            								icon: 'none',
+            								duration: 2000
+            							})
+            						}
+            					})
+            				} else if (res.cancel) {
+            				    console.log('取消'); // 用户点击取消
+            				}
+            			}
+            		})
+            	}else if(this.orderobj.deviceLockStatus == 1){
+					uni.getLocation({
+						type: 'wgs84', 
+						success: (res) => {
+							console.log(res);
+							this.latsc = res.latitude
+							this.lngsc = res.longitude
+						},
+						fail: (err) => {
+							console.error('获取位置失败：', err)
+						}
+					})
+            		let that = this
+            		uni.showModal({
+            			title: '提示',
+            			content: '您是否要临时解锁？',
+            			showCancel: true,
+            			success: function (res) {
+            				if (res.confirm) {
+            					that.$u.put(`/app/order/closeDevice?orderId=${that.orderobj.orderId}&lat=${that.latsc}&lon=${that.lngsc}`).then((res) => {
+            						if (res.code == 200) {
+            						    uni.showToast({
+            						    	title: '临时锁车成功',
+            						    	icon: 'success',
+            						    	duration: 2000
+            						    })
+            							that.getorderdevice()
+            						}else{
+            							uni.showToast({
+            								title: res.msg,
+            								icon: 'none',
+            								duration: 2000
+            							})
+            						}
+            					})
+            				} else if (res.cancel) {
+            				    console.log('取消'); // 用户点击取消
+            				}
+            			}
+            		})
+            	}
+            },
+			// 获取本人正在使用的订单设备
+			getorderdevice() {
+				this.$u.get("/app/orderDevice/mineUsing").then((res) => {
+					if (res.code == 200) {
+						if (res.data) {
+							this.orderobj = res.data
+							this.orderAreaReturnVerify = res.data.orderAreaReturnVerify
+							this.orderAreaId = res.data.orderAreaId
+							this.areaId = res.data.orderAreaId
+							this.$u.get(`/app/area/detail?id=${this.orderAreaId}`).then((res) => {
+								if (res.code == 200) {
+									const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
+									this.polyline.push(polylines)
+									this.getParking()
+								}
+							})
+						} else {
+							this.orderAreaId = ''
+						}
+					}
+				})
+			},
+			// 点击地图中的店铺操作
+			handleMarkerClick(e) {
+				let id = String(e.detail.markerId)
+				if (id.slice(-1) == 1) {
+					console.log('店铺')
+					this.covers.filter(item => {
+						if (item.id == id) {
+							item.iconPath = 'https://api.ccttiot.com/smartmeter/img/static/u8ONjRuMpydcZ4WuA6vP'
+							this.shoptcflag = true
+						}
+					})
+				} else if (id.slice(-1) == 2) {
+					console.log('车辆')
+					if (this.orderAreaId == '') {
+						this.covers.filter(item => {
+							if (item.id == id) {
+								item.iconPath = 'https://api.ccttiot.com/smartmeter/img/static/uCBNaRAdk9kcgQgrom2G'
+								this.taocanflag = true
+								this.$u.get(`/app/device/availableDetail?id=${id.slice(0, -1)}`).then((res) => {
+									if (res.code == 200) {
+										this.cheobj = res.data
+										this.areaId = res.data.areaId
+										this.getArea()
+									}
+								})
+							}
+						})
+					} else {
+						console.log('进行中订单');
+						uni.showToast({
+							title: '当前已有订单',
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				} else if (id.slice(-1) == 3) {
+					console.log('导览')
+				}
+			},
 			// 请求客服
-			getkefu(){
-				this.$u.get(`/app/customerService/list?pageNum=1&pageSize=999`).then(res =>{
-					if(res.code == 200){
+			getkefu() {
+				this.$u.get(`/app/customerService/list?pageNum=1&pageSize=999`).then(res => {
+					if (res.code == 200) {
 						this.kefulist = res.rows
 					}
 				})
 			},
 			// 点击去下单
-		    btndetaxq(){
-				this.$u.get(`/getInfo`).then(res =>{
-					if(res.code == 200){
+			btndetaxq() {
+				this.$u.get(`/getInfo`).then(res => {
+					if (res.code == 200) {
 						this.taocanflag = false
 						uni.navigateTo({
-							url:'/page_fenbao/storedlist/trueorder?modelId=' + this.cheobj.modelId + '&sn=' + this.cheobj.sn
+							url: '/page_fenbao/storedlist/trueorder?modelId=' + this.cheobj.modelId + '&sn=' + this.cheobj.sn
 						})
-					}else if(res.code == 401){
+					} else if (res.code == 401) {
 						uni.showModal({
 							title: '提示',
 							content: '您当前未登录，是否前去登录？',
 							showCancel: true,
-							success: function (res) {
+							success: function(res) {
 								if (res.confirm) {
 									uni.reLaunch({
-										url:'/pages/login/login'
+										url: '/pages/login/login'
 									})
 								} else if (res.cancel) {
-									
+
 								}
 							}
 						})
@@ -220,30 +465,30 @@
 				})
 			},
 			// 点击响铃寻车
-			btnxlxc(){
-				this.$u.put(`/bst/device/iot/ring?id=${this.cheobj.id}`).then((res) => {
+			btnxlxc() {
+				this.$u.put(`/app/device/iot/ring?id=${this.cheobj.id}`).then((res) => {
 					if (res.code == 200) {
-					    uni.showToast({
-					    	title: '操作成功',
-					    	icon: 'success',
-					    	duration: 2000
-					    })
-					}else if(res.code == 401){
+						uni.showToast({
+							title: '操作成功',
+							icon: 'success',
+							duration: 2000
+						})
+					} else if (res.code == 401) {
 						uni.showModal({
 							title: '提示',
 							content: '您当前未登录，是否前去登录？',
 							showCancel: true,
-							success: function (res) {
+							success: function(res) {
 								if (res.confirm) {
 									uni.reLaunch({
-										url:'/pages/login/login'
+										url: '/pages/login/login'
 									})
 								} else if (res.cancel) {
-									
+
 								}
 							}
 						})
-					} else{
+					} else {
 						uni.showToast({
 							title: res.msg,
 							icon: 'none',
@@ -253,7 +498,7 @@
 				})
 			},
 			// 点击隐藏车辆弹窗
-			btncheyc(){
+			btncheyc() {
 				this.taocanflag = false
 				this.getqingqiu()
 			},
@@ -261,25 +506,25 @@
 			regionchange(e) {
 				this.iconflag = true
 				if (e.type == 'end') {
-					if(this.rtindex == 2){
-					    this.jingweidu = e.detail.centerLocation.longitude + ',' + e.detail.centerLocation.latitude
-					    this.getqingqiu()
-					    this.iconflag = false
+					if (this.rtindex == 2) {
+						this.jingweidu = e.detail.centerLocation.longitude + ',' + e.detail.centerLocation.latitude
+						this.getqingqiu()
+						this.iconflag = false
 					}
-				} 
+				}
 			},
 			// 点击选择骑行套餐
-			btntcxz(index){
+			btntcxz(index) {
 				this.tcindex = index
 			},
 			// 点击跳转到帮助中心
-			btnbz(){
+			btnbz() {
 				uni.navigateTo({
-					url:'/page_user/bangzhu'
+					url: '/page_user/bangzhu'
 				})
 			},
 			// 点击拨打平台客服电话
-			btnptkf(){
+			btnptkf() {
 				uni.makePhoneCall({
 					phoneNumber: '18888888888',
 					success: function(res) {
@@ -291,20 +536,20 @@
 				})
 			},
 			// 点击跳转到租车门店
-			btnmendain(){
+			btnmendain() {
 				uni.navigateTo({
-					url:'/page_fenbao/storedlist/index'
+					url: '/page_fenbao/storedlist/index'
 				})
 			},
 			// 点击右侧图标
-			btntap(num){
-				if(num == 3){
+			btntap(num) {
+				if (num == 3) {
 					uni.showToast({
 						title: '导览暂未开放',
 						icon: 'none',
-						duration:2000
+						duration: 2000
 					})
-				}else{
+				} else {
 					this.covers = []
 					this.rtindex = num
 					this.shoptcflag = false
@@ -312,7 +557,7 @@
 				}
 			},
 			// 点击调用回到地图中心点
-			btnhuiz(){
+			btnhuiz() {
 				this.setMapScale()
 			},
 			// 回到地图中心点
@@ -336,78 +581,50 @@
 					}
 				})
 			},
-			// 点击地图中的店铺操作
-			handleMarkerClick(e){
-				let id = String(e.detail.markerId) 
-				if(id.slice(-1) == 1){
-					console.log('店铺')
-					this.covers.filter(item =>{
-						if(item.id == id){
-							item.iconPath = 'https://api.ccttiot.com/smartmeter/img/static/u8ONjRuMpydcZ4WuA6vP'
-							this.shoptcflag = true
-						}
-					})
-				}else if(id.slice(-1) == 2){
-					console.log('车辆')
-					this.covers.filter(item =>{
-						if(item.id == id){
-							item.iconPath = 'https://api.ccttiot.com/smartmeter/img/static/uCBNaRAdk9kcgQgrom2G'
-							this.taocanflag = true
-							this.$u.get(`/app/device/availableDetail?id=${id.slice(0, -1)}`).then((res) => {
-								if (res.code == 200) {
-								    this.cheobj = res.data
-									this.getArea()
-								}
-							})
-						}
-					})
-				}else if(id.slice(-1) == 3){
-					console.log('导览')
-				}
-			},
+
 			// 请求附近车辆and门店
-			getqingqiu(){
-				if(this.rtindex == 1){
+			getqingqiu() {
+				if (this.rtindex == 1) {
 					this.iconPath = 'https://api.ccttiot.com/smartmeter/img/static/upX2lLilhrRi4tttdHlo'
-				}else if(this.rtindex == 2){
-					this.iconPath = 'https://api.ccttiot.com/smartmeter/img/static/uX0FBv86yDIR5tIqjoe2'
+				} else if (this.rtindex == 2) {
 					this.iconPath = 'https://api.ccttiot.com/smartmeter/img/static/uX0FBv86yDIR5tIqjoe2'
+					// this.iconPath = 'https://api.ccttiot.com/smartmeter/img/static/uX0FBv86yDIR5tIqjoe2'
 					this.$u.get(`/app/device/listNearBy?radius=10000&center=${this.jingweidu}`).then((res) => {
 						if (res.code == 200) {
 							this.covers = []
-							res.data.forEach(item =>{
+							res.data.forEach(item => {
 								const shopCover = {
 									// 门店后面拼接1，车辆拼接2，3是导览
-									id: this.rtindex == 1 ? parseInt(item.id + "1") : this.rtindex == 2 ? parseInt(item.id + "2") : parseInt(item.id + "3"),
+									id: this.rtindex == 1 ? parseInt(item.id + "1") : this.rtindex ==
+										2 ? parseInt(item.id + "2") : parseInt(item.id + "3"),
 									latitude: item.latitude,
-									longitude:item.longitude,
+									longitude: item.longitude,
 									width: 35,
 									height: 40,
-									iconPath:this.iconPath,
-									label: {
-										content: item.vehicleNum,
-										anchorX: this.calculateAnchorX(item.vehicleNum),
-										fontWeight: 700,
-										color: '#0D75E5',
-										borderColor: '#fff',
-										borderRadius: 5,
-										bgColor: '#fff',
-										padding:1,
+									iconPath: this.iconPath,
+									callout: {
+										content: '' + item.vehicleNum, // 修改为你想要显示的文字内容
+										color: '#0D75E5', // 修改为文字颜色
+										fontSize: 10, // 修改为文字大小
+										borderRadius: 10, // 修改为气泡圆角大小
+										bgColor: '#fff', // 修改为气泡背景颜色
+										padding: 3, // 修改为气泡内边距
+										display: 'ALWAYS', // 修改为气泡的显示策略
 									}
 								}
 								this.covers.push(shopCover)
 							})
 						}
 					})
-				}else if(this.rtindex == 3){
+				} else if (this.rtindex == 3) {
 					this.iconPath = 'https://api.ccttiot.com/smartmeter/img/static/un7ecyEN8vsJhlEnXfD4'
-				}else{
+				} else {
 					this.iconPath = null
 				}
 			},
 			// 获取自身位置
 			getMyLocation() {
-				uni.getLocation({  
+				uni.getLocation({
 					type: 'wgs84',
 					success: (res) => {
 						this.latitude = Number(res.latitude) - 0.005
@@ -421,22 +638,7 @@
 					}
 				})
 			},
-			// 均衡地图文字居中
-			calculateAnchorX(name) {
-				let chineseLength = 0
-				let englishLength = 0
-				for (let i = 0; i < name.length; i++) {
-					const charCode = name.charCodeAt(i)
-					if (charCode >= 0x4e00 && charCode <= 0x9fa5) {
-						chineseLength++
-					} else if (/[a-zA-Z]/.test(name[i])) {
-						englishLength = englishLength + 1.2 // 英文长度加1，但视为两个中文字符长度  
-					}
-				}
-				const totalLength = chineseLength + englishLength * 2;
-				return -totalLength * 6.5 // 假设每个中文字符对应的 anchorX 偏移是 -6.5
-			},
-			
+
 			convertBoundaryToPolyline(boundary) {
 				if (!boundary) return null
 				const points = JSON.parse(boundary).map(coord => ({
@@ -447,7 +649,7 @@
 					points: points,
 					fillColor: "#55888840", //填充颜色
 					strokeColor: "#22FF00", //描边颜色
-					strokeWidth: 2, //描边宽度
+					strokeWidth: 1, //描边宽度
 					zIndex: 1, //层级
 				}
 				return polyline
@@ -468,7 +670,7 @@
 							console.error("Parsed boundary is not an array:", coords)
 							return null
 						}
-						console.log(coords,'1111111');
+						console.log(coords, '1111111');
 						const points = coords.map(coord => ({
 							latitude: coord[1],
 							longitude: coord[0]
@@ -480,7 +682,7 @@
 							strokeWidth: 2, //描边宽度
 							zIndex: 1, //层级
 						}
-					}).filter(polyline => polyline !== null) 
+					}).filter(polyline => polyline !== null)
 				} else if (num == 2) {
 					return boundaries.map(boundary => {
 						if (!boundary) return null
@@ -495,7 +697,7 @@
 							console.error("Parsed boundary is not an array:", coords)
 							return null
 						}
-						console.log(coords,'2222222222222')
+						console.log(coords, '2222222222222')
 						const points = coords.map(coord => ({
 							latitude: coord[1],
 							longitude: coord[0]
@@ -507,7 +709,7 @@
 							strokeWidth: 2, //描边宽度
 							zIndex: 1, //层级
 						}
-					}).filter(polyline => polyline !== null) 
+					}).filter(polyline => polyline !== null)
 				} else if (num == 3) {
 					return boundaries.map(boundary => {
 						if (!boundary) return null
@@ -522,7 +724,7 @@
 							console.error("Parsed boundary is not an array:", coords)
 							return null
 						}
-						console.log(coords,'333333333333');
+						console.log(coords, '333333333333');
 						const points = coords.map(coord => ({
 							latitude: coord[1],
 							longitude: coord[0]
@@ -533,19 +735,19 @@
 							strokeColor: "#FF473E", //描边颜色
 							strokeWidth: 2, //描边宽度
 							zIndex: 1, //层级
-			
+
 						};
-					}).filter(polyline => polyline !== null) 
+					}).filter(polyline => polyline !== null)
 				}
 			},
 			toggleIconAndCallout() {
-				if(this.cheobj == ''){
+				if (this.cheobj == '') {
 					uni.showToast({
 						title: '请选选择车辆',
 						icon: 'none',
-						duration:2000
+						duration: 2000
 					})
-				}else{
+				} else {
 					this.showIconAndCallout = !this.showIconAndCallout
 					if (this.showIconAndCallout) {
 						const newMarkers = []
@@ -557,7 +759,8 @@
 								width: 20,
 								height: 28.95,
 								iconPath: item.type == 1 ?
-									'https://lxnapi.ccttiot.com/bike/img/static/up2xXqAgwCX5iER600k3' : item
+									'https://lxnapi.ccttiot.com/bike/img/static/up2xXqAgwCX5iER600k3' :
+									item
 									.type == 2 ?
 									'https://lxnapi.ccttiot.com/bike/img/static/u53BAQcFIX3vxsCzEZ7t' :
 									' https://lxnapi.ccttiot.com/bike/img/static/uDNY5Q4zOiZTCBTA2Jdq',
@@ -566,7 +769,8 @@
 									color: '#ffffff',
 									fontSize: 14,
 									borderRadius: 10,
-									bgColor: item.type == 1 ? '#3A7EDB' : item.type == 2 ? '#FFC107' : '#FF473E',
+									bgColor: item.type == 1 ? '#3A7EDB' : item.type == 2 ? '#FFC107' :
+										'#FF473E',
 									padding: 6,
 									display: 'ALWAYS'
 								},
@@ -582,7 +786,7 @@
 			},
 			getParking() {
 				// 发送请求获取数据
-				this.$u.get(`/app/areaSub/listByArea?areaId=${this.cheobj.areaId}`).then((res) => {
+				this.$u.get(`/app/areaSub/listByArea?areaId=${this.areaId}`).then((res) => {
 					if (res.code === 200) {
 						// 处理接口返回的数据
 						const type1Data = []
@@ -616,6 +820,7 @@
 			},
 			// 请求运营区停车点，禁行区，
 			getArea() {
+				this.polyline = []
 				this.$u.get(`/app/area/detail?id=${this.cheobj.areaId}`).then((res) => {
 					if (res.code == 200) {
 						const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
@@ -624,7 +829,7 @@
 					}
 				})
 			},
-			
+
 		}
 	}
 </script>
@@ -634,22 +839,137 @@
 		background: #fff;
 		border-radius: 0rpx 0rpx 0rpx 0rpx;
 	}
-	.active{
-		image{
+
+	.active {
+		image {
 			z-index: 99 !important;
 		}
-		.bike_item{
+
+		.bike_item {
 			border: 1px solid #4297F3 !important;
 		}
 	}
+
 	@keyframes fadeIn {
-	  from {
-	    opacity: 0;
-	  }
-	  to {
-	    opacity: 1;
-	  }
+		from {
+			opacity: 0;
+		}
+
+		to {
+			opacity: 1;
+		}
 	}
+    .conts_box {
+    	width: 680rpx;
+		height: 360rpx;
+    	margin: 0 auto;
+    	display: flex;
+    	flex-wrap: wrap;
+    	align-items: center;
+    	justify-content: space-between;
+    	margin-top: 38rpx;
+    	background: #FFFFFF;
+    	box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
+    	border-radius: 20rpx 20rpx 20rpx 20rpx;
+    	padding-bottom: 20rpx;
+        position: fixed;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 220rpx;
+		.orderzt{
+			display: flex;
+			justify-content: space-between;
+			padding: 0 20rpx;
+			margin-top: 20rpx;
+			box-sizing: border-box;
+			width: 100%;
+		}
+    	.txtss {
+    		margin-top: 18rpx;
+    		padding-left: 20rpx;
+    		width: 100%;
+    		font-weight: 500;
+    		font-size: 28rpx;
+    		color: #808080;
+    	}
+		.dh{
+			width: 160rpx;
+			height: 60rpx;
+			border-radius: 30rpx;
+			text-align: center;
+			border: 1px solid #333;
+			font-size: 28rpx;
+			padding-top: 10rpx;
+			box-sizing: border-box;
+		}
+		.suocheanniu{
+			display: flex;
+			align-items: center;
+			.lssc{
+				width: 160rpx;
+				height: 60rpx;
+				border-radius: 30rpx;
+				text-align: center;
+				background-color: #0D75E5;
+				color: #fff;
+				font-size: 28rpx;
+				padding-top: 10rpx;
+				box-sizing: border-box;
+				margin-left: 30rpx;
+			}
+		}
+    	.cont_li {
+    		width: 100%;
+    		display: flex;
+    		flex-wrap: nowrap;
+    		align-items: center;
+    		justify-content: space-between;
+            padding: 0 20rpx;
+			box-sizing: border-box;
+			
+    		.left {
+    			display: flex;
+    			flex-wrap: wrap;
+    			font-weight: 600;
+    			font-size: 36rpx;
+    			color: #3D3D3D;
+    			.km {
+    				font-weight: 400;
+    				font-size: 28rpx;
+    				color: #3D3D3D;
+    			}
+    			.speed {
+    				margin-top: 18rpx;
+    				width: 226rpx;
+    				height: 22rpx;
+    				background: #ccc;
+    				border-radius: 16rpx 16rpx 16rpx 16rpx;
+    				.speeds {
+    					height: 100%;
+    					background: #4297F3;
+    					border-radius: 16rpx 16rpx 16rpx 16rpx;
+    				}
+    			}
+    			.NO {
+    				width: 100%;
+    				font-weight: 400;
+    				font-size: 24rpx;
+    				color: #3D3D3D;
+    				margin-top: 18rpx;
+    			}
+    		}
+    		.right {
+				width: 70%;
+    			padding-right: 20rpx;
+    			font-size: 24rpx;
+    			color: #333;
+    			image {
+    				width: 160rpx;
+    				height: 110rpx;
+    			}
+    		}
+    	}
+    }
 	.picimg {
 		width: 120rpx;
 		height: 120rpx;
@@ -659,32 +979,37 @@
 		top: 50%;
 		z-index: 99;
 	}
-	.kefutc{
+
+	.kefutc {
 		animation: fadeIn 0.5s ease-in-out forwards;
 		position: fixed;
 		top: 660rpx;
 		left: 50%;
 		transform: translateX(-50%);
 		z-index: 99;
-		.bot{
+
+		.bot {
 			margin-top: 30rpx;
-			.wz{
+
+			.wz {
 				margin-top: 10rpx;
 				font-weight: 600;
 				font-size: 28rpx;
 				color: #3D3D3D;
 			}
-			.wzs{
+
+			.wzs {
 				margin-top: 10rpx;
 				font-size: 24rpx;
 				color: #7C7C7C;
 			}
 		}
-		.top{
+
+		.top {
 			width: 538rpx;
 			height: 122rpx;
 			background: #FFFFFF;
-			box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0,0,0,0.1);
+			box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.1);
 			border-radius: 14rpx 14rpx 14rpx 14rpx;
 			display: flex;
 			justify-content: space-between;
@@ -692,14 +1017,16 @@
 			padding-right: 14rpx;
 			box-sizing: border-box;
 			margin-top: 20rpx;
-			.dianhua{
+
+			.dianhua {
 				font-weight: 600;
 				font-size: 28rpx;
 				color: #3D3D3D;
 				padding-left: 26rpx;
 				box-sizing: border-box;
 			}
-			.boda{
+
+			.boda {
 				width: 94rpx;
 				height: 94rpx;
 				background: #DCEDFF;
@@ -707,12 +1034,14 @@
 				text-align: center;
 				padding-top: 8rpx;
 				box-sizing: border-box;
-				text{
+
+				text {
 					display: block;
 				}
 			}
 		}
-		image{
+
+		image {
 			position: absolute;
 			top: -280rpx;
 			z-index: -1;
@@ -722,50 +1051,65 @@
 			height: 748rpx;
 		}
 	}
-	.mask{
+
+	.mask {
 		width: 100%;
 		height: 100vh;
 		position: fixed;
 		z-index: 98;
-		background-color: rgba(0,0,0,0.08);
+		background-color: rgba(0, 0, 0, 0.08);
 		top: 0;
 		left: 0;
 	}
-	.clmask{
+
+	.clmask {
 		width: 100%;
 		height: 100vh;
 		position: fixed;
 		z-index: 98;
-		background-color: rgba(0,0,0,0.08);
+		background-color: rgba(0, 0, 0, 0.08);
 		top: 0;
 		left: 0;
 	}
-	.biketc{
+
+	.biketc {
 		position: fixed;
-		left: 0;
-		bottom: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 220rpx;
 		z-index: 99;
-		.topfor{
-			width: 750rpx;
+        background-color: #fff;
+		border-radius: 30rpx;
+		width: 700rpx;
+		margin: auto;
+		padding-bottom: 30rpx;
+		box-sizing: border-box;
+		.topfor {
+			width: 100%;
+			margin: auto;
 			max-height: 664rpx;
-			background: #f9f9f9;
+			background: #fff;
 			border-radius: 30rpx 30rpx 0 0;
 			padding: 44rpx 34rpx;
 			box-sizing: border-box;
 			position: relative;
-			.bikeyc{
+            
+			.bikeyc {
 				position: absolute;
 				top: 20rpx;
 				right: 32rpx;
 				font-size: 70rpx;
 				font-weight: 600;
 			}
-			.biketaocan{
+
+			.biketaocan {
 				display: flex;
 				overflow: scroll;
-				.bikelist{
+
+				.bikelist {
 					margin-right: 22rpx;
-					.bike_item{
+
+					.bike_item {
 						border: 1px solid #fff;
 						margin-top: 36rpx;
 						padding-top: 16rpx;
@@ -775,11 +1119,12 @@
 						width: 368rpx;
 						height: 280rpx;
 						background: #FFFFFF;
-						box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
+						box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
 						border-radius: 26rpx 26rpx 26rpx 26rpx;
 						position: relative;
 						overflow: hidden;
-						image{
+
+						image {
 							width: 82rpx;
 							height: 50rpx;
 							position: absolute;
@@ -787,19 +1132,22 @@
 							right: 0;
 							z-index: -1;
 						}
-						.name{
+
+						.name {
 							font-weight: 600;
 							font-size: 32rpx;
 							color: #3D3D3D;
 						}
-						.qibu{
+
+						.qibu {
 							display: flex;
 							justify-content: space-between;
 							font-size: 24rpx;
 							color: #3D3D3D;
 							margin-top: 16rpx;
 						}
-						.ckxq{
+
+						.ckxq {
 							width: 368rpx;
 							height: 58rpx;
 							background: #4297F3;
@@ -815,56 +1163,67 @@
 					}
 				}
 			}
-			.bikesy{
+
+			.bikesy {
 				width: 100%;
-				border-top:1rpx solid #D8D8D8;
+				border-top: 1rpx solid #D8D8D8;
 				margin-top: 30rpx;
 				padding-top: 36rpx;
 				box-sizing: border-box;
 				display: flex;
-				.bikelt{
+
+				.bikelt {
 					width: 50%;
 					text-align: center;
-					.bikegongli{
+
+					.bikegongli {
 						font-weight: 600;
 						font-size: 48rpx;
 						color: #3D3D3D;
 					}
-					.bikets{
+
+					.bikets {
 						font-size: 28rpx;
 						color: #808080;
 						margin-bottom: 28rpx;
 					}
-					image{
+
+					image {
 						width: 48rpx;
 						height: 36rpx;
 						margin-right: 18rpx;
 					}
 				}
-				.bikert{
+
+				.bikert {
 					width: 50%;
 					text-align: center;
-					.bikegongli{
+
+					.bikegongli {
 						font-weight: 600;
 						font-size: 48rpx;
 						color: #3D3D3D;
 					}
-					.bikets{
+
+					.bikets {
 						font-size: 28rpx;
 						color: #808080;
 						margin-bottom: 28rpx;
 					}
-					image{
+
+					image {
 						width: 22rpx;
 						height: 48rpx;
 						margin-right: 18rpx;
 					}
 				}
 			}
-			.biketop{
+
+			.biketop {
 				display: flex;
 				align-items: center;
-				.bikebeep{
+
+				.bikebeep {
 					width: 160rpx;
 					height: 60rpx;
 					border-radius: 10rpx 10rpx 10rpx 10rpx;
@@ -876,29 +1235,31 @@
 					line-height: 60rpx;
 					margin-left: 80rpx;
 				}
-				.bianh{
-					view{
+
+				.bianh {
+					view {
 						font-weight: 600;
 						font-size: 28rpx;
 						color: #3D3D3D;
 					}
 				}
-				image{
+
+				image {
 					width: 56rpx;
 					height: 56rpx;
 					margin-right: 24rpx;
 				}
 			}
 		}
-		.anniuks{
-			width: 750rpx;
-			height: 184rpx;
-			background: #FFFFFF;
-			box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
+
+		.anniuks {
+			width: 100%;
+			// height: 184rpx;
+			// background: #FFFFFF;
 			text-align: center;
-			line-height: 184rpx;
-			text{
+			// line-height: 184rpx;
+
+			text {
 				display: inline-block;
 				width: 680rpx;
 				height: 90rpx;
@@ -912,7 +1273,8 @@
 			}
 		}
 	}
-	.shoptc{
+
+	.shoptc {
 		position: fixed;
 		width: 696rpx;
 		max-height: 312rpx;
@@ -923,34 +1285,41 @@
 		transform: translateX(-50%);
 		padding: 28rpx 34rpx;
 		box-sizing: border-box;
-		.cont{
+
+		.cont {
 			margin-top: 40rpx;
 			display: flex;
-			.shuoming{
-				.name{
+
+			.shuoming {
+				.name {
 					font-size: 28rpx;
 					color: #3D3D3D;
 				}
-				.price{
+
+				.price {
 					font-size: 24rpx;
 					color: #FF1C1C;
 					margin-top: 20rpx;
-					text{
+
+					text {
 						font-size: 44rpx;
 					}
 				}
 			}
-			image{
+
+			image {
 				width: 166rpx;
 				height: 128rpx;
 				margin-right: 26rpx;
 			}
 		}
-		.juli{
+
+		.juli {
 			display: flex;
 			align-items: center;
 			margin-top: 12rpx;
-			.mi{
+
+			.mi {
 				padding: 0 10rpx;
 				box-sizing: border-box;
 				height: 38rpx;
@@ -961,54 +1330,64 @@
 				color: #0D75E5;
 				margin-right: 20rpx;
 			}
-			.dizhi{
+
+			.dizhi {
 				font-size: 28rpx;
 				color: #808080;
 			}
 		}
-		.top{
+
+		.top {
 			display: flex;
 			justify-content: space-between;
-			.name{
+
+			.name {
 				font-size: 32rpx;
 				color: #3D3D3D;
 				font-weight: 600;
 			}
-			.zu{
+
+			.zu {
 				font-size: 24rpx;
 				color: #3D3D3D;
 				display: flex;
 				align-items: center;
-				image{
+
+				image {
 					width: 22rpx;
 					height: 22rpx;
 				}
 			}
 		}
 	}
-	.rticon{
+
+	.rticon {
 		position: fixed;
-		right:28rpx;
-		top: 450rpx;
-		image{
+		right: 28rpx;
+		top: 260rpx;
+
+		image {
 			width: 78rpx;
 			height: 96rpx;
 			display: block;
 			margin-top: 32rpx;
 		}
 	}
-	.lticon{
+
+	.lticon {
 		position: fixed;
 		left: 28rpx;
-		top: 538rpx;
-		image{
+		top: 300rpx;
+
+		image {
 			width: 88rpx;
 			height: 88rpx;
 			display: block;
 			margin-top: 32rpx;
 		}
 	}
-	.map{
+
+	.map {
 		width: 100%;
 		height: 100vh;
 	}