Merge remote-tracking branch 'origin/master'

src/projects/business/apis/Master/live.js

@@ -5,7 +5,7 @@ import Qs from 'qs';
 export function queryCameraList(params) {
 
     return request({
-        url: '/mobile/cameraApi/cameraList',
+        url: '/mobile/cameraApi/cameraListPension',
         data: Qs.stringify(params),
         method: 'post',
     })
@@ -35,7 +35,7 @@ export function submit(params) {
 export function cameraDetail(params) {
 
     return request({
-        url: '/mobile/cameraApi/cameraDetail',
+        url: '/mobile/cameraApi/cameraDetailPension',
         data: Qs.stringify(params),
         method: 'post',
     })

src/projects/business/views/Common/Notice/Info.vue

@@ -62,7 +62,12 @@
 				API_Notice.getMessageInfo(this.id).then(response => {
 
 					this.detail = response;
-
+                    this.$nextTick(()=>{
+                        var list =document.getElementsByClassName("vongi-notice")[0].getElementsByTagName("img");
+                        for(var i=0;i<list.length;i++){
+                            list[i].style='width: 100%;height: 100%;'
+                        }
+                    })
 					this.isLoading = false;
 					//获取最新5条通知消息
 					this.getLastNotice();

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

@@ -5,7 +5,7 @@
 	<top-header :pageTitle="pageTitle"   :routeName="routeName"    ></top-header>
 
 	<div class="mui-content vongi-fklist vongi-spkh" v-if="buystatus&&list.length" >
-				<div class="vongi-spkh-title flew">
+				<div class="vongi-spkh-title flew" v-if="false">
 					<div class="mui-media-body">
 						<span class="mui-media-object mui-pull-left">
 							<img :src="person_data.faceImageUrl" :alt="person_data.name">