Merge branch 'master' into gray

@@ -36,15 +36,15 @@ router.get('/passport/international', login.common.beforeLogin, login.local.inte
 router.post('/passport/login/auth', login.local.login);
 router.post('/passport/login/auth', login.local.login);
 
 
 // SMS 短信
 // SMS 短信
-router.use('/passport/sms_login', login.common.beforeLogin, smsLogin.beforeIn);
-router.get('/passport/sms_login', smsLogin.loginPage);
-router.get('/passport/sms_login/token.json',
-    smsLogin.tokenBefore,
-    smsLogin.token); // only ajax;
-router.get('/passport/sms_login/check.json',
-    smsLogin.checkBefore,
-    smsLogin.check); // only ajax
-router.post('/passport/sms_login/password.json', smsLogin.password);
+// router.use('/passport/sms_login', login.common.beforeLogin, smsLogin.beforeIn);
+// router.get('/passport/sms_login', smsLogin.loginPage);
+// router.get('/passport/sms_login/token.json',
+//     smsLogin.tokenBefore,
+//     smsLogin.token); // only ajax;
+// router.get('/passport/sms_login/check.json',
+//     smsLogin.checkBefore,
+//     smsLogin.check); // only ajax
+// router.post('/passport/sms_login/password.json', smsLogin.password);
 
 
 // 微信登录
 // 微信登录
 router.get('/passport/login/wechat', login.common.beforeLogin, login.wechat.login);
 router.get('/passport/login/wechat', login.common.beforeLogin, login.wechat.login);

@@ -10,7 +10,7 @@
         </div>
         </div>
         <span id="btn-login" class="btn btn-login disable">登录</span>
         <span id="btn-login" class="btn btn-login disable">登录</span>
         <p class="op-container">
         <p class="op-container">
-            <a class="sms-login" href={{smsLoginUrl}}>手机号码快捷登录</a>
+            {{!--<a class="sms-login" href={{smsLoginUrl}}>手机号码快捷登录</a>--}}
             <span id="forget-pwd" class="forget-pwd">忘记密码</span>
             <span id="forget-pwd" class="forget-pwd">忘记密码</span>
         </p>
         </p>
         <div class="third-party-login">
         <div class="third-party-login">

@@ -32,7 +32,7 @@ const cachePage = {
 
 
 
 
     // 领券中心
     // 领券中心
-    '/activity/coupon/floor': 5 * MINUTE,
+    '/activity/coupon/floor': 1 * MINUTE,
 
 
     // 商品列表
     // 商品列表
     '/product/list/index': 1 * MINUTE,
     '/product/list/index': 1 * MINUTE,