From db9769f8bba2f42d7e9642f0dea3f340c46f9ba1 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Tue, 18 Jun 2024 13:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_fenbao/statulist/nearby/index.vue | 17 ++++++-----------
 page_user/cbRecord.vue                 | 23 ++++++++++++-----------
 page_user/mapditu/index.vue            |  6 +++---
 page_user/sbdetail.vue                 |  6 +++---
 pages/shouye/index.vue                 |  6 +++---
 pages/tj.vue                           |  2 +-
 6 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/page_fenbao/statulist/nearby/index.vue b/page_fenbao/statulist/nearby/index.vue
index d870d79..d6e84aa 100644
--- a/page_fenbao/statulist/nearby/index.vue
+++ b/page_fenbao/statulist/nearby/index.vue
@@ -107,9 +107,8 @@
 							width: 25,
 							height: 30,
 							iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
-							borderColor:'#fff',
 							borderRadius:5,
-							bgColor: 'rgba(255, 255, 255, 0.7)'
+							bgColor: '#fff'
 						}
 						this.covers.push(shopCover);
 					}
@@ -132,9 +131,8 @@
 								fontWeight: 700,
 								color: '#8883F0',
 								textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white',
-								borderColor:'#fff',
 								borderRadius:5,
-								bgColor: 'rgba(255, 255, 255, 0.7)'
+								bgColor: '#fff'
 							}
 						}
 						this.covers.push(shopCover);
@@ -263,9 +261,8 @@
 													fontWeight: 700,
 													color: '#8883F0',
 													textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white',
-													borderColor:'#fff',
 													borderRadius:5,
-													bgColor: 'rgba(255, 255, 255, 0.7)'
+													bgColor: '#fff'
 												}
 											}
 											this.covers.push(shopCover)
@@ -357,10 +354,9 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-
 		.dtxs {
 			width: 100%;
-			height: 70vh;
+			height: 100vh;
 			position: fixed;
 			top: 0;
 			left: 0;
@@ -378,10 +374,9 @@
 			height: 40vh;
 			overflow-y: scroll;
 			padding-bottom: 400rpx;
-
 			.moshi {
-				position: fixed;
-				bottom: 38vh;
+				position: absolute;
+				bottom: 40vh;
 				left: 30rpx;
 				z-index: 99;
 				width: 100%;
diff --git a/page_user/cbRecord.vue b/page_user/cbRecord.vue
index 1f06c38..20b89f0 100644
--- a/page_user/cbRecord.vue
+++ b/page_user/cbRecord.vue
@@ -36,6 +36,11 @@
 					</view>
         		</view>
         	</view>
+			<view class="" v-if="showflag" style="width: 100%;height: 200rpx;margin: auto;margin-top: 170rpx;text-align: center;">
+				<image style="width: 200rpx;height: 200rpx;"
+					src="https://api.ccttiot.com/smartmeter/img/static/uZFUpcz0YZZ4f4RjvGg2" mode=""></image>
+				<view class="" style="font-size: 28rpx;color: #808080;margin-top: 30rpx;">暂无更多充值记录...</view>
+			</view>
         </view>
 	</view>
 </template>
@@ -53,7 +58,8 @@
                 isLoading: false, // 是否正在加载数据  
                 noMoreData: false, // 是否没有更多数据  
                 total: 0,
-				deviceId:''
+				deviceId:'',
+				showflag:false
 			}
 		},
 		onLoad(option) {
@@ -65,6 +71,11 @@
 				this.$u.get('/app/bill/rechargeListByDevice?deviceId='+this.deviceId+ '&pageNum=' + this.pagenum + '&pageSize='+this.pagesize).then((res) => {
 					if (res.code == 200) {
 						this.total = res.total
+						if (this.total > 0) {
+							this.showflag = false
+						} else {
+							this.showflag = true
+						}
 						if (res.rows.length > 0) {
 							// 有数据，追加到列表  
 							this.wateringList = this.wateringList.concat(res.rows)
@@ -89,12 +100,6 @@
 					});
 				}
 			},
-			
-   //          btndetail(item){
-			// 	uni.navigateTo({
-			// 		url:'/page_fenbao/statulist/myorder/detailxq/index?billId=' + item.billId
-			// 	})
-			// }
 		}
 	}
 </script>
@@ -108,14 +113,10 @@
 	}
 	page {
 		background: #F4F5F7;
-		// background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
 	}
 
 	.page {
 		width: 750rpx;
-		// position: fixed;
-		// top: 0;
-		// left: 0;
 		.box{
 			width: 750rpx;
 			height:100%;
diff --git a/page_user/mapditu/index.vue b/page_user/mapditu/index.vue
index 227cd86..1d40dfc 100644
--- a/page_user/mapditu/index.vue
+++ b/page_user/mapditu/index.vue
@@ -134,7 +134,7 @@
 						iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
 						borderColor:'#fff',
 						borderRadius:5,
-						bgColor: 'rgba(255, 255, 255, 0.7)'
+						bgColor: '#fff'
 					};
 					this.covers.push(shopCover);
 					}
@@ -158,7 +158,7 @@
 							textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white',
 							borderColor:'#fff',
 							borderRadius:5,
-							bgColor: 'rgba(255, 255, 255, 0.7)'
+							bgColor: '#fff'
 						}
 					}
 					this.covers.push(shopCover);
@@ -316,7 +316,7 @@
 													textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white',
 													borderColor:'#fff',
 													borderRadius:5,
-													bgColor: 'rgba(255, 255, 255, 0.7)'
+													bgColor: '#fff'
 												}
 											};
 											this.covers.push(shopCover);
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 1b6afcf..6addd8a 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -17,7 +17,7 @@
 				<view class="mid">
 					<view class="mid_left">
 						<button
-							style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;"
+							style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;border: 1rpx solid #ccc;"
 							type="primary reverse" open-type="chooseAvatar" @chooseavatar="btnpic">
 							<image  :src="imglist" mode=""
 								style="width: 142rpx;height: 142rpx;border-radius: 20rpx;"></image>
@@ -1053,7 +1053,7 @@
 						width: 100%;
 						justify-content: space-between;
 						padding-left: 80rpx;
-						padding-right: 120rpx;
+						padding-right: 80rpx;
 						box-sizing: border-box;
 
 						.cont {
@@ -1082,7 +1082,7 @@
 				width: 100%;
 				justify-content: space-between;
 				padding-left: 80rpx;
-				padding-right: 120rpx;
+				padding-right: 80rpx;
 				box-sizing: border-box;
 			    margin-top: 30rpx;
 				.cont {
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index f081a06..7a97dd8 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -350,7 +350,7 @@
 													color: '#8883F0',
 													borderColor:'#fff',
 													borderRadius:5,
-													bgColor: 'rgba(255, 255, 255, 0.7)'
+													bgColor: '#fff'
 												}
 											}
 											this.covers.push(shopCover)
@@ -391,7 +391,7 @@
 						iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
 						borderColor:'#fff',
 						borderRadius:5,
-						bgColor: 'rgba(255, 255, 255, 0.7)'
+						bgColor: '#fff'
 					};
 					this.covers.push(shopCover);
 					}
@@ -415,7 +415,7 @@
 							textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white',
 							borderColor:'#fff',
 							borderRadius:5,
-							bgColor: 'rgba(255, 255, 255, 0.7)'
+							bgColor: '#fff'
 						}
 					}
 					this.covers.push(shopCover);
diff --git a/pages/tj.vue b/pages/tj.vue
index 03f4efb..d062928 100644
--- a/pages/tj.vue
+++ b/pages/tj.vue
@@ -181,7 +181,7 @@
 							this.chartData = this.timelist.map(item => item.recharge);
 							this.chartday = this.timelist.map(item => item.createDay + '日');
 						}else{
-							this.timelists = this.timelist.slice(0, 14)
+							this.timelists = this.timelist.slice(0,this.dateday)
 							this.timelists.reverse()
 							this.totalRecharge = res.totalRecharge
 							this.chartData = this.timelist.slice(0, this.dateday).map(item => item.recharge)