diff --git a/page_user/about.vue b/page_user/about.vue
index 27033f8..67fe4b4 100644
--- a/page_user/about.vue
+++ b/page_user/about.vue
@@ -27,7 +27,14 @@
 		},
 		methods: {
              getabout(){
-				 let type = 'about'
+				 let type = ''
+				 if(this.tit == '用户协议'){
+					 type = 'user'
+				 }else if(this.tit == '隐私政策'){
+					 type = 'privacy'
+				 }else if(this.tit == '关于我们'){
+					 type = 'about'
+				 }
 				 this.$u.get(`/app/article/licence/${type}`).then((res) => {
 				 	if (res.code == 200) {
 				 		this.obj= res.data
@@ -40,7 +47,7 @@
 
 <style lang="scss">
 	page {
-		background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
+		background: linear-gradient(180deg, #54DAA1 0%, rgba(255, 255, 255, 0) 100%);
 	}
 
 	.page {
diff --git a/page_user/daili/cjdaili.vue b/page_user/daili/cjdaili.vue
index d3bd260..16cf3b5 100644
--- a/page_user/daili/cjdaili.vue
+++ b/page_user/daili/cjdaili.vue
@@ -7,7 +7,7 @@
         	</view>
 			<view class="list">
 				<view class="list_val">
-					<view class="" style="padding-top:12rpx">代理级别</view> <input type="text" v-model="level" disabled="false" placeholder="2级代理" />
+					<view class="" style="padding-top:12rpx">代理级别</view> <input type="text" v-model="level" disabled="false" :placeholder="agentLevel + 1 + '级代理'" />
 				</view>
 				<view class="list_val">
 					<view class="" style="padding-top:12rpx">代理名称</view> <input type="text" v-model="name" placeholder="请输入代理名称" />
@@ -73,9 +73,13 @@
 				tel:'',
 				sheng:'请选择省市区',
 				arr:[],
-				arrqx:[]
+				arrqx:[],
+				agentLevel:''
 			}
 		},
+		onLoad() {
+			this.agentLevel = uni.getStorageSync('userdata').agentLevel
+		},
 		methods: {
             confirm(e){
 				this.arr = []
@@ -116,7 +120,7 @@
 					})
 				}else{
 					this.arrqx = []
-					const mapping = {  
+					let mapping = {  
 					    '允许登录': 'agent:login',  
 					    '允许提现': 'agent:withdraw',  
 					    '展示分成比例': 'agent:point:show',  
diff --git a/page_user/ditu.vue b/page_user/ditu.vue
index dcbe8a5..2ed8abf 100644
--- a/page_user/ditu.vue
+++ b/page_user/ditu.vue
@@ -130,7 +130,12 @@
 			                            longitude: item.lng,  
 			                            width: 25,  
 			                            height: 30,  
-			                            iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw' 
+			                            iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw' ,
+										label: {
+											content: item.name,
+											// anchorX:-20,
+											textAlign: 'center'
+										}
 			                        };  
 			                        this.covers.push(shopCover); 
 			                    });  
diff --git a/page_user/listshu/edit.vue b/page_user/listshu/edit.vue
index 44731bd..59c99c5 100644
--- a/page_user/listshu/edit.vue
+++ b/page_user/listshu/edit.vue
@@ -8,24 +8,24 @@
 			<!-- 代理 -->
 			<view class="list">
 				<view class="list_val">
-					<view class="" style="padding-top:12rpx">代理级别</view> <input type="text" disabled="false" placeholder="2级代理" />
+					<view class="" style="padding-top:12rpx">代理级别</view> <input type="text" disabled="false" :placeholder="jibie" />
 				</view>
 				<view class="list_val">
-					<view class="" style="padding-top:12rpx">代理名称</view> <input type="text" placeholder="请输入代理名称" />
+					<view class="" style="padding-top:12rpx">代理名称</view> <input type="text" v-model="name" placeholder="请输入代理名称" />
 				</view>
 				<view class="list_val">
-					<view class="" style="padding-top:12rpx">分成比例</view> <input type="text" placeholder="请输入分成比例  %" />
+					<view class="" style="padding-top:12rpx">分成比例</view> <input type="text" v-model="fenc" placeholder="请输入分成比例  %" />
 				</view>
+			<!-- 	<view class="list_val">
+					<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" placeholder="请输入手机号码" />
-				</view>
-				<view class="list_val">
-					<view class="" style="padding-top:12rpx;margin-right: 88rpx;">省市区</view> <input @click="show = true" type="text" placeholder="请选择省市区" />
+					<view class="" style="padding-top:12rpx;margin-right: 88rpx;">省市区</view> <input @click="show = true" disabled="true" type="text" :placeholder="sheng" />
 					<u-picker v-model="show" mode="region" @confirm="confirm"></u-picker>
 				</view>
 			</view>
        
-			<view class="baocun">
+			<view class="baocun" @click="brnbc">
 				保存
 			</view>
         </view>
@@ -36,20 +36,89 @@
 	export default {
 		data() {
 			return {
-                checked: false,
 				show:false,
 				bgc: {
 					backgroundColor: " #25CE88",
 				},
-				
+				name:'',
+				fenc:'',
+				tel:'',
+				sheng:'请选择省市区',
+				listobj:{},
+				jibie:'',
+				agentId:'',
+				shengarr:[]
 			}
 		},
-		onLoad() {
-			
+		onLoad(option) {
+			this.listobj = JSON.parse(option.obj)
+			this.jibie = this.listobj.level + '级代理'
+			this.name = this.listobj.name
+			this.fenc = this.listobj.point
+			this.tel = this.listobj.mobile
+			this.sheng = this.listobj.area[0]+ '/' + this.listobj.area[1]+ '/' + this.listobj.area[2]
+			this.agentId = this.listobj.agentId
+			this.shengarr.push(this.listobj.area[0])
+			this.shengarr.push(this.listobj.area[1])
+			this.shengarr.push(this.listobj.area[2])
 		},
 		methods: {
             confirm(e){
-				console.log(e);
+				this.shengarr = []
+				this.sheng = e.province.label + '/' + e.city.label + '/' + e.area.label 
+				this.shengarr.push(e.province.label)
+				this.shengarr.push(e.city.label)
+				this.shengarr.push(e.area.label)
+			},
+			brnbc(){
+				let data = {
+					agentId:this.agentId,
+					name:this.name,
+					point:this.fenc,
+					// mobile:this.tel,
+					area:this.shengarr
+				}
+				this.$u.put('/agent/agent',data).then(res => {
+					if(this.name == ''){
+						uni.showToast({
+							title: '请输入姓名',
+							icon: 'none',
+							duration: 1000
+						})
+					}else{
+						if (res.code == 200) {
+						    uni.showToast({
+						    	title: '修改成功',
+						    	icon: 'success',
+						    	duration: 1000
+						    })
+						    setTimeout(()=>{
+						    	uni.navigateBack({
+									delta:2
+								})
+						    },1500)
+						}else if(res.msg == '请输入正确的手机号'){
+							uni.showToast({
+								title: '请输入正确的手机号',
+								icon: 'none',
+								duration: 1000
+							})
+						}else if(res.msg == '分成比例不允许超过上级代理，最高：90.00'){
+							uni.showToast({
+								title: '分成比例不允许超过上级代理，最高：90.00',
+								icon: 'none',
+								duration: 1000
+							})
+						}else if(res.code == 500){
+							uni.showToast({
+								title: '分成比例请填写数值，最高：90.00',
+								icon: 'none',
+								duration: 1000
+							})
+						}
+					}
+					
+				})
 			}
 		}
 	}
diff --git a/page_user/listshu/xqdetail.vue b/page_user/listshu/xqdetail.vue
index 56cc0d6..d37ec11 100644
--- a/page_user/listshu/xqdetail.vue
+++ b/page_user/listshu/xqdetail.vue
@@ -68,7 +68,7 @@
 					})
 				}else if(num == 2){
 					uni.navigateTo({
-						url:'/page_user/listshu/edit?obj=' + this.listobj
+						url:'/page_user/listshu/edit?obj=' + JSON.stringify(this.listobj)
 					})
 				}else if(num == 3){
 					let vm = this
diff --git a/page_user/shopdetail.vue b/page_user/shopdetail.vue
index 560a1e8..fb279bc 100644
--- a/page_user/shopdetail.vue
+++ b/page_user/shopdetail.vue
@@ -43,7 +43,8 @@
 				storeId:'',
 				listobj:{},
 				flag:false,
-				flags:false
+				flags:false,
+				cabinetSn:''
 			}
 		},
 		onLoad(option) {
@@ -110,6 +111,16 @@
 						scanType: ['qrCode'],
 						success: res => {
 							console.log('扫描结果：', res);
+							this.cabinetSn = res.result
+							this.$u.put(`/agent/cabinet/${this.storeId}/bind/${this.cabinetSn}`).then(res => {
+								if(res.code == 200){
+									uni.showToast({
+										title: '绑定成功',
+										icon: 'none',
+										duration:1000
+									});
+								}
+							})
 						},
 						fail: err => {
 							console.error('扫描失败：', err);
diff --git a/page_user/yajin/index.vue b/page_user/yajin/index.vue
index 5a83404..65ef964 100644
--- a/page_user/yajin/index.vue
+++ b/page_user/yajin/index.vue
@@ -13,7 +13,7 @@
 				</view>
 				<view class="wz">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/urpodioxdcaz8ukriOZN" mode=""></image>
-					3元/小时，租借5分钟内免费
+					{{fee.feePrice}}元/小时，租借{{fee.feeFreeTime}}分钟内免费
 				</view>
 				<view class="wz">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/urpodioxdcaz8ukriOZN" mode=""></image>
@@ -21,7 +21,7 @@
 				</view>
 				<view class="wz">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/urpodioxdcaz8ukriOZN" mode=""></image>
-					每24小时封顶30元，总分顶99元
+					每24小时封顶{{sum}}元，总封顶{{fee.feeMaxPrice}}元
 				</view>
 				<view class="mianyj" @click="btnzu">
 					免押金租借
@@ -67,7 +67,7 @@
 			<view class="" style="text-align: right;margin-right: 40rpx;font-size: 40rpx;" @click="btnyc">X</view>
 			<view class="fen">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uW2U0U93W2oTmDlLf7mA" mode=""></image>
-				<text>611</text>
+				<text>{{wxf}}</text>
 			</view>
 			<view class="tit">你的微信支付分已达标 </view>
 			<view class="tit">可享租借充电宝免押金￥99.00</view>
@@ -83,8 +83,8 @@
 			<view class="yuedu">
 				请仔细阅读《微信支付分押金规则》，同意协议请 点击按钮
 			</view>
-			<view class="anniu">
-				确认并支付
+			<view class="anniu" @click="btnzujie">
+				确认并租借
 			</view>
 		</view>
 	</view>
@@ -99,17 +99,70 @@
 				},
 				show: false,
 				depositfalse: false,
-				deposittrue:false
+				deposittrue:false,
+				sn:'',
+				fee:{},
+				sum:0,
+				wxf:''
 			}
 		},
+		onLoad(option) {
+			this.sn = option.sn
+			this.getemi()
+			this.getwxf()
+		},
 		methods: {
 			btnzu() {
-                // this.depositfalse = true
-				this.deposittrue = true
+			    if(this.wxf > 550){
+					this.deposittrue = true
+				}else{
+					this.depositfalse = true
+				}
 			},
 			btnyc() {
 				this.depositfalse = false
 				this.deposittrue = false
+			},
+			
+			getemi(){
+				this.$u.get(`/app/cabinet/rentInfo/${this.sn}`).then(res => {
+					if(res.code == 200){
+						this.fee = res.data.fee
+						this.sum = this.fee.feePrice * 24
+					}
+				})
+			},
+			getwxf(){
+				this.$u.get('/wx/pay/score').then(res => {
+					if(res.code == 200){
+						this.wxf = res.data.userScore
+					}
+				})
+			},
+			
+			// 确认并租借
+			btnzujie(){
+				let data = {
+					cabinetSn:this.sn,
+					rentType:2,
+					fee:{
+						feePrice:this.fee.feePrice,
+						feeMode:this.fee.feeMode,
+						feeMaxPrice:this.fee.feeMaxPrice,
+						feeFreeTime:this.fee.feeFreeTime
+					}
+				}
+				this.$u.post('/app/order/rent',data).then(res => {
+					if(res.code == 200){
+						
+					}else if(res.code == 500){
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				})
 			}
 		}
 	}
diff --git a/pages.json b/pages.json
index 06fc904..5c7157c 100644
--- a/pages.json
+++ b/pages.json
@@ -476,6 +476,13 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},{
+					"path": "aboutxq",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				}
 
 
diff --git a/pages/abbr/index.vue b/pages/abbr/index.vue
index ec262ec..381050d 100644
--- a/pages/abbr/index.vue
+++ b/pages/abbr/index.vue
@@ -1,39 +1,31 @@
 <template>
 	<view class="page">
-		<u-navbar title="客服中心" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
+		<u-navbar title="常见问题" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
 			height='38'></u-navbar>
 		<view class="serch">
-			<u-search placeholder="搜索问题" height="72" :showAction="false" v-model="keyword"></u-search>
+			<u-search placeholder="搜索问题" height="72" :showAction="false" v-model="keyword" @change="sousuo"></u-search>
 		</view>
 
-		<view class="list">
+		<view class="list" v-if="!listitem.length == 0">
 			<view class="tab">
-			     	<u-tabs :list="list" :is-scroll="true" :current="current" active-color="#38D492" bar-width="80" gutter="40" item-width="200" @change="change"></u-tabs>
+				<u-tabs :list="list" :is-scroll="true" :current="current" active-color="#38D492" bar-width="80"
+					gutter="40" item-width="200" @change="change"></u-tabs>
 			</view>
-			<view class="wenti">
-				<view class="wzwt">
-					<text>充电宝没弹出但扣费了</text> <u-icon name="arrow-right"></u-icon>
-				</view>
-				<view class="wzwt">
-					<text>租借的充电宝电量不足</text> <u-icon name="arrow-right"></u-icon>
-				</view>
-				<view class="wzwt">
-					<text>充电宝无法充电</text> <u-icon name="arrow-right"></u-icon>
-				</view>
-				<view class="wzwt">
-					<text>可归还机离线/断电/故障</text> <u-icon name="arrow-right"></u-icon>
-				</view>
-				<view class="wzwt">
-					<text>充电宝无法归还（商家打烊/机柜满仓）</text> <u-icon name="arrow-right"></u-icon>
-				</view>
-				<view class="wzwt">
-					<text>购买充电宝后能退款吗</text> <u-icon name="arrow-right"></u-icon>
+			<view class="wenti" v-for="(item,index) in listitem" :key="index">
+				<view class="wzwt" @click="btnxq(item.articleId)">
+					<text>{{item.title}}</text> <u-icon name="arrow-right"></u-icon>
 				</view>
+
 			</view>
-			<view class="huan">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/uH9hJJuhEDQw4JBGy9kS" mode=""></image> 换一换
+			<view class="huan" @click="btnhuan" v-if="list[0].name == '猜你想问'">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uQyHxbK49U3S5f4uLU6m" mode=""></image> 换一换
 			</view>
 		</view>
+		<view class="" v-if="listitem.length == 0" style="width: 100%;margin-top: 50rpx;text-align: center;">
+			<image src="https://api.ccttiot.com/smartmeter/img/static/uO8bv6yv8Icg5hlbKccj" mode="" style="width: 430rpx;height: 430rpx;"></image>
+			<text
+				style="display: block;font-size: 36rpx;color: #666;margin-top: 30rpx;font-weight: 600;">您搜索的问题暂无相关分类</text>
+		</view>
 
 	</view>
 </template>
@@ -42,26 +34,84 @@
 	export default {
 		data() {
 			return {
-				list: [{
-					name: '猜你想问',
-				}, {
-					name: '常见问题',
-				}, {
-					name: '费用问题'
-				}, {
-					name: '归还问题'
-				}, {
-					name: '使用问题'
-				}],
-				current:0
+				list: [],
+				current: 0,
+				classifyId: '',
+				listitem: [],
+				huanindex: 1,
+				keyword: ''
 			}
 		},
 		onLoad() {
-          
+			this.getfenlei()
+			setTimeout(() => {
+				this.getlists()
+			}, 1000)
 		},
 		methods: {
-			change(index){
-			this.current = index;
+			sousuo() {
+				this.huanindex = 1
+				this.getfenlei()
+			},
+
+			getfenlei() {
+				this.$u.get('/app/article/problem/list', {
+					keyword: this.keyword
+				}).then(res => {
+					if (res.rows.length != 0) {
+						this.list = res.rows.map(row => ({
+							name: row.classifyName,
+							classifyId: row.classifyId
+						}))
+						if (this.list.length != 0) {
+							this.classifyId = this.list[1].classifyId
+							this.getlists()
+						}
+					} else {
+						this.listitem = []
+					}
+				})
+			},
+			btnhuan() {
+				if (this.list.length != 0) {
+					this.classifyId = this.list[this.huanindex++].classifyId
+					// this.current++
+					if (this.huanindex == this.list.length) {
+						this.huanindex = 1
+					}
+					// if(this.current == this.list.length){
+					// 	this.current = 0
+					// }
+					this.getlists()
+				}
+
+			},
+			btnxq(id) {
+				uni.navigateTo({
+					url: '/page_user/aboutxq?id=' + id
+				})
+			},
+			change(index) {
+				if (index == 0) {
+					this.classifyId = this.list[index + 1].classifyId
+					this.current = index;
+					this.getlists()
+				} else {
+					this.classifyId = this.list[index].classifyId
+					this.current = index;
+					this.getlists()
+				}
+
+			},
+			getlists() {
+				this.$u.get('/app/article/list?classifyId=' + this.classifyId + '&pageNum=' + 1 + '&pageSize=' + 6).then(
+					res => {
+						if (res.code == 200) {
+
+							this.listitem = res.rows
+							// console.log(this.listitem);
+						}
+					})
 			}
 		}
 	}
@@ -70,7 +120,7 @@
 <style lang="scss">
 	page {
 		// background-color: ;
-		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
+		background: linear-gradient(180deg, #38D492 0%, rgba(255, 255, 255, 0) 100%);
 		border-radius: 0rpx 0rpx 0rpx 0rpx;
 	}
 
@@ -86,24 +136,27 @@
 		.serch {
 			margin-top: 44rpx;
 		}
-		.list{
+
+		.list {
 			width: 680rpx;
 			height: 654rpx;
 			background: #FFFFFF;
-		    margin-top: 46rpx;
+			margin-top: 46rpx;
 			border-radius: 50rpx;
 			padding: 10rpx 32rpx;
 			box-sizing: border-box;
 			overflow: hidden;
+
 			// overflow-x: scroll;
-			.tab{
+			.tab {
 				width: 650rpx;
 				margin-bottom: 38rpx;
 				// display: flex;
-				
+
 			}
-			.wenti{
-				.wzwt{
+
+			.wenti {
+				.wzwt {
 					display: flex;
 					justify-content: space-between;
 					margin-bottom: 38rpx;
@@ -112,13 +165,15 @@
 					color: #3D3D3D;
 				}
 			}
-			.huan{
-				image{
-					width: 30rpx;
+
+			.huan {
+				image {
+					width: 28rpx;
 					height: 28rpx;
 					vertical-align: middle;
 					margin-right: 10rpx;
 				}
+
 				width: 100%;
 				text-align: center;
 				font-weight: 500;
@@ -127,9 +182,9 @@
 			}
 		}
 	}
-	
-	.active{
-		border-bottom: 6rpx solid #25CE88;
+
+	.active {
+		border-bottom: 6rpx solid #D9D8FF;
 		padding-bottom: 10rpx;
 		border-radius: 3rpx 3rpx 3rpx 3rpx;
 	}
diff --git a/pages/agentpages/devicemanagement/chargepallist/index.vue b/pages/agentpages/devicemanagement/chargepallist/index.vue
index a006580..3c78237 100644
--- a/pages/agentpages/devicemanagement/chargepallist/index.vue
+++ b/pages/agentpages/devicemanagement/chargepallist/index.vue
@@ -5,9 +5,9 @@
 			<view class="serchinp">
 				<u-search placeholder="搜索" v-model="keyword"></u-search>
 				<view class="xuanze">
-					<text style="margin-top: 4rpx;" @click="btnstatus(1)">状态</text> <text
+					<text style="margin-top: 4rpx;" @click="btnstatus(1)">{{zhuangt}}</text> <text
 						style="width: 2px;height: 40rpx;background-color: #C7C7C7;display: inline-block;"></text> <text
-						style="margin-top: 4rpx;" @click="btnstatus(2)">类型</text>
+						style="margin-top: 4rpx;" @click="btnstatus(2)">{{leix}}</text>
 				</view>
 			</view>
 			<view class="device">
@@ -137,7 +137,7 @@
 				<view class="cdblist">
 					<view class="toptltle">
 						<view class="toptltle_lt">
-							<u-icon name="file-text" size="32"></u-icon>  fadgfryt168742341682
+							<u-icon name="file-text" @click="copybtn(text)" size="32"></u-icon>  {{text}}
 						</view>
 						<view class="toptltle_rt">
 							<text></text><text></text><text></text>
@@ -190,6 +190,7 @@
 			return {
 				zhuangtaishow: false,
 				leixingshow: false,
+				text:'fadgfryt168742341682',
 				zhaungtailist: [{
 						value: '1',
 						label: '正常'
@@ -199,6 +200,8 @@
 						label: '离线'
 					}
 				],
+				zhuangt:'状态',
+				leix:'类型',
 				leixinglist: [{
 						value: '1',
 						label: '4'
@@ -219,6 +222,26 @@
 			}
 		},
 		methods: {
+			
+			copybtn(value){
+				uni.setClipboardData({
+				   data:value,//要被复制的内容
+				   success:()=>{//复制成功的回调函数
+				      uni.showToast({//提示
+				          title:'复制成功'
+				      })
+				   }
+				});
+			 // uni.showModal({
+			 //      content:value,//模板中提示的内容
+			 //      confirmText:'复制内容',
+			 //      success:()=>{//点击复制内容的后调函数
+				// 	 //uni.setClipboardData方法就是讲内容复制到粘贴板
+
+				//   }
+			 //  });
+			},
+			
             btnstatus(num){
 				if(num == 1){
 					this.zhuangtaishow = true
@@ -230,9 +253,11 @@
 			},
 			confirmzt(e){
 				console.log(e);
+				this.zhuangt = e[0].label
 			},
 			confirmlx(e){
 				console.log(e);
+				this.leix = e[0].label
 			},
 			
 			btnxq(){
diff --git a/pages/agentpages/devicemanagement/failure/index.vue b/pages/agentpages/devicemanagement/failure/index.vue
index da00047..e28a3f3 100644
--- a/pages/agentpages/devicemanagement/failure/index.vue
+++ b/pages/agentpages/devicemanagement/failure/index.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="page">
 		<u-navbar title="设备故障" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='38'></u-navbar>
+			height='58'></u-navbar>
 		<view class="box">
 			<view class="nav">
 				<view class="top">
-					<u-search placeholder="搜索" input-align="center" v-model="keyword"></u-search>
+					<u-search placeholder="搜索" input-align="center" v-model="keyword" @custom="serch"></u-search>
 					<view class="yc" @click="btnyc">上报异常</view>
 				</view>
 				<view class="tab">
@@ -13,15 +13,19 @@
 				</view>
 			</view>
 			
-			<view class="list">
+			<view class="list" @scrolltolower="onReachBottom" v-for="(item,index) in wateringList" :key="index">
 				<view class="list_val">
-					<view class="wz">设备编号</view> <view class="gl">1023</view>
+					<view class="wz">设备编号</view> <view class="gl">{{item.cabinetSn}}</view>
 				</view>
 				<view class="list_val">
-					<view class="wz">故障原因</view> <view class="gl">弹出失败</view>
+					<view class="wz">故障原因</view> 
+					<view class="gl" v-if="item.type == 1">弹出失败</view>
+					<view class="gl" v-if="item.type == 2">卡槽损坏</view>
+					<view class="gl" v-if="item.type == 3">设备破坏</view>
+					<view class="gl" v-if="item.type == 4">仓位异常</view>
 				</view>
 				<view class="list_val">
-					<view class="wz">备注</view> <view class="gl">设备没有弹出 点击没有反应啊实打实大啊实打实大所阿达阿达是的阿达阿达是的啊实打实大师大师大阿达阿达是的</view>
+					<view class="wz">备注</view> <view class="gl">{{item.remark}}</view>
 				</view>
 			</view>
 			
@@ -44,37 +48,104 @@
 				}, {
 					name: '仓位异常'
 				}],
-				current: 0
+				current: 0,
+				pagenum: 1,
+				wateringList: [],
+				pagesize: 10, // 一页多少数据
+				isLoading: false, // 是否正在加载数据  
+				noMoreData: false, // 是否没有更多数据  
+				total: 0,
+				keyword:'',
+				type:'',
+				bgc:{
+					background:'#25CE88'
+				}
 			}
 		},
+		onLoad() {
+			
+		},
+		onShow() {
+			this.wateringList = []
+			this.pagenum = 1
+			this.getlist()
+		},
 		methods: {
+			serch(){
+				this.wateringList = []
+				this.pagenum = 1
+				this.getlist()
+			},
 			change(index) {
+				this.wateringList = []
+				this.pagenum = 1
 				this.current = index;
+				if(index == 0){
+					this.type = ''
+					this.getlist()
+				}else{
+					this.type = index
+					this.getlist()
+				}
 			},
 			
 			btnyc(){
 				uni.navigateTo({
 					url:'/pages/agentpages/devicemanagement/failure/yichang/index'
 				})
-			}
+			},
+			getlist(){
+				this.$u.get('/agent/abnormal/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize +'&type=' +this.type + '&keyword=' + this.keyword).then(res => {
+					if (res.code == 200) {
+					    this.total = res.total
+					    if (res.rows.length > 0) {
+					    	// 有数据，追加到列表  
+					    	this.wateringList = this.wateringList.concat(res.rows)
+					    	this.pagenum++
+					    } else {
+					    	// 没有更多数据  
+					    	this.noMoreData = true;
+					    }
+					    this.isLoading = false;
+					}
+				})
+			},
+			onReachBottom() {
+				let sum = this.total / this.pagesize
+				if (this.pagenum-1 < sum) {
+					this.getlist();
+				} else {
+					uni.showToast({
+						title: '没有更多记录了',
+						icon: 'none',
+						duration: 1000
+					});
+				}
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
+	/deep/ .u-title,
+	/deep/ .uicon-nav-back{
+		padding-bottom: 40rpx;
+	}
+	
 	page {
-		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
+		background: #F4F5F7
 	}
 
 	.page {
 		width: 750rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
+		// position: fixed;
+		// top: 0;
+		// left: 0;
 		.box{
 			width: 750rpx;
-			height: 1624rpx;
+			height: 100%;
 			background: #F4F5F7;
+			padding-bottom: 200rpx;
 			.list{
 				width: 680rpx;
 				padding: 20rpx 40rpx;
diff --git a/pages/agentpages/devicemanagement/failure/yichang/index.vue b/pages/agentpages/devicemanagement/failure/yichang/index.vue
index 6fef583..6c6d7fa 100644
--- a/pages/agentpages/devicemanagement/failure/yichang/index.vue
+++ b/pages/agentpages/devicemanagement/failure/yichang/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="上报异常" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='38'></u-navbar>
+			height='58'></u-navbar>
 		<view class="box">
 			<view class="list">
 				<view class="sbbh">
@@ -9,9 +9,9 @@
 						<image src="https://api.ccttiot.com/smartmeter/img/static/uTo0sMNT1u6dyEgpvraQ" mode=""></image> 设备编号：
 					</view>
 					<view class="inp">
-						<input type="text" placeholder="请输入编号" style="color: #C9CDD4;padding-left: 30rpx;"/>
+						<input type="text" placeholder="请输入编号" v-model="result" style="color: #999;padding-left: 30rpx;"/>
 					</view>
-					<view class="sm">
+					<view class="sm" @click="scanQRCode">
 						<image src="https://api.ccttiot.com/smartmeter/img/static/uwtCTFeo0LULdRKL6wHG" mode=""></image>
 					</view>
 				</view>
@@ -28,12 +28,15 @@
 						<image src="https://api.ccttiot.com/smartmeter/img/static/uTo0sMNT1u6dyEgpvraQ" mode=""></image>备&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;注：
 					</view>
 					<view class="wb">
-						<textarea name="" placeholder="请输入备注" id="" cols="30" rows="10"></textarea>
+						<textarea name=""  placeholder="请输入备注" v-model="cont" id="" cols="30" rows="10"></textarea>
 					</view>
 				</view>
 			</view>
+			
+			<view class="yc" @click="btnyc">上报异常</view>
 		</view>
 		
+		
 		<u-select v-model="listshow" :list="list" @confirm="confirm"></u-select>
 	</view>
 </template>
@@ -60,7 +63,10 @@
 						label: '仓位异常'
 					}
 				],
-				text:'弹出失败'
+				text:'弹出失败',
+				result:'',
+				cont:'',
+				type:1
 			}
 		},
 		methods: {
@@ -68,17 +74,71 @@
 				this.listshow = true
 			},
 			confirm(e){
-				console.log(e);
 				this.text = e[0].label
+				this.type = e[0].value
+			},
+			
+			scanQRCode() {
+				uni.scanCode({
+					onlyFromCamera: true,
+					scanType: ['qrCode'],
+					success: res => {
+						console.log('扫描结果：', res);
+						this.result = res.result
+					},
+					fail: err => {
+						console.error('扫描失败：', err);
+						uni.showToast({
+							title: '扫描失败',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			btnyc(){
+				let data = {
+					cabinetSn:this.result,
+					type:this.type,
+					remark:this.cont
+				}
+				this.$u.post('/agent/abnormal',data).then(res =>{
+					if(res.code == 200){
+						uni.showToast({
+							title: '上报成功',
+							icon: 'none',
+							duration: 1000
+						})
+						setTimeout(()=>{
+							uni.navigateBack()
+						},1000)
+					}
+				})
 			}
+			
 		}
 	}
 </script>
 
 <style lang="scss">
+	/deep/ .u-title,
+	/deep/ .uicon-nav-back{
+		padding-bottom: 40rpx;
+	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
 	}
+	.yc{
+		width: 660rpx;
+		height: 108rpx;
+		margin: auto;
+		background: #1DBE7B;
+		border-radius: 20rpx;
+		color: #FFFFFF;
+		line-height: 108rpx;
+		text-align: center;
+		margin-top: 150rpx;
+		font-size: 36rpx;
+	}
 
 	.page {
 		width: 750rpx;
diff --git a/pages/agentpages/devicemanagement/xiajilist/index.vue b/pages/agentpages/devicemanagement/xiajilist/index.vue
index fbe73f3..d2201cb 100644
--- a/pages/agentpages/devicemanagement/xiajilist/index.vue
+++ b/pages/agentpages/devicemanagement/xiajilist/index.vue
@@ -5,9 +5,9 @@
 			<view class="serchinp">
 				<u-search placeholder="搜索" v-model="keyword"></u-search>
 				<view class="xuanze">
-					<text style="margin-top: 4rpx;" @click="btnstatus(1)">状态</text> <text
+					<text style="margin-top: 4rpx;" @click="btnstatus(1)">{{zhuangt}}</text> <text
 						style="width: 2px;height: 40rpx;background-color: #C7C7C7;display: inline-block;"></text> <text
-						style="margin-top: 4rpx;" @click="btnstatus(2)">类型</text>
+						style="margin-top: 4rpx;" @click="btnstatus(2)">{{leix}}</text>
 				</view>
 			</view>
 			<view class="device">
@@ -52,12 +52,12 @@
 			
 			
 			<view class="scrll">
-				<view class="cdblist" @click="btnxq">
+				<view class="cdblist">
 					<view class="toptltle">
 						<view class="toptltle_lt">
 							<u-icon name="file-text" size="32"></u-icon>  fadgfryt168742341682
 						</view>
-						<view class="toptltle_rt">
+						<view class="toptltle_rt" @click="btnxq">
 							<text></text><text></text><text></text>
 						</view>
 					</view>
@@ -199,6 +199,8 @@
 						label: '离线'
 					}
 				],
+				zhuangt:'状态',
+				leix:'类型',
 				leixinglist: [{
 						value: '1',
 						label: '4'
@@ -230,9 +232,11 @@
 			},
 			confirmzt(e){
 				console.log(e);
+				this.zhuangt = e[0].label
 			},
 			confirmlx(e){
 				console.log(e);
+				this.leix = e[0].label
 			},
 			
 			btnxq(){
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cb28930..c1def0e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -69,23 +69,24 @@
 		},
 		methods: {
 			scanQRCode() {
-				uni.navigateTo({
-					url: '/page_user/yajin/index'
-				})
-				// uni.scanCode({
-				// 	onlyFromCamera: true,
-				// 	scanType: ['qrCode'],
-				// 	success: res => {
-				// 		console.log('扫描结果：', res);
-				// 	},
-				// 	fail: err => {
-				// 		console.error('扫描失败：', err);
-				// 		uni.showToast({
-				// 			title: '扫描失败',
-				// 			icon: 'none'
-				// 		});
-				// 	}
-				// });
+				uni.scanCode({
+					onlyFromCamera: true,
+					scanType: ['qrCode'],
+					success: res => {
+						console.log('扫描结果：', res);
+						let result = res.result
+						uni.navigateTo({
+							url: '/page_user/yajin/index?sn=' + result
+						})
+					},
+					fail: err => {
+						console.error('扫描失败：', err);
+						uni.showToast({
+							title: '扫描失败',
+							icon: 'none'
+						});
+					}
+				});
 			},
             
 			// 保存当前用户信息
@@ -148,7 +149,12 @@
 											longitude: item.lng,
 											width: 25,
 											height: 30,
-											iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw'
+											iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw',
+											label: {
+												content: item.name,
+												// anchorX:-20,
+												textAlign: 'center'
+											}
 										};
 										this.covers.push(shopCover);
 									});
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c970629..1e858f9 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -4,7 +4,7 @@
 			
 		</u-navbar>
 		<view class="imgbox">
-			<image src="https://api.ccttiot.com/smartmeter/img/static/uGPwljIaEppyKAT1iQaW" mode=""></image>
+			<image src="https://api.ccttiot.com/smartmeter/img/static/uGHvzVjLjHy3SGGFbD5C" mode=""></image>
 		</view>
 		<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"   >
 			授权登录
diff --git a/pages/myorder/index.vue b/pages/myorder/index.vue
index 2c83704..50da3be 100644
--- a/pages/myorder/index.vue
+++ b/pages/myorder/index.vue
@@ -1,30 +1,30 @@
 <template>
 	<view class="page">
-		<u-navbar title="我的订单" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='38'></u-navbar>
-         <view class="listorder">
+		<u-navbar title="我的订单" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='58'></u-navbar>
+         <view class="listorder" @scrolltolower="onReachBottom" v-for="(item,index) in wateringList" :key="index">
          	<view class="title">
-         		<view>SDFGA5452168437113123 &nbsp;&nbsp; <u-icon name="file-text" size="38"></u-icon> </view> <view @click="btnnav"><u-icon name="arrow-right"></u-icon></view>
+         		<view>{{item.orderNo}} &nbsp;&nbsp; <u-icon name="file-text" size="38"></u-icon> </view> <view @click="btnnav"><u-icon name="arrow-right"></u-icon></view>
          	</view>
 			<view class="bh">
-				<text>柜机编号</text> <text>SDGJRAEG15684721339658</text>
+				<text>柜机编号</text> <text>{{item.startCabinetSn}}</text>
 			</view>
 			<view class="bh">
-				<text>电池编号</text> <text>DFASF5413786946</text>
+				<text>电池编号</text> <text>{{item.deviceSn}}</text>
 			</view>
 			<view class="bh">
-				<text>手机号码</text> <text>12345678978</text>
+				<text>手机号码</text> <text>{{item.mobile}}</text>
 			</view>
 			<view class="bh">
 				<text>订单状态</text> <text>使用中</text>
 			</view>
 			<view class="bh">
-				<text>订单金额</text> <text>-</text>
+				<text>订单金额</text> <text>{{item.money == null ? '-' : item.money}}</text>
 			</view>
 			<view class="bh">
-				<text>租借时间</text> <text>2024-04-08 15:05:21</text>
+				<text>租借时间</text> <text>{{item.startRentTime}}</text>
 			</view>
 			<view class="bh">
-				<text>租借时长</text> <text>-</text>
+				<text>租借时长</text> <text>{{item.endRentTime  == null ? '-' : item.endRentTime}}</text>
 			</view>
          </view>
 	
@@ -36,27 +36,68 @@
 	export default {
 		data() {
 			return {
-				
+				pagenum: 1,
+				wateringList: [],
+				pagesize: 10, // 一页多少数据
+				isLoading: false, // 是否正在加载数据  
+				noMoreData: false, // 是否没有更多数据  
+				total: 0,
+				keyword:'',
+				type:'',
+				bgc:{
+					background:'#25CE88'
+				}
 			}
 		},
 		onLoad() {
-
+            this.getlist()
 		},
 		methods: {
 			btnnav(){
 				uni.navigateTo({
 					url:'/pages/myorder/returned/index'
 				})
-			}
+			},
+			getlist(){
+				this.$u.get('/app/order/rent/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize).then(res => {
+					if (res.code == 200) {
+					    this.total = res.total
+					    if (res.rows.length > 0) {
+					    	// 有数据，追加到列表  
+					    	this.wateringList = this.wateringList.concat(res.rows)
+					    	this.pagenum++
+					    } else {
+					    	// 没有更多数据  
+					    	this.noMoreData = true;
+					    }
+					    this.isLoading = false;
+					}
+				})
+			},
+			onReachBottom() {
+				let sum = this.total / this.pagesize
+				if (this.pagenum-1 < sum) {
+					this.getlist();
+				} else {
+					uni.showToast({
+						title: '没有更多记录了',
+						icon: 'none',
+						duration: 1000
+					});
+				}
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
-
+    /deep/ .u-title,
+    /deep/ .uicon-nav-back{
+    	padding-bottom: 40rpx;
+    }
 	page {
 		// background-color: ;
-		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
+		background: linear-gradient(180deg, #F4F5F7 0%, rgba(255, 255, 255, 0) 100%);
 		border-radius: 0rpx 0rpx 0rpx 0rpx;
 	}
 
@@ -65,9 +106,9 @@
 		padding-left: 34rpx;
 		padding-right: 34rpx;
 		box-sizing: border-box;
-        position: fixed;
-		top: 0;
-		left: 0;
+  //       position: fixed;
+		// top: 0;
+		// left: 0;
 		.listorder{
 			margin-top: 32rpx;
 			width: 100%;
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index 78d29b3..e22814c 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -9,7 +9,7 @@
 				<view class="pic">
 					<image :src="item.picture" mode=""></image>
 				</view>
-				<view class="cen">
+				<view class="cen" @click="handleMarkerClicks(item)">
 					<view class="cena" style="font-weight: 600;">
 						{{item.name}}
 					</view>
@@ -91,7 +91,12 @@
 			                            width: 25,    
 			                            height: 30,    
 			                            iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw', 
-			                            distance: distance // 可以在这里也添加距离到覆盖物对象中，但通常只需要在店铺对象中  
+			                            distance: distance ,// 可以在这里也添加距离到覆盖物对象中，但通常只需要在店铺对象中  
+										label: {
+											content: item.name,
+											// anchorX:-20,
+											textAlign: 'center'
+										}
 			                        };    
 			                        // console.log(this.gxlist);
 			                        this.covers.push(shopCover); // 将店铺覆盖物添加到数组中  
@@ -122,7 +127,13 @@
 			handleMarkerClick(event) {
 				const markerId = event.markerId;
 				uni.navigateTo({
-					url: '/page_user/mapditu/index?markerId=' + markerId
+					url: '/page_user/ditu?markerId=' + markerId
+				})
+			},
+			handleMarkerClicks(item) {
+				const markerId = item.storeId;
+				uni.navigateTo({
+					url: '/page_user/ditu?markerId=' + markerId
 				})
 			},
 			
@@ -150,14 +161,14 @@
 		left: 0;
 		.dtxs{
 			width: 100%;
-			height: 50vh;
+			height: 70vh;
 			position: fixed;
 			top: 0;
 			left: 0;
 			z-index: -1;
 		}
 		.listbox{
-			margin-top: 480rpx;
+			margin-top: 820rpx;
 			background: #FFFFFF;
 			border-radius: 64rpx 64rpx 0  0;
 			box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
@@ -165,7 +176,7 @@
 			padding-left: 32rpx;
 			padding-right: 32rpx;
 			box-sizing: border-box;
-			height: 70vh;
+			height: 40vh;
 			overflow-y: scroll;
 			padding-bottom: 400rpx;
 			.moshi{
@@ -214,6 +225,7 @@
 					image{
 						width: 100%;
 						height: 100%;
+						border-radius: 20rpx;
 					}
 				}
 				.cen{