diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index d915805..149d626 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -17,7 +17,7 @@
 		</view>
 
 		<!-- 检测蓝牙未开启 -->
-	<!-- 	<view class="shibai" v-if="lanyaflag">
+		<view class="shibai" v-if="lanyaflag">
 			<view class="top">
 				设备未联网
 			</view>
@@ -45,9 +45,9 @@
 			<view class="jxcz" @click="btnjxcz">
 				我已知晓
 			</view>
-		</view>  v-else-->
+		</view> 
 
-		<view class="box">
+		<view class="box" v-else>
 			<view class="tit">
 				选择服务
 			</view>
@@ -57,7 +57,7 @@
 					v-for="(item,index) in deviceobj.suitList" :key="index" @click="btnactive(item)">
 					<view class="lt">
 						<view class="tc">
-							{{item.name}}
+							{{item.name.length > 5 ? item.name.substring(0,5) + '...' : item.name}}
 						</view>
 						<view class="date">
 							{{item.value}} <text v-if="item.timeUnit == 1">日</text>  <text v-if="item.timeUnit == 2">时</text> <text v-if="item.timeUnit == 3">分钟</text> <text v-if="item.timeUnit == 4">秒</text>
@@ -128,7 +128,8 @@
 				onlineStatus: '',
 				jine: '',
 				dingobj: {},
-				suitTimeUnit:''
+				suitTimeUnit:'',
+				zfflag:true
 			}
 		},
 		onLoad(option) {
@@ -362,7 +363,6 @@
 						duration: 1000
 					})
 				} else if (this.onlineStatus == 1) {
-					
 					let that = this
 					let data = {
 						deviceNo: that.id,
@@ -414,7 +414,6 @@
 						}
 					})
 				} else {
-					
 					if (this.ver_data == '') {
 						this.czflag = true
 						uni.showLoading({
diff --git a/page_components/newtaocan.vue b/page_components/newtaocan.vue
index 61beda9..8a84cde 100644
--- a/page_components/newtaocan.vue
+++ b/page_components/newtaocan.vue
@@ -1,45 +1,28 @@
 <template>
 	<view class="page">
-		<u-navbar title="选择套餐" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff"
-			title-size='36' height='42'></u-navbar>
-
+		<u-navbar title="套餐管理" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='50'></u-navbar>
+			
 		<view class="box" v-if="loading">
-			<view class="box_list" v-for="(item, index) in list" :key="index" @click="btnactive(item.suitId,index)">
-				<view :class="['boxlist', { active: tcidlist.includes(item.suitId) }]">
-					<view :class="['toptime', { activewz: tcidlist.includes(item.suitId) }]">
-						<text>{{item.name}}（通电时长：{{item.value}} <text v-if="item.timeUnit == 1">日</text> <text
-								v-if="item.timeUnit == 2">时</text> <text v-if="item.timeUnit == 3">分钟</text> <text
-								v-if="item.timeUnit == 4">秒</text> ）</text> <text>￥{{item.price}}</text>
-					</view>
-					<view class="ccc">
-						<view class="bumday" v-if="item.description == null">
-							<text class="shi"></text></text>
+			<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in list" :key="item.suitId" @click="click(item)" @open="open" :options="options">
+				<view class="boxlist" @click="btnedit(item)">
+						<view class="toptime">
+							<text>{{item.name.length > 5 ? item.name.substring(0,4) + '...' : item.name}}（通电时长：{{item.value}}  <text v-if="item.timeUnit == 1">日</text>  <text v-if="item.timeUnit == 2">时</text> <text v-if="item.timeUnit == 3">分钟</text> <text v-if="item.timeUnit == 4">秒</text> ）</text> <text>￥{{item.price}}</text>
 						</view>
-						<view class="bumday" v-else>
-							<text
-								:class="['shi', { activewz: tcidlist.includes(item.suitId) }]">{{item.description.length > 20 ? item.description.substring(0, 20) + '...' : item.description}}</text></text>
+						<view class="bumday" v-if="item.description">
+							<text class="shi">{{item.description.length > 20 ? item.description.substring(0, 20) + '...' : item.description}}</text></text>
 						</view>
-						<!-- <u-checkbox-group>
-							<u-checkbox v-model="item.checked"></u-checkbox>
-						</u-checkbox-group> -->
-					</view>
 				</view>
-			</view>
-
-			<view class="" v-if="list == ''"
-				style="color: #ccc;font-size: 36rpx;margin-top: 200rpx;text-align: center;">
+			</u-swipe-action>
+			<view class="" v-if="list.length == 0" style="color: #ccc;font-size: 36rpx;margin-top: 200rpx;text-align: center;">
 				该设备暂无套餐
 			</view>
 			<view class="anniu">
 				<view class="xinz" @click="btnadd">
-					新建套餐
-				</view>
-				<view class="xinz" @click="btnqd">
-					确定
+					新增套餐
 				</view>
 			</view>
-
-
+			
 		</view>
 	</view>
 </template>
@@ -48,8 +31,8 @@
 	export default {
 		data() {
 			return {
-				list: '',
-				loading: false,
+				list: [],
+				loading:false,
 				disabled: false,
 				btnWidth: 180,
 				show: false,
@@ -59,105 +42,37 @@
 						backgroundColor: '#dd524d'
 					}
 				}],
-				deviceId: '',
+				deviceId:'',
 				bgc: {
 					backgroundColor: "#8883f0",
 				},
-				activeid: '',
-				checkboxes: [],
-				tcidlist: [],
-				titaoc: []
 			};
 		},
 		onLoad(option) {
+			console.log(option);
 			this.deviceId = option.id
-
-		},
-		created() {
-			// 初始化checkboxes数组，每个元素都设为false（表示初始时不显示复选框）  
-			this.checkboxes = new Array(this.list.length).fill(false);
 		},
 		onShow() {
-			this.tcidlist = []
 			this.getlist()
-			setTimeout(() => {
-				this.getao()
-			}, 100)
 		},
 		// 分享到好友（会话）
-		onShareAppMessage: function() {
-			return {
-				title: '创想物联',
-				path: '/pages/shouye/index'
-			}
-		},
-
-		// 分享到朋友圈  
-		onShareTimeline: function() {
-			return {
-				title: '创想物联',
-				query: '',
-				path: '/pages/shouye/index'
-			}
-		},
+		  onShareAppMessage: function () {  
+		    return {  
+		      title: '创想物联',  
+		      path: '/pages/shouye/index'  
+		    }  
+		  },  
+		  
+		  // 分享到朋友圈  
+		  onShareTimeline: function () {  
+		    return {  
+		      title: '创想物联',  
+		      query: '',  
+		      path: '/pages/shouye/index'  
+		    }  
+		  },
 		methods: {
-			// 查询本人套餐
-			getao() {
-				this.$u.get(`/app/suit/listByDeviceId/${this.deviceId}`).then(res => {
-					if (res.code == 200) {
-						if (res.data.length > 0) {
-							this.titaoc = res.data
-
-							this.list.forEach(item => {
-								if (this.titaoc.some(titaocItem => titaocItem.sourceId === item.suitId)) {
-									this.titaoc.forEach(titaocItem => {
-										if (titaocItem.sourceId === item.suitId) {
-											this.tcidlist.push(item.suitId)
-										}
-									})
-									let uniqueTcidlist = [...new Set(this.tcidlist)];  
-									this.tcidlist = uniqueTcidlist
-								}
-							})
-						}
-					}
-				})
-			},
 			
-
-			btnactive(id, index) {
-				const indexInTcidList = this.tcidlist.indexOf(id);
-				if (indexInTcidList !== -1) {
-					this.tcidlist.splice(indexInTcidList, 1);
-				} else {
-					this.tcidlist.push(id);
-				}
-				console.log(this.tcidlist);
-			},
-
-			// 点击确定
-			btnqd() {
-				this.$u.delete(`/app/suit/delByDevice/${this.deviceId}`).then(res=>{})
-				
-				let numArr = this.tcidlist.map(item => parseInt(item, 10))
-				let data = {
-					deviceId: this.deviceId,
-					suitIds: numArr
-				}
-				this.$u.post(`/app/suit/copy`, data).then((res) => {
-					if (res.code == 200) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'success',
-							duration: 1000,
-						})
-						setTimeout(() => {
-							uni.navigateBack()
-						}, 1000)
-					}
-				})
-			},
-
 			getlist() {
 				let data = {
 					pageNum: 1,
@@ -166,6 +81,7 @@
 				this.$u.get(`/app/suit/tempList`, data).then((res) => {
 					if (res.code == 200) {
 						this.list = res.rows
+						this.loading = true
 						this.list = this.list.map(item => ({
 							...item,
 							checked: false,
@@ -174,22 +90,21 @@
 						console.log(this.list);
 						this.loading = true
 					}
-				});
-			},
-
-			btnedit(item) {
-				uni.navigateTo({
-					url: '/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId + '&suitId=' +
-						item.suitId
 				})
 			},
-
-			click(item) {
+			
+			btnedit(item){
+				uni.navigateTo({
+					url:'/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId + '&suitId=' + item.suitId
+				})
+			},
+			
+			click(item) { 
 				this.$u.delete(`/app/suit/${item.suitId}`).then((res) => {
 					if (res.code == 200) {
-						this.$u.toast(`删除成功`);
+					    this.$u.toast(`删除成功`);
 						this.getlist()
-					} else {
+					}else{
 						uni.showToast({
 							title: res.msg,
 							icon: 'none',
@@ -197,7 +112,7 @@
 						})
 					}
 				});
-
+				
 			},
 			open(index) {
 				this.list[index].show = true
@@ -205,9 +120,9 @@
 					if (index != idx) this.list[idx].show = false;
 				})
 			},
-			btnadd() {
+			btnadd(){
 				uni.navigateTo({
-					url: '/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + ''
+					url:'/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId
 				})
 			}
 		}
@@ -215,22 +130,12 @@
 </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;
+	/deep/ .u-title{
+		padding-bottom: 22rpx;
 	}
-
-	.activewz {
-		color: #fff !important;
+	/deep/ .u-icon__icon{
+		padding-bottom: 22rpx;
 	}
-
 	page {
 		background: #F4F5F7;
 	}
@@ -238,69 +143,53 @@
 	.page {
 		width: 750rpx;
 		padding-bottom: 400rpx;
-
 		.box {
 			width: 750rpx;
-			height: 100%;
+			height:100%;
 			background: #F4F5F7;
 			border-radius: 0rpx 0rpx 0rpx 0rpx;
 			padding: 50rpx;
-
-			.box_list {
-				background-color: #fff;
-				margin-top: 20rpx;
-				border-radius: 20rpx;
-			}
-
-			.anniu {
+			.anniu{
 				position: fixed;
-				bottom: 76rpx;
+				bottom: 0;
 				left: 50%;
 				transform: translateX(-50%);
-				display: flex;
-				justify-content: space-between;
-				width: 80%;
+				width: 100%;
+				height: 200rpx;
+				padding-top: 40rpx;
+				background-color: #fff;
+				padding-left: 50rpx;
+				padding-right: 50rpx;
+				.xinz{
+					width: 100%;
+					height: 84rpx;
+					background: #8883F0;
+					filter: blur(0px);
+					text-align: center;
+					line-height: 84rpx;
+					font-size: 36rpx;
+					color: #FFFFFF; 
+					border-radius: 50rpx;
+				}
 			}
 
-			.xinz {
-				width: 280rpx;
-				height: 84rpx;
-				background: #8883F0;
-				filter: blur(0px);
-				text-align: center;
-				line-height: 84rpx;
-				font-size: 36rpx;
-				color: #FFFFFF;
-				border-radius: 50rpx;
-			}
-
-			.boxlist {
+            .boxlist{
 				padding: 40rpx 42rpx;
 				box-sizing: border-box;
-
-				.ccc {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-				}
-
-				.toptime {
+				.toptime{
 					font-size: 32rpx;
-					color: #000000;
+					// color: #000000;
 					display: flex;
 					justify-content: space-between;
 				}
-
-				.bumday {
+				.bumday{
 					margin-top: 10rpx;
-
-					text {
+					text{
 						font-size: 32rpx;
 						color: #95989D;
 					}
 				}
 			}
-
 			/deep/ .u-swipe-action {
 				margin-top: 30rpx;
 				border-radius: 20rpx;
@@ -317,4 +206,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/page_fenbao/statulist/taocanlist/addtaocan/index.vue b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
index 69f925b..78039df 100644
--- a/page_fenbao/statulist/taocanlist/addtaocan/index.vue
+++ b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
@@ -15,13 +15,18 @@
 				<view class="title" style="margin-top: 50rpx;">
 					通电时长
 				</view>
-				<view class="" style="display: flex;justify-content: space-between;">
-					<input style="width: 80%;" type="text" v-model="value" placeholder="输入通电时长" />
-					<picker style="margin-top: 24rpx;border: 1px solid;padding: 5rpx 10rpx;border-radius: 10rpx;height: 40rpx;" mode="selector" :range="array" @change="bindPickerChange">
-						<view class="picker">
-							 {{array[index]}} <u-icon name="arrow-right" color="#000" size="28"></u-icon>
+				<view class="" style="display: flex;justify-content: space-between;position: relative;">
+					<input style="width: 80%;" type="number" v-model="value" placeholder="输入通电时长" />
+					<!-- <picker style="margin-top: 24rpx;border: 1px solid;padding: 5rpx 10rpx;border-radius: 10rpx;height: 40rpx;" mode="selector" :range="array" @change="bindPickerChange"> -->
+						<view class="picker" @click="btnxz">
+							 {{array[index]}}  <u-icon v-if="arrflag" name="arrow-down" color="#000" size="24"></u-icon> <u-icon v-else name="arrow-right" color="#000" size="24"></u-icon>
 						</view>
-					</picker>
+						<view class="arr_list" v-if="arrflag">
+							<view class="arr_item" v-for="(item,index) in array" :key="index" @click="btnxl(index)">
+								{{item}}
+							</view>
+						</view>
+					<!-- </picker> -->
 				</view>
 				<view class="title" style="margin-top: 50rpx;margin-bottom: 20rpx;">
 					详细说明
@@ -47,9 +52,10 @@
 				price: '',
 				title: '',
 				suitId: '',
-				array: ['日', '时', '分钟', '秒'],
+				array: ['天', '时', '分钟', '秒'],
 				index: 2,
-				timewz:''
+				timewz:'',
+				arrflag:false
 			}
 		},
 		onLoad(option) {
@@ -80,8 +86,19 @@
 		    }  
 		  },
 		methods: {
-			bindPickerChange(e) {
-				this.index = e.detail.value
+			// bindPickerChange(e) {
+			// 	this.index = e.detail.value
+			// },
+			btnxl(index){
+				this.index = index
+				this.arrflag = false
+			},
+			btnxz(){
+				if(this.arrflag == true){
+					this.arrflag = false
+				}else{
+					this.arrflag = true
+				}
 			},
 
 			gettaocan(suitId) {
@@ -138,7 +155,7 @@
 				} else {
 					if (this.title == '确定') {
 						let data = {
-							deviceId: this.deviceId,
+							// deviceId: this.deviceId,
 							name: this.name,
 							value: this.value,
 							price: this.price,
@@ -160,7 +177,7 @@
 					} else {
 						let data = {
 							suitId: this.suitId,
-							deviceId: this.deviceId,
+							// deviceId: this.deviceId,
 							name: this.name,
 							value: this.value,
 							price: this.price,
@@ -204,13 +221,37 @@
 	page {
 		background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
 	}
-
+    .arr_list{
+		position: absolute;
+		top: 80rpx;
+		right: -20rpx;
+		background: #FFFFFF;
+		width: 140rpx;
+		height:320rpx;
+		box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
+		padding: 5rpx 0;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		z-index: 99;
+		.arr_item:last-child{
+			border: none !important;
+		}
+		.arr_item{
+			text-align: center;
+			height: 80rpx;
+			line-height: 80rpx;
+			border-bottom:1px solid #ccc;
+		}
+	}
+	.picker{
+		margin-top: 30rpx;
+	}
 	.page {
 		width: 750rpx;
 		position: fixed;
 		top: 0;
 		left: 0;
-
+		
 		.box {
 			width: 750rpx;
 			height: 1440rpx;
diff --git a/page_fenbao/statulist/taocanlist/index.vue b/page_fenbao/statulist/taocanlist/index.vue
index c512f8f..67cd40b 100644
--- a/page_fenbao/statulist/taocanlist/index.vue
+++ b/page_fenbao/statulist/taocanlist/index.vue
@@ -1,36 +1,62 @@
 <template>
 	<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>
-			
+		<u-navbar title="套餐列表" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff"
+			title-size='36' height='42'></u-navbar>
+
 		<view class="box" v-if="loading">
-			<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in list" :key="item.suitId" @click="click(item)" @open="open" :options="options">
-				<view class="boxlist" @click="btnedit(item)">
-						<view class="toptime">
-							<text>{{item.name}}（通电时长：{{item.value}}  <text v-if="item.timeUnit == 1">日</text>  <text v-if="item.timeUnit == 2">时</text> <text v-if="item.timeUnit == 3">分钟</text> <text v-if="item.timeUnit == 4">秒</text> ）</text> <text>￥{{item.price}}</text>
+			<view class="" style="width: 100%;color: #ccc;font-weight: 600;">
+				长按拖动可更改排序
+			</view>
+			<!-- <view class="box_list" v-for="(item, index) in list" :key="index" @click="btnactive(item.suitId,index)" >
+				<view :class="['boxlist', { active: tcidlist.includes(item.suitId) }]">
+					<view :class="['toptime', { activewz: tcidlist.includes(item.suitId) }]">
+						<text>{{item.name.length > 5 ? item.name.substring(0,4) + '...' : item.name}}（通电时长：{{item.value}} <text v-if="item.timeUnit == 1">日</text> <text
+								v-if="item.timeUnit == 2">时</text> <text v-if="item.timeUnit == 3">分钟</text> <text
+								v-if="item.timeUnit == 4">秒</text> ）</text> <text>￥{{item.price}}</text>
+					</view>
+					<view class="ccc">
+						<view class="bumday" v-if="item.description == null">
+							<text class="shi"></text></text>
 						</view>
-						<view class="bumday" v-if="item.description">
-							<text class="shi">{{item.description.length > 20 ? item.description.substring(0, 20) + '...' : item.description}}</text></text>
+						<view class="bumday" v-else>
+							<text
+								:class="['shi', { activewz: tcidlist.includes(item.suitId) }]">{{item.description.length > 20 ? item.description.substring(0, 20) + '...' : item.description}}</text></text>
 						</view>
+					</view>
 				</view>
-			</u-swipe-action>
-			<view class="" v-if="list.length == 0" style="color: #ccc;font-size: 36rpx;margin-top: 200rpx;text-align: center;">
+			</view> -->
+			
+			<HM-dragSorts v-if="tcidlist.length > 0" ref="dragSorts" :list="newobj" :tcidlist="tcidlist" @update:tcidlist="handleTcidlistUpdate" :autoScroll="true" :feedbackGenerator="false" @newList="handleNewList" rowHeight='50'
+				 @change="change" @confirm="confirm" @onclick="onclick" :listBackgroundColor='F7FAFE'></HM-dragSorts>
+			
+			<view class="" v-if="list == ''"
+				style="color: #ccc;font-size: 36rpx;margin-top: 200rpx;text-align: center;">
 				该设备暂无套餐
 			</view>
-			<view class="xinz" @click="btnadd">
-				新增套餐
+			<view class="anniu">
+				<!-- <view class="xinz" @click="btnadd">
+					新建套餐
+				</view> -->
+				<view class="xinz" @click="btnqd">
+					确定
+				</view>
 			</view>
-			
 		</view>
+		
+		
 	</view>
 </template>
 
 <script>
+	import dragSorts from '@/page_fenbao/HM-dragSorts/HM-dragSorts.vue'
 	export default {
+		components: {
+			'HM-dragSorts': dragSorts
+		},
 		data() {
 			return {
-				list: [],
-				loading:false,
+				list: '',
+				loading: false,
 				disabled: false,
 				btnWidth: 180,
 				show: false,
@@ -40,58 +66,176 @@
 						backgroundColor: '#dd524d'
 					}
 				}],
-				deviceId:'',
+				deviceId: '',
 				bgc: {
 					backgroundColor: "#8883f0",
 				},
+				activeid: '',
+				checkboxes: [],
+				tcidlist: [],
+				titaoc: [],
+				newobj:[]
 			};
 		},
 		onLoad(option) {
-			console.log(option);
 			this.deviceId = option.id
+
+		},
+		created() {
+			// 初始化checkboxes数组，每个元素都设为false（表示初始时不显示复选框）  
+			this.checkboxes = new Array(this.list.length).fill(false);
 		},
 		onShow() {
+			this.tcidlist = []
 			this.getlist()
+            
 		},
 		// 分享到好友（会话）
-		  onShareAppMessage: function () {  
-		    return {  
-		      title: '创想物联',  
-		      path: '/pages/shouye/index'  
-		    }  
-		  },  
-		  
-		  // 分享到朋友圈  
-		  onShareTimeline: function () {  
-		    return {  
-		      title: '创想物联',  
-		      query: '',  
-		      path: '/pages/shouye/index'  
-		    }  
-		  },
+		onShareAppMessage: function() {
+			return {
+				title: '创想物联',
+				path: '/pages/shouye/index'
+			}
+		},
+
+		// 分享到朋友圈  
+		onShareTimeline: function() {
+			return {
+				title: '创想物联',
+				query: '',
+				path: '/pages/shouye/index'
+			}
+		},
 		methods: {
+			handleTcidlistUpdate(newTcidlist) {  
+			      // 这里是处理接收到的新 tcidlist 的地方  
+			      console.log('接收到的 tcidlist:', newTcidlist);
+					this.tcidlist = newTcidlist
+			},  
 			
-			getlist(){
-				this.$u.get(`/app/suit/listByDeviceId/${this.deviceId}`).then((res) => {
+			
+			handleNewList(newList) {
+				  let list = [this.list, ...newList];
+					 const newSortedList = list.map((item, index) => {
+					            return {
+					                storeId: item.suitId,
+					                groupSort: index + 1 // 使用索引值加 1 作为 groupSort
+					            };
+					        });
+						console.log("新的排列数据:", newSortedList);
+					setTimeout(()=> {
+						this.$u.put("/app/store/changeSort",newSortedList).then((res) => {
+								// this.$forceUpdate()
+							if (res.code == 200) {
+								// this.getgroup()
+							}
+						});
+					}, 200);
+				
+				// 在这里处理新的排列数据，可以将其存储到父组件的数据中，或者进行其他操作
+			},
+			change(){
+				
+			},
+			confirm(e) {
+				
+			},
+			onclick(e) {
+				
+			},
+			
+			
+			
+			// 查询本人套餐
+			getao() {
+				this.$u.get(`/app/suit/listByDeviceId/${this.deviceId}`).then(res => {
 					if (res.code == 200) {
-					    this.list = res.data
+						if (res.data.length > 0) {
+							this.titaoc = res.data
+							let uniqueSuitIds = new Set();  
+							this.list.forEach(item => {  
+							    if (this.titaoc.some(titaocItem => titaocItem.sourceId === item.suitId || titaocItem.suitId === item.suitId)) {  
+							        uniqueSuitIds.add(item.suitId);  
+							    }  
+							})
+							this.tcidlist = Array.from(uniqueSuitIds);  
+							let matchedItems = this.list.filter(item => uniqueSuitIds.has(item.suitId))  
+							let unmatchedItems = this.list.filter(item => !uniqueSuitIds.has(item.suitId))  
+							this.list = matchedItems.concat(unmatchedItems)
+							this.newobj = this.list
+						}
+					}
+				})
+			},
+			
+
+			btnactive(id, index) {
+				const indexInTcidList = this.tcidlist.indexOf(id);
+				if (indexInTcidList !== -1) {
+					this.tcidlist.splice(indexInTcidList, 1);
+				} else {
+					this.tcidlist.push(id);
+				}
+				// console.log(this.tcidlist);
+			},
+
+			// 点击确定
+			btnqd() {
+				this.$u.delete(`/app/suit/delByDevice/${this.deviceId}`).then(res=>{})
+				let numArr = this.tcidlist.map(item => parseInt(item, 10))
+				let data = {
+					deviceId: this.deviceId,
+					suitIds: numArr
+				}
+				this.$u.post(`/app/suit/copy`, data).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'success',
+							duration: 1000,
+						})
+						this.getao()
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 1000)
+					}
+				})
+			},
+
+			getlist() {
+				let data = {
+					pageNum: 1,
+					pageSize: 99
+				}
+				this.$u.get(`/app/suit/tempList`, data).then((res) => {
+					if (res.code == 200) {
+						this.getao()
+						this.list = res.rows
+						this.list = this.list.map(item => ({
+							...item,
+							checked: false,
+							isActive: false,
+							tcidlist:this.tcidlist
+						}))
+						// console.log(this.list); 
 						this.loading = true
 					}
 				});
 			},
-			
-			btnedit(item){
+
+			btnedit(item) {
 				uni.navigateTo({
-					url:'/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId + '&suitId=' + item.suitId
+					url: '/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId + '&suitId=' +
+						item.suitId
 				})
 			},
-			
-			click(item) { 
+
+			click(item) {
 				this.$u.delete(`/app/suit/${item.suitId}`).then((res) => {
 					if (res.code == 200) {
-					    this.$u.toast(`删除成功`);
+						this.$u.toast(`删除成功`);
 						this.getlist()
-					}else{
+					} else {
 						uni.showToast({
 							title: res.msg,
 							icon: 'none',
@@ -99,7 +243,7 @@
 						})
 					}
 				});
-				
+
 			},
 			open(index) {
 				this.list[index].show = true
@@ -107,9 +251,9 @@
 					if (index != idx) this.list[idx].show = false;
 				})
 			},
-			btnadd(){
+			btnadd() {
 				uni.navigateTo({
-					url:'/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId
+					url: '/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + ''
 				})
 			}
 		}
@@ -117,12 +261,22 @@
 </script>
 
 <style lang="scss">
-	/deep/ .u-title{
-		padding-bottom: 22rpx;
+	// /deep/ .u-title {
+	// 	padding-bottom: 22rpx;
+	// }
+
+	// /deep/ .u-icon__icon {
+	// 	padding-bottom: 22rpx;
+	// }
+	.active {
+		background-color: #8883F0 !important;
+		border-radius: 20rpx;
 	}
-	/deep/ .u-icon__icon{
-		padding-bottom: 22rpx;
+
+	.activewz {
+		color: #fff !important;
 	}
+
 	page {
 		background: #F4F5F7;
 	}
@@ -130,44 +284,74 @@
 	.page {
 		width: 750rpx;
 		padding-bottom: 400rpx;
+
 		.box {
 			width: 750rpx;
-			height: 1440rpx;
+			height: 100%;
 			background: #F4F5F7;
 			border-radius: 0rpx 0rpx 0rpx 0rpx;
 			padding: 50rpx;
-			.xinz{
-				width: 368rpx;
+
+			.box_list {
+				background-color: #fff;
+				margin-top: 20rpx;
+				border-radius: 20rpx;
+			}
+
+			.anniu {
+				position: fixed;
+				bottom: 0;
+				left: 50%;
+				transform: translateX(-50%);
+				display: flex;
+				height: 200rpx;
+				padding-top: 40rpx;
+				background-color: #fff;
+				// justify-content: space-between;
+				width: 100%;
+				padding-left: 50rpx;
+				padding-right: 50rpx;
+			}
+
+			.xinz {
+				width: 100%;
 				height: 84rpx;
 				background: #8883F0;
 				filter: blur(0px);
 				text-align: center;
 				line-height: 84rpx;
 				font-size: 36rpx;
-				color: #FFFFFF; 
-				position: fixed;
-				bottom: 76rpx;
-				left: 50%;
-				transform: translateX(-50%);
-				border-radius: 50rpx;
+				color: #FFFFFF;
+				border-radius: 18rpx;
 			}
-            .boxlist{
+
+			.boxlist {
 				padding: 40rpx 42rpx;
 				box-sizing: border-box;
-				.toptime{
+
+				.ccc {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+				}
+
+				.toptime {
 					font-size: 32rpx;
 					color: #000000;
 					display: flex;
 					justify-content: space-between;
 				}
-				.bumday{
+
+				.bumday {
 					margin-top: 10rpx;
-					text{
+
+					text {
 						font-size: 32rpx;
 						color: #95989D;
 					}
 				}
 			}
+
 			/deep/ .u-swipe-action {
 				margin-top: 30rpx;
 				border-radius: 20rpx;
diff --git a/page_user/fenzu.vue b/page_user/fenzu.vue
index 14c224d..8e273f7 100644
--- a/page_user/fenzu.vue
+++ b/page_user/fenzu.vue
@@ -162,6 +162,7 @@
 					// console.log(this.groupList)
 					this.firstlist=	this.groupList[0]
 					  this.newobj = this.groupList.slice(1)
+					  console.log(this.newobj,'2121212121');
 					  // this.newobj = this.groupList
 					  this.remake=''
 					  this.price=''
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 2cf10f0..73ccaca 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -303,7 +303,7 @@
 				'isStart': false
 			});
 			wx.closeBLEConnection({
-				deviceId: this.objlist.deviceId,
+				deviceId: this.deviceId,
 			})
 		},
 		onHide() {
@@ -312,7 +312,7 @@
 				'isStart': false
 			});
 			wx.closeBLEConnection({
-				deviceId: this.objlist.deviceId,
+				deviceId: this.deviceId,
 			})
 		},
 		onBeforeUnmount() {
@@ -321,7 +321,7 @@
 				'isStart': false
 			});
 			wx.closeBLEConnection({
-				deviceId: this.objlist.deviceId,
+				deviceId: this.deviceId,
 			})
 		},
 		methods: {
diff --git a/page_user/setting.vue b/page_user/setting.vue
index 7fd5da2..a0366ca 100644
--- a/page_user/setting.vue
+++ b/page_user/setting.vue
@@ -27,7 +27,7 @@
 			</view>
 			<view class="li" @click.stop="sremakes()">
 				<view class="tit">
-					店铺名称
+					所属店铺
 				</view>
 				<view class="info">
 					<view class="txt">
@@ -68,7 +68,7 @@
 				</view>
 			</view>
 			
-			<view class="li" style="padding-left: 40%;font-size: 32rpx;" @click="deldevice()">
+			<view class="lis" @click="deldevice()">
 						解除绑定
 			</view>
 		
@@ -470,7 +470,20 @@
 	page {
 		background-color: #F7FAFE;
 	}
-
+    .lis{
+		position: fixed;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 230rpx;
+		width: 632rpx;
+		height: 90rpx;
+		background-color: red;
+		text-align: center;
+		line-height: 90rpx;
+		font-size: 36rpx;
+		color: #fff;
+		border-radius: 50rpx;
+	}
 	.page {
 		width: 750rpx;
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3f877f2..a4b0508 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,8 +1,13 @@
 <template>
 	<view class="page">
-		<u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#fff' 
+		<!-- <u-navbar :is-back="true" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#fff' @custom-back="btncustom" back-icon-color="#fff"
 			title-size='44' height='50' id="navbar">
-		</u-navbar>
+		</u-navbar> -->
+		<view class="title">
+			<image src="https://api.ccttiot.com/smartmeter/img/static/uyr6T0Vfkefty2blkDmU" mode="" style="width: 52rpx;height: 52rpx;margin-right: 10rpx;vertical-align: bottom;vertical-align: bottom;" @click="btnshouye"></image>
+		    <text>商户中心</text>
+		</view>
+		
 		<u-mask :show="showtip" @click="show = false" :z-index='1000' />
 		<view class="tip_box" v-if="showtip">
 			<view class="top">
@@ -88,7 +93,7 @@
 									<view class="card_left_tit" @click="todetail(item.deviceId)">
 										{{item.deviceName}}
 									</view>
-									<view class="card_left_sta">
+									<view class="card_left_sta" @click="todetail(item.deviceId)">
 										<image src="https://api.ccttiot.com/smartmeter/img/static/uZSiz7XWpxcXEkl6sTwj"
 											mode=""></image>
 										<view class="sta_txt" v-if="item.status==3">
@@ -276,6 +281,7 @@
 		    }  
 		  },
 		methods: {
+			
 			// 获取店铺
 			sremakes(item) {
 				this.id = item.deviceId
@@ -820,6 +826,12 @@
 				this.pagenum = 1
 				this.curtitidx = index
 			},
+			// 点击导航栏回到首页
+			btnshouye(){
+				uni.reLaunch({
+					url:'/pages/shouye/index'
+				})
+			},
 
 			toydfx() {
 				uni.navigateTo({
@@ -848,6 +860,18 @@
 </script>
 
 <style lang="scss">
+	.title {
+		padding-left: 32rpx;
+		font-size: 40rpx;
+		color: #fff;
+		margin-bottom: 30rpx;
+		padding-top: 110rpx;
+		height: 200rpx;
+		background-color: #8883F0;
+		text{
+			padding-left: 28%;
+		}
+	}
 	/deep/ .u-title {
 		padding-bottom: 22rpx;
 	}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 063c5f4..ad77bcb 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -11,31 +11,41 @@
 			欢迎来到共享开关
 		</view>
 		<view class="inputbox">
-			<!-- 在这里放置你的输入框 -->
-			<!-- <view class="box1" v-if="chooseType">
-				<view class="input_txt">
-					首次使用请选择您的身份
-				</view>
-				<div class="button" style="margin-top: 162rpx;" @click="userType(1)">
-					我是商家
-				</div>
-				<div class="button"  @click="userType(2)">
-					我是用户
-				</div>
-			</view> -->
-			<view class="box1">
+			<view class="box1" v-if="!dlflag">
 				<view class="input_txt" style="width: 536rpx;font-size: 24rpx;line-height: 32rpx;">
 					您暂未授权共享开关小程序获取你的信息，将无法正常使用小程序的功能。如需要正常使用请点击“授权”按钮，打开头像，昵称等信息的授权。
 				</view>
-
 				<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
-					style="margin-top: 280rpx;margin-left: -10rpx;">
+					style="margin-left: -10rpx;">
 					授权登录
 				</button>
-				<button class="button" style="margin-top: 50rpx;margin-left: -10rpx;" @click="btnbudl">
-					暂不授权登录
-				</button>
+				<view class="">
+					<view class="buttons" style="margin-top: 50rpx;margin-left: -10rpx;" @click="btnshoudong">
+						—— 账号密码登录 ——
+					</view>
+					<view class="buttons" style="margin-top: 50rpx;margin-left: -10rpx;" @click="btnbudl">
+						—— 暂不授权登录 ——
+					</view>
+				</view>
 			</view> 
+			
+			<!-- 账号密码登录 -->
+			<view class="zhangh" v-if="dlflag">
+				<view class="tit">
+					账号密码登录
+				</view>
+				<input type="text" v-model="zh" placeholder="请输入你的账号" />
+				<input type="text" v-model="mm"  placeholder="请输入你的密码" />
+				<view class="mmdl" @click="btndl">
+					登录
+				</view>
+				<view class="mmdl" @click="dlflag = false" style="background-color: #fff;border: 1px solid #efefef;color: #000;margin-top: 20rpx;">
+					取消
+				</view>
+			</view>
+			
+			
+			
 		</view>
 	</view>
 </template>
@@ -51,7 +61,10 @@
 				chooseType: true,
 				usertype: '',
 				login: false,
-				id:''
+				id:'',
+				dlflag:false,
+				zh:'',
+				mm:''
 			}
 		},
 		onLoad(option) {
@@ -76,6 +89,29 @@
 		    }  
 		  },
 		methods: {
+			// 账号密码登录
+			btndl(){
+				let data = {
+					username:this.zh,
+					password:this.mm
+				}
+				this.$u.post("/app/auth/login", data).then(res => {
+					if(res.code == 200){
+						wx.setStorageSync('token', res.token);
+						this.ceshi()
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000,
+						})
+					}
+				})
+			},
+			
+			btnshoudong(){
+				this.dlflag = true
+			},
 			userType(num) {
 				this.chooseType = false
 				this.login = true
@@ -142,7 +178,44 @@
 	page {
 		background: #FFFFFF;
 	}
-
+	.zhangh{
+		width: 562rpx;
+		text-align: center;
+		.tit{
+			font-size: 40rpx;
+			color: #000;
+			margin-bottom: 30rpx;
+		}
+		input{
+			width: 562rpx;
+			height: 90rpx;
+			margin-top: 20rpx;
+			border-radius: 20rpx;
+			background-color: #eeefee;
+			text-align: center;
+			padding-left: 30rpx;
+			box-sizing: border-box;
+			text-align: left;
+		}
+		.mmdl{
+			width: 562rpx;
+			height: 96rpx;
+			background: #8883F0;
+			border-radius: 52rpx 52rpx 52rpx 52rpx;
+			font-weight: 500;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			line-height: 96rpx;
+			margin-top: 50rpx;
+		}
+	}
+    .buttons{
+		width: 562rpx;
+		text-align: center;
+		padding-bottom: 5rpx;
+		box-sizing: border-box;
+		color: #ccc;
+	}
 	.page {
 		position: relative;
 		/* 添加相对定位 */
diff --git a/pages/my.vue b/pages/my.vue
index 59aa2c3..83a49a1 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -79,14 +79,18 @@
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uCtxeWyTyH2DHQZaRv5Q" mode=""></image>
 					<view class="txt">秘钥管理</view>
 				</view>
+				<view class="botcard" @click="btnguanli">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/umjPUc8nDKf1JwVqRAeb" mode=""></image>
+					<view class="txt">套餐管理</view>
+				</view>
 				<view class="botcard" @click="topage(5)">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uYWpW30vIQ6M4svb7Vnb"></image>
 					<view class="txt">设置</view>
 				</view>
 				
-				<view class="botcard" style="padding-left: 220rpx;font-size: 40rpx;font-weight: 600;" @click="btntc">
+				<!-- <view class="botcard" style="padding-left: 220rpx;font-size: 40rpx;font-weight: 600;" @click="btntc">
 					切换用户端
-				</view>
+				</view> -->
 			</view>
 		</view>
 		
@@ -131,6 +135,11 @@
 		    }  
 		  },
 		methods: {
+			btnguanli(){
+				uni.navigateTo({
+					url:'/page_components/newtaocan'
+				})
+			},
 			btnmy(){
 				uni.navigateTo({
 					url:'/page_components/miyao'
@@ -241,7 +250,7 @@
 	}
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 page{
 	background-color: #F7FAFE;
 }
@@ -331,7 +340,7 @@ page{
 		.top_box{
 			padding-top: 40rpx;
 			width: 750rpx;
-			height: 458rpx;
+			height: 360rpx;
 			background-color: #8883F0;
 			.userinfo{
 				margin-left: 56rpx;
@@ -357,7 +366,7 @@ page{
 					}
 					.num{
 						margin-top: 20rpx;
-						font-size: 28rpx;
+						font-size: 30rpx;
 						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
 						font-weight: 400;
 						color: #ABA8F4;
@@ -374,7 +383,7 @@ page{
 				color: #FFFFFF;
 			}
 			.cont_box{
-				margin-top: 58rpx;
+				margin-top: 30rpx;
 				display: flex;
 				flex-wrap: nowrap;
 				align-items: center;
@@ -395,7 +404,7 @@ page{
 					}
 					.bot{
 						margin-top: 20rpx;
-						font-size: 22rpx;
+						font-size: 26rpx;
 						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
 						font-weight: 400;
 						color: #FFFFFF;
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 7748340..97335b7 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -2,7 +2,7 @@
 	<view class="page">
 		<!-- 用户首页显示 -->
 		<view class="useryonghu">
-			<u-navbar :is-back="false" title="创想物联" :border-bottom="false" :background="bgc" title-color='#fff'
+			<u-navbar :is-back="false" title="创想物联" :border-bottom="false" :background="bgc" title-color='#fff' 
 				title-size='44' height='50'></u-navbar>
 			<view class="ditu">
 				<view class="dtxs">