diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 040d4ce..5dcb86b 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -20,8 +20,8 @@ const install = (Vue, vm) => {
 	// 	},
 	// }); 
 	Vue.prototype.$u.http.setConfig({
-			baseUrl: 'http://124.221.246.124:2290',
-			// baseUrl: 'https://kg.chuantewulian.cn/prod-api',
+			// baseUrl: 'http://124.221.246.124:2290',
+			baseUrl: 'https://kg.chuantewulian.cn/prod-api',
 			loadingText: '努力加载中~',
 			loadingTime: 1000,
 			// 设置自定义头部content-type
diff --git a/page_components/eletj.vue b/page_components/eletj.vue
index 22d31d3..cfd850a 100644
--- a/page_components/eletj.vue
+++ b/page_components/eletj.vue
@@ -1,251 +1,419 @@
 <template>
 	<view class="page">
-		<u-navbar title="用电分析" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
-			height='50' id="navbar"></u-navbar>
-		<view class="card">
-			<view class="xzsj">
-				<u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
-			</view>
-			<view class="month" @click="show = true">
-				{{yeartime.year + '年' + yeartime.month + '月'}} <u-icon style="margin-left: 10rpx;" name="arrow-down-fill"></u-icon>
-			</view>
-			<view class="tit">
-				本月用电量（度）
-			</view>
-			<div class="txt">
-				{{quantity}}
-			</div>
-			<view class="echarts" v-if="loging">
-				<!-- <mpvue-echarts id="main" ref="pieChart" :echarts="echarts" @onInit="initChart" /> -->
-			<uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas" canvas-id="uni-ec-canvas"
-				:ec="ec">
-			</uni-ec-canvas>
-			</view>
-		</view>
-		<view class="list" style="padding-bottom: 120rpx;">
-			<view class="card_list" v-for="(item,index) in timelist" :key="index">
-				<view class="left">
-					{{yeartime.year + '年' + yeartime.month + '月' + item.createDay + '日'}}
+		<u-navbar :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff'
+			title-size='36' height='50' id="navbar">
+		</u-navbar>
+		<view class="zhuhu">
+			<view class="card1">
+				<view class="top">
+					<view class="left">
+						设备
+					</view>
+					<view class="right">
+					
+					</view>
+				</view>
+				<view class="mid">
+					<view class="mid_left">
+					<!-- 	<button v-if="opflag" style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;border: 1rpx solid #ccc;"
+							type="primary reverse" open-type="chooseAvatar" @chooseavatar="btnpic"> -->
+							<image  :src="imglist" mode=""
+								style="width: 142rpx;height: 142rpx;border-radius: 20rpx;background: #ccc;"></image>
+						<!-- </button> -->
+					<!-- 	<image v-else :src="imglist" mode=""
+							style="width: 142rpx;height: 142rpx;border-radius: 20rpx;"></image> -->
+					</view>
+					<view class="mid_right">
+						<view class="mid_top">
+							{{ deviceInfo.deviceName == null ? '' : deviceInfo.deviceName }}
+							<view class="" style="font-size: 26rpx;margin-top: 8rpx;">
+								更新时间：{{deviceInfo.lastPullTime == null ? '--' : deviceInfo.lastPullTime}}</view>
+						</view>
+						<view class="mid_bot">
+							<view class="txt" v-if="deviceInfo">
+								S/N码：{{ deviceInfo.deviceNo == null ? '' : deviceInfo.deviceNo }}</view>
+							<div class="tip" v-if="deviceInfo.onlineStatus==1">在线</div>
+							<div class="tip" v-if="deviceInfo.onlineStatus==0">离线</div>
+							<div class="tip" v-if="deviceInfo.status==1">空闲</div>
+							<div class="tip" v-if="deviceInfo.status==2">使用中</div>
+							<div class="tip" v-if="deviceInfo.status==3">维修中</div>
+						</view>
+					</view>
+				</view>
+				<view class="bot">
 				</view>
-			<view class="right">
-				{{item.usedElectriQuantity}}度
 			</view>
+			<view class="card2">
+				<view class="bot_right">
+					<view class="cont" style="text-align: center;">
+						<view class="txt">
+							剩余时长：{{ setMode == null ? timeday : setMode}} 
+						</view>
+					</view>
+				</view>
+				
+				
 			</view>
 		</view>
-
+		 
 	</view>
 </template>
 
 <script>
+	var xBlufi = require("@/page_components/blufi/xBlufi.js")
 	import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas.vue'
 	import * as echarts from '@/components/uni-ec-canvas/echarts'
 	let chart = null
-	
 	export default {
 		components: {
 			uniEcCanvas
 		},
 		data() {
 			return {
-				ec: {
-					lazyLoad: true
-				},
-				
 				bgc: {
 					backgroundColor: "#8883f0",
 				},
-				params: {
-					year: true,
-					month: true,
-					day: false,
-					hour: false,
-					minute: false,
-					second: false
+				ec: {
+					lazyLoad: true
 				},
-				show: false,
-				yeartime: {
-					year: '',
-					month: ''
-				},
-				timelist: '',
-				quantity: 0, //电量
-				chartData: [],
-				chartday: [],
-				loging: true,
+				deviceInfo: {},
+				loadings: false,
+				info: '',
+				tittxt: "设备详情",
+				titlist: [
+					"全部",
+					"电表",
+					"水表",
+
+				],
+				curtitidx: 0,
+				id: '',
+				timeday: '',
+				imglist: '',
+				token: '',
+				userImgs: '',
+				imgflag: true,
+				mac: "",
+				name: '',
 				deviceId: '',
-				userType: '',
-				dateday:'',
-				monthdui:''
+				storeId: '',
+				qrResult: '',
+				devicesList: [],
+				setMode:null,
+				vipflag:false,
+				cztime:'',
+				opflag:true
 			}
 		},
-		onLoad(e) {
+		onLoad(option) {
+			let id = option.id
+			this.id = id
+			this.getDevice(id)
+             if(option.flag){
+				 this.opflag = false
+			 }else{
+				 this.opflag = true
+			 }
+
+		},
+		onShow() {
 			setTimeout(() => {
-				// console.log(this.$refs)
-				this.$refs.canvas.init(this.initChart)
+				this.getDevice(this.id)
 			}, 1000)
-			this.deviceId = e.id
-			
-			const now = new Date();
-			this.yeartime.year = now.getFullYear()
-			this.yeartime.month = now.getMonth() + 1
-			this.monthdui = this.yeartime.month
-			this.dateday = String(now.getDate()).padStart(2, '0')
-			this.gettimes()
+			this.getQiniuToken()
+		},
+		onUnload: function() {
+			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
+			xBlufi.notifyStartDiscoverBle({
+				'isStart': false
+			});
+			wx.closeBLEConnection({
+				deviceId: this.objlist.deviceId,
+			})
+		},
+		onHide() {
+			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
+			xBlufi.notifyStartDiscoverBle({
+				'isStart': false
+			});
+			wx.closeBLEConnection({
+				deviceId: this.objlist.deviceId,
+			})
+		},
+		onBeforeUnmount() {
+			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
+			xBlufi.notifyStartDiscoverBle({
+				'isStart': false
+			});
+			wx.closeBLEConnection({
+				deviceId: this.objlist.deviceId,
+			})
 		},
 		methods: {
-			confirm(e) {
-				setTimeout(() => {
-					// console.log(this.$refs)
-					this.$refs.canvas.init(this.initChart)
-				}, 1000)
-				this.yeartime = e
-				this.gettimes()
-			},
-			// 进行获取用电量请求
-			gettimes() {
-				let data = {
-					deviceId:this.deviceId,
-					year: this.yeartime.year,
-					month: this.yeartime.month,
-					groupBy: 'create_date'
-				}
-				this.loging=false
-				this.$u.get('/app/device/electric/count', data).then((res) => {
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
 					if (res.code == 200) {
-						this.timelist = res.data
-						// this.chartData = this.timelist.map(item => item.usedElectriQuantity);
-					 //    this.chartday = this.timelist.map(item => item.createDay + '日');
-					
-					    if(this.monthdui != this.yeartime.month){
-					    	this.timelist = this.timelist
-					    	this.totalRecharge = res.totalRecharge
-					    	this.chartData = this.timelist.map(item => item.usedElectriQuantity);
-					    	this.chartday = this.timelist.map(item => item.createDay + '日');
-					    }else{
-					    	this.timelist = this.timelist.slice(0, 14)
-					    	this.timelist.reverse()
-					    	this.totalRecharge = res.totalRecharge
-					    	this.chartData = this.timelist.slice(0, this.dateday).map(item => item.usedElectriQuantity)
-					    	this.chartday = this.timelist.slice(0, this.dateday).map(item => item.createDay + '日');
-					    }
-					      
-						this.loging=true
-						this.quantity = 0
-						for (let i = 0; i < this.timelist.length; i++) {
-							this.quantity += this.timelist[i].usedElectriQuantity
-						}
-						return this.quantity
-						
+						this.token = res.token
+					}
+				});
+			},
+			// btnpic(e) {
+			// 	let _this = this
+			// 	let math = 'static/' + _this.$u.guid(20)
+			// 	const tempFilePaths = e.detail.avatarUrl
+			// 	wx.uploadFile({
+			// 		url: 'https://up-z2.qiniup.com',
+			// 		name: 'file',
+			// 		filePath: tempFilePaths,
+			// 		formData: {
+			// 			token: _this.token,
+			// 			key: 'smartmeter/img/' + math
+			// 		},
+			// 		success: function(res) {
+			// 			let str = JSON.parse(res.data)
+			// 			console.log(str.key)
+			// 				_this.userImgs = 'https://api.ccttiot.com/' + str.key
+			// 				_this.imglist = _this.userImgs
+			// 				_this.imgflag = false
+			// 				let data = {
+			// 					deviceId:_this.id,
+			// 					customPicture:_this.imglist
+			// 				}
+			// 				_this.putdevice(data)
+			// 		}
+			// 	})
+			// },
+			putdevice(data) {
+				this.$u.put('/app/device', data).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration: 2000
+						})
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
 				})
 			},
-			
-			generateWaveData(length) {
-				const data = [];
-				for (let i = 0; i < length; i++) {
-					const y = Math.sin((i / (length - 1)) * Math.PI * 2); // 正弦函数生成波浪形状的y值
-					data.push((y + 1) * 50); // 映射到0-100的范围
-				}
-				return data;
+
+			// 获取设备详情
+			getDevice(id) {
+				this.$u.get("/app/device/" + id).then((res) => {
+					// this.$forceUpdate()
+					if (res.code == 200) {
+						this.deviceInfo = res.data
+						this.storeId = res.data.storeId
+						this.qrResult = 'CTKG-' + res.data.mac
+						if (res.data.customPicture != null) {
+							this.imglist = res.data.customPicture
+						} else {
+							this.imglist = res.data.picture
+						}
+						if(this.deviceInfo.expireTime == null){
+							this.timeday = 0
+						}else{
+							let expireTimeStr = this.deviceInfo.expireTime
+							let expireTimeParts = expireTimeStr.split(" ");
+							let expireDateParts = expireTimeParts[0].split("-");
+							let expireTimePartsTime = expireTimeParts[1].split(":");
+							let expireDate = new Date(expireDateParts[0], expireDateParts[1] - 1, expireDateParts[2],expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2])
+							let now = new Date();
+							let differenceInMs = expireDate - now;
+							if (differenceInMs <= 0) {
+								this.timeday = 0
+							} else {
+								this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60)));
+							}
+						}
+
+						
+						this.loadings = true
+					}
+				});
+
 			},
-		initChart(canvas, width, height, canvasDpr) {
-			let that = this
-			console.log(canvas, width, height, canvasDpr)
-			const option = {
-				grid: {
-					left: 60,
-					right: 10,
-					top: 10,
-					bottom: 30,
-				},
-				xAxis: {
-					type: 'category',
-					boundaryGap: false,
-					axisLine: {
-						show: false,
-					},
-					axisTick: {
-						show: false,
-					},
-					axisLabel: {
-						show: true,
-						color: '#fff',
-						fontSize: 11,
-						rotate: 0,
-					},
-					splitLine: {
-						show: false,
-					},
-					data:that.chartday,
-				},
-				yAxis: {
-					show: true,
-					axisLine: {
-						show: false,
-					},
-					axisTick: {
-						show: false,
-					},
-					axisLabel: {
-						show: true,
-						color: '#fff',
-						fontSize: 11,
-						formatter: function(value) {
-							// 保留两位小数，没有小数时显示00
-							return value  + '度'
-						},
-					},
-					splitLine: {
-						show: false,
-					},
-				},
-				visualMap: {
-					type: 'piecewise',
-					show: false,
-					dimension: 0,
-					seriesIndex: 0,
-					pieces: [{
-							gt: 1,
-							lt: 3,
-							color: 'rgba(0, 0, 180, 0.4)',
-						},
-						{
-							gt: 5,
-							lt: 7,
-							color: 'rgba(0, 0, 180, 0.4)',
-						},
-					],
-				},
-				series: [{
-					type: 'line',
-					smooth: 0.6,
-					symbol: 'none',
-					lineStyle: {
-						color: '#E0DBFF',
-						width: 4,
-					},
-					areaStyle: {
-						normal: {
-							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-								offset: 0,
-								color: '#B4B0F7'
-							}, ]),
-						},
-					},
-					data:that.chartData,
-				}],
-			};
-			chart = echarts.init(canvas, null, {
-				width: width,
-				height: height,
-				devicePixelRatio: canvasDpr
-			})
-			console.log(chart);
-			option.xAxis.data =  that.chartday
-			canvas.setChart(chart)
-			chart.setOption(option)
-			return chart
-		},
+			opendevice() {
+				let stause = 0
+				if (this.deviceInfo.powerStatus == 1) {
+					stause = 0
+				} else {
+					stause = 1
+				}
+				console.log(stause, 'stausestause');
+				this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => {
+					// this.$forceUpdate()
+					if (res.code == 200) {
+						// this.groupList=res.rows
+						setTimeout(() => {
+							this.getDevice(this.id)
+						}, 2000)
+
+						// this.loadings=true
+						// this.initChart()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				});
+			},
+			opendevices() {
+
+			},
+			swiperchange(e) {
+				this.curtitidx = e.detail.current
+				console.log(e, 'aaaa');
+			},
+			changeidx(index) {
+				this.curtitidx = index
+			},
+
+			toydfx() {
+				uni.navigateTo({
+					url: "/page_components/eletj?id=" + this.id
+				})
+			},
+
+
+			funListenDeviceMsgEvent: function(options) {
+				switch (options.type) {
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
+						let loadPercent = options.data;
+						let loadText = '文件读取中'
+						// console.log("文件读取中", options.data);
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+
+						let ver_data =  this.parseCustomData(options.data) 
+						this.setMode = Math.floor(ver_data.setMode / 60)
+						console.log("1收到设备发来的自定义数据结果：", ver_data,this.setMode);
+						break;
+
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
+						if (options.result) {
+							let devicesarr = options.data
+							// console.log(devicesarr,'devicesarrdevicesarr');
+							devicesarr.forEach(device => {
+								const mac = device.name.substring(5);
+								if (device.name == this.qrResult) {
+									this.deviceId = device.deviceId
+									this.name = device.name
+									this.mac = device.name.slice(5, 17)
+									// console.log(this.mac, 'macmacmac');
+									// 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'
+							// }); 
+							{
+								console.log("连接回调options.data.deviceId：" + options.data.deviceId,
+									"连接回调options.data.name：" + options.data.name);
+							}
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: '设备离线或不在范围内',
+								icon: 'none',
+								duration: 2000
+							})
+						}
+
+						break;
+
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
+						if (!options.result) {
+							console.log("蓝牙未开启", options);
+							uni.showToast({
+								title: '蓝牙未开启',
+								icon: 'none',
+								duration: 3000
+							});
+							return
+						} else {
+							// this.searching = true
+							//蓝牙搜索开始
+							// _this.setData({
+							// 	searching: true
+							// });
+						}
+
+						break;
+
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
+						if (options.result) {
+							let uniqueDevicesList = Array.from(new Set(this.devicesList));
+
+							// 将去重后的数组重新赋值给 this.devicesList
+							this.devicesList = uniqueDevicesList;
+							let list = []
+							filteredDevices.forEach(device => {
+								// 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符）
+								let macFromName = device.name.substring(device.name.length - 12);
+								this.$u.get(`/app/device/${macFromName}/isBind`).then((res) => {
+									if (res.data == false) {
+										list.push(device)
+									} else {
+
+									}
+								})
+
+							});
+							setTimeout(() => {
+								this.devicesList = list
+							}, 200)
+
+							console.log('蓝牙停止搜索ok');
+						} else {
+							//蓝牙停止搜索失败
+							console.log('蓝牙停止搜索失败');
+						}
+						this.searching = false
+						// _this.setData({
+						// 	searching: false
+						// });
+
+						break;
+
+				}
+			},
+			parseCustomData(data) {
+				// 将字符串按照 "@" 分割成数组
+				const dataArray = data.split('@');
+			
+				// 根据约定，解析各个字段的值
+				const voltage = parseFloat(dataArray[0].substring(1)); // 去除前缀 "V"，并将字符串转换为浮点数
+				const switchState = dataArray[1].substring(1); // 去除前缀 "S"
+				const current = parseFloat(dataArray[2].substring(1)); // 去除前缀 "A"，并将字符串转换为浮点数
+				const power = parseFloat(dataArray[4].substring(1)); // 去除前缀 "P"，并将字符串转换为浮点数
+				const remainingPower = parseFloat(dataArray[5].substring(1)); // 去除前缀 "M"，并将字符串转换为浮点数
+				const setMode = dataArray[6].substring(1); // 去除前缀 "T"
+			
+				// 返回解析后的数据对象
+				return {
+					voltage,
+					switchState,
+					current,
+					power,
+					remainingPower,
+					setMode
+				};
+			},
+
 		}
 	}
 </script>
@@ -254,115 +422,387 @@
 	/deep/ .u-title {
 		padding-bottom: 22rpx;
 	}
-	
+
 	/deep/ .u-icon__icon {
 		padding-bottom: 22rpx;
 	}
+
 	page {
 		background-color: #F7FAFE;
 	}
-	.uni-ec-canvas {
-		width: 100%;
-		height: 320rpx;
-		display: block;
-		margin-top: 30rpx;
+	.mask {
+		width: 750rpx;
+		height: 100vh;
+		background: #000000;
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		opacity: 0.2;
+		z-index: 1;
+		position: fixed;
+		top: 0;
+		left: 0;
 	}
+	.tanc {
+		width: 610rpx;
+		height: 282rpx;
+		background: #FFFFFF;
+		border-radius: 30rpx 30rpx 30rpx 30rpx;
+		position: fixed;
+		top: 628rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 2;
+	
+		.tit {
+			width: 100%;
+			text-align: center;
+			margin-top: 28rpx;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #3D3D3D;
+		}
+	
+		input {
+			width: 504rpx;
+			height: 62rpx;
+			background: #EEEEEE;
+			border-radius: 6rpx 6rpx 6rpx 6rpx;
+			margin: auto;
+			margin-top: 22rpx;
+			padding-left: 20rpx;
+		}
+	
+		.xian {
+			width: 610rpx;
+			height: 2rpx;
+			background: #D8D8D8;
+			border-radius: 0rpx 0rpx 0rpx 0rpx;
+			margin-top: 26rpx;
+		}
+	
+		.anniu {
+			display: flex;
+			justify-content: space-between;
+			height: 98rpx;
+	
+			text {
+				padding: 24rpx;
+				text-align: center;
+				box-sizing: border-box;
+				font-weight: 500;
+				font-size: 36rpx;
+				color: #3D3D3D;
+				display: inline-block;
+				width: 100%;
+				height: 100rpx;
+			}
+		}
+	}
+
 	.page {
-			padding: 0 59rpx;
-	
-			.title {
-				margin-top: 120rpx;
-				font-size: 48rpx;
-				font-weight: 400;
-				letter-spacing: 0rpx;
-	
-				color: rgba(38, 43, 55, 1);
-			}
-	
-			.card {
-				padding-top: 32rpx;
-				margin-top: 46rpx;
-				width: 632rpx;
-				height: 586rpx;
-				background: #8883F0;
-				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
-				opacity: 1;
-				// filter: blur(0px);
-				border-radius: 40rpx;
-	
-				.month {
-	
-					margin-left: 22rpx;
-					font-size: 28rpx;
-					font-family: Source Han Sans, Source Han Sans;
-					font-weight: 400;
-					color: #FFFFFF;
-				}
-	
-				.tit {
-					margin-top: 18rpx;
-					margin-left: 22rpx;
-					font-size: 20rpx;
-					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
-					font-weight: 400;
-					color: #FFFFFF;
-	
-				}
-	
-				.txt {
-					margin-top: 2rpx;
-					margin-left: 22rpx;
-					font-size: 36rpx;
-					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
-					font-weight: 700;
-					color: #FFFFFF;
-				}
-	
-				.echarts {
-					margin-left: 22rpx;
-					margin-top: 60rpx;
-					// width: 100%;
-					// height: 80%;
-					width: 588rpx;
-					height: 320rpx;
-				}
-			}
-	
-			.list {
-				margin-top: 16rpx;
-	//          height:280rpx;
-				// overflow-y: scroll;
-				.card_list {
-					width: 632rpx;
-					height: 88rpx;
-					background: #FFFFFF;
-					box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
-					opacity: 1;
-					border-radius: 30rpx;
+		.zhuhu {
+			margin-top: 60rpx;
+			padding: 0 40rpx;
+
+			.card1 {
+				padding: 34rpx 0 0 40rpx;
+				width: 670rpx;
+				height: 260rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 14rpx 35rpx 0rpx rgba(53, 140, 255, 0.1);
+				border-radius: 28rpx 28rpx 0rpx 0rpx;
+
+				.top {
 					display: flex;
 					flex-wrap: nowrap;
 					justify-content: space-between;
-					margin-top: 16rpx;
 					align-items: center;
-	
+
 					.left {
-						margin-left: 52rpx;
-						font-size: 28rpx;
+						font-size: 35rpx;
 						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
 						font-weight: 400;
-						color: #808080;
+						color: #8883F0;
 					}
-	
+
 					.right {
-						margin-right: 20rpx;
-						font-size: 28rpx;
-						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
-						font-weight: 400;
-						color: #808080;
+						margin-right: 56rpx;
+
+						.img1 {
+							width: 76rpx;
+							height: 76rpx;
+						}
+					}
+				}
+
+				.mid {
+					margin-top: 20rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-content: flex-start;
+
+					.mid_left {
+						image {
+							width: 160rpx;
+							height: 160rpx;
+							border-radius: 20rpx;
+						}
+					}
+
+					.mid_right {
+						margin-left: 40rpx;
+						display: flex;
+						flex-wrap: wrap;
+
+						.mid_top {
+							width: 100%;
+							font-size: 42rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #262B37;
+						}
+
+						.mid_bot {
+							display: flex;
+							flex-wrap: nowrap;
+							align-items: center;
+
+							.txt {
+								font-size: 26rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #95989D;
+							}
+
+							.tip {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								margin-left: 19rpx;
+								// width: 38rpx;
+								// height: 23rpx;
+								padding: 0 10rpx;
+								box-sizing: border-box;
+								background: rgba(204, 204, 204, 0);
+								opacity: 1;
+								border: 2rpx solid #8883F0;
+								border-radius: 15rpx;
+								font-size: 26rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #8883F0;
+							}
+						}
+					}
+				}
+
+				.bot {
+					margin-top: 53rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+
+					.bot_left {
+						width: 210rpx;
+						height: 180rpx;
+						margin-right: 34rpx;
+
+						.echarts {
+							// width: 210rpx;
+							height: 200rpx;
+
+							.uni-ec-canvas {
+								width: 100%;
+								height: 100rpx !important;
+								display: block;
+								// margin-top: 30rpx;
+							}
+						}
+					}
+
+					.bot_right {
+						// margin-top: 50rpx;
+						display: flex;
+						// flex-wrap: nowrap;
+						width: 100%;
+						justify-content: space-between;
+						padding-left: 80rpx;
+						padding-right: 80rpx;
+						box-sizing: border-box;
+
+						.cont {
+							.tit {
+								font-size: 28rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 600;
+								color: #262B37;
+								line-height: 49rpx;
+							}
+
+							.txt {
+								font-size: 26rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #262B37;
+							}
+						}
 					}
 				}
 			}
+			.bot_right {
+				// margin-top: 50rpx;
+				display: flex;
+				// flex-wrap: nowrap;
+				width: 100%;
+				justify-content: space-between;
+				padding-left: 45rpx;
+				padding-right: 80rpx;
+				box-sizing: border-box;
+				.cont {
+					.tit {
+						font-size: 28rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 600;
+						color: #262B37;
+						line-height: 49rpx;
+						margin-left: 0;
+					}
+			
+					.txt {
+						font-size: 26rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 400;
+						color: #262B37;
+					}
+				}
+			}
+
+			.card2 {
+				padding-top: 0rpx;
+				width: 670rpx;
+				height: 60rpx;
+				background: #FFFFFF;
+				border-radius:0 0 28rpx 28rpx;
+
+				.tit {
+					margin-left: 40rpx;
+
+					font-size: 35rpx;
+					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+					font-weight: 400;
+					color: #8883F0;
+				}
+
+				.cont_box {
+					margin-top: 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-around;
+
+
+					.cont {
+						width: 25%;
+						display: flex;
+						flex-wrap: wrap;
+						align-items: center;
+						justify-content: center;
+						text-align: center;
+
+						.top {
+							width: 110rpx;
+							font-size: 32rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #262B37;
+						}
+
+						.bot {
+							margin-top: 20rpx;
+							font-size: 26rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #262B37;
+						}
+					}
+				}
+			}
+
+			.card3 {
+				padding-top: 40rpx;
+				margin-top: 24rpx;
+				width: 670rpx;
+				// height: 318rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53, 140, 255, 0.1);
+				border-radius: 28rpx;
+				padding-bottom: 20rpx;
+
+				.tit {
+					margin-left: 40rpx;
+
+					font-size: 35rpx;
+					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+					font-weight: 400;
+					color: #8883F0;
+				}
+
+				.cont_box {
+					// padding-left: 30rpx;
+					// 	padding-right: 30rpx;
+					padding: 0 40rpx;
+					margin-top: 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-around;
+
+					.cont:last-child {
+						margin-right: 0rpx;
+					}
+
+					.cont {
+						width: 112rpx;
+						display: flex;
+						flex-wrap: wrap;
+						align-items: center;
+						justify-content: center;
+						margin-right: 80rpx;
+
+						.top {
+							image {
+								width: 56rpx;
+								height: 56rpx;
+							}
+						}
+
+						.bot {
+							margin-top: 15rpx;
+							font-size: 28rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #808080;
+						}
+					}
+				}
+			}
+
+			.button {
+				margin-left: 76rpx;
+				margin-top: 178rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 520rpx;
+				height: 104rpx;
+				background: #8883F0;
+				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
+				border-radius: 52rpx 52rpx 52rpx 52rpx;
+
+				font-size: 32rpx;
+				font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
 		}
-	
-	
+
+
+	}
 </style>
\ No newline at end of file
diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index 3cc4a29..2861455 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -80,8 +80,7 @@
 				      id="myTextarea"  
 				      cols="30"  
 				      rows="10"  
-				      style="pointer-events: none;"  
-				    ></textarea>  
+				      style="pointer-events: none;"></textarea>  
 					<!-- <textarea name="" v-model="item.description == null ? '无' : item.description"  id="" cols="30" rows="10"></textarea> -->
 				</view>
 				
@@ -100,8 +99,6 @@
          <view class="mask" v-if="czflag"></view>
 		 
 		 
-		 
-		 
 
 		</view>
 	</view>
@@ -392,29 +389,29 @@
 					})
 					if (this.ver_data == '') {
 						let that = this
+						xBlufi.initXBlufi(1);
+						xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent);
+						xBlufi.notifyStartDiscoverBle({
+							'isStart': true
+						})
+						setTimeout(() => {
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': false
+							})
+							if (that.devicesList.length > 0) { 
+								xBlufi.notifyConnectBle({
+									isStart: true,
+									deviceId: that.deviceId,
+									name: that.name
+								})
+							}
+						}, 2000)
 						uni.showModal({
-							title: '提示',
-							content: '支付失败，支付的时候请靠近设备,并打开蓝牙',
+							title: '温馨提示',
+							content: '支付失败,支付的时候需要靠近设备,并打开蓝牙',
 							success: function(res) {
 								if (res.confirm) {
 									
-									xBlufi.initXBlufi(1);
-									xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent);
-									xBlufi.notifyStartDiscoverBle({
-										'isStart': true
-									})
-									setTimeout(() => {
-										xBlufi.notifyStartDiscoverBle({
-											'isStart': false
-										})
-										if (that.devicesList.length > 0) {
-											xBlufi.notifyConnectBle({
-												isStart: true,
-												deviceId: that.deviceId,
-												name: that.name
-											})
-										}
-									}, 2000)
 								} else if (res.cancel) {
 									console.log('用户点击了取消');
 								}
@@ -451,10 +448,11 @@
 													url: '/pages/shouye/index'
 												})
 												uni.setStorageSync('time', that.expireTimeStr)
-											},
-											fail(err) {
-												this.czflag = false
-												uni.hideLoading()
+											},fail(err) {
+												setTimeout(()=>{
+													this.czflag = false
+													uni.hideLoading()
+												},500)
 												// 支付失败逻辑
 												uni.showToast({
 													title: '支付失败',
@@ -469,6 +467,8 @@
 								uni.reLaunch({
 									url: '/pages/login/login'
 								})
+							}else{
+								this.czflag = false
 							}
 						})
 					}
@@ -497,7 +497,7 @@
 								if (device.name == this.mac) {
 									this.deviceId = device.deviceId
 									this.name = device.name
-									console.log(device.name,this.mac,'222');
+									// console.log(device.name,this.mac,'222');
 									this.devicesList.push(device);
 									let uniqueDevicesList = Array.from(new Set(this.devicesList));
 									// 将去重后的数组重新赋值给 this.devicesList
@@ -521,11 +521,10 @@
 
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
-
 						this.ver_data = this.parseCustomData(options.data)
+						console.log("1收到设备发来的自定义数据结果：", this.ver_data);
 						this.czflag = false
 						uni.hideLoading()
-						console.log("1收到设备发来的自定义数据结果：", this.ver_data);
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
 						if (options.result) {
@@ -533,17 +532,7 @@
 							let filteredDevices = uniqueDevicesList.filter(device => device.name.substring(0, 4) === "CTKG");
 							// 将过滤后的数组重新赋值给 this.devicesList
 							this.devicesList = filteredDevices;
-							filteredDevices.forEach(device => {
-								// 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符）
-								let macFromName = device.name.substring(device.name.length - 12);
-								console.log(macFromName);
-								// 与 this.mac 进行比较
-								if (macFromName == this.mac) {
-									this.ishave = true;
-								}
-							})
 						}
-						this.searching = false
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
 						if (!options.result) {
diff --git a/page_fenbao/statulist/myorder/detailxq/index.vue b/page_fenbao/statulist/myorder/detailxq/index.vue
index 532dcaf..b45a8b3 100644
--- a/page_fenbao/statulist/myorder/detailxq/index.vue
+++ b/page_fenbao/statulist/myorder/detailxq/index.vue
@@ -24,6 +24,9 @@
 					<text class="qian" v-if="detailobj.status == 6">
 						支付中 
 					</text>
+					<text class="qian" v-if="detailobj.status == 7">
+						退款中 
+					</text>
         		</view>
 				<view class="nav">
 					<text class="shen">设备编号</text><text class="qian">{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}</text>
@@ -34,6 +37,9 @@
 				<view class="nav">
 					<text class="shen">用户</text><text class="qian">{{detailobj.userName == undefined ? '--' : detailobj.userName}}</text>
 				</view>
+				<view class="nav">
+					<text class="shen">收款人手机号</text><text class="qian"  @click="call">{{detailobj.mchName == undefined ? '--' : detailobj.mchName}}</text>
+				</view>
 				<view class="nav">
 					<text class="shen">消费时间</text><text class="qian">{{detailobj.createTime == undefined ? '--' : detailobj.createTime}}</text>
 				</view>
@@ -58,7 +64,7 @@
 					<text class="shen">共计</text><text class="qian">￥{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
 				</view>
         	</view>
-			<view class="sb" @click="btntz" style="width:680rpx;height: 100rpx;display: flex;justify-content: space-between;background: #FFFFFF;
+			<view class="sb" v-if="userflag" @click="btntz" style="width:680rpx;height: 100rpx;display: flex;justify-content: space-between;background: #FFFFFF;
 				border-radius: 20rpx 20rpx 20rpx 20rpx;
 				margin: auto;
 				padding: 32rpx 24rpx;
@@ -103,10 +109,13 @@
 				detailobj:{},
 				imgad:'',
 				maskflag:false,
-				inptext:''
+				inptext:'',
+				userType:{},
+				userflag:false
 			}
 		},
 		onLoad(option) {
+			this.userType = uni.getStorageSync('userType')
 			if(option.billId){
 				this.billId = option.billId
 				this.getlist()
@@ -114,6 +123,23 @@
 			}
 		},
 		methods: {
+			call() {
+				let phoneNumber = this.detailobj.mchName
+				uni.makePhoneCall({
+					phoneNumber: phoneNumber, 
+					success: function(res) {
+						console.log('拨打电话成功', res);
+					},
+					fail: function(err) {
+						console.error('拨打电话失败', err);
+						uni.showToast({
+							title: '拨打电话失败',
+							icon: 'none'
+						})
+					}
+				})
+			},
+			
 			btnqd(){
 				if(this.inptext > this.detailobj.money){
 					uni.showToast({
@@ -131,7 +157,7 @@
 						if (res.code == 200) {
 							uni.showToast({
 								title: '操作成功',
-								icon: 'none',
+								icon: 'success',
 								duration: 3000
 							})
 						}else{
@@ -159,6 +185,11 @@
             	this.$u.get(`/app/bill/${this.billId}`).then((res) => {
             		if (res.code == 200) {
             			this.detailobj = res.data
+						if(res.data.mchId == this.userType.userId){
+							this.userflag = true
+						}else{
+							this.userflag = false
+						}
             		}
             	})
             },
diff --git a/page_fenbao/statulist/myorder/index.vue b/page_fenbao/statulist/myorder/index.vue
index ec03dee..f0eb740 100644
--- a/page_fenbao/statulist/myorder/index.vue
+++ b/page_fenbao/statulist/myorder/index.vue
@@ -30,6 +30,9 @@
 						<view class="top" v-if="item.status == 6">
 							支付中 <u-icon name="arrow-right" color="#808080" size="20" style="margin-left: 10rpx;"></u-icon>
 						</view>
+						<view class="top" v-if="item.status == 7">
+							退款中 <u-icon name="arrow-right" color="#808080" size="20" style="margin-left: 10rpx;"></u-icon>
+						</view>
 						<view class="je" style="text-align: right;">
 							{{item.money}}元
 						</view>
diff --git a/page_user/cbRecord.vue b/page_user/cbRecord.vue
index 20b89f0..c17ca12 100644
--- a/page_user/cbRecord.vue
+++ b/page_user/cbRecord.vue
@@ -7,7 +7,7 @@
         		<view class="list_val">
         			<view class="lt">
         				<view class="tit">{{item.deviceName}}</view>
-						<view class="wz">地点：{{item.storeName}}</view>
+						<view class="wz">地点：{{item.storeName == null ? '--' : item.storeName}}</view>
 						<view class="wz">订单号：{{item.billNo}}</view>
 						<view class="wz">消费时间：{{item.createTime}}</view>
         			</view>
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 1217090..4bc7d92 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -182,7 +182,7 @@
 				deviceInfo: {},
 				loadings: false,
 				info: '',
-				tittxt: "设备列表",
+				tittxt: "设备详情",
 				titlist: [
 					"全部",
 					"电表",
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index f3f4ec7..f98d222 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -9,6 +9,23 @@
 					<map class='map' id="map" :latitude="latitude" :longitude="longitude" @markertap="handleMarkerClick"
 						:show-location="true" :markers="covers" :scale="mapScale" />
 				</view>
+
+				<!-- 正在进行中的订单 -->
+			<!-- 	<view class="ongoing_order">
+					<view class="order_top">
+						<view class="order_lt">
+							<image src="https://api.ccttiot.com/smartmeter/img/static/uFNuOet0fB5Bwe1c26sk" mode=""></image>
+							<text>您有正在使用中的设备...</text>
+						</view>
+						<image @click="btnorder" v-if="!listflag" src="https://api.ccttiot.com/smartmeter/img/static/ublEB3HEjyfZbnKS2Ai9" mode=""></image>
+						<image @click="btnorders" v-if="listflag" style="transform: rotate(180deg);margin-top: 20rpx;" src="https://api.ccttiot.com/smartmeter/img/static/ublEB3HEjyfZbnKS2Ai9" mode=""></image>
+					</view>
+					<view class="order_list" v-for="(item,index) in 3" :key="index" v-if="listflag" @click="btnitem">
+						<text>共享洗衣机001</text> <image src="https://api.ccttiot.com/smartmeter/img/static/uZoBXJ0MLrGUSBFk5lGp" mode=""></image>
+					</view>
+				</view> -->
+				<!-- 正在进行中的订单结束 --><!-- 正在进行中的订单结束 -->
+
 				<view class="fujin">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uqv3e5ThWL8DqrRNBfoA" mode=""
 						@click="btnindex(5)"></image>
@@ -74,6 +91,7 @@
 	export default {
 		data() {
 			return {
+				listflag:false,
 				params: {
 					year: true,
 					month: true,
@@ -101,13 +119,13 @@
 				bgc: {
 					backgroundColor: "#8883F0",
 				},
-				deviceobj:{},
-				deviceCount:0
+				deviceobj: {},
+				deviceCount: 0
 			};
 		},
 		onLoad(option) {
 			if (option.flag) {
-                let id = option.id
+				let id = option.id
 				this.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
 					if (res.code == 200) {
 						this.deviceobj = res.data;
@@ -125,14 +143,15 @@
 							that.$u.put("/app/device/bind", data).then(res => {
 								if (res.code == 200) {
 									uni.navigateTo({
-										url: '/page_user/sbdetail?id=' +that.deviceobj.deviceId
+										url: '/page_user/sbdetail?id=' + that.deviceobj
+											.deviceId
 									})
-								}else {
-									if(res.msg == '设备未录入'){
+								} else {
+									if (res.msg == '设备未录入') {
 										uni.navigateTo({
-											url:'/page_fenbao/zhuce?sn=' + id
+											url: '/page_fenbao/zhuce?sn=' + id
 										})
-									}else{
+									} else {
 										uni.showToast({
 											title: res.msg,
 											icon: 'none',
@@ -167,6 +186,19 @@
 			}
 		},
 		methods: {
+			btnitem(){
+				uni.navigateTo({
+					url:'/page_components/eletj'
+				})
+			},
+			// 点击显示使用中设备
+            btnorder(){
+			   this.listflag = true	
+			},
+			btnorders(){
+			   this.listflag = false	
+			},
+			
 			btnad() {
 				this.$u.get("/app/ad").then((res) => {
 					if (res.code == 200) {
@@ -183,7 +215,7 @@
 				})
 			},
 
-			
+
 			calculateAnchorX(name) {
 				let chineseLength = 0
 				let englishLength = 0
@@ -309,11 +341,12 @@
 						this.longitude = Number(res.longitude.toFixed(5)) + 0.005
 						this.setMapScale()
 						// 请求附近的店铺  
-						this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(res => {
+						this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(
+							res => {
 								if (res.code == 200) {
 									this.listmap = res.data
 									res.data.forEach(item => {
-										if (item.deviceCount !== null && item.deviceCount > 0){
+										if (item.deviceCount !== null && item.deviceCount > 0) {
 											const shopCover = {
 												id: parseFloat(item.storeId),
 												latitude: item.lat,
@@ -326,27 +359,33 @@
 													anchorX: (() => {
 														if (item.name.length <= 2) {
 															return -12
-														} else if (item.name.length <= 3) {
+														} else if (item.name.length <=
+															3) {
 															return -20
-														} else if (item.name.length <= 4) {
+														} else if (item.name.length <=
+															4) {
 															return -25
-														} else if (item.name.length <= 5) {
+														} else if (item.name.length <=
+															5) {
 															return -30
-														} else if (item.name.length <= 6) {
+														} else if (item.name.length <=
+															6) {
 															return -35
-														} else if (item.name.length <= 8) {
+														} else if (item.name.length <=
+															8) {
 															return -40
 														} else if (item.name.length <=
 															10) {
 															return -45
 														} else {
-															return -item.name.length * 6
+															return -item.name.length *
+																6
 														}
 													})(),
 													fontWeight: 700,
 													color: '#8883F0',
-													borderColor:'#fff',
-													borderRadius:5,
+													borderColor: '#fff',
+													borderRadius: 5,
 													bgColor: '#fff'
 												}
 											}
@@ -378,46 +417,46 @@
 			},
 			addMarkersWithoutLabels() {
 				this.listmap.forEach((item) => {
-					if (item.deviceCount !== null && item.deviceCount > 0){
+					if (item.deviceCount !== null && item.deviceCount > 0) {
 						const shopCover = {
-						id: parseFloat(item.storeId),
-						latitude: item.lat,
-						longitude: item.lng,
-						width: 25,
-						height: 30,
-						iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
-						borderColor:'#fff',
-						borderRadius:5,
-						bgColor: '#fff'
-					};
-					this.covers.push(shopCover);
+							id: parseFloat(item.storeId),
+							latitude: item.lat,
+							longitude: item.lng,
+							width: 25,
+							height: 30,
+							iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
+							borderColor: '#fff',
+							borderRadius: 5,
+							bgColor: '#fff'
+						};
+						this.covers.push(shopCover);
 					}
 				});
 			},
 			addMarkersWithLabels() {
 				this.listmap.forEach((item) => {
-					if (item.deviceCount !== null && item.deviceCount > 0){
+					if (item.deviceCount !== null && item.deviceCount > 0) {
 						const shopCover = {
-						id: parseFloat(item.storeId),
-						latitude: item.lat,
-						longitude: item.lng,
-						width: 25,
-						height: 30,
-						iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
-						label: {
-							content: item.name,
-							anchorX: this.calculateAnchorX(item.name),
-							fontWeight: 700,
-							color: '#8883F0',
-							textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white',
-							borderColor:'#fff',
-							borderRadius:5,
-							bgColor: '#fff'
+							id: parseFloat(item.storeId),
+							latitude: item.lat,
+							longitude: item.lng,
+							width: 25,
+							height: 30,
+							iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
+							label: {
+								content: item.name,
+								anchorX: this.calculateAnchorX(item.name),
+								fontWeight: 700,
+								color: '#8883F0',
+								textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white',
+								borderColor: '#fff',
+								borderRadius: 5,
+								bgColor: '#fff'
+							}
 						}
+						this.covers.push(shopCover);
 					}
-					this.covers.push(shopCover);
-					}
-					
+
 				});
 			},
 
@@ -429,37 +468,37 @@
 			},
 
 			logins() {
-				if (uni.getStorageSync('userType')) {
-					this.userType = uni.getStorageSync('userType')
-					this.userType = '01'
-					if (this.userType == '01') {
-						this.getDeviceList()
-					} else if (this.userType == '00') {
-						this.getdevice()
-					}
-				} else {
+				// if (uni.getStorageSync('userType')) {
+				// 	this.userType = uni.getStorageSync('userType')
+				// 	this.userType = '01'
+				// 	if (this.userType == '01') {
+				// 		this.getDeviceList()
+				// 	} else if (this.userType == '00') {
+				// 		this.getdevice()
+				// 	}
+				// } else {
 
-				}
+				// }
 				this.getuserinfo()
 			},
 			getuserinfo() {
 				this.$u.get("/app/user/userInfo").then((res) => {
 					if (res.code == 200) {
 						this.isMch = res.data.isMch
-						uni.setStorageSync('userType', res.data.userType)
+						uni.setStorageSync('userType', res.data)
 						this.userType = res.data.userType
 						this.deviceCount = res.data.deviceCount
-						if (this.userType == '01') {
-							this.getDeviceList()
-						} else if (this.userType == '00') {
-							this.getdevice()
-						}
+						// if (this.userType == '01') {
+						// 	this.getDeviceList()
+						// } else if (this.userType == '00') {
+						// 	this.getdevice()
+						// }
 					} else {
 						this.jmlogin()
 					}
 				})
 			},
-			
+
 			jmlogin() {
 				let taht = this
 				wx.login({
@@ -530,7 +569,8 @@
 	.dateactive {
 		background: #E1F3ED;
 	}
-	.mask{
+
+	.mask {
 		width: 100%;
 		height: 100vh;
 		position: fixed;
@@ -539,7 +579,7 @@
 		transform: translateX(-50%);
 		background-color: #000;
 		opacity: .6;
-	} 
+	}
 
 	page {
 		background: linear-gradient(180deg, #8883F0 10%, rgba(255, 255, 255, 0) 100%);
@@ -835,6 +875,68 @@
 			padding-top: 16rpx;
 			position: relative;
 
+			.ongoing_order {
+				width: 622rpx;
+				max-height: 100%;
+				background-color: rgba(0, 0, 0, 0.4);
+				border-radius: 40rpx 40rpx 40rpx 40rpx;
+				// opacity: 0.6;
+				position: absolute;
+				top: 48rpx;
+				left: 34rpx;
+                .order_list{
+					width: 100%;
+					height: 110rpx;
+					// background-color: rgba(0, 0, 0, 0.6); 
+					border-radius: 40rpx 40rpx 40rpx 40rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					font-size: 36rpx;
+					color: #FFFFFF;
+					padding: 0 38rpx;
+					padding-right: 56rpx;
+					box-sizing: border-box;
+					line-height: 110rpx;
+					animation: fadeInDown .5s ease-out forwards;
+					image{
+						width: 17rpx;
+						height: 34rpx;
+					}
+				}
+				.order_top {
+					width: 622rpx;
+					height: 94rpx;
+					background: rgba(0, 0, 0, 0.6);
+					box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0,0,0,0.3);
+					border-radius: 40rpx 40rpx 40rpx 40rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					padding: 18rpx 42rpx;
+					box-sizing: border-box;
+					font-weight: 400;
+					font-size: 36rpx;
+					color: #FFFFFF;
+
+					.order_lt {
+						display: flex;
+						align-items: center;
+						image {
+							width: 44rpx;
+							height: 62rpx;
+							margin-right: 20rpx;
+						}
+					}
+                    image{
+						width: 47rpx;
+						height: 47rpx;
+						padding-bottom: 10rpx;
+						box-sizing: border-box;
+					}
+				}
+			}
+
 			.fujin {
 				position: absolute;
 				top: 730rpx;
@@ -877,4 +979,14 @@
 			}
 		}
 	}
+	@keyframes fadeInDown {  
+	  from {  
+	    opacity: 0;  
+	    transform: translateY(-20px);
+	  }  
+	  to {  
+	    opacity: 1;  
+	    transform: translateY(0);
+	  }  
+	}
 </style>
\ No newline at end of file