diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index a0dfa0c..6ad01e4 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -20,8 +20,8 @@ const install = (Vue, vm) => {
 	// 	},
 	// https://yxd.ccttiot.com/prod-api}); 
 	Vue.prototype.$u.http.setConfig({
-			// baseUrl: 'http://192.168.2.43:8089',
-			baseUrl: 'https://testcha.chuangtewl.com/prod-api',
+			baseUrl: 'http://192.168.2.43:8089',
+			// baseUrl: 'https://testcha.chuangtewl.com/prod-api',
 			loadingText: '努力加载中~',
 			loadingTime: 800,
 			// 设置自定义头部content-type
diff --git a/page_fenbaotwo/bangzhu.vue b/page_fenbaotwo/bangzhu.vue
index b1b25c3..eb814ca 100644
--- a/page_fenbaotwo/bangzhu.vue
+++ b/page_fenbaotwo/bangzhu.vue
@@ -29,10 +29,10 @@
 			</view> 
 		</view>
 		
-		<view class="btn" @click="btndh">
+		<!-- <view class="btn" @click="btndh">
 			<image src="https://api.ccttiot.com/smartmeter/img/static/uNMbLZ4Ig7lkFLmhcU1P" mode=""></image> 在线客服
 		</view>
-		
+		 -->
 		<!-- 拨打电话 -->
 		<view class="kfimg" v-if="flag">
 			<image src="https://api.ccttiot.com/smartmeter/img/static/uc8dAVNneEshmNJjPW3w" mode=""></image>
diff --git a/page_fenbaotwo/wifipz.vue b/page_fenbaotwo/wifipz.vue
index 0afcbca..79f2dee 100644
--- a/page_fenbaotwo/wifipz.vue
+++ b/page_fenbaotwo/wifipz.vue
@@ -18,11 +18,11 @@
         			<view class="">WIFI密码</view>
 					<view class="" v-if="delflag">操作</view>
         		</view>
-        		<view class="bottab" v-for="(item,index) in 3" :key="index">
-        			<view class="">chuangteA</view>
-        			<view class="">123456789</view> 
+        		<view class="bottab" v-for="(item,index) in wifilist" :key="index">
+        			<view class="">{{item.wifi == null ? '--' : item.wifi}}</view>
+        			<view class="">{{item.password == null ? '--' : item.password}}</view> 
 					<view class="" v-if="delflag">
-						<text style="color: #000;" @click="btnxg">编辑</text> <text>删除</text>
+						<text style="color: #000;" @click="btnxg(item)">编辑</text> <text @click="btndel(item.wifiId)">删除</text>
 					</view>
         		</view>
         		<view class="addpz" @click="flag = true">
@@ -33,21 +33,16 @@
 				<view class="name">
 					WIFI配置
 				</view>
-				<view class="list_item" v-for="(item,index) in 6" :key="index" @click="btnroom"> 
+				<view class="list_item" v-for="(item,index) in sheshilist" :key="index" @click="btnroom(item.objId)"> 
 					<view class="">
-						房间{{index}}
+						{{item.name == null ? '--' : item.name}}
 					</view>
 					<view class="">
-						chuangteA <u-icon name="arrow-right" color="#7C7C7C" size="28"></u-icon>
+						{{item.wifiName == null ? '--' : item.wifiName}} <u-icon name="arrow-right" color="#7C7C7C" size="28"></u-icon>
 					</view>
 				</view>
 			</view>
         </view>
-		<!-- <view class="anniu">
-			<view class="">
-				保存
-			</view>
-		</view> -->
 		<view class="mask" v-if="flag"></view>
 		<view class="addwifi" v-if="flag">
 			<view class="name">
@@ -57,15 +52,15 @@
 				<view class="">
 					WIFI名称
 				</view>
-				<input type="text" placeholder="输入WIFI名称"/>
+				<input type="text" v-model="wifiname" placeholder="输入WIFI名称"/>
 			</view>
 			<view class="one">
 				<view class="">
 					WIFI密码
 				</view>
-				<input type="text" placeholder="输入WIFI密码"/>
+				<input type="text" v-model="wifipwd" placeholder="输入WIFI密码"/>
 			</view>
-			<view class="baocun">
+			<view class="baocun" @click="btnadd">
 				保存
 			</view>
 			<view class="cha" @click="flag = false">×</view>
@@ -79,15 +74,15 @@
 				<view class="">
 					WIFI名称
 				</view>
-				<input type="text" placeholder="输入WIFI名称"/>
+				<input type="text" v-model="wifiname" placeholder="输入WIFI名称"/>
 			</view>
 			<view class="one">
 				<view class="">
 					WIFI密码
 				</view>
-				<input type="text" placeholder="输入WIFI密码"/>
+				<input type="text" v-model="wifipwd" placeholder="输入WIFI密码"/>
 			</view>
-			<view class="baocun">
+			<view class="baocun" @click="btnedit">
 				修改
 			</view>
 			<view class="cha" @click="editflag = false">×</view>
@@ -105,21 +100,128 @@
                 },
 				flag:false,
 				delflag:false,
-				editflag:false
+				editflag:false,
+				wifilist:[],
+				wifiname:'',
+				wifipwd:'',
+				wifiid:'',
+				sheshilist:[]
 			}
 		},
 		onLoad() {
 
+		},
+		onShow() {
+			this.getwifilist()
+			this.getsheshilist()
 		},
 		methods: {
+			// 获取所有的房间与设施
+			getsheshilist(){
+				this.$u.get(`/app/room/getWifiList`).then(res => {
+					if (res.code == 200) {
+						this.sheshilist = res.data
+					}
+				})
+			},
+			// 点击删除wifi
+			btndel(wifiId){
+				let that = this
+				uni.showModal({
+					    title: '温馨提示',  
+					    content: '您确定要删除此WiFi吗?',  
+					    success: function (res) {  
+					        if (res.confirm) {
+								that.$u.delete(`/app/wifi/${wifiId}`).then(res => {
+									if (res.code == 200) {
+										uni.showToast({
+											title: '删除成功',
+											icon: 'success',
+											duration:2000
+										})
+										that.getwifilist()
+									}else{
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration:2000
+										})
+									}
+								})
+					        } else if (res.cancel) {
+					          
+					    }  
+					}  
+				})
+			},
+			// 新增wifi
+			btnadd(){
+				let data = {
+					wifi:this.wifiname,
+					password:this.wifipwd
+				}
+				this.$u.post(`/app/wifi`,data).then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '新增成功',
+							icon: 'success',
+							duration:2000
+						})
+						this.flag = false
+						this.getwifilist()
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration:2000
+						})
+					}
+				})
+			},
+			// 获取所有wifi列表
+			getwifilist(){
+				this.$u.get(`/app/wifi/list`).then(res => {
+					if (res.code == 200) {
+						this.wifilist = res.rows
+					}
+				})
+			},
 			// 点击修改WIFI
-			btnxg(){
+			btnxg(item){
+				this.wifiname = item.wifi
+				this.wifipwd = item.password
+				this.wifiid = item.wifiId
 				this.editflag = true
 			},
+			// 点击确认修改wifi
+			btnedit(){
+				let data = {
+					wifiId:this.wifiid,
+					wifi:this.wifiname,
+					password:this.wifipwd
+				}
+				this.$u.put(`/app/wifi`,data).then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration:2000
+						})
+						this.editflag = false
+						this.getwifilist()
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration:2000
+						})
+					}
+				})
+			},
 			// 点击房间或者大厅配置WIFI
-			btnroom(){
+			btnroom(objId){
 				uni.navigateTo({
-					url:'/page_fenbaotwo/wifixz'
+					url:'/page_fenbaotwo/wifixz?objId=' + objId
 				})
 			}
 			
diff --git a/page_fenbaotwo/wifixz.vue b/page_fenbaotwo/wifixz.vue
index af27ec9..154cd9c 100644
--- a/page_fenbaotwo/wifixz.vue
+++ b/page_fenbaotwo/wifixz.vue
@@ -8,13 +8,16 @@
         		WiFi列表
         	</view>
 			<view class="list_wifi">
-			   <view class="item_wifi" v-for="(item,index) in 5" :key="index">
-			   	 chuangteA
-			   </view>
+			   <!-- <view class="item_wifi" v-for="(item, index) in wifilist" @click="btnxz(item.wifiId)" :class="{ 'selected': selectedIds.includes(item.wifiId) }" :key="item.wifiId">
+			        {{ item.wifi }}
+			    </view> -->
+				<view class="item_wifi" v-for="(item, index) in wifilist" @click="btnxz(item.wifiId)" :id="selectedIds == item.wifiId ? 'active' : ''" :key="item.wifiId">
+				     {{ item.wifi }}
+				 </view>
 			</view>
         </view>
         <view class="anniu">
-        	<view class="">
+        	<view class="" @click="btnqr">
         		确认选择
         	</view>
         </view>
@@ -28,13 +31,60 @@
                 bgc: {
                 	backgroundColor: "#fff",
                 },
+				wifilist:[],
+				selectedIds: '',
+				objId:''
 			}
 		},
-		onLoad() {
-
+		onLoad(option) {
+			this.objId = option.objId
+            this.getwifilist()
 		},
 		methods: {
-			
+			// 获取所有wifi列表
+			getwifilist(){
+				this.$u.get(`/app/wifi/list`).then(res => {
+					if (res.code == 200) {
+						this.wifilist = res.rows
+					}
+				})
+			},
+			// 点击选择wifi
+            btnxz(id){
+				this.selectedIds = id
+				// const index = this.selectedIds.indexOf(id)
+				// if (index > -1) {
+				//   this.selectedIds.splice(index, 1)
+				// } else {
+				//   this.selectedIds.push(id)
+				// }
+				// console.log(this.selectedIds)
+			},
+		    // 确认选择wifi 
+			btnqr(){
+				let data = {
+					roomId:Number(this.objId),
+					wifiId:this.selectedIds
+				}
+				this.$u.put(`/app/room/setWifi`,data).then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '配置成功',
+							icon: 'success',
+							duration:2000
+						})
+						setTimeout(() =>{
+							uni.navigateBack()
+						},1000)
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration:2000
+						})
+					}
+				})
+			}
 		}
 	}
 </script>
@@ -44,6 +94,10 @@
 	/deep/ .u-title{
 		padding-bottom: 20rpx;
 	}
+	#active {
+	  background-color: #48893B !important;
+	  color: #fff !important;
+	}
 	.anniu{
 		width: 750rpx;
 		height: 152rpx;
diff --git a/page_moban/baojie.vue b/page_moban/baojie.vue
index 432bbe3..7bdbec6 100644
--- a/page_moban/baojie.vue
+++ b/page_moban/baojie.vue
@@ -23,7 +23,7 @@
 				<view class="list_val">
 					<view class="list_shop">
 						<view class="" style="font-size: 24rpx;color: #808080;">保洁单数</view>
-						<view class="" style="font-weight: 600;font-size: 28rpx;color: #3D3D3D;margin-top:18rpx;">2</view>
+						<view class="" style="font-weight: 600;font-size: 28rpx;color: #3D3D3D;margin-top:18rpx;">{{item.orderNum == null ? '--' : item.orderNum}}</view>
 					</view>
 					<view class="list_shebei">
 						<view class="" style="font-size: 24rpx;color: #808080;">所属店铺</view>
@@ -121,7 +121,7 @@
 			  })  
 		   },
 		   getlist() {
-		   	this.$u.get(`/app/user/list`).then(res => {
+		   	this.$u.get(`/app/user/list?userType=04`).then(res => {
 		   		if (res.code == 200) {
 		            this.wateringList = res.data
 		   		}
diff --git a/page_moban/baojieadd.vue b/page_moban/baojieadd.vue
index 58aa6b9..356ef7e 100644
--- a/page_moban/baojieadd.vue
+++ b/page_moban/baojieadd.vue
@@ -101,7 +101,7 @@
 						realName:this.level,
 						phonenumber:this.tel
 					}
-					this.$u.put(`/app/user/editCleaner`,data).then(res => {
+					this.$u.put(`/app/user/editUser`,data).then(res => {
 						if (res.code == 200) {
 					       uni.showToast({
 					       	title: '编辑成功',
diff --git a/page_moban/baojieorder.vue b/page_moban/baojieorder.vue
index cf2bb1a..03739f9 100644
--- a/page_moban/baojieorder.vue
+++ b/page_moban/baojieorder.vue
@@ -56,12 +56,12 @@
 				</view>
 				<view class="bot" v-if="item.status == 2">
 					<view class=""></view>
-					<view class="wc">完成保洁</view>
+					<view class="wc" @click.stop="btnwc">完成保洁</view>
 				</view>
-				<view class="bot" v-if="item.status == 1">
+				<!-- <view class="bot" v-if="item.status == 1">
 					<view class=""></view>
 					<view class="wc">开始保洁</view>
-				</view>
+				</view> -->
 			</view>
 			<view style="width: 100%;text-align: center;font-size: 32rpx;color: #ccc;font-weight: 600;margin-top: 30rpx;">
 				没有更多保洁订单啦...
@@ -90,6 +90,28 @@
             this.getlist()
 		},
 		methods: {
+			// 点击完成保洁
+			btnwc(cleanId){
+				this.$u.get(`/app/clean/completeCleaning?cleanId=${cleanId}`).then(res =>{
+					if(res.code == 200){
+						uni.showToast({
+							title: '保洁完成',
+							icon: 'success',
+							duration:2000
+						})
+						this.tabindex = 1
+						this.orderlist = []
+						this.pagenum = 1 
+						this.getlist()
+					}else{
+						uni.showToast({
+							title:res.msg,
+							icon: 'none',
+							duration:2000
+						})
+					}
+				})
+			},
 			// 点击切换列表状态
 			btntab(num){
 				this.tabindex = num
diff --git a/page_moban/datingxq.vue b/page_moban/datingxq.vue
index 0a64487..610887b 100644
--- a/page_moban/datingxq.vue
+++ b/page_moban/datingxq.vue
@@ -171,7 +171,7 @@
 						let id = getQueryParam(decodedValue, 'sn')
 						let that = this
 						let data = {
-							deviceId: id,
+							sn: id,
 							equipmentId: this.obj.equipmentId
 						}
 						that.$u.put(`/app/store/bandGate`, data).then(res => {
diff --git a/page_moban/hehuoren.vue b/page_moban/hehuoren.vue
index f4dc88a..ad6ed3d 100644
--- a/page_moban/hehuoren.vue
+++ b/page_moban/hehuoren.vue
@@ -2,18 +2,12 @@
 	<view class="page">
 		<u-navbar title="合伙人管理" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
         <view class="box">
-        	<view class="serch">
-        		<view class="lt">
-        			<image src="https://api.ccttiot.com/smartmeter/img/static/uaG7R4JLfYOzBhWfDN0j" mode=""></image><input type="text" v-model="keyword" placeholder="搜索"/> <view class="sousuo" @click="btnsousuo">搜索</view>
-        		</view>
-        	</view>
-			<view class="list" v-for="(item,index) in 2" :key="index" @click="btnxq(index)">
+			<view class="list" v-for="(item,index) in wateringList" :key="index" @click="btnxq(index)">
 				<view class="top">
 					<view class="lt" style="display: flex;align-items: center;">
 					    <image style="margin-right: 10rpx;width: 32rpx;
 						height: 32rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uSjKq6xJU3oPNzMRfaYp" mode=""></image> 
-						<view v-if="item.userName" class="" style="font-weight: 500;font-size: 24rpx;color: #3D3D3D;">{{item.userName}}-合伙人</view>
-						<view v-else class="" style="font-weight: 500;font-size: 24rpx;color: red;" @click.stop="qrFun(item.employId)">点击扫码绑定</view>
+						<view style="font-weight: 500;font-size: 24rpx;color: #3D3D3D;">{{item.realName == null ? '--' : item.realName}}-合伙人</view>
 					</view> 
 					<view class="rt" >
 						<text style="width: 9rpx;height: 9rpx;border-radius: 50%;margin-right: 5rpx;display: inline-block;background-color: #575B66;"></text>
@@ -21,119 +15,67 @@
 						<text style="width: 9rpx;height: 9rpx;border-radius: 50%;margin-right: 5rpx;display: inline-block;background-color: #575B66;"></text>
 					</view>
 					<view class="bianji" style="display: none;" :id="tabindex == index ? 'active' : ''">
-						<view class="" @click="btnedit(item.employId)">编辑合伙人</view>
-						<view class="" style="border: 0;color: #FF1C1C;" @click="btnshanchu(item.employId)">删除合伙人</view>
+						<view class="" @click="btnedit(item)">编辑合伙人</view>
+						<view class="" style="border: 0;color: #FF1C1C;" @click="btnshanchu(item.userId)">删除合伙人</view>
 					</view>
 				</view>
 				<view class="" style="width: 680rpx;height: 1px;background: #F0F0F0;margin-left: -30rpx;margin-top: 14rpx;"></view>
 				<view class="list_val">
 					<view class="list_shop">
 						<view class="" style="font-size: 24rpx;color: #808080;">绑定店铺</view>
-						<view class="" style="font-weight: 600;font-size: 28rpx;color: #3D3D3D;margin-top:18rpx;">{{item.storeName}}</view>
+						<view class="" style="font-weight: 600;font-size: 28rpx;color: #3D3D3D;margin-top:18rpx;">{{item.storeName == null ? '--' : item.storeName}}</view>
 					</view>
 					<view class="list_shebei">
 						<view class="" style="font-size: 24rpx;color: #808080;">月收入</view>
-						<view class="" style="font-weight: 600;font-size: 28rpx;color: #3D3D3D;margin-top:18rpx;">￥{{item.monthIncome == undefined ? '--' : item.monthIncome}}</view>
+						<view class="" style="font-weight: 600;font-size: 28rpx;color: #3D3D3D;margin-top:18rpx;">{{item.monthIncome == null ? '--'  : item.monthIncome}}</view>
 					</view>
 					<view class="list_shebei">
-						<view class="" style="font-size: 24rpx;color: #808080;">设备数</view>
-						<view class="" style="font-weight: 600;font-size: 28rpx;color: #3D3D3D;margin-top:18rpx;">{{item.deviceCount == undefined ? '--' : item.deviceCount}}台</view>
+						<view class="" style="font-size: 24rpx;color: #808080;">分成比例</view>
+						<view class="" style="font-weight: 600;font-size: 28rpx;color: #3D3D3D;margin-top:18rpx;">{{item.dividendProportion == null ? '--'  : item.dividendProportion * 10}}</view>
 					</view>
 				</view>
 				<view class="">
-					联系电话：18855566655
+					联系电话：{{item.phonenumber}}
 				</view>
 				<view class="" style="width: 680rpx;height: 1px;background: #F0F0F0;margin-left: -30rpx;margin-top: 14rpx;"></view>
 				<view class="" style="font-size: 24rpx;color: #3D3D3D;margin-top: 10rpx;width: 100%;display: flex;justify-content: space-between;">
-					<text>{{item.createTime}}</text>  <text>分成比例：{{item.point}}%</text>
+					<text>{{item.createTime == null ? '--' : item.createTime}}</text>  <text></text>
 				</view>
 			</view>
-			<view class="" style="width: 448rpx;height: 448rpx;margin: auto;margin-top: 100rpx;text-align: center;"
-				v-if="showflag">
-				<view class="" style="font-size: 30rpx;color: #ccc;margin-top: 30rpx;">暂无更多合伙人...</view>
+			<view class="" style="width: 448rpx;height: 448rpx;margin: auto;margin-top: 100rpx;text-align: center;">
+				<view class="" style="font-size: 30rpx;color: #ccc;margin-top: 30rpx;">没有更多合伙人啦...</view>
 			</view>
         </view>
 		
-		<view class="imgewm" v-if="imgflag">
-			<canvas canvas-id="qrcode" style="height: 100%;margin: 0 auto;" />
-			<view class="" style="width: 100%;text-align: center;font-size: 30rpx;">
-				请扫描二维码进行绑定
-			</view>
-		</view>
-		<view class="imgewmflag" v-if="imgflag"></view>
-		
 		<view class="xinjian" @click="btnadd">
 			新建合伙人
 		</view>
-		<view class="xinjians" v-if="imgflag" @click="imgflag = false">
-			关闭二维码
-		</view>
 	</view>
 </template>
 
 <script>
-	import uQRCode from '@/common/uqrcode.js'
 	export default {
 		data() {
 			return {
                 bgc: {
-                	backgroundColor: " #fff"
+                	backgroundColor: "#fff"
                 }, 
-				pagenum: 1,
 				wateringList: [],
-				pagesize: 10, // 一页多少数据
-				isLoading: false, // 是否正在加载数据  
-				noMoreData: false, // 是否没有更多数据  
-				total: 0,
 				keyword:'',
-				showflag: false,
 				tabindex:-1,
-				imgflag:false,
-				storeId:''
 			}
 		},
-		onLoad(option) {
-			this.storeId = option.storeId
+		onLoad() {
+			
 		},
 		onShow() {
-			// this.pagenum = 1
-			// this.wateringList = []
-			// this.tabindex = -1
-			// this.getlist()
-		},
-		onShareAppMessage: function() {
-			return {
-				title: '创想物联',
-				path: '/pages/shouye/index'
-			}
-		},
-		
-		// 分享到朋友圈  
-		onShareTimeline: function() {
-			return {
-				title: '创想物联',
-				query: '',
-				path: '/pages/shouye/index'
-			}
+			this.tabindex = -1
+			this.getlist()
 		},
 		methods: {
-			//**生成二维码**//
-			qrFun: function(employId) {
-				this.imgflag = true
-				uQRCode.make({
-					canvasId: 'qrcode',
-					text: 'https://kg.chuangtewl.com/h?i=' + employId,
-					size: 300,
-					margin: 0,
-					backgroundColor: '#ffffff',
-					foregroundColor: '#000000',
-					fileType: 'jpg',
-					errorCorrectLevel: uQRCode.errorCorrectLevel.H,
-				})
-			},
 			// 点击删除合伙人
-			btnshanchu(employId){
-				let employids = employId
+			btnshanchu(userId){
+				let employids = userId
 				let that = this
 				uni.showModal({
 				    title: '温馨提示',
@@ -141,10 +83,8 @@
 				    showCancel: true,
 				    success: function(res) {
 				        if (res.confirm) { 
-				            that.$u.delete(`/mch/storeStaff/${employids}`).then(res => {
+				            that.$u.delete(`/app/user/${userId}`).then(res => {
 				            	if (res.code == 200) {
-									that.pagenum = 1
-									that.wateringList = []
 									that.tabindex = -1
 									that.getlist()
 				                    uni.showToast({
@@ -167,12 +107,11 @@
 				})
 			},
 			// 点击跳转编辑合伙人
-			btnedit(employId){
+			btnedit(item){
 				uni.navigateTo({
-					url:'/page_moban/hehuorenadd?employId=' + employId + '&storeId=' + this.storeId
+					url:'/page_moban/hehuorenadd?item=' + JSON.stringify(item)
 				})
 			},
-			
            btnxq(index){
 			   if(this.tabindex == index){
 				   this.tabindex = -1
@@ -186,43 +125,12 @@
 			  })  
 		   },
 		   getlist() {
-		   	this.$u.get("/mch/storeStaff/list?pageNum=" + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' + this.keyword).then(res => {
+		   	this.$u.get(`/app/user/list?userType=05`).then(res => {
 		   		if (res.code == 200) {
-		               this.total = res.total
-					   if (this.total > 0) {
-					   	this.showflag = false
-					   } else {
-					   	this.showflag = true
-					   }
-		               if (res.rows.length > 0) {
-		               	// 有数据，追加到列表  
-		               	this.wateringList = this.wateringList.concat(res.rows)
-		               	this.pagenum++
-		               } else {
-		               	// 没有更多数据  
-		               	this.noMoreData = true
-		               }
-		               this.isLoading = false
+		            this.wateringList = res.data
 		   		}
 		   	})
 		   },
-		   searchs(){
-			this.pagenum = 1
-		   	this.wateringList = []
-		   	this.getlist()
-		   },
-		   onReachBottom() {
-		   	let sum = this.total / this.pagesize
-		   	if (this.pagenum-1 < sum) {
-		   		this.getlist(); // 上拉加载更多  
-		   	} else {
-		   		uni.showToast({
-		   			title: '没有更多代理人员了',
-		   			icon: 'none',
-		   			duration: 1000
-		   		})
-		   	}
-		   },
 		   
 		}
 	}
diff --git a/page_moban/hehuorenadd.vue b/page_moban/hehuorenadd.vue
index e004bdd..cc53d30 100644
--- a/page_moban/hehuorenadd.vue
+++ b/page_moban/hehuorenadd.vue
@@ -10,10 +10,10 @@
 					<view class="" style="padding-top:12rpx">合伙人名称</view> <input type="text" v-model="level"  placeholder="请输入合伙人名称" />
 				</view>
 				<view class="list_val">
-					<view class="" style="padding-top:12rpx">分成比例</view> <input type="text" v-model="ratio" placeholder="请输入分成比例%" />
+					<view class="" style="padding-top:12rpx">手机号码</view> <input type="text" v-model="tel" placeholder="请输入手机号码" />
 				</view>
 				<view class="list_val">
-					<view class="" style="padding-top:12rpx">手机号码</view> <input type="text" v-model="tel" placeholder="请输入手机号码" />
+					<view class="" style="padding-top:12rpx">分成比例</view> <input type="text" v-model="bili" placeholder="请输入分成比例%" />
 				</view>
 				<view class="list_val" style="position: relative;">
 					<view class="" style="padding-top:12rpx;width: 176rpx;">绑定店铺</view> <input @click="show = true" type="text" disabled="false" v-model="sheng" :placeholder="sheng" /> 
@@ -21,25 +21,6 @@
 					<u-select v-model="show" :list="arr" @confirm="confirm"></u-select>
 				</view>
 			</view>
-			<view class="title">
-				商户权限
-			</view>
-			<view class="swlist">
-				<view class="swlist_val" v-for="(item,index) in list" :key="index">
-					<view class="lt">
-						<view class="one">
-							{{item.name}}
-						</view>
-						<view class="two">
-							{{item.tit}}
-						</view>
-					</view>
-					<view class="rt">
-						<u-switch v-model="item.checked"  active-color="#48893B " size="36" inactive-color="#eee"></u-switch>
-					</view>
-				</view>
-				
-			</view>
 			<view class="baocun" @click="btncj">
 				{{tit}}
 			</view>
@@ -48,67 +29,40 @@
 </template>
 
 <script>
+import { number } from 'echarts'
+
 	export default {
 		data() {
 			return {
-				list:[
-					{name:'展示分成比例',tit:'是否展示分成比例',checked:false,txt:1},
-					{name:'设备管理显示',tit:'是否展示设备管理',checked:false,txt:2},
-					{name:'设备操作',tit:'是否允许设备操作',checked:false,txt:3},
-					{name:'订单管理',tit:'是否展示订单管理',checked:false,txt:4}
-				],
 				show:false,
 				bgc: {
 					backgroundColor: " #fff",
 				},
 				level:'',
-				name:'',
-				ratio:'',
 				tel:'',
 				sheng:'请选择店铺',
 				arr:[],
-				arrqx:[],
-				agentLevel:'',
 				storeId:'',
-				employId:'',
 				tit:'创建合伙人',
-				storeId:''
+				storeId:'',
+				userId:'',
+				bili:''
 			}
 		},
 		onLoad(option) {
-			this.storeId = option.storeId
-			if(option.employId){
+			if(option.item){
 				this.tit = '编辑合伙人'
-				this.employId = option.employId
-				this.getedit()
+				let obj = JSON.parse(option.item)
+				this.level = obj.userName
+				this.tel = obj.phonenumber
+				this.sheng = obj.storeName
+				this.storeId = obj.storeId
+				this.bili = Number(obj.dividendProportion) * 10
+				this.userId = obj.userId
 			}
 			this.getlist()
 		},
 		methods: {
-			// 请求编辑的合伙人
-			getedit(){
-				this.$u.get(`/mch/storeStaff/${this.employId}`).then(res => {
-					if (res.code == 200) {
-				        this.storeId = this.storeId
-				        this.ratio = res.data.point
-				        this.level = res.data.remark
-				        this.arrqx = res.data.permissions
-						this.sheng = res.data.storeName
-						const txtToItemMap = {}
-						this.list.forEach(item => {
-						  txtToItemMap[item.txt] = item
-						})
-						this.arrqx.forEach(txt => {
-						  const item = txtToItemMap[txt]
-						  if (item) {
-						    item.checked = true
-						  }
-						})
-						
-					}
-				})
-			},
-			
 			// 请求所有店铺
             getlist() {
             	this.$u.get(`/app/store/list?pageNum=1&pageSize=990&keyword=`).then(res => {
@@ -123,22 +77,14 @@
 			},
 			// 点击创建
 			btncj(){
-				this.arrqx = []
 				if(this.tit == '创建合伙人'){
-					this.list.forEach(item => {
-						if(item.checked == true){
-							this.arrqx.push(item.txt)
-						}
-					})
 					let data = {
+						phonenumber:this.tel,
+						realName:this.level,
 						storeId:this.storeId,
-						role:1,
-						point:this.ratio,
-						remark:this.level,
-						enabled: true,
-						permissions:this.arrqx
+						dividendProportion:Number(this.bili) / 10
 					}
-					this.$u.post(`/mch/storeStaff/`,data).then(res => {
+					this.$u.post(`/app/user/addPartner`,data).then(res => {
 						if (res.code == 200) {
 					       uni.showToast({
 					       	title: '创建成功',
@@ -157,21 +103,14 @@
 						}
 					})
 				}else{
-					this.list.forEach(item => {
-						if(item.checked == true){
-							this.arrqx.push(item.txt)
-						}
-					})
 					let data = {
-						employId:this.employId,
+						userId:this.userId,
 						storeId:this.storeId,
-						role:1,
-						point:this.ratio,
-						remark:this.level,
-						enabled: true,
-						permissions:this.arrqx
+						realName:this.level,
+						phonenumber:this.tel,
+						dividendProportion:Number(this.bili) / 10
 					}
-					this.$u.put(`/mch/storeStaff/`,data).then(res => {
+					this.$u.put(`/app/user/editUser`,data).then(res => {
 						if (res.code == 200) {
 					       uni.showToast({
 					       	title: '编辑成功',
diff --git a/page_moban/jichu.vue b/page_moban/jichu.vue
index 08cfc18..8717d1d 100644
--- a/page_moban/jichu.vue
+++ b/page_moban/jichu.vue
@@ -4,27 +4,48 @@
 			title-size='36' height='50' id="navbar">
 		</u-navbar>
         <view class="box">
-        	<view class="orderqx">
+        	<!-- <view class="orderqx">
         		<view class="top">
         			<view class="one">
         				订单取消设置
         			</view>
-        			<view class="two">
+        			<view class="two" @click="delflag = !delflag">
         				编辑
         			</view>
         		</view>
         		<view class="toptab">
         			<view class="">取消时长</view>
         			<view class="">违约金</view>
+					<view class="" v-if="delflag">操作</view>
         		</view>
-        		<view class="bottab" v-for="(item,index) in 6" :key="index">
-        			<view class="">开始前30分钟外</view>
-        			<view class="">不收取</view>
+        		<view class="bottab" v-for="(item,index) in 3" :key="index">
+        			<view class="">开始前30分钟内</view>
+        			<view class="">10%</view>
+					<view class="" v-if="delflag">
+						<text style="color: #000;" @click="btnxg(item)">编辑</text> <text @click="btndel(item.wifiId)">删除</text>
+					</view>
         		</view>
-        		<view class="addpz">
+        		<view class="addpz" @click="flag = true">
         			添加取消配置
         		</view>
-        	</view> 
+        	</view> -->
+			<view class="ones">
+				<view class="">
+					取消时长
+				</view>
+				<view class="">
+					开始前<input type="text" v-model="min" placeholder="输入"/>分钟内
+				</view>
+			</view>
+			<view class="ones">
+				<view class="">
+					违约金
+				</view>
+				<view class="">
+			        收取订单<input type="text" v-model="price" placeholder="输入"/>%					
+				</view>
+			</view>
+			
         	<view class="orderqx">
         		<view class="top">
         			<view class="one">
@@ -36,15 +57,15 @@
         	    		保洁通知
         	    	</view>
         			<view class="two">
-        				通知给商户 <u-icon name="arrow-right" color="#7C7C7C" size="28"></u-icon>
+        				{{onetxt}} <u-icon name="arrow-right" color="#7C7C7C" size="28"></u-icon>
         			</view>
         	    </view>
-        		<view class="tongzhi" style="border: none;padding-bottom: 0;" @click="showtwo = true">
+        		<view class="tongzhi" style="border: none;padding-bottom: 0;">
         			<view class="one">
         				保洁时长
         			</view>
         			<view class="two">
-        				30分钟 <u-icon name="arrow-right" color="#7C7C7C" size="28"></u-icon>
+        				<input type="text" v-model="twotxt" placeholder="输入时间" /><view class="">分钟 <u-icon name="arrow-right" color="#7C7C7C" size="28"></u-icon></view>
         			</view>
         		</view>
         	</view> 
@@ -54,22 +75,47 @@
         				订单设置
         			</view>
         		</view>
-        		<view class="tongzhi" style="border: none;padding-bottom: 0;" @click="showthr = true">
+        		<view class="tongzhi" style="border: none;padding-bottom: 0;">
         			<view class="one">
-        				提前开始使用限制
+        				提前开始使用
         			</view>
         			<view class="two">
-        				5分钟 <u-icon name="arrow-right" color="#7C7C7C" size="28"></u-icon>
+        				<input type="text" v-model="thrtxt" placeholder="输入时间" /><view class="">分钟 <u-icon name="arrow-right" color="#7C7C7C" size="28"></u-icon></view>
         			</view>
         		</view>
         	</view> 
         </view>
 		
-		<u-select v-model="showone" :list="listone"></u-select>
-		<u-select v-model="showtwo" :list="listtwo"></u-select>
-		<u-select v-model="showthr" :list="listthr"></u-select>
+		<view class="mask" v-if="flag"></view>
+		<view class="addwifi" v-if="flag">
+			<view class="name">
+				添加取消配置
+			</view>
+			<view class="one">
+				<view class="">
+					取消时长
+				</view>
+				<view class="">
+					开始前<input type="text" v-model="wifiname" placeholder="输入"/>分钟内
+				</view>
+			</view>
+			<view class="one">
+				<view class="">
+					违约金
+				</view>
+				<view class="">
+                    收取订单<input type="text" v-model="wifipwd" placeholder="输入"/>%					
+				</view>
+			</view>
+			<view class="baocun" @click="btnadd">
+				保存
+			</view>
+			<view class="cha" @click="flag = false">×</view>
+		</view>
+		
+		<u-select v-model="showone" :list="listone" @confirm="confirmone"></u-select>
 		<view class="anniu">
-			<view class="">
+			<view class="" @click="btnbc">
 				保存
 			</view>
 		</view>
@@ -84,53 +130,92 @@
                 	backgroundColor: "#fff",
                 },
 				showone: false,
+				flag:false,
+				min:'',
+				price:'',
 				listone: [
 					{
-						value: '1',
-						label: '通知给用户'
-					},
-					{
-						value: '2',
+						value: '0',
 						label: '不通知'
+					},{
+						value: '1',
+						label: '通知给商户'
+					},{
+						value: '2',
+						label: '通知给保洁'
+					},{
+						value: '3',
+						label: '通知商户和保洁'
 					}
 				],
 				showtwo: false,
-				listtwo: [
-					{
-						value: '2',
-						label: '10分钟'
-					},
-					{
-						value: '1',
-						label: '30分钟'
-					},
-					{
-						value: '2',
-						label: '45分钟'
-					}
-				],
-				showthr: false,
-				listthr: [
-					{
-						value: '2',
-						label: '5分钟'
-					},
-					{
-						value: '1',
-						label: '10分钟'
-					},
-					{
-						value: '2',
-						label: '30分钟'
-					}
-				],
+				delflag:false,
+				cleanDuration:'',
+				cleanNotice:'',
+				onetxt:'',
+				twotxt:'',
+				thrtxt:'',
+				beforeTime:''
 			}
 		},
 		onLoad() {
-
+            this.getinfo()
 		},
 		methods: {
-			
+			// 获取个人信息拿到基础信息
+			getinfo(){
+				this.$u.get(`/getAppInfo`).then(res => {
+					if(res.code == 200){
+						this.min = res.user.agoCancel
+						this.price = res.user.penalty * 10
+						this.twotxt = res.user.cleanDuration
+						this.thrtxt = res.user.beforeTime
+						this.cleanNotice = res.user.cleanNotice
+						if(res.user.cleanNotice == 0){
+							this.onetxt = '不通知'
+						}else if(res.user.cleanNotice == 1){
+							this.onetxt = '通知给商户'
+						}else if(res.user.cleanNotice == 2){
+							this.onetxt = '通知给保洁'
+						}else if(res.user.cleanNotice == 3){
+							this.onetxt = '通知商户和保洁'
+						}
+					}
+				})
+			},
+			// 保存基础设置
+			btnbc(){
+				let data = {
+					agoCancel:this.min, //最少时长
+					penalty:this.price / 10, //百分比
+					cleanDuration:this.twotxt, //保洁时长
+					cleanNotice:this.cleanNotice, //通知类型
+					beforeTime:this.thrtxt //提前开始使用
+				}
+				this.$u.post(`/app/user/basicConfig`,data).then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'success',
+							duration:2000
+						})
+						setTimeout(()=>{
+							uni.navigateBack()
+						},2000)
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration:2000
+						})
+					}
+				})
+			},
+			// 点击确定选择通知
+			confirmone(e){
+				this.cleanNotice = e[0].value
+				this.onetxt = e[0].label
+			},
 		}
 	}
 </script>
@@ -140,6 +225,104 @@
 	/deep/ .u-title{
 		padding-bottom: 20rpx;
 	}
+	.ones{
+		display: flex;
+		    justify-content: space-between;
+		    padding-bottom: 34rpx;
+		    /* border-bottom: 1px solid #D8D8D8; */
+		    /* margin-top: 58rpx; */
+		    box-sizing: border-box;
+		    font-size: 32rpx;
+		    color: #3D3D3D;
+		    background-color: #fff;
+		    width: 680rpx;
+		    padding: 0 20rpx;
+		    box-sizing: border-box;
+		    height: 100rpx;
+		    line-height: 100rpx;
+		    margin: auto;
+		    margin-top: 30rpx;
+		    border-radius: 16rpx;
+		view{
+			display: flex;
+			input{
+				width: 80rpx;
+				margin-left: 10rpx;
+				height: 100rpx;
+				line-height: 100rpx;
+			}
+		}
+	}
+	.addwifi{
+		width: 750rpx;
+		height: 598rpx;
+		background: #FFFFFF;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		border-radius: 50rpx  50rpx 0 0;
+		padding: 0 72rpx;
+		box-sizing: border-box;
+		.cha{
+			color: #3D3D3D;
+			font-size: 50rpx;
+			font-weight: 600;
+			position: absolute;
+			top: 30rpx;
+			right: 30rpx;
+		}
+		.baocun{
+			width: 680rpx;
+			height: 104rpx;
+			background: #48893B;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			margin: auto;
+			text-align: center;
+			line-height: 104rpx;
+			border-radius: 24rpx;
+			position: fixed;
+			left: 50%;
+			transform: translateX(-50%);
+			bottom: 32rpx;
+		}
+		.one{
+			display: flex;
+			justify-content: space-between;
+			padding-bottom: 34rpx;
+			border-bottom: 1px solid #D8D8D8;
+			margin-top: 58rpx;
+			box-sizing: border-box;
+			font-size: 32rpx;
+			color: #3D3D3D;
+			view{
+				display: flex;
+				input{
+					width: 80rpx;
+					margin-left: 10rpx;
+				}
+			}
+		}
+		.name{
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #3D3D3D;
+			width: 100%;
+			text-align: center;
+			margin-top: 42rpx;
+			margin-bottom: 86rpx;
+		}
+	}
+	.mask{
+		width: 100%;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background-color: #000;
+		opacity: .2;
+	}
 	.box{
 		height: 80vh;
 		overflow: scroll;
@@ -198,6 +381,21 @@
 			padding-bottom: 20rpx;
 			box-sizing: border-box;
 			border-bottom: 1px solid #D8D8D8;
+			.two{
+				font-size: 28rpx;
+				display: flex;
+				align-items: center;
+				/deep/ .uicon-arrow-right{
+					padding-bottom: 0;
+				}
+				input{ 
+					width: 200rpx;
+					height: 22rpx;
+					line-height: 22rpx;
+					text-align: right;
+					margin-right: 20rpx;
+				}
+			}
 		}
 		.bottab{
 			width: 100%;
@@ -209,6 +407,11 @@
 			view{
 				width: 50%;
 				text-align: center;
+				text{
+					display: inline-block;
+					margin-left: 20rpx;
+					color: red;
+				}
 			}
 		}
 		.toptab{
@@ -235,6 +438,11 @@
 			.two{
 				font-size: 28rpx;
 				color: #48893B;
+				display: flex;
+				align-items: center;
+				input{ 
+					width: 200rpx;
+				}
 			}
 		}
 	}
diff --git a/page_shanghu/cesuoxq.vue b/page_shanghu/cesuoxq.vue
index 325eec6..b9e371e 100644
--- a/page_shanghu/cesuoxq.vue
+++ b/page_shanghu/cesuoxq.vue
@@ -209,7 +209,7 @@
 						let id = getQueryParam(decodedValue, 'sn')
 						let that = this
 						let data = {
-							deviceId: id,
+							sn: id,
 							equipmentId: this.obj.equipmentId
 						}
 						that.$u.put(`/app/store/bandGate`, data).then(res => {
diff --git a/page_shanghu/roomsheshi.vue b/page_shanghu/roomsheshi.vue
index 5414e70..380736e 100644
--- a/page_shanghu/roomsheshi.vue
+++ b/page_shanghu/roomsheshi.vue
@@ -216,7 +216,7 @@
 						let id = getQueryParam(decodedValue, 'sn')
 						let that = this
 						let data = {
-							deviceId: id,
+							sn: id,
 							equipmentId: this.obj.equipmentId
 						}
 						that.$u.put(`/app/store/bandGate`, data).then(res => {
diff --git a/page_shanghu/toufsb.vue b/page_shanghu/toufsb.vue
index a11b6bb..58e08d6 100644
--- a/page_shanghu/toufsb.vue
+++ b/page_shanghu/toufsb.vue
@@ -239,7 +239,7 @@
 						let id = getQueryParam(decodedValue, 'sn')
 						let that = this
 						let data = {
-							deviceId: id,
+							sn: id,
 							equipmentId: this.xxobj.equipmentId
 						}
 						that.$u.put(`/app/store/bandGate`, data).then(res => {
diff --git a/page_shanghu/yunying.vue b/page_shanghu/yunying.vue
index cc21732..67ede40 100644
--- a/page_shanghu/yunying.vue
+++ b/page_shanghu/yunying.vue
@@ -140,7 +140,7 @@
 </template>
 
 <script>
-	import * as echarts from '@/uni_modules/lime-echart/static/echarts.min.js';
+	// import * as echarts from '@/uni_modules/lime-echart/static/echarts.min.js';
 	export default {
 		data() {
 			return {
@@ -156,7 +156,7 @@
 		},
 		onShow() {
 			//加载折线图数据
-			this.loadLineData2() 
+			// this.loadLineData2() 
 		},
 		mounted() {
 
diff --git a/page_user/bangzhuxq.vue b/page_user/bangzhuxq.vue
new file mode 100644
index 0000000..11fdede
--- /dev/null
+++ b/page_user/bangzhuxq.vue
@@ -0,0 +1,54 @@
+<template>
+	<view>
+		<u-navbar :is-back="true" :title='obj.title' title-color="#000" :border-bottom="false" :background="bgc" 
+			id="navbar">
+		</u-navbar>
+         <view class="" v-html="obj.content">
+         	
+         </view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+			data() {
+				return {
+					bgc: {
+						backgroundColor: "#fff",
+					},
+					active:1,
+					flag:false,
+					obj:{}
+				}
+			},
+			onLoad(option) {
+                this.classifyId = option.classifyId		
+				this.$u.get(`app/article/${this.classifyId}`).then(res => {
+					if(res.code == 200){
+						this.obj = res.data
+					}
+				})
+			},
+			methods:{
+				
+			}
+		}
+</script>
+
+<style lang="less">
+	/deep/ .u-title{
+		margin-bottom: 22rpx;
+	}
+	/deep/ .uicon-nav-back{
+		margin-bottom: 22rpx;
+	}
+	page{
+		width: 100%;
+		padding: 20rpx 30rpx;
+		box-sizing: border-box;
+		background-color: #fff;
+	}
+
+
+</style>
\ No newline at end of file
diff --git a/page_user/changjian.vue b/page_user/changjian.vue
index 470141d..0bc51b0 100644
--- a/page_user/changjian.vue
+++ b/page_user/changjian.vue
@@ -47,7 +47,7 @@
 		methods: {
 			// 获取常见问题
 			getchangjian(){
-				this.$u.get(`app/article/21`).then(res => {
+				this.$u.get(`/app/article/21`).then(res => {
 					if (res.code == 200) {
 						this.content = res.data.content
 					}
diff --git a/pages.json b/pages.json
index 85cc376..e09782b 100644
--- a/pages.json
+++ b/pages.json
@@ -104,6 +104,13 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},{
+					"path": "bangzhuxq",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				},{
 					"path": "lijikaishi",
 					"style": {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 4e62cc6..6fb2fb4 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -34,7 +34,7 @@
 				没有账户？ <text @click="btnljdl">去注册</text>
 			</view>
 			<view class="wxlogo">
-				——————  其他登录方式  ——————
+				—————  其他登录方式  —————
 			</view>
 			<button class="lofo" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uxWMldLMb888YHm0qOgN" mode=""></image>
diff --git a/pages/login/zhuce.vue b/pages/login/zhuce.vue
index af9404e..43acc6f 100644
--- a/pages/login/zhuce.vue
+++ b/pages/login/zhuce.vue
@@ -37,7 +37,7 @@
 				已有账户？ <text @click="btnljdl">去登录</text>
 			</view>
 			<view class="wxlogo">
-				——————  其他登录方式  ——————
+				—————  其他登录方式  —————
 			</view>
 			<button class="lofo" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uxWMldLMb888YHm0qOgN" mode=""></image>