From f306f2e5c6aed0ee50f42a4c91421a4652204f42 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Fri, 7 Jun 2024 18:02:00 +0800
Subject: [PATCH] aaa

---
 common/http.interceptor.js                    |   8 +-
 page_user/about.vue                           |   5 +-
 page_user/daili/cjdaili.vue                   |   4 +-
 page_user/daili/index.vue                     |   7 +-
 page_user/daili/shanghu.vue                   |   4 +-
 page_user/daili/yunwei.vue                    |   4 +-
 page_user/ditu.vue                            |   4 +-
 page_user/hezuo/index.vue                     |   5 +-
 page_user/jifei.vue                           |   5 +-
 page_user/listshu/edit.vue                    |   4 +-
 page_user/listshu/index.vue                   |   5 +-
 page_user/listshu/quanxian.vue                |   5 +-
 page_user/listshu/shangjialist.vue            |   5 +-
 page_user/listshu/xqdetail.vue                |   5 +-
 page_user/order/detailshop.vue                | 133 +++++++++++---
 page_user/order/index.vue                     |  23 +--
 page_user/order/xiangqing.vue                 | 163 ++++++++++++++----
 page_user/shopdetail.vue                      |   5 +-
 page_user/shopedit.vue                        |   5 +-
 page_user/shuju/index.vue                     |   5 +-
 page_user/shuju/lsfx.vue                      |   5 +-
 page_user/yajin/index.vue                     |   5 +-
 page_user/yunying/gongdan/index.vue           |   5 +-
 page_user/yunying/gongdan/liushui.vue         |   5 +-
 page_user/yunying/gongdan/lsmx.vue            |   5 +-
 page_user/yunying/gongdan/mingxi.vue          |   5 +-
 page_user/yunying/gongdan/tanchu.vue          |   5 +-
 page_user/yunying/index.vue                   |   5 +-
 pages/abbr/index.vue                          |   5 +-
 .../devicemanagement/chargepallist/index.vue  |  58 ++++---
 .../chargepallist/listdetail/index.vue        |   5 +-
 .../devicemanagement/failure/index.vue        |   5 +-
 .../failure/yichang/index.vue                 |   5 +-
 pages/agentpages/devicemanagement/index.vue   |  64 +++----
 .../devicemanagement/lnstallation/index.vue   |   5 +-
 .../repairapplication/index.vue               |   5 +-
 .../repairapplication/shenbao/index.vue       |   5 +-
 .../devicemanagement/xiajilist/index.vue      |  74 +++++---
 pages/agentpages/index/index.vue              |  96 ++++++-----
 .../shopguanli/discipleshop/index.vue         |   5 +-
 pages/agentpages/shopguanli/index.vue         |  25 ++-
 pages/agentpages/shopguanli/myshop/index.vue  |   5 +-
 .../agentpages/shopguanli/setupshop/index.vue |   5 +-
 pages/detail/detailed/index.vue               |   4 +-
 pages/detail/index.vue                        |   5 +-
 pages/income/index.vue                        |   5 +-
 pages/myorder/index.vue                       |   8 +-
 pages/nearbystores/index.vue                  |  10 +-
 48 files changed, 521 insertions(+), 322 deletions(-)

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index bd14000..df97676 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -1,6 +1,6 @@
 const install = (Vue, vm) => {
 	Vue.prototype.$u.http.setConfig({
-			baseUrl: 'http://192.168.2.88:3100/dev-api',
+			baseUrl: 'http://124.221.246.124:2288/dev-api',
 			// baseUrl: 'https://znb.ccttiot.com',
 			loadingText: '努力加载中~',
 			loadingTime: 800,
@@ -9,24 +9,18 @@ const install = (Vue, vm) => {
 				'content-type': 'application/json;charset=UTF-8',
 				
 			},
-			// ......
 		});
 
 // 请求拦截部分，如配置，每次请求前都会执行
 	Vue.prototype.$u.http.interceptor.request = (config) => {
 		const token = uni.getStorageSync('token');
 		config.header.Authorization = token; 
-		// config.header.Tenant-Id=1
 		// #ifdef H5
 			config.header.Authorization = 'Bearer '+token; 
 		// #endif
-		// 可以对某个url进行特别处理，此url参数为this.$u.get(url)中的url值
 		if(config.url == '/user/login') config.header.noToken = true;
 		// 最后需要将config进行return
 		return config;
-		
-		// 如果return一个false值，则会取消本次请求
-		// if(config.url == '/user/rest') return false; // 取消某次请求
 	}
 	
 	// 响应拦截，如配置，每次请求结束都会执行本方法
diff --git a/page_user/about.vue b/page_user/about.vue
index 972a29d..c0fce33 100644
--- a/page_user/about.vue
+++ b/page_user/about.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar :title="tit" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<u-navbar :title="tit" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
         <view class="box">
         	<view class="title">
         		{{obj.title}}
@@ -48,7 +47,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #54DAA1 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/daili/cjdaili.vue b/page_user/daili/cjdaili.vue
index 6c44584..edb922d 100644
--- a/page_user/daili/cjdaili.vue
+++ b/page_user/daili/cjdaili.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="创建代理" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='58'></u-navbar>
+		<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="title">
         		基本信息
@@ -190,7 +190,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 
diff --git a/page_user/daili/index.vue b/page_user/daili/index.vue
index 5b7fb47..c9a961f 100644
--- a/page_user/daili/index.vue
+++ b/page_user/daili/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="代理管理" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="shuju">
         		<view class="ddje" @click="btnshop(4)">
@@ -83,7 +82,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
@@ -107,7 +106,7 @@
 				border-radius: 24rpx 24rpx 24rpx 24rpx;
 				margin: auto;
 				margin-top: 40rpx;
-				padding: 54rpx 78rpx;
+				padding: 54rpx 120rpx;
 				box-sizing: border-box;
 				display: flex;
 				// justify-content: space-between;
diff --git a/page_user/daili/shanghu.vue b/page_user/daili/shanghu.vue
index 5489007..314485d 100644
--- a/page_user/daili/shanghu.vue
+++ b/page_user/daili/shanghu.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="创建商户" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='58'></u-navbar>
+		<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="title">
         		基本信息
@@ -117,7 +117,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/daili/yunwei.vue b/page_user/daili/yunwei.vue
index 3e6ceac..2ed578b 100644
--- a/page_user/daili/yunwei.vue
+++ b/page_user/daili/yunwei.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="创建商户" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='58'></u-navbar>
+		<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="title">
         		基本信息
@@ -64,7 +64,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/ditu.vue b/page_user/ditu.vue
index 8524bbc..99df8b1 100644
--- a/page_user/ditu.vue
+++ b/page_user/ditu.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="附近门店" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='58'></u-navbar>
+		<u-navbar title="附近门店" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
 			<view class="dtxs">
 					<map class='map' id="map" :latitude="latitude" :longitude="longitude" @markertap="handleMarkerClick"
 						:show-location="true" :markers="covers" :scale="mapScale" />
@@ -293,7 +293,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	/deep/ .map{
 		width: 100%;
diff --git a/page_user/hezuo/index.vue b/page_user/hezuo/index.vue
index aa99630..9284489 100644
--- a/page_user/hezuo/index.vue
+++ b/page_user/hezuo/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="合作加盟" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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">
 			<image src="https://api.ccttiot.com/smartmeter/img/static/u7CKiZqacBOcqYyDWDGF" mode="" class="pic"></image>
 			<view class="inp" style="margin-top: 46rpx;">
@@ -154,7 +153,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/jifei.vue b/page_user/jifei.vue
index f3f9734..0ad119b 100644
--- a/page_user/jifei.vue
+++ b/page_user/jifei.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="计费规则" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="listobj">
 				<view class="inps">
@@ -131,7 +130,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	
 	page {
diff --git a/page_user/listshu/edit.vue b/page_user/listshu/edit.vue
index 83a383e..942b146 100644
--- a/page_user/listshu/edit.vue
+++ b/page_user/listshu/edit.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="修改信息" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='58'></u-navbar>
+		<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="title">
         		基本信息
@@ -127,7 +127,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/listshu/index.vue b/page_user/listshu/index.vue
index 0a4be01..b10e9d0 100644
--- a/page_user/listshu/index.vue
+++ b/page_user/listshu/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="代理列表" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="nav">
         		<view class="top">
@@ -128,7 +127,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/listshu/quanxian.vue b/page_user/listshu/quanxian.vue
index dfa5d0d..49c00c6 100644
--- a/page_user/listshu/quanxian.vue
+++ b/page_user/listshu/quanxian.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="权限操作" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="title">
 				权限操作
@@ -157,7 +156,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/listshu/shangjialist.vue b/page_user/listshu/shangjialist.vue
index 2f4ae2a..6328719 100644
--- a/page_user/listshu/shangjialist.vue
+++ b/page_user/listshu/shangjialist.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="商家列表" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="nav">
 				<view class="top">
@@ -67,7 +66,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/listshu/xqdetail.vue b/page_user/listshu/xqdetail.vue
index 7cecb62..1f98175 100644
--- a/page_user/listshu/xqdetail.vue
+++ b/page_user/listshu/xqdetail.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="详情" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="shopname">
                {{listobj.name}}	
@@ -111,7 +110,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/order/detailshop.vue b/page_user/order/detailshop.vue
index 06ecac2..1edac48 100644
--- a/page_user/order/detailshop.vue
+++ b/page_user/order/detailshop.vue
@@ -1,28 +1,27 @@
 <template>
 	<view class="page">
-		<u-navbar :title="title" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<u-navbar :title="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="top">
-				<u-search placeholder="搜索" input-align="center" v-model="keyword"></u-search>
+				<u-search placeholder="搜索" input-align="center" v-model="keyword" @custom="seach"></u-search>
 			</view>
 			<u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
 			<view class="date">
 				<text @click="btnks(1)">{{selector}}</text> -- <text @click="btnks(2)">{{selectors}}</text>
 			</view>
 
-			<view class="list" @scrolltolower="onReachBottom" v-for="(item,index) in 3" :key="index" @click="btnxq">
+			<view class="list" @scrolltolower="onReachBottom" v-for="(item,index) in wateringList" :key="index">
 				<view class="tops">
-					<view class="" style="font-size: 32rpx;color: #3D3D3D;">SDFGA5452168437113123 <u-icon
-							name="file-text"></u-icon></view>
-					<view class=""><u-icon name="arrow-right"></u-icon></view>
+					<view class="" style="font-size: 32rpx;color: #3D3D3D;">{{item.orderNo}} 
+					<u-icon  @click="fuzhi(item.orderNo)" name="file-text" size="38"></u-icon></view>
+					<view class=""  @click="btnxq(item.orderId)"><u-icon name="arrow-right"></u-icon></view>
 				</view>
 				<view class="list_val">
 					<view class="wz">
 						租借店铺
 					</view>
 					<view class="gl" style="color: #1DBE7B;">
-						金水湾
+						{{item.startStoreName}}
 					</view>
 				</view>
 				<view class="list_val">
@@ -30,7 +29,7 @@
 						租借时间
 					</view>
 					<view class="gl">
-						2024-04-10 14:10:48
+						{{item.startRentTime}}
 					</view>
 				</view>
 				<view class="list_val">
@@ -38,7 +37,7 @@
 						手机号码
 					</view>
 					<view class="gl">
-						12345678978
+						{{item.mobile}}
 					</view>
 				</view>
 				<view class="list_val">
@@ -46,7 +45,7 @@
 						订单时长
 					</view>
 					<view class="gl">
-						-
+						{{item.remainingTime}}
 					</view>
 				</view>
 				<view class="list_val">
@@ -54,16 +53,20 @@
 						代理信息
 					</view>
 					<view class="gl">
-						嘻嘻（20921）
+						{{item.userName}}（{{item.startAgentId}}）
 					</view>
 				</view>
 				<view class="je">
 					<view class="" style="font-size: 32rpx;color: #3D3D3D;">
 						订单金额 <text
-							style="font-size: 28rpx;color: #FF8157;display: inline-block;margin-left: 10rpx;">0.00</text>
+							style="font-size: 28rpx;color: #FF8157;display: inline-block;margin-left: 10rpx;">￥{{item.money}}</text>
 					</view>
 					<view class="" style="font-size: 28rpx;color: #FF8157;">
-						租借中
+						<text v-if="item.status == '1'">租借中</text>
+						<text v-if="item.status == '2'">待扣款</text>
+						<text v-if="item.status == '4'">已完成</text>
+						<text v-if="item.status == '6'">租转卖</text>
+						<text v-if="item.status == '7'">弹出失败</text>
 					</view>
 				</view>
 			</view>
@@ -89,8 +92,8 @@
 					second: false
 				},
 				show: false,
-				selector: '2024-4-9',
-				selectors: '2024-4-9',
+				selector: '',
+				selectors: '',
 				num: '',
 				status: '',
 
@@ -105,13 +108,17 @@
 			}
 		},
 		onLoad(option) {
+			let today = new Date()
+			this.selector = this.formatDate(today)
+			this.selectors = this.formatDate(today)
 			this.title = option.title
 			this.status = option.status
+			this.getlist()
 		},
 		methods: {
-
 			getlist() {
-				this.$u.get('/agent/order/rent/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize + '&orderNo=' + 1798627633516257280 + '&status=' + this.status).then(res => {
+				this.$u.get('/agent/order/rent/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' +
+					this.keyword + '&status=' + this.status + '&startDate=' + this.selector + '&endDate=' + this.selectors).then(res => {
 					if (res.code == 200) {
 						this.total = res.total
 						if (this.total > 0) {
@@ -121,6 +128,59 @@
 						}
 						if (res.rows.length > 0) {
 							// 有数据，追加到列表  
+							res.rows.forEach(order => {
+								if (order.endRentTime == null) {
+									var targetDate = new Date(order.startRentTime)
+									var currentDate = new Date()
+									var diff = targetDate - currentDate
+									var absDiff = Math.abs(diff)
+									var hours = Math.floor(absDiff / (1000 * 60 * 60))
+									var minutes = Math.floor((absDiff % (1000 * 60 * 60)) / (1000 * 60))
+									let formattedMinutes = minutes < 10 ? '0' + minutes : minutes
+									order.remainingTime = hours + '时' + formattedMinutes + '分钟'
+									if (order.priceStandard.feeMode == 2) {
+										if (minutes >= order.priceStandard.feeFreeTime) {
+											order.money = (hours + 1) * order.priceStandard.feePrice
+										} else {
+											order.money = hours * order.priceStandard.feePrice
+										}
+									} else if (order.priceStandard.feeMode == 1) {
+										if (minutes >= order.priceStandard.feeFreeTime) {
+											order.money = (hours * 2 + 1) * order.priceStandard.feePrice
+											if (minutes >= 30) {
+												order.money = (hours * 2 + 2) * order.priceStandard.feePrice
+											}
+										} else {
+											order.money = hours * 2 * order.priceStandard.feePrice
+										}
+									}
+								} else {
+									var targetDate = new Date(order.endRentTime)
+									var currentDate = new Date()
+									var diff = targetDate - currentDate
+									var absDiff = Math.abs(diff)
+									var hours = Math.floor(absDiff / (1000 * 60 * 60))
+									var minutes = Math.floor((absDiff % (1000 * 60 * 60)) / (1000 * 60))
+									let formattedMinutes = minutes < 10 ? '0' + minutes : minutes
+									order.remainingTime = hours + '时' + formattedMinutes + '分钟'
+									if (order.priceStandard.feeMode == 2) {
+										if (minutes >= order.priceStandard.feeFreeTime) {
+											order.money = (hours + 1) * order.priceStandard.feePrice
+										} else {
+											order.money = hours * order.priceStandard.feePrice
+										}
+									} else if (order.priceStandard.feeMode == 1) {
+										if (minutes >= order.priceStandard.feeFreeTime) {
+											order.money = (hours * 2 + 1) * order.priceStandard.feePrice
+											if (minutes >= 30) {
+												order.money = (hours * 2 + 2) * order.priceStandard.feePrice
+											}
+										} else {
+											order.money = hours * 2 * order.priceStandard.feePrice
+										}
+									}
+								}
+							})
 							this.wateringList = this.wateringList.concat(res.rows)
 							this.pagenum++
 						} else {
@@ -143,7 +203,12 @@
 					});
 				}
 			},
-
+			formatDate(date) {
+				let year = date.getFullYear()
+				let month = String(date.getMonth() + 1).padStart(2, '0')
+				let day = String(date.getDate()).padStart(2, '0')
+				return `${year}-${month}-${day}`
+			},
 			btnks(num) {
 				this.show = true
 				if (num == 1) {
@@ -155,14 +220,36 @@
 			confirm(e) {
 				if (this.num == 1) {
 					this.selector = e.year + '-' + e.month + '-' + e.day
+					this.pagenum = 1
+					this.wateringList = []
+					this.getlist()
 				} else {
 					this.selectors = e.year + '-' + e.month + '-' + e.day
+					this.pagenum = 1
+					this.wateringList = []
+					this.getlist()
 				}
 			},
-			btnxq() {
+			btnxq(orderId) {
 				uni.navigateTo({
-					url: '/page_user/order/xiangqing'
+					url: '/page_user/order/xiangqing?orderId=' + orderId
 				})
+			},
+			fuzhi(text) {
+				uni.setClipboardData({
+					data: text,
+					success: function(res) {
+						console.log('复制的信息：', text);
+						uni.showToast({
+							title: '复制成功',
+						});
+					}
+				});
+			}, 
+			seach(){
+				this.pagenum = 1
+				this.wateringList = []
+				this.getlist()
 			}
 		}
 	}
@@ -171,7 +258,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 
 	page {}
@@ -188,7 +275,7 @@
 
 			.list {
 				width: 680rpx;
-				height: 490rpx;
+				height: 500rpx;
 				background: #FFFFFF;
 				border-radius: 38rpx 38rpx 38rpx 38rpx;
 				padding: 32rpx 42rpx;
diff --git a/page_user/order/index.vue b/page_user/order/index.vue
index a521290..e997327 100644
--- a/page_user/order/index.vue
+++ b/page_user/order/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="订单管理" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="ordertongji">
         		<view class="orderday">
@@ -19,7 +18,7 @@
 			<view class="shuju">
 				<view class="ddje" @click="btnpage(0)">
 					<view class="shu">
-						{{statuobj.total}}
+						{{statuobj.total == null ? 0 : statuobj.total}}
 					</view>
 					<view class="sb">
 						订单总数<u-icon name="arrow-right" size="18"></u-icon>
@@ -28,7 +27,7 @@
 				<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
 				<view class="ddje" @click="btnpage(1)">
 					<view class="shu">
-						{{statuobj.renting}}
+						{{statuobj.renting == null ? 0 : statuobj.renting}}
 					</view>
 					<view class="sb">
 						租借中<u-icon name="arrow-right" size="18"></u-icon>
@@ -37,7 +36,7 @@
 				<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
 				<view class="ddje" @click="btnpage(2)">
 					<view class="shu">
-						{{statuobj.finished}}
+						{{statuobj.finished == null ? 0 : statuobj.finished}}
 					</view>
 					<view class="sb">
 						已完成<u-icon name="arrow-right" size="18"></u-icon>
@@ -48,7 +47,7 @@
 			<view class="shuju">
 				<view class="ddje" @click="btnpage(3)">
 					<view class="shu">
-                          {{statuobj.popFailed}}
+                          {{statuobj.popFailed == null ? 0 : statuobj.popFailed}}
 					</view>
 					<view class="sb">
 						弹出失败<u-icon name="arrow-right" size="18"></u-icon>
@@ -57,7 +56,7 @@
 				<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
 				<view class="ddje" @click="btnpage(4)">
 					<view class="shu">
-						{{statuobj.sale}}
+						{{statuobj.sale == null ? 0 : statuobj.sale}}
 					</view>
 					<view class="sb">
 						租转卖<u-icon name="arrow-right" size="18"></u-icon>
@@ -66,7 +65,7 @@
 				<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
 				<view class="ddje" @click="btnpage(5)">
 					<view class="shu">
-						{{statuobj.partRefund}}
+						{{statuobj.partRefund == null ? 0 : statuobj.partRefund}}
 					</view>
 					<view class="sb">
 						部分退款<u-icon name="arrow-right" size="18"></u-icon>
@@ -76,7 +75,7 @@
 			<view class="shujus">
 				<view class="ddje" @click="btnpage(6)">
 					<view class="shu">
-						{{statuobj.allRefund}}
+						{{statuobj.allRefund == null ? 0 : statuobj.allRefund}}
 					</view>
 					<view class="sb">
 						已全额退款<u-icon name="arrow-right" size="18"></u-icon>
@@ -85,7 +84,7 @@
 				<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;margin-left: 54rpx;margin-right: 70rpx;"></text>
 				<view class="ddje" @click="btnpage(7)">
 					<view class="shu">
-						{{statuobj.waitPay}}
+						{{statuobj.waitPay == null ? 0 : statuobj.waitPay}}
 					</view>
 					<view class="sb">
 						待扣款<u-icon name="arrow-right" size="18"></u-icon>
@@ -145,9 +144,11 @@
 			confirm(e) {
 				if (this.num == 1) {
 					this.firsTime = e.year + '-' + e.month + '-' + e.day
+					this.dateindex = 0
 					this.getlist()
 				} else {
 					this.lasTime = e.year + '-' + e.month + '-' + e.day
+					this.dateindex = 0
 					this.getlist()
 				}
 			},
@@ -228,7 +229,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/order/xiangqing.vue b/page_user/order/xiangqing.vue
index d31c337..db87839 100644
--- a/page_user/order/xiangqing.vue
+++ b/page_user/order/xiangqing.vue
@@ -1,73 +1,95 @@
 <template>
 	<view class="page">
-		<u-navbar title="订单详情" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="detaobj">
         		<view class="top">
 					订单详情
         		</view>
 				<view class="names">
-					<view class="wz">收费策略 ：</view> <view class="gl">3.00元/小时，前5分钟免费，日封顶30.00元</view>
+					<view class="wz">收费策略 ：</view> <view class="gl">
+					<text v-if="fee.feeMode == 2">{{fee.feePrice}}元/小时</text>
+					<text v-if="fee.feeMode == 1">{{fee.feePrice}}元/半小时</text>
+					,前{{fee.feeFreeTime}}分钟免费,总封顶{{fee.feeMaxPrice}}元</text>
+					</view>
 				</view>
 				<view class="names">
-					<view class="wz">电池编号：</view> <view class="gl">GFVDSG126420921</view>
+					<view class="wz">电池编号：</view> <view class="gl">{{listobj.deviceSn}}</view>
 				</view>
 				<view class="names">
-					<view class="wz" style="width: 160rpx;">租借店铺：</view> <view class="gl" style="color: #1DBE7B;">星途自助台球棋牌室</view>
+					<view class="wz" style="width: 160rpx;">租借店铺：</view> <view class="gl" style="color: #1DBE7B;">{{listobj.startStoreName}}</view>
 				</view>
 				<view class="names">
-					<view class="wz">租借设备：</view> <view class="gl" style="color: #1DBE7B;">GDFFS4569875213</view>
+					<view class="wz">租借设备：</view> <view class="gl" style="color: #1DBE7B;">{{listobj.startCabinetSn}}</view>
 				</view>
 				<view class="names">
-					<view class="wz">租借时间：</view> <view class="gl">2024-04-11 02:58:22</view>
+					<view class="wz">租借时间：</view> <view class="gl">{{listobj.startRentTime}}</view>
 				</view>
 				<view class="names">
-					<view class="wz" style="width: 160rpx;">租借地址：</view> <view class="gl">福建省宁德市福鼎市海口路28号途客中国酒店 （福鼎海口路）</view>
+					<view class="wz" style="width: 160rpx;">租借地址：</view> <view class="gl">{{listobj.startStoreAddress}}</view>
 				</view>
 				<view class="names">
-					<view class="wz" style="width: 160rpx;">归还店铺：</view> <view class="gl" style="color: #1DBE7B;">星途自助台球棋牌室</view>
+					<view class="wz" style="width: 160rpx;">归还店铺：</view> <view class="gl" style="color: #1DBE7B;">{{listobj.endStoreName == null ? '-' : listobj.endStoreName}}</view>
 				</view>
 				<view class="names">
-					<view class="wz">归还设备：</view> <view class="gl" style="color: #1DBE7B;">GDFFS4569875213</view>
+					<view class="wz">归还设备：</view> <view class="gl" style="color: #1DBE7B;">{{listobj.endCabinetSn == null ? '-' : listobj.endCabinetSn}}</view>
 				</view>
 				<view class="names">
-					<view class="wz">归还时间：</view> <view class="gl">2024-04-11 02:58:22</view>
+					<view class="wz">归还时间：</view> <view class="gl">{{listobj.endStoreAddress == null ? '-' : listobj.endStoreAddress}}</view>
 				</view>
 				<view class="names">
-					<view class="wz" style="width: 160rpx;">归还地址：</view> <view class="gl">福建省宁德市福鼎市海口路28号途客中国酒店 （福鼎海口路）</view>
+					<view class="wz" style="width: 160rpx;">归还地址：</view> <view class="gl">{{listobj.endStoreAddress == null ? '-' : listobj.endStoreAddress}}</view>
 				</view>
 				<view class="names">
-					<view class="wz">支付时间：</view> <view class="gl">2024-04-11 02:58:22</view>
+					<view class="wz">支付时间：</view> <view class="gl">{{listobj.payTime == null ? '-' : listobj.payTime}}</view>
 				</view>
 				<view class="names">
-					<view class="wz">订单时长：</view> <view class="gl">1小时3分钟16秒</view>
+					<view class="wz">订单时长：</view> <view class="gl">
+					  <text v-if="listobj.sale.payTime">{{zuzhuan}}</text>
+					  <text v-else>{{listobj.remainingTime}}</text>
+					</view>
 				</view>
 				<view class="names">
-					<view class="wz">支付类型：</view> <view class="gl">微信免押</view>
+					<view class="wz">支付类型：</view> <view class="gl">
+					 <text v-if="listobj.rentType == 1">普通租赁</text>
+					 <text v-if="listobj.rentType == 2">免押金租赁</text>
+					</view>
+				</view>
+				<view class="names" v-if="listobj.sale.money">
+					<view class="wz">预估金额：</view> <view class="gl">￥{{ listobj.sale.money / 100}}</view>
+				</view>
+				<view class="names" v-else>
+					<view class="wz">预估金额：</view> <view class="gl">￥{{ listobj.payMoney == null ? (zujiemoney > fee.feeMaxPrice ? fee.feeMaxPrice : zujiemoney) : listobj.payMoney}}</view>
 				</view>
 				<view class="names">
-					<view class="wz">付款金额：</view> <view class="gl">￥6.00</view>
+					<view class="wz">付款金额：</view> <view class="gl">{{listobj.money == null ? '-' : '￥' + listobj.money}}</view>
 				</view>
 				<view class="names">
-					<view class="wz">退款金额：</view> <view class="gl">￥0</view>
+					<view class="wz">退款金额：</view> <view class="gl">{{listobj.refundAmount == null ? '-' : '￥' + listobj.refundAmount}}</view>
 				</view>
 				<view class="names">
-					<view class="wz">订单编号：</view> <view class="gl">202426546841385</view>
+					<view class="wz">订单编号：</view> <view class="gl">{{listobj.orderNo}}</view>
 				</view>
 				<view class="names">
-					<view class="wz">订单状态：</view> <view class="gl">已归还</view>
+					<view class="wz">订单状态：</view> <view class="gl">
+					  <text v-if="listobj.status == '1'">租借中</text>
+					  <text v-if="listobj.status == '2'">待扣款</text>
+					  <text v-if="listobj.status == '4'">已完成</text>
+					  <text v-if="listobj.status == '6'">租转卖</text>
+					  <text v-if="listobj.status == '7'">弹出失败</text>
+					</view>
 				</view>
 				<view class="bottom">
 					收益明细
 				</view>
-				<view class="names">
-					<view class="wz">星途自助台球棋牌室（商家）</view> <view class="gl">￥3.456</view>
+				<view class="" v-for="(item,index) in listobj.divideList">
+					<view class="names">
+						<view class="wz">{{item.agentName}}（{{item.agentLevel}}级代理）</view> <view class="gl">
+		                   {{item.amount == null ? '-' : item.amount }}
+						</view>
+					</view>
 				</view>
-				<view class="names">
-					<view class="wz">嘻嘻（代理）</view> <view class="gl">￥0.384</view>
-				</view>
-        	</view>
+        	</view> 
         </view>
 	</view>
 </template>
@@ -79,10 +101,87 @@
                 bgc: {
                 	background: '#25CE88'
                 },
+				orderId:'',
+				listobj:{},
+				fee:{},
+				zujiemoney:'',
+				zuzhuan:''
 			}
 		},
+		onLoad(option) {
+			this.orderId = option.orderId
+			this.getxq()
+		},
 		methods: {
-
+             getxq(){
+				 this.$u.get(`/agent/order/rent/${this.orderId}`).then(res=>{
+				 	if(res.code == 200){
+				 		this.listobj = res.data
+						this.fee = res.data.priceStandard
+						if(this.listobj.endRentTime == null){
+							var targetDate = new Date(this.listobj.startRentTime)  
+							var currentDate = new Date()  
+							var diff = targetDate - currentDate  
+							var absDiff = Math.abs(diff)  
+							var hours = Math.floor(absDiff / (1000 * 60 * 60))   
+							var minutes = Math.floor((absDiff % (1000 * 60 * 60)) / (1000 * 60))  
+							let formattedMinutes = minutes < 10 ? '0' + minutes : minutes;  
+							this.listobj.remainingTime = hours + '时' + formattedMinutes + '分钟'
+							if (this.listobj.priceStandard.feeMode == 2) {
+								if (minutes >= this.listobj.priceStandard.feeFreeTime) {
+									this.zujiemoney = (hours + 1) * this.listobj.priceStandard.feePrice
+								} else {
+									this.zujiemoney = hours * this.listobj.priceStandard.feePrice
+								}
+							}else if(this.listobj.priceStandard.feeMode == 1){
+								if (minutes >= this.listobj.priceStandard.feeFreeTime) {
+									this.zujiemoney = (hours * 2 + 1) * this.listobj.priceStandard.feePrice
+									if(minutes >= 30){
+										this.zujiemoney = (hours * 2 + 2)  * this.listobj.priceStandard.feePrice
+									}
+								} else {
+									this.zujiemoney = hours * 2 * this.listobj.priceStandard.feePrice 
+								}
+							}
+						}else{
+							var targetDate = new Date(this.listobj.endRentTime)
+							var currentDate = new Date()  
+							var diff = targetDate - currentDate 
+							var absDiff = Math.abs(diff)  
+							var hours = Math.floor(absDiff / (1000 * 60 * 60));   
+							var minutes = Math.floor((absDiff % (1000 * 60 * 60)) / (1000 * 60))  
+							let formattedMinutes = minutes < 10 ? '0' + minutes : minutes;  
+							this.listobj.remainingTime = hours + '时' + formattedMinutes + '分钟'
+							if (this.listobj.priceStandard.feeMode == 2) {
+								if (minutes >= this.listobj.priceStandard.feeFreeTime) {
+									this.zujiemoney = (hours + 1) * this.listobj.priceStandard.feePrice
+								} else {
+									this.zujiemoney = hours * this.listobj.priceStandard.feePrice
+								}
+							}else if(this.listobj.priceStandard.feeMode == 1){
+								if (minutes >= this.listobj.priceStandard.feeFreeTime) {
+									this.zujiemoney = (hours * 2 + 1) * this.listobj.priceStandard.feePrice
+									if(minutes >= 30){
+										this.zujiemoney = (hours * 2 + 2)  * this.listobj.priceStandard.feePrice
+									}
+								} else {
+									this.zujiemoney = hours * 2 * this.listobj.priceStandard.feePrice 
+								}
+							}
+						}
+						if(this.listobj.sale){
+							var targetDate = new Date(this.listobj.startRentTime)
+							var currentDate = new Date(this.listobj.sale.payTime) 
+							var diff = targetDate - currentDate
+							var absDiff = Math.abs(diff)  
+							var hours = Math.floor(absDiff / (1000 * 60 * 60))   
+							var minutes = Math.floor((absDiff % (1000 * 60 * 60)) / (1000 * 60))
+							let formattedMinutes = minutes < 10 ? '0' + minutes : minutes
+							this.zuzhuan = hours + '时' + formattedMinutes + '分钟'
+						}
+				 	}
+				 })
+			 }
 		}
 	}
 </script>
@@ -90,7 +189,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
        
@@ -98,18 +197,18 @@
 
 	.page {
 		width: 750rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
+		// position: fixed;
+		// top: 0;
+		// left: 0;
 		.box{
 			width: 750rpx;
-			height: 1440rpx;
+			height: 100%;
 			background: #F4F5F7;
 			border-radius: 0rpx 0rpx 0rpx 0rpx;
 			padding-top: 30rpx;
 			.detaobj{
 				width: 680rpx;
-				height: 1300rpx;
+				height: 100%;
 				background: #FFFFFF;
 				border-radius: 24rpx 24rpx 24rpx 24rpx;
 				margin: auto;
diff --git a/page_user/shopdetail.vue b/page_user/shopdetail.vue
index 2b993db..0a04fbb 100644
--- a/page_user/shopdetail.vue
+++ b/page_user/shopdetail.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="店铺详情" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="shopname">
                 {{listobj.name}}        		
@@ -178,7 +177,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	
 	page {
diff --git a/page_user/shopedit.vue b/page_user/shopedit.vue
index 45540ef..729f9e3 100644
--- a/page_user/shopedit.vue
+++ b/page_user/shopedit.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="修改店铺" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="list">
 				<view class="listval">
@@ -372,7 +371,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: #F4F5F7;
diff --git a/page_user/shuju/index.vue b/page_user/shuju/index.vue
index e5f04e1..5d29552 100644
--- a/page_user/shuju/index.vue
+++ b/page_user/shuju/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="数据分析" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="list">
         		<view class="lisy_val" @click="btnpage(1)">
@@ -53,7 +52,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/shuju/lsfx.vue b/page_user/shuju/lsfx.vue
index 8118b08..bd77a13 100644
--- a/page_user/shuju/lsfx.vue
+++ b/page_user/shuju/lsfx.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="流水分析" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="date">
 				<text @click="btnks(1)">{{firsTime}}</text> -- <text @click="btnks(2)">{{lasTime}}</text>
@@ -135,7 +134,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/yajin/index.vue b/page_user/yajin/index.vue
index 6c504c7..5fa3e95 100644
--- a/page_user/yajin/index.vue
+++ b/page_user/yajin/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="押金" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="listobj">
 				<view class="title">适用接口</view>
@@ -180,7 +179,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/yunying/gongdan/index.vue b/page_user/yunying/gongdan/index.vue
index 74ca3d5..63c4106 100644
--- a/page_user/yunying/gongdan/index.vue
+++ b/page_user/yunying/gongdan/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="运维工单" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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">
 			<u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
 			<view class="date">
@@ -90,7 +89,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/yunying/gongdan/liushui.vue b/page_user/yunying/gongdan/liushui.vue
index c87a5d9..aae58e7 100644
--- a/page_user/yunying/gongdan/liushui.vue
+++ b/page_user/yunying/gongdan/liushui.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="运维工单" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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">
 			<u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
 			<view class="date">
@@ -97,7 +96,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/yunying/gongdan/lsmx.vue b/page_user/yunying/gongdan/lsmx.vue
index 0fa2953..c33c8ae 100644
--- a/page_user/yunying/gongdan/lsmx.vue
+++ b/page_user/yunying/gongdan/lsmx.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="运维工单" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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">
 			<u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
 			<view class="date">
@@ -80,7 +79,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/yunying/gongdan/mingxi.vue b/page_user/yunying/gongdan/mingxi.vue
index bdecab2..81b4f78 100644
--- a/page_user/yunying/gongdan/mingxi.vue
+++ b/page_user/yunying/gongdan/mingxi.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="运维工单明细" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="nav">
 				<view class="top">
@@ -78,7 +77,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/yunying/gongdan/tanchu.vue b/page_user/yunying/gongdan/tanchu.vue
index 39c432f..b60fdd9 100644
--- a/page_user/yunying/gongdan/tanchu.vue
+++ b/page_user/yunying/gongdan/tanchu.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="弹出记录" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="nav">
 				<view class="top">
@@ -50,7 +49,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/page_user/yunying/index.vue b/page_user/yunying/index.vue
index c22fee5..a0157d2 100644
--- a/page_user/yunying/index.vue
+++ b/page_user/yunying/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="运营管理" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="list">
         		<image @click="btnpage(1)" src="https://api.ccttiot.com/smartmeter/img/static/u1P5r4kaSpkbARsGA9JY" mode=""></image>
@@ -42,7 +41,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/pages/abbr/index.vue b/pages/abbr/index.vue
index cb3d653..f7cd08a 100644
--- a/pages/abbr/index.vue
+++ b/pages/abbr/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="常见问题" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<u-navbar title="常见问题" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
 		<view class="serch">
 			<u-search placeholder="搜索问题" height="72" :showAction="false" v-model="keyword" @change="sousuo"></u-search>
 		</view>
@@ -123,7 +122,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background-color: ;
diff --git a/pages/agentpages/devicemanagement/chargepallist/index.vue b/pages/agentpages/devicemanagement/chargepallist/index.vue
index b25d973..62512aa 100644
--- a/pages/agentpages/devicemanagement/chargepallist/index.vue
+++ b/pages/agentpages/devicemanagement/chargepallist/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="设备列表" :border-bottom="false" :background="bgc"  title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<u-navbar title="设备列表" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
 			<view class="serchinp">
 				<u-search placeholder="搜索" v-model="keyword" @custom="btnseach"></u-search>
 				<view class="xuanze">
@@ -17,16 +16,7 @@
 							设备总数
 						</view>
 						<view class="sb">
-							50
-						</view>
-					</view>
-					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
-					<view class="ddje">
-						<view class="shu">
-							未上机数
-						</view>
-						<view class="sb">
-							0
+							{{listobj.current.total == null ? 0 : listobj.current.total}}
 						</view>
 					</view>
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -35,7 +25,7 @@
 							在线数
 						</view>
 						<view class="sb">
-							47
+							{{listobj.current.online == null ? 0 : listobj.current.online}}
 						</view>
 					</view>
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -44,7 +34,7 @@
 							离线数
 						</view>
 						<view class="sb">
-							3
+							{{listobj.current.offline == null ? 0 : listobj.current.offline}}
 						</view>
 					</view>
 				</view>
@@ -77,9 +67,9 @@
 						</view>
 						<view class="cdbcen-szbz">
 							<view class="inp">
-							<text>设置备注：</text>	<input type="text" v-model="remark" :placeholder="item.cabinetRemark == null ? '无' : item.cabinetRemark" /> 
+							<text>设置备注：</text>	<input type="text" v-model="item.cabinetRemark" :placeholder="item.cabinetRemark == null ? '无' : item.cabinetRemark" /> 
 							</view>
-							<view class="but" @click="btnxg(item.cabinetId)">
+							<view class="but" @click="btnxg(item.cabinetId,item.cabinetRemark)">
 								修改备注
 							</view>
 						</view>
@@ -163,7 +153,10 @@
 				showflag:false,
 				keyword:'',
 				remark:'',
-				storeId:''
+				storeId:'',
+				listobj:{},
+				status:'',
+				slotNum:''
 			}
 		},
 		onLoad(option) {
@@ -172,6 +165,7 @@
 			}else{
 				this.storeId = ''
 			}
+			this.getlistobj()
 		},
 		onShow() {
 			if(this.storeId){
@@ -186,11 +180,17 @@
 			}
 		},
 		methods: {
-			
-			btnxg(cabinetId){
+			getlistobj(){
+				this.$u.get('/agent/cabinet/indexCount').then(res => {
+					if(res.code == 200){
+						this.listobj = res.data
+					}
+				})
+			},
+			btnxg(cabinetId,remark){
 				let data = {
 					cabinetId:cabinetId,
-					cabinetRemark:this.remark
+					cabinetRemark:remark
 				}
 				this.$u.put(`/agent/cabinet/${cabinetId}`,data).then(res=>{
 					if(res.code == 200){
@@ -211,7 +211,7 @@
 				this.getlist()
 			},
 			getlist() {
-				this.$u.get('/agent/cabinet/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' + this.keyword + '&agentId=' + this.agentId).then(res => {
+				this.$u.get('/agent/cabinet/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' + this.keyword + '&agentId=' + this.agentId+ '&status=' + this.status + '&slotNum=' + this.slotNum).then(res => {
 					if (res.code == 200) {
 						this.total = res.total;
 						if (this.total > 0) {
@@ -229,7 +229,7 @@
 				})
 			},
 			getlists() {
-				this.$u.get('/agent/cabinet/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' + this.keyword + '&storeId=' + this.storeId).then(res => {
+				this.$u.get('/agent/cabinet/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' + this.keyword + '&storeId=' + this.storeId+ '&status=' + this.status + '&slotNum=' + this.slotNum).then(res => {
 					if (res.code == 200) {
 						this.total = res.total;
 						if (this.total > 0) {
@@ -282,10 +282,22 @@
 			confirmzt(e){
 				console.log(e);
 				this.zhuangt = e[0].label
+				if(this.zhuangt == '正常'){
+					this.status = 1
+				}else{
+					this.status = 2
+				}
+				this.pagenum = 1
+				this.wateringList = []
+				this.getlist()
 			},
 			confirmlx(e){
 				console.log(e);
 				this.leix = e[0].label
+				this.slotNum = e[0].label
+				this.pagenum = 1
+				this.wateringList = []
+				this.getlist()
 			},
 			
 			btnxq(cabinetId){
@@ -300,7 +312,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	.page .serchinp .u-content{
 		padding-left: 20rpx !important;
diff --git a/pages/agentpages/devicemanagement/chargepallist/listdetail/index.vue b/pages/agentpages/devicemanagement/chargepallist/listdetail/index.vue
index c7bfc07..51ac8a4 100644
--- a/pages/agentpages/devicemanagement/chargepallist/listdetail/index.vue
+++ b/pages/agentpages/devicemanagement/chargepallist/listdetail/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="设备详情" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="boxtop">
 				<view class="bh">
@@ -227,7 +226,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 
 	page {
diff --git a/pages/agentpages/devicemanagement/failure/index.vue b/pages/agentpages/devicemanagement/failure/index.vue
index 97d484b..92f2720 100644
--- a/pages/agentpages/devicemanagement/failure/index.vue
+++ b/pages/agentpages/devicemanagement/failure/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="设备故障" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="nav">
 				<view class="top">
@@ -142,7 +141,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back{
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	
 	page {
diff --git a/pages/agentpages/devicemanagement/failure/yichang/index.vue b/pages/agentpages/devicemanagement/failure/yichang/index.vue
index 6c6d7fa..3d26611 100644
--- a/pages/agentpages/devicemanagement/failure/yichang/index.vue
+++ b/pages/agentpages/devicemanagement/failure/yichang/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="上报异常" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="list">
 				<view class="sbbh">
@@ -122,7 +121,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back{
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/pages/agentpages/devicemanagement/index.vue b/pages/agentpages/devicemanagement/index.vue
index 91b10ea..8fee7dd 100644
--- a/pages/agentpages/devicemanagement/index.vue
+++ b/pages/agentpages/devicemanagement/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="设备管理" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="title">
 				全部设备
@@ -13,16 +12,7 @@
 							设备总数
 						</view>
 						<view class="sb">
-							50
-						</view>
-					</view>
-					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
-					<view class="ddje">
-						<view class="shu">
-							未上机数
-						</view>
-						<view class="sb">
-							0
+							{{listobj.all.total == null ? 0 : listobj.all.total}}
 						</view>
 					</view>
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -31,7 +21,7 @@
 							在线数
 						</view>
 						<view class="sb">
-							42
+							{{listobj.all.online == null ? 0 : listobj.all.online}}
 						</view>
 					</view>
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -40,7 +30,7 @@
 							离线数
 						</view>
 						<view class="sb">
-							8
+							{{listobj.all.offline == null ? 0 : listobj.all.offline}}
 						</view>
 					</view>
 				</view>
@@ -55,16 +45,7 @@
 							设备总数
 						</view>
 						<view class="sb">
-							50
-						</view>
-					</view>
-					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
-					<view class="ddje">
-						<view class="shu">
-							未上机数
-						</view>
-						<view class="sb">
-							0
+							{{listobj.current.total == null ? 0 : listobj.current.total}}
 						</view>
 					</view>
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -73,7 +54,7 @@
 							在线数
 						</view>
 						<view class="sb">
-							42
+							{{listobj.current.online == null ? 0 : listobj.current.online}}
 						</view>
 					</view>
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -82,7 +63,7 @@
 							离线数
 						</view>
 						<view class="sb">
-							8
+							{{listobj.current.offline == null ? 0 : listobj.current.offline}}
 						</view>
 					</view>
 				</view>
@@ -97,16 +78,7 @@
 							设备总数
 						</view>
 						<view class="sb">
-							0
-						</view>
-					</view>
-					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
-					<view class="ddje">
-						<view class="shu">
-							未上机数
-						</view>
-						<view class="sb">
-							0
+							{{listobj.children.total == null ? 0 : listobj.children.total}}
 						</view>
 					</view>
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -115,7 +87,7 @@
 							在线数
 						</view>
 						<view class="sb">
-							0
+							{{listobj.children.online == null ? 0 : listobj.children.online}}
 						</view>
 					</view>
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -124,7 +96,7 @@
 							离线数
 						</view>
 						<view class="sb">
-							0
+							{{listobj.children.offline == null ? 0 : listobj.children.offline}}
 						</view>
 					</view>
 				</view>
@@ -168,10 +140,20 @@
 	export default {
 		data() {
 			return {
-
+               listobj:{}
 			}
 		},
+		onLoad() {
+			this.getlist()
+		},
 		methods: {
+			getlist(){
+				this.$u.get('/agent/cabinet/indexCount').then(res => {
+					if(res.code == 200){
+						this.listobj = res.data
+					}
+				})
+			},
             btnpage(num){
 				if(num == 0){
 					uni.navigateTo({
@@ -241,7 +223,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	
 	page {
@@ -296,7 +278,7 @@
 			.shuju {
 				display: flex;
 				justify-content: space-between;
-				padding: 0 40rpx;
+				padding: 0 50rpx;
 				box-sizing: border-box;
 				margin-top: 24rpx;
 				width: 680rpx;
diff --git a/pages/agentpages/devicemanagement/lnstallation/index.vue b/pages/agentpages/devicemanagement/lnstallation/index.vue
index 68efe7b..503153a 100644
--- a/pages/agentpages/devicemanagement/lnstallation/index.vue
+++ b/pages/agentpages/devicemanagement/lnstallation/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="维修申报" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="serchs">
 				<u-search placeholder="搜索" input-align="center" v-model="keyword"></u-search>
@@ -136,7 +135,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/pages/agentpages/devicemanagement/repairapplication/index.vue b/pages/agentpages/devicemanagement/repairapplication/index.vue
index fa0720c..0b65868 100644
--- a/pages/agentpages/devicemanagement/repairapplication/index.vue
+++ b/pages/agentpages/devicemanagement/repairapplication/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="维修申报记录" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="nav">
 				<view class="top">
@@ -49,7 +48,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/pages/agentpages/devicemanagement/repairapplication/shenbao/index.vue b/pages/agentpages/devicemanagement/repairapplication/shenbao/index.vue
index 7f1edd3..3421e5b 100644
--- a/pages/agentpages/devicemanagement/repairapplication/shenbao/index.vue
+++ b/pages/agentpages/devicemanagement/repairapplication/shenbao/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="维修申报" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="jijian">
         		<text>寄件地址：</text> <textarea value="" placeholder="请输入寄件地址" />
@@ -39,7 +38,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/pages/agentpages/devicemanagement/xiajilist/index.vue b/pages/agentpages/devicemanagement/xiajilist/index.vue
index fccf044..846ee1d 100644
--- a/pages/agentpages/devicemanagement/xiajilist/index.vue
+++ b/pages/agentpages/devicemanagement/xiajilist/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="下级设备列表" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<u-navbar title="下级设备列表" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
 		<view class="serchinp">
 			<u-search placeholder="搜索" v-model="keyword" @custom="btnseach"></u-search>
 			<view class="xuanze">
@@ -17,16 +16,7 @@
 						设备总数
 					</view>
 					<view class="sb">
-						50
-					</view>
-				</view>
-				<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
-				<view class="ddje">
-					<view class="shu">
-						未上机数
-					</view>
-					<view class="sb">
-						0
+						{{listobj.children.total == null ? 0 : listobj.children.total}}
 					</view>
 				</view>
 				<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -35,7 +25,7 @@
 						在线数
 					</view>
 					<view class="sb">
-						47
+						{{listobj.children.online == null ? 0 : listobj.children.online}}
 					</view>
 				</view>
 				<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -44,7 +34,7 @@
 						离线数
 					</view>
 					<view class="sb">
-						3
+						{{listobj.children.offline == null ? 0 : listobj.children.offline}}
 					</view>
 				</view>
 			</view>
@@ -61,7 +51,7 @@
 					<view class="toptltle_rt" @click="btnxq(item.cabinetId)">
 						<text></text><text></text><text></text>
 					</view>
-				</view>
+				</view> 
 
 				<view class="cdbcen">
 					<view class="cdbcen-dpmc">
@@ -78,10 +68,9 @@
 					</view>
 					<view class="cdbcen-szbz">
 						<view class="inp">
-							<text>设置备注：</text> <input type="text"
-								:placeholder="item.remark == null ? '无' : item.remark" />
+							<text>设置备注：</text>	<input type="text" v-model="item.cabinetRemark" :placeholder="item.cabinetRemark == null ? '无' : item.cabinetRemark" /> 
 						</view>
-						<view class="but">
+						<view class="but" @click="btnxg(item.cabinetId,item.cabinetRemark)">
 							修改备注
 						</view>
 					</view>
@@ -162,7 +151,10 @@
 				total: 0,
 				showflag: false,
 				keyword: '',
-				storeId:''
+				storeId:'',
+				listobj:{},
+				status:'',
+				slotNum:''
 			}
 		},
 		onLoad(option) {
@@ -171,6 +163,7 @@
 			}else{
 				this.storeId = ''
 			}
+			this.getlistobj()
 		},
 		onShow() {
 		if(this.storeId){
@@ -185,6 +178,31 @@
 		}
 		},
 		methods: {
+			getlistobj(){
+				this.$u.get('/agent/cabinet/indexCount').then(res => {
+					if(res.code == 200){
+						this.listobj = res.data
+					}
+				})
+			},
+			btnxg(cabinetId,remark){
+				let data = {
+					cabinetId:cabinetId,
+					cabinetRemark:remark
+				}
+				this.$u.put(`/agent/cabinet/${cabinetId}`,data).then(res=>{
+					if(res.code == 200){
+						uni.showToast({
+							title: '修改备注成功',
+							icon: 'none',
+							duration: 1000
+						})
+						this.pagenum = 1
+						this.wateringList = []
+						this.getlist()
+					}
+				})
+			},
 			btnseach() {
 				this.pagenum = 1
 				this.wateringList = []
@@ -192,7 +210,7 @@
 			},
 			getlist() {
 				this.$u.get('/agent/cabinet/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' +
-					this.keyword + '&ancestorAgentId=' + this.ancestorAgentId).then(res => {
+					this.keyword + '&ancestorAgentId=' + this.ancestorAgentId + '&status=' + this.status + '&slotNum=' + this.slotNum).then(res => {
 					if (res.code == 200) {
 						this.total = res.total;
 						if (this.total > 0) {
@@ -210,7 +228,7 @@
 				})
 			},
 			getlists() {
-				this.$u.get('/agent/cabinet/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' + this.keyword + '&storeId=' + this.storeId).then(res => {
+				this.$u.get('/agent/cabinet/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' + this.keyword + '&storeId=' + this.storeId + '&status=' + this.status + '&slotNum=' + this.slotNum).then(res => {
 					if (res.code == 200) {
 						this.total = res.total;
 						if (this.total > 0) {
@@ -263,10 +281,22 @@
 			confirmzt(e) {
 				console.log(e);
 				this.zhuangt = e[0].label
+				if(this.zhuangt == '正常'){
+					this.status = 1
+				}else{
+					this.status = 2
+				}
+				this.pagenum = 1
+				this.wateringList = []
+				this.getlist()
 			},
 			confirmlx(e) {
 				console.log(e);
 				this.leix = e[0].label
+				this.slotNum = e[0].label
+				this.pagenum = 1
+				this.wateringList = []
+				this.getlist()
 			},
 
 			btnxq(cabinetId) {
@@ -281,7 +311,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
     .page .serchinp .u-content{
     	padding-left: 20rpx !important;
diff --git a/pages/agentpages/index/index.vue b/pages/agentpages/index/index.vue
index 24fdca9..e454cce 100644
--- a/pages/agentpages/index/index.vue
+++ b/pages/agentpages/index/index.vue
@@ -10,11 +10,11 @@
 					<text>账户余额（元）</text> <text class="tx" style="margin-right: 10rpx;" @click="btnnav(9)">提现明细</text>
 				</view>
 				<view class="zhje">
-					<text>1163.916</text> <text class="btntx" @click="btnnav(10)">立即提现</text>
+					<text>{{txobj.totalAmount}}</text> <text class="btntx" @click="btnnav(10)">立即提现</text>
 				</view>
 				<view class="buc">
 					收益提升技巧：加强关注，尽快为缺宝的设备补充充电宝
-				</view>
+				</view> 
 			</view>
 
 			<view class="dttitle">
@@ -36,7 +36,7 @@
 				<view class="shuju">
 					<view class="ddje">
 						<view class="shu">
-							32.5
+							{{listobj.orderAmount == null ? 0 : listobj.orderAmount}}
 						</view>
 						<view class="sb">
 							订单总额
@@ -45,7 +45,7 @@
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
 					<view class="ddje">
 						<view class="shu">
-							9
+							{{listobj.orderCount == null ? 0 : listobj.orderCount}}
 						</view>
 						<view class="sb">
 							订单总数
@@ -54,7 +54,7 @@
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
 					<view class="ddje">
 						<view class="shu">
-							0
+							{{listobj.newStoreCount == null ? 0 : listobj.newStoreCount}}
 						</view>
 						<view class="sb">
 							新增店铺
@@ -63,7 +63,7 @@
 					<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
 					<view class="ddje">
 						<view class="shu">
-							0
+							{{listobj.newCabinetCount == null ? 0 : listobj.newCabinetCount}}
 						</view>
 						<view class="sb">
 							新增设备
@@ -123,17 +123,36 @@
 				selectors: '2024-4-9',
 				num: '',
 				dateindex: 1,
-                
+                listobj:{},
 				firsTime:'',
-				lasTime:''
+				lasTime:'',
+				txobj:''
 			};
 		},
 		onLoad() {
-			let today = new Date();
-			this.firsTime = this.formatDate(today);
-			this.lasTime = this.formatDate(today);
+			let today = new Date()
+			this.firsTime = this.formatDate(today)
+			this.lasTime = this.formatDate(today)
+		},
+		onShow() {
+			this.getlist()
+			this.getguize()
 		},
 		methods: {
+			getguize() {
+				this.$u.get('/agent/withdraw/rule').then(res => {
+					if (res.code == 200) {
+						this.txobj = res.data
+					}
+				})
+			},
+			getlist(){
+				this.$u.get('/agent/report/agent/indexCount?startDate=' + this.firsTime + '&endDate=' + this.lasTime).then(res=>{
+					if(res.code == 200){
+						this.listobj = res.data
+					}
+				})
+			},
 			btnks(num) {
 				this.show = true
 				if (num == 1) {
@@ -145,8 +164,12 @@
 			confirm(e) {
 				if (this.num == 1) {
 					this.firsTime = e.year + '-' + e.month + '-' + e.day
+					this.dateindex = 0
+					this.getlist()
 				} else {
 					this.lasTime = e.year + '-' + e.month + '-' + e.day
+					this.dateindex = 0
+					this.getlist()
 				}
 			},
 
@@ -193,44 +216,39 @@
 					})
 				}
 			},
-			// let today = new Date();
-			// // 获取七天前的日期
-			// // 格式化日期为 yyyy-MM-dd
-			// this.firsTime = this.formatDate(today);
-			// this.lasTime = this.formatDate(today);
 			btnriq(num) {
 				this.dateindex = num
 				if (num == 1) {
 					let today = new Date();
-					this.firsTime = this.formatDate(today);
-					this.lasTime = this.formatDate(today);
-					// this.operatingData()
+					this.firsTime = this.formatDate(today)
+					this.lasTime = this.formatDate(today)
+					this.getlist()
 				} else if (num == 2) {
-					let yesterday = new Date();
-					yesterday.setDate(yesterday.getDate() - 1);
-					this.firsTime = this.formatDate(yesterday);
-					this.lasTime = this.formatDate(new Date());
-					// this.operatingData()
+					let yesterday = new Date()
+					yesterday.setDate(yesterday.getDate() - 1)
+					this.firsTime = this.formatDate(yesterday)
+					this.lasTime = this.formatDate(new Date())
+					this.getlist()
 				} else if (num == 3) {
-					let today = new Date();
-					let firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6);
-					this.firsTime = this.formatDate(firstDayOfMonth);
-					this.lasTime = this.formatDate(new Date());
-					// this.operatingData()
+					let today = new Date()
+					let firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6)
+					this.firsTime = this.formatDate(firstDayOfMonth)
+					this.lasTime = this.formatDate(new Date())
+					this.getlist()
 				} else if (num == 4) {
-					let today = new Date();
-					let firstDayOfLastMonth = new Date(today.getFullYear(), today.getMonth() - 1,today.getDate() + 1);
-					let lastDayOfLastMonth = new Date(today.getFullYear(), today.getMonth(), today.getDate());
-					this.firsTime = this.formatDate(firstDayOfLastMonth);
-					this.lasTime = this.formatDate(lastDayOfLastMonth);
-					// this.operatingData()
+					let today = new Date()
+					let firstDayOfLastMonth = new Date(today.getFullYear(), today.getMonth() - 1,today.getDate() + 1)
+					let lastDayOfLastMonth = new Date(today.getFullYear(), today.getMonth(), today.getDate())
+					this.firsTime = this.formatDate(firstDayOfLastMonth)
+					this.lasTime = this.formatDate(lastDayOfLastMonth)
+					this.getlist()
 				} 
 			},
 			formatDate(date) {
-				let year = date.getFullYear();
-				let month = String(date.getMonth() + 1).padStart(2, '0');
-				let day = String(date.getDate()).padStart(2, '0');
-				return `${year}-${month}-${day}`;
+				let year = date.getFullYear()
+				let month = String(date.getMonth() + 1).padStart(2, '0')
+				let day = String(date.getDate()).padStart(2, '0')
+				return `${year}-${month}-${day}`
 			},
 
 
diff --git a/pages/agentpages/shopguanli/discipleshop/index.vue b/pages/agentpages/shopguanli/discipleshop/index.vue
index 7da5b02..77028ff 100644
--- a/pages/agentpages/shopguanli/discipleshop/index.vue
+++ b/pages/agentpages/shopguanli/discipleshop/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="下级店铺" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="top">
         		<u-search placeholder="搜索" input-align="center" v-model="keyword" @custom="searchs"></u-search>
@@ -167,7 +166,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	
 	page {
diff --git a/pages/agentpages/shopguanli/index.vue b/pages/agentpages/shopguanli/index.vue
index d9029c2..cf95477 100644
--- a/pages/agentpages/shopguanli/index.vue
+++ b/pages/agentpages/shopguanli/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="店铺管理" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="shuju">
         		<view class="ddje">
@@ -9,7 +8,7 @@
         				全部店铺
         			</view>
         			<view class="sb">
-        				0
+        				{{listobj.all == null ? 0 : listobj.all}}
         			</view>
         		</view>
         		<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -18,7 +17,7 @@
         				我的店铺
         			</view>
         			<view class="sb">
-        				0
+        				{{listobj.current == null ? 0 : listobj.current}}
         			</view>
         		</view>
         		<text style="width: 1px;height: 60rpx;background: #979797;margin-top: 24rpx;"></text>
@@ -27,7 +26,7 @@
         			下级店铺
         			</view>
         			<view class="sb">
-        				0
+        				{{listobj.children == null ? 0 : listobj.children}}
         			</view>
         		</view>
         	</view>
@@ -48,10 +47,20 @@
 	export default {
 		data() {
 			return {
-
+               listobj:{}
 			}
 		},
+		onLoad() {
+			this.getlist()
+		},
 		methods: {
+			getlist(){
+				this.$u.get('/agent/store/indexCount').then(res=>{
+					if(res.code == 200){
+						this.listobj = res.data
+					}
+				})
+			},
             btnshop(num){
 				if(num == 1){
 					uni.navigateTo({
@@ -71,7 +80,7 @@
 					})
 				}else if(num ==5){
 					uni.navigateTo({
-						url:'/pages/income/index'
+						url:'/pages/income/index?tit=' + '店铺排名' + '&tits=' + '金额'
 					})
 				}
 			}
@@ -82,7 +91,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	
 	page {
diff --git a/pages/agentpages/shopguanli/myshop/index.vue b/pages/agentpages/shopguanli/myshop/index.vue
index ae02f3c..74bd508 100644
--- a/pages/agentpages/shopguanli/myshop/index.vue
+++ b/pages/agentpages/shopguanli/myshop/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="我的店铺" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="top">
 				<u-search placeholder="搜索" input-align="center" v-model="keyword" @custom="searchs"></u-search>
@@ -165,7 +164,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/pages/agentpages/shopguanli/setupshop/index.vue b/pages/agentpages/shopguanli/setupshop/index.vue
index 4cc24f4..3d8db3d 100644
--- a/pages/agentpages/shopguanli/setupshop/index.vue
+++ b/pages/agentpages/shopguanli/setupshop/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="创建店铺" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<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="list">
 				<view class="listval">
@@ -336,7 +335,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #19CD82 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/pages/detail/detailed/index.vue b/pages/detail/detailed/index.vue
index 013e98a..bb659fc 100644
--- a/pages/detail/detailed/index.vue
+++ b/pages/detail/detailed/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="提现明细详情" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='58'></u-navbar>
+		<u-navbar title="提现明细详情" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
 		<view class="list">
 			<view class="listbox">
 				<view class="title">
@@ -146,7 +146,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	page {
 		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
diff --git a/pages/detail/index.vue b/pages/detail/index.vue
index 3a5a24f..5480096 100644
--- a/pages/detail/index.vue
+++ b/pages/detail/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="提现明细" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<u-navbar title="提现明细" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
 		<view class="title">
 			总提现金额：<text>{{totalWithdraw}}</text>元
 		</view>
@@ -131,7 +130,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 
 	page {
diff --git a/pages/income/index.vue b/pages/income/index.vue
index 09a3b02..e2b07a0 100644
--- a/pages/income/index.vue
+++ b/pages/income/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar :title="bttit" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<u-navbar :title="bttit" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
 		<view class="box">
 			<view class="top">
 				<u-search placeholder="搜索" input-align="center" v-model="keyword" @custom="seach"></u-search>
@@ -239,7 +238,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 
 	page {
diff --git a/pages/myorder/index.vue b/pages/myorder/index.vue
index 5a70704..47c64c4 100644
--- a/pages/myorder/index.vue
+++ b/pages/myorder/index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="我的订单" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='58'></u-navbar>
+		<u-navbar title="我的订单" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
 		<view class="listorder" @scrolltolower="onReachBottom" v-for="(item,index) in wateringList" :key="index">
 			<view class="title">
 				<view>订单号：{{item.orderNo}} &nbsp;&nbsp; <u-icon @click="fuzhi(item.orderNo)" name="file-text"
@@ -146,8 +145,7 @@
 										if (minutes >= order.priceStandard.feeFreeTime) {
 											order.money = (hours * 2 + 1) * order.priceStandard.feePrice
 											if (minutes >= 30) {
-												order.money = (hours * 2 + 2) * order.priceStandard
-													.feePrice
+												order.money = (hours * 2 + 2) * order.priceStandard.feePrice
 											}
 										} else {
 											order.money = hours * 2 * order.priceStandard.feePrice
@@ -203,7 +201,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 
 	page {
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index 54a3a2d..d5247e4 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="附近共享" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='58'></u-navbar>
+		<u-navbar title="附近共享" :border-bottom="false" :background="bgc" title-color='#000' back-icon-color="#000" title-size='36' height='50'></u-navbar>
 			<view class="dtxs">
 				<map class='map' id="map" :latitude="latitude" :longitude="longitude" @markertap="handleMarkerClick"
 					:show-location="true" :markers="covers" :scale="mapScale" />
@@ -20,8 +20,8 @@
 					<view class="cenc">
 						营业时间：{{item.businessTimeStart}}-{{item.businessTimeEnd}}
 				<view class="" style="display: flex;margin-top: 20rpx;">
-					<view class="wz" style="color: #109F64;" v-if="item.availableDeviceCount > 0">可租借</view>
-					<view class="wz" style="color: #109F64;" v-if="item.slotCount - item.deviceCount > 0">可归还</view>
+					<view class="wz" style="color: #109F64;background-color: #B7FFE1;" v-if="item.availableDeviceCount > 0">可租借</view>
+					<view class="wz" style="color: #109F64;background-color: #B7FFE1;" v-if="item.slotCount - item.deviceCount > 0">可归还</view>
 					<view class="wz" style="background-color: #FFEFEF;color: #FF4444;" v-if="item.slotCount - item.deviceCount == 0">不可还</view>
 				</view>
 					</view>
@@ -270,7 +270,7 @@
 <style lang="scss">
 	/deep/ .u-title,
 	/deep/ .uicon-nav-back {
-		padding-bottom: 40rpx;
+		padding-bottom: 22rpx;
 	}
 	/deep/ .map{
 		width: 100%;
@@ -378,7 +378,7 @@
 						// display: flex;
 						.wz{
 							font-size: 20rpx;
-							margin-left: 5rpx;
+							// margin-left: 5rpx;
 							padding: 4rpx 14rpx;
 							box-sizing: border-box;
 							// width:100rpx;