常志远 1 rok temu
rodzic
commit
cbbaf48d36

+ 6 - 0
assets/img/fas fa-bell.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 448 512" width="28" height="28" style="" filter="drop-shadow(0px 2px 4px rgba(182,77,0,1))">
+    <defs><linearGradient id="ik4s6tsjU2GQ0kwGd7QnhI1" x1="0" x2="100%" y1="0" y2="0" gradientTransform="matrix(6.123233995736766e-17, 1, -1, 6.123233995736766e-17, 224, 0)" gradientUnits="userSpaceOnUse"><stop stop-color="#ffffff" stop-opacity="1" offset="0.4"></stop><stop stop-color="#ffffff" stop-opacity="0.6" offset="1"></stop></linearGradient></defs>
+    <g>
+    <path d="M224 512c35.32 0 63.97-28.65 63.97-64H160.03c0 35.35 28.65 64 63.97 64zm215.39-149.71c-19.32-20.76-55.47-51.99-55.47-154.29 0-77.7-54.48-139.9-127.94-155.16V32c0-17.67-14.32-32-31.98-32s-31.98 14.33-31.98 32v20.84C118.56 68.1 64.08 130.3 64.08 208c0 102.3-36.15 133.53-55.47 154.29-6 6.45-8.66 14.16-8.61 21.71.11 16.4 12.98 32 32.1 32h383.8c19.12 0 32-15.6 32.1-32 .05-7.55-2.61-15.27-8.61-21.71z" fill="url(#ik4s6tsjU2GQ0kwGd7QnhI1)"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/fas fa-chart-pie(1).svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 544 512" width="28" height="28" style="" filter="drop-shadow(0px 2px 4px rgba(0,130,118,1))">
+    <defs><linearGradient id="ik4s6tsjU4h0KD89gbi3M61" x1="0" x2="100%" y1="0" y2="0" gradientTransform="matrix(6.123233995736766e-17, 1, -1, 6.123233995736766e-17, 272, 0)" gradientUnits="userSpaceOnUse"><stop stop-color="#ffffff" stop-opacity="1" offset="0.4"></stop><stop stop-color="#ffffff" stop-opacity="0.6" offset="1"></stop></linearGradient></defs>
+    <g>
+    <path d="M527.79 288H290.5l158.03 158.03c6.04 6.04 15.98 6.53 22.19.68 38.7-36.46 65.32-85.61 73.13-140.86 1.34-9.46-6.51-17.85-16.06-17.85zm-15.83-64.8C503.72 103.74 408.26 8.28 288.8.04 279.68-.59 272 7.1 272 16.24V240h223.77c9.14 0 16.82-7.68 16.19-16.8zM224 288V50.71c0-9.55-8.39-17.4-17.84-16.06C86.99 51.49-4.1 155.6.14 280.37 4.5 408.51 114.83 513.59 243.03 511.98c50.4-.63 96.97-16.87 135.26-44.03 7.9-5.6 8.42-17.23 1.57-24.08L224 288z" fill="url(#ik4s6tsjU4h0KD89gbi3M61)"></path>
+    </g>
+  </svg>

Plik diff jest za duży
+ 3 - 0
assets/img/modalIcon.svg


+ 6 - 0
assets/img/riFill-exchange-cny-fill.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="20" height="20" style="" filter="none">
+    
+    <g>
+    <path d="M7.164 6.013c2.333-2.077 5.426-3.347 8.815-3.347 0.007 0 0.015 0 0.022 0h-0.001c7.364 0 13.333 5.969 13.333 13.333 0 0.006 0 0.014 0 0.021 0 2.845-0.895 5.48-2.419 7.641l0.028-0.042-3.609-7.62h3.333c0-0 0-0 0-0 0-5.891-4.776-10.667-10.667-10.667-2.992 0-5.696 1.232-7.633 3.215l-0.002 0.002-1.2-2.536zM24.836 25.987c-2.333 2.077-5.426 3.347-8.815 3.347-0.007 0-0.015 0-0.022-0h0.001c-7.364 0-13.333-5.969-13.333-13.333 0-2.833 0.884-5.46 2.391-7.62l3.609 7.62h-3.333c0 0 0 0 0 0 0 5.891 4.776 10.667 10.667 10.667 2.992 0 5.696-1.232 7.633-3.215l0.002-0.002 1.2 2.536zM17.333 18.047h4v2.667h-4v2.667h-2.667v-2.667h-4v-2.667h4v-1.333h-4v-2.667h3.448l-2.829-2.828 1.888-1.885 2.827 2.828 2.828-2.828 1.887 1.885-2.829 2.829h3.448v2.667h-4v1.333z" fill="rgba(255,255,255,1)"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/riLine-time-line.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="16" height="16" style="" filter="none">
+    
+    <g>
+    <path d="M16 29.333c-7.364 0-13.333-5.969-13.333-13.333s5.969-13.333 13.333-13.333 13.333 5.969 13.333 13.333-5.969 13.333-13.333 13.333zM16 26.667c5.891 0 10.667-4.776 10.667-10.667s-4.776-10.667-10.667-10.667v0c-5.891 0-10.667 4.776-10.667 10.667s4.776 10.667 10.667 10.667v0zM17.333 16h5.333v2.667h-8v-9.333h2.667v6.667z" fill="rgba(255,255,255,1)"></path>
+    </g>
+  </svg>

+ 6 - 1
pages/businessHall/billingRules/billingRules.vue

@@ -5,7 +5,7 @@
 			<!-- 单位 -->
 			<view class="unit">
 				<view class="title">
-					所属缴费单位
+					所属收款单位
 				</view>
 				<view class="value">
 					湖北荆鹏集团有限公司
@@ -140,6 +140,11 @@
 	  margin: 68rpx 32rpx 40rpx;
 	  background-color: #fff;
 	  padding-bottom: 24rpx;
+	  border-radius: 8px;
+	  /deep/.u-tabs{
+		  border-radius: 8px;
+		  
+	  }
 	  .content{
 		  padding:24rpx;
 		  display: flex;

+ 2 - 3
pages/businessHall/deductionRecord/deductionDetails.vue

@@ -161,12 +161,11 @@
 	}
  // 返回
  .back{
-	 border: 1px solid rgba(22,119,255,1);
+	 border: 1px solid rgba(205,205,205,1);
 	 
 	 line-height: 88rpx;
-	 border-radius: 50px;
 	 background-color: rgba(255,255,255,1);
-	 color: rgba(22,119,255,1);
+	 color: rgba(119,119,119,1);
 	 font-size: 32rpx;
 	 position: absolute;
 	 top: 970rpx;

+ 57 - 1
pages/businessHall/deductionRecord/deductionRecord.vue

@@ -1,6 +1,24 @@
 <template>
 	<view>
-		<u-navbar title="扣费记录"  title-color="#101010" ></u-navbar>
+		<u-navbar title="扣费记录"  title-color="#101010" >
+			<view class="slot" slot="right">
+				开发票
+
+			</view>
+		</u-navbar>
+		<!-- 折线图 -->
+		<view class="chart-box">
+			<view class="title">
+				1月 共扣费
+			</view>
+			<view class="sum">
+				1000.00<text class="unit">元</text>
+			</view>
+			<view class="chart">
+				<image class="img" src="@/assets/img/jVzkNKE@1x.png" mode=""></image>
+			</view>
+		
+		</view>
 		<!-- 标签 -->
 		<view class="tabs">
 			<u-dropdown>
@@ -134,6 +152,44 @@
 </script>
 
 <style lang="scss" scoped>
+	.slot{
+		color: rgba(16,16,16,1);
+		font-size: 32rpx;
+		margin-right: 32rpx;
+	}
+	// 折线图
+	.chart-box {
+		padding: 24rpx 32rpx;
+		background: linear-gradient(180deg, rgba(203, 234, 255, 1) 0%, rgba(255, 255, 255, 1) 100%);
+	
+		.title {
+			color: rgb(16, 16, 16);
+		}
+	
+		.sum {
+			color: rgb(51, 51, 51);
+			font-size: 64rpx;
+			margin-top: 16rpx;
+	
+			.unit {
+				color: rgb(16, 16, 16);
+				font-size: 28rpx;
+				margin-left: 8rpx;
+			}
+		}
+	
+		.chart {
+			width: 100%;
+			height: 240rpx;
+			margin-top: 8rpx;
+	
+			.img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	
+	}
 	.tabs{
 		
 		height: 96rpx;

+ 1 - 1
pages/businessHall/index/index.vue

@@ -118,7 +118,7 @@
 				预存余额 安心用电
 			</view>
 		</view>
-		<u-divider border-color="#bbbbbb" half-width="80" color="#777777">荆鹏电管家 24小时服务热线 <text
+		<u-divider border-color="#bbbbbb" half-width="80" color="#777777">荆鹏电管家 服务热线 <text
 				class="tel">8121234</text></u-divider>
 		<Tabbar :current="0"></Tabbar>
 	</view>

+ 56 - 7
pages/businessHall/message/message.vue

@@ -33,38 +33,76 @@
 				<view class="content">
 					<view class="title">
 						<view class="title-name">
-							停电通知
+							余额提醒
 						</view>
 						<view class="title-time">
 							01-02
 						</view>
 					</view>
 					<view class="value">
-						接电力部门通知,明天(1月25日)因台区用电调调调调调调调调调
+						租户您好,贵司账户余额不足100元,请尽快充值充值
 					</view>
 				</view>
 			</view>
 			
 			<view class="message-item">
 				<view class="icon icon3">
-					<image class="img" src="@/assets/img/fas fa-exclamation-triangle Copy 1.svg" mode=""></image>
+					<image class="img" src="@/assets/img/fas fa-bell.svg" mode=""></image>
 				
 				</view>
 				<view class="content">
 					<view class="title">
 						<view class="title-name">
-							停电通知
+							故障报警
 						</view>
 						<view class="title-time">
 							01-02
 						</view>
 					</view>
 					<view class="value">
-						接电力部门通知,明天(1月25日)因台区用电调调调调调调调调调
+						本园区11楼所在楼层电表网络故障,我们会尽快处处处处
 					</view>
 				</view>
 			</view>
 			
+			<view class="message-item">
+				<view class="icon icon4">
+					<image class="img" src="@/assets/img/fas fa-exclamation-triangle Copy 1.svg" mode=""></image>
+				
+				</view>
+				<view class="content">
+					<view class="title">
+						<view class="title-name">
+							断电通知
+						</view>
+						<view class="title-time">
+							01-02
+						</view>
+					</view>
+					<view class="value">
+						租户您好,截止2月18日0时,贵司账户余额已不足足足足足
+					</view>
+				</view>
+			</view>
+			<view class="message-item">
+				<view class="icon icon5">
+					<image class="img" src="@/assets/img/fas fa-chart-pie.svg" mode=""></image>
+				
+				</view>
+				<view class="content">
+					<view class="title">
+						<view class="title-name">
+							电费月度账单
+						</view>
+						<view class="title-time">
+							01-02
+						</view>
+					</view>
+					<view class="value">
+						截止2024年01月,您家电表止码8652,用电12888888
+					</view>
+				</view>
+			</view>
 		</view>
 		
 		<Tabbar :current="1" ></Tabbar>
@@ -123,12 +161,21 @@
 				background: linear-gradient(180deg, rgba(121,172,255,1) 0%,rgba(57,132,255,1) 100%);
 				color: rgba(255,255,255,1);
 			}
-			.u-icon3{
+			.icon3{
 				background: linear-gradient(180.29deg, rgba(255,214,125,1) 0.9%,rgba(255,150,0,1) 100.4%);
 			}
+			.icon4{
+background: linear-gradient(180.29deg, rgba(255,124,112,1) 0.9%,rgba(255,79,63,1) 100.4%);
+			}
+			.icon5{
+				background: linear-gradient(178.44deg, rgba(122,232,227,1) 3.96%,rgba(57,182,182,1) 100.6%);
+			}
 			.content{
 				flex:1;
 				margin-left: 24rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
 				.title{
 					display: flex;
 					justify-content: space-between;
@@ -143,11 +190,13 @@
 					}
 				}
 				.value{
-					width: 566rpx;
+					width: 560rpx;
 					white-space: nowrap;
 					overflow: hidden;
 					text-overflow: ellipsis;
 					margin-top: 10rpx;
+	
+					font-size: 24rpx
 				}
 			}
 		}

+ 148 - 58
pages/businessHall/mine/electronicMonitoring.vue

@@ -6,7 +6,7 @@
 			 :defaultTime="tabsFrom.show2Index" :endYear="endYear"
 			 mode="time" :params="params"  @confirm="selector2confirm" @reset="selector2reset" ></u-picker-select>
 			
-			<u-navbar :background="background" back-icon-color="#fff" title="用电监控" title-color="#fff">
+			<u-navbar :background="background" back-icon-color="#fff" title="联通公司" title-color="#fff">
 				<view class="u-nav-slot" slot="right" @click="tabsFrom.show2=true,params.day=true">
 					<image class="img" src="@/assets/img/riLine-calendar-todo-line 1.svg" mode=""></image>
 				</view>
@@ -17,9 +17,12 @@
 					<view class="date">
 						26
 					</view>
-					<view class="week">
+					<view class="week ">
 						今天
 					</view>
+					<view class="dot">
+						
+					</view>
 				</view>
 				<view class="item">
 					<view class="date">
@@ -58,15 +61,76 @@
 		</view>
 		<!-- 用电量 -->
 		<view class="electricity-consumption">
-			<view class="number">
-				1,201,920.1
-			</view>
-			<view class="tab">
-				正向有功电度
+			<view class="title">
+				用电量统计(kW·h)
 			</view>
-			<view class="tab2">
-				正向无功电度
+			<view class="degree">
+				<view class="item">
+					<view class="item-text">
+						百万
+					</view>
+					<view class="item-number">
+						0
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-text">
+						拾万
+					</view>
+					<view class="item-number">
+						0
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-text">
+						万
+					</view>
+					<view class="item-number">
+						0
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-text">
+						千
+					</view>
+					<view class="item-number">
+						0
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-text">
+						百
+					</view>
+					<view class="item-number">
+						0
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-text">
+						拾
+					</view>
+					<view class="item-number">
+						7
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-text">
+						1
+					</view>
+					<view class="item-number">
+						7
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-text">
+						0.1
+					</view>
+					<view class="item-number decimal">
+						7
+					</view>
+				</view>
 			</view>
+			
 			<view class="radio">
 				<u-radio-group v-model="value" @change="radioGroupChange">
 					<u-radio @change="radioChange" v-for="(item, index) in list" :key="index" :name="item.id"
@@ -95,9 +159,7 @@
 		<view class="abnormal"  v-if="false">
 			<view class="headline">
 				<view class="title">
-					<view class="icon">
-
-					</view>
+					
 					<view class="text">
 						异常波动
 					</view>
@@ -318,6 +380,7 @@
 	};
 </script>
 
+
 <style lang="scss" scoped>
 	page {
 		padding-bottom: 100rpx;
@@ -388,7 +451,7 @@
 
 		.item-today {
 			background-color: rgba(255, 255, 255, 1);
-
+            position: relative;
 			.date {
 				color: rgba(22, 119, 255, 1);
 			}
@@ -396,6 +459,16 @@
 			.week {
 				color: rgba(16, 16, 16, 1);
 			}
+			.dot{
+				width: 10rpx;
+				height: 10rpx;
+				background-color: rgba(255,150,0,1);
+				border-radius: 999px;
+				position: absolute;
+				bottom: -5rpx;
+				left: 50%;
+				transform: translateX(-50%);
+			}
 		}
 	}
 
@@ -403,56 +476,73 @@
 	.electricity-consumption {
 		background-color: #fff;
 		padding: 40rpx 32rpx 0rpx;
-		border-radius: 0px 8px 8px 8px;
+		border-radius: 8px;
 		margin: 24rpx 32rpx 0;
 		position: relative;
-
-		.number {
-			border-radius: 8px;
-			background-color: rgba(238, 238, 238, 1);
-			padding: 26rpx 32rpx;
-			text-align: right;
-			color: rgba(22, 119, 255, 1);
-			font-size: 72rpx;
+        .title{
+			color: rgba(16,16,16,1);
+			font-size: 36rpx;
 		}
-
-		.tab {
-			width: 240rpx;
-			height: 0;
-			border-width: 0px 48rpx 72rpx 0px;
-			border-radius: 8px 8px 0 0;
-			border-style: none solid solid none;
-			border-color: transparent transparent #fff;
-			position: absolute;
-			top: -72rpx;
-			left: 0rpx;
-			right: 0rpx;
-			color: #101010;
-			color: rgba(16, 16, 16, 1);
-			// font-size: 32rpx;
-			text-align: center;
-			line-height: 72rpx;
-			z-index: 999;
-			text-indent: 16rpx;
+		.degree{
+			display: flex;
+			margin-top: 32rpx;
+			.item{
+				margin-right: 6rpx;
+				text-align: center;
+				.item-text{
+					color: rgba(16,16,16,1);
+				}
+				.item-number{
+					margin-top: 24rpx;
+					width: 72rpx;
+					height: 96rpx;
+					background-color: rgba(16,16,16,1);
+					color: #fff;
+					font-size: 72rpx;
+					
+				}
+				.decimal{
+					background-color: #900005;
+				}
+			}
 		}
+		
 
-		.tab2 {
-			width: 240rpx;
-			height: 0;
-			border-width: 0px 48rpx 72rpx 0px;
-			border-radius: 8px 8px 0 0;
-			border-style: none solid solid none;
-			border-color: transparent transparent #D4DBE4;
-			position: absolute;
-			top: -72rpx;
-			left: 210rpx;
-			right: 0rpx;
-			color: #777777;
-			// font-size: 32rpx;
-			text-align: center;
-			line-height: 72rpx;
-			text-indent: 16rpx;
-		}
+		// .tab {
+		// 	width: 240rpx;
+		// 	height: 0;
+		// 	border-width: 0px 48rpx 72rpx 0px;
+		// 	border-radius: 8px 8px 0 0;
+		// 	border-style: none solid solid none;
+		// 	border-color: transparent transparent #fff;
+		// 	position: absolute;
+		// 	top: -72rpx;
+		// 	left: 0rpx;
+		// 	right: 0rpx;
+		// 	color: #101010;
+		// 	color: rgba(16, 16, 16, 1);
+		// 	text-align: center;
+		// 	line-height: 72rpx;
+		// 	z-index: 999;
+		// 	text-indent: 16rpx;
+		// }
+
+		// .tab2 {
+		// 	width: 240rpx;
+		// 	height: 0;
+		// 	border-width: 0px 48rpx 72rpx 0px;
+		// 	border-radius: 8px 8px 0 0;
+		// 	border-style: none solid solid none;
+		// 	border-color: transparent transparent #D4DBE4;
+		// 	position: absolute;
+		// 	top: -72rpx;
+		// 	left: 210rpx;
+		// 	right: 0rpx;
+		// 	color: #777777;
+		// 	text-align: center;
+		// 	line-height: 72rpx;
+		// 	text-indent: 16rpx;
+		// }
 
 		.radio {
 			margin-top: 24rpx;

+ 127 - 6
pages/businessHall/recharge/accountRecharge.vue

@@ -1,6 +1,10 @@
 <template>
 	<view>
-		<u-navbar title="账户充值"  title-color="#101010" ></u-navbar>
+		<u-navbar title="账户充值"  title-color="#101010" >
+			<view slot="right" class="slot">
+				退余额
+			</view>
+		</u-navbar>
 		<view class="main">
 			<view class="headline">
 				<view class="title-left">
@@ -14,10 +18,10 @@
 				</view>
 				<view class="title-right">
 					<view class="icon">
-						<image class="icon2" src="@/assets/img/riLine-file-text-line Copy l9stN6v.svg" mode=""></image>
+						<image class="icon2" src="@/assets/img/riLine-time-line.svg" mode=""></image>
 					</view>
 					<view class="text">
-						历史账单
+						充值记录
 					</view>
 				</view>
 			</view>
@@ -151,10 +155,83 @@
 							</view>
 						</view>
 						
+						<view class="way-item">
+							<view class="way-name">
+								<view class="icon">
+									<image style="width: 40rpx;height: 40rpx; border-radius: 999px;" class="img" src="@/assets/img/modalIcon.svg" mode=""></image>
+								</view>
+								<view class="text">
+									对公转账
+								</view>
+							</view>
+							<view class="way-radio" @click="open">
+								<label class="radio">
+									<radio value="" /><text></text>
+								</label>
+							</view>
+						</view>
+						<!-- 对公转账弹窗 -->
+						<u-modal v-model="show"  :show-cancel-button="true":content="content" :show-title="false" confirm-text="复制" cancel-text="关闭">
+							<view class="modal-content">
+								<view class="title-icon">
+									<image class="img" src="@/assets/img/modalIcon.svg" mode=""></image>
+								</view>
+								<view class="title">
+									对公转账信息
+								</view>
+								<view class="infos-group">
+									<view class="item">
+										<view class="item-title">
+											收款户名
+
+										</view>
+										<view class="item-value">
+											湖北荆鹏软件集团有限公司
+										
+
+										</view>
+									</view>
+									<view class="item">
+										<view class="item-title">
+											开户银行
+										</view>
+										<view class="item-value">
+											
+											中国工商银行玉桥支行
+				
+										</view>
+									</view>
+									<view class="item">
+										<view class="item-title">
+											收款账号								
+										</view>
+										<view class="item-value">
+											
+											25681354894163
+											
+									
+										</view>
+									</view>
+									<view class="item">
+										<view class="item-title">									
+											
+											
+											联系电话
+									
+										</view>
+										<view class="item-value">
+													15500001111
+										</view>
+									</view>
+								</view>
+							</view>
+						 
+						</u-modal>
+								
 					</view>
 				</view>
 				<!-- 按钮 -->
-				<button class="btn" >立即缴费</button>
+				<button class="btn" >立即支付</button>
 			</view>
 		</view>
 	</view>
@@ -164,11 +241,13 @@
 	export default {
 		data() {
 			return {
-				
+				show: false,
 			}
 		},
 		methods: {
-			
+			open() {
+							this.show = true;
+						}
 		}
 	}
 </script>
@@ -177,6 +256,10 @@
 	page{
 		padding-bottom: 50px;
 	}
+	.slot{
+		margin-right: 24rpx;
+		color: rgba(16,16,16,1);
+	}
 	.main{
 		margin: 24rpx;
 		overflow: hidden;
@@ -358,4 +441,42 @@
 		}
 	}
 
+
+// 对公转账弹窗
+.modal-content{
+	
+	padding: 40rpx 0;
+	.title-icon{
+		text-align: center;
+	}
+	.img{
+		width: 96rpx;
+		height: 96rpx;
+		
+	}
+	.title{
+		text-align: center;
+		color: rgba(16,16,16,1);
+		font-size: 36rpx;
+		font-weight: 600;
+		margin-top: 8rpx;
+	}
+	.infos-group{
+		margin: 40rpx 32rpx 0;
+		.item{
+			display:flex;
+			justify-content: space-between;
+			margin-bottom: 16rpx;
+			.item-title{
+				color: rgba(119,119,119,1);
+				font-size: 32rpx;
+			}
+			.item-value{
+				color: rgba(51,51,51,1);
+				font-size: 32rpx;
+				margin-left: 16rpx;
+			}
+		}
+	}
+}
 </style>

+ 1 - 1
pages/businessHall/recharge/paymentResult.vue

@@ -59,7 +59,7 @@
 		<!-- 按钮 -->
 		<view class="btns">
 			<button class="btn1">完成</button>
-			<button class="btn2">缴费记录</button>
+			<button class="btn2">充值记录</button>
 		</view>
 	</view>
 </template>

+ 3 - 5
pages/businessHall/recharge/rechargeDetails.vue

@@ -4,7 +4,7 @@
 		<view class="background">
 			<view class="recharge-details">
 				<view class="headline">
-					电费充值
+					账户充值
 				</view>
 				<view class="sum">
 					1000.00
@@ -156,12 +156,10 @@
 	}
  // 返回
  .back{
-	 border: 1px solid rgba(22,119,255,1);
-	 
+	 border: 1px solid rgba(205,205,205,1);
 	 line-height: 88rpx;
-	 border-radius: 50px;
 	 background-color: rgba(255,255,255,1);
-	 color: rgba(22,119,255,1);
+	 color: rgba(119,119,119,1);
 	 font-size: 32rpx;
 	 position: absolute;
 	 top: 970rpx;

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików