diff --git a/page_fenbao/statulist/merchant/index.vue b/page_fenbao/statulist/merchant/index.vue
index cd34e58..6164221 100644
--- a/page_fenbao/statulist/merchant/index.vue
+++ b/page_fenbao/statulist/merchant/index.vue
@@ -2,38 +2,67 @@
 	<view class="page">
 		<u-navbar title="商家合作" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
 			height='50'></u-navbar>
-			<view class="title">
-				请您输入真实有效信息，我们将在第一时间联系您！
+		<image src="https://api.ccttiot.com/smartmeter/img/static/u22jKujzqJ82mSVfXhgG" class="bj" mode=""></image>
+		<view class="video">
+			<video src="https://api.ccttiot.com/smartmeter/img/static/ubSSfeAihTk6WgtvSbLL"></video>
+		</view>
+		<view class="box">
+		    <view class="one">
+		    	<view class="name">
+		    		1.您已经有设备了吗？
+		    	</view>
+				<u-dropdown>
+					<u-dropdown-item v-model="value1" :title="txt1" @change="btnsb" :options="options1"></u-dropdown-item>
+				</u-dropdown>
+		    </view>	
+			<view class="one" style="margin-top: 48rpx;">
+				<view class="name">
+					2.你想做的经营模式是？
+				</view>
+				<u-dropdown>
+					<u-dropdown-item v-model="value2" :title="txt2" @change="btnjy" :options="options2"></u-dropdown-item>
+				</u-dropdown>
+			</view>	
+			<view class="one" style="margin-top: 48rpx;">
+				<view class="name">
+					3.你打算将设备投放到哪里？
+				</view>
+				<u-checkbox-group @change="checkboxGroupChange">
+					<u-checkbox 
+						@change="checkboxChange" 
+						v-model="item.checked" 
+						v-for="(item, index) in list" shape="circle" :key="index" 
+						:name="item.name"
+					>{{item.name}}</u-checkbox>
+				</u-checkbox-group>
+			</view>	
+			<view class="one" style="margin-top: 48rpx;">
+				<view class="name">
+					4.您的姓名
+				</view>
+				<input type="text" v-model="name" placeholder="请输入您的真实姓名"/>
+			</view>	
+			<view class="one" style="margin-top: 48rpx;">
+				<view class="name">
+					5.您的联系方式
+				</view>
+				<input type="text" v-model="tel" placeholder="请输入您的手机号"/>
+			</view>	
+			<view class="one" style="margin-top: 48rpx;">
+				<view class="name">
+					6.您想了解的消息
+				</view>
+				<input type="text" v-model="xiaoxi" placeholder="请输入您想知道的消息"/>
+			</view>	
+		</view>
+		<view class="bot">
+			<view class="wz">
+				请输入您的真实有效信息，我们将在第一时间联系您
 			</view>
-        <view class="box">
-        	<view class="name">
-        		<!-- <image src="../../../static/image/a1.png" mode="aspectFit"></image> -->
-				<u-icon name="account" color="#8883F0" size="40"></u-icon>
-				<input type="text" placeholder="请输入您的真实姓名" v-model="name" />
-        	</view>
-			<view class="photo">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/uWvCbMLwjsdweRjOO1ZW" mode="aspectFit"></image>
-				<input type="text" placeholder="请输入您的手机号" v-model="phone" />
+			<view class="anniu" @click="btnjiameng">
+				马上加盟 立即赚钱
 			</view>
-			<view class="photos">
-				<!-- <image src="../../../static/image/a1.png" mode="aspectFit"></image> -->
-				<u-icon name="file-text" color="#8883F0" size="50"></u-icon>
-				<textarea name="" placeholder="详细输入您想了解的信息" id="" v-model="cont" cols="30" rows="10"></textarea>
-			</view>
-			<view class="" style="width: 100%;text-align: center;color: red;font-size: 28rpx;margin-top: 20rpx;">
-				<!-- 请填写真实信息，感谢您的配合！ -->
-			</view>
-			<!-- <view class="" style="width: 100%;color: red;font-size: 28rpx;margin-top: 20rpx;">
-				审核通过后，即可创建店铺，店铺中的设备可在地图中被发现！
-			</view> -->
-			<view class="tijiao" v-if="tjflag" @click="btnshenq"> 
-				提交申请
-			</view>
-			<view class="tijiao" v-else>
-				提交申请
-			</view>
-			
-        </view>
+		</view>
 	</view>
 </template>
 
@@ -41,10 +70,85 @@
 	export default {
 		data() {
 			return {
-                name:'',
-				phone:'',
-				cont:'',
-				tjflag:true
+               bgc: {
+               	  backgroundColor: "#D9DAF5",
+               }, 
+			   txt1:'请选择有无设备',
+			   value1: '',
+			   options1: [{
+			   			label: '已有设备，想合作',
+			   			value: 1,
+			   		},
+			   		{
+			   			label: '没有设备,打算开始',
+			   			value: 2,
+			   		}
+			   	],
+				txt2:'请选择经营模式',
+				value2: '',
+				options2: [{
+						label: '个体经营',
+						value: 1,
+					},
+					{
+						label: '企业经营',
+						value: 2,
+					},{
+						label: '政府经营',
+						value: 3,
+					},{
+						label: '机构经营',
+						value: 4,
+					}
+				],
+				list: [
+					{
+						name: '麻将房',
+						checked: false,
+						disabled: false
+					},
+					{
+						name: '棋牌室',
+						checked: false,
+						disabled: false
+					},
+					{
+						name: '台球桌',
+						checked: false,
+						disabled: false
+					},{
+						name: '加水器',
+						checked: false,
+						disabled: false
+					},
+					{
+						name: '按摩椅',
+						checked: false,
+						disabled: false
+					},{
+						name: '洗衣机',
+						checked: false,
+						disabled: false
+					},
+					{
+						name: '卡丁车',
+						checked: false,
+						disabled: false
+					},
+					{
+						name: '充电桩',
+						checked: false,
+						disabled: false
+					},{
+						name: '其他',
+						checked: false,
+						disabled: false
+					}
+				],
+				name:'',
+				tel:'',
+				xiaoxi:'',
+				toufanglist:[]
 			}
 		},
 		// 分享到好友（会话）
@@ -67,6 +171,67 @@
 			this.getuserinfo()
 		},
 		methods: {
+			// 点击加盟
+			btnjiameng(){
+				if(this.value1 == ''){
+					uni.showToast({
+						title: '请选择有无设备',
+						icon: 'none',
+						duration:2000
+					})
+				}else if(this.value2 == ''){
+					uni.showToast({
+						title: '请选择经营模式',
+						icon: 'none',
+						duration:2000
+					})
+				}else if(this.toufanglist.length == 0){
+					uni.showToast({
+						title: '请勾选投放哪里',
+						icon: 'none',
+						duration:2000
+					})
+				}else if(this.name == ''){
+					uni.showToast({
+						title: '请输入您的姓名',
+						icon: 'none',
+						duration:2000
+					})
+				}else if(this.tel == ''){
+					uni.showToast({
+						title: '请输入您的手机号',
+						icon: 'none',
+						duration:2000
+					})
+				}else if(this.xiaoxi == ''){
+					uni.showToast({
+						title: '请输入您想知道的消息',
+						icon: 'none',
+						duration:2000
+					})
+				}else{
+					console.log('111')
+				}
+			},
+			
+			// 选择使用场景
+			checkboxChange(e) {
+				//console.log(e);
+			},
+			// 选中任一checkbox时，由checkbox-group触发
+			checkboxGroupChange(e) {
+				console.log(e);
+				this.toufanglist = e
+			},
+			// 选择经营模式
+			btnjy(){
+				this.txt2 = this.options2[this.value2 - 1].label
+			},
+			// 选择是否拥有设备
+			btnsb(){
+				this.txt1 = this.options1[this.value1 - 1].label
+			},
+			// 获取个人信息
 			getuserinfo() {
 				this.$u.get("/app/user/userInfo").then((res) => {
 					if (res.code == 200) {
@@ -78,178 +243,114 @@
 					}
 				})
 			},
-			
-            btnshenq(){
-				if(this.name == ''){
-					uni.showToast({
-						title: '真实姓名不能为空',
-						icon: 'none',
-						duration: 1000
-					});
-				}else if(this.phone == ''){
-					uni.showToast({
-						title: '手机号不能为空',
-						icon: 'none',
-						duration: 1000
-					});
-				}else{
-					this.tjflag = false
-					let data = {
-						name:this.name,
-						mobile:this.phone,
-						content:this.cont
-					}
-					this.$u.post("/app/mchApply/submit",data).then(res => {
-						if(res.code == 401){
-							uni.reLaunch({
-								url:'/pages/login/login'
-							})
-							this.tjflag = true
-						}else if(res.msg == '商家不允许重复申请') {
-							uni.showToast({
-								title: '商家不允许重复申请',
-								icon: 'none',
-								duration: 1000
-							})
-							setTimeout(()=>{
-								this.tjflag = true
-							},1000)
-						}else if(res.code == 500){
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 1000
-							})
-							this.tjflag = true
-						}else{
-							uni.showToast({
-								title: '申请成功',
-								icon: 'success',
-								duration: 1000
-							})
-							setTimeout(()=>{
-								this.tjflag = true
-								uni.navigateBack()
-							},1000)
-						}
-					})
-				}
-			}
 		}
 	}
 </script>
 
 <style lang="scss">
+	.bj{
+		width: 100%;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: -1;
+	}
+	/deep/ .u-dropdown__content__mask{
+		background: transparent !important;
+	}
 	/deep/ .u-title{
 		padding-bottom: 22rpx;
 	}
 	/deep/ .uicon-nav-back{
 		padding-bottom: 22rpx;
 	}
-	
-	page {
-		background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
+	/deep/ .u-dropdown__menu{
+		z-index: 0 !important;
 	}
-
-	.page {
-		width: 750rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
-		.title{
+	/deep/ .u-dropdown__menu__item{
+		background-color: #f0f0f0;
+		border-radius: 10rpx;
+		justify-content: end !important;
+		padding: 0 48rpx;
+		box-sizing: border-box;
+	}
+	/deep/ .u-dropdown__menu__item__text{
+		width: 500rpx;
+	}
+	/deep/ .u-checkbox__icon-wrap--checked{
+		background-color: rgb(150,149,242) !important;
+		border-color: rgb(150,149,242) !important;
+	}
+	/deep/ .u-checkbox{
+		margin-right: 30rpx;
+	}
+	.bot{
+		margin: auto;
+		margin-top: 60rpx;
+		.wz{
 			width: 100%;
-			height: 120rpx;
-			padding: 30rpx;
-			box-sizing: border-box;
-			font-size: 30rpx;
-			color: #fff;
+			text-align: center;
+			font-size: 28rpx;
+			color: #3731BE;
 		}
-		.box{
-			width: 750rpx;
-			height: 1440rpx;
-			background: #F4F5F7;
-			border-radius: 50rpx 50rpx 0rpx 0rpx;
-			padding: 50rpx;
-			box-sizing: border-box;
-			.tijiao{
-				width: 676rpx;
-				height: 102rpx;
-				background: linear-gradient( 90deg, #8883F0 0%, #837EEB 100%);
-				border-radius: 54rpx 54rpx 54rpx 54rpx;
-				margin: auto;
-				text-align: center;
-				line-height: 102rpx;
-				font-weight: 500;
-				font-size: 40rpx;
-				color: #FFFFFF;
-				position: fixed;
-				bottom:40rpx;
-				left: 50%;
-				transform: translateX(-50%);
-			}
-			.photos{
-				margin-top: 32rpx;
-				width: 650rpx;
-				height: 358rpx;
-				background: #FFFFFF;
-				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1);
-				display: flex;
-				border-radius: 30rpx;
-				padding-top: 38rpx;
-				padding-left: 42rpx;
-				text{
-					width: 45rpx;
-					height: 45rpx;
-					margin-right: 34rpx;
-					margin-bottom: 30rpx;
-					top: -129rpx !important;
-				}
-				textarea{
-					font-size: 30rpx;
-					color: #333;
-					padding-right: 20rpx;
-				}
-			}
-			.photo{
-				margin-top: 32rpx;
-				width: 650rpx;
-				height: 118rpx;
-				background: #FFFFFF;
-				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1);
-				display: flex;
-				border-radius: 30rpx;
-				padding-top: 38rpx;
-				padding-left: 42rpx;
-				image{
-					width: 45rpx;
-					height: 45rpx;
-					margin-right: 34rpx;
-				}
-				input{
-					font-size: 30rpx;
-					color: #333;
-				}
-			}
+		.anniu{
+			width: 676rpx;
+			height: 101rpx;
+			background: #A3A0FF;
+			border-radius: 54rpx 54rpx 54rpx 54rpx;
+			line-height: 101rpx;
+			font-weight: 500;
+			font-size: 40rpx;
+			color: #FFFFFF;
+			margin: auto;
+			margin-top: 20rpx;
+			text-align: center;
+		}
+	}
+	.box{
+		width: 694rpx;
+		max-height: 1462rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		margin: auto;
+		margin-top: 30rpx;
+		padding: 44rpx 36rpx;
+		box-sizing: border-box;
+		.one{
 			.name{
-				width: 650rpx;
-				height: 118rpx;
-				background: #FFFFFF;
-				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1);
-				display: flex;
-				border-radius: 30rpx;
-				padding-top: 38rpx;
-				padding-left: 42rpx;
-				text{
-					width: 45rpx;
-					height: 45rpx;
-					margin-right: 34rpx;
-					margin-bottom: 30rpx;
-				}
-				input{
-					font-size: 30rpx;
-					color: #333;
-				}
+				font-weight: 600;
+				font-size: 34rpx;
+				color: #3D3D3D;
+				margin-bottom: 32rpx;
+			}
+			input{
+				width: 626rpx;
+				height: 90rpx;
+				background: #F0F0F0;
+				border-radius: 10rpx 10rpx 10rpx 10rpx;
+				line-height: 90rpx;
+				padding-left: 48rpx;
+				box-sizing: border-box;
 			}
 		}
 	}
+	.video{
+		width: 694rpx;
+		height: 390rpx;
+		margin: auto;
+		border-radius: 20rpx;
+		overflow: hidden;
+		video{
+			width: 694rpx;
+			height: 390rpx;
+		}
+	}
+	page {
+		background: #D9DAF5;
+		max-height: 200vh;
+		overflow: scroll;
+		padding-bottom: 60rpx;
+		box-sizing: border-box;
+	}
 </style>
\ No newline at end of file
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 249eca1..298ab18 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -115,7 +115,7 @@
 				<view class="bot_right">
 					<view class="cont" style="text-align: center;">
 						<view class="tit">
-							{{deviceInfo.surplusEle == null || Number(deviceInfo.surplusEle) < 0 ? '--' : deviceInfo.surplusEle}}
+							{{deviceInfo.surplusEleDb == null || Number(deviceInfo.surplusEleDb) < 0 ? '--' : deviceInfo.surplusEleDb}}
 						</view>
 						<view class="txt">
 							剩余度数
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 71f8fdc..2cd318d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -45,9 +45,26 @@
 					</view>
 					<view class="right">
 						<view class="fd_set iconfont icon-liebiao" @click="showfz = true"></view>
-						<image style="width: 32rpx;height: 34rpx;margin-top: 10rpx;margin-left: 20rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uiZneL59hHNJ2EsOE557" mode="aspectFit" @click="pxshow = true"></image>
+						<view class="" @click="pxshow = !pxshow">
+							{{paixutxt}}
+						</view>
+						<!-- <image style="width: 32rpx;height: 34rpx;margin-left: 10rpx;position: relative;z-index: 99;" src="https://api.ccttiot.com/smartmeter/img/static/uiZneL59hHNJ2EsOE557" mode="aspectFit" @click="btnpx"></image> -->
+						<view style="width: 32rpx;height: 34rpx;margin-left: 10rpx;position: relative;z-index: 99;" @click="btnpx" v-if="pxflag">
+							<u-icon name="arrow-up-fill" style="position: absolute;top: 0rpx;right: 4rpx;" color="#8883F0" size="24"></u-icon>
+							<u-icon style="position: absolute;top: 16rpx;right: 4rpx;" name="arrow-down-fill" color="#333" size="24"></u-icon>
+						</view>
+						<view style="width: 32rpx;height: 34rpx;margin-left: 10rpx;position: relative;z-index: 99;" @click="btnpxs" v-else>
+							<u-icon name="arrow-up-fill" style="position: absolute;top: 0rpx;right: 4rpx;" color="#333" size="24"></u-icon>
+							<u-icon style="position: absolute;top: 16rpx;right: 4rpx;" name="arrow-down-fill" color="#8883F0" size="24"></u-icon>
+						</view>
+						<view class="paixu" v-if="pxshow">
+							<view class="paixu_item" v-for="(item,index) in pxlist" :key="index" @click="pxconfirm(item)">
+								{{item.label}}
+							</view>
+						</view>
+						<view class="mask" v-if="pxshow" @click="pxshow = false"></view>
 					</view>
-					<u-select v-model="pxshow" :list="pxlist" @confirm="pxconfirm"></u-select>
+					<!-- <u-select v-model="pxshow" :list="pxlist" @confirm="pxconfirm"></u-select> -->
 				</view>
 			</view>
 			<u-mask :show="showfz" @click="showfz=false"></u-mask>
@@ -91,53 +108,57 @@
 					<view class="swiper_item">
 						<view class="card_box" v-for="(item,indexs) in items.wateringList" :key="indexs">
 							<view class="card">
-								<view class="card_left">
-									<view class="card_left_tit" @click="todetail(item.deviceId)">
-										{{item.deviceName}}
-									</view>
-									<view class="card_left_sta" @click="todetail(item.deviceId)">
-										网络:<view class="" style="width: 10rpx;"></view>
-										<text v-if="!item.modelTags.some(tag => tag == 2 || tag == 3)">
-											无
-										</text>
-										<text v-else>
-											<text v-if="item.wifi == null && !item.modelTags.some(tag => tag == 3) || item.wifi == '创特物联TP'" style="color: red;">未配网</text>
-											<text v-else>
-												<text v-if="item.onlineStatus == 0" style="color: red;">离线</text>
-												<text v-else style="color: #00BA88;">在线</text>
-											</text>
-										</text>
-										 <view class="" style="width: 20rpx;"></view>
-										状态:<view class="" style="width: 10rpx;"></view>
-										<view class="sta_txt" v-if="item.status==3">
-											维修中
-										</view>
-										<view class="sta_txt" v-if="item.status==2" style="color:red;">
-											使用中
-										</view>
-										<view class="sta_txt" v-if="item.status==1" style="color:#00BA88;">
-											空闲
-										</view>
-									</view>
-									<view class="card_left_no" :class="item.onlineStatus == 0 ? 'activewzgl' : ''"
-										@click="todetail(item.deviceId)">
-										S/N码：{{item.deviceNo}}
-									</view>
-									<view @click="sremakes(item)" v-if="item.storeId == null" class="dianpu"
-										style="border: 1px solid #ccc;padding: 5rpx;font-size:26rpx: border-box;width: 180rpx;border-radius: 20rpx;color: #ccc;text-align: center;margin-top: 10rpx;">
-										未分配店铺
-									</view>
-									<view v-else :class="item.onlineStatus == 0 ? 'activewzgl' : ''"
-										style="color: #95989D;padding-top: 20rpx;font-size: 26rpx;"
-										@click="todetail(item.deviceId)">
-										店铺：{{item.storeName.length > 5 ? item.storeName.slice(0,5) + '...' : item.storeName}}
-									</view>
-								</view>
 								<view class="card_right" @click="todetail(item.deviceId)">
 									<image v-if="item.customPicture" :src="item.customPicture" mode="aspectFit"
 										style="border-radius: 20rpx;"></image>
 									<image v-else :src="item.picture" mode="aspectFit"></image>
 								</view>
+								<view class="card_left">
+									<view class="card_left_tit" @click="todetail(item.deviceId)">
+										{{item.deviceName.length > 4 ? item.deviceName.slice(0, 4) + '...' : item.deviceName}}
+										<view class="card_left_sta" @click="todetail(item.deviceId)">
+											<text v-if="item.modelTags.some(tag => tag == 1)" style="margin-left: 20rpx;">
+												蓝牙
+											</text>
+											<text v-if="item.modelTags.some(tag => tag == 2)">
+												WIFi
+											</text>
+											<text v-if="item.modelTags.some(tag => tag == 3)">
+												4G
+											</text>
+											<text v-if="item.wifi == null && !item.modelTags.some(tag => tag == 3) && !item.modelTags.some(tag => tag == 1)" style="background-color: red;color: #fff;border: 1px solid red;">未配网</text>
+											<span style="display: flex;align-items: center;"v-if="item.wifi != null || item.modelTags.some(tag => tag == 3) || !item.modelTags.some(tag => tag == 1)">
+												<text v-if="item.onlineStatus == 0" style="background-color: red;color: #fff;border: 1px solid red;">离线</text>
+												<text v-else style="background-color: #00BA88;color: #fff;border: 1px solid #00BA88;">在线</text>
+											</span>
+										</view>
+									</view>
+									<view class="sta_txt" v-if="item.status==3" style="color:#fff;background-color: red;">
+										维修中
+									</view>
+									<view class="sta_txt" v-if="item.status==2" style="color:#fff;background-color: #ffba00;">
+										使用中
+									</view>
+									<view class="sta_txt" v-if="item.status==1" style="color:#fff;background-color: #00BA88;">
+										空闲
+									</view>
+									
+									<view class="" style="display: flex;align-items: center;">
+										<view class="card_left_no" :class="item.onlineStatus == 0 ? 'activewzgl' : ''"
+											@click="todetail(item.deviceId)">
+											S/N码：{{item.deviceNo}}
+										</view>
+										<view @click="sremakes(item)" v-if="item.storeId == null" class="dianpu"
+											style="border: 1px solid #ccc;padding: 5rpx;font-size:26rpx: border-box;width: 180rpx;border-radius: 20rpx;color: #ccc;text-align: center;margin-top: 10rpx;">
+											未分配店铺
+										</view>
+										<view v-else :class="item.onlineStatus == 0 ? 'activewzgl' : ''"
+											style="color: #95989D;padding-top: 20rpx;font-size: 26rpx;"
+											@click="todetail(item.deviceId)">
+											店铺：{{item.storeName.length > 5 ? item.storeName.slice(0,5) + '...' : item.storeName}}
+										</view>
+									</view>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -210,18 +231,18 @@
 				pxlist: [
 					{
 						value: 'deviceName',
-						label: '按设备名称排序'
+						label: '名称排序'
 					},
 					{
 						value: 'activationTime',
-						label: '按绑定时间排序'
+						label: '时间排序'
 					},
 					{
 						value: 'onlineStatus',
-						label: '按在线状态排序'
+						label: '状态排序'
 					}
 				],
-				
+				paixutxt:'名称排序',
 				shuaxin: false,
 				showshop: false,
 				shoplist: [],
@@ -248,6 +269,7 @@
 				sbflag: true,
 				show: false,
 				qingqiuflag:true,
+				pxdaoxu:'desc',
 				list: [{
 						value: '1',
 						label: '扫码添加'
@@ -303,7 +325,8 @@
 				url: "",
 				deviceNo: '',
 				btnmsk:false,
-				pxzt:'onlineStatus'
+				pxzt:'onlineStatus',
+				pxflag:true
 			}
 		},
 		onLoad() {
@@ -377,14 +400,24 @@
 		methods: {
 			// 选择排序
 			pxconfirm(e){
-				this.pxzt = e[0].value
-				// this.gettanc()
+				this.pxshow = false
+				this.paixutxt = e.label
+				this.pxdaoxu = e.value
+				this.pagenum = 1
+				this.getlist()
+			},
+			btnpx(){
+				this.pxflag = false
+				this.pxdaoxu = 'asc'
+				this.pagenum = 1
+				this.getlist()
+			},
+			btnpxs(){
+				this.pxflag = true
+				this.pxdaoxu = 'desc'
 				this.pagenum = 1
-				// this.logins()
-				// this.getgroup()
 				this.getlist()
 			},
-			
 			funListenDeviceMsgEvent: function(options) {
 				switch (options.type) {
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
@@ -1038,7 +1071,7 @@
 			getlist() {
 				this.shujuflag = false
 				// if (this.storeId == null) {
-					this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&orderByColumn=${this.pxzt}&isAsc=desc&storeId=${this.storeId == null ? '' : this.storeId}&keyword=${this.keyword}`).then((res) => {
+					this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&orderByColumn=${this.pxzt}&isAsc=${this.pxdaoxu}&storeId=${this.storeId == null ? '' : this.storeId}&keyword=${this.keyword}`).then((res) => {
 						if (res.code == 200) {
 							this.xiaflag = true
 							this.shuaxin = false
@@ -1402,7 +1435,7 @@
 		position: fixed;
 		bottom: 240rpx;
 		right: 60rpx;
-		z-index: 99;
+		z-index: 8;
 	}
 
 	.title {
@@ -2038,7 +2071,7 @@
                 	}
                 }
 				.fd_da {
-					width: 600rpx;
+					width: 440rpx;
 					overflow: hidden;
 					overflow-x: auto;
 					white-space: nowrap;
@@ -2082,13 +2115,43 @@
 					display: flex;
 					flex-wrap: nowrap;
 					align-items: center;
-
+					align-items: center;
+                    position: relative;
+					.paixu{
+						position: absolute;
+						top: 64rpx;
+						right: 0;
+						z-index: 10;
+						background-color: #fff;
+						padding: 10rpx 20rpx;
+						box-sizing: border-box;
+						width: 160rpx;
+						text-align: center;
+						border-radius: 10rpx;
+						.paixu_item{
+							height: 50rpx;
+							line-height: 50rpx;
+							border-bottom: 1px solid #ccc;
+						}
+						.paixu_item:last-of-type{
+							border: none;
+						}
+					}
+					.mask{
+						width: 100%;
+						height: 100vh;
+						position: fixed;
+						top: 0;
+						left: 0;
+						background-color: rgba(0,0,0,0.1);
+						z-index: 9;
+					}
 					.fd_set {
 						font-size: 60rpx;
 					}
 
 					.icon-liebiao {
-						margin-top: 10rpx;
+						// margin-top: 10rpx;
 						margin-left: 20rpx;
 						font-size: 40rpx;
 					}
@@ -2122,48 +2185,62 @@
 
 						.card {
 							display: flex;
-							// margin-top: 20rpx;
-							width: 658rpx;
+							width: 680rpx;
 							max-height: 300rpx;
-							padding-bottom: 20rpx;
+							padding-bottom: 10rpx;
 							box-sizing: border-box;
 							background: #fff;
-							// box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(255, 255, 255, 0);
 							 box-shadow: 0 4px 8px rgba(0,0,0,0.1); 
 							border-radius: 24rpx 24rpx 24rpx 24rpx;
 
 							.card_left {
 								width: 100%;
 								margin-top: 20rpx;
-								margin-left: 50rpx;
-
+								margin-left: 20rpx;
+								position: relative;
+								.sta_txt {
+									color: #262B37;
+									font-size: 26rpx;
+									font-weight: 400;
+									position: absolute;
+									top: -20rpx;
+									right: 0;
+									width: 100rpx;
+									height: 50rpx;
+									line-height: 50rpx;
+			                        text-align: center;
+									border-radius: 30rpx 0 30rpx 0;
+								}
 								.card_left_tit {
-									font-size: 36rpx;
-									font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+									font-size: 34rpx;
 									font-weight: 600;
-									color: #8883F0;
+									color: #333;
+									display: flex;
+									align-items: center;
 								}
 
 								.card_left_sta {
-
-									padding-top: 15rpx;
+                                    font-weight: 400;
 									display: flex;
 									flex-wrap: nowrap;
 									align-items: center;
-
+									display: flex;
+                                    text{
+										padding:2rpx 4rpx;
+										box-sizing: border-box;
+										border: 1px solid #8883F0;
+										background-color: #8883F0;
+										color: #fff;
+										font-size: 20rpx;
+										text-align: center;
+										border-radius: 10rpx;
+										margin-right: 10rpx;
+									}
 									image {
 										width: 23.32rpx;
 										height: 36.47rpx;
 
 									}
-
-									.sta_txt {
-										// margin-left: 15rpx;
-										color: #262B37;
-										font-size: 26rpx;
-										font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
-										font-weight: 400;
-									}
 								}
 
 								.card_left_no {
@@ -2172,17 +2249,18 @@
 									font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
 									font-weight: 400;
 									color: #95989D;
+									margin-right: 20rpx;
 								}
 							}
 
 							.card_right {
 								margin-top: 30rpx;
 								margin-left: auto;
-								margin-right: 50rpx;
+								margin-left: 20rpx;
 
 								image {
-									width: 180rpx;
-									height: 180rpx;
+									width: 100rpx;
+									height: 100rpx;
 									border-radius: 10rpx;
 								}
 							}
diff --git a/pages/shanghudd.vue b/pages/shanghudd.vue
index 25d2f3a..b3cf9d4 100644
--- a/pages/shanghudd.vue
+++ b/pages/shanghudd.vue
@@ -71,7 +71,7 @@
 		<view class="time_list">
 			<view class="time_top">
 				<view class="">
-					<text v-if="detaobj.suitFeeType == 2 || detaobj.suitFeeType == 3">{{du}}度</text>
+					<text v-if="detaobj.suitFeeType == 2 || detaobj.suitFeeType == 3">{{sbobj.surplusEleDb}}度</text>
 					<text v-if="detaobj.suitFeeType == 1 || detaobj.suitFeeType == 4">{{formattedTime == '1秒' ? '0' : formattedTime}}</text>
 				</view>
 				<view class="" v-if="detaobj.suitEndTime">
@@ -84,7 +84,7 @@
 			</view>
 			<view class="time_bot" v-if="!detaobj.suitEndTime || detaobj.suitFeeType == 1">
 				<view class="">
-					<text >订单剩余</text>
+					<text >设备剩余</text>
 				</view>
 				<view class="">
 					<text v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">预估金额,以实际金额为准</text>
@@ -947,9 +947,8 @@
 								this.newArr.push(value)
 							}
 						}
-						if (this.detaobj.suitEndEle) {
-							let du = Number(this.detaobj.suitEndEle) - Number(this.detaobj.deviceTotalEle)
-							this.du = du.toFixed(2)
+						if (this.detaobj.deviceSurplusEle) {
+							this.du = this.detaobj.deviceSurplusEle
 						}
 						if (res.data.deviceExpireTime == null) {
 							this.timeday = 0