diff --git a/page_user/agreement.vue b/page_user/agreement.vue
index 8cde35a..24a755c 100644
--- a/page_user/agreement.vue
+++ b/page_user/agreement.vue
@@ -1,8 +1,16 @@
 <template>
 	<view class="page">
-		<u-navbar title="协议" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='45'></u-navbar>
+		<u-navbar :is-back='false' title=" " :border-bottom="false" :background="bgc" title-color='#000'
+			title-size='36' height='45'></u-navbar>
 		<view class="cont" v-html="info.content"></view>
+		<view class="bottom">
+			<view class="btn" @click="quit()">
+				不同意
+			</view>
+			<view class="btn1" @click="ok()">
+				同意
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -15,16 +23,39 @@
 				},
 				info: {},
 				userinfo: {},
-				areaInfo:{}
+				areaInfo: {}
+			}
+		},
+		onLoad(e) {
+			console.log(e, 'eee');
+			if (e.needback) {
+				this.showbot = true
 			}
 		},
 		onShow() {
 			this.getagree()
 		},
 		methods: {
-			
+			ok() {
+					this.$store.commit('SET_SHOWAGRE',false);
+					console.log( this.$store.getters.showagre);
+					uni.redirectTo({
+						url:'/pages/index/index'
+					})
+			},
+			quit() {
+				uni.exitMiniProgram({
+					success: function() {
+						console.log('退出小程序成功');
+					},
+					fail: function(err) {
+						console.log('退出小程序失败', err);
+					}
+				})
+			},
+
 			getagree() {
-					let id = uni.getStorageSync('areaId');
+				let id = 15
 				this.$u.get(`/app/article/list?areaId=${id}&tag=agreement`).then((res) => {
 					if (res.code === 200) {
 						this.info = res.rows[0];
@@ -61,7 +92,7 @@
 			//   this.info.content = this.info.content.replace(/&nbsp;/g, '\u00A0');
 			// },
 			insertPhoneNumberAndDate() {
-			
+
 				// 替换所有的&nbsp;为 \u00A0
 				this.info.content = this.info.content.replace(/&nbsp;/g, '\u00A0');
 			}
@@ -78,6 +109,47 @@
 	.page {
 		width: 750rpx;
 
+		.bottom {
+			position: fixed;
+			background: #fff;
+			bottom: 0;
+			width: 750rpx;
+			height: 200rpx;
+			display: flex;
+			flex-wrap: nowrap;
+			align-items: center;
+			justify-content: space-around;
+			// box-shadow: 12rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1);
+			.btn {
+				width: 250rpx;
+				height: 80rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: center;
+				// border: 2rpx solid #000;
+				border-radius: 40rpx;
+				background: #ccc;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: 600;
+			}
+			.btn1{
+				width: 250rpx;
+				height: 80rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: center;
+				// border: 2rpx solid #000;
+				border-radius: 40rpx;
+				background: #4C97E7;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: 600;
+			}
+		}
+
 		.cont {
 			margin-top: 34rpx;
 			margin: 0 auto;
diff --git a/page_user/khfw/khfw.vue b/page_user/khfw/khfw.vue
index 50de600..e6cfc6a 100644
--- a/page_user/khfw/khfw.vue
+++ b/page_user/khfw/khfw.vue
@@ -1,11 +1,34 @@
 <template>
 	<view class="page">
-		<u-navbar title="客户服务" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
+		<u-navbar title="客户服务" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36'
 			height='45'></u-navbar>
+			<image class="backimg" src="https://lxnapi.ccttiot.com/bike/img/static/uWCOkHl7HYqjZUVUOzxy" mode=""></image>
+			<view class="tit">
+				Hi 您好，我们为您提供更多帮助哦~
+			</view>
+			<view class="qscard">
+				<view class="card_top">
+					<view class="li"  v-for="(item,index) in classlist" :key="index" @click="changeitx(item,index)">
+						<view class="txt">
+							{{item.classifyName}}
+						</view>
+						<view class="bot_bor" v-if="tabindex==index"></view>
+						<view class="bot_bor" v-if="tabindex!=index" style="background: #fff;"></view>
+					</view>
+					
+				</view>
+				<view class="qs_li" v-for="(item,index) in wordlist" :key="index" @click="topage(item)">
+					<view class="qs_li_txt">
+						{{item.title}}
+					</view>
+					<view class="iconfont icon-xiangyou1"></view>
+				</view>
+			</view>
 		<view class="btn" @click="callPhone">
 			<image src="https://lxnapi.ccttiot.com/bike/img/static/uEM1RpP3J0K51qTjtnA5" mode=""></image>
 			电话咨询：{{areaInfo.servicePhone}}
 		</view>
+		
 	</view>
 </template>
 
@@ -14,22 +37,137 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#fff",
+					backgroundColor: "#4C97E7",
 				},
-				areaInfo: {}
+				areaInfo: {},
+				tabindex:0,
+				classlist:[],
+				wordlist:[]
 			}
 		},
 		onShow() {
 			this.getarea()
+			this.getclass()
 		},
 		methods: {
+			getuserInfo(){
+				uni.showLoading({
+					title:'加载中'
+				})
+				this.$u.get("/getAppInfo").then((res) => {
+				
+					if (res.code == 200) {
+						uni.hideLoading()
+						
+						this.getarea()
+						// if( res.user.role==2){
+						// 	uni.navigateTo({
+						// 		url:'/page_fix/fix_index'
+						// 	})
+						// }
+					} else {
+						
+						let areaId=uni.getStorageSync('areaId'); 
+						if(areaId){
+							let that =this
+							wx.login({
+								success(res) {
+									if (res.code) {
+										console.log('登录！', res);
+										let data = {
+											wxOpenId: res.code,
+							
+										};
+										let areaId = uni.getStorageSync('areaId');
+										that.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId).then(
+											res => {
+												uni.hideLoading();
+												if (res.code == 200) {
+													uni.setStorageSync('token', res.token);
+													that.getuserInfo()
+							
+							
+												} else if (res.code == 501) {
+													uni.showToast({
+														title: res.msg,
+														icon: 'none',
+														duration: 2000
+													});
+												} else {
+													// console.log("老用户登录",res.data)
+													uni.redirectTo({
+														url: '/pages/login/login'
+													})
+												}
+											});
+									}
+								},
+							
+							});
+						}else{
+							uni.showToast({
+								title: '请授权位置信息后再尝试',
+								icon: 'none',
+								duration: 4000
+							});
+						}
+						
+					}
+				});
+			},
 			getarea() {
 				let id = uni.getStorageSync('areaId');
 				this.$u.get("/app/area/" + id).then((res) => {
 
 					if (res.code == 200) {
 						this.areaInfo = res.data
-
+						
+					} else {
+						// uni.showToast({
+						// 	title: res.msg,
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
+					}
+				});
+			},
+			topage(item) {
+			    // 编码 title 和 content
+			    const encodedTitle = encodeURIComponent(item.title);
+			    const encodedContent = encodeURIComponent(JSON.stringify(item.content));
+			    // 跳转到新页面并传递编码后的 title 和 content
+			    uni.navigateTo({
+			        url: `/page_user/word?title=${encodedTitle}&content=${encodedContent}`
+			    });
+			},
+			changeitx(itme,index){
+				this.tabindex=index
+				this.getword(itme.classifyId)
+			},
+			getclass() {
+				
+				this.$u.get("/app/classify/list?deptId=101&parentId=111" ).then((res) => {
+			
+					if (res.code == 200) {
+						this.classlist = res.data
+						let id =this.classlist[0].classifyId
+						this.getword(id)
+					} else {
+						// uni.showToast({
+						// 	title: res.msg,
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
+					}
+				});
+			},
+			getword(id) {
+				
+				this.$u.get("/app/article/list??classifyId="+id ).then((res) => {
+			
+					if (res.code == 200) {
+						this.wordlist = res.rows
+			
 					} else {
 						// uni.showToast({
 						// 	title: res.msg,
@@ -55,7 +193,70 @@
 
 	.page {
 		width: 750rpx;
-
+		.backimg{
+			position: fixed;
+			width: 750rpx;
+			height: 384rpx;
+			z-index: -1;
+		}
+		.tit{
+			margin-top: 56rpx;
+			margin-left: 56rpx;
+			font-weight: 400;
+			font-size: 30rpx;
+			color: #FFFFFF;
+		}
+		.qscard{
+			width: 680rpx;
+			margin: 40rpx auto ;
+			background: #FFFFFF;
+			border-radius: 40rpx;
+			padding: 28rpx 30rpx;
+			box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1);
+			.card_top{
+				display: flex;
+				align-items: center;
+				flex-wrap: nowrap;
+				justify-content: space-around;
+				.li{
+					width: 112rpx;
+					display: flex;
+					flex-wrap: wrap;
+					justify-content: center;
+					.txt{
+						font-weight: 500;
+						font-size: 28rpx;
+						color: #3D3D3D;
+					}
+					.bot_bor{
+						margin-top: 16rpx;
+						width: 66rpx;
+						height: 6rpx;
+						background: #4C97E7;
+						border-radius: 3rpx 3rpx 3rpx 3rpx;
+					}
+				}
+			}
+			.qs_li{
+					margin-top: 10rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: space-between;
+				border-bottom: 2rpx solid #D8D8D8;
+				padding-bottom: 26rpx;
+				.qs_li_txt{
+				
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #3D3D3D;
+				}
+				.icon-xiangyou1{
+					font-size: 32rpx;
+					color: #3D3D3D;
+				}
+			}
+		}
 		.btn {
 			position: fixed;
 			left: 36rpx;
diff --git a/page_user/word.vue b/page_user/word.vue
new file mode 100644
index 0000000..78c66aa
--- /dev/null
+++ b/page_user/word.vue
@@ -0,0 +1,78 @@
+<template>
+	<view class="page">
+		<u-navbar :title="title" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
+			height='45'></u-navbar>
+		<view class="cont" v-html="content"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				bgc: {
+					backgroundColor: "#fff",
+				},
+				info: {},
+				userinfo: {},
+				areaInfo: {},
+				content: '',
+				title:''
+			}
+		},
+		onLoad(options) {
+			if (options.title && options.content) {
+				// 解码 title 和 content
+				const title = decodeURIComponent(options.title);
+				const content = JSON.parse(decodeURIComponent(options.content));
+				// 设置数据
+				this.title = title
+				this.content = content
+				this.insertPhoneNumberAndDate()
+			}
+		},
+
+		methods: {
+
+			getagree() {
+				let id = uni.getStorageSync('areaId');
+				this.$u.get(`/app/article/list?areaId=${id}&tag=agreement`).then((res) => {
+					if (res.code === 200) {
+						this.info = res.rows[0];
+						this.insertPhoneNumberAndDate();
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
+
+			insertPhoneNumberAndDate() {
+
+				// 替换所有的&nbsp;为 \u00A0
+				this.content = this.content.replace(/&nbsp;/g, '\u00A0');
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.page {
+		width: 750rpx;
+
+		.cont {
+			margin-top: 34rpx;
+			margin: 0 auto;
+			width: 634rpx;
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/page_user/yj.vue b/page_user/yj.vue
index f908763..5b38d41 100644
--- a/page_user/yj.vue
+++ b/page_user/yj.vue
@@ -238,7 +238,7 @@
 							this.getinfo()
 							this.getlist()
 							this.show = false
-						}, 2000)
+						}, 500)
 
 					} else {
 						uni.hideLoading()
diff --git a/pages.json b/pages.json
index 84d384b..6071900 100644
--- a/pages.json
+++ b/pages.json
@@ -355,6 +355,15 @@
 						"enablePullDownRefresh" : false,
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path" : "word",
+					"style" : 
+					{
+					"navigationBarTitleText" : "",
+					"enablePullDownRefresh" : false,
+					"navigationStyle": "custom"
+					}
 				}
 
 				// 其他 userpages 目录下的页面...
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cfba857..ed566be 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,7 +6,7 @@
 			<view class="txts">
 				创享出行
 			</view>
-			<!-- <view class="txts">
+			<!-- 	<view class="txts">
 				嵛你出行
 			</view> -->
 		</view>
@@ -396,6 +396,12 @@
 						故障上报
 					</view>
 				</view>
+				<view class="cont" @click="topage(9)">
+					<image src="https://lxnapi.ccttiot.com/bike/img/static/uk7i80QWz02cAfbbC518" mode=""></image>
+					<view class="text">
+						客户服务
+					</view>
+				</view>
 			</view>
 			<view class="guangggao">
 				<image src="https://lxnapi.ccttiot.com/bike/img/static/uvHYQhuouHZQQL3qfLzP" mode=""></image>
@@ -434,11 +440,53 @@
 
 
 		</view>
+		<view class="bottom_more" v-if="showindex==1">
+			<view class="close" @click="showindex=0">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uM76uO46a5cZOkFlffnX" mode=""></image>
+			</view>
+			<div class="tit">
+				更多用车服务
+			</div>
+			<div class="contbox" style="width: 100%;">
+				<view class="cont_li" @click="topage(1)">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uGDkCwxDNH9oFORX2XNU" mode=""></image>
+					<view class="txt">
+						押金充值
+					</view>
+				</view>
 
+				<view class="cont_li" @click="topage(3)">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/utP4rdOzXLlQPx6Ug8cO" mode=""></image>
+					<view class="txt">
+						用车指南
+					</view>
+				</view>
+				<view class="cont_li" @click="topage(4)">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uFaJV6NJGhmmodpEuWMy" mode=""></image>
+					<view class="txt">
+						编号开锁
+					</view>
+				</view>
+
+				<view class="cont_li" @click="topage(5)">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uucc9g8b2MM6G9vp8HWa" mode=""></image>
+					<view class="txt">
+						故障上报
+					</view>
+				</view>
+				<view class="cont_li" @click="topage(6)">
+					<image src="https://lxnapi.ccttiot.com/bike/img/static/uW1XRPQfJTD6sLimkln5" mode=""></image>
+					<view class="txt">
+						个人中心
+					</view>
+				</view>
+			</div>
+		</view>
 		<u-mask :show="showtcs" @click="showtc = false" :z-index='100' duration='0' />
 		<u-mask :show="showTips" :z-index='100' duration='0' />
 
 		<u-mask :show="showYjTip" @click="showYjTip = false" :z-index='100' duration='0' />
+
 		<view class="pops" v-if="showYjTip">
 			<view class="tit" style="font-weight: 600;">
 				您未充值押金
@@ -524,52 +572,54 @@
 			</view>
 		</view>
 
-		<view class="bottom_more" v-if="showindex==1">
-			<view class="close" @click="showindex=0">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/uM76uO46a5cZOkFlffnX" mode=""></image>
+
+		<!-- 蓝牙 -->
+		<u-mask :show="isnoline" :z-index='100' duration='0' />
+		<view class="pops" v-if="isnoline">
+			<view class="tit" style="font-weight: 600;">
+				设备离线 请使用蓝牙连接辅助操作
+			</view>
+			<view class="cont_box" style="text-align: center;color: #808080;justify-content: center;font-size: 36rpx;">
+				请确保手机蓝牙权限已授权
 			</view>
-			<div class="tit">
-				更多用车服务
-			</div>
-			<div class="contbox" style="width: 100%;">
-				<view class="cont_li" @click="topage(1)">
-					<image src="https://api.ccttiot.com/smartmeter/img/static/uGDkCwxDNH9oFORX2XNU" mode=""></image>
-					<view class="txt">
-						押金充值
-					</view>
-				</view>
 
-				<view class="cont_li" @click="topage(3)">
-					<image src="https://api.ccttiot.com/smartmeter/img/static/utP4rdOzXLlQPx6Ug8cO" mode=""></image>
-					<view class="txt">
-						用车指南
-					</view>
+			<view class="btn_box">
+				<view class="btn1" @click="isnoline = false">
+					取消
 				</view>
-				<view class="cont_li" @click="topage(4)">
-					<image src="https://api.ccttiot.com/smartmeter/img/static/uFaJV6NJGhmmodpEuWMy" mode=""></image>
-					<view class="txt">
-						编号开锁
-					</view>
+				<view class="btn2" @click="Binddevice()">
+					蓝牙连接
 				</view>
+			</view>
 
-				<view class="cont_li" @click="topage(5)">
-					<image src="https://api.ccttiot.com/smartmeter/img/static/uucc9g8b2MM6G9vp8HWa" mode=""></image>
-					<view class="txt">
-						故障上报
-					</view>
+		</view>
+		<!-- 是否在运营区 -->
+		<u-mask :show="isbackdevice" :z-index='100' duration='0' />
+		<view class="pops" v-if="isbackdevice">
+			<view class="tit" style="font-weight: 600;">
+				停车点外还车
+			</view>
+			<view class="cont_box" style="text-align: center;color: #808080;justify-content: center;font-size: 36rpx;">
+				未在停车点内还车,任要还车会产生额外费用，是否继续还车？
+			</view>
+
+			<view class="btn_box">
+				<view class="btn1" @click="isbackdevice = false">
+					取消
 				</view>
-				<view class="cont_li" @click="topage(6)">
-					<image src="https://lxnapi.ccttiot.com/bike/img/static/uW1XRPQfJTD6sLimkln5" mode=""></image>
-					<view class="txt">
-						个人中心
-					</view>
+				<view class="btn2" @click="keepback()">
+					确定
 				</view>
-			</div>
+			</view>
+
 		</view>
 	</view>
 </template>
 
 <script>
+	const app = getApp();
+	var xBlufi = require("@/utils/blufi/xBlufi.js");
+	let _this = null;
 	export default {
 		data() {
 			return {
@@ -628,7 +678,40 @@
 				showxy: false,
 				countdown: 5, // 五秒倒计时
 				// userId:this.$store.getters.userId,
-				qParam: null
+				qParam: null,
+
+
+				// 蓝牙
+				devicesList: [
+					// {name:'110000',
+					// mac:'11111'}
+				],
+				searching: false,
+				texts: '正在扫描蓝牙设备...',
+				btnflag: true,
+				tishiflag: false,
+				option: '',
+				bluthlist: [], //蓝牙数组
+				// status: 'loading',
+				statusflag: false,
+				Bluetoothmac: '',
+				mac: '',
+				ishave: false,
+				ver_data: null,
+				deviceInfoss: {},
+
+
+				deviceIds: '',
+				name: '',
+				orderinfo: {},
+				dl: 0,
+				czmoney: true,
+				iscz: true,
+				isnoline: false,
+				carstause: false,
+
+				isbackdevice: false
+
 			}
 		},
 		watch: {
@@ -637,12 +720,15 @@
 				// console.log('userId 发生变化', newValue, oldValue);
 				this.getisInOrder()
 			},
-			showYjTip(newValue, oldValue) {
-				console.log('showYjTip 发生变化', newValue, oldValue);
-			}
+			
 		},
 
 		onLoad(e) {
+			if(this.showagre){
+				uni.redirectTo({
+					url:'/page_user/agreement?needback=true'
+				})
+			}
 			console.log(e, 'eeeeeeeeeeeeeeeeeee');
 			if (e.q) {
 				this.qParam = e
@@ -674,13 +760,10 @@
 				this.getmarks()
 				// 在这里执行你的逻辑
 			}, 3000); // 每秒执行一次
-
+		
 			if (this.seeDetail == false) {
 
-				if (uni.getStorageSync('role')) {
-					let abb = uni.getStorageSync('role')
-
-				}
+				
 				let that = this
 				uni.getLocation({
 					type: 'wgs84',
@@ -760,6 +843,10 @@
 				this.timers = null;
 				console.log('定时器已清除');
 			}
+			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
+			xBlufi.notifyStartDiscoverBle({
+				'isStart': false
+			});
 		},
 		onUnload() {
 			// 页面卸载时清除定时器
@@ -768,6 +855,17 @@
 				this.timers = null;
 				console.log('定时器已清除');
 			}
+			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
+			xBlufi.notifyStartDiscoverBle({
+				'isStart': false
+			});
+		},
+
+		onBeforeUnmount() {
+			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
+			xBlufi.notifyStartDiscoverBle({
+				'isStart': false
+			});
 		},
 		computed: {
 			appointmentServiceFee() {
@@ -798,8 +896,973 @@
 			isMeal() {
 				return this.$store.getters.isMeal;
 			},
+			
+			showagre() {
+				return this.$store.getters.showagre;
+			},
 		},
 		methods: {
+			keepback() {
+				let that = this
+				uni.getLocation({
+					type: 'wgs84',
+					success: function(lb) {
+
+
+						let data = {
+							latitude: lb.latitude,
+							longitude: lb.longitude,
+							areaId: that.areaInfo.areaId
+						}
+						if (that.carstause) {
+							that.reboot()
+							that.$u.post('/appVerify/device/return?returnType=1&orderNo=' + that.orderinfo
+								.orderNo + '&isBluetooth=true' + '&lon=' + lb.longitude + '&lat=' + lb
+								.latitude).then((
+								res) => {
+								uni.hideLoading()
+								if (res.code === 200) {
+									that.isbackdevice = false
+									that.close()
+									that.getisInOrder()
+
+								} else {
+									uni.showToast({
+										title: res.msg,
+										icon: 'none',
+										duration: 2000
+									});
+								}
+							})
+						} else {
+							uni.showToast({
+								title: '蓝牙状态异常，请重新链接',
+								icon: 'none',
+								duration: 1000
+							});
+							setTimeout(() => {
+								that.isbackdevice=false
+								that.isnoline = true
+							}, 1300)
+						}
+
+					},
+					fail: function(error) {
+						uni.showToast({
+							title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+							icon: 'none',
+							duration: 2000
+						});
+						// that.getmarks()
+						// 在这里处理获取位置信息失败的情况
+					}
+
+				})
+
+
+			},
+			onlinebackDevice() {
+				let that = this
+				uni.getLocation({
+					type: 'wgs84',
+					success: function(lb) {
+
+
+						let data = {
+							latitude: lb.latitude,
+							longitude: lb.longitude,
+							areaId: that.areaInfo.areaId
+						}
+
+						that.$u.get('/appVerify/isInParkingArea?', data).then((res) => {
+
+							if (res.code == 200) {
+								let parkingReturn = res.data.parkingReturn
+								let isInParkingArea = res.data.isInParkingArea
+								if (parkingReturn) {
+									if (isInParkingArea) {
+										if (that.carstause) {
+											that.reboot()
+											that.$u.post(
+												'/appVerify/device/return?returnType=1&orderNo=' +
+												that.orderinfo
+												.orderNo + '&isBluetooth=true' + '&lon=' + lb
+												.longitude + '&lat=' + lb.latitude).then((
+												res) => {
+												uni.hideLoading()
+												if (res.code === 200) {
+													that.close()
+													that.getisInOrder()
+
+												} else {
+													uni.showToast({
+														title: res.msg,
+														icon: 'none',
+														duration: 2000
+													});
+												}
+											})
+
+
+										} else {
+											uni.showToast({
+												title: '蓝牙状态异常，请重新链接',
+												icon: 'none',
+												duration: 1000
+											});
+											setTimeout(() => {
+												that.isnoline = true
+											}, 1300)
+										}
+
+
+									} else {
+										uni.showToast({
+											title: '停车点外禁止还车，请行驶至停车区内',
+											icon: 'none',
+											duration: 2000
+										});
+									}
+								} else {
+									if (isInParkingArea) {
+										if (that.carstause) {
+											that.reboot()
+											that.$u.post(
+												'/appVerify/device/return?returnType=1&orderNo=' +
+												that.orderinfo
+												.orderNo + '&isBluetooth=true' + '&lon=' + lb
+												.longitude + '&lat=' + lb.latitude).then((
+												res) => {
+												uni.hideLoading()
+												if (res.code === 200) {
+													that.close()
+													that.getisInOrder()
+
+												} else {
+													uni.showToast({
+														title: res.msg,
+														icon: 'none',
+														duration: 2000
+													});
+												}
+											})
+
+
+										} else {
+											uni.showToast({
+												title: '蓝牙状态异常，请重新链接',
+												icon: 'none',
+												duration: 1000
+											});
+											setTimeout(() => {
+												that.isnoline = true
+											}, 1300)
+										}
+									} else {
+										that.isbackdevice = true
+									}
+								}
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								});
+							}
+						})
+
+
+
+					},
+					fail: function(error) {
+						uni.showToast({
+							title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+							icon: 'none',
+							duration: 2000
+						});
+						// that.getmarks()
+						// 在这里处理获取位置信息失败的情况
+					}
+
+				})
+
+			},
+			// 蓝牙
+			Binddevice() {
+				this.isnoline = false
+				uni.showLoading({
+					title: '连接中..'
+				})
+				xBlufi.initXBlufi(1);
+				console.log("xBlufi", xBlufi.XMQTT_SYSTEM);
+				xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
+				xBlufi.notifyStartDiscoverBle({
+					'isStart': true
+				});
+
+
+				// 两秒后停止蓝牙搜索
+				setTimeout(() => {
+					xBlufi.notifyStartDiscoverBle({
+						'isStart': false
+					});
+					setTimeout(() => {
+						
+						if (this.devicesList.length == 0) {
+							uni.showToast({
+								title: '暂无发现对应设备,请靠近设备',
+								icon: 'none'
+							});
+						} else {
+							let uniqueDevicesList = Array.from(new Set(this.devicesList));
+
+							// 将去重后的数组重新赋值给 this.devicesList
+							this.devicesList = uniqueDevicesList;
+							console.log(this.devicesList, 'this.devicesListthis.devicesList');
+							this.devicesList.forEach(device => {
+								// 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符）
+								let macFromName = device.name.substring(device.name.length - 12);
+								console.log(macFromName, 'macFromNamemacFromName');
+								// 与 this.mac 进行比较
+								if (macFromName == this.mac) {
+									// 如果相同，则将 this.ishave 设置为 true
+									console.log(device);
+									this.deviceInfoss = device
+									// this.ishave = true;
+									this.createBLEConnection(device)
+
+									console.log('对比正确1111111111');
+								} else {
+									console.log('对比错误');
+
+								}
+							});
+						}
+							
+						
+					}, 200)
+					// 判断是否存在浇花器设备
+
+					// this.status = true
+				}, 2000)
+
+			},
+			reboot() {
+				let vm = this; // 将外部的 this 绑定到 vm 上
+				uni.getNetworkType({
+					success(res) {
+						if (res.networkType !== 'none') {
+							uni.getConnectedBluetoothDevices({
+								success(res) {
+									console.log('已连接的蓝牙设备信息：', res);
+									// vm.dl = (vm.orderinfo.deviceAmount / vm.orderinfo.unitPrice).toFixed(2); // 使用 vm 访问 Vue 实例的属性
+									xBlufi.notifySendCustomData({
+										customData: "11reboot"
+									});
+									// uni.hideLoading()
+									// vm.remakr()
+								},
+								fail(err) {
+									uni.hideLoading()
+									console.error('获取已连接蓝牙设备信息失败：', err);
+								}
+							});
+						} else {
+							console.log('手机未连接网络');
+						}
+					}
+				});
+			},
+			opencar() {
+				let vm = this; // 将外部的 this 绑定到 vm 上
+				uni.getNetworkType({
+					success(res) {
+						if (res.networkType !== 'none') {
+							uni.getConnectedBluetoothDevices({
+								success(res) {
+									console.log('已连接的蓝牙设备信息：', res);
+									// vm.dl = (vm.orderinfo.deviceAmount / vm.orderinfo.unitPrice).toFixed(2); // 使用 vm 访问 Vue 实例的属性
+									xBlufi.notifySendCustomData({
+										customData: "11open"
+									});
+									// uni.hideLoading()
+									// vm.remakr()
+								},
+								fail(err) {
+									uni.hideLoading()
+									console.error('获取已连接蓝牙设备信息失败：', err);
+								}
+							});
+						} else {
+							console.log('手机未连接网络');
+						}
+					}
+				});
+			},
+			closecar() {
+				let vm = this; // 将外部的 this 绑定到 vm 上
+				uni.getNetworkType({
+					success(res) {
+						if (res.networkType !== 'none') {
+							uni.getConnectedBluetoothDevices({
+								success(res) {
+									console.log('已连接的蓝牙设备信息：', res);
+									// vm.dl = (vm.orderinfo.deviceAmount / vm.orderinfo.unitPrice).toFixed(2); // 使用 vm 访问 Vue 实例的属性
+									xBlufi.notifySendCustomData({
+										customData: "11llose"
+									});
+									// uni.hideLoading()
+									// vm.remakr()
+								},
+								fail(err) {
+									uni.hideLoading()
+									console.error('获取已连接蓝牙设备信息失败：', err);
+								}
+							});
+						} else {
+							console.log('手机未连接网络');
+						}
+					}
+				});
+			},
+			unloackdevices() {
+				if (this.OrderdeviceInfos.onlineStatus == 1) {
+					uni.showLoading({
+						title: '加载中...'
+					})
+					this.$u.post('/appVerify/device/unlock?sn=' + this.OrderdeviceInfos.sn + '&orderNo=' + this.orderinfo
+						.orderNo).then((res) => {
+
+						if (res.code === 200) {
+							this.getisInOrder()
+						} else {
+							if (res.msg == '10500-----') {
+								uni.showToast({
+									title: '系统异常，请重新尝试',
+									icon: 'none',
+									duration: 2000
+								});
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								});
+							}
+
+						}
+					})
+				} else {
+					if (this.carstause) {
+						this.opencar()
+
+						setTimeout(() => {
+							let that = this
+							uni.getLocation({
+								type: 'wgs84',
+								success: function(lb) {
+
+
+									let data = {
+										latitude: lb.latitude,
+										longitude: lb.longitude,
+										areaId: that.areaInfo.areaId
+									}
+									that.$u.post('/appVerify/device/unlock?sn=' + that.OrderdeviceInfos
+										.sn + '&orderNo=' +
+										that
+										.orderinfo
+										.orderNo + '&isBluetooth=true' + '&lon=' + lb.longitude +
+										'&lat=' + lb.latitude).then((res) => {
+
+										if (res.code === 200) {
+											that.getisInOrder()
+										} else {
+											if (res.msg == '10500-----') {
+												uni.showToast({
+													title: '系统异常，请重新尝试',
+													icon: 'none',
+													duration: 2000
+												});
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: 'none',
+													duration: 2000
+												});
+											}
+
+										}
+									})
+
+								},
+								fail: function(error) {
+									uni.showToast({
+										title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+										icon: 'none',
+										duration: 2000
+									});
+									// that.getmarks()
+									// 在这里处理获取位置信息失败的情况
+								}
+
+							})
+
+
+						}, 300)
+					} else {
+						uni.showToast({
+							title: '蓝牙状态异常，请重新链接',
+							icon: 'none',
+							duration: 1000
+						});
+						setTimeout(() => {
+							this.isnoline = true
+						}, 1300)
+					}
+
+				}
+
+			},
+			// ；临时锁车
+			loackdevice() {
+				if (this.OrderdeviceInfos.onlineStatus == 1) {
+					uni.showLoading({
+						title: '加载中...'
+					})
+					this.$u.post('/appVerify/device/lock?sn=' + this.OrderdeviceInfos.sn + '&orderNo=' + this.orderinfo
+						.orderNo).then((res) => {
+
+						if (res.code === 200) {
+							this.getisInOrder()
+						} else {
+							if (res.msg == '10500-----') {
+								uni.showToast({
+									title: '系统异常，请重新尝试',
+									icon: 'none',
+									duration: 2000
+								});
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								});
+							}
+
+						}
+					})
+				} else {
+					if (this.carstause) {
+						this.closecar()
+
+						setTimeout(() => {
+							let that = this
+							uni.getLocation({
+								type: 'wgs84',
+								success: function(lb) {
+							
+							
+									let data = {
+										latitude: lb.latitude,
+										longitude: lb.longitude,
+										areaId: that.areaInfo.areaId
+									}
+									that.$u.post('/appVerify/device/lock?sn=' + that.OrderdeviceInfos.sn + '&orderNo=' +
+										that
+										.orderinfo
+										.orderNo + '&isBluetooth=true'+ '&lon=' + lb.longitude + '&lat='+lb.latitude).then((res) => {
+									
+										if (res.code === 200) {
+											that.getisInOrder()
+										} else {
+											if (res.msg == '10500-----') {
+												uni.showToast({
+													title: '系统异常，请重新尝试',
+													icon: 'none',
+													duration: 2000
+												});
+											} else {
+												uni.showToast({
+													title: res.msg,
+													icon: 'none',
+													duration: 2000
+												});
+											}
+									
+										}
+									})
+									
+								},
+								fail: function(error) {
+									uni.showToast({
+										title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+										icon: 'none',
+										duration: 2000
+									});
+									// that.getmarks()
+									// 在这里处理获取位置信息失败的情况
+								}
+							
+							})
+						
+						}, 300)
+					} else {
+						uni.showToast({
+							title: '蓝牙状态异常，请重新链接',
+							icon: 'none',
+							duration: 1000
+						});
+						setTimeout(() => {
+							this.isnoline = true
+						}, 1300)
+					}
+
+				}
+
+			},
+
+
+
+			btnyc() {
+				this.titleflag = false
+			},
+
+			// 解析自定义数据
+
+			funListenDeviceMsgEvent: function(options) {
+				switch (options.type) {
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
+						if (options.result) {
+							let devicesarr = options.data
+							// this.devicesList = options.data
+
+							devicesarr.forEach(device => {
+
+
+								// this.$u.get(`/app/device/${mac}/isBind`, data).then((res) => {
+								// if (res.data == false) {
+								this.devicesList.push(device);
+
+								let uniqueDevicesList = Array.from(new Set(this.devicesList));
+
+								// 将去重后的数组重新赋值给 this.devicesList
+								this.devicesList = uniqueDevicesList;
+
+							});
+						}
+						break;
+
+					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
+						console.log("连接回调：" + JSON.stringify(options));
+						if (options.result) {
+							// uni.hideLoading();
+							
+							uni.showToast({
+								title: '连接成功',
+								icon: 'none'
+							}); 
+							{
+
+								xBlufi.notifyInitBleEsp32({
+									deviceId: options.data.deviceId
+								});
+
+								xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvents);
+
+								this.deviceIds = options.data.deviceId
+								this.name = options.data.name
+								// 连接成功绑定设备
+								// let params = {
+								// 	mac: this.Bluetoothmac,
+								// 	userId: this.$store.state.user.userId
+								// }
+								let systemInfo = uni.getSystemInfoSync();
+								if (systemInfo.platform === 'android') {
+									// 当前设备是 Android  
+
+								} else if (systemInfo.platform === 'ios') {
+									// 当前设备是 iOS  
+									// uni.navigateTo({
+									// 	url: '/pages/wifilist/index?deviceId=' + options
+									// 		.data.deviceId + '&name=' + options.data.name
+									// })
+								}
+							}
+						}
+
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+
+						// this.ver_data = this.parseCustomData(options.data)
+						if (options.data) {
+							this.carstause = true
+						}
+						// console.log("1收到设备发来的自定义数据结果：", this.ver_data);
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
+						if (options.result) {
+							let uniqueDevicesList = Array.from(new Set(this.devicesList));
+
+							// 过滤出名称字段的前五个字母为 "CTPOW" 的项
+							let filteredDevices = uniqueDevicesList.filter(device => device.name.substring(0, 4) ===
+								"BBLE");
+
+							// 将过滤后的数组重新赋值给 this.devicesList
+							this.devicesList = filteredDevices;
+
+							// console.log('蓝牙停止搜索ok',this.devicesList);
+						} else {
+							//蓝牙停止搜索失败
+							// console.log('蓝牙停止搜索失败');
+						}
+						this.searching = false
+						// _this.setData({
+						// 	searching: false
+						// });
+
+						break;
+				}
+			},
+
+
+			//4、建立连接
+			createBLEConnection(e) {
+				uni.showLoading({
+					title: '绑定中..'
+				})
+				console.log('调用了');
+				xBlufi.notifyStartDiscoverBle({
+					'isStart': false
+				});
+				// console.log(e, '蓝牙信息')
+				const deviceId = e.deviceId
+				this.Bluetoothmac = e.localName.substring(5) //从第七位开始截取 只取后面的mac号
+				console.log(this.Bluetoothmac, '11111');
+				let name = e.name;
+				// console.log('点击了，蓝牙准备连接的deviceId:' + e.deviceId);
+				xBlufi.notifyConnectBle({
+					isStart: true,
+					deviceId: e.deviceId,
+					name
+				});
+				setTimeout(()=>{
+					uni.hideLoading()
+				},3000)
+				// for (var i = 0; i < this.devicesList.length; i++) {
+				// 	if (e.deviceId === this.devicesList[i].deviceId) {
+
+				// 		uni.showLoading({
+				// 			title: '连接蓝牙设备中...'
+				// 		});
+				// 	}
+				// }
+			},
+			// 点击重新搜索
+			Search() {
+				if (this.status) {
+					xBlufi.notifyStartDiscoverBle({
+						'isStart': true
+					});
+					// 重新搜索清空蓝牙数组
+					this.bluthlist = []
+					this.devicesList = []
+					// 重新搜索
+					// this.startBluetoothDevicesDiscovery()
+					this.statusflag = true
+					this.status = false
+					this.texts = '正在扫描蓝牙设备...'
+					setTimeout(() => {
+						this.statusflag = false
+						this.status = true
+						if (this.searching) {
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': false
+							});
+							// 判断是否存在浇花器设备
+							if (this.devicesList.length == 0) {
+								uni.showToast({
+									title: '暂无发现对应设备,请靠近设备',
+									icon: 'none'
+								});
+							} else {
+								this.texts = '扫描到以下设备，请点击连接！'
+							}
+						} else {
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': true
+							});
+						}
+					}, 2000)
+				}
+
+
+			},
+			funListenDeviceMsgEvents: function(options) {
+				let that = this;
+				switch (options.type) {
+					case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED: {
+						console.log('状态', options.result)
+						if (options.result == false) {
+							this.carstause = false
+							uni.showToast({
+								title: '设备断开链接，请重新点击蓝牙链接',
+								icon: 'none'
+							});
+							// uni.showModal({
+							// 	title: '很抱歉提醒你！',
+							// 	content: '小程序与设备异常断开',
+							// 	showCancel: false,
+							// 	success: function(res) {
+							// 		// uni.navigateBack({
+							// 		// 	url: '../search/search'
+							// 		// });
+							// 	}
+							// });
+							// this.statusflag = false
+							// uni.hideLoading();
+						}
+					}
+					break;
+
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
+						this.loadPercent = options.data;
+						this.loadText = '文件读取中'
+						console.log("文件读取中", options.data);
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+						// this.isband = true
+						// this.ver_data = this.parseCustomData(options.data)
+						console.log("1收到设备发来的自定义数据结果：", options.data);
+						if (options.data) {
+							this.carstause = true
+						}
+						break;
+
+					case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
+						// uni.hideLoading();
+						if (options.result) {
+							console.log('初始化成功');
+						} else {
+							console.log('初始化失败');
+
+
+						}
+						break;
+				}
+			},
+			// 点击隐藏没有设备提示
+			btnhd() {
+				this.tishiflag = false
+			},
+
+
+
+
+			starTime() {
+				uni.hideLoading()
+				this.showtcs = false
+				this.seeDetail = false
+				clearInterval(this.timer)
+				this.timer = null
+				this.$u.get('/app/device/info?sn=' + this.orderinfo.sn).then((res) => {
+					if (res.code === 200) {
+						this.OrderdeviceInfos = res.data
+						// this.OrderdeviceInfos.onlineStatus ='0'
+
+						if (this.OrderdeviceInfos.onlineStatus == 0&&this.orderinfo.status != 3) {
+							this.mac = this.OrderdeviceInfos.mac
+							if (this.carstause == false) {
+
+								this.isnoline = true
+							}
+
+						}
+						// 直接从OrderdeviceInfos对象创建一个新的标记，并标记为设备特定标记
+						const newMarker = {
+							id: parseFloat(this.OrderdeviceInfos.sn),
+							latitude: parseFloat(this.OrderdeviceInfos.latitude),
+							longitude: parseFloat(this.OrderdeviceInfos.longitude),
+							width: 40,
+							height: 28,
+							isDeviceMarker: true, // 添加标识属性
+							iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uF9qLejuAZErNTrRuHq7',
+						};
+
+						// 保留显示气泡的标记和设备特定标记
+						const preservedMarkers = this.markers.filter(marker => marker.isCalloutVisible || marker
+							.isDeviceMarker);
+						// 使用单个新标记更新markers数组，如果需要保留之前的标记也可以加入
+						this.markers = [newMarker, ...preservedMarkers];
+						this.oldMarkers = [...this.markers];
+
+					} else {
+						// 处理接口返回错误的情况
+					}
+				}).catch(error => {
+					// 处理接口请求失败的情况
+				});
+
+
+				// 预约中
+				if (this.orderinfo.status == 0) {
+					this.showdevice = true
+					this.deviceIndex = 2
+					const createTimeTimestamp = new Date(this.orderinfo.createTime).getTime();
+
+					// 定义定时器
+					this.timer = setInterval(() => {
+						const currentTime = Date.now();
+						const timePassed = currentTime - createTimeTimestamp;
+						const secondsPassed = Math.floor(timePassed / 1000);
+
+						// 转换为时分秒格式
+						const hours = Math.floor(secondsPassed / 3600);
+						const minutes = Math.floor((secondsPassed % 3600) / 60);
+						const seconds = secondsPassed % 60;
+						const timeString =
+							`${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+						const totalMinutes = hours * 60 + minutes;
+						const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
+						this.money = tenMinuteIntervals * parseFloat(this.areaInfo.appointmentServiceFee)
+
+						// 每隔十分钟增加费用
+						if (minutes % 10 === 0 && seconds === 0) {
+
+						}
+						this.timeString = timeString
+						// console.log("已经过去了：" + timeString);
+					}, 1000);
+				} else if (this.orderinfo.status == 1) {
+					// 取消预约
+					// this.topay()
+					const createTimeTimestamp = new Date(this.orderinfo.appointmentStartTime).getTime();
+
+					// 定义定时器
+
+					const currentTime = new Date(this.orderinfo.appointmentEndTime).getTime();;
+					const timePassed = currentTime - createTimeTimestamp;
+					const secondsPassed = Math.floor(timePassed / 1000);
+
+					// 转换为时分秒格式
+					const hours = Math.floor(secondsPassed / 3600);
+					const minutes = Math.floor((secondsPassed % 3600) / 60);
+					const seconds = secondsPassed % 60;
+					const timeString =
+						`${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+					const totalMinutes = hours * 60 + minutes;
+					const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
+
+					this.timeString = timeString
+					// console.log("已经过去了：" + timeString);
+
+					this.showdevice = true
+					this.deviceIndex = 3
+				} else if (this.orderinfo.status == 2) {
+					// 开始骑行
+					// this.topay()
+					this.showdevice = true
+					this.deviceIndex = 2
+					const createTimeTimestamp = new Date(this.orderinfo.unlockTime).getTime();
+
+					// 定义定时器
+					this.timer = setInterval(() => {
+						const currentTime = Date.now();
+						const timePassed = currentTime - createTimeTimestamp;
+						const secondsPassed = Math.floor(timePassed / 1000);
+
+						// 转换为时分秒格式
+						const hours = Math.floor(secondsPassed / 3600);
+						const minutes = Math.floor((secondsPassed % 3600) / 60);
+						const seconds = secondsPassed % 60;
+						const timeString =
+							`${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+						let totalMinutes = hours * 60 + minutes;
+
+						let totalTime;
+						if (this.orderinfo.rule.rentalUnit === 'minutes') {
+							totalTime = totalMinutes;
+						} else if (this.orderinfo.rule.rentalUnit === 'hours') {
+							totalTime = hours + minutes / 60;
+						} else if (this.orderinfo.rule.rentalUnit === 'day') {
+							totalTime = hours / 24 + minutes / 1440;
+						}
+
+						// 计费规则计算
+						if (this.orderinfo.rule.ridingRule == 1) {
+							const ridingRuleJson = JSON.parse(this.orderinfo.rule.ridingRuleJson);
+							const timeoutTime = parseFloat(ridingRuleJson.timeoutTime);
+							const startingPrice = parseFloat(ridingRuleJson.startingPrice);
+							const startingTime = parseFloat(ridingRuleJson.startingTime);
+							const timeoutPrice = parseFloat(ridingRuleJson.timeoutPrice);
+
+							let totalCharge;
+							if (totalTime <= startingTime) {
+								totalCharge = startingPrice;
+							} else {
+								const extraTime = totalTime - startingTime;
+								const extraCharge = Math.ceil(extraTime / timeoutTime) * timeoutPrice;
+								totalCharge = startingPrice + extraCharge;
+							}
+
+							// 更新money值
+							this.money = totalCharge + this.orderinfo.appointmentFee
+						} else if (this.orderinfo.rule.ridingRule == 2) {
+							const ridingRuleJson = JSON.parse(this.orderinfo.rule.ridingRuleJson);
+							const rules = ridingRuleJson.rule;
+							let totalCharge = 0;
+
+							for (let rule of rules) {
+								const start = parseFloat(rule.start);
+								const end = parseFloat(rule.end);
+								const eachUnit = parseFloat(rule.eachUnit);
+								const fee = parseFloat(rule.fee);
+
+								if (totalTime > start && (end === 9999 || totalTime <= end)) {
+									// 所有时间都按照该区间的费率来计算
+									totalCharge = Math.ceil(totalTime / eachUnit) * fee;
+									break;
+								}
+							}
+
+							// 更新money值
+							this.money = totalCharge + this.orderinfo.appointmentFee
+						}
+
+						// 更新时间字符串
+						this.timeString = timeString;
+					}, 1000);
+				} else if (this.orderinfo.status == 3) {
+					// 骑行结束
+					// this.topay()
+					const createTimeTimestamp = new Date(this.orderinfo.createTime).getTime();
+
+					// 定义定时器
+
+					const currentTime = Date.now();
+					const timePassed = currentTime - createTimeTimestamp;
+					const secondsPassed = Math.floor(timePassed / 1000);
+
+					// 转换为时分秒格式
+					const hours = Math.floor(secondsPassed / 3600);
+					const minutes = Math.floor((secondsPassed % 3600) / 60);
+					const seconds = secondsPassed % 60;
+					const timeString =
+						`${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+					const tenMinuteIntervals = Math.floor((hours * 60 + minutes) / 10) + 1; // 加1是因为不满十分钟也算一个十分钟
+
+					this.timeString = timeString
+					// console.log("已经过去了：" + timeString);
+
+					this.showdevice = true
+					this.deviceIndex = 3
+				}
+
+
+
+				// 将 createTime 转换为时间戳
+
+			},
 			startCountdown() {
 				console.log('调用了');
 				const interval = setInterval(() => {
@@ -987,23 +2050,29 @@
 				})
 			},
 			backDevice() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				this.$u.post('/appVerify/device/return?returnType=1&orderNo=' + this.orderinfo.orderNo).then((res) => {
-					uni.hideLoading()
-					if (res.code === 200) {
-						this.close()
-						this.getisInOrder()
+				if (this.OrderdeviceInfos.onlineStatus == 1) {
+					uni.showLoading({
+						title: '加载中...'
+					})
+					this.$u.post('/appVerify/device/return?returnType=1&orderNo=' + this.orderinfo.orderNo).then((res) => {
+						uni.hideLoading()
+						if (res.code === 200) {
+							this.close()
+							this.getisInOrder()
+
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+
+				} else {
+					this.onlinebackDevice()
+				}
 
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				})
 			},
 			// 套餐直接开锁
 			sub6() {
@@ -1095,252 +2164,8 @@
 				}
 
 			},
-			unloackdevices() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				this.$u.post('/appVerify/device/unlock?sn=' + this.OrderdeviceInfos.sn + '&orderNo=' + this.orderinfo
-					.orderNo).then((res) => {
-
-					if (res.code === 200) {
-						this.getisInOrder()
-					} else {
-						if (res.msg == '10500-----') {
-							uni.showToast({
-								title: '系统异常，请重新尝试',
-								icon: 'none',
-								duration: 2000
-							});
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 2000
-							});
-						}
-
-					}
-				})
-			},
-			// ；临时锁车
-			loackdevice() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				this.$u.post('/appVerify/device/lock?sn=' + this.OrderdeviceInfos.sn + '&orderNo=' + this.orderinfo
-					.orderNo).then((res) => {
-
-					if (res.code === 200) {
-						this.getisInOrder()
-					} else {
-						if (res.msg == '10500-----') {
-							uni.showToast({
-								title: '系统异常，请重新尝试',
-								icon: 'none',
-								duration: 2000
-							});
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 2000
-							});
-						}
-
-					}
-				})
-			},
-			starTime() {
-				uni.hideLoading()
-				this.showtcs = false
-				this.seeDetail = false
-				clearInterval(this.timer)
-				this.timer = null
-				this.$u.get('/app/device/info?sn=' + this.orderinfo.sn).then((res) => {
-					if (res.code === 200) {
-						 // 直接从OrderdeviceInfos对象创建一个新的标记，并标记为设备特定标记
-						        const newMarker = {
-						            id: parseFloat(this.OrderdeviceInfos.sn),
-						            latitude: parseFloat(this.OrderdeviceInfos.latitude),
-						            longitude: parseFloat(this.OrderdeviceInfos.longitude),
-						            width: 40,
-						            height: 28,
-						            isDeviceMarker: true,  // 添加标识属性
-						            iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uF9qLejuAZErNTrRuHq7',
-						        };
-						
-						        // 保留显示气泡的标记和设备特定标记
-						        const preservedMarkers = this.markers.filter(marker => marker.isCalloutVisible || marker.isDeviceMarker);
-						        // 使用单个新标记更新markers数组，如果需要保留之前的标记也可以加入
-						        this.markers = [newMarker, ...preservedMarkers];
-						        this.oldMarkers = [...this.markers];
-					} else {
-						// 处理接口返回错误的情况
-					}
-				}).catch(error => {
-					// 处理接口请求失败的情况
-				});
 
 
-				// 预约中
-				if (this.orderinfo.status == 0) {
-					this.showdevice = true
-					this.deviceIndex = 2
-					const createTimeTimestamp = new Date(this.orderinfo.createTime).getTime();
-
-					// 定义定时器
-					this.timer = setInterval(() => {
-						const currentTime = Date.now();
-						const timePassed = currentTime - createTimeTimestamp;
-						const secondsPassed = Math.floor(timePassed / 1000);
-
-						// 转换为时分秒格式
-						const hours = Math.floor(secondsPassed / 3600);
-						const minutes = Math.floor((secondsPassed % 3600) / 60);
-						const seconds = secondsPassed % 60;
-						const timeString =
-							`${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
-						const totalMinutes = hours * 60 + minutes;
-						const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
-						this.money = tenMinuteIntervals * parseFloat(this.areaInfo.appointmentServiceFee)
-
-						// 每隔十分钟增加费用
-						if (minutes % 10 === 0 && seconds === 0) {
-
-						}
-						this.timeString = timeString
-						// console.log("已经过去了：" + timeString);
-					}, 1000);
-				} else if (this.orderinfo.status == 1) {
-					// 取消预约
-					// this.topay()
-					const createTimeTimestamp = new Date(this.orderinfo.appointmentStartTime).getTime();
-
-					// 定义定时器
-
-					const currentTime = new Date(this.orderinfo.appointmentEndTime).getTime();;
-					const timePassed = currentTime - createTimeTimestamp;
-					const secondsPassed = Math.floor(timePassed / 1000);
-
-					// 转换为时分秒格式
-					const hours = Math.floor(secondsPassed / 3600);
-					const minutes = Math.floor((secondsPassed % 3600) / 60);
-					const seconds = secondsPassed % 60;
-					const timeString =
-						`${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
-					const totalMinutes = hours * 60 + minutes;
-					const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
-
-					this.timeString = timeString
-					// console.log("已经过去了：" + timeString);
-
-					this.showdevice = true
-					this.deviceIndex = 3
-				} else if (this.orderinfo.status == 2) {
-					// 开始骑行
-					// this.topay()
-					this.showdevice = true
-					this.deviceIndex = 2
-					const createTimeTimestamp = new Date(this.orderinfo.unlockTime).getTime();
-
-					// 定义定时器
-					this.timer = setInterval(() => {
-						const currentTime = Date.now();
-						const timePassed = currentTime - createTimeTimestamp;
-						const secondsPassed = Math.floor(timePassed / 1000);
-
-						// 转换为时分秒格式
-						const hours = Math.floor(secondsPassed / 3600);
-						const minutes = Math.floor((secondsPassed % 3600) / 60);
-						const seconds = secondsPassed % 60;
-						const timeString =
-							`${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
-						let totalMinutes = hours * 60 + minutes;
-
-						let totalTime;
-						if (this.orderinfo.rule.rentalUnit === 'minutes') {
-							totalTime = totalMinutes;
-						} else if (this.orderinfo.rule.rentalUnit === 'hours') {
-							totalTime = hours + minutes / 60;
-						} else if (this.orderinfo.rule.rentalUnit === 'day') {
-							totalTime = hours / 24 + minutes / 1440;
-						}
-
-						// 计费规则计算
-						if (this.orderinfo.rule.ridingRule == 1) {
-							const ridingRuleJson = JSON.parse(this.orderinfo.rule.ridingRuleJson);
-							const timeoutTime = parseFloat(ridingRuleJson.timeoutTime);
-							const startingPrice = parseFloat(ridingRuleJson.startingPrice);
-							const startingTime = parseFloat(ridingRuleJson.startingTime);
-							const timeoutPrice = parseFloat(ridingRuleJson.timeoutPrice);
-
-							let totalCharge;
-							if (totalTime <= startingTime) {
-								totalCharge = startingPrice;
-							} else {
-								const extraTime = totalTime - startingTime;
-								const extraCharge = Math.ceil(extraTime / timeoutTime) * timeoutPrice;
-								totalCharge = startingPrice + extraCharge;
-							}
-
-							// 更新money值
-							this.money = totalCharge + this.orderinfo.appointmentFee
-						} else if (this.orderinfo.rule.ridingRule == 2) {
-							const ridingRuleJson = JSON.parse(this.orderinfo.rule.ridingRuleJson);
-							const rules = ridingRuleJson.rule;
-							let totalCharge = 0;
-
-							for (let rule of rules) {
-								const start = parseFloat(rule.start);
-								const end = parseFloat(rule.end);
-								const eachUnit = parseFloat(rule.eachUnit);
-								const fee = parseFloat(rule.fee);
-
-								if (totalTime > start && (end === 9999 || totalTime <= end)) {
-									// 所有时间都按照该区间的费率来计算
-									totalCharge = Math.ceil(totalTime / eachUnit) * fee;
-									break;
-								}
-							}
-
-							// 更新money值
-							this.money = totalCharge + this.orderinfo.appointmentFee
-						}
-
-						// 更新时间字符串
-						this.timeString = timeString;
-					}, 1000);
-				} else if (this.orderinfo.status == 3) {
-					// 骑行结束
-					// this.topay()
-					const createTimeTimestamp = new Date(this.orderinfo.createTime).getTime();
-
-					// 定义定时器
-
-					const currentTime = Date.now();
-					const timePassed = currentTime - createTimeTimestamp;
-					const secondsPassed = Math.floor(timePassed / 1000);
-
-					// 转换为时分秒格式
-					const hours = Math.floor(secondsPassed / 3600);
-					const minutes = Math.floor((secondsPassed % 3600) / 60);
-					const seconds = secondsPassed % 60;
-					const timeString =
-						`${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
-					const tenMinuteIntervals = Math.floor((hours * 60 + minutes) / 10) + 1; // 加1是因为不满十分钟也算一个十分钟
-
-					this.timeString = timeString
-					// console.log("已经过去了：" + timeString);
-
-					this.showdevice = true
-					this.deviceIndex = 3
-				}
-
-
-
-				// 将 createTime 转换为时间戳
-
-			},
 			// 取消预约支付
 			topay() {
 				let data = {
@@ -1638,55 +2463,13 @@
 					uni.navigateTo({
 						url: '/page_user/gzsb?sn=' + this.sn
 					})
+				} else if (num == 9) {
+					uni.navigateTo({
+						url: '/page_user/khfw/khfw'
+					})
 				}
 			},
-			createWebSocket() {
-				// 创建 WebSocket 实例，传入 token
-				let token = uni.getStorageSync('token')
-				let that = this
-				this.socket = uni.connectSocket({
-					url: `ws://192.168.2.8:8080/appVerify/ws/${this.eventKey}`, // WebSocket 服务器地址
-					header: {
-						'Authorization': token // 设置 Authorization 请求头
-					},
-					success(res) {
 
-						console.log('WebSocket 连接成功', res);
-					},
-					fail(err) {
-						console.error('WebSocket 连接失败', err);
-					}
-				});
-
-				// 监听 WebSocket 接收到消息事件
-				this.socket.onMessage(res => {
-					console.log('收到消息：', res.data);
-				});
-
-				// 监听 WebSocket 错误事件
-				this.socket.onError(err => {
-					console.error('WebSocket 错误：', err);
-				});
-
-				// 监听 WebSocket 连接关闭事件
-				this.socket.onClose(() => {
-					console.log('WebSocket 连接已关闭');
-				});
-			},
-			sendMessage() {
-				// console.log('发送了消息');
-				// 发送消息给服务器
-				this.socket.send({
-					data: 'Hello, server!'
-				});
-			},
-			closeConnection() {
-				// 关闭 WebSocket 连接
-				this.socket.close({
-					code: 1000, // 关闭连接的代码
-					reason: 'Closing connection' // 关闭连接的原因
-				});
-			},
 			sub5() {
 				if (this.orderinfo.ruleId) {
 					this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' +
@@ -2484,15 +3267,17 @@
 							}));
 
 							// 保留显示气泡的标记
-						const preservedMarkers = this.markers.filter(marker => marker.isCalloutVisible || marker.isDeviceMarker);
-						
-						    // 假设newMarkers是从新数据生成的标记数组
-						    // 更新markers数组，避免删除已标识的重要标记
-						    this.markers = [...newMarkers.filter(newMarker => 
-						        !preservedMarkers.some(preservedMarker => preservedMarker.id === newMarker.id)
-						    ), ...preservedMarkers];
-						
-						    this.oldMarkers = [...this.markers];
+							const preservedMarkers = this.markers.filter(marker => marker.isCalloutVisible ||
+								marker.isDeviceMarker);
+
+							// 假设newMarkers是从新数据生成的标记数组
+							// 更新markers数组，避免删除已标识的重要标记
+							this.markers = [...newMarkers.filter(newMarker =>
+								!preservedMarkers.some(preservedMarker => preservedMarker.id === newMarker
+									.id)
+							), ...preservedMarkers];
+
+							this.oldMarkers = [...this.markers];
 						}
 					}).catch(error => {
 						// 处理接口请求失败的情况
@@ -2585,6 +3370,7 @@
 				this.$u.get('/app/area/info?', this.gps).then((res) => {
 					this.showmap = true
 					if (res.code === 200) {
+						
 						// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
 						const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
 						// console.log(polylines,'polylinespolylinespolylines');
@@ -2609,6 +3395,7 @@
 
 						if (hasShownPopup === '' || hasShownPopup === null) {
 							console.log('1111111111');
+							
 							this.showTips = true;
 							this.startCountdown();
 							uni.setStorageSync('hasShownPopup', true);
@@ -2617,7 +3404,9 @@
 							this.showTips = uni.getStorageSync('hasShownPopup');
 							console.log(this.showTips, 'this.showTips');
 							this.startCountdown();
+							
 						}
+						
 						this.setMapScale()
 						// if(!hasShownPopup){
 						// 	console.log(typeof(hasShownPopup),'hasShownPopuphasShownPopup');
diff --git a/pages_admin/admin_index.vue b/pages_admin/admin_index.vue
index 8468bad..fbd2590 100644
--- a/pages_admin/admin_index.vue
+++ b/pages_admin/admin_index.vue
@@ -21,7 +21,9 @@
 		<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
 			:show-location="true" :markers="markers" :polygons="polyline" @markertap="onMarkerTap">
 		</map>
-
+		<view class="park" @click="toggleIconAndCallout">
+			<image src="https://lxnapi.ccttiot.com/bike/img/static/uRiYQZQEb3l2LsltEsyW" mode=""></image>
+		</view>
 		<view @touchmove.stop.prevent="() => {}">
 			<view class="btn_box">
 				<view class="btn1" @click="qecodelock()">
@@ -146,7 +148,8 @@
 				},
 				statusidx: 7,
 				deviceNum: {},
-				areaId:0,
+				areaId: 0,
+				showIconAndCallout:false
 
 
 			}
@@ -159,12 +162,12 @@
 
 				// 执行其他操作...
 			});
-			
+
 
 			this.getareaid()
-			
-			
-		
+
+
+
 			let that = this
 			uni.getLocation({
 				type: 'wgs84',
@@ -195,7 +198,7 @@
 		},
 		onLoad() {
 
-			
+
 		},
 		computed: {
 			userId() {
@@ -203,24 +206,56 @@
 			},
 		},
 		methods: {
-			getareaid(){
+			toggleIconAndCallout() {
+				this.showIconAndCallout = !this.showIconAndCallout;
+				if (this.showIconAndCallout) {
+					const newMarkers = [];
+					this.parkingList.forEach(item => {
+						newMarkers.push({
+							id: parseFloat(item.parkingId),
+							latitude: parseFloat(item.latitude),
+							longitude: parseFloat(item.longitude),
+							width: 20,
+							height: 40,
+							iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
+							callout: {
+								content: item.parkingName,
+								color: '#ffffff',
+								fontSize: 14,
+								borderRadius: 10,
+								bgColor: item.type == 1 ? '#3A7EDB' : item.type == 2 ? '#FFC107' :
+									'#FF473E',
+								padding: 6,
+								display: 'ALWAYS'
+							},
+							isCalloutVisible: true // 添加标记
+						});
+					});
+					this.$set(this, 'markers', [...this.markers, ...newMarkers]);
+				} else {
+					// 过滤掉所有气泡显示的标记
+					this.$set(this, 'markers', this.markers.filter(marker => !marker.isCalloutVisible));
+				}
+			
+			},
+			getareaid() {
 				this.$u.post('/appVerify/getAreaId').then((res) => {
 					if (res.code == 200) {
 						// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
 						// this.areaId=res.data
-						this.areaId=14
+						this.areaId = 14
 						this.getArea()
-						
+
 						this.allVehicleNum()
 						// console.log(this.polyline);
-					}else{
-						this.areaId=14
+					} else {
+						this.areaId = 14
 						this.getArea()
-						
+
 						this.allVehicleNum()
 					}
 				}).catch(error => {
-					
+
 				});
 			},
 			async setMapScale(e, val) {
@@ -624,14 +659,14 @@
 
 			},
 
-			
-			
+
+
 			getArea() {
 				// 发送请求获取数据
 				let data = {
 					areaId: this.areaId
 				}
-				this.$u.get('/app/area/list?',data).then((res) => {
+				this.$u.get('/app/area/list?', data).then((res) => {
 					if (res.code === 200) {
 						// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
 						const polylines = res.rows
@@ -639,7 +674,7 @@
 							.map(area => this.convertBoundaryToPolyline(area.boundaryStr));
 						// 更新折线数据
 						this.polyline = polylines;
-						
+
 						this.getmarks()
 						// console.log(this.polyline);
 					}
@@ -769,64 +804,7 @@
 						this.polyline = this.polyline.concat(polylines);
 						console.log(this.polyline, 'this.polyline');
 						// console.log(this.polyline);
-						res.rows.forEach(item => {
-							if(item.type==1){
-								this.markers.push({
-									id: parseFloat(item.parkingId),
-									latitude: parseFloat(item.latitude),
-									longitude: parseFloat(item.longitude),
-									width: 20,
-									height: 40,
-									iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
-									callout: {
-										content: item.parkingName, // 修改为你想要显示的文字内容
-										color: '#ffffff', // 修改为文字颜色
-										fontSize: 14, // 修改为文字大小
-										borderRadius: 10, // 修改为气泡圆角大小
-										bgColor: '#3A7EDB', // 修改为气泡背景颜色
-										padding: 6, // 修改为气泡内边距
-										display: 'ALWAYS' // 修改为气泡的显示策略
-									}
-								});
-							}else if(item.type==2){
-								this.markers.push({
-									id: parseFloat(item.parkingId),
-									latitude: parseFloat(item.latitude),
-									longitude: parseFloat(item.longitude),
-									width: 20,
-									height: 40,
-									iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
-									callout: {
-										content: item.parkingName, // 修改为你想要显示的文字内容
-										color: '#ffffff', // 修改为文字颜色
-										fontSize: 14, // 修改为文字大小
-										borderRadius: 10, // 修改为气泡圆角大小
-										bgColor: '#FFC107', // 修改为气泡背景颜色
-										padding: 6, // 修改为气泡内边距
-										display: 'ALWAYS' // 修改为气泡的显示策略
-									}
-								});
-							}else if(item.type==3){
-								this.markers.push({
-									id: parseFloat(item.parkingId),
-									latitude: parseFloat(item.latitude),
-									longitude: parseFloat(item.longitude),
-									width: 20,
-									height: 40,
-									iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
-									callout: {
-										content: item.parkingName, // 修改为你想要显示的文字内容
-										color: '#ffffff', // 修改为文字颜色
-										fontSize: 14, // 修改为文字大小
-										borderRadius: 10, // 修改为气泡圆角大小
-										bgColor: '#FF473E', // 修改为气泡背景颜色
-										padding: 6, // 修改为气泡内边距
-										display: 'ALWAYS' // 修改为气泡的显示策略
-									}
-								});
-							}
-						})
-					
+							this.parkingList = res.rows
 					}
 				}).catch(error => {
 					console.error("Error fetching parking data:", error);
@@ -894,7 +872,24 @@
 
 
 		}
-
+		.park {
+			position: fixed;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			right: 30rpx;
+			bottom: 500rpx;
+			// background-color: #fff;
+			border-radius: 50%;
+			width: 82rpx;
+			height: 82rpx;
+			z-index: 10;
+		
+			.img {
+				width: 82rpx;
+				height: 82rpx;
+			}
+		}
 		.btn_box {
 			width: 100%;
 			display: flex;
diff --git a/store/getters.js b/store/getters.js
index 5fa3217..cf9b0ff 100644
--- a/store/getters.js
+++ b/store/getters.js
@@ -16,6 +16,6 @@ const getters = {
   userId: state => state.app.userId,
   isMeal: state => state.app.isMeal,
   deposit: state => state.app.deposit,
-  showTips: state => state.app.showTips,
+  showagre: state => state.app.showagre,
 }
 export default getters
diff --git a/store/modules/app.js b/store/modules/app.js
index 1784970..def2629 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -13,7 +13,7 @@ const state = {
 		userId:null,
 		isMeal:null,
 		deposit:null,
-		showTips:true,
+		showagre:true,
 };
 
 const mutations = {
@@ -52,9 +52,9 @@ const mutations = {
 		state.deposit = fee;
 		
 	},
-	SET_SHOWTIPS(state, fee) {
+	SET_SHOWAGRE(state, fee) {
 			console.log(fee,'feefeefeefee');
-			state.showTips = fee;
+			state.showagre = fee;
 			
 		
 	}