From 6f69ad215d524f79a234732b1a0b6196c501a4e1 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Tue, 21 May 2024 18:02:34 +0800
Subject: [PATCH] aaa

---
 page_components/eletj.vue                     |  6 ++--
 page_components/fuwu/index.vue                |  4 +--
 page_fenbao/statulist/about/index.vue         |  4 +--
 page_fenbao/statulist/fault/index.vue         |  4 +--
 page_fenbao/statulist/fault/yichang/index.vue |  4 +--
 page_fenbao/statulist/merchant/index.vue      |  4 +--
 .../statulist/myorder/detailxq/index.vue      |  4 +--
 page_fenbao/statulist/myorder/index.vue       |  4 +--
 .../statulist/myshop/editshop/index.vue       |  6 ++--
 page_fenbao/statulist/myshop/index.vue        |  6 ++--
 .../statulist/myshop/shebeilist/index.vue     |  4 +--
 .../statulist/myshop/shopdetail/index.vue     |  4 +--
 page_fenbao/statulist/myshop/shopxx/index.vue |  6 ++--
 page_fenbao/statulist/nearby/index.vue        | 30 +++++++++++++------
 page_fenbao/statulist/question/index.vue      |  4 +--
 .../statulist/question/xiangqing/index.vue    |  4 +--
 .../statulist/taocanlist/addtaocan/index.vue  |  4 +--
 page_fenbao/statulist/taocanlist/index.vue    |  4 +--
 page_user/cbRecord.vue                        |  4 +--
 page_user/fenzu.vue                           |  6 ++--
 page_user/mapditu/index.vue                   | 20 +++++++++----
 page_user/order_detail.vue                    |  6 ++--
 page_user/sbdetail.vue                        |  6 ++--
 page_user/setting.vue                         |  6 ++--
 page_user/shouzhi.vue                         |  6 ++--
 page_user/txrecord.vue                        |  6 ++--
 page_user/userSet.vue                         |  6 ++--
 page_user/yetx.vue                            |  8 ++---
 pages/index/index.vue                         | 16 +++++-----
 pages/shouye/index.vue                        | 23 ++++++--------
 pages/tj.vue                                  | 17 ++++++-----
 31 files changed, 127 insertions(+), 109 deletions(-)

diff --git a/page_components/eletj.vue b/page_components/eletj.vue
index 65c05ea..e79bda0 100644
--- a/page_components/eletj.vue
+++ b/page_components/eletj.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar title="用电分析" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36' id="navbar"></u-navbar>
+		<u-navbar title="用电分析" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
+			height='58' id="navbar"></u-navbar>
 		<view class="card">
 			<view class="xzsj">
 				<u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
@@ -52,7 +52,7 @@
 				},
 				
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 				},
 				params: {
 					year: true,
diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index 0529ea8..81dcfa9 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/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>
+		<u-navbar title="充值" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
 		<view class="title">
 			设备名称：{{deviceobj.deviceName}}
 		</view>
diff --git a/page_fenbao/statulist/about/index.vue b/page_fenbao/statulist/about/index.vue
index 686f5b7..4c5051e 100644
--- a/page_fenbao/statulist/about/index.vue
+++ b/page_fenbao/statulist/about/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>
+		<u-navbar title="关于我们" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
         <view class="box">
         	<view class="title">
         		{{obj.title}}
diff --git a/page_fenbao/statulist/fault/index.vue b/page_fenbao/statulist/fault/index.vue
index 9baf470..698f9eb 100644
--- a/page_fenbao/statulist/fault/index.vue
+++ b/page_fenbao/statulist/fault/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>
+		<u-navbar title="设备故障" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
 		<view class="box">
 			<view class="nav">
 				<view class="top">
diff --git a/page_fenbao/statulist/fault/yichang/index.vue b/page_fenbao/statulist/fault/yichang/index.vue
index f480b36..3d47d9c 100644
--- a/page_fenbao/statulist/fault/yichang/index.vue
+++ b/page_fenbao/statulist/fault/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>
+		<u-navbar title="上报异常" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
 		<view class="box">
 			<view class="list">
 				<view class="sbbh">
diff --git a/page_fenbao/statulist/merchant/index.vue b/page_fenbao/statulist/merchant/index.vue
index 290c66d..91f7d59 100644
--- a/page_fenbao/statulist/merchant/index.vue
+++ b/page_fenbao/statulist/merchant/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>
+		<u-navbar title="商家合作" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
 			<view class="title">
 				请输入您的真实有效信息，我们将在第一时间联系 您
 			</view>
diff --git a/page_fenbao/statulist/myorder/detailxq/index.vue b/page_fenbao/statulist/myorder/detailxq/index.vue
index 8ef1468..d8b67bb 100644
--- a/page_fenbao/statulist/myorder/detailxq/index.vue
+++ b/page_fenbao/statulist/myorder/detailxq/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>
+		<u-navbar title="订单详情" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
         <view class="box">
         	<view class="listxq">
         		<view class="nav">
diff --git a/page_fenbao/statulist/myorder/index.vue b/page_fenbao/statulist/myorder/index.vue
index fe0d30d..76c1bed 100644
--- a/page_fenbao/statulist/myorder/index.vue
+++ b/page_fenbao/statulist/myorder/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>
+		<u-navbar title="我的订单" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
         <view class="box">
         	<view class="list" @scrolltolower="onReachBottom" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item)">
         		<view class="list_val">
diff --git a/page_fenbao/statulist/myshop/editshop/index.vue b/page_fenbao/statulist/myshop/editshop/index.vue
index c53bc97..5ef88a7 100644
--- a/page_fenbao/statulist/myshop/editshop/index.vue
+++ b/page_fenbao/statulist/myshop/editshop/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>
+		<u-navbar title="修改店铺" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
 		<view class="box">
 			<view class="list">
 				<view class="listval">
@@ -391,7 +391,7 @@
 
 			.list {
 				width: 680rpx;
-				height: 1254rpx;
+				height: 1180rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx 24rpx 24rpx 24rpx;
 				margin: auto;
diff --git a/page_fenbao/statulist/myshop/index.vue b/page_fenbao/statulist/myshop/index.vue
index caafa9f..f4440d6 100644
--- a/page_fenbao/statulist/myshop/index.vue
+++ b/page_fenbao/statulist/myshop/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>
+		<u-navbar title="我的店铺" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' back-icon-color="#fff"
+			height='58'></u-navbar>
 		<view class="box">
 			<view class="top">
 				<u-search placeholder="搜索" input-align="center" v-model="keyword" @custom="searchs"></u-search>
@@ -311,7 +311,7 @@
 				display: flex;
 				justify-content: space-between;
                 position: fixed;
-				top: 160rpx;
+				top: 200rpx;
 				.cjshop {
 					width: 200rpx;
 					height: 64rpx;
diff --git a/page_fenbao/statulist/myshop/shebeilist/index.vue b/page_fenbao/statulist/myshop/shebeilist/index.vue
index 6a3036a..f2ba6ac 100644
--- a/page_fenbao/statulist/myshop/shebeilist/index.vue
+++ b/page_fenbao/statulist/myshop/shebeilist/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>
+		<u-navbar title="设备列表" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
         <view class="box">
         	<view class="warp_box">
         		<view class="swiper"  :current='curtitidx' @change="swiperchange" @scrolltolower="onReachBottom">
diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue
index 71043e3..ffd1a8f 100644
--- a/page_fenbao/statulist/myshop/shopdetail/index.vue
+++ b/page_fenbao/statulist/myshop/shopdetail/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>
+		<u-navbar title="店铺详情" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
         <view class="box">
         	<view class="shopname">
                 {{listobj.name}}        		
diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue
index 6f94903..ccd03b2 100644
--- a/page_fenbao/statulist/myshop/shopxx/index.vue
+++ b/page_fenbao/statulist/myshop/shopxx/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>
+		<u-navbar title="创建店铺" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
 		<view class="box">
 			<view class="list">
 				<view class="listval">
@@ -353,7 +353,7 @@
 
 			.list {
 				width: 680rpx;
-				height: 1254rpx;
+				height: 1180rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx 24rpx 24rpx 24rpx;
 				margin: auto;
diff --git a/page_fenbao/statulist/nearby/index.vue b/page_fenbao/statulist/nearby/index.vue
index 32c8148..425dec7 100644
--- a/page_fenbao/statulist/nearby/index.vue
+++ b/page_fenbao/statulist/nearby/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='38'></u-navbar>
+		<u-navbar title="附近共享" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='44' height='58'></u-navbar>
 			<view class="dtxs">
 				<map class='map' :latitude="latitude" :longitude="longitude" @markertap="handleMarkerClick" :markers="covers" :show-location="true" />
 			</view>
@@ -10,10 +10,10 @@
 				<!-- <image src="https://api.ccttiot.com/smartmeter/img/static/uGVN2tOaCq2hiWKy1cYl" mode="" @click="btndt(2)" v-if="isMch"></image> -->
 			</view>
 			<view class="list" v-for="(item,index) in gxlist" :key="index">
-				<view class="pic">
+				<view class="pic" @click="btndts(item)">
 					<image :src="item.picture" mode=""></image>
 				</view>
-				<view class="cen">
+				<view class="cen" @click="btndts(item)">
 					<view class="cena" style="font-weight: 600;">
 						{{item.name}}
 					</view>
@@ -43,7 +43,10 @@
 				covers: [], 
 				index:1,
 				isMch:false,
-				gxlist:[]
+				gxlist:[],
+				bgc: {
+					backgroundColor: " #8883F0",
+				},
 			}
 		},
 		onLoad() {
@@ -127,6 +130,12 @@
 					url: '/page_user/mapditu/index?markerId=' + markerId
 				})
 			},
+			btndts(item){
+				const markerId = item.storeId;
+				uni.navigateTo({
+					url: '/page_user/mapditu/index?markerId=' + markerId
+				})
+			},
 			
 			btntab(num){
 				this.index = num
@@ -168,14 +177,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: 850rpx;
 			background: #FFFFFF;
 			border-radius: 64rpx 64rpx 0  0;
 			box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
@@ -183,12 +192,12 @@
 			padding-left: 32rpx;
 			padding-right: 32rpx;
 			box-sizing: border-box;
-			height: 70vh;
+			height:40vh;
 			overflow-y: scroll;
 			padding-bottom: 400rpx;
 			.moshi{
 				position: fixed;
-				top: 570rpx;
+				bottom: 37vh;
 				left: 30rpx;
 				z-index: 99;
 				image{
@@ -229,15 +238,17 @@
 					background-color: #D9D8FF;
 					border-radius: 10rpx;
 					margin-right: 20rpx;
+					border-radius: 20rpx;
 					image{
 						width: 100%;
 						height: 100%;
+						border-radius: 20rpx;
 					}
 				}
 				.cen{
 					width: 488rpx;
 					.cena{
-						font-weight: 500;
+						font-weight: 700 !important;
 						font-size: 28rpx;
 						color: #3D3D3D;
 						line-height: 38rpx;
@@ -265,6 +276,7 @@
 							margin-left: 10rpx;
 							background:#D9D8FF;
 							color: #4D48B5;
+							font-size: 20rpx;
 						}
 					}
 				}
diff --git a/page_fenbao/statulist/question/index.vue b/page_fenbao/statulist/question/index.vue
index e62ba0c..f99d405 100644
--- a/page_fenbao/statulist/question/index.vue
+++ b/page_fenbao/statulist/question/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>
+		<u-navbar title="常见问题" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
 		<view class="serch">
 			<u-search placeholder="搜索问题" height="72" :showAction="false" v-model="keyword" @change="sousuo"></u-search>
 		</view>
diff --git a/page_fenbao/statulist/question/xiangqing/index.vue b/page_fenbao/statulist/question/xiangqing/index.vue
index 060daff..556534a 100644
--- a/page_fenbao/statulist/question/xiangqing/index.vue
+++ b/page_fenbao/statulist/question/xiangqing/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>
+		<u-navbar title="常见问题" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
         <view class="box">
         	<view class="title">
         		{{listobj.title}}
diff --git a/page_fenbao/statulist/taocanlist/addtaocan/index.vue b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
index 810166a..feff821 100644
--- a/page_fenbao/statulist/taocanlist/addtaocan/index.vue
+++ b/page_fenbao/statulist/taocanlist/addtaocan/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>
+		<u-navbar title="新增套餐" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
 		<view class="box">
 			<view class="list">
 				<view class="title">
diff --git a/page_fenbao/statulist/taocanlist/index.vue b/page_fenbao/statulist/taocanlist/index.vue
index 8fde222..fa0a11f 100644
--- a/page_fenbao/statulist/taocanlist/index.vue
+++ b/page_fenbao/statulist/taocanlist/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>
+		<u-navbar title="套餐列表" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
 		<view class="box">
 			<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in list" :key="index" @click="click(item)" @open="open" :options="options">
 				<view class="boxlist" @click="btnedit(item)">
diff --git a/page_user/cbRecord.vue b/page_user/cbRecord.vue
index 86ed01d..9608702 100644
--- a/page_user/cbRecord.vue
+++ b/page_user/cbRecord.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>
+		<u-navbar title="充值记录" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
         <view class="box">
         	<view class="list" @scrolltolower="onReachBottom" v-for="(item,index) in wateringList" :key="index">
         		<view class="list_val">
diff --git a/page_user/fenzu.vue b/page_user/fenzu.vue
index cb89d6c..1d82598 100644
--- a/page_user/fenzu.vue
+++ b/page_user/fenzu.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar title="店铺管理" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+		<u-navbar title="店铺管理" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
+			height='58'></u-navbar>
 		<view class="fzbox">
 			<!-- 禁用 -->
 			<view class="card" :class="{fixed: index === 0}" v-for="(item,index) in groupList " :key="index" v-if="index==0">
@@ -75,7 +75,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 				},
 				obj: [],
 				newobj:[],
diff --git a/page_user/mapditu/index.vue b/page_user/mapditu/index.vue
index a1e5625..f41ee00 100644
--- a/page_user/mapditu/index.vue
+++ b/page_user/mapditu/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='38'></u-navbar>
+		<u-navbar title="地图模式" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='44' height='58'></u-navbar>
 			<view class="dtxs">
 					<map class='map' :latitude="latitude" :longitude="longitude" @markertap="handleMarkerClick" :markers="covers" :show-location="true"/>
 			</view>
@@ -43,10 +43,10 @@
 			</view>
 			<view class="anniu">
 				<view class="" @click="mapFun">
-					到这去
+				    <image class="picsm" src="https://api.ccttiot.com/smartmeter/img/static/u9Z7DXlWfjJtIrq5OEty" mode=""></image> 到这去
 				</view>
 				<view class="" style="color: #fff;background-color: #8883F0;" @click="scanQRCode">
-					扫一扫
+				    <image class="picsm" src="https://api.ccttiot.com/smartmeter/img/static/uvrsmSxGunHTI9S51ujn" mode=""></image>	扫一扫
 				</view>
 			</view>
 		</view>
@@ -68,7 +68,10 @@
 				listobj:{},
 				mapname:'',
 				mapaddress:'',
-				isMch:''
+				isMch:'',
+				bgc: {
+					backgroundColor: " #8883F0",
+				},
 			}
 		},
 		onLoad(option) {
@@ -342,7 +345,14 @@
 				}
 			}
 		}
-		
+		.picsm{
+				width: 48rpx;
+				height: 48rpx;
+				vertical-align: middle;
+				display: inline-block;
+				margin-bottom: 10rpx;
+				margin-right: 10rpx;
+		}
 		.dtxs{
 			width: 100%;
 			height: 100vh;
diff --git a/page_user/order_detail.vue b/page_user/order_detail.vue
index 35d8e42..5931a07 100644
--- a/page_user/order_detail.vue
+++ b/page_user/order_detail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<u-navbar title="账单详情" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+		<u-navbar title="账单详情" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
+			height='58'></u-navbar>
 		<view class="cont">
 			<view class="order_card">
 				<view class="cardtop">
@@ -75,7 +75,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 				},
 				list: {},
 				payType: ''
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 0748e7c..568ac92 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar :title="tittxt" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36' id="navbar">
+		<u-navbar :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
+			height='58' id="navbar">
 		</u-navbar>
 		<view class="zhuhu">
 			<view class="card1">
@@ -159,7 +159,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 
 				},
 				ec: {
diff --git a/page_user/setting.vue b/page_user/setting.vue
index 82ea0ff..84fc0f4 100644
--- a/page_user/setting.vue
+++ b/page_user/setting.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar title="设置" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+		<u-navbar title="设置" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
+			height='58'></u-navbar>
 		<view class="card">
 			<view class="li" @click.stop="sremakemc()">
 				<view class="tit">
@@ -168,7 +168,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 				},
 				showloading: false,
 				showfz: false,
diff --git a/page_user/shouzhi.vue b/page_user/shouzhi.vue
index c04a7bd..9b74ede 100644
--- a/page_user/shouzhi.vue
+++ b/page_user/shouzhi.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="pages">
-		<u-navbar title="收支明细" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+		<u-navbar title="收支明细" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
+			height='58'></u-navbar>
 
 		
 		<view class="cards" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.billId)" @scrolltolower="onReachBottom">
@@ -32,7 +32,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 				},
 				obj:{},
 				pagenum: 1,
diff --git a/page_user/txrecord.vue b/page_user/txrecord.vue
index 7b2ff0f..0e852cf 100644
--- a/page_user/txrecord.vue
+++ b/page_user/txrecord.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="pages">
-		<u-navbar title="提现记录" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+		<u-navbar title="提现记录" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
+			height='58'></u-navbar>
 
 		<!-- <view class="tops">
 			<view class="tit">提现记录</view>
@@ -36,7 +36,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 				},
 				list:''
 			}
diff --git a/page_user/userSet.vue b/page_user/userSet.vue
index 80dde2d..6300b88 100644
--- a/page_user/userSet.vue
+++ b/page_user/userSet.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar title="设置" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+		<u-navbar title="设置" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
+			height='58'></u-navbar>
 		<view class="card">
 			<view class="li">
 				<view class="tit">
@@ -118,7 +118,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 				},
 				showloading: false,
 				showfz: false,
diff --git a/page_user/yetx.vue b/page_user/yetx.vue
index 50a28bd..1aeea82 100644
--- a/page_user/yetx.vue
+++ b/page_user/yetx.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<u-navbar title="收款账户" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-		height='36'></u-navbar>
+		<u-navbar title="收款账户" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+			height='58'></u-navbar>
 		<view class="cont">
 			<view class="top_box">
 				<view class="tip">账户余额(元)</view>
@@ -81,7 +81,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 				},
 				name:'',
 				idnum:'',
@@ -314,7 +314,7 @@
 		margin-top: 218rpx;
 		width: 590rpx;
 		height: 84rpx;
-		background: #2A82E4;
+		background: #8883f0;
 		border-radius: 40rpx;
 		font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
 		font-weight: 400;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2241ae5..2003681 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#2E4975'
-			title-size='44' height='44' id="navbar">
+		<u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#fff'
+			title-size='44' height='58' id="navbar">
 		</u-navbar>
 		<u-mask :show="showtip" @click="show = false" :z-index='1000' />
 		<view class="tip_box" v-if="showtip">
@@ -69,7 +69,6 @@
 						<view class="swiper-item ">
 							<view class="card_box" @scrolltolower="onReachBottom" @click="todetail(item.deviceId)"
 								v-for="(item,index) in wateringList" :key="index">
-								<!-- deviceList -->
 								<view class="card">
 									<view class="card_left">
 										<view class="card_left_tit">
@@ -138,7 +137,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 
 				},
 				ec: {
@@ -1171,10 +1170,11 @@
 
 				.card_cont {
 					width: 750rpx;
-					display: flex;
-					flex-wrap: wrap;
-					align-items: baseline;
-					justify-content: center;
+					// display: flex;
+					// flex-wrap: wrap;
+					// align-items: baseline;
+					// justify-content: center;
+					padding-left: 30rpx;
 					height: 100%;
 					overflow-y: auto;
 					overflow-x: hidden;
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index a0806db..d7acb6a 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -2,15 +2,15 @@
 	<view class="page">
 		<!-- 用户首页显示 -->
 		<view class="useryonghu">
-			<u-navbar :is-back="false" title="首页" :border-bottom="false" :background="bgc" title-color='#000'
-				title-size='44' height='44'></u-navbar>
+			<u-navbar :is-back="false" title="首页" :border-bottom="false" :background="bgc" title-color='#fff'
+				title-size='44' height='58'></u-navbar>
 			<!-- <view class="title">
 				充电宝
 			</view> -->
 			<view class="ditu">
 				<view class="dtxs">
 					<map class='map' :latitude="latitude" :longitude="longitude" @markertap="handleMarkerClick"
-						:show-location="true" :markers="covers" :scale="13"/>
+						:show-location="true" :markers="covers" :scale="15"/>
 				</view>
 				<view class="fujin">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/u7HPhEwbIJqbLRpImBON" mode="" @click="btnindex(5)"></image>
@@ -173,20 +173,15 @@
 											longitude: item.lng,
 											width: 25,
 											height: 30,
-											iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4' // 你可以为每个店铺指定不同的图标  
+											iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4' ,// 你可以为每个店铺指定不同的图标  
+											label: {
+												content: item.name,
+												 // anchorX:-20,
+												textAlign:'center'
+											}
 										};
 										this.covers.push(shopCover); // 将店铺覆盖物添加到数组中  
 									});
-
-									// 添加当前位置的覆盖物（如果需要的话）  
-									// const myLocationCover = {
-									// 	latitude: this.latitude,
-									// 	longitude: this.longitude,
-									// 	width: 20,
-									// 	height: 40,
-									// 	iconPath: '../../static/image/icon1.png'
-									// };
-									// this.covers.push(myLocationCover);
 								}
 							});
 					},
diff --git a/pages/tj.vue b/pages/tj.vue
index 622953f..b6152a9 100644
--- a/pages/tj.vue
+++ b/pages/tj.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar :is-back="false" title="统计" :border-bottom="false" :background="bgc" title-color='#2E4975'
-			title-size='44' height='44' id="navbar">
+		<u-navbar :is-back="false" title="统计" :border-bottom="false" :background="bgc" title-color='#fff'
+			title-size='44' height='58' id="navbar">
 		</u-navbar>
 
 		<view v-if="userType=='01'">
@@ -20,11 +20,8 @@
 					本月收入{{recharge}}（元） 累计收入{{totalRecharge}}（元）
 				</view>
 
-				<view class="echarts" v-if="loging">
-					<!-- <mpvue-echarts id="main" ref="pieChart" :echarts="echarts" @onInit="initChart" /> -->
-					<!-- <l-echart ref="chart" @finished="initChart"></l-echart> -->
-					<uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas" canvas-id="uni-ec-canvas" :ec="ec">
-					</uni-ec-canvas>
+				<view class="echarts">
+					<uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas" canvas-id="uni-ec-canvas" :ec="ec"></uni-ec-canvas>
 				</view>
 			</view>
 			<view class="list" style="padding-bottom: 120rpx;">
@@ -103,7 +100,7 @@
 				},
 				recharge: 0,
 				bgc: {
-					backgroundColor: "#F7FAFE",
+					backgroundColor: "#8883f0",
 
 				},
 				show: false,
@@ -119,6 +116,8 @@
 				deviceId: '',
 				userType: '',
 				totalRecharge: 0,
+				
+			
 			}
 		},
 		onLoad() {
@@ -154,6 +153,8 @@
 			// }
 		},
 		methods: {
+			
+			
 			// 点击获取时间
 			confirm(e) {
 				this.recharge = 0