Merge remote-tracking branch 'origin/developer' into developerA

src/main/resources/static/css/article/article.css

@@ -581,35 +581,31 @@ dl,dd,dt{zoom:1}
 	.listData-select-title .search-select .select-new {margin-right: 9vw;}
 
 	/*ross宣传弹窗*/
-	.ross-banner-fiexd{width: 100%;height: 113.8vw;position: fixed;z-index: 999;background: linear-gradient(0deg, #FFA86E, #FF5B00);left: 0;right: 0;bottom: -113.8vw;box-sizing: border-box;padding: 4vw;background-size: cover;animation: all 1s;}
+	.ross-banner-fiexd{width: 100%;height: 260px;position: fixed;z-index: 999;background: linear-gradient(90deg, #FF5B00, #FFA86E);left: 0;right: 0;bottom: -260px;box-sizing: border-box;opacity: 0;}
 	.ross-banner-fiexd.active{animation: rundbottom 0.5s backwards;bottom: 0;opacity: 1;}
-	.ross-mssg{width: 100%; height: 26vw;float: left;margin-bottom: 8vw;}
-	.ross-mssg .ross-mssg-img{width: 26vw;height: 26vw;float: left;margin-right: 4vw;}
-	.ross-mssg .ross-mssg-img img{width: 26vw;height: 26vw;display: block;}
-	.ross-mssg .ross-mssg-text{width: 62vw;height: 26vw; float: left;box-sizing: border-box;}
-	.ross-mssg .ross-mssg-text-t{margin-bottom: 6vw;}
+	.ross-banner-fiexd .ross-inner{width: 1200px;margin: 0 auto;}
+	.ross-mssg{height: 100%;float: left;}
+	.ross-mssg .ross-mssg-img{width: 260px;height: 260px;float: left;margin-right: 40px;}
+	.ross-mssg .ross-mssg-img img{width: 260px;height: 260px;display: block;}
+	.ross-mssg .ross-mssg-text{float: left;box-sizing: border-box;padding: 30px 0;}
+	.ross-mssg .ross-mssg-text-t{margin-bottom: 60px;}
 	.ross-mssg .ross-mssg-text-b{position: relative;}
-	.ross-mssg .ross-mssg-text-b .el-icon-caret-bottom{position: absolute;top:-5vw;left: 0;color: #FFFFFF;font-size: 20px;}
-	.ross-mssg .ross-mssg-text-t p{font-size: 4vw;color: #FFFFFF;line-height: 6vw;}
-	.ross-mssg .ross-mssg-text-b p{font-size: 2.8vw;color: #FFFFFF;line-height: 4vw;}
-	.ross-main{width: 100%;height: auto;box-sizing: border-box;float: right;padding: 0 4vw; position: relative;}
-	.ross-close{width: 6vw;height: 6vw;background: url('/img/activity/pc_close.png') no-repeat;background-size: cover;position: absolute;top: -25vw;right: 0vw;cursor: pointer;}
+	.ross-mssg .ross-mssg-text-b .el-icon-caret-bottom{position: absolute;top:-15px;left: 0;color: #FFFFFF;font-size: 20px;}
+	.ross-mssg .ross-mssg-text-t p{font-size: 28px;color: #FFFFFF;line-height: 50px;}
+	.ross-mssg .ross-mssg-text-b p{font-size: 16px;color: #FFFFFF;line-height: 40px;}
+	.ross-main{width: 400px;height: 100%;box-sizing: border-box;padding: 24px;float: right;position: relative;}
+	.ross-close{width: 28px;height: 28px;background: url('/img/activity/pc_close.png') no-repeat;background-size: cover;position: absolute;top: 20px;right: -24px;cursor: pointer;}
 	.ross-from{width: 100%;height: auto;}
-	.ross-from .from-row{width: 100%;height: 12vw;float: left;margin: 2vw 0;box-sizing: border-box;}
-	.ross-from .from-row.btn{margin-top: 12vw;}
-	.ross-from .from-row.none{margin: 0;}
-	.ross-from .from-row .label{display: none;}
-	.ross-from .from-row .input{width: 100%;height: 12vw;background: none;float: left;border: none; line-height:12vw;font-size: 4vw;color: #FFFFFF;box-sizing: border-box;border-bottom: 1px solid #FFFFFF;}
-	.ross-from .from-row .input::-webkit-input-placeholder{ color:#FFFFFF;}
-	.ross-from .from-row .input::-moz-input-placeholder{ color:#FFFFFF;}
-	.ross-from .from-row .input::-ms-input-placeholder{ color:#FFFFFF;}
-	.ross-from .from-row .input::input-placeholder{ color:#FFFFFF;}
-	.ross-from .from-row .from-btn{width: 100%;height: 12vw;float: left;line-height: 12vw;font-size: 4vw;color: #FFFFFF;text-align: center;background: #202020;cursor: pointer;}
+	.ross-from .from-row{width: 100%;height: 40px;float: left;margin: 12px 0;box-sizing: border-box;}
+	.ross-from .from-row.none{margin: 0;padding-left: 60px;}
+	.ross-from .from-row .label{width: 60px;height: 40px;float: left;line-height: 40px;font-size: 14px;color: #FFFFFF;text-align: right;padding-right: 5px;box-sizing: border-box;}
+	.ross-from .from-row .input{width: 280px;height: 40px;float: left;border-radius: 2px; border: none; line-height: 40px;font-size: 14px;color: #202020;box-sizing: border-box;padding: 0 10px;background: #FFFFFF;}
+	.ross-from .from-row .from-btn{width: 280px;height: 40px;float: left;line-height: 40px;font-size: 14px;color: #FFFFFF;text-align: center;background: #202020;cursor: pointer;}
 	.ross-from .from-row .from-btn.disabled{background: #CBCBCB;}
-	.ross-from .from-row .link{display: block;line-height: 12vw;font-size: 4vw;color: #FFFFFF;margin: 0 24px;}
+	.ross-from .from-row .link{display: block;line-height: 28px;font-size: 14px;color: #FFFFFF;margin: 0 24px;}
 	.ross-from .from-row .link.left{float: left;}
 	.ross-from .from-row .link.right{float: right;}
-	@keyframes rundbottom{ 0%{bottom: -113.8vw;opacity: 0;} 100%{bottom:0;opacity: 1;} }
+	@keyframes rundbottom{ 0%{bottom: -260px;opacity: 0;} 100%{bottom:0;opacity: 1;} }
 }
 @media screen and (min-width: 768px) {
 	.auto-input ul.auto-select-list{margin: 0;position:absolute;left:0;top:50px;width:50%;padding:8px 0;background:#fff; z-index: 999;box-shadow: 0px 6px 12px 1px rgba(0,0,0,0.1);max-height: 420px;overflow-y:auto;}

src/main/resources/static/css/base/base.pc.css

@@ -505,25 +505,26 @@ iframe{width:320px !important;height: 280px !important}
 .cmbeans-alert-content-tips .tips{width: 118px;height: 24px;background-color: rgba(226, 91, 28, 0.1);border-radius: 12px;line-height: 24px;font-size: 12px;color: #FF5B00;text-align: center;}
 
 /*ross宣传弹窗*/
-.ross-banner-fiexd{width: 100%;height: 260px;position: fixed;z-index: 999;background: linear-gradient(90deg, #FF5B00, #FFA86E);left: 0;right: 0;bottom: -260px;box-sizing: border-box;padding: 0 180px;opacity: 0;}
+.ross-banner-fiexd{width: 100%;height: 260px;position: fixed;z-index: 999;background: linear-gradient(90deg, #FF5B00, #FFA86E);left: 0;right: 0;bottom: -260px;box-sizing: border-box;opacity: 0;}
 .ross-banner-fiexd.active{animation: rundbottom 0.5s backwards;bottom: 0;opacity: 1;}
+.ross-banner-fiexd .ross-inner{width: 1200px;margin: 0 auto;}
 .ross-mssg{height: 100%;float: left;}
-.ross-mssg .ross-mssg-img{width: 260px;height: 260px;float: left;margin-right: 80px;}
+.ross-mssg .ross-mssg-img{width: 260px;height: 260px;float: left;margin-right: 40px;}
 .ross-mssg .ross-mssg-img img{width: 260px;height: 260px;display: block;}
 .ross-mssg .ross-mssg-text{float: left;box-sizing: border-box;padding: 30px 0;}
 .ross-mssg .ross-mssg-text-t{margin-bottom: 60px;}
 .ross-mssg .ross-mssg-text-b{position: relative;}
 .ross-mssg .ross-mssg-text-b .el-icon-caret-bottom{position: absolute;top:-15px;left: 0;color: #FFFFFF;font-size: 20px;}
-.ross-mssg .ross-mssg-text-t p{font-size: 34px;color: #FFFFFF;line-height: 50px;}
-.ross-mssg .ross-mssg-text-b p{font-size: 18px;color: #FFFFFF;line-height: 40px;}
-.ross-main{width: 440px;height: 100%;box-sizing: border-box;padding: 24px 40px;float: right;position: relative;}
+.ross-mssg .ross-mssg-text-t p{font-size: 28px;color: #FFFFFF;line-height: 50px;}
+.ross-mssg .ross-mssg-text-b p{font-size: 16px;color: #FFFFFF;line-height: 40px;}
+.ross-main{width: 400px;height: 100%;box-sizing: border-box;padding: 24px;float: right;position: relative;}
 .ross-close{width: 28px;height: 28px;background: url('/img/activity/pc_close.png') no-repeat;background-size: cover;position: absolute;top: 20px;right: -24px;cursor: pointer;}
 .ross-from{width: 100%;height: auto;}
 .ross-from .from-row{width: 100%;height: 40px;float: left;margin: 12px 0;box-sizing: border-box;}
 .ross-from .from-row.none{margin: 0;padding-left: 60px;}
 .ross-from .from-row .label{width: 60px;height: 40px;float: left;line-height: 40px;font-size: 14px;color: #FFFFFF;text-align: right;padding-right: 5px;box-sizing: border-box;}
-.ross-from .from-row .input{width: 300px;height: 40px;float: left;border-radius: 2px; border: none; line-height: 40px;font-size: 14px;color: #202020;box-sizing: border-box;padding: 0 10px;background: #FFFFFF;}
-.ross-from .from-row .from-btn{width: 300px;height: 40px;float: left;line-height: 40px;font-size: 14px;color: #FFFFFF;text-align: center;background: #202020;cursor: pointer;}
+.ross-from .from-row .input{width: 280px;height: 40px;float: left;border-radius: 2px; border: none; line-height: 40px;font-size: 14px;color: #202020;box-sizing: border-box;padding: 0 10px;background: #FFFFFF;}
+.ross-from .from-row .from-btn{width: 280px;height: 40px;float: left;line-height: 40px;font-size: 14px;color: #FFFFFF;text-align: center;background: #202020;cursor: pointer;}
 .ross-from .from-row .from-btn.disabled{background: #CBCBCB;}
 .ross-from .from-row .link{display: block;line-height: 28px;font-size: 14px;color: #FFFFFF;margin: 0 24px;}
 .ross-from .from-row .link.left{float: left;}

src/main/resources/templates/components/ross-advert.html

@@ -2,41 +2,43 @@
 <div class="other" id="rossAdvert" v-cloak>
   <!--Ross广告图-->
   <div class="ross-banner-fiexd" :class="showRossHtml ? 'active' : ''">
-    <div class="ross-mssg">
-      <div class="ross-mssg-img">
-        <img :src="advertisement.image" alt="">
-      </div>
-      <div class="ross-mssg-text">
-        <div class="ross-mssg-text-t">
-          <p>{{ advertisement.guidingOne }}</p>
-          <p>{{ advertisement.guidingTwo }}</p>
+    <div class="ross-inner">
+      <div class="ross-mssg">
+        <div class="ross-mssg-img">
+          <img :src="advertisement.image" alt="">
         </div>
-        <div class="ross-mssg-text-b">
-          <i class="el-icon-caret-bottom"></i>
-          <p>请留下您的姓名和手机号，采美会安排咨询顾问联系您!</p>
+        <div class="ross-mssg-text">
+          <div class="ross-mssg-text-t">
+            <p>{{ advertisement.guidingOne }}</p>
+            <p>{{ advertisement.guidingTwo }}</p>
+          </div>
+          <div class="ross-mssg-text-b">
+            <i class="el-icon-caret-bottom"></i>
+            <p>请留下您的姓名和手机号，采美会安排咨询顾问联系您!</p>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="ross-main">
-      <div class="ross-from">
-        <div class="from-row">
-          <div class="label">姓名:</div>
-          <input class="input" type="text" value="" v-model="consultParams.consultName" @input="handleInputName" maxlength="10" placeholder="您的姓名">
-        </div>
-        <div class="from-row">
-          <div class="label">手机号:</div>
-          <input class="input" type="text" value="" v-model="consultParams.consultMobile" @input="handleInputPhone"  maxlength="11" placeholder="您的手机号">
-        </div>
-        <div class="from-row btn">
-          <div class="label"></div>
-          <div class="from-btn" :class="isDisabled ? 'disabled' : ''" @click="handleSubmit">提交</div>
-        </div>
-        <div class="from-row none">
-          <a class="link left" href="/register.html">立即注册</a>
-          <a class="link right" href="/login.html">登录</a>
+      <div class="ross-main">
+        <div class="ross-from">
+          <div class="from-row">
+            <div class="label">姓名:</div>
+            <input class="input" type="text" value="" v-model="consultParams.consultName" @input="handleInputName" maxlength="10" placeholder="您的姓名">
+          </div>
+          <div class="from-row">
+            <div class="label">手机号:</div>
+            <input class="input" type="text" value="" v-model="consultParams.consultMobile" @input="handleInputPhone"  maxlength="11" placeholder="您的手机号">
+          </div>
+          <div class="from-row btn">
+            <div class="label"></div>
+            <div class="from-btn" :class="isDisabled ? 'disabled' : ''" @click="handleSubmit">提交</div>
+          </div>
+          <div class="from-row none">
+            <a class="link left" href="/register.html">立即注册</a>
+            <a class="link right" href="/login.html">登录</a>
+          </div>
         </div>
+        <div class="ross-close" @click="handleClose"></div>
       </div>
-      <div class="ross-close" @click="handleClose"></div>
     </div>
   </div>
 </div>