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

src/main/resources/static/css/account/login.css

@@ -31,7 +31,7 @@ footer .footTop{display:none;}
 .loginForm .showPwd:before{width:22px;height:20px;background-position:-240px -299px}
 .loginForm .showPwd.on:before{width:22px;height:20px;background-position:-205px -299px}
 #qrCodeWrap{position:relative}
-#qrCodeWrap .model{position:absolute;width:200px;height:200px;top:15px;left:98px;display:flex;justify-content:center;align-items:center;background:rgba(255,255,255,.9);color:#000;z-index:99999;cursor:pointer;border:1px solid #EBEBEB}
+#qrCodeWrap .model{position:absolute;width:200px;height:200px;top:15px;left:98px;display:flex;justify-content:center;align-items:center;background:rgba(255,255,255,1);color:#000;z-index:99999;cursor:pointer;border:1px solid #EBEBEB}
 #qrCodeWrap .model .refresh{width:21px;height:21px;display:block;margin:0 auto 3px}
 #qrCodeWrap .model .refresh-div{width:100px;height:64px;display:block}
 #qrCodeWrap .model .refresh-div p{text-align:center;font-size:14px;line-height:20px}

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

@@ -5,6 +5,13 @@
 body{min-width:1184px;}
 header{box-shadow: 0 2px 10px #ebecef;}
 .h5Only{display:none!important;}
+/*微信二维码样式*/
+iframe{width:320px !important;height: 280px !important}
+.impowerBox .qrcode {width: 200px !important;}
+.impowerBox .title {display: none;}
+.impowerBox .info {width: 280px;}
+.impowerBox .status_icon {display: none;}
+.impowerBox .status {text-align: center;}
 /*定义滚动条样式*/
 ::-webkit-scrollbar{width:10px;height:10px;background-color:#F6F6F6}
 ::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,0.1);border-radius:2px;background-color:#F6F6F6}

src/main/resources/static/js/account/login.js

@@ -42,7 +42,7 @@ var loginPage = new Vue({
                         redirect_uri: response.data.redirect_uri,
                         state: response.data.state,
                         style: "black",
-                        href: "https://www-b.caimei365.com/web/login/css/login.css"
+                        href: "https://www.caimei365.com/css/base/base.pc.css"
                 });
                 timeClock = setInterval(function(){
                     _self.maxtime--;

src/main/resources/templates/index.html

@@ -186,7 +186,7 @@
     <!--左侧广告图-->
     <div id="advertising">
         <div class="item" v-for="ad in advertising">
-            <a href="javascript:void(0);">
+            <a :href="ad.link" target="_blank">
                 <img :src="ad.image" :alt="ad.title">
             </a>
             <span class="close"></span>

src/main/resources/templates/user-center/order/logistics.html

@@ -41,7 +41,7 @@
                     <div class="title">物流信息</div>
                     <div class="logistics-deatil">
                         <div class="title-deatil">物流详情</div>
-                         <div class="logsitics-list" v-if="logisticsInfoList.length<0">
+                         <div class="logsitics-list" v-if="logisticsInfoList.length>0">
                              <div class="goodlist" v-for="(info,index) in logisticsInfoList" :key="index">
                                <p>发货时间：<span>{{info.updateDate}}</span></p>
                                <p v-if="isPC">物流公司：<span>{{info.logisticsCompanyName}}</span></p>