From 3dfd82456ec98686d89fb48da10caf729b8c4dfb Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Sat, 14 Sep 2024 18:01:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95-=E5=BA=8A=E5=9E=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.interceptor.js |   5 +-
 page_fenbao/addtaocan.vue  |   9 +-
 page_fenbao/listtaocan.vue |   1 -
 page_fenbao/shebeixz.vue   |   8 -
 page_fenbao/shiyong.vue    |   6 +-
 page_user/deviceedit.vue   |   4 +-
 page_user/devicelist.vue   |   2 +-
 page_user/fuwu.vue         | 779 ++++++++++++++++++++++---------------
 page_user/mydetail.vue     | 299 +++++++-------
 page_user/mydingdan.vue    |  34 +-
 page_user/orderdetail.vue  |  31 +-
 page_user/orderlist.vue    |   9 +-
 page_user/tixian.vue       |   2 +-
 pages/index/index.vue      |  11 -
 pages/zhuce.vue            |   4 +-
 15 files changed, 681 insertions(+), 523 deletions(-)

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 134b800..d3b08ad 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -16,12 +16,11 @@ const install = (Vue, vm) => {
 	// 	// 配置请求头信息 
 	// 	header: {   
 	// 		'content-type': 'application/json;charset=UTF-8',
-			
 	// 	},
 	// }); 
 	Vue.prototype.$u.http.setConfig({
-			baseUrl: 'http://192.168.2.81:3302',
-			// baseUrl: 'https://kang.chuangtewl.com/prod-api',
+			// baseUrl: 'http://192.168.2.81:3302',
+			baseUrl: 'https://kang.chuangtewl.com/prod-api',
 			loadingText: '努力加载中~',
 			loadingTime: 800,
 			// 设置自定义头部content-type
diff --git a/page_fenbao/addtaocan.vue b/page_fenbao/addtaocan.vue
index 7350439..2e9738c 100644
--- a/page_fenbao/addtaocan.vue
+++ b/page_fenbao/addtaocan.vue
@@ -200,7 +200,7 @@
 								}
 								// console.log(that.tcidlist,indexInTcidList,'0202'); 
 								that.tcidlist = that.tcidlist.filter(item => item !== undefined)
-								console.log(that.tcidlist,'10101010');
+								// console.log(that.tcidlist,'10101010');
 								let data = {
 									storeIds: that.tcidlist,
 									suitId: that.suitId
@@ -443,7 +443,6 @@
 			.time_item {
 				width: 134rpx;
 				height: 48rpx;
-				// background: #64B6A7;
 				border-radius: 6rpx 6rpx 6rpx 6rpx;
 				margin-top: 18rpx;
 				color: #fff;
@@ -531,7 +530,6 @@
 					height: 58rpx;
 					background: #D8D8D8;
 					border-radius: 6rpx 6rpx 6rpx 6rpx;
-					// padding-left: 30rpx;
 					text-align: center;
 					box-sizing: border-box;
 					margin-right: 20rpx;
@@ -539,7 +537,6 @@
 			}
 
 			.feelt {
-				// width: 174rpx;
 				height: 42rpx;
 				font-size: 30rpx;
 				color: #000000;
@@ -575,7 +572,6 @@
 					height: 58rpx;
 					background: #D8D8D8;
 					border-radius: 6rpx 6rpx 6rpx 6rpx;
-					// padding-left: 30rpx;
 					text-align: center;
 					box-sizing: border-box;
 					margin-right: 20rpx;
@@ -721,7 +717,6 @@
 			box-sizing: border-box;
 			height: 100vh;
 			overflow: scroll;
-			// overflow: hidden;
 
 			.tcname {
 				width: 654rpx;
@@ -783,8 +778,6 @@
 				}
 
 				input {
-					// margin-top: 30rpx;
-					// padding-left: 100rpx;
 					text-align: right;
 				}
 			}
diff --git a/page_fenbao/listtaocan.vue b/page_fenbao/listtaocan.vue
index ef95695..b956e5e 100644
--- a/page_fenbao/listtaocan.vue
+++ b/page_fenbao/listtaocan.vue
@@ -236,7 +236,6 @@
 				box-sizing: border-box;
 				.toptime{
 					font-size: 32rpx;
-					// color: #000000;
 					display: flex;
 					justify-content: space-between;
 				}
diff --git a/page_fenbao/shebeixz.vue b/page_fenbao/shebeixz.vue
index 7c3dc0e..f55a945 100644
--- a/page_fenbao/shebeixz.vue
+++ b/page_fenbao/shebeixz.vue
@@ -239,13 +239,6 @@
 </script>
 
 <style lang="scss">
-	// /deep/ .u-title {
-	// 	padding-bottom: 22rpx;
-	// }
-
-	// /deep/ .u-icon__icon {
-	// 	padding-bottom: 22rpx;
-	// }
 	.active {
 		background-color: #8883F0 !important;
 		border-radius: 20rpx;
@@ -267,7 +260,6 @@
 				height: 200rpx;
 				padding-top: 40rpx;
 				background-color: #fff;
-				// justify-content: space-between;
 				width: 100%;
 				padding-left: 50rpx;
 				padding-right: 50rpx;
diff --git a/page_fenbao/shiyong.vue b/page_fenbao/shiyong.vue
index a8121d0..86b3e80 100644
--- a/page_fenbao/shiyong.vue
+++ b/page_fenbao/shiyong.vue
@@ -3,10 +3,10 @@
 		<u-navbar :title="tit" :border-bottom="false" :background="bgc" title-color='#3D3D3D' back-icon-color="#3D3D3D"
 			title-size='38' height='44'></u-navbar>
         
-      <!--  <view class="cont" v-html="cont">
+       <view class="cont" v-html="cont">
         	
-        </view> -->
-		<rich-text class="cont" :nodes="cont"></rich-text>
+        </view>
+		<!-- <rich-text class="cont" :nodes="cont"></rich-text> -->
         
 
 		<view class="" style="position: fixed;top: 0;left: 0;width: 100%;height: 100vh;z-index: -1;">
diff --git a/page_user/deviceedit.vue b/page_user/deviceedit.vue
index 308bf07..f38a12a 100644
--- a/page_user/deviceedit.vue
+++ b/page_user/deviceedit.vue
@@ -55,7 +55,7 @@
 				<view class="thr">{{obj.storeName == undefined ? '--' : obj.storeName}}</view>
 			</view>
 			<view class="jy">
-				<view class="one" style="width: 160rpx;">经营地址：</view>
+				<view class="one" style="width: 180rpx;">经营地址：</view>
 				<view class="two">{{obj.storeAddress == undefined ? '--' : obj.storeAddress}}</view>
 			</view>
 			<view class="jy">
@@ -105,7 +105,7 @@
 				收益明细
 			</view>
 			<view class="jy" v-for="(item,index) in obj.bonusList" :key="index">
-				<view class="one">{{item.arrivalName == undefined ? '--' : item.arrivalName}}（<text v-if="item.arrivalType == 1">平台</text><text v-if="item.arrivalType == 2">公司</text><text v-if="item.arrivalType == 3">合作伙伴商</text><text v-if="item.arrivalType == 4">渠道商</text><text v-if="item.arrivalType == 5">创业者</text><text v-if="item.arrivalType == 6">经营场所</text>）{{item.point}}%</view>
+				<view class="one">{{item.arrivalName == undefined ? '--' : item.arrivalName}}（<text v-if="item.arrivalType == 1">平台</text><text v-if="item.arrivalType == 2">公司</text><text v-if="item.arrivalType == 3">合作伙伴</text><text v-if="item.arrivalType == 4">渠道商</text><text v-if="item.arrivalType == 5">创业者</text><text v-if="item.arrivalType == 6">经营场所</text>）{{item.point}}%</view>
 				<!-- <view class="two">￥{{item.amount== undefined ? '--' : otem.amount}}</view> -->
 			</view>
 		</view>
diff --git a/page_user/devicelist.vue b/page_user/devicelist.vue
index 5cef13e..594cb95 100644
--- a/page_user/devicelist.vue
+++ b/page_user/devicelist.vue
@@ -40,7 +40,7 @@
 					<view class="wbd" v-else style="color: #8883F0;" @click.stop="btnbds(item.deviceId)">未绑定</view>
 				</view>
 				<view class="bd">
-					<view class="one" style="width: 160rpx;">经营地址</view>
+					<view class="one" style="width: 180rpx;">经营地址</view>
 					<view class="one">{{item.storeAddress == undefined ? '--' : item.storeAddress}}</view>
 				</view>
 				<view class="cen" v-if="type == 2">
diff --git a/page_user/fuwu.vue b/page_user/fuwu.vue
index dde6cf8..a706e96 100644
--- a/page_user/fuwu.vue
+++ b/page_user/fuwu.vue
@@ -8,82 +8,86 @@
 			<view class="wz" @click="call" style="text-align: right;padding-right: 50rpx;"
 				v-if="obj.storeContactMobile == null">
 				<image style="width: 48rpx;height: 50rpx;vertical-align: middle;"
-					src="https://api.ccttiot.com/smartmeter/img/static/u9bYsfyXGAMwKMFfQAmL" mode=""></image>
+					src="https://api.ccttiot.com/smartmeter/img/static/u9bYsfyXGAMwKMFfQAmL" mode="aspectFit"></image>
 				<!-- <text>客服</text> -->
 			</view>
-			<view class="wz" @click="call"
-				style="text-align: right;padding-right: 50rpx;" v-else>
+			<view class="wz" @click="call" style="text-align: right;padding-right: 50rpx;" v-else>
 				<image style="width: 60rpx;height: 64rpx;vertical-align: middle;"
 					src="https://api.ccttiot.com/smartmeter/img/static/u9bYsfyXGAMwKMFfQAmL" mode=""></image>
 				<!-- <text>客服</text> -->
 			</view>
 		</view>
-		 
-		 <view class="">
-		 	<!-- 套餐 -->
-		 	<view class="list">
-		 		<view class="list_item" :class="activeindex == item.suitId ? 'active' : ''" v-for="(item,index) in list" :key="index"
-		 			@click="btnactive(item)">
-		 			<view class="tit">
-		 				<text class="tc" :class="activeindex == item.suitId ? 'active' : ''">{{item.name}}</text> <text class="yh"
-		 					:class="activeindex == item.suitId ? 'actives' : ''">{{item.usePoint}}%用户选择</text>
-		 			</view>
-		 			<view class="bot">
-		 				<view class="price" :class="activeindex == item.suitId ? 'active' : ''">
-		 					￥{{item.price}}
-		 				</view>
-		 				<view class="time" :class="activeindex == item.suitId ? 'active' : ''">
-		 					可使用{{item.value}} {{item.timeUnit == 3 ? '分钟' : '小时'}}
-		 				</view>
-		 			</view>
-		 		</view>
-		 	</view>
-		 	<!-- 说明 -->
-		 	<view class="shuom">
-		 		<view class="shuomtit">
-		 			功能介绍
-		 		</view>
-	            <view class="cont" style="height: 208rpx;" v-html="obj.funcInfo">
-					<!-- {{obj.funcInfo == undefined ? '暂无介绍...' : obj.funcInfo}} -->
-	            </view> 
-		 	</view>
+
+		<view class="">
+			<!-- 套餐  @scrolltolower="onScrollToLower"-->
+			<scroll-view class="list" scroll-y="true" @scroll="handleScroll" :scroll-top="scrollTop" scroll-with-animation="true">
+				<view class="list_item" :class="activeindex == item.suitId ? 'active' : ''" v-for="(item,index) in list"
+					:key="index" @click="btnactive(item)">
+					<view class="tit">
+						<text class="tc" :class="activeindex == item.suitId ? 'active' : ''">{{item.name}}</text> <text
+							class="yh"
+							:class="activeindex == item.suitId ? 'actives' : ''">{{item.usePoint}}%用户选择</text>
+					</view>
+					<view class="bot">
+						<view class="price" :class="activeindex == item.suitId ? 'active' : ''">
+							￥{{item.price}}
+						</view>
+						<view class="time" :class="activeindex == item.suitId ? 'active' : ''">
+							可使用{{item.value}} {{item.timeUnit == 3 ? '分钟' : '小时'}}
+						</view>
+					</view>
+				</view>
+				<image v-if="picimg" class="picdh" @click="btnscrll"
+					src="https://api.ccttiot.com/smartmeter/img/static/uDdjuHcC2h79pEBoQdTh" mode=""></image>
+			</scroll-view>
+			<!-- 说明 -->
+			<view class="shuom">
+				<view class="shuomtit">
+					功能介绍
+				</view>
+				<view class="cont" style="height: 208rpx;" v-html="obj.funcInfo">
+					<!-- {{obj.funcInfo == undefined ? '暂无介绍...'}} -->
+				</view>
+			</view>
 			<view class="shuom" style="max-height: 220rpx;margin-top: 30rpx;">
 				<view class="shuomtit">
 					设备地址
 				</view>
 				<view class="shuomwz">
-				    <image style="width: 30rpx;height: 30rpx;margin-right: 6rpx;" src="https://api.ccttiot.com/smartmeter/img/static/umUFE9oFeYo2Q7atp3jv" mode=""></image>
+					<image style="width: 30rpx;height: 30rpx;margin-right: 6rpx;"
+						src="https://api.ccttiot.com/smartmeter/img/static/umUFE9oFeYo2Q7atp3jv" mode=""></image>
 					{{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}室
 				</view>
 				<view class="shuomwz">
-				    <image style="width: 30rpx;height: 30rpx;margin-right: 6rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uHHgD7nRON3WTmomzKVE" mode=""></image> 
+					<image style="width: 30rpx;height: 30rpx;margin-right: 6rpx;"
+						src="https://api.ccttiot.com/smartmeter/img/static/uHHgD7nRON3WTmomzKVE" mode=""></image>
 					{{obj.storeAddress ? (obj.storeAddress.length > 18 ? obj.storeAddress.substring(0, 18) + '...' : obj.storeAddress) : '' }}
 				</view>
 			</view>
-		 	
-		 	
-		 	<!-- 支付 -->
-		 	<view class="tongyi">
-		 		<u-checkbox-group>
-		 			<u-checkbox v-model="checked" @change="checkboxChange" active-color="#8883F0 ">我已同意
-		 			</u-checkbox><text @click="btnxieyi">《用户服务协议》</text>
-		 		</u-checkbox-group>
-		 		<view class="zf" v-if="zhifuflag" @click="btnzhifu">
-		 			立即支付
-		 		</view>
+
+
+			<!-- 支付 -->
+			<view class="tongyi">
+				<u-checkbox-group>
+					<u-checkbox v-model="checked" @change="checkboxChange" active-color="#8883F0 ">我已同意
+					</u-checkbox><text @click="btnxieyi">《用户服务协议》</text>
+				</u-checkbox-group>
+				<view class="zf" v-if="zhifuflag" @click="btnzhifu">
+					立即支付
+				</view>
 				<view class="zf" v-else>
-					立即支付 
-				</view> 
-		 	</view>
-		 </view>
-		 <!-- <view class="mask" v-if="zfflag"></view> -->
-       
+					立即支付
+				</view>
+			</view>
+		</view>
+		<!-- <view class="mask" v-if="zfflag"></view> -->
+
 		<!-- 背景 -->
 		<view class="" style="position: fixed;top: 0;left: 0;width: 100%;height: 100vh;z-index: -1;">
 			<image style="width: 100%;height: 100vh;"
 				src="https://api.ccttiot.com/smartmeter/img/static/uOiCQSDjukktdvbx5oPw" mode=""></image>
 		</view>
-		
+
 		<!-- 客服列表 -->
 		<view class="kflist" v-if="kfflag">
 			<view class="kftit">
@@ -95,9 +99,12 @@
 			<view class="kfshuzu">
 				<view class="item_val" v-for="(item,index) in kefulist" :key="index" @click="btncall(item.mobile)">
 					<view class="lt">
-						<image v-if="item.type == 2" src="https://api.ccttiot.com/smartmeter/img/static/urCSQTavLmUje5oTIsE6" mode=""></image>
-						<image v-if="item.type == 3" src="https://api.ccttiot.com/smartmeter/img/static/uE5rZZvVutxxUj9I06m5" mode=""></image>
-						<image v-if="item.type == 4" src="https://api.ccttiot.com/smartmeter/img/static/uruHLe3W460sdXr2lcxF" mode=""></image>
+						<image v-if="item.type == 2"
+							src="https://api.ccttiot.com/smartmeter/img/static/urCSQTavLmUje5oTIsE6" mode=""></image>
+						<image v-if="item.type == 3"
+							src="https://api.ccttiot.com/smartmeter/img/static/uE5rZZvVutxxUj9I06m5" mode=""></image>
+						<image v-if="item.type == 4"
+							src="https://api.ccttiot.com/smartmeter/img/static/uruHLe3W460sdXr2lcxF" mode=""></image>
 					</view>
 					<view class="rt">
 						<view class="" v-if="item.type == 2">{{item.name}}</view>
@@ -112,32 +119,33 @@
 			×
 		</view>
 		<view class="mask" v-if="kfflag"></view>
-		
+
 		<!-- 蓝牙充值动画 -->
-		<view class="czdh"  v-if="jzflag">
-		    <view class="bj">
-		    	<view class="tittop">
-		    		正在充值中,请稍后
-		    	</view>
-		    	<view class="bfb">
-		    		{{progress}} %
-		    	</view>
-		    </view>
+		<view class="czdh" v-if="jzflag">
+			<view class="bj">
+				<view class="tittop">
+					正在充值中,请稍后
+				</view>
+				<view class="bfb">
+					{{progress}} %
+				</view>
+			</view>
 		</view>
-		
+
 	</view>
 </template>
 
 <script>
-	var xBlufi = require("@/components/blufi/xBlufi.js");  
+	var xBlufi = require("@/components/blufi/xBlufi.js");
 	export default {
 		data() {
 			return {
-				jine:'',
-				zfflag:false,
-				jzflag:false,
+				picimg: false,
+				jine: '',
+				zfflag: false,
+				jzflag: false,
 				progress: 0,
-				mac:'',
+				mac: '',
 				deviceId: '',
 				name: '',
 				czflag: false,
@@ -152,25 +160,26 @@
 				activeindex: -1,
 				id: '',
 				list: [],
-				obj:{},
-				orderno:'',
-				payNo:'',
-				prices:'',
-				sytime:'',
-				zfobj:{},
-				suitTimeUnit:'',
-				suitPrice:'',
-				suitGearAmount:'',
-				suitGearTime:'',
-				suitFeeMode:'',
-				suitFeeType:'',
-				title:'',
-				sbobj:{},
-				onlineStatus:'',
-				kfflag:false,
-				timer:null,
-				titflag:false, 
-				kefulist:[]
+				obj: {},
+				orderno: '',
+				payNo: '',
+				prices: '',
+				sytime: '',
+				zfobj: {},
+				suitTimeUnit: '',
+				suitPrice: '',
+				suitGearAmount: '',
+				suitGearTime: '',
+				suitFeeMode: '',
+				suitFeeType: '',
+				title: '',
+				sbobj: {},
+				onlineStatus: '',
+				kfflag: false,
+				timer: null,
+				titflag: false,
+				kefulist: [],
+				scrollTop:0
 			}
 		},
 		onLoad(option) {
@@ -184,22 +193,22 @@
 				let decodedValue = decodeURIComponent(this.sceneValue)
 				this.id = getQueryParam(decodedValue, 's')
 				this.$u.get(`/app/user/userInfo`).then(res => {
-					if(res.code == 200){
-				        this.getlist()
-					}else if(res.code == 401){
+					if (res.code == 200) {
+						this.getlist()
+					} else if (res.code == 401) {
 						uni.navigateTo({
-							url:'/pages/login/login?id=' + this.id
+							url: '/pages/login/login?id=' + this.id
 						})
 					}
 				})
 			} else {
 				this.id = option.id
 				this.$u.get(`/app/user/userInfo`).then(res => {
-					if(res.code == 200){
-				        this.getlist()
-					}else if(res.code == 401){
+					if (res.code == 200) {
+						this.getlist()
+					} else if (res.code == 401) {
 						uni.navigateTo({
-							url:'/pages/login/login?id=' + this.id
+							url: '/pages/login/login?id=' + this.id
 						})
 					}
 				})
@@ -233,39 +242,62 @@
 		},
 		methods: {
 			// 点击协议跳转
-			btnxieyi(){
+			btnxieyi() {
 				uni.navigateTo({
 					url: '/page_fenbao/shiyong?tit=' + '用户服务协议' + '&type=' + 'user'
 				})
 			},
 			// 获取设备客服
-			getkefu(){
+			getkefu() {
 				this.$u.get(`/app/device/${this.obj.deviceId}/service`).then(res => {
-					if(res.code == 200){
+					if (res.code == 200) {
 						this.kefulist = res.data
 					}
 				})
 			},
-			
+
 			// 获取设备套餐列表
 			getlist() {
 				this.$u.get(`app/device/${this.id}/withSuitList`).then((res) => {
 					if (res.code == 200) {
 						this.list = res.data.suitList
+						if (this.list.length <= 3) {
+							this.picimg = false
+						} else {
+							this.picimg = true
+						}
 						this.obj = res.data
 						this.onlineStatus = res.data.onlineStatus
-						this.mac = 'CTKG-' + res.data.mac
+						this.mac = 'CCYK:' + res.data.mac
 						this.getkefu()
-					}else if(res.code == 401){
+					} else if (res.code == 401) {
 						uni.navigateTo({
-							url:'/pages/login/login'
+							url: '/pages/login/login'
 						})
 					}
 				})
 			},
+			// 滚动到底部
+			handleScroll(e) {
+				if (e.detail.deltaY <= 0) {
+					  this.picimg = false
+				} else {
+					setTimeout(()=>{
+						this.scrollTop = 0
+						if(this.list.length <= 3){
+							this.picimg = false
+						}else{
+							this.picimg = true
+						}
+					},500)
+				}
+			},
+			btnscrll() {
+				this.scrollTop = 99999
+			},
 			// 点击支付	
 			btnzhifu() {
-				if(this.onlineStatus == 0){
+				if (this.onlineStatus == 0) {
 					if (this.ver_data == '') {
 						this.czflag = true
 						uni.showLoading({
@@ -294,20 +326,20 @@
 							content: `检测到该设备未联网,为您切换为蓝牙模式,支付的时候靠近该设备,并打开蓝牙`,
 							showCancel: false,
 						})
-						setTimeout(()=>{
-							if(that.ver_data == ''){
+						setTimeout(() => {
+							if (that.ver_data == '') {
 								uni.showToast({
 									title: '未连接成功，如多次失败请点击右上角联系客服咨询',
 									icon: 'none',
 									duration: 5000
 								})
 								that.czflag = false
-								setTimeout(()=>{
+								setTimeout(() => {
 									uni.hideLoading()
-								},5000)
+								}, 5000)
 							}
-						},18000)
-					}else{
+						}, 18000)
+					} else {
 						this.zhifuflag = false
 						let that = this
 						let data = {
@@ -315,145 +347,222 @@
 							suitId: that.zfobj.suitId,
 							money: that.zfobj.price,
 							suitTime: that.zfobj.value,
-							suitTimeUnit:that.suitTimeUnit,
-							suitFeeMode:that.suitFeeMode,
-							suitFeeType:that.suitFeeType,
-							suitGearAmount:that.suitGearAmount,
-							suitGearTime:that.suitGearTime,
-							suitPrice:that.suitPrice
+							suitTimeUnit: that.suitTimeUnit,
+							suitFeeMode: that.suitFeeMode,
+							suitFeeType: that.suitFeeType,
+							suitGearAmount: that.suitGearAmount,
+							suitGearTime: that.suitGearTime,
+							suitPrice: that.suitPrice
 						}
 						that.$u.post('/app/bill/recharge', data).then(res => {
-							if(res.code == 200){
+							if (res.code == 200) {
 								that.orderno = res.data
 								that.$u.get(`/app/pay/wx/${that.orderno}`).then((res) => {
 									if (res.code == 200) {
-											uni.requestPayment({
-												provider: 'wxpay',
-												timeStamp: res.data.payParams.timeStamp,
-												nonceStr: res.data.payParams.nonceStr,
-												package: res.data.payParams.packageVal,
-												signType: res.data.payParams.signType,
-												paySign: res.data.payParams.paySign,
-												success: (res) => {
-													if (that.timer) {
-														clearInterval(this.timer);
-														that.timer = null;
-													}
-													// 111111111111111111111111 
-													that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res =>{
-														// if(res.code == 200){
-															that.$u.get('/app/bill/recharge/device/fail/list').then(res => {
-																	if (res.code == 200) {
-																		if(res.data.length != 0){
-																			let dingobj = res.data[0].billNo
-																			uni.getNetworkType({
-																				success(res) {
-																					if (res.networkType !== 'none') {
-																						uni.getConnectedBluetoothDevices({
-																							success(res) {
-																								that.jzflag = true
-																								that.startLoading()
-																								setTimeout(()=> {
-																									xBlufi.notifySendCustomData({
-																											customData: "time@" + that.jine
-																										})
-																								},1500)
+										uni.requestPayment({
+											provider: 'wxpay',
+											timeStamp: res.data.payParams.timeStamp,
+											nonceStr: res.data.payParams.nonceStr,
+											package: res.data.payParams.packageVal,
+											signType: res.data.payParams.signType,
+											paySign: res.data.payParams.paySign,
+											success: (res) => {
+												if (that.timer) {
+													clearInterval(this.timer);
+													that.timer = null;
+												}
+												// 111111111111111111111111 
+												that.$u.put(
+													`/app/bill/${that.orderno}/refreshPayResult`
+												).then(res => {
+													// if(res.code == 200){
+													that.$u.get(
+														'/app/bill/recharge/device/fail/list'
+													).then(res => {
+														if (res.code == 200) {
+															if (res.data
+																.length != 0) {
+																let dingobj =
+																	res.data[0]
+																	.billNo
+																uni.getNetworkType({
+																	success(
+																		res
+																	) {
+																		if (res
+																			.networkType !==
+																			'none'
+																		) {
+																			uni.getConnectedBluetoothDevices({
+																				success(
+																					res
+																				) {
+																					that.jzflag =
+																						true
+																					that.startLoading()
+																					setTimeout
+																						(() => {
+																								xBlufi
+																									.notifySendCustomData({
+																										customData: "11time@" +
+																											that
+																											.jine
+																									})
 																							},
-																							fail(err) {
-																								console.error('获取已连接蓝牙设备信息失败：',err)
-																							}
-																						})
-																						that.$u.get(`/app/bill/recharge/${dingobj}/bluetoothSuccess`).then(res => {
-																									if (res.code == 200) {
-																										that.zhifuflag = true
-																										console.log('蓝牙离线充值成功11')
-																										setTimeout(() => {
-																											uni.reLaunch({
-																												url:'/pages/index/index?id=' + that.orderno
-																											})
-																										},1000)
-																									}
-																								})
-																					} else {
-																						console.log('手机未连接网络')
-																						// this.baiflag = false
-																					}
+																							1500
+																						)
+																				},
+																				fail(
+																					err
+																				) {
+																					console
+																						.error(
+																							'获取已连接蓝牙设备信息失败：',
+																							err
+																						)
 																				}
 																			})
-																		}else{
-																			uni.getNetworkType({
-																				success(res) {
-																					if (res.networkType !== 'none') {
-																						uni.getConnectedBluetoothDevices({
-																							success(res) {
-																								that.jzflag = true
-																								that.startLoading()
-																								setTimeout(()=> {
-																									xBlufi.notifySendCustomData({
-																											customData: "time@" + that.jine
+																			that.$u
+																				.get(
+																					`/app/bill/recharge/${dingobj}/bluetoothSuccess`
+																				)
+																				.then(
+																					res => {
+																						if (res
+																							.code ==
+																							200
+																						) {
+																							that.zhifuflag =
+																								true
+																							console
+																								.log(
+																									'蓝牙离线充值成功11'
+																								)
+																							setTimeout
+																								(() => {
+																										uni.reLaunch({
+																											url: '/pages/index/index?id=' +
+																												that
+																												.orderno
 																										})
-																								},1500)
-																							},
-																							fail(err) {
-																								console.error('获取已连接蓝牙设备信息失败：',err)
-																							}
-																						})
-																				        that.zhifuflag = true
-																				        setTimeout(() => {
-																				        	uni.reLaunch({
-																				        		url:'/pages/index/index?id=' + that.orderno
-																				        	})
-																				        },1000)
-																					} else {
-																						console.log('手机未连接网络')
-																						// this.baiflag = false
+																									},
+																									1000
+																								)
+																						}
 																					}
-																				}
-																			})
+																				)
+																		} else {
+																			console
+																				.log(
+																					'手机未连接网络'
+																				)
+																			// this.baiflag = false
 																		}
-
 																	}
 																})
-														// }
+															} else {
+																uni.getNetworkType({
+																	success(
+																		res
+																	) {
+																		if (res
+																			.networkType !==
+																			'none'
+																		) {
+																			uni.getConnectedBluetoothDevices({
+																				success(
+																					res
+																				) {
+																					that.jzflag =
+																						true
+																					that.startLoading()
+																					setTimeout
+																						(() => {
+																								xBlufi
+																									.notifySendCustomData({
+																										customData: "11time@" +
+																											that
+																											.jine
+																									})
+																							},
+																							1500
+																						)
+																				},
+																				fail(
+																					err
+																				) {
+																					console
+																						.error(
+																							'获取已连接蓝牙设备信息失败：',
+																							err
+																						)
+																				}
+																			})
+																			that.zhifuflag =
+																				true
+																			setTimeout
+																				(() => {
+																						uni.reLaunch({
+																							url: '/pages/index/index?id=' +
+																								that
+																								.orderno
+																						})
+																					},
+																					1000
+																				)
+																		} else {
+																			console
+																				.log(
+																					'手机未连接网络'
+																				)
+																			// this.baiflag = false
+																		}
+																	}
+																})
+															}
+
+														}
 													})
-													// 支付成功逻辑
-													uni.setStorageSync('time', that.expireTimeStr)
-												},
-												fail(err) {
-													this.zhifuflag = true
-													setTimeout(() => {
-														this.czflag = false
-														uni.hideLoading()
-													}, 500)
-													// 支付失败逻辑
-													uni.showToast({
-														title: '支付失败',
-														icon: 'none',
-														duration: 2000
-													});
-												}
-											})
-									}else{
+													// }
+												})
+												// 支付成功逻辑
+												uni.setStorageSync('time', that.expireTimeStr)
+											},
+											fail(err) {
+												this.zhifuflag = true
+												setTimeout(() => {
+													this.czflag = false
+													uni.hideLoading()
+												}, 500)
+												// 支付失败逻辑
+												uni.showToast({
+													title: '支付失败',
+													icon: 'none',
+													duration: 2000
+												});
+											}
+										})
+									} else {
 										this.zhifuflag = true
 									}
 								})
 							}
 						})
 					}
-				}else{
-					if(this.checked == false){
+				} else {
+					if (this.checked == false) {
 						uni.showToast({
 							title: '请勾选用户服务协议 !',
 							icon: 'none',
 							duration: 1000
 						})
-					}else if(this.activeindex == -1){
+					} else if (this.activeindex == -1) {
 						uni.showToast({
 							title: '请选择套餐 !',
 							icon: 'none',
 							duration: 1000
 						})
-					}else{
+					} else {
 						// 不允许一直点击支付
 						this.zhifuflag = false
 						let that = this
@@ -462,22 +571,22 @@
 							suitId: that.zfobj.suitId,
 							money: that.zfobj.price,
 							suitTime: that.zfobj.value,
-							suitTimeUnit:that.suitTimeUnit,
-							suitFeeMode:that.suitFeeMode,
-							suitFeeType:that.suitFeeType,
-							suitGearAmount:that.suitGearAmount,
-							suitGearTime:that.suitGearTime,
-							suitPrice:that.suitPrice
+							suitTimeUnit: that.suitTimeUnit,
+							suitFeeMode: that.suitFeeMode,
+							suitFeeType: that.suitFeeType,
+							suitGearAmount: that.suitGearAmount,
+							suitGearTime: that.suitGearTime,
+							suitPrice: that.suitPrice
 						}
 						that.$u.post('/app/bill/recharge', data).then(res => {
-							if(res.code == 200){
+							if (res.code == 200) {
 								that.orderno = res.data
 								let data = {
-									billNo:that.orderno,
-									channelId:1
+									billNo: that.orderno,
+									channelId: 1
 								}
 								that.$u.get(`app/pay/wx/${that.orderno}`).then(res => {
-									if(res.code == 200){
+									if (res.code == 200) {
 										that.payNo = res.data.payBill.payNo
 										uni.requestPayment({
 											provider: 'wxpay',
@@ -488,10 +597,13 @@
 											paySign: res.data.payParams.paySign,
 											success: (res) => {
 												that.zhifuflag = true
-												that.$u.put(`/app/bill/${that.payNo}/refreshPayResult`).then(res => {})
-												// 支付成功逻辑
-												uni.reLaunch({
-													url:'/pages/index/index'
+												that.$u.put(
+													`/app/bill/${that.payNo}/refreshPayResult`
+												).then(res => {
+													// 支付成功逻辑
+													uni.reLaunch({
+														url: '/pages/index/index'
+													})
 												})
 											},
 											fail(err) {
@@ -504,51 +616,51 @@
 												})
 											}
 										})
-									}else{
+									} else {
 										uni.showToast({
 											title: res.msg,
 											icon: 'none',
 											duration: 2000
 										})
-										setTimeout(()=>{
+										setTimeout(() => {
 											this.zhifuflag = true
-										},2000)
+										}, 2000)
 									}
 								})
-							}else{
+							} else {
 								uni.showToast({
 									title: res.msg,
 									icon: 'none',
 									duration: 2000
 								})
-								setTimeout(()=>{
+								setTimeout(() => {
 									this.zhifuflag = true
-								},2000)
+								}, 2000)
 							}
 						})
 					}
 				}
 			},
-			
+
 			// 蓝牙充值动画
 			startLoading() {
-			   this.isLoading = true;
-			   const intervalId = setInterval(() => {
-			     this.progress += 100 / 100; // 每次增加 1
-			     if (this.progress >= 99) {
-			       clearInterval(intervalId);
-			       this.isLoading = false;
-			       this.progress = 98; // 确保进度条最终达到98
-			     }
-			   }, 15);
+				this.isLoading = true;
+				const intervalId = setInterval(() => {
+					this.progress += 100 / 100; // 每次增加 1
+					if (this.progress >= 99) {
+						clearInterval(intervalId);
+						this.isLoading = false;
+						this.progress = 98; // 确保进度条最终达到98
+					}
+				}, 15);
 			},
 			// 获取附近蓝牙设备列表
 			funListenDeviceMsgEvent: function(options) {
-				switch (options.type) { 
+				switch (options.type) {
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
 						if (options.result) {
 							let devicesarr = options.data
-							console.log(devicesarr,this.mac,'111');
+							console.log(devicesarr, this.mac, '111');
 							devicesarr.forEach(device => {
 								const mac = device.name.substring(4);
 								if (device.name.slice(5, 17) == this.mac.slice(5, 17)) {
@@ -558,7 +670,7 @@
 									let uniqueDevicesList = Array.from(new Set(this.devicesList));
 									// 将去重后的数组重新赋值给 this.devicesList
 									this.devicesList = uniqueDevicesList;
-								} 
+								}
 							})
 						}
 						break;
@@ -574,23 +686,24 @@
 								this.deviceIds = options.data.deviceId
 								this.name = this.name
 							}
-						}else{
-							
+						} else {
+
 						}
-			
+
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
 						this.ver_data = this.parseCustomData(options.data)
 						console.log("1收到设备发来的自定义数据结果：", this.ver_data);
-						setTimeout(()=>{
+						setTimeout(() => {
 							this.czflag = false
 							uni.hideLoading()
-						},1000)
+						}, 1000)
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
 						if (options.result) {
 							let uniqueDevicesList = Array.from(new Set(this.devicesList));
-							let filteredDevices = uniqueDevicesList.filter(device => device.name.substring(0, 4) === "CTKG");
+							let filteredDevices = uniqueDevicesList.filter(device => device.name.substring(0, 4) ===
+								"CCYK");
 							// 将过滤后的数组重新赋值给 this.devicesList
 							this.devicesList = filteredDevices;
 						}
@@ -642,13 +755,13 @@
 				this.suitGearTime = item.gearTime
 				this.suitFeeMode = item.feeMode
 				this.suitFeeType = item.feeType
-				if(item.timeUnit == 1){
-					this.jine = item.value  * 24 * 60 * 60
-				}else if(item.timeUnit == 2){
+				if (item.timeUnit == 1) {
+					this.jine = item.value * 24 * 60 * 60
+				} else if (item.timeUnit == 2) {
 					this.jine = item.value * 60 * 60
-				}else if(item.timeUnit == 3){
+				} else if (item.timeUnit == 3) {
 					this.jine = item.value * 60
-				}else if(item.timeUnit == 4){
+				} else if (item.timeUnit == 4) {
 					this.jine = item.value
 				}
 			},
@@ -666,7 +779,7 @@
 				this.kfflag = true
 			},
 			// 拨打客服电话
-			btncall(mobile){
+			btncall(mobile) {
 				uni.makePhoneCall({
 					phoneNumber: mobile,
 					success: function(res) {
@@ -681,8 +794,8 @@
 					}
 				})
 			}
-			
-			
+
+
 		}
 	}
 </script>
@@ -700,7 +813,8 @@
 	/deep/ .u-title {
 		padding-bottom: 15rpx;
 	}
-	.czdh{
+
+	.czdh {
 		width: 100%;
 		height: 100vh;
 		position: fixed;
@@ -708,19 +822,22 @@
 		left: 0;
 		background-color: rgba(0, 0, 0, .5);
 		padding-top: 700rpx;
-		.bj{
+
+		.bj {
 			width: 500rpx;
 			height: 300rpx;
 			background-color: #fff;
 			margin: auto;
 			border-radius: 20rpx;
-			.tittop{
+
+			.tittop {
 				width: 100%;
 				text-align: center;
 				padding-top: 50rpx;
 				box-sizing: border-box;
 			}
-			.bfb{
+
+			.bfb {
 				width: 100%;
 				text-align: center;
 				padding-top: 50rpx;
@@ -729,7 +846,8 @@
 			}
 		}
 	}
-	.qx{
+
+	.qx {
 		width: 68rpx;
 		height: 68rpx;
 		background: #fff;
@@ -740,12 +858,13 @@
 		color: #3D3D3D;
 		margin: auto;
 		bottom: 420rpx;
-	    z-index: 1;
+		z-index: 1;
 		position: fixed;
 		left: 50%;
 		transform: translateX(-50%);
 	}
-    .kflist{
+
+	.kflist {
 		width: 590rpx;
 		height: 778rpx;
 		background: #FFFFFF;
@@ -757,52 +876,84 @@
 		z-index: 1;
 		padding-top: 48rpx;
 		box-sizing: border-box;
-		.kftit{
+
+		.kftit {
 			font-size: 40rpx;
 			color: #3D3D3D;
 			font-weight: 600;
 			width: 100%;
 			text-align: center;
 		}
-		.kfwz{
+
+		.kfwz {
 			font-size: 28rpx;
 			color: #3D3D3D;
 			margin-top: 16rpx;
 			width: 100%;
 			text-align: center;
 		}
-		.kfshuzu{
+
+		.kfshuzu {
 			height: 580rpx;
 			overflow: scroll;
-			 .item_val{
-				 display: flex;
-				 align-items: center;
-				 padding-left: 30rpx;
-				 box-sizing: border-box;
-				 width: 528rpx;
-				 height: 144rpx;
-				 background: #FFFFFF;
-				 box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0,0,0,0.1);
-				 border-radius: 20rpx 20rpx 20rpx 20rpx;
-				 margin: auto;
-				 margin-top: 42rpx;
-				 .lt{
-					 margin-right: 34rpx;
-					 padding-top: 10rpx;
-					 box-sizing: border-box;
-				 	image{
-				 		width: 76rpx;
-				 		height: 78rpx;
-				 	}
-				 }
-				 .rt{
-					 font-size: 32rpx;
-					 color: #3D3D3D;
-				 }
-			 }
+
+			.item_val {
+				display: flex;
+				align-items: center;
+				padding-left: 30rpx;
+				box-sizing: border-box;
+				width: 528rpx;
+				height: 144rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.1);
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				margin: auto;
+				margin-top: 42rpx;
+
+				.lt {
+					margin-right: 34rpx;
+					padding-top: 10rpx;
+					box-sizing: border-box;
+
+					image {
+						width: 76rpx;
+						height: 78rpx;
+					}
+				}
+
+				.rt {
+					font-size: 32rpx;
+					color: #3D3D3D;
+				}
+			}
 		}
 	}
-	.mask{
+
+	.picdh {
+		width: 30rpx;
+		height: 25rpx;
+		position: fixed;
+		top: 53%;
+		right: 76rpx;
+		z-index: 99;
+		opacity: .5;
+		animation: moveUpDown 1.5s infinite ease-in-out;
+	}
+
+	@keyframes moveUpDown {
+
+		0%,
+		100% {
+			transform: translateY(0);
+		}
+
+		50% {
+			transform: translateY(-10rpx);
+			/* 控制上下跳动的幅度 */
+		}
+	}
+
+	.mask {
 		position: fixed;
 		top: 0;
 		left: 0;
@@ -811,17 +962,19 @@
 		background-color: #000;
 		opacity: .5;
 	}
+
 	page {
 		background-color: #F7FAFE;
 		overflow: hidden;
 	}
+
 	.shibai {
 		margin-top: 50rpx;
 		text-align: center;
 		padding-bottom: 600rpx;
 		height: 100vh;
 		overflow: scroll;
-	
+
 		.jxcz {
 			width: 563rpx;
 			height: 100rpx;
@@ -836,23 +989,23 @@
 			left: 50%;
 			transform: translateX(-50%);
 		}
-	
+
 		.top {
 			font-size: 40rpx;
 			color: #3D3D3D;
 		}
-	
+
 		.tishi {
 			font-size: 31rpx;
 			color: #3D3D3D;
 			margin-top: 50rpx;
 		}
-	
+
 		.li {
 			margin-top: 50rpx;
 			font-size: 31rpx;
 			color: #3D3D3D;
-	
+
 			image {
 				margin-top: 30rpx;
 			}
@@ -870,16 +1023,18 @@
 			box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
 			filter: blur(0px);
 			margin: auto;
-			margin-top: 50rpx;
+			margin-top: 60rpx;
 			border-radius: 20rpx;
 			padding: 20rpx;
 			box-sizing: border-box;
-            .cont{
+
+			.cont {
 				margin-top: 10rpx;
 				max-height: 120rpx;
 				overflow: scroll;
 				line-height: 40rpx;
 			}
+
 			.shuomtit {
 				font-weight: 700;
 				font-size: 34rpx;
diff --git a/page_user/mydetail.vue b/page_user/mydetail.vue
index a2c3b2e..d7827b4 100644
--- a/page_user/mydetail.vue
+++ b/page_user/mydetail.vue
@@ -65,12 +65,20 @@
 					￥{{detailobj.money == undefined ? '--' : detailobj.money}}
 				</view>
 			</view>
+			<view class="item_xx" v-if="detailobj.status == 3">
+				<view class="">
+					退款金额
+				</view>
+				<view class="">
+					￥{{detailobj.refundAmount == undefined ? '--' : detailobj.refundAmount}}
+				</view>
+			</view>
 			<view class="item_xx">
 				<view class="">
 					经营场所：
 				</view>
 				<view class="">
-					{{detailobj.storeName == undefined ? '--' : detailobj.storeName}}
+					{{detailobj.storeName == undefined ? '--' : detailobj.storeName}} {{detailobj.deviceRoom == undefined ? '' : detailobj.deviceRoom + '室'}}
 				</view>
 			</view>
 			<view class="item_xx">
@@ -197,6 +205,7 @@
 				isUsing: false,
 				timer: null,
 				timers: null,
+				pictrim:true
 			}
 		},
 		onShow() {
@@ -363,7 +372,7 @@
 										success(res) {
 											setTimeout(() => {
 												xBlufi.notifySendCustomData({
-													customData: 'time0@'
+													customData: '11time0@'
 												})
 												uni.showToast({
 													title: '操作成功',
@@ -405,145 +414,169 @@
 
 			// 点击临时开关
 			btnimg() {
-				if (this.detailobj.deviceOnlineStatus == 1) {
-					this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=false`).then(res => {
-						if (res.code == 200) {
-							this.imgflag = false
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 1000
-							})
-						}
-					})
-				} else {
-					if (this.setMode == null) {
-						this.btnmsk = false
-						this.shibaiflag = false
-						this.bluetoothflag = true
-						xBlufi.initXBlufi(1)
-						xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
-						xBlufi.notifyStartDiscoverBle({
-							'isStart': true
-						})
-						// 停止蓝牙搜索  
-						setTimeout(() => {
-							xBlufi.notifyStartDiscoverBle({
-								'isStart': false
-							})
-							xBlufi.notifyConnectBle({
-								isStart: true,
-								deviceId: this.deviceId,
-								name: this.name
-							})
-							xBlufi.notifyInitBleEsp32({
-								deviceId: this.deviceId
-							})
-						}, 1000)
-					} else {
-						let that = this
-						uni.getNetworkType({
-							success(res) {
-								if (res.networkType !== 'none') {
-									uni.getConnectedBluetoothDevices({
-										success(res) {
-											setTimeout(() => {
-												xBlufi.notifySendCustomData({
-													customData: 'close'
-												})
-												uni.showToast({
-													title: '操作成功',
-													icon: 'success',
-													duration: 1000
-												})
-												this.imgflag = false
-												that.getlist()
-												that.msakflag = false
-												that.btnmsk = false
-												that.shibaiflag = false
-												that.bluetoothflag = false
-											}, 1000)
-										},
-										fail(err) {
-											console.error('获取已连接蓝牙设备信息失败：', err)
-										}
-									})
-								}
+				if(this.pictrim == true){  //防止频繁点击
+					this.pictrim = false
+					setTimeout(()=>{
+						this.pictrim = true
+					},5000)
+					if (this.detailobj.deviceOnlineStatus == 1) {
+						this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=false`).then(res => {
+							if (res.code == 200) {
+								this.imgflag = false
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 1000
+								})
 							}
 						})
+					} else {
+						if (this.setMode == null) {
+							this.btnmsk = false
+							this.shibaiflag = false
+							this.bluetoothflag = true
+							xBlufi.initXBlufi(1)
+							xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': true
+							})
+							// 停止蓝牙搜索  
+							setTimeout(() => {
+								xBlufi.notifyStartDiscoverBle({
+									'isStart': false
+								})
+								xBlufi.notifyConnectBle({
+									isStart: true,
+									deviceId: this.deviceId,
+									name: this.name
+								})
+								xBlufi.notifyInitBleEsp32({
+									deviceId: this.deviceId
+								})
+							}, 1000)
+						} else {
+							let that = this
+							uni.getNetworkType({
+								success(res) {
+									if (res.networkType !== 'none') {
+										uni.getConnectedBluetoothDevices({
+											success(res) {
+												setTimeout(() => {
+													xBlufi.notifySendCustomData({
+														customData: '11close'
+													})
+													uni.showToast({
+														title: '操作成功',
+														icon: 'success',
+														duration: 1000
+													})
+													this.imgflag = false
+													that.getlist()
+													that.msakflag = false
+													that.btnmsk = false
+													that.shibaiflag = false
+													that.bluetoothflag = false
+												}, 1000)
+											},
+											fail(err) {
+												console.error('获取已连接蓝牙设备信息失败：', err)
+											}
+										})
+									}
+								}
+							})
+						}
 					}
+				}else{
+					uni.showToast({
+						title: '请不要频繁点击',
+						icon: 'none',
+						duration: 1000
+					})
 				}
 			},
 			btnimgs() {
-				if (this.detailobj.deviceOnlineStatus == 1) {
-					this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=true`).then(res => {
-						if (res.code == 200) {
-							this.imgflag = true
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 1000
-							})
-						}
-					})
-				} else {
-					if (this.setMode == null) {
-						this.btnmsk = false
-						this.shibaiflag = false
-						this.bluetoothflag = true
-						xBlufi.initXBlufi(1)
-						xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
-						xBlufi.notifyStartDiscoverBle({
-							'isStart': true
-						})
-						// 停止蓝牙搜索  
-						setTimeout(() => {
-							xBlufi.notifyStartDiscoverBle({
-								'isStart': false
-							})
-							xBlufi.notifyConnectBle({
-								isStart: true,
-								deviceId: this.deviceId,
-								name: this.name
-							})
-							xBlufi.notifyInitBleEsp32({
-								deviceId: this.deviceId
-							})
-						}, 1000)
-					} else {
-						let that = this
-						uni.getNetworkType({
-							success(res) {
-								if (res.networkType !== 'none') {
-									uni.getConnectedBluetoothDevices({
-										success(res) {
-											setTimeout(() => {
-												xBlufi.notifySendCustomData({
-													customData: 'open'
-												})
-												uni.showToast({
-													title: '操作成功',
-													icon: 'success',
-													duration: 1000
-												})
-												this.imgflag = true
-												that.getlist()
-												that.msakflag = false
-												that.btnmsk = false
-												that.shibaiflag = false
-												that.bluetoothflag = false
-											}, 1000)
-										},
-										fail(err) {
-											console.error('获取已连接蓝牙设备信息失败：', err)
-										}
-									})
-								}
+				if(this.pictrim == true){ //防止频繁点击
+					this.pictrim = false
+					setTimeout(()=>{  
+						this.pictrim = true
+					},5000)
+					if (this.detailobj.deviceOnlineStatus == 1) {
+						this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=true`).then(res => {
+							if (res.code == 200) {
+								this.imgflag = true
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 1000
+								})
 							}
 						})
+					} else {
+						if (this.setMode == null) {
+							this.btnmsk = false
+							this.shibaiflag = false
+							this.bluetoothflag = true
+							xBlufi.initXBlufi(1)
+							xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': true
+							})
+							// 停止蓝牙搜索  
+							setTimeout(() => {
+								xBlufi.notifyStartDiscoverBle({
+									'isStart': false
+								})
+								xBlufi.notifyConnectBle({
+									isStart: true,
+									deviceId: this.deviceId,
+									name: this.name
+								})
+								xBlufi.notifyInitBleEsp32({
+									deviceId: this.deviceId
+								})
+							}, 1000)
+						} else {
+							let that = this
+							uni.getNetworkType({
+								success(res) {
+									if (res.networkType !== 'none') {
+										uni.getConnectedBluetoothDevices({
+											success(res) {
+												setTimeout(() => {
+													xBlufi.notifySendCustomData({
+														customData: '11open'
+													})
+													uni.showToast({
+														title: '操作成功',
+														icon: 'success',
+														duration: 1000
+													})
+													this.imgflag = true
+													that.getlist()
+													that.msakflag = false
+													that.btnmsk = false
+													that.shibaiflag = false
+													that.bluetoothflag = false
+												}, 1000)
+											},
+											fail(err) {
+												console.error('获取已连接蓝牙设备信息失败：', err)
+											}
+										})
+									}
+								}
+							})
+						}
 					}
+				}else{
+					uni.showToast({
+						title: '请不要频繁点击',
+						icon: 'none',
+						duration: 1000
+					})
 				}
 			},
 
@@ -1036,7 +1069,7 @@
 
 		.list_item {
 			width: 658rpx;
-			max-height: 380rpx;
+			max-height: 410rpx;
 			background: #FFFFFF;
 			box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
 			border-radius: 24rpx 24rpx 24rpx 24rpx;
diff --git a/page_user/mydingdan.vue b/page_user/mydingdan.vue
index 65b3b49..d381782 100644
--- a/page_user/mydingdan.vue
+++ b/page_user/mydingdan.vue
@@ -9,41 +9,19 @@
 					<view class="bh">
 						设备编号：{{item.deviceNo}}
 					</view>
-					<!-- 					<view class="wc" v-if="item.status == 2" style="color: #e6b000;">
-						已支付
-					</view>
-					<view class="wc" v-if="item.status == 1" style="color: #004fd8;">
-						未支付
-					</view>
-					<view class="wc" v-if="item.status == 3" style="color: #e10328;">
-						已退款
-					</view>
-					<view class="wc" v-if="item.status == 4" style="color: #5d5d5d;">
-						已取消(用户)
-					</view>
-					<view class="wc" v-if="item.status == 5" style="color: #5d5d5d;">
-						已取消(系统)
-					</view>
-					<view class="wc" v-if="item.status == 6" style="color: #e6b000;">
-						支付中
-					</view>
-					<view class="wc" v-if="item.status == 7" style="color: #e10328;">
-						退款中
-					</view> -->
 					<view style="color: #17b402;" v-if="item.isUsing == true"> <text
 							style="background-color: #17b402;"></text> 进行中 </view>
-					<view style="color: #8883F0;" v-if="item.isFinished == true"> <text
+					<view style="color: #8883F0;" v-if="item.isFinished == true && item.status != 3"> <text
 							style="background-color: #8883F0;"></text> 已完成 </view>
-					<view class="" v-if="item.isUsing == false && item.isFinished == false">
+					<view v-if="item.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>
+					<view class="" v-if="item.isUsing == false && item.isFinished == false && item.status != 3">
 						<view v-if="item.status == 1" style="color: #004fd8;"><text
 								style="background-color: #004fd8;"></text> 未支付</view>
 						<view v-if="item.status == 2" style="color: #e6b000;"><text
 								style="background-color: #e6b000;"></text> 支付成功</view>
-						<view v-if="item.status == 3" style="color: #e10328;"><text
-								style="background-color: #e10328;"></text> 已退款</view>
 						<view v-if="item.status == 4" style="color: #5d5d5d;"><text
 								style="background-color: #5d5d5d;"></text> 用户取消</view>
-						<view v-if="item.status == 5" style="color: #5d5d5d;"><text
+						<view v-if="item.status == 5" style="color: #5d5d5d;"><text 
 								style="background-color: #5d5d5d;"></text> 系统超时取消</view>
 						<view v-if="item.status == 6" style="color: #e6b000;"><text
 								style="background-color: #e6b000;"></text> 支付中</view>
@@ -81,10 +59,10 @@
 				</view>
 				<view class="item_xx">
 					<view class="">
-						租借店铺：
+						经营场所：
 					</view>
 					<view class="">
-						{{item.storeName}}
+						{{item.storeName}} {{item.deviceRoom == undefined ? '' : item.deviceRoom + '室'}}
 					</view>
 				</view>
 				<view class="bot">
diff --git a/page_user/orderdetail.vue b/page_user/orderdetail.vue
index 8e9d24d..cf9661b 100644
--- a/page_user/orderdetail.vue
+++ b/page_user/orderdetail.vue
@@ -24,12 +24,12 @@
 				 <view style="color: #8883F0;">{{obj.storeName == undefined ? '--' : obj.storeName}}</view>
 			</view>
 			<view class="xiao">
-				 <view style="width: 160rpx;">经营地址</view>
+				 <view style="width: 180rpx;">经营地址</view>
 				 <view>{{obj.storeAddress == undefined ? '--' : obj.storeAddress}}</view>
 			</view>
 			<view class="xiao">
 				 <view>房间号</view>
-				 <view>{{obj.room == undefined ? '--' : obj.storeAddress}}号</view>
+				 <view>{{obj.deviceRoom == undefined ? '--' : obj.deviceRoom}}号</view>
 			</view>
 			<view class="xiao">
 				 <view>支付时间</view>
@@ -51,13 +51,32 @@
 				 <view>套餐金额</view>
 				 <view>￥{{obj.money == undefined ? '--' : obj.money}}</view>
 			</view>
+			<view class="xiao" v-if="obj.status == 3">
+				 <view>退款金额</view>
+				 <view style="color: red;">￥{{obj.refundAmount == undefined ? '--' : obj.refundAmount}}</view>
+			</view>
 			<view class="xiao">
 				 <view>结束时间</view>
 				 <view>{{obj.suitEndTime == undefined ? '--' : obj.suitEndTime}}</view>
 			</view>
 			<view class="xiao">
 				 <view>订单状态</view>
-				 <view>使用中</view>
+				<view style="color: #17b402;" v-if="obj.isUsing == true"> <text
+						style="background-color: #17b402;"></text> 进行中 </view>
+				<view style="color: #8883F0;" v-if="obj.isFinished == true && obj.status != 3"> <text
+						style="background-color: #8883F0;"></text> 已完成 </view>
+				<view v-if="obj.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>
+				<view class="" v-if="obj.isUsing == false && obj.isFinished == false && obj.status != 3">
+				       <view v-if="obj.status == 1" style="color: rgb(99, 178, 168);"><text style="background-color: rgb(99, 178, 168);"></text> 未支付</view>		
+					   <view v-if="obj.status == 2" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 支付成功</view>	
+					   <view v-if="obj.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>	
+					   <view v-if="obj.status == 4" style="color: #5d5d5d;"><text style="background-color: #5d5d5d;"></text> 用户取消</view>	
+					   <view v-if="obj.status == 5" style="color: #5d5d5d;"><text style="background-color: #5d5d5d;"></text> 系统超时取消</view>	
+					   <view v-if="obj.status == 6" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 支付中</view>	
+					   <view v-if="obj.status == 7" style="color: #e10328;"><text style="background-color: #e10328;"></text> 退款中</view>	
+					   <view v-if="obj.status == 8" style="color: rgb(99, 178, 168);"><text style="background-color: rgb(99, 178, 168);"></text> 押金未支付</view>	
+					   <view v-if="obj.status == 9" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 押金已支付</view>	
+				</view> 
 			</view>
 			<view class="xiao">
 				 <view>直属合作伙伴</view>
@@ -75,8 +94,8 @@
 				收益明细
 			</view>
 			<view class="xiao" v-for="(item,index) in obj.bonusList" :key="index">
-				<view class="one">{{item.arrivalName == undefined ? '--' : item.arrivalName}}（<text v-if="item.arrivalType == 1">平台</text><text v-if="item.arrivalType == 2">公司</text><text v-if="item.arrivalType == 3">合作伙伴商</text><text v-if="item.arrivalType == 4">渠道商</text><text v-if="item.arrivalType == 5">创业者</text><text v-if="item.arrivalType == 6">经营场所</text>）{{item.point}}%</view>
-				<view class="two">￥{{item.amount == undefined ? '--' : item.amount}}</view>
+				<view class="one">{{item.arrivalName == undefined ? '--' : item.arrivalName}}（<text v-if="item.arrivalType == 1">平台</text><text v-if="item.arrivalType == 2">公司</text><text v-if="item.arrivalType == 3">合作伙伴</text><text v-if="item.arrivalType == 4">渠道商</text><text v-if="item.arrivalType == 5">创业者</text><text v-if="item.arrivalType == 6">经营场所</text>）{{item.point}}%</view>
+				<view class="two">￥{{item.amount == undefined ? '--' : item.amount}} <text v-if="obj.status == 3" style="margin-left: 20rpx;color: red;">(已退￥{{item.refundAmount}})</text> </view>
 			</view>
 		</view>
 		<view class="sb" v-if="userflag" @click="btntz" style="width:680rpx;height: 100rpx;display: flex;justify-content: space-between;background: #FFFFFF;
@@ -268,9 +287,7 @@
 		.shuzhi {
 			display: flex;
 			align-items: center;
-			// justify-content: space-between;
 			justify-content: center;
-			// padding:  0 60rpx;
 			margin-top: 50rpx;
 			box-sizing: border-box;
 	
diff --git a/page_user/orderlist.vue b/page_user/orderlist.vue
index 909084a..a7feca0 100644
--- a/page_user/orderlist.vue
+++ b/page_user/orderlist.vue
@@ -26,9 +26,12 @@
 		  	  <view class="order_item" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.billId)">
 		  	  	  <view class="tops">
 		  	  	  	 <view>订单编号：{{item.billNo}}</view> 
-					 <view style="color: #17b402;" v-if="item.isUsing == true"> <text style="background-color: #17b402;"></text> 进行中 </view>
-					 <view style="color: #8883F0;" v-if="item.isFinished == true"> <text style="background-color: #8883F0;"></text> 已完成 </view>
-					 <view class="" v-if="item.isUsing == false && item.isFinished == false">
+					<view style="color: #17b402;" v-if="item.isUsing == true"> <text
+							style="background-color: #17b402;"></text> 进行中 </view>
+					<view style="color: #8883F0;" v-if="item.isFinished == true && item.status != 3"> <text
+							style="background-color: #8883F0;"></text> 已完成 </view>
+					<view v-if="item.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>
+					<view class="" v-if="item.isUsing == false && item.isFinished == false && item.status != 3">
                             <view v-if="item.status == 1" style="color: rgb(99, 178, 168);"><text style="background-color: rgb(99, 178, 168);"></text> 未支付</view>		
 							<view v-if="item.status == 2" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 支付成功</view>	
 							<view v-if="item.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>	
diff --git a/page_user/tixian.vue b/page_user/tixian.vue
index ab87866..2adc0cf 100644
--- a/page_user/tixian.vue
+++ b/page_user/tixian.vue
@@ -68,7 +68,7 @@
 				-提现额度：单笔提现金额最低20元
 			</view>
 			<view class="tx_wz">
-				-到账时间：3个工作日内
+				-到账时间：1个工作日内
 			</view>
 			<view class="tx_wz" v-if="serviceType == 1">
 				-提现手续费：{{serviceRate}}%
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b5bc61d..4bd4cd6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -947,7 +947,6 @@
 					color: #8883F0;
 
 				}
-
 			}
 		}
 
@@ -971,7 +970,6 @@
 						height: 50px;
 					}
 				}
-
 			}
 
 			.ordertongji {
@@ -1177,18 +1175,14 @@
 		.ditu {
 			width: 100%;
 			height: 980rpx;
-			// background: #FFFFFF;
 			border-radius: 38rpx 38rpx 38rpx 38rpx;
-			// padding-top: 16rpx;
 			position: relative;
 
 			.ongoing_order {
 				width: 622rpx;
 				max-height: 100%;
-				// background-color: rgba(0, 0, 0, 0.4);
 				background: linear-gradient(to right, #FFEFEF 20%, #D9F6FF 100%);
 				border-radius: 40rpx 40rpx 40rpx 40rpx;
-				// opacity: 0.6;
 				position: absolute;
 				top: 48rpx;
 				left: 50%;
@@ -1197,7 +1191,6 @@
 				.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;
@@ -1221,7 +1214,6 @@
 					height: 94rpx;
 					background: rgba(0, 0, 0, 0.4);
 					background: linear-gradient(to right, #FFEFEF 20%, #D9F6FF 100%);
-					// box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.3);
 					border-radius: 40rpx 40rpx 40rpx 40rpx;
 					display: flex;
 					align-items: center;
@@ -1268,7 +1260,6 @@
 				width: 100%;
 				height: 1000rpx;
 				margin: auto;
-				// border-radius: 30rpx;
 				overflow: hidden;
 				position: relative;
 
@@ -1288,7 +1279,6 @@
 				padding: 30rpx 0;
 				box-sizing: border-box;
 
-				// padding-bottom: ;
 				.gr {
 					text-align: center;
 					width: 100%;
@@ -1299,7 +1289,6 @@
 					image {
 						display: block;
 						margin: auto;
-						// margin-bottom: 14rpx;
 						width: 104rpx;
 						height: 122rpx;
 					}
diff --git a/pages/zhuce.vue b/pages/zhuce.vue
index 12f877d..bd12172 100644
--- a/pages/zhuce.vue
+++ b/pages/zhuce.vue
@@ -357,11 +357,11 @@
 									success(res) {
 										setTimeout(() => { //一秒后发送开启命令
 											xBlufi.notifySendCustomData({
-												customData: 'open'
+												customData: '11open'
 											})
 											setTimeout(()=>{ //发送开启命令两秒后发送关闭命令
 												xBlufi.notifySendCustomData({
-													customData: 'close'
+													customData: '11close'
 												})
 												setTimeout(()=>{ //发送关闭命令后一秒后断开连接
 													uni.hideLoading()