Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/static/css/supplier-login/login.css

@@ -6,19 +6,13 @@ body{
     opacity: 0;
 }
 .text_info {
-    padding-top: 10vh;
-    display: flex;
-    padding-bottom: 10vh;
-    justify-content: center;
-    align-items: center;
     width: 100vw;
-    height: 100vh;
+    height: 100%;
     box-sizing: border-box;
-    overflow: hidden;
+    overflow-y: scroll;
 }
 .text_info .text_info_contain {
-    height: 100vh;
-    overflow-y: scroll;
+    height: auto;
     padding: 10vh 24vw;
     box-sizing: border-box;
     width: 100%;
@@ -323,7 +317,6 @@ body{
 #fullpage {
     scroll-behavior: smooth;
     width: 100vw;
-    overflow-y: scroll;
     scrollbar-width: none; /* Firefox 兼容*/
     -ms-overflow-style: none; /* IE 10+ 兼容*/
     position: absolute;
@@ -341,6 +334,7 @@ body{
     padding-top: 7vh;
     scroll-snap-align: start;
     box-sizing: border-box;
+    overflow: hidden;
 }
 #zeroPage .el-carousel__container {
     height: 40vh;

src/main/resources/static/js/supplier-login/login.js

@@ -127,12 +127,12 @@ new Vue({
             {
                 id: 1,
                 title: '美业企谈|西班牙ROSS中国区执行总裁评论——采美是第三方专业的美业采购平台',
-                video: '/video/ROSS_1.mp4',
+                video: 'https://static.caimei365.com/www/video/video_01.mp4',
                 bg: '/img/supplier-login/ROSS_1.jpg',
             },{
                 id: 2,
                 title: '美业企谈|米蓝米岚品牌负责人Mita评论——采美是综合性平台，是我们的优质伙伴',
-                video: '/video/mp4_2.mp4',
+                video: 'https://static.caimei365.com/www/video/video_02.mp4',
                 bg: '/img/supplier-login/mp4_2.jpg',
             }
         ],

src/main/resources/templates/account/components/header.html

@@ -5,7 +5,7 @@
                 <img class="pcOnly" src="/img/base/logo.png" alt="采美 生美/医美采购服务平台"/>
                 <img class="h5Only" src="/img/base/logo_m.png" alt="采美 生美/医美采购服务平台"/>
             </a>
-            <p class="accountLogin">已有账号？请直接<a href="/login.html" rel="nofollow">登录</a></p>
+            <p class="accountLogin">已有账号？请直接<a href="/supplierlogin.html" rel="nofollow">登录</a></p>
         </div>
     </div>
     <input type="hidden" th:value="${coreServer}" id="coreServer">

src/main/resources/templates/supplier_login/index.html

@@ -404,9 +404,9 @@
     </div>
     <div class="text_info" v-else>
         <div class="text_info_contain" v-html="textContent" v-if="textContent"></div>
-<!--        &lt;!&ndash; 底部区域 end &ndash;&gt;-->
-<!--        <template th:replace="components/footer"></template>-->
-<!--        <template th:replace="components/foot-link"></template>-->
+        <!-- 底部区域 end -->
+        <template th:replace="components/footer"></template>
+        <template th:replace="components/foot-link"></template>
 
     </div>
 </div>