Merge remote-tracking branch 'origin/master'

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

@@ -17,7 +17,7 @@
 					<li class="mui-table-view-cell mui-media"  v-for="(mod,index) in list">
 						<a @click="goToPlay(mod.id)" >
 							<div class="vongi-video-img">
-								<img src="~$project/assets/img/gkke02.png" v-if="!mod.picUrl"  width="100%">
+								<img src="~$project/assets/img/default_webcam.png" v-if="!mod.picUrl"  width="100%">
 
 								<img :src="mod.picUrl"  v-if="mod.picUrl"  width="100%">
 							</div>

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>
+        <h1> 暂无介绍</h1>
     </div>
     <div class="fyy-footer">
       <div class="bindfyy-btn">

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

@@ -35,6 +35,11 @@
 					<label>租用时长</label>
 					<span>{{info.contractDuration}}</span>
 				</div>
+
+				<div class="mui-input-row">
+					<label>状态</label>
+					<span>{{info.statusN}}</span>
+				</div>
 			</form>
 		</div>
 	</div>

src/projects/pension/views/Master/Live/Info.vue

@@ -17,7 +17,7 @@
 					<li class="mui-table-view-cell mui-media"  v-for="(mod,index) in list">
 						<a @click="goToPlay(mod.id)" >
 							<div class="vongi-video-img">
-								<img src="~$project/assets/img/gkke02.png" v-if="!mod.picUrl"  width="100%">
+ 								<img src="~$project/assets/img/default_webcam.png" v-if="!mod.picUrl"  width="100%">
 
 								<img :src="mod.picUrl"  v-if="mod.picUrl"  width="100%">
 							</div>