diff --git a/page_components/bindsz.vue b/page_components/bindsz.vue
index ffe5f45..8fb44b1 100644
--- a/page_components/bindsz.vue
+++ b/page_components/bindsz.vue
@@ -75,7 +75,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="li" @click.stop="sremakes()" v-if="isMch">
+			<view class="li" @click.stop="sremakes">
 				<view class="tit">
 					归属店铺
 				</view>
@@ -292,13 +292,13 @@
 			this.id = id
 			this.getDevice(id)
 			
-			this.gettanc()
 		},
 		onShow() {
 			this.setMode == null
 			this.taocan = ''
 			this.getQiniuToken()
 			this.getgroup()
+			this.gettanc()
 			this.getlistobj(this.id)
 			this.getuserinfo()
 			this.getao()
diff --git a/page_fenbao/statulist/merchant/index.vue b/page_fenbao/statulist/merchant/index.vue
index 45b716d..26e69b1 100644
--- a/page_fenbao/statulist/merchant/index.vue
+++ b/page_fenbao/statulist/merchant/index.vue
@@ -23,9 +23,9 @@
 			<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 class="" style="width: 100%;color: red;font-size: 28rpx;margin-top: 20rpx;">
 				审核通过后，即可创建店铺，店铺中的设备可在地图中被发现！
-			</view>
+			</view> -->
 			<view class="tijiao" v-if="tjflag" @click="btnshenq"> 
 				提交申请
 			</view>
diff --git a/page_fenbao/statulist/myshop/editshop/index.vue b/page_fenbao/statulist/myshop/editshop/index.vue
index 2f37dd8..01de4c8 100644
--- a/page_fenbao/statulist/myshop/editshop/index.vue
+++ b/page_fenbao/statulist/myshop/editshop/index.vue
@@ -77,7 +77,7 @@
 					</view>
 				</view>
 				<view class="baocun" @click="btncreat">
-					确定修改
+					提交修改
 				</view>
 			</view>
 
@@ -341,7 +341,7 @@
 							this.btnmsk = false
 						} else {
 							uni.showToast({
-								title: '修改成功',
+								title: '提交修改成功',
 								icon: 'success',
 								duration: 1000
 							})
diff --git a/page_fenbao/statulist/myshop/index.vue b/page_fenbao/statulist/myshop/index.vue
index f08df22..3d97c1d 100644
--- a/page_fenbao/statulist/myshop/index.vue
+++ b/page_fenbao/statulist/myshop/index.vue
@@ -34,6 +34,9 @@
 					</view>
 					<view class="gzlist">
 						<view class="jfgz">
+							<text>审核状态：</text> {{item.status == 1 ? '正常' : '审核中'}}
+						</view>
+						<view class="jfgz" style="margin-top: 16rpx;">
 							<text>绑定人员：</text>{{item.contactName}}
 						</view>
 						<view class="phone">
@@ -215,7 +218,7 @@
 					padding: 12rpx 38rpx;
 					box-sizing: border-box;
 					width: 680rpx;
-					height: 430rpx;
+					height: 490rpx;
 					background: #FFFFFF;
 					border-radius: 38rpx 38rpx 38rpx 38rpx;
 					margin: auto;
diff --git a/page_fenbao/statulist/myshop/shebeilist/index.vue b/page_fenbao/statulist/myshop/shebeilist/index.vue
index c85b026..81e090d 100644
--- a/page_fenbao/statulist/myshop/shebeilist/index.vue
+++ b/page_fenbao/statulist/myshop/shebeilist/index.vue
@@ -16,7 +16,7 @@
 										<view class="card_left_sta">
 											<image
 												src="https://api.ccttiot.com/smartmeter/img/static/uZSiz7XWpxcXEkl6sTwj"
-												mode=""></image>
+												mode="aspectFit"></image>
 											<view class="sta_txt" v-if="item.status==3">
 												维修中
 											</view>
@@ -169,7 +169,7 @@
 							display: flex;
 							margin-top: 20rpx;
 							width: 658rpx;
-							height: 282rpx;
+							height: 250rpx;
 							background: #fff;
 							box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(255, 255, 255, 0);
 							border-radius: 24rpx 24rpx 24rpx 24rpx;
@@ -224,7 +224,7 @@
 
 								image {
 									width: 180rpx;
-									height: 200rpx;
+									height: 180rpx;
 									border-radius: 20rpx;
 								}
 							}
diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue
index 1b8f3d3..b5b71f9 100644
--- a/page_fenbao/statulist/myshop/shopdetail/index.vue
+++ b/page_fenbao/statulist/myshop/shopdetail/index.vue
@@ -24,6 +24,14 @@
 					<text class="qian">创建时间：</text> <text class="shen">{{listobj.createTime}}</text>
 				</view>
 			</view>
+			<view class="editxg" @click="btnsh" v-if="listobj.status == 2">
+				<view class="">
+					审核中
+				</view>
+				<view class="">
+					<u-icon name="arrow-right" color="#000" size="28"></u-icon>
+				</view>
+			</view>
 			<view class="icons">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uDNcSwmkeciv4fHv4JdJ" mode=""
 					@click="show = true"></image>
@@ -124,6 +132,11 @@
 		    }  
 		  },
 		methods: {
+			btnsh(){
+				uni.navigateTo({
+					url:'/page_fenbao/editshenhe?obj=' + JSON.stringify(this.listobj)
+				})
+			},
 			getdetail() {
 				this.$u.get("/app/store/mch/" + this.storeId).then(res => {
 					if (res.code == 200) {
@@ -138,9 +151,17 @@
 						url: '/page_fenbao/statulist/myshop/shebeilist/index?storeId=' + this.storeId
 					})
 				} else if (num == 2) {
-					uni.navigateTo({
-						url: '/page_fenbao/statulist/myshop/editshop/index?obj=' + JSON.stringify(this.listobj)
-					})
+					if(this.listobj.status == 2){
+						uni.showToast({
+							title: '已有未审核店铺信息',
+							icon: 'none',
+							duration: 1000
+						})
+					}else{
+						uni.navigateTo({
+							url: '/page_fenbao/statulist/myshop/editshop/index?obj=' + JSON.stringify(this.listobj)
+						})
+					}
 				} else if (num == 3) {
 					let vm = this
 					uni.showModal({
@@ -173,7 +194,7 @@
 								console.log('用户点击了取消');
 							}
 						}
-					});
+					})
 				}
 			},
 
@@ -449,7 +470,18 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-
+         .editxg{
+			 width: 100%;
+			 height: 90rpx;
+			 line-height: 90rpx;
+			 display: flex;
+			 justify-content: space-between;
+			 padding: 0 30rpx;
+			 box-sizing: border-box;
+			 background-color: #fff;
+			 border-radius: 20rpx;
+			 margin-top: 20rpx;
+		 }
 		.box {
 			width: 750rpx;
 			height: 1440rpx;
diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue
index 211876f..db52cdc 100644
--- a/page_fenbao/statulist/myshop/shopxx/index.vue
+++ b/page_fenbao/statulist/myshop/shopxx/index.vue
@@ -80,7 +80,7 @@
 					</view>
 				</view>
 				<view class="baocun" @click="btncreat">
-					创建
+					提交创建
 				</view>
 			</view>
 
diff --git a/page_fenbao/statulist/taocanlist/index.vue b/page_fenbao/statulist/taocanlist/index.vue
index ca00a8b..587eb76 100644
--- a/page_fenbao/statulist/taocanlist/index.vue
+++ b/page_fenbao/statulist/taocanlist/index.vue
@@ -31,9 +31,9 @@
 				@newList="handleNewList" rowHeight='50' @change="change" @confirm="confirm" @onclick="onclick"
 				:listBackgroundColor='F7FAFE'></HM-dragSorts>
 
-			<view class="" v-if="list == ''"
+			<view class="" v-if="newobj == ''"
 				style="color: #ccc;font-size: 36rpx;margin-top: 200rpx;text-align: center;">
-				该设备暂无套餐
+				  暂无可用套餐
 			</view>
 			<view class="anniu">
 				<!-- <view class="xinz" @click="btnadd">
@@ -166,6 +166,21 @@
 								this.newobj = this.list
 						}else{
 							this.newobj = this.list
+							if(this.newobj.length == 0){
+								uni.showModal({
+									title: '提示',
+									content: '未存有套餐，是否去新建？',
+									success: function(res) {
+										if (res.confirm) {
+											uni.navigateTo({
+												url:'/page_fenbao/statulist/taocanlist/addtaocan/index'
+											})
+										} else if (res.cancel) {
+											
+										}
+									}
+								})
+							}
 							this.tcidlist = []
 						}
 					}
diff --git a/page_user/HM-dragSorts/HM-dragSorts.vue b/page_user/HM-dragSorts/HM-dragSorts.vue
index 8fca365..4b5adad 100644
--- a/page_user/HM-dragSorts/HM-dragSorts.vue
+++ b/page_user/HM-dragSorts/HM-dragSorts.vue
@@ -764,7 +764,7 @@
 		display: flex;
 		flex-direction: column;
 		position: relative;
-		overflow: hidden;
+		// overflow: hidden; 
 
 		.scroll-view {
 			box-sizing: border-box;
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 34f54c9..4567f05 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -506,8 +506,8 @@
 							let expireDateParts = expireTimeParts[0].split("-");
 							let expireTimePartsTime = expireTimeParts[1].split(":");
 							let expireDate = new Date(expireDateParts[0], expireDateParts[1] - 1, expireDateParts[2],expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2])
-							let now = new Date();
-							let differenceInMs = expireDate - now;
+							let now = new Date()
+							let differenceInMs = expireDate - now
 							if (differenceInMs <= 0) {
 								this.timeday = 0
 							} else {
diff --git a/page_user/upload.vue b/page_user/upload.vue
index a4870cf..66007b0 100644
--- a/page_user/upload.vue
+++ b/page_user/upload.vue
@@ -103,7 +103,7 @@
 			},
 		}
 	}
-</script>
+</script>																				
 
 <style>
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index dd1f9b9..5451205 100644
--- a/pages.json
+++ b/pages.json
@@ -263,6 +263,16 @@
 						"navigationBarTextStyle": "#FFFFFF",
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "editshenhe",
+					"style": {
+						"navigationBarTitleText": "添加设备",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#3996FD",
+						"navigationBarTextStyle": "#FFFFFF",
+						"navigationStyle": "custom"
+					}
 				},{
 					"path": "webview",
 					"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5de7572..a5e131d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -407,19 +407,7 @@
 
 			// 获取店铺
 			sremakes(item) {
-				if(this.isMch == false){
-					uni.showModal({
-						title: '提示',
-						content: '您未申请商家合作，是否申请？',
-						success: function(res) {
-							if (res.confirm) {
-                                uni.navigateTo({
-                                	url:'/page_fenbao/statulist/merchant/index'
-                                })
-							} 
-						}
-					})
-				}else if(this.shoplist.length == 0){
+                if(this.shoplist.length == 0){
                      uni.showModal({
                      	title: '提示',
                      	content: '未创建店铺，是否去创建店铺？',
diff --git a/pages/my.vue b/pages/my.vue
index 5e56321..b40e53b 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -56,14 +56,11 @@
 				</view>
 			</view>
 			<view class="bot_box">
-				<view class="botcard" @click="topage(0)" v-if="userinfo.isMch">
+				<view class="botcard" @click="topage(0)">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uATEvHAKIB0tdXk0embn" mode=""></image>
 					<view class="txt">我的店铺</view>
 				</view>
-				<view class="botcard" @click="topage(9)" v-else>
-					<image src="https://api.ccttiot.com/smartmeter/img/static/uYOquvGtfb1sm5F60NgJ" 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>
@@ -76,10 +73,14 @@
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uKewAY8xvJN04yFpGEjl" mode=""></image>
 					<view class="txt">设备故障</view>
 				</view>
-				<view class="botcard" @click="topage(2)">
+				<view class="botcard" @click="topage(9)">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uYOquvGtfb1sm5F60NgJ" mode=""></image>
+					<view class="txt">商家合作</view>
+				</view> 
+				<!-- <view class="botcard" @click="topage(2)">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/u6qVTFXdkQKEqE1y0J4o" mode=""></image>
 					<view class="txt">常见问题</view>
-				</view>
+				</view> -->
 				<view class="botcard" @click="topage(3)">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uGlrjkSOTDXMFuuRb03l" mode=""></image>
 					<view class="txt">意见反馈</view>
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 8335f59..ba0c31c 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -53,11 +53,11 @@
 							style="width: 96rpx;height:94rpx;"></image>
 						<!-- 附近门店 -->
 					</view>
-					<view class="gr" @click="btnindex(4)" v-if="isMch == false && deviceCount == 0">
+					<!-- <view class="gr" @click="btnindex(4)" v-if="isMch == false && deviceCount == 0">
 						<image src="https://api.ccttiot.com/smartmeter/img/static/uBN46m7mPVlbbPth80FC" mode=""
 							style="width: 96rpx;height:94rpx;"></image>
-					</view>
-					<view class="gr" @click="btnindex(6)" v-else>
+					</view> -->
+					<view class="gr" @click="btnindex(6)">
 						<image src="https://api.ccttiot.com/smartmeter/img/static/u3NDAI21OIGQH0Exdmdd" mode=""
 							style="width: 96rpx;height:94rpx;"></image>
 					</view>