zhengkaixin преди 1 година
родител
ревизия
2423960e58
променени са 5 файла, в които са добавени 15 реда и са изтрити 5 реда
  1. BIN
      assets/img/chat@13x.png
  2. BIN
      assets/img/controlCover.png
  3. 1 1
      pages/statistics/statistics.vue
  4. 9 2
      pages/tenantList/contractList.vue
  5. 5 2
      pages/timing/autoOff.vue

BIN
assets/img/chat@13x.png


BIN
assets/img/controlCover.png


+ 1 - 1
pages/statistics/statistics.vue

@@ -712,7 +712,7 @@
 							return true
 						}
 						if(selectType1==1){
-							return tenant.balance<100
+							return tenant.balance<tenant.minBalance
 						}
 						for(var k in tenant1.contractItemList){
 							

+ 9 - 2
pages/tenantList/contractList.vue

@@ -72,9 +72,16 @@
 						</view>
 					</view>
 						<view  class="remark" >
-							<view class="item">
+							<view class="item" style=" display: flex; justify-content: space-between;">
+								<view>
+									
+								
 								自动扣费:<span style="color:#5aa867 ;" v-if="obj.autoDeductFee">是</span>
 										<span  style="color:#ee3138 ;" v-else>否</span>
+								</view>	
+								<view v-if="tenant.minBalance">	
+										余额提醒:<span :style="tenant.minBalance<tenant.balance?'color:#5aa867 ;':'color:#ee3138 ;'" >{{tenant.minBalance}}元</span>
+								</view>
 							</view>
 							<view class="item" v-if="obj.address">
 								租住地址:{{obj.address}}
@@ -170,7 +177,7 @@
 								 bl=true
 							}
 							if(selectType1==1){
-								return tenant.balance<100
+								return tenant.balance<tenant.minBalance
 							}
 							if(item.paymentMethod==1&&item.name!='电费'){
 								

+ 5 - 2
pages/timing/autoOff.vue

@@ -164,7 +164,7 @@
 				<view class="radio-group">
 					<checkbox-group @change="checkboxChange" >
 					<view class="radio-item" v-for="(item,i) in weekdaysListTemp" :key="i">
-						<view class="item-title">
+						<view class="item-title" >
 							{{weeklist[i]}}
 						</view>
 						<view class="item-value">
@@ -444,6 +444,7 @@
 					}
 				}
 				if(!this.endTime){
+					
 					var br=false
 					if(this.formData.switchStatus==0){
 						br=true
@@ -473,7 +474,9 @@
 					this.formData.startTime=this.startTime
 					this.formData.endTime=this.endTime
 				}
-				
+				if(!this.formData.endTime){
+					this.formData.endTime=""
+				}
 				if(this.typeShowIndex==0){
 					this.formData.type="1"
 				}else{