新版界面

pages/deductionRecord/billPush.vue

@@ -129,7 +129,7 @@
 			</view>
 			<view class="details-title">
 				
-				<span class="remark">请在收到账单5日内缴纳如下费用</span>
+				<span class="remark">请在收到账单5日内缴纳上述费用。</span>
 				
 			</view>
 			<!--  -->

pages/mine/mine.vue

@@ -17,9 +17,15 @@
 					</view>
 
 				</view>
-				<view class="change">
+				<u-picker  v-model="changeUserShow" mode="selector" :range="userList"
+					 :default-selector="[defaultIndex]" range-key="tenantName" @confirm="selector1confirm" ></u-picker>
+					
+					<view class="change" @click="changeUserShowBtn" v-if="userList&&userList.length>1">
+						切换
+					</view>
+				<!-- <view class="change">
 					切换
-				</view>
+				</view> -->
 			</view>
 			<!-- 账户余额 -->
 			<view class="content">
@@ -30,73 +36,48 @@
 						</view>
 						<view class="text">
 							账户余额
-							<text class="state">已欠费</text>
+							<span class="state" v-if="personInfo.balance<0">已欠费</span>
 						</view>
 					</view>
 
 					<view class="balance-number">
-						<view class="number">
-							-100.00
+						<view class="number" :class="{
+							number2:personInfo.balance<0
+						}" >
+							{{personInfo.balance}}
 						</view>
-						<view class="recharge">
+						<view class="recharge"  @click="gotoUrl('/pages/recharge/accountRecharge')" >
 							充值
 						</view>
 					</view>
 				</view>
 				<!-- 期限 -->
-				<view class="deadline">
-					<view class="deadline-item" >
+				<view class="deadline" v-for="(obj,i) in contractList" :key="i">
+					<view class="deadline-item"  v-for="(item,i) in obj.contractItemList" :key="i" v-if="item.paymentMethod==1" >
 						<view class="item-icon">
-							<image class="img" src="@/assets/img/deadline1.png" mode=""></image>
+							
+							<image class="img" v-if="item.name.indexOf('水')>-1" src="@/assets/img/deadline2.png" mode=""></image>
+								<image class="img"  v-else-if="item.name.indexOf('房')>-1||item.name.indexOf('租')>-1" src="@/assets/img/deadline1.png" mode=""></image>
+								<image class="img"  v-else-if="item.name.indexOf('保洁')>-1" src="@/assets/img/deadline4.png" mode=""></image>
+								<image class="img" v-else-if="item.name.indexOf('物业')>-1"  src="@/assets/img/deadline3.png" mode=""></image>
+								
+							<image class="img" v-else src="@/assets/img/deadline3.png" mode=""></image>
+							
+							
 						</view>
-						<view class="date-box">
+						<view class="date-box" :class="{
+							stateBl:stateBl(item.prepaidEndTime)
+						}">
 							<view class="classify">
-								房租 <text class="state">已到期</text>
+								{{item.name}} <text class="state" v-if="item.prepaidEndTime&&stateBl(item.prepaidEndTime)">已到期</text>
+								<text class="state" v-if="!item.prepaidEndTime">未交费</text>
 							</view>
-							<view class="date">
-								已缴费至 <text class="state">2024.03.14</text>
+							<view class="date" v-if="item.prepaidEndTime">
+								已缴费至 <text class="state">{{item.prepaidEndTime}}</text>
 							</view>
+							
 						</view>
 					</view>
-                     <view class="deadline-item" >
-                     	<view class="item-icon">
-                     		<image class="img" src="@/assets/img/deadline2.png" mode=""></image>
-                     	</view>
-                     	<view class="date-box">
-                     		<view class="classify">
-                     			水费
-                     		</view>
-                     		<view class="date">
-                     			已缴费至 <text>2024.03.14</text>
-                     		</view>
-                     	</view>
-                     </view>
-					 <view class="deadline-item" >
-					 	<view class="item-icon">
-					 		<image class="img" src="@/assets/img/deadline3.png" mode=""></image>
-					 	</view>
-					 	<view class="date-box">
-					 		<view class="classify">
-					 			物业费 
-					 		</view>
-					 		<view class="date">
-					 			已缴费至 <text >2024.03.14</text>
-					 		</view>
-					 	</view>
-					 </view>
-					 <view class="deadline-item" >
-					 	<view class="item-icon">
-					 		<image class="img" src="@/assets/img/deadline4.png" mode=""></image>
-					 	</view>
-					 	<view class="date-box">
-					 		<view class="classify">
-					 			保洁费 
-					 		</view>
-					 		<view class="date">
-					 			已缴费至 <text >2024.03.14</text>
-					 		</view>
-					 	</view>
-					 </view>
 				</view>
 			</view>
 			<!-- 地址 -->
@@ -262,7 +243,12 @@
 			this.query()
 		},
 		methods: {
-
+			stateBl(time){
+				var get=new Date(time)
+				var time=new Date()
+				return get<time;
+			},
+			
 			getContractList() {
 			
 				API_deduction.contractList({
@@ -473,6 +459,8 @@
 					font-weight: bold;
 
 					.state {
+						    white-space: pre;
+						
 						margin-left: 16rpx;
 						color: rgba(238, 49, 56, 1);
 					}
@@ -485,9 +473,13 @@
 				justify-content: space-between;
 				margin-top: 16rpx;
 				margin-left: 56rpx;
-
-				.number {
+				.number2 {
+				
 					color: rgba(238, 49, 56, 1);
+				
+				}
+				.number {
+					
 					font-size: 56rpx;
 					font-weight: bold;
 
@@ -535,12 +527,18 @@
 							vertical-align: middle;
 						}
 					}
-
-					.date-box {
+					.stateBl{
 						.state {
-							
+							// white-space: pre;
 							color: rgba(238, 49, 56, 1);
 						}
+					}
+					.date-box {
+						
+						.state {
+							 white-space: pre;
+							//color: rgba(238, 49, 56, 1);
+						}
 						text{
 							margin-left: 8rpx;
 						}