diff --git a/page_moban/hehuorenadd.vue b/page_moban/hehuorenadd.vue
index cc53d30..d4a59c2 100644
--- a/page_moban/hehuorenadd.vue
+++ b/page_moban/hehuorenadd.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { number } from 'echarts'
+// import { number } from 'echarts'
 
 	export default {
 		data() {
diff --git a/page_shanghu/editsheshi.vue b/page_shanghu/editsheshi.vue
index 2058c8d..72048af 100644
--- a/page_shanghu/editsheshi.vue
+++ b/page_shanghu/editsheshi.vue
@@ -229,7 +229,7 @@
 					let data = {
 						ruleId:this.ruleId,
 						mode:this.type,
-						hours:1,
+						hours:this.huor,
 						price:this.price,
 						minHours:this.mintime,
 						explain:this.explain,
@@ -348,6 +348,9 @@
 			padding-bottom: 30rpx;
 			box-sizing: border-box;
 			margin-top: 30rpx;
+			input{
+				width: 85%;
+			}
 		}
 		.del{
 			position: absolute;
diff --git a/page_shanghu/erwm.vue b/page_shanghu/erwm.vue
index 620c67d..bf19efb 100644
--- a/page_shanghu/erwm.vue
+++ b/page_shanghu/erwm.vue
@@ -39,13 +39,13 @@
 		onLoad(option) {
 		    if(option.roomId){ //房间and大厅
 			   this.roomId = option.roomId
-			   this.https = 'https://testcha.chuangtewl.com?roomCode=' + this.roomId
+			   this.https = 'https://testcha.chuangtewl.com?f=' + this.roomId
 			}else if(option.storeId){ //大门-店铺
 				this.storeId = option.storeId
-				this.https = 'https://testcha.chuangtewl.com?storeCode=' + this.storeId
+				this.https = 'https://testcha.chuangtewl.com?d=' + this.storeId
 			}else if(option.toiletId){ //厕所
 				this.toiletId = option.toiletId
-				this.https = 'https://testcha.chuangtewl.com?toiletId=' + this.toiletId
+				this.https = 'https://testcha.chuangtewl.com?w=' + this.toiletId
 			}
 		   console.log(option)
            this.qrFun()
diff --git a/page_shanghu/index.vue b/page_shanghu/index.vue
index 7159a92..efdbaf6 100644
--- a/page_shanghu/index.vue
+++ b/page_shanghu/index.vue
@@ -324,7 +324,7 @@
 			}
 		}
 		width: 680rpx;
-		height: 1260rpx;
+		max-height: 1260rpx;
 		background: #FFFFFF;
 		box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(72,137,59,0.1);
 		border-radius: 24rpx 24rpx 24rpx 24rpx;
diff --git a/page_shanghu/pricemoben.vue b/page_shanghu/pricemoben.vue
index 5382df9..25567ee 100644
--- a/page_shanghu/pricemoben.vue
+++ b/page_shanghu/pricemoben.vue
@@ -7,6 +7,9 @@
 			<view class="tishi" style="margin-top: 0;">
 				 押金收费
 			</view>
+			<view class="wz">
+				注：押金套餐订单提前结束、押金剩多少退还多少
+			</view>
 			<view class="" v-for="(item,index) in tclist" :key="index" @click="btnedit(item,1)">
 				<view class="item_list" v-if="item.mode == 1">
 					<view class="shoufei">
@@ -29,7 +32,7 @@
 				 套餐收费
 			</view>
 			<view class="wz">
-				注：订单提前结束剩余消费时长、金额不返还
+				注：套餐订单提前结束剩余消费时长、金额不返还
 			</view>
 			<view class="item_list" v-for="(item,index) in modelist" :key="index" @click="btnedit(item,2)">
 				<view class="shoufei">
diff --git a/page_user/dingdanxq.vue b/page_user/dingdanxq.vue
index d78878e..c7fba6e 100644
--- a/page_user/dingdanxq.vue
+++ b/page_user/dingdanxq.vue
@@ -232,7 +232,7 @@
 			},
 			// 点击开店门
 			btnkdm(){
-				if(this.orderobj.userId != this.user.userId){
+				if(this.orderobj.userId == this.user.userId){
 					this.$u.get(`app/store/openGate/${this.orderobj.storeId}`).then(res => {
 						if (res.code == 200) {
 							uni.showToast({
@@ -249,7 +249,10 @@
 						}
 					})
 				}else{
-				   this.$u.get(`app/store/openGate/${this.orderobj.storeId}&isVerify=false`).then(res => {
+					let data = {
+						isVerify:false
+					}
+				   this.$u.get(`app/store/openGate/${this.orderobj.storeId}`,data).then(res => {
 				   	if (res.code == 200) {
 				   		uni.showToast({
 				   		  title: '开启店门成功',
diff --git a/page_user/lurukz.vue b/page_user/lurukz.vue
index c9f99ed..c4a20fb 100644
--- a/page_user/lurukz.vue
+++ b/page_user/lurukz.vue
@@ -15,8 +15,6 @@
 			</view>
 			<input type="text" class="ips" v-model="storeId" placeholder="请扫描设备上的二维码" style="margin-left: 32rpx;"
 				placeholder-class="my-placeholder"/>
-			<!-- <input type="text" class="ips" v-model="storeIds" v-if="storeIds" placeholder="请扫描设备上的二维码" style="margin-left: 32rpx;"
-				placeholder-class="my-placeholder" /> -->
 		</view>
 		<view class="machao">
 			MAC号：{{obj.mac == undefined ? '--' : obj.mac}}
@@ -25,7 +23,7 @@
 			电压：{{obj.voltage == undefined ? '--' : obj.voltage}}V
 		</view>
 		<view class="machao">
-			功率：{{obj.realTimePower == undefined ? '--' : obj.realTimePower}}KW
+			功率：{{obj.realTimePower == undefined ? '--' : obj.realTimePower}}W
 		</view>
 		<view class="machao">
 			电流：{{obj.electricity == undefined ? '--' : obj.electricity}}A
@@ -41,10 +39,14 @@
 		<view class="machao">
 			版本号：{{obj.version == undefined ? '--' : obj.version}}
 		</view>
+		<view class="machao">
+			最后更新时间：{{obj.lastPullTime == undefined ? '--' : obj.lastPullTime}}
+		</view>
 		<view class="machao">
 			最后在线时间：{{obj.lastOnlineTime == undefined ? '--' : obj.lastOnlineTime}}
 		</view>
 		
+		
 		<view class="jiaozhun">
 			<view class="input">
 				<button @click="btnjian">-</button>
@@ -57,6 +59,17 @@
 		</view>
 
 		<view class="list">
+			<view class="anniulist">
+				<view class="anniu" @click="btnkaim">
+					开门
+				</view>
+				<view class="anniu" @click="btncq">
+					重启
+				</view>
+				<view class="anniu" @click="btnsxs">
+					刷新
+				</view>
+			</view>
 			<view class="anniulist">
 				<view class="anniu" @click="btnkq">
 					开启
@@ -65,7 +78,7 @@
 					关闭
 				</view>
 				<view class="anniu" @click="btnsx">
-					刷新
+					同步
 				</view>
 			</view>
 			<view class="fanhui" @click="btnfh">
@@ -116,16 +129,93 @@
 			}
 		},
 		methods: {
+			// 点击开门
+			btnkaim(){
+				this.$u.put(`/app/device/admin/openDoor?sn=${this.storeId}`).then(res =>{
+					if(res.code == 200){
+						uni.showToast({
+							title: '开门成功',
+							icon: 'success',
+							duration:2000
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration:2000
+						})
+					}
+				})
+			},
+			// 点击重启
+			btncq(){
+			    this.$u.put(`/app/device/admin/reboot?sn=${this.storeId}`).then(res =>{
+					if(res.code == 200){
+						uni.showToast({
+							title: '重启成功',
+							icon: 'success',
+							duration:2000
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration:2000
+						})
+					}
+				})
+			},
+			// 点击刷新
+			btnsxs(){
+				this.$u.put(`/app/device/admin/uploadData?sn=${this.storeId}`).then(res =>{
+					if(res.code == 200){
+						console.log(res.data.vxs);
+						this.obj = res.data
+						this.id = res.data.deviceId
+						if(res.data.vxs == null || res.data.vxs == 0){
+							this.xshu = 1
+						}else{
+							this.xshu = res.data.vxs
+						}
+						if (res.data.onlineStatus == 0) {
+							this.onlineStatus = '离线'
+						} else if (res.data.onlineStatus == 1) { 
+							this.onlineStatus = '在线'
+						}
+						if (res.data.powerStatus == 0) {
+							this.powerStatus = '关闭'
+						} else if (res.data.powerStatus == 1) {
+							this.powerStatus = '开启'
+						}
+						uni.showToast({
+							title: res.msg,
+							icon: 'success',
+							duration: 2000,
+						})
+						uni.hideLoading()
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration:2000
+						})
+					}
+				})
+			},
+			// 点击减电压
 			btnjian(){
 				this.valuedian = Number(this.valuedian) - 1
 			},
+			// 点击加电压
 			btnadd(){
 				this.valuedian = Number(this.valuedian) + 1
 			},
+			// 点击校准电压
 			btnjiaozhun(){
+				console.log(this.valuedian,this.obj.voltage,this.xshu );
 				this.x = this.valuedian / this.obj.voltage * this.xshu 
-				this.x = this.x.toFixed(3)
 				console.log(this.x)
+				this.x = this.x.toFixed(3)
 				this.$u.put(`/app/device/admin/${this.obj.deviceId}/vxs?vxs=${this.x}`).then(res => {
 					if(res.code == 200){
 						uni.showToast({
@@ -142,12 +232,13 @@
 					}
 				})
 			},
-			
+			// 点击返回录入页
 			btnmy() {
 				uni.reLaunch({
-					url: '/page_user/luru'
+					url: '/page_shanghu/index'
 				})
 			},
+			// 点击扫码
 			qrcode() {
 				uni.scanCode({
 					onlyFromCamera: true,
@@ -160,7 +251,7 @@
 						}
 						let sceneValue = res.result
 						let decodedValue = decodeURIComponent(sceneValue)
-						let id = getQueryParam(decodedValue, 'sn')
+						let id = getQueryParam(decodedValue, 's')
 						this.storeId = id
 						this.getsn()
 					},
@@ -173,13 +264,13 @@
 					}
 				})
 			},
-
+            // 请求设备详情
 			getsn() {
 					this.$u.get(`/app/device/admin/get?sn=${this.storeId}`).then(res => {
 						if (res.code == 200) {
 							this.obj = res.data
 							this.id = res.data.deviceId
-							if(res.data.vxs == null){
+							if(res.data.vxs == null || res.data.vxs == 0){
 								this.xshu = 1
 							}else{
 								this.xshu = res.data.vxs
@@ -224,9 +315,6 @@
 				})
 				this.$u.put(`/app/device/admin/${this.id}/switch?open=true`).then((res) => {
 					if (res.code == 200) {
-						// setTimeout(()=>{
-						// 	this.btnsx()
-						// },1000)
 						uni.showToast({
 							title: '开启成功',
 							icon: 'success',
@@ -267,20 +355,19 @@
 					}
 				})
 			},
-			// 刷新
+			// 同步
 			btnsx() {
-
-				this.$u.get(`/app/device/v2/refreshIot?deviceNo=${this.storeId}`).then((res) => {
+				this.$u.get(`/app/device/v2/refreshIot?sn=${this.storeId}`).then((res) => {
 					if (res.code == 200) {
 						this.getsn()
 						uni.showToast({
-							title: '刷新成功',
+							title: '同步成功',
 							icon: 'success',
 							duration: 2000
 						})
 					} else {
 						uni.showToast({
-							title: '刷新失败',
+							title: '同步失败',
 							icon: 'none',
 							duration: 2000
 						})
@@ -338,13 +425,12 @@
 		.anniulist {
 			width: 658rpx;
 			margin: auto;
-			margin-top: 200rpx;
+			margin-top: 20rpx;
 			text-align: left;
 			font-size: 32rpx;
 			display: flex;
-			justify-content: space-between;
-
 			.anniu {
+				margin-right: 20rpx;
 				width: 30%;
 				height: 90rpx;
 				border-radius: 20rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f95a5b7..bd98402 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -270,8 +270,8 @@
 			        return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null;
 			    }
 			    // 判断是 storeCode 还是 roomCode
-			    let storeCode = getQueryParam(decodedValue, 'storeCode');
-			    let roomCode = getQueryParam(decodedValue, 'roomCode');
+			    let storeCode = getQueryParam(decodedValue, 'd');
+			    let roomCode = getQueryParam(decodedValue, 'f');
 			    if (storeCode) {
 					this.$u.get(`app/getId?storeCode=${storeCode}`).then(resp =>{
 						if(resp.code == 200){
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index 14f6343..eef28ab 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -2,43 +2,46 @@
 	<view class="page">
 		<u-navbar :is-back="false" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
 			height='8'></u-navbar>
-			<image src="https://api.ccttiot.com/smartmeter/img/static/u3lZnmhqSqkMd7gHKtMD" mode="" class="imgbj"></image>
+		<image src="https://api.ccttiot.com/smartmeter/img/static/u3lZnmhqSqkMd7gHKtMD" mode="" class="imgbj"></image>
 		<view class="title">
 			<text v-if="userType != 00" @click="btnshanghu">商户中心</text>
 		</view>
 		<view class="serchshop">
 			<view class="dingwei" @click="btnweizhi">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/uSDeC51wazjnZ9cFQx6l" mode="" class="dwimg"></image>
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uSDeC51wazjnZ9cFQx6l" mode="" class="dwimg">
+				</image>
 				{{tit}}
-				<image src="https://api.ccttiot.com/smartmeter/img/static/u0FZH7ZLG168c7W0FUMk" mode="" class="xlimg"></image>
+				<image src="https://api.ccttiot.com/smartmeter/img/static/u0FZH7ZLG168c7W0FUMk" mode="" class="xlimg">
+				</image>
 			</view>
 			<view class="search">
-                <input type="text" v-model="sousuovalue" @confirm="confirm" placeholder="搜索门店"/>
+				<input type="text" v-model="sousuovalue" @confirm="confirm" placeholder="搜索门店" />
 				<u-icon name="search"></u-icon>
 			</view>
 		</view>
-		
+
 		<view class="" style="margin-top: 48rpx;">
 			<view class="tabqh">
 				<view @click="btntabindex(1)" :class="tabindex == 1 ? 'activetab' : ''">
 					<text>茶室</text>
-					<image v-if="tabindex == 1" src="https://api.ccttiot.com/smartmeter/img/static/uHFOqckZJiCEP9JOtMvj" mode=""></image>
+					<image v-if="tabindex == 1" src="https://api.ccttiot.com/smartmeter/img/static/uHFOqckZJiCEP9JOtMvj"
+						mode=""></image>
 				</view>
 				<view @click="btntabindex(2)" :class="tabindex == 2 ? 'activetab' : ''">
 					<text>棋牌</text>
-					<image v-if="tabindex == 2" src="https://api.ccttiot.com/smartmeter/img/static/uQ6c41aBHWUOD02aK9WQ" mode=""></image>
+					<image v-if="tabindex == 2" src="https://api.ccttiot.com/smartmeter/img/static/uQ6c41aBHWUOD02aK9WQ"
+						mode=""></image>
 				</view>
 				<view @click="btntabindex(3)" style="width: 34%;" :class="tabindex == 3 ? 'activetab' : ''">
 					<text>台球</text>
-					<image v-if="tabindex == 3" style="transform: rotateY(180deg)" src="https://api.ccttiot.com/smartmeter/img/static/uHFOqckZJiCEP9JOtMvj" mode=""></image>
+					<image v-if="tabindex == 3" style="transform: rotateY(180deg)"
+						src="https://api.ccttiot.com/smartmeter/img/static/uHFOqckZJiCEP9JOtMvj" mode=""></image>
 				</view>
 			</view>
-			<view class="shoplist"
-			  @touchstart="onTouchStart"
-			  @touchend="onTouchEnd" 
-			  @touchcancel="onTouchCancel">
-			 
-				<view class="shop_item" v-for="(item,index) in listshop" :key="index" @click="btndetail(item.storeId,item)">
+			<view class="shoplist" @touchstart="onTouchStart" @touchend="onTouchEnd" @touchcancel="onTouchCancel">
+
+				<view class="shop_item" v-for="(item,index) in listshop" :key="index"
+					@click="btndetail(item.storeId,item)">
 					<view class="lt">
 						<image :src="item.pictures[0]" mode="aspectFill"></image>
 						<!-- <view class="hour">
@@ -53,23 +56,35 @@
 							{{item.address.length > 13 ? item.address.slice(0,13) + '...' : item.address}}
 						</view>
 						<view class="storebq">
-							<image v-if="item.typeTags && item.typeTags.some(tag => tag == 1)" src="https://api.ccttiot.com/smartmeter/img/static/u7ilmXTNlXUbbvfSgOa1" mode=""></image>
-							<image v-if="item.typeTags && item.typeTags.some(tag => tag == 2)" src="https://api.ccttiot.com/smartmeter/img/static/umA2EUZkovZEA0hCLmP3" mode=""></image>
-							<image v-if="item.typeTags && item.typeTags.some(tag => tag == 3)" src="https://api.ccttiot.com/smartmeter/img/static/uPjeCCnwjiJlCNqURltX" mode=""></image>
+							<image v-if="item.typeTags && item.typeTags.some(tag => tag == 1)"
+								src="https://api.ccttiot.com/smartmeter/img/static/u7ilmXTNlXUbbvfSgOa1" mode="">
+							</image>
+							<image v-if="item.typeTags && item.typeTags.some(tag => tag == 2)"
+								src="https://api.ccttiot.com/smartmeter/img/static/umA2EUZkovZEA0hCLmP3" mode="">
+							</image>
+							<image v-if="item.typeTags && item.typeTags.some(tag => tag == 3)"
+								src="https://api.ccttiot.com/smartmeter/img/static/uPjeCCnwjiJlCNqURltX" mode="">
+							</image>
 						</view>
 						<view class="juli">
 							<view class="kmjuli">
 								距我{{item.distance == undefined ? '--' : item.distance}}km
 							</view>
 							<view class="juliimg">
-								<image @click.stop="btndaohang(item.lng,item.lat,item.name,item.address)" src="https://api.ccttiot.com/smartmeter/img/static/ufhdTzq4mHUlHgCKgI5Y" mode=""></image>
-								<image @click.stop="btntel(item.serverPhone)" src="https://api.ccttiot.com/smartmeter/img/static/uOxtHZOxGREoFVXEv73f" mode=""></image>
+								<image @click.stop="btndaohang(item.lng,item.lat,item.name,item.address)"
+									src="https://api.ccttiot.com/smartmeter/img/static/ufhdTzq4mHUlHgCKgI5Y" mode="">
+								</image>
+								<image @click.stop="btntel(item.serverPhone)"
+									src="https://api.ccttiot.com/smartmeter/img/static/uOxtHZOxGREoFVXEv73f" mode="">
+								</image>
 							</view>
 						</view>
 						<view class="yuding">
-							<image src="https://api.ccttiot.com/smartmeter/img/static/u7zHXOY1SGwic7jQESUR" mode="" class="one"></image>
+							<image src="https://api.ccttiot.com/smartmeter/img/static/u7zHXOY1SGwic7jQESUR" mode=""
+								class="one"></image>
 							预定包间
-							<image src="https://api.ccttiot.com/smartmeter/img/static/urIGUWi7cHWqp9qem3Ag" mode="" class="two"></image>
+							<image src="https://api.ccttiot.com/smartmeter/img/static/urIGUWi7cHWqp9qem3Ag" mode=""
+								class="two"></image>
 						</view>
 					</view>
 				</view>
@@ -85,51 +100,66 @@
 			<image src="https://api.ccttiot.com/smartmeter/img/static/uuoqWaq7HnXBteQayaz4" mode=""></image>
 		</view>
 		<view class="xuanfu" v-if="imgflag">
-			<image @click="btnopen(1)" src="https://api.ccttiot.com/smartmeter/img/static/uKeCHdot1z4QJldDe3UL" mode=""></image>
-			<image @click="btnopen(2)" src="https://api.ccttiot.com/smartmeter/img/static/u4lmGbm77OWC2Uik2737" mode=""></image>
-			<image @click="btnopen(3)" src="https://api.ccttiot.com/smartmeter/img/static/uUjamKC7Kvd9KMLLOeBD" mode=""></image>
-			<image @click="btnopen(6)" src="https://api.ccttiot.com/smartmeter/img/static/u3AxwRFjWnSAAYyNS70w" mode=""></image>
-			<image @click="btnopen(4)" src="https://api.ccttiot.com/smartmeter/img/static/u9ccoP5o6Gt6rCKwsXva" mode=""></image>
-			<image @click="btnopen(5)" src="https://api.ccttiot.com/smartmeter/img/static/uONMVGcplNBtVnjlHaeh" mode=""></image>
+			<image @click="btnopen(1)" src="https://api.ccttiot.com/smartmeter/img/static/uKeCHdot1z4QJldDe3UL" mode="">
+			</image>
+			<image @click="btnopen(2)" src="https://api.ccttiot.com/smartmeter/img/static/u4lmGbm77OWC2Uik2737" mode="">
+			</image>
+			<image @click="btnopen(3)" src="https://api.ccttiot.com/smartmeter/img/static/uUjamKC7Kvd9KMLLOeBD" mode="">
+			</image>
+			<image @click="btnopen(6)" src="https://api.ccttiot.com/smartmeter/img/static/u3AxwRFjWnSAAYyNS70w" mode="">
+			</image>
+			<image @click="btnopen(4)" src="https://api.ccttiot.com/smartmeter/img/static/u9ccoP5o6Gt6rCKwsXva" mode="">
+			</image>
+			<image @click="btnopen(5)" src="https://api.ccttiot.com/smartmeter/img/static/uONMVGcplNBtVnjlHaeh" mode="">
+			</image>
 		</view>
 		<view class="xuanfus" v-else>
-			<image @click="btnopen(1)" src="https://api.ccttiot.com/smartmeter/img/static/uKeCHdot1z4QJldDe3UL" mode=""></image>
-			<image @click="btnopen(2)" src="https://api.ccttiot.com/smartmeter/img/static/u4lmGbm77OWC2Uik2737" mode=""></image>
-			<image @click="btnopen(6)" src="https://api.ccttiot.com/smartmeter/img/static/u3AxwRFjWnSAAYyNS70w" mode=""></image>
-			<image @click="btnopen(3)" src="https://api.ccttiot.com/smartmeter/img/static/uUjamKC7Kvd9KMLLOeBD" mode=""></image>
-			<image @click="btnopen(4)" src="https://api.ccttiot.com/smartmeter/img/static/u9ccoP5o6Gt6rCKwsXva" mode=""></image>
-			<image @click="btnopen(5)" src="https://api.ccttiot.com/smartmeter/img/static/uONMVGcplNBtVnjlHaeh" mode=""></image>
+			<image @click="btnopen(1)" src="https://api.ccttiot.com/smartmeter/img/static/uKeCHdot1z4QJldDe3UL" mode="">
+			</image>
+			<image @click="btnopen(2)" src="https://api.ccttiot.com/smartmeter/img/static/u4lmGbm77OWC2Uik2737" mode="">
+			</image>
+			<image @click="btnopen(6)" src="https://api.ccttiot.com/smartmeter/img/static/u3AxwRFjWnSAAYyNS70w" mode="">
+			</image>
+			<image @click="btnopen(3)" src="https://api.ccttiot.com/smartmeter/img/static/uUjamKC7Kvd9KMLLOeBD" mode="">
+			</image>
+			<image @click="btnopen(4)" src="https://api.ccttiot.com/smartmeter/img/static/u9ccoP5o6Gt6rCKwsXva" mode="">
+			</image>
+			<image @click="btnopen(5)" src="https://api.ccttiot.com/smartmeter/img/static/uONMVGcplNBtVnjlHaeh" mode="">
+			</image>
 		</view>
 		<view class="karaokeroom" v-if="jinxinflag">
 			<view class="top">
 				正在进行中的订单
 			</view>
 			<view class="roomlist">
-				<view class="room_item" v-for="(item,index) in jinxinglist" :key="index" :id="mdindex == index ? 'active' : ''" @click="btnmd(index,item)">
-                    <view class="lt">
-                    	<image :src="item.picture" mode=""></image>
-                    </view>			
-				    <view class="rt" style="font-size: 22rpx;">
-				    	<view class="">
-				    		<text>预约门店：</text> <text>{{item.storeName == null ? '--' : item.storeName}}</text>
-				    	</view>
+				<view class="room_item" v-for="(item,index) in jinxinglist" :key="index"
+					:id="mdindex == index ? 'active' : ''" @click="btnmd(index,item)">
+					<view class="lt">
+						<image :src="item.picture" mode=""></image>
+					</view>
+					<view class="rt" style="font-size: 22rpx;">
+						<view class="">
+							<text>预约门店：</text> <text>{{item.storeName == null ? '--' : item.storeName}}</text>
+						</view>
 						<view class="">
 							<text>预约包厢：</text> <text>{{item.roomName == null ? '--' : item.roomName}}</text>
 						</view>
 						<view class="">
-							<text>开始时间：</text> <text>{{item.reserveStartTime == null ? '--' : item.reserveStartTime}}</text>
+							<text>开始时间：</text>
+							<text>{{item.reserveStartTime == null ? '--' : item.reserveStartTime}}</text>
 						</view>
 						<view class="">
 							<text>结束时间：</text> <text>{{item.reserveEndTime == null ? '--' : item.reserveEndTime}}</text>
 						</view>
-				    </view>
+					</view>
 				</view>
 			</view>
 			<view class="anniu" @click="btnanniu">
 				{{jinxintxt}}
 			</view>
 		</view>
-		<image v-if="jinxinflag" @click="jinxinflag = false" class="jinxinx" src="https://api.ccttiot.com/smartmeter/img/static/uH5fAInJQYhf3wlXkuYI" mode=""></image>
+		<image v-if="jinxinflag" @click="jinxinflag = false" class="jinxinx"
+			src="https://api.ccttiot.com/smartmeter/img/static/uH5fAInJQYhf3wlXkuYI" mode=""></image>
 		<view class="mask" v-if="jinxinflag"></view>
 		<!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 -->
 		<view class="cesuoul" v-if="cesuoflag">
@@ -148,7 +178,7 @@
 			</view>
 		</view>
 		<view class="mask" v-if="cesuoflag"></view>
-		
+
 	</view>
 </template>
 
@@ -156,45 +186,61 @@
 	export default {
 		data() {
 			return {
-			   guangaoflag:true,
-			   jinxintxt:'开包厢',
-               imgflag:true,
-			   longitude:'',
-			   latitude:'',
-			   tit:'',
-			   listshop:[],
-			   cityid:'',
-			   pagesum:1,
-			   pagesize:10,
-			   touchStartX: 0, // 触屏起始点x
-			   touchStartY: 0, // 触屏起始点y  
-			   xiaflag:true,
-			   total:'',
-			   qingqiuflag:true,
-			   jinxinglist:[],
-			   mdindex:-1,
-			   viewType:'',
-			   jinxinflag:false,
-			   sousuovalue:'',
-			   tabindex:1,
-			   type:1,
-			   userType:'00',
-			   cesuolist:[],
-			   cesuoflag:false,
-			   csindex:-1,
+				guangaoflag: true,
+				jinxintxt: '开包厢',
+				imgflag: true,
+				longitude: '',
+				latitude: '',
+				tit: '',
+				listshop: [],
+				cityid: '',
+				pagesum: 1,
+				pagesize: 10,
+				touchStartX: 0, // 触屏起始点x
+				touchStartY: 0, // 触屏起始点y  
+				xiaflag: true,
+				total: '',
+				qingqiuflag: true,
+				jinxinglist: [],
+				mdindex: -1,
+				viewType: '',
+				jinxinflag: false,
+				sousuovalue: '',
+				tabindex: 1,
+				type: 1,
+				userType: '00',
+				cesuolist: [],
+				cesuoflag: false,
+				csindex: -1,
+			}
+		},
+		// 分享到好友（会话）
+		onShareAppMessage: function() {
+			return {
+				title: '共享时光屋',
+				path: '/pages/nearbystores/index'
+			}
+		},
+		
+		// 分享到朋友圈  
+		onShareTimeline: function() {
+			return {
+				title: '共享时光屋',
+				query: '',
+				path: '/pages/nearbystores/index'
 			}
 		},
 		onLoad(option) {
-			if(option.cityId){
+			if (option.cityId) {
 				this.cityid = option.cityId
 				this.tit = option.cityName
 				this.longitude = ''
 				this.latitude = ''
 				this.getweizhi()
-			}else{
+			} else {
 				this.getweizhi()
 			}
-            this.getinfo()
+			this.getinfo()
 			this.getorder()
 		},
 		onShow() {
@@ -202,7 +248,7 @@
 		},
 		methods: {
 			// 点击切换门店类型
-			btntabindex(num){
+			btntabindex(num) {
 				this.tabindex = num
 				this.type = num
 				this.pagesum = 1
@@ -210,35 +256,35 @@
 				this.getshop()
 			},
 			// 点击跳转到商户中心
-			btnshanghu(){
+			btnshanghu() {
 				uni.navigateTo({
-					url:'/page_shanghu/index'
+					url: '/page_shanghu/index'
 				})
 			},
 			// 点击选择开包厢
-			btnmd(index,item){
+			btnmd(index, item) {
 				this.viewType = item.reType
 				this.mdindex = index
 			},
 			// 请求正在进行中的订单
-			getorder(){
-				this.$u.get(`/app/order/getInProgressOrderList`).then(res =>{
-					if(res.code == 200){
+			getorder() {
+				this.$u.get(`/app/order/getInProgressOrderList`).then(res => {
+					if (res.code == 200) {
 						this.jinxinglist = res.data
 					}
 				})
 			},
 			// 点击进行导航
-			btndaohang(lng,lat,name,addres){
+			btndaohang(lng, lat, name, addres) {
 				uni.openLocation({
-				   latitude:lat,//纬度-目的地/坐标点
-				   longitude:lng,//经度-目的地/坐标点
-				   name:name,//地点名称
-				   address:addres//详细地点名称
+					latitude: lat, //纬度-目的地/坐标点
+					longitude: lng, //经度-目的地/坐标点
+					name: name, //地点名称
+					address: addres //详细地点名称
 				})
 			},
 			// 点击拨打电话
-			btntel(serverPhone){
+			btntel(serverPhone) {
 				uni.makePhoneCall({
 					phoneNumber: serverPhone,
 					success: function(res) {
@@ -254,20 +300,20 @@
 				})
 			},
 			// 选择订单后进行操作
-			btnanniu(){
-				if(this.jinxintxt == '开店门'){
+			btnanniu() {
+				if (this.jinxintxt == '开店门') {
 					let storeId = this.jinxinglist[this.mdindex].storeId
-					console.log(this.jinxinglist[this.mdindex],this.mdindex);
+					console.log(this.jinxinglist[this.mdindex], this.mdindex);
 					this.$u.get(`app/store/openGate/${storeId}`).then(res => {
-						if(res.code == 200){
+						if (res.code == 200) {
 							this.jinxinflag = false
 							this.mdindex = -1
 							uni.showToast({
-							title: '开启店门成功',
-							icon: 'success',
-							duration: 2000
-						    })
-						}else{
+								title: '开启店门成功',
+								icon: 'success',
+								duration: 2000
+							})
+						} else {
 							this.mdindex = -1
 							uni.showToast({
 								title: res.msg,
@@ -276,111 +322,112 @@
 							})
 						}
 					})
-				}else if(this.jinxintxt == '开包厢'){
+				} else if (this.jinxintxt == '开包厢') {
 					let roomId = this.jinxinglist[this.mdindex].roomId
 					this.$u.get(`app/room/openRoomGate/${roomId}`).then(res => {
-						if(res.code == 200){
-						   this.jinxinflag = false
-						   this.mdindex = -1
-						   uni.showToast({
-						     title: '开启包厢门成功',
-						     icon: 'success',
-						     duration: 2000
-					       })
-					   }else{
-						   this.mdindex = -1
-						  uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						  })
-					    }
+						if (res.code == 200) {
+							this.jinxinflag = false
+							this.mdindex = -1
+							uni.showToast({
+								title: '开启包厢门成功',
+								icon: 'success',
+								duration: 2000
+							})
+						} else {
+							this.mdindex = -1
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					})
-				}else if(this.jinxintxt == '去续单'){
+				} else if (this.jinxintxt == '去续单') {
 					this.jinxinflag = false
 					let roomId = this.jinxinglist[this.mdindex].roomId
 					let orderNo = this.jinxinglist[this.mdindex].orderNo
 					uni.navigateTo({
-						url:'/page_user/xudan?roomId=' + roomId + '&orderNo=' + orderNo + '&viewType='  + this.viewType
+						url: '/page_user/xudan?roomId=' + roomId + '&orderNo=' + orderNo + '&viewType=' + this
+							.viewType
 					})
 				}
 			},
 			// 点击进行开店门开包厢等操作
-			btnopen(num){
-				if(num == 1){
-					if(this.jinxinglist.length > 1){
+			btnopen(num) {
+				if (num == 1) {
+					if (this.jinxinglist.length > 1) {
 						this.jinxinflag = true
 						this.jinxintxt = '开店门'
-					}else if(this.jinxinglist.length == 1){
+					} else if (this.jinxinglist.length == 1) {
 						let storeId = this.jinxinglist[0].storeId
 						this.$u.get(`app/store/openGate/${storeId}`).then(res => {
-						if(res.code == 200){
-							uni.showToast({
-							title: '开启店门成功',
-							icon: 'success',
-							duration: 2000
-						    })
-						}else{
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 2000
-							})
-						}
-					})
-				   }else{
-					    uni.showToast({
-							title: '您当前没有订单',
-							icon: 'none',
-							duration: 2000
+							if (res.code == 200) {
+								uni.showToast({
+									title: '开启店门成功',
+									icon: 'success',
+									duration: 2000
+								})
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
 						})
-					}
-				}else if(num == 2){
-					if(this.jinxinglist.length > 1){
-						this.jinxinflag = true
-						this.jinxintxt = '开包厢'
-					}else if(this.jinxinglist.length == 1){
-						let roomId = this.jinxinglist[0].roomId
-						this.$u.get(`app/room/openRoomGate/${roomId}`).then(res => {
-							if(res.code == 200){
-							   uni.showToast({
-							     title: '开启包厢门成功',
-							     icon: 'success',
-							     duration: 2000
-						       })
-						   }else{
-							  uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 2000
-							  })
-						    }
-						})
-					}else{
+					} else {
 						uni.showToast({
 							title: '您当前没有订单',
 							icon: 'none',
 							duration: 2000
 						})
 					}
-				}else if(num == 3){
-					if(this.jinxinglist.length > 1){
+				} else if (num == 2) {
+					if (this.jinxinglist.length > 1) {
+						this.jinxinflag = true
+						this.jinxintxt = '开包厢'
+					} else if (this.jinxinglist.length == 1) {
+						let roomId = this.jinxinglist[0].roomId
+						this.$u.get(`app/room/openRoomGate/${roomId}`).then(res => {
+							if (res.code == 200) {
+								uni.showToast({
+									title: '开启包厢门成功',
+									icon: 'success',
+									duration: 2000
+								})
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+					} else {
+						uni.showToast({
+							title: '您当前没有订单',
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				} else if (num == 3) {
+					if (this.jinxinglist.length > 1) {
 						this.jinxinflag = true
 						this.jinxintxt = '去续单'
-					}else if(this.jinxinglist.length == 1){
+					} else if (this.jinxinglist.length == 1) {
 						let roomId = this.jinxinglist[0].roomId
 						let orderNo = this.jinxinglist[0].orderNo
 						uni.navigateTo({
-							url:'/page_user/xudan?roomId=' + roomId + '&orderNo=' + orderNo
+							url: '/page_user/xudan?roomId=' + roomId + '&orderNo=' + orderNo
 						})
-					}else{
+					} else {
 						uni.showToast({
 							title: '您当前没有订单',
 							icon: 'none',
 							duration: 2000
 						})
 					}
-				}else if(num == 4){
+				} else if (num == 4) {
 					uni.scanCode({
 						onlyFromCamera: true,
 						scanType: ['qrCode'],
@@ -394,7 +441,9 @@
 							let sceneValue = res.result
 							let decodedValue = decodeURIComponent(sceneValue)
 							let id = getQueryParam(decodedValue, 'sn')
-							if(id){
+							let storeCode = getQueryParam(decodedValue, 'd');
+							let roomCode = getQueryParam(decodedValue, 'f');
+							if (id) {
 								let that = this
 								let data = {
 									sn: id,
@@ -412,20 +461,21 @@
 											content: '该设备未绑定,你需进行绑定吗？',
 											success: function(res) {
 												if (res.confirm) {
-													that.$u.put("/app/device/bind", data).then(res => {
-														if (res.code == 200) {
-															uni.showToast({
-																title: '绑定成功',
-																icon: 'success',
-																duration: 2000
-															})
-															that.userType = '01'
-														}
-													})
+													that.$u.put("/app/device/bind", data)
+														.then(res => {
+															if (res.code == 200) {
+																uni.showToast({
+																	title: '绑定成功',
+																	icon: 'success',
+																	duration: 2000
+																})
+																that.userType = '01'
+															}
+														})
 												}
 											}
 										})
-									}else if(res.data == 0){
+									} else if (res.data == 0) {
 										uni.showToast({
 											title: '该设备为录入，请先录入',
 											icon: 'none',
@@ -433,35 +483,40 @@
 										})
 									}
 								})
-							}
-						}
-					})
-				}else if(num == 5){
-					uni.switchTab({
-						url:'/pages/tj'
-					})
-				}else if(num == 6){
-					if(this.jinxinglist.length > 0){
-						let storeId = this.jinxinglist[0].storeId
-						this.$u.get(`/app/toilet/list?storeId=${storeId}`).then(res =>{
-							if(res.code == 200){
-								if(res.rows == null || res.rows.length == 0){
-									uni.showToast({
-										title: '暂无卫生间',
-										icon: 'none',
-										duration:2000
-									})
-								}else{
-									this.cesuolist = res.rows
-									if(this.cesuolist.length == 1){
-										this.$u.get(`/app/room/openToilet/${this.cesuolist[0].toiletId}`).then(res => {
+							} else if (storeCode) {
+								this.$u.get(`app/getId?storeCode=${storeCode}`).then(resp => {
+									if (resp.code == 200) {
+										uni.navigateTo({
+											url:'/pages/index/index?storeId=' + resp.data
+										})
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+								})
+							} else if (roomCode) {
+								this.$u.get(`app/getId?roomCode=${roomCode}`).then(resp => {
+									if (resp.code == 200) {
+										console.log('这是 roomId:', resp.data);
+										let roomId = resp.data
+										this.$u.get(`/app/order/getInProgressOrderList`).then(res => {
 											if (res.code == 200) {
-												uni.showToast({
-													title: '打开成功',
-													icon: 'success',
-													duration: 2000
+												if (res.data == null || res.data.length == 0) {
+													uni.navigateTo({
+														url: '/pages/myorder/index?roomId=' + roomId
+													})
+												} else {
+													uni.navigateTo({
+														url: '/page_user/dingdanxq?orderNo=' + res.data[0].orderNo + '&viewType=' + res.data[0].roomType2
+													})
+												}
+											} else if (res.code == 401) {
+												uni.navigateTo({
+													url: '/pages/login/index'
 												})
-												this.cesuoflag = false
 											} else {
 												uni.showToast({
 													title: res.msg,
@@ -470,13 +525,61 @@
 												})
 											}
 										})
-									}else{
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+								})
+							} else {
+								console.log('URL 中未找到 storeCode 或 roomCode');
+							}
+						}
+					})
+				} else if (num == 5) {
+					uni.switchTab({
+						url: '/pages/tj'
+					})
+				} else if (num == 6) {
+					if (this.jinxinglist.length > 0) {
+						let storeId = this.jinxinglist[0].storeId
+						this.$u.get(`/app/toilet/list?storeId=${storeId}`).then(res => {
+							if (res.code == 200) {
+								if (res.rows == null || res.rows.length == 0) {
+									uni.showToast({
+										title: '暂无卫生间',
+										icon: 'none',
+										duration: 2000
+									})
+								} else {
+									this.cesuolist = res.rows
+									if (this.cesuolist.length == 1) {
+										this.$u.get(`/app/room/openToilet/${this.cesuolist[0].toiletId}`).then(
+											res => {
+												if (res.code == 200) {
+													uni.showToast({
+														title: '打开成功',
+														icon: 'success',
+														duration: 2000
+													})
+													this.cesuoflag = false
+												} else {
+													uni.showToast({
+														title: res.msg,
+														icon: 'none',
+														duration: 2000
+													})
+												}
+											})
+									} else {
 										this.cesuoflag = true
 									}
 								}
 							}
 						})
-					}else{
+					} else {
 						uni.showToast({
 							title: '当前没有订单，请先下单',
 							icon: 'none',
@@ -486,15 +589,15 @@
 				}
 			},
 			// 点击打开厕所门
-			btncs(item){
+			btncs(item) {
 				console.log(item);
-				if(item.deviceId == null){
+				if (item.deviceId == null) {
 					uni.showToast({
 						title: '该厕所未安装设备',
 						icon: 'none',
 						duration: 2000
 					})
-				}else{
+				} else {
 					this.$u.get(`/app/room/openToilet/${item.toiletId}`).then(res => {
 						if (res.code == 200) {
 							uni.showToast({
@@ -514,142 +617,144 @@
 				}
 			},
 			// 点击输入框确定执行搜索
-			confirm(){
+			confirm() {
 				this.pagesum = 1
 				this.getshop()
 			},
 			// 根据定位来获取门店
-			getshop(){
+			getshop() {
 				let data = {
-					phoneLon:this.longitude,
-					phoneLat:this.latitude,
-					cityId:this.cityid,
-					keyword:this.sousuovalue,
-					type:this.type
+					phoneLon: this.longitude,
+					phoneLat: this.latitude,
+					cityId: this.cityid,
+					keyword: this.sousuovalue,
+					type: this.type
 				}
-				this.$u.post(`/app/getStoreListByLocation?pageNum=${this.pagesum}&pageSize=${this.pagesize}`,data).then(res => {
-					if(res.code == 200){
-						this.xiaflag = true
-						this.total = res.total
-						if (this.pagesum > 1) {
-							this.pagesum++
-							this.listshop = this.listshop.concat(res.rows)
-							this.qingqiuflag = true
-						} else {
-							this.pagesum++
-							this.listshop = res.rows  
-							this.qingqiuflag = true
-						} 
-						console.log(this.listshop)
-					}
-				})
+				this.$u.post(`/app/getStoreListByLocation?pageNum=${this.pagesum}&pageSize=${this.pagesize}`, data).then(
+					res => {
+						if (res.code == 200) {
+							this.xiaflag = true
+							this.total = res.total
+							if (this.pagesum > 1) {
+								this.pagesum++
+								this.listshop = this.listshop.concat(res.rows)
+								this.qingqiuflag = true
+							} else {
+								this.pagesum++
+								this.listshop = res.rows
+								this.qingqiuflag = true
+							}
+							console.log(this.listshop)
+						}
+					})
 			},
 			// 获取用户详情
-			getinfo(){
+			getinfo() {
 				this.$u.get(`/getAppInfo`).then(res => {
-					if(res.code == 200){
+					if (res.code == 200) {
 						this.userType = res.user.userType
 						uni.setStorageSync('user', res.data)
-					}else if(res.code == 401){
+					} else if (res.code == 401) {
 						this.jingmo()
 					}
 				})
 			},
 			// 静默登录
-			jingmo(){
+			jingmo() {
 				let that = this
 				wx.login({
-				    success(res) {
-				        if (res.code) {
-				            console.log('登录！', res)
-				            let data = {
-				                jsCode: res.code,  
-				            }
-							that.$u.post(`/loginByopenid?jsCode=${res.code}`,data).then(res=>{
-				        		if (res.code == 200) {
-									console.log("老用户登录",res)
+					success(res) {
+						if (res.code) {
+							console.log('登录！', res)
+							let data = {
+								jsCode: res.code,
+							}
+							that.$u.post(`/loginByopenid?jsCode=${res.code}`, data).then(res => {
+								if (res.code == 200) {
+									console.log("老用户登录", res)
 									that.getinfo()
 									wx.setStorageSync('token', res.token)
-				        		}
-				        	})
-				        }
-				    },
+								}
+							})
+						}
+					},
 				})
 			},
 			// 获取自身当前经纬度
-			getweizhi(){
+			getweizhi() {
 				uni.getLocation({
-				  type: 'wgs84',
-				  success: res => {
-					  this.longitude = res.longitude
-					  this.latitude = res.latitude
-					  this.getshop()
-					  this.$u.get(`app/getCity?lon=${this.longitude}&lat=${this.latitude}`).then(res => {
-					  	if(res.code == 200){
-							if(this.cityid == ''){
-                                this.tit = res.data.cityName
+					type: 'wgs84',
+					success: res => {
+						this.longitude = res.longitude
+						this.latitude = res.latitude
+						this.getshop()
+						this.$u.get(`app/getCity?lon=${this.longitude}&lat=${this.latitude}`).then(res => {
+							if (res.code == 200) {
+								if (this.cityid == '') {
+									this.tit = res.data.cityName
+								}
 							}
-					  	}
-					  })
-				  },
-				  fail: err => {
-				    // 获取失败，err为错误信息
-				    console.log('getLocation err:', err)
-				  }
+						})
+					},
+					fail: err => {
+						// 获取失败，err为错误信息
+						console.log('getLocation err:', err)
+					}
 				})
 			},
-            // 按下滑动
-            onTouchStart(e) {
-                this.imgflag = false
+			// 按下滑动
+			onTouchStart(e) {
+				this.imgflag = false
 				this.touchStartX = e.touches[0].clientX
 				this.touchStartY = e.touches[0].clientY
-            },
-            // 松开滑动
-            onTouchEnd(e) {
-              this.imgflag = true
-			  let deltaX = e.changedTouches[0].clientX - this.touchStartX
-			  let deltaY = e.changedTouches[0].clientY - this.touchStartY
-			  if (Math.abs(deltaX) > 50 && Math.abs(deltaX) > Math.abs(deltaY)) {
-			  	if (deltaX >= 0) {
-			  		// console.log("左滑")  
-			  	} else {
-			  		// console.log("右滑")  
-			  	}
-			  } else if (Math.abs(deltaY) > 50 && Math.abs(deltaX) < Math.abs(deltaY)) {
-			  	if (deltaY < 100) {
-			  		if(this.qingqiuflag == true){
-			  			let sum = (this.pagesum - 1) * this.pagesize
-			  			console.log(sum,this.total)
-			  			if (this.total > sum) {
-			  				this.qingqiuflag = false
-			  				this.getshop() 
-			  			}
-			  		}
-			  	} else {
-			  		console.log("下滑") 
-			  	}
-			  }
-            },
-            // 滑动取消
-            onTouchCancel() {
-              this.imgflag = true
-            },
-            // 点击跳转门店详情页
-            btndetail(storeId,item){
-            	uni.reLaunch({
-            		url:'/pages/index/index?storeId=' + storeId + '&tit=' + item.name + '&distance=' + item.distance
-            	})
-            },
+			},
+			// 松开滑动
+			onTouchEnd(e) {
+				this.imgflag = true
+				let deltaX = e.changedTouches[0].clientX - this.touchStartX
+				let deltaY = e.changedTouches[0].clientY - this.touchStartY
+				if (Math.abs(deltaX) > 50 && Math.abs(deltaX) > Math.abs(deltaY)) {
+					if (deltaX >= 0) {
+						// console.log("左滑")  
+					} else {
+						// console.log("右滑")  
+					}
+				} else if (Math.abs(deltaY) > 50 && Math.abs(deltaX) < Math.abs(deltaY)) {
+					if (deltaY < 100) {
+						if (this.qingqiuflag == true) {
+							let sum = (this.pagesum - 1) * this.pagesize
+							console.log(sum, this.total)
+							if (this.total > sum) {
+								this.qingqiuflag = false
+								this.getshop()
+							}
+						}
+					} else {
+						console.log("下滑")
+					}
+				}
+			},
+			// 滑动取消
+			onTouchCancel() {
+				this.imgflag = true
+			},
+			// 点击跳转门店详情页
+			btndetail(storeId, item) {
+				uni.reLaunch({
+					url: '/pages/index/index?storeId=' + storeId + '&tit=' + item.name + '&distance=' + item
+						.distance
+				})
+			},
 			// 点击跳转到加盟合作页
-			btnjiameng(){
+			btnjiameng() {
 				uni.navigateTo({
-					url:'/page_user/zhaoshang'
+					url: '/page_user/zhaoshang'
 				})
 			},
 			// 点击选择定位位置
-			btnweizhi(){
+			btnweizhi() {
 				uni.navigateTo({
-					url:'/page_user/city'
+					url: '/page_user/city'
 				})
 			}
 		}
@@ -661,17 +766,20 @@
 		background: #fff;
 		border-radius: 0rpx 0rpx 0rpx 0rpx;
 	}
-	#active{
+
+	#active {
 		border: 1px solid #226914 !important;
-		background-color: #226914 !important; 
+		background-color: #226914 !important;
 		color: #fff !important;
 	}
-	.activetab{
+
+	.activetab {
 		font-weight: 600 !important;
 		font-size: 40rpx !important;
 		color: #3D3D3D !important;
 	}
-	.cesuoul{
+
+	.cesuoul {
 		width: 260rpx;
 		max-height: 500rpx;
 		background-color: #fff;
@@ -683,7 +791,8 @@
 		z-index: 99;
 		padding: 30rpx;
 		box-sizing: border-box;
-		.anniuqx{
+
+		.anniuqx {
 			width: 100%;
 			height: 80rpx;
 			border: 1px solid #226914;
@@ -695,16 +804,19 @@
 			font-size: 32rpx;
 			font-weight: 600;
 		}
-		.cesuoli{
+
+		.cesuoli {
 			width: 100%;
-			.caocuo{
-				.name{
+
+			.caocuo {
+				.name {
 					width: 100%;
 					text-align: center;
 					margin-top: 20rpx;
 					font-size: 32rpx;
 				}
-				.kaiguan{
+
+				.kaiguan {
 					padding: 10rpx;
 					background-color: #226914;
 					color: #fff;
@@ -715,10 +827,11 @@
 					text-align: center;
 				}
 			}
-			
+
 		}
 	}
-	.tabqh{
+
+	.tabqh {
 		display: flex;
 		width: 100%;
 		height: 84rpx;
@@ -728,7 +841,8 @@
 		// left: 0;
 		position: relative;
 		border-radius: 30rpx 30rpx 0 0;
-		view{
+
+		view {
 			font-weight: 600;
 			font-size: 32rpx;
 			color: #7C7C7C;
@@ -737,13 +851,15 @@
 			height: 84rpx;
 			line-height: 84rpx;
 			position: relative;
-			text{
+
+			text {
 				position: absolute;
 				z-index: 1;
 				left: 50%;
 				transform: translateX(-50%);
 			}
-			image{
+
+			image {
 				height: 84rpx;
 				position: absolute;
 				top: 0;
@@ -751,7 +867,8 @@
 			}
 		}
 	}
-	.jinxinx{
+
+	.jinxinx {
 		width: 60rpx;
 		height: 60rpx;
 		position: fixed;
@@ -760,7 +877,8 @@
 		transform: translateX(-50%);
 		z-index: 2;
 	}
-	.karaokeroom{
+
+	.karaokeroom {
 		position: fixed;
 		top: 332rpx;
 		left: 50%;
@@ -768,9 +886,10 @@
 		z-index: 2;
 		width: 674rpx;
 		height: 828rpx;
-		background: linear-gradient( 180deg, #DEF1DA 0%, #FFFFFF 100%, #FFFFFF 100%);
+		background: linear-gradient(180deg, #DEF1DA 0%, #FFFFFF 100%, #FFFFFF 100%);
 		border-radius: 36rpx 36rpx 36rpx 36rpx;
-		.top{
+
+		.top {
 			font-weight: 600;
 			font-size: 44rpx;
 			color: #48893B;
@@ -779,7 +898,8 @@
 			margin-top: 52rpx;
 			margin-bottom: 44rpx;
 		}
-		.anniu{
+
+		.anniu {
 			width: 584rpx;
 			height: 86rpx;
 			background: #48893B;
@@ -794,10 +914,12 @@
 			transform: translateX(-50%);
 			bottom: 72rpx;
 		}
-		.roomlist{
+
+		.roomlist {
 			height: 480rpx;
 			overflow: scroll;
-			.room_item{
+
+			.room_item {
 				width: 584rpx;
 				height: 224rpx;
 				border: 2rpx solid #969696;
@@ -809,8 +931,9 @@
 				padding: 34rpx;
 				box-sizing: border-box;
 				margin-top: 26rpx;
-				.lt{
-					image{
+
+				.lt {
+					image {
 						width: 154rpx;
 						height: 154rpx;
 						margin-right: 22rpx;
@@ -820,7 +943,8 @@
 			}
 		}
 	}
-	.mask{
+
+	.mask {
 		width: 100%;
 		height: 100vh;
 		position: fixed;
@@ -829,53 +953,63 @@
 		background-color: #000;
 		opacity: .2;
 	}
+
 	.page {
 		width: 750rpx;
-		.xuanfu{
+
+		.xuanfu {
 			position: fixed;
 			top: 38%;
 			right: 30rpx;
 			animation: fadeInDowns .5s ease-out forwards;
-			image{
+
+			image {
 				width: 90rpx;
 				height: 90rpx;
 				display: block;
 				margin-bottom: 44rpx;
 			}
 		}
+
 		@keyframes fadeInDowns {
 			from {
 				opacity: 0;
 				transform: translateX(50px);
 			}
+
 			to {
 				opacity: 1;
 				transform: translateX(0);
 			}
 		}
+
 		@keyframes fadeInDown {
 			from {
 				opacity: 0;
 				transform: translateX(-50px);
 			}
+
 			to {
 				opacity: 1;
 				transform: translateX(0);
 			}
 		}
-		.xuanfus{
+
+		.xuanfus {
 			position: fixed;
 			top: 34%;
 			right: -80rpx;
 			animation: fadeInDown .5s ease-out forwards;
-			image{
+
+			image {
 				width: 90rpx;
 				height: 90rpx;
 				display: block;
 				margin-top: 44rpx;
 			}
 		}
-		.jiameng{
+
+		.jiameng {
 			width: 100%;
 			text-align: center;
 			background-color: #fff;
@@ -883,10 +1017,11 @@
 			position: fixed;
 			bottom: 0;
 			left: 0;
-			.gb{
+
+			.gb {
 				width: 100rpx;
 				height: 40rpx;
-				background-color: rgba(0,0,0,0.15);
+				background-color: rgba(0, 0, 0, 0.15);
 				position: absolute;
 				top: 0;
 				right: 22rpx;
@@ -894,17 +1029,20 @@
 				align-items: center;
 				justify-content: center;
 				border-radius: 0 30rpx 0 0;
-				text{
+
+				text {
 					font-size: 34rpx;
 				}
 			}
-			image{
+
+			image {
 				width: 710rpx;
 				height: 196rpx;
 				border-radius: 30rpx;
 			}
 		}
-		.shoplist{
+
+		.shoplist {
 			width: 750rpx;
 			max-height: 1250rpx;
 			background: #FFFFFF;
@@ -916,87 +1054,101 @@
 			overflow: scroll;
 			padding-bottom: 240rpx !important;
 			box-sizing: border-box;
-			.shop_item{
+
+			.shop_item {
 				margin: auto;
 				display: flex;
-                margin-top: 30rpx;
+				margin-top: 30rpx;
 				box-sizing: border-box;
 				width: 674rpx;
 				height: 330rpx;
 				background: #FFFFFF;
 				padding: 20rpx 18rpx;
-				box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0,0,0,0.15);
+				box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0, 0, 0, 0.15);
 				border-radius: 18rpx 18rpx 18rpx 18rpx;
-				.rt{
-					.storebq{
+
+				.rt {
+					.storebq {
 						margin-top: 16rpx;
 						display: flex;
-						image{
+
+						image {
 							width: 108rpx;
 							height: 40rpx;
 							margin-right: 10rpx;
 						}
 					}
-					.yuding{
+
+					.yuding {
 						display: flex;
 						align-items: center;
 						font-size: 24rpx;
 						color: #48893B;
 						margin-top: 26rpx;
 						margin-left: 248rpx;
-						.one{
+
+						.one {
 							width: 32rpx;
 							height: 32rpx;
 							margin-right: 10rpx;
 						}
-						.two{
+
+						.two {
 							width: 14rpx;
 							height: 36rpx;
 							margin-left: 10rpx;
 						}
 					}
-					.juli{
+
+					.juli {
 						display: flex;
 						justify-content: space-between;
 						margin-top: 16rpx;
 						align-items: center;
-						.kmjuli{
+
+						.kmjuli {
 							width: 210rpx;
 							height: 40rpx;
 							border-radius: 4rpx 4rpx 4rpx 4rpx;
 							border: 2rpx solid #48893B;
 							text-align: center;
 							line-height: 36rpx;
-                            font-size: 26rpx;
-                            color: #48893B;							
+							font-size: 26rpx;
+							color: #48893B;
 						}
-						.juliimg{
-							image{
+
+						.juliimg {
+							image {
 								width: 60rpx;
 								height: 60rpx;
 								margin-left: 26rpx;
 							}
 						}
 					}
-					.dizhi{
+
+					.dizhi {
 						font-size: 26rpx;
 						color: #7C7C7C;
 						margin-top: 16rpx;
 					}
-					.name{
+
+					.name {
 						font-weight: 600;
 						font-size: 36rpx;
 						color: #3D3D3D;
 					}
 				}
-				.lt{
+
+				.lt {
 					margin-right: 38rpx;
-					image{
+
+					image {
 						width: 186rpx;
 						height: 220rpx;
 						border-radius: 10rpx;
 					}
-					.hour{
+
+					.hour {
 						font-size: 32rpx;
 						color: #48893B;
 						margin-top: 32rpx;
@@ -1004,7 +1156,8 @@
 				}
 			}
 		}
-		.serchshop{
+
+		.serchshop {
 			display: flex;
 			margin-top: 40rpx;
 			align-items: center;
@@ -1012,42 +1165,49 @@
 			padding-left: 34rpx;
 			padding-right: 34rpx;
 			box-sizing: border-box;
-			.search{
+
+			.search {
 				width: 468rpx;
 				height: 72rpx;
 				line-height: 72rpx;
 				background: #FFFFFF;
 				border-radius: 6rpx 6rpx 6rpx 6rpx;
 				position: relative;
-				input{
+
+				input {
 					margin-left: 94rpx;
 					height: 72rpx;
 					line-height: 72rpx;
 				}
-				/deep/ .uicon-search{
+
+				/deep/ .uicon-search {
 					position: absolute;
 					top: 24rpx !important;
 					left: 26rpx !important;
 				}
 			}
-			.dingwei{
+
+			.dingwei {
 				display: flex;
 				font-weight: 600;
 				font-size: 32rpx;
 				color: #48893B;
 				align-items: center;
-				.dwimg{
+
+				.dwimg {
 					width: 40rpx;
 					height: 40rpx;
 					margin-right: 12rpx;
 				}
-				.xlimg{
+
+				.xlimg {
 					width: 26rpx;
 					height: 14rpx;
 					margin-left: 12rpx;
 				}
 			}
 		}
+
 		.title {
 			font-weight: 600;
 			font-size: 36rpx;
@@ -1057,7 +1217,8 @@
 			padding-left: 34rpx;
 			box-sizing: border-box;
 		}
-		.imgbj{
+
+		.imgbj {
 			width: 750rpx;
 			height: 610rpx;
 			position: fixed;
diff --git a/pages/tj.vue b/pages/tj.vue
index 32bcfd0..8e84b57 100644
--- a/pages/tj.vue
+++ b/pages/tj.vue
@@ -282,7 +282,7 @@
 							   	 }else{
 									 uni.showToast({
 									     title: res.msg,
-									     icon: 'success',
+									     icon: 'none',
 									     duration:2000
 									 })
 								 }
diff --git a/static/image/a1.png b/static/image/a1.png
deleted file mode 100644
index a19daa4..0000000
Binary files a/static/image/a1.png and /dev/null differ
diff --git a/static/image/a2.png b/static/image/a2.png
deleted file mode 100644
index 73542ea..0000000
Binary files a/static/image/a2.png and /dev/null differ
diff --git a/static/image/a3.png b/static/image/a3.png
deleted file mode 100644
index 42783bc..0000000
Binary files a/static/image/a3.png and /dev/null differ
diff --git a/static/image/a4.png b/static/image/a4.png
deleted file mode 100644
index 9d7804c..0000000
Binary files a/static/image/a4.png and /dev/null differ
diff --git a/static/image/a5.png b/static/image/a5.png
deleted file mode 100644
index d0ae2f9..0000000
Binary files a/static/image/a5.png and /dev/null differ
diff --git a/static/image/lx.png b/static/image/lx.png
deleted file mode 100644
index 955e710..0000000
Binary files a/static/image/lx.png and /dev/null differ
diff --git a/static/image/sm.png b/static/image/sm.png
deleted file mode 100644
index 03ab1fa..0000000
Binary files a/static/image/sm.png and /dev/null differ