Merge remote-tracking branch 'origin/master'

pc/src/views/site-detail.vue

@@ -11,9 +11,9 @@
 		<div class="detail-body">
 			<div class="body-one base" v-if="tab=='base'">
 				<div class="poster">
-					<div class="blur-mask" :style="`background-image:url('${detail.showImage}')`"></div>
+					<!--<div class="blur-mask" v-if="showBanner" :style="`background-image:url('${detail.poster[detail.index]}')`"></div>-->
 					<div class="banner"  v-if="showBanner">
-						<el-carousel :interval="5000" arrow="never" style="height: 480px;"
+						<el-carousel :interval="3000" arrow="never" style="height: 480px;"
 									 @change="(val)=>{detail.index=val}">
 							<el-carousel-item style="height: 480px;" v-for="item in detail.poster" :key="item">
 								<div class="banner-bg" :style="`background-image:url('${item}')`"></div>
@@ -727,13 +727,14 @@
 					overflow: hidden;
 
 					.banner {
+						width: 100%;
 						position: relative;
 						height: 480px;
 						z-index: 3;
 
 						.banner-bg {
 							display: block;
-							width: 1140px;
+							width: 100%;
 							height: 100%;
 							background-repeat: no-repeat;
 							background-position: center;
@@ -899,7 +900,7 @@
 					left: 40px;
 					top: 70px;
 					display: flex;
-					width: 720px;
+					width: 640px;
 					z-index: 2;
 				}
 				.process-table{
@@ -953,10 +954,8 @@
 				}
 				.video{
 					position: absolute;
-					left: 20px;
-					right: 20px;
-					top: 20px;
-					bottom: 20px;
+					width: calc(100% - 40px);
+					height: calc(100% - 40px);
 					object-fit: fill;
 					z-index: 1;
 				}