updated

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

@@ -216,7 +216,7 @@ html {
         -ms-flex-direction: column;
             flex-direction: column;
     border-radius: 6px;
-    padding: 6.667vw 0;
+    padding: 5.667vw 0;
     -webkit-box-sizing: border-box;
             box-sizing: border-box;
 }
@@ -640,7 +640,7 @@ html {
     content: '';
     transform: rotate(45deg);
     right: 30vw;
-    top: 7.264vw;
+    top: 7vw;
     border-bottom: 1px solid;
     border-right: 1px solid;
 }
@@ -651,7 +651,7 @@ html {
     content: '';
     transform: rotate(45deg);
     right: 30vw;
-    top: 6.264vw;
+    top: 6vw;
     border-bottom: 1px solid;
     border-right: 1px solid;
 }
@@ -975,6 +975,9 @@ video {
 .videoClose {
     width: 40px;
     height: 40px;
+    margin-bottom: -20px;
+    margin-right: -20px;
+    z-index: 1;
 }
 .close {
     width: 82%;

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

@@ -1568,6 +1568,9 @@ body{
     width: 40px;
     height: 40px;
     cursor: pointer;
+    margin-bottom: -20px;
+    margin-right: -20px;
+    z-index: 1;
 }
 .close {
     width: 60%;

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

@@ -292,8 +292,8 @@ new Vue({
         this.getPageSnap()
         this.goLinkActive()
         this.ScenarioListFilter(6)
-        this.backIntoView()
         this.getSupplierInfoLanding()
+        this.backIntoView()
     },
     filters: {
         textSubString(val, index) {
@@ -343,10 +343,13 @@ new Vue({
             });
         },
         backIntoView() {
-            if (location.search) {
-                const id = location.search
-                const to = document.getElementById(id.substring(1, id.length))
-                to.scrollIntoView()
+            if (localStorage.getItem('activeLink')) {
+                const id = localStorage.getItem('activeLink')
+                this.H5link({
+                    id: this.activeLinks.filter(e => e.href === id)[0].id,
+                    href: id
+                })
+                localStorage.removeItem('activeLink')
             }
         },
         // 底部切换
@@ -488,7 +491,7 @@ new Vue({
                 localStorage.removeItem('text_info_from')
             }
             localStorage.setItem('text_info_from', JSON.stringify(this.textContent))
-            window.location.href = '/supplier-login/text_info.html'
+            window.open('/supplier-login/text_info.html')
         },
         goToIndex() {
             window.location.href = '/'
@@ -504,9 +507,6 @@ new Vue({
                 callback: action => {}
             });
         },
-        scrollintoview() {
-            document.getElementById('thirdPage').scrollIntoView()
-        },
         // 截取运营产品
         ScenarioListFilter(index) {
             this.filterH5ScenarioList = this.H5ScenarioList.filter(item => item.id <= index)

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

@@ -521,9 +521,8 @@ new Vue({
             this.drawer = !this.drawer
         },
         H5link($event) {
-            // window.location.href = `/supplier-login/index.html?${$event.href}`
-            // this.scrollToDom(to, window)
-            window.history.go(-1)
+            localStorage.setItem('activeLink', $event.href)
+            window.location.href = `/supplier-login/index.html`
         },
         // 滚动函数
         scrollToDom(to, container) {

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

@@ -502,7 +502,7 @@
                 </div>
                 <div class="cm_video_player" @click="playerOff" ref="Myplayer">
                     <div class="close"><el-image src="https://static.caimei365.com/app/img/supplier-login/close.png" class="videoClose"></el-image></div>
-                    <video controls ref="cm_player" width="60%">
+                    <video controls ref="cm_player" width="60%" webkit-playsinline="true" playsinline="true">
                         <source type="video/mp4">
                         您的浏览器不支持Video标签。
                     </video>