Merge remote-tracking branch 'origin/master'

src/projects/business/views/Master/Live/Show.vue

@@ -10,7 +10,7 @@
         <img src="~$project/assets/img/show03.png" />
         <img src="~$project/assets/img/show04.png" />
         <img src="~$project/assets/img/show05.png" />-->
-        占无介绍
+        <h1> 占无介绍</h1>
     </div>
     <div class="fyy-footer">
       <div class="bindfyy-btn">

src/projects/business/views/Master/Property/Car/Apply.vue

@@ -96,7 +96,7 @@
 
 						<div class="mui-slider-item"  >
 							<a>
-								<img :src="mod"   style="height: 180px">
+								<img  v-image-preview :src="mod"   style="height: 180px">
 							</a>
 						</div>
 
@@ -335,9 +335,11 @@
 					}
 
 				}else{
+					this.isLoading = true;
 
 					API.parkingList({id:val}).then(response => {
   						this.map.set(val,response.list)
+						this.isLoading = false;
 
 						if(response.list.length==0){
 							this.parkingId=val;
@@ -346,7 +348,8 @@
 						}
 
 					}).catch(error => {
-
+						this.isLoading = false;
+						console.log(error)
 					})
 
 				}