Merge branch 'hotfix/12817'

@@ -52,12 +52,6 @@ passport.use('local', new LocalStrategy({
         return done({message: '登录账号格式错误'}, null);
         return done({message: '登录账号格式错误'}, null);
     }
     }
 
 
-    let expire = req.cookies['LE' + md5('_LOGIN_EXPIRE')];
-
-    if (_.isEmpty(expire) || expire < (new Date()).getTime() / 1000) {
-        return done({message: '页面停留时间过长，请刷新页面'}, null);
-    }
-
     let verifyCode = req.body.captcha;
     let verifyCode = req.body.captcha;
 
 
     if (verifyCode && verifyCode !== req.session.captcha) {
     if (verifyCode && verifyCode !== req.session.captcha) {

@@ -102,14 +102,6 @@ const common = {
 
 
 const local = {
 const local = {
     loginPage: (req, res) => {
     loginPage: (req, res) => {
-        // 先清除cookie
-        res.clearCookie('LE' + md5('_LOGIN_EXPIRE'), {
-            domain: 'yohobuy.com'
-        });
-
-        // 设置登录有效时间30分钟, 防机器刷，cache不稳定，改为cookie
-        res.cookie('LE' + md5('_LOGIN_EXPIRE'), (new Date()).getTime() / 1000 + 1800);
-
         // 清除cookie
         // 清除cookie
         res.clearCookie('_UID', {
         res.clearCookie('_UID', {
             domain: 'yohobuy.com'
             domain: 'yohobuy.com'

@@ -330,9 +330,9 @@
         <div class="footer-link">
         <div class="footer-link">
             <div class="center-content clearfix">
             <div class="center-content clearfix">
                 <div class="left right-flag">
                 <div class="left right-flag">
-                    <div class="govicon">
-                        <script id="jsgovicon" src="http://odr.jsdsgsxt.gov.cn:8081/mbm/app/main/electronic/js/govicon.js?siteId=f2b6e3b8d18241afb8dd6cadf7f15406&width=26&height=34&type=1" type="text/javascript" charset="utf-8"></script>
-                    </div>
+                    <a class='govicon' href="http://odr.jsdsgsxt.gov.cn:8081/mbm/entweb/elec/certView?siteId=f2b6e3b8d18241afb8dd6cadf7f15406" target="_blank" rel="nofollow">
+                        <div class="govimg"></div>
+                    </a>
                     <a href="https://ss.knet.cn/verifyseal.dll?sn=e14021832010046477dka7000000&amp;ct=df&amp;a=1&amp;pa=0.5902942178957805" target="_blank" rel="nofollow">
                     <a href="https://ss.knet.cn/verifyseal.dll?sn=e14021832010046477dka7000000&amp;ct=df&amp;a=1&amp;pa=0.5902942178957805" target="_blank" rel="nofollow">
                         <img src="//static.yohobuy.com/images/v3/icon/credit-flag3.png">
                         <img src="//static.yohobuy.com/images/v3/icon/credit-flag3.png">
                     </a>
                     </a>

@@ -253,7 +253,7 @@
                     </div>
                     </div>
                     <div class="go-full-cart">
                     <div class="go-full-cart">
                         <div>
                         <div>
-                            <a href="/shopping/cart">去购物车结算</a>
+                            <a href="//www.yohobuy.com/shopping/cart">去购物车结算</a>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>

@@ -7,6 +7,8 @@ var len = $item.length, slide;
 var src = /url\("([^'"]*)"\)/g.exec($('.print_qrcode').css('background'))[1];
 var src = /url\("([^'"]*)"\)/g.exec($('.print_qrcode').css('background'))[1];
 $('.print_qrcode').find('img').attr('src', src);
 $('.print_qrcode').find('img').attr('src', src);
 
 
+require('../common');
+
 function slideDo(to) {
 function slideDo(to) {
     $item.each(function(index) {
     $item.each(function(index) {
         index === to ? $(this).stop().animate({
         index === to ? $(this).stop().animate({

@@ -3,3 +3,4 @@
  */
  */
 
 
 require('./back/back');
 require('./back/back');
+require('../common');

@@ -3,3 +3,4 @@
  */
  */
 
 
 require('./back/reset');
 require('./back/reset');
+require('../common');

 /**
 /**
  * Created by TaoHuang on 2016/6/21.
  * Created by TaoHuang on 2016/6/21.
  */
  */
+require('../common');

 /**
 /**
  * Created by TaoHuang on 2016/6/21.
  * Created by TaoHuang on 2016/6/21.
  */
  */
+require('../common');

@@ -3,3 +3,4 @@
  */
  */
 
 
 require('./back/verification');
 require('./back/verification');
+require('../common');

@@ -2,3 +2,4 @@
  * 绑定成功页面
  * 绑定成功页面
 **/
 **/
 require('../simple-header');
 require('../simple-header');
+require('../common');

 require('./bind/thirdlogin');
 require('./bind/thirdlogin');
+require('../common');

 require('./login/index');
 require('./login/index');
+require('../common');

 require('./bind/bind-info');
 require('./bind/bind-info');
+require('../common');

 var reg = require('./reg/reg');
 var reg = require('./reg/reg');
 
 
 reg.init('reg');
 reg.init('reg');
+require('../common');

 require('./bind/relate');
 require('./bind/relate');
+require('../common');

@@ -324,20 +324,12 @@ $addToCart.click(function() {
         }
         }
     }).then(function(data) {
     }).then(function(data) {
         var code = data.code;
         var code = data.code;
-        var strK;
 
 
         if (code === 200) {
         if (code === 200) {
             $('#type-chose').slideUp(SLIDETIME);
             $('#type-chose').slideUp(SLIDETIME);
             $('#balance').slideDown(SLIDETIME);
             $('#balance').slideDown(SLIDETIME);
 
 
             $('#cart-num').text(data.data.goods_count); // 更新数目
             $('#cart-num').text(data.data.goods_count); // 更新数目
-
-            strK = '{"_k":"' + data.data._k + '","_nac":0' + ',"_ac":0,"_r":0}'; //eslint-disable-line
-
-            window.setCookie('_g', strK, {
-                path: '/',
-                domain: '.yohobuy.com'
-            });
         }
         }
     });
     });
 });
 });

@@ -299,6 +299,7 @@
                 margin-right: 5px;
                 margin-right: 5px;
             }
             }
             .govicon {
             .govicon {
+                display: inline-block;
                 float: left;
                 float: left;
                 border-radius: 2px;
                 border-radius: 2px;
                 margin-right: 8px;
                 margin-right: 8px;
@@ -306,6 +307,12 @@
                 width: 26px;
                 width: 26px;
                 height: 34px;
                 height: 34px;
             }
             }
+
+            .govimg {
+                width: 100%;
+                height: 100%;
+                background: url(/layout/ebsIcon.png) no-repeat;
+            }
         }
         }
 
 
         .about-us {
         .about-us {