26/4/18 wyx 同步本地代码

property-uniapp-project/pages/payment-list/addPayment.vue

@@ -1,8 +1,8 @@
  <template>
  	<view class="contentStyle" style="">
  		<view class="status-bar"></view>
- 		<uni-nav-bar :title="'新增'+paymentType+'缴费'" left-icon="left" @clickLeft="goBack"  backgroundColor="transparent"
+ 		<uni-nav-bar :title="'新增'+paymentType+'缴费'" left-icon="left" @clickLeft="goBack" backgroundColor="transparent"
-			:border="false">
+ 			:border="false">
  		</uni-nav-bar>
  		<Loading mask="true" click="true" ref="loading"></Loading>
 
@@ -126,14 +126,10 @@
  				userNo: '',
  				isAgree: false,
  				showPopup: false, // 控制弹窗显示
-
-
  			}
  		},
 
-
  		methods: {
-
  			handleAgreeChange(e) {
  				// e.detail.value 是数组，有值 = 选中，空 = 未选中
  				this.isAgree = e.detail.value.length > 0
@@ -165,21 +161,21 @@
  					content: '确认要提交吗?',
  					success: (res) => {
  						if (res.confirm) {
-							uni.showLoading({
+ 							uni.showLoading({
-								title: '提交中...',
+ 								title: '提交中...',
-								mask: true
+ 								mask: true
-							});
+ 							});
-							setTimeout(() => {
+ 							setTimeout(() => {
-								uni.showToast({
+ 								uni.showToast({
-									title: '提交成功',
+ 									title: '提交成功',
-									icon: 'success'
+ 									icon: 'success'
-								});
+ 								});
-							}, 1000);
+ 							}, 1000);
-							setTimeout(() => {
+ 							setTimeout(() => {
-								// 提交成功后跳转列表页
+ 								// 提交成功后跳转列表页
-								uni.hideLoading();
+ 								uni.hideLoading();
  								this.goNext()
-							}, 3000);
+ 							}, 3000);
 
 
  						}
@@ -529,8 +525,10 @@
  	.toast-text {
  		color: #fff;
  		font-size: 28rpx;
- 	}.status-bar{
+ 	}
-		width: 100vw;
+
-		height: 46px;
+ 	.status-bar {
-	}
+ 		width: 100vw;
+ 		height: 46px;
+ 	}
  </style>

property-uniapp-project/pages/payment-list/arrearsPayment.vue

@@ -15,8 +15,10 @@
 					<!-- 物业费缴费 -->
 					<!-- 金额展示 -->
 					<view class="amount-section">
-						<text class="amount-text">- ¥1680.00</text>
+						<text class="amount-text"
+							:class="{ 'outstandingPaymentClass':outstandingPayment }">{{outstandingPayment?'-¥'+payAmount:'¥'+payAmount}}</text>
 					</view>
+					<view style="border-bottom: 1px solid #c7c7c7;padding-bottom: 10px;"></view>
 					<!-- 缴费信息 -->
 					<view class="info-section" style="">
 						<view v-if="arrearsPayment=='物业费'">
@@ -36,10 +38,9 @@
 								<text class="info-label">可用余额</text>
 								<text class="info-value">0.00</text>
 							</view>
-							<view style="border-bottom: 1px solid #c7c7c7;padding-bottom: 10px;"></view>
+							<!-- <view class="info-payAmountItem">
-							<view class="info-payAmountItem">
 								<text class="info-payAmount">{{'￥'+payAmount}}</text>
-							</view>
+							</view> -->
 						</view>
 						<view v-else>
 							<view class="info-item" v-if="arrearsPayment=='暖气费'">
@@ -58,7 +59,7 @@
 								<text class="info-label">缴费单位</text>
 								<text class="info-value">HN热力有限公司</text>
 							</view>
-							<view style="border-bottom: 1px solid #c7c7c7;padding-bottom: 10px;"></view>
+							<!-- <view style="border-bottom: 1px solid #c7c7c7;padding-bottom: 10px;"></view> -->
 							<!-- 缴费金额输入 -->
 							<view class="input-section" style="display: flex;">
 								<text class="amount-input" style="width: auto;">¥</text>
@@ -73,10 +74,7 @@
 					</view>
 
 
-					<!-- 立即缴费按钮 -->
+
-					<view class="btn-section">
-						<button class="pay-btn" @click="handlePay">立即缴费</button>
-					</view>
 
 				</view>
 
@@ -167,20 +165,20 @@
 					<view class="success-text">缴费成功</view>
 					<view class="success-desc">成功缴纳物业费</view>
 
-					<!-- 返回按钮 -->
+
-					<view class="btn-section">
-						<button class="pay-btn" @click="handleBackToList">返回生活缴费</button>
-					</view>
 				</view>
 			</view>
 
 
-
-
-
-
-
 		</scroll-view>
+		<!-- 立即缴费按钮 -->
+		<view class="btn-section" v-if="currentStep === 1">
+			<button class="pay-btn" @click="handlePay">立即缴费</button>
+		</view>
+		<!-- 返回按钮 -->
+		<view class="btn-section" v-if="currentStep === 3">
+			<button class="pay-btn" @click="handleBackToList">返回生活缴费</button>
+		</view>
 	</view>
 
 
@@ -218,6 +216,7 @@
 			return {
 				/* 设定状态栏默认高度 */
 				statusBarHeight: 20,
+				outstandingPayment: true, //是否欠费
 				arrearsPayment: uni.getStorageSync('arrearsPayment'),
 				currentStep: 1, // 1: 详情页 2: 密码弹窗 3: 成功页
 				payAmount: "1680.00", // 缴费金额
@@ -344,7 +343,7 @@
 </script>
 <style lang="scss">
 	page {
-		background: #f2f1f6;
+		background-color: #f9f9f9;
 	}
 </style>
 
@@ -362,15 +361,17 @@
 		overflow-y: auto;
 		padding: 0px 20px;
 		box-sizing: border-box;
-		background-color: #fff;
+		background-color: #
+			/* fff */
+		;
 	}
 
 
 	/* 1. 物业费详情页 */
 	.pay-page {
 		width: 100%;
-		min-height: 100vh;
+		/* min-height: 100vh; */
-		background-color: #fff;
+		/* background-color: #fff; */
 	}
 
 	.amount-section {
@@ -381,7 +382,10 @@
 	.amount-text {
 		font-size: 28px;
 		font-weight: 600;
-		color: #bd3124;
+	}
+
+	.outstandingPaymentClass {
+		color: #E34D59;
 	}
 
 	.info-section {
@@ -437,7 +441,9 @@
 	}
 
 	.btn-section {
-		padding: 0 15px;
+		padding: 10px 15px 20px;
+		display: flex;
+		gap: 20rpx;
 	}
 
 	.pay-btn {

property-uniapp-project/pages/payment-list/paymentIndex.vue

@@ -268,6 +268,7 @@
 		margin-bottom: 20rpx;
 	}
 	
+
 	.bill-info {
 		width: calc(90% - 50px);
 		flex: 1;