소스 검색

Merge remote-tracking branch 'origin/master'

wgl 4 년 전
부모
커밋
81f3e0049d
2개의 변경된 파일20개의 추가작업 그리고 4개의 파일을 삭제
  1. 12 4
      src/projects/business/views/Master/Property/Car/Info.vue
  2. 8 0
      src/projects/business/views/Master/Property/Car/List.vue

+ 12 - 4
src/projects/business/views/Master/Property/Car/Info.vue

@@ -100,7 +100,7 @@
 				<div class="mui-popup-inner vongi-pop-inner">
 					<div class="mui-popup-title">关闭申请理由</div>
 					<div class="mui-popup-input">
-						<textarea id="textarea" rows="3" placeholder="可输入关闭申请理由" v-model="detail.reason"></textarea>
+						<textarea id="textarea" rows="3" placeholder="该车位已被售出/租出" v-model="detail.reason"></textarea>
 					</div>
 				</div>
 				<div class="mui-popup-buttons" ><span class="mui-popup-button"@click="show=0" >取消</span>
@@ -175,11 +175,13 @@
 				picker.setData([
 					{
 						text:'线下收款',value:'1'
-					},
-					{
-						text:'推送账单',value:'2'
 					}
+
 				]);
+			// ,
+			// 	{
+			// 		text:'推送账单',value:'2'
+			// 	}
 				picker.show((selectItems) => {
 					this.payType = selectItems[0].value;
 					this.payTypeN = selectItems[0].text;
@@ -189,7 +191,13 @@
 				if(!this.detail.actualFee){
 					this.detail.actualFee=this.info.estimateFee;
 				}
+				if(!this.detail.reason){
+					this.detail.reason='该车位已被售出/租出';
+				}
+
 				this.show=0;
+				this.isLoading = true;
+
 				if(this.payType ==1){
 					API.ParkingApplicationConfirmLease(this.detail).then(res => {
 						mui.toast("操作成功");

+ 8 - 0
src/projects/business/views/Master/Property/Car/List.vue

@@ -17,7 +17,15 @@
 					</div>
 				</div>
 				<div class="mui-slider-group">
+					<div style="text-align: center;margin-top: 100px"  v-if="!recordList.length">
+						<img src="~$project/assets/img/lad.png" width="50%"  >
+					</div>
+
 					<div  class="mui-slider-item mui-control-content">
+						<div style="text-align: center"  v-if="!recordList.length">
+							<span>暂无车位申请出入记录</span>
+						</div>
+
 						<div class="mui-scroll-wrapper">
 							<div class="mui-scroll">
 								<ul class="mui-table-view" >