Selaa lähdekoodia

正品联盟页面兼容性调整

yuwenjun 4 vuotta sitten
vanhempi
commit
26af1ec4eb

+ 12 - 9
src/main/resources/static/css/product/qualityauthorize.css

@@ -35,6 +35,7 @@ ul{margin:0;padding:0;list-style-type:none}
 .container-main .img-box .product-img{width:100%;height:100%}
 .container-main .img-box .product-authorize{width:72px;height:72px;position:absolute;bottom:20px;right:30px;z-index:10}
 .product-desc{width:570px;line-height:30px;color:#101010;float: right;}
+.product-desc h3{font-size: 20px}
 .product-desc .pink-box{margin:30px 0;padding:10px 16px;background:rgb(251,241,242);color:#bc1724}
 .product-desc .pink-box a{color:#bc1724}
 .product-desc .default-box{padding:10px 0;border-top:1px solid #eee;border-bottom:1px solid #eee}
@@ -43,10 +44,12 @@ ul{margin:0;padding:0;list-style-type:none}
 .product-desc .statement a::after{content:'?';display:inline-block;width:14px;height:14px;text-align:center;line-height:16px;font-size:14px;border:1px solid #bc1724;border-radius:50%;margin-left:5px}
 .product-desc p{margin:30px 0}
 .product-params{width:1184px;margin:16px auto 0;padding:25px;background:#FFFFFF;-webkit-box-sizing:border-box;box-sizing:border-box}
-.product-params .title{position:relative;padding-bottom:10px;border-bottom:2px solid #eee;-webkit-box-sizing:border-box;box-sizing:border-box}
+.product-params .title{position:relative;padding-bottom:10px;border-bottom:1px solid #eee;-webkit-box-sizing:border-box;box-sizing:border-box}
 .product-params .title::after{content:'';display:block;position:absolute;bottom:-2px;left:0;width:72px;height:2px;background:#101010}
 .product-params .title span{font-size:18px;font-weight:bold}
-.product-params .pc-params li{float: left;width: 50%;margin: 30px 0}
+.product-params .p-content{color:#101010}
+.product-params .pc-params{margin-top: 30px}
+.product-params .pc-params li{float: left;width: 50%;margin: 15px 0}
 .product-params .pc-params li>div{float: left}
 .product-params .pc-params li .p-title{color: #999999}
 .footer{margin-top:60px;padding:20px 0;background-color:#eee}
@@ -142,7 +145,7 @@ body{background: #fff}
 .product-desc h3{background:-webkit-gradient(linear,left top, right top,from(#101010),to(#404040));background:-o-linear-gradient(left,#101010,#404040);background:linear-gradient(to right,#101010,#404040);color:#fefefe;padding:4vw;font-size:4.4vw}
 .product-desc .pink-box{padding:3.2vw 4vw;background:rgb(251,241,242);color:#bc1724;line-height:8vw}
 .product-desc .default-box{width:92.3vw;margin:0 auto;padding:3.2vw 0;border-bottom:0.4vw solid #eee;line-height:8vw}
-.product-desc .statement a::after{content:'?';display:inline-block;width:3vw;height:3vw;text-align:center;line-height:3vw;font-size:3vw;border:1px solid #bc1724;border-radius:50%;margin-left:1vw}
+.product-desc .statement a{display: block;padding-right: 20px;width:23.6vw; background: url(/img/quality/icon-statement.png) no-repeat center;background-size:3.8vw;background-position-x:16vw;  }
 .product-desc p{padding:3.2vw 4vw;line-height:6vw}
 .product-desc .sn-number{padding:3.2vw 0;background:#f5f5f5}
 .product-desc .sn-number .item-row{background:rgb(251,241,242);padding:3.2vw 4vw}
@@ -168,13 +171,13 @@ body{background: #fff}
 /*授权证书*/
 .container-main .sq-book{position:absolute;width: 27.2vw;height: 20.6vw;bottom:4.1vw;left:4vw;z-index:10;}
 .sq-book-modal{width: 100%;height: 100vh;position: fixed;z-index: 9999;top: 0;left: 0;background: rgba(0,0,0,.7)}
-.sq-book-modal img{display: block;width: 92vw;height: 69vw;position: fixed;top: 50%;left: 50%;
--webkit-transform: translate(-50%,-50%);
-        transform: translate(-50%,-50%);
-        -moz-transform:translate(-50%,-50%);
-        -ms-transform: translate(-50%,-50%);
+.sq-book-modal img{display: block;width: 92vw;height: 69vw;position: fixed;top: 41.2vw;left: 50%;
+-webkit-transform: translateX(-50%);
+        transform: translateX(-50%);
+        -moz-transform:translateX(-50%);
+        -ms-transform: translateX(-50%);/*
 -webkit-animation: showBig 1s ease;
-        animation: showBig 1s ease;}
+        animation: showBig 1s ease;*/}
 
 @-webkit-keyframes showBig {
     from{

+ 2 - 1
src/main/resources/static/js/base.js

@@ -16,8 +16,9 @@ if(localStorage.getItem('userInfo')){
         GLOBAL_USER_IDENTITY = 1;
     }
 } else {
+    var pathname = window.location.pathname;
     var weChatLoginFlag = (Number(getBaseCookie("weChatAutoLogin"))===1 || Number(getBaseCookie("weChatAutoLogin"))===2);
-    if(!weChatLoginFlag){
+    if(pathname.indexOf('/product/auth/') === -1 && !weChatLoginFlag ){
         var userAgent = navigator.userAgent.toLowerCase();
         if (userAgent.match(/MicroMessenger/i)) {
             // 微信浏览器自动授权登录

+ 1 - 0
src/main/resources/static/js/product/qualityauthorize.js

@@ -69,6 +69,7 @@ var qualityAuthorize = new Vue({
     // }
     mounted:function () {
         setBaseCookie("weChatAutoLogin", 2);
+        console.log(1);
         //根据地址获取产品id
         var _that = this;
         var pathname = window.location.pathname;

+ 2 - 2
src/main/resources/templates/product/qualityauthorize.html

@@ -91,7 +91,7 @@
                 <div class="content">{{statementContent}}</div>
             </div>
         </div>
-        <div class="float-zplm"><a target="_blank" href="#"><img src="/img/quality/float-img.png"></a></div>
+        <div class="float-zplm"><a target="_blank" href="/index.html"><img src="/img/quality/float-img.png"></a></div>
 
         <!--授权图模态框-->
         <div class="sq-book-modal" @click="hideSqBookModal" v-show="isShowSqBookModal">
@@ -102,4 +102,4 @@
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/product/qualityauthorize.js(v=${version})}"></script>
-</body>
+</body>