Merge branch 'gray' into 'master'

Gray See merge request !274

Merge branch 'gray' into 'master'
Gray See merge request !274
陈峰
Commit 9915a73e3d880c73471f34f1d337867af18b79aa 2 parents 62afda52 32d59c9c
Showing 10 changed files with 34 additions and 26 deletions
apps/activity/views/action/invite/mycoupons.hbs
apps/home/views/action/installment/help.hbs
apps/home/views/action/installment/open-index.hbs
apps/passport/controllers/sms.js
apps/product/models/sale.js
package.json
public/img/home/installment-icon2-change.png
public/js/common/open-app.js
public/js/product/detail/like.js
public/scss/home/installment/_installment.css
--- a/apps/activity/views/action/invite/mycoupons.hbs
View file @9915a73
+++ b/apps/activity/views/action/invite/mycoupons.hbs
View file @9915a73
@@ -12,7 +12,6 @@
             </div>
             <p class="congratu-coupon fz15 t-shadow">{{amount}}元现金券<br/>已自动存入YOHO!有货账户 {{userInfo.encMobile}}</p>
-            <p class="fz11">（首次下载客户端还能再次领取10元现金券）</p>
             <a href="javascript:void(0)" onclick="downLoadApp()" class="download-btn fz16" style="margin-top: 30px;">下载客户端查看</a>
             <p><a href="//m.yohobuy.com" class="now-login fz14" style="border-bottom: 1px solid #fff; text-decoration:none;color:#FFF;line-height: normal;">立即登录网站使用</a></p>
--- a/apps/home/views/action/installment/help.hbs
View file @9915a73
+++ b/apps/home/views/action/installment/help.hbs
View file @9915a73
@@ -49,7 +49,7 @@
 			1、有货分期支持多久的分期？
 		</p>
 		<p>
-			试运营阶段，支持30天免息、3期、6期，具体分期请在支付中心选择并确认。
+			目前支持30天、3期、6期，但因具体订单金额等限制问题，具体分期请在支付中心选择并确认。
 		</p>
 		<p>
 			2、为什么我开通了分期后仍然无法使用？
@@ -67,7 +67,7 @@
 			4、分期服务费如何收取？
 		</p>
 		<p>
-			试运营期商品分期免息、免服务费，具体请看商品详情页有货分期介绍。
+			分期服务费依据所分期期数收取，详见商品详情页有货分期说明。
 		</p>
 		<p>
 			5、如何查看消费明细和还款情况？
@@ -79,8 +79,8 @@
 			6、我的还款日是哪天呢？
 		</p>
 		<p>
-			30天免息：到期还款日为借款当日日期向后顺延30个自然日。
-			3、6期分期：到期还款日为借款当日日期向后顺延1个自然月。（例如：您8.11使用分期借款，分三期还款，9.11为第一期到期还款日，10.11为第二期到期还款日，11.11为第三期到期还款日）。
+			30天：到期还款日为借款日向后顺延30个自然日。
+			3、6期：首个到期还款日，为借款日向后顺延1个自然月；第2期还款日，为首个到期还款日向后顺延1个自然月，依此类推。（例如：8月11日使用有货分期支付，分3期；则到期还款日分别为：9月11日、10月11日、11月11日。）
 		</p>
 		<p>
 			7、可以设置自动还款吗？
--- a/apps/home/views/action/installment/open-index.hbs
View file @9915a73
+++ b/apps/home/views/action/installment/open-index.hbs
View file @9915a73
@@ -20,7 +20,7 @@
                         </li>
                         <li>
                             <span class="open-icon-2"></span>
-                            <span>30天免息<br>灵活分期</span>
+                            <span>0元首付<br>随心分期</span>
                         </li>
                         <li>
                             <span class="open-icon-3"></span>
--- a/apps/passport/controllers/sms.js
View file @9915a73
+++ b/apps/passport/controllers/sms.js
View file @9915a73
@@ -289,10 +289,17 @@ exports.checkBefore = (req, res, next) => {
 // AJAX 校验验证码 in step2
 exports.check = (req, res, next) => {
     const code = req.query.code;
-    const mobile = req.session.smsLogin.mobile;
-    const area = req.session.smsLogin.area;
+    const mobile = _.get(req.session, 'smsLogin.mobile', '');
+    const area = _.get(req.session, 'smsLogin.area', '');
     const shopping_key = cookie.getShoppingKey(req); // eslint-disable-line
+    if (!mobile || !area) {
+        res.json({
+            code: 401,
+            message: VERIFY_ERROR
+        });
+        return;
+    }
     Promise.all([
         PhoneService.checkUserPhoneExist(mobile, area),
--- a/apps/product/models/sale.js
View file @9915a73
+++ b/apps/product/models/sale.js
View file @9915a73
@@ -230,7 +230,7 @@ const _getUserProfile = (uid) => {
  */
 const _getResources = (page, channel) => {
     return serviceAPI.get('operations/api/v5/resource/get', {
-        content_code: contentCode[channel][page]
+        content_code: _.get(contentCode, `${channel}.${page}`, '')
     }, {
         cache: true
     }).then((result) => {
--- a/package.json
View file @9915a73
+++ b/package.json
View file @9915a73
 {
   "name": "m-yohobuy-node",
-  "version": "5.4.13",
+  "version": "5.4.14",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {
--- a/public/img/home/installment-icon2-change.png 0 → 100644
View file @9915a73
+++ b/public/img/home/installment-icon2-change.png 0 → 100644
View file @9915a73
--- a/public/js/common/open-app.js
View file @9915a73
+++ b/public/js/common/open-app.js
View file @9915a73
@@ -13,7 +13,7 @@ const iOSVersion = parseInt((u.match(/OS (\d+)_(\d+)_?(\d+)?/i) || [])[1], 10); 
 const nodownload = document.getElementById('no-download'); // 页面不需要下载
 const urlBlacklist = ['m.yohobuy.com/brands', 'm.yohobuy.com/passport'];
-const blackCheck = urlBlacklist.some(function (url) {
+const blackCheck = urlBlacklist.some(function(url) {
     return new RegExp(url, 'i').test(location.href);
 });
@@ -40,19 +40,21 @@ if (canOpenApp()) {
     let appPath = getAppPath();
     let ifr;
-    if (window._yas && window._yas.sendCustomInfo) {
-        window._yas.sendCustomInfo({
-            op: 'YB_H5_AWAKE_APP',
-            param: JSON.stringify({
-                PAGE_NAME: encodeURIComponent(document.title),
-                PAGE_URL: encodeURIComponent(location.href)
-            })
-        }, true);
-    }
+    setTimeout(function() {
+        if (window._yas && window._yas.sendCustomInfo) {
+            window._yas.sendCustomInfo({
+                op: 'YB_H5_AWAKE_APP',
+                param: JSON.stringify({
+                    PAGE_NAME: encodeURIComponent(document.title),
+                    PAGE_URL: encodeURIComponent(location.href)
+                })
+            }, true);
+        }
-    if (window._hmt && window._hmt.push) {
-        window._hmt.push(['_trackEvent', 'H5唤起APP', isiOS ? 'Apple' : 'Android', document.title, location.href]);
-    }
+        if (window._hmt && window._hmt.push) {
+            window._hmt.push(['_trackEvent', 'H5唤起APP', isiOS ? 'Apple' : 'Android', document.title, location.href]);
+        }
+    }, 2000);
     if (isiOS) {
         window.location.href = appPath;
--- a/public/js/product/detail/like.js
View file @9915a73
+++ b/public/js/product/detail/like.js
View file @9915a73
@@ -83,7 +83,7 @@ $('#likeBtn').on('touchstart', function() {
     });
     // 统计代码：用于统计用户加入或取消商品收藏的动作
-    if (window._yas) {
+    if (window._yas && window._yas.sendCustomInfo) {
         window._yas.sendCustomInfo({
             pd: productId,
             fa: favorite
@@ -99,7 +99,7 @@ $('#addtoCart').on('touchstart', function() {
     chosePanel.show();
     // 统计代码：用于统计用户加入购物车的动作
-    if (window._yas) {
+    if (window._yas && window._yas.sendCustomInfo) {
         window._yas.sendCustomInfo({
             pd: productId,
             by: 1
--- a/public/scss/home/installment/_installment.css
View file @9915a73
+++ b/public/scss/home/installment/_installment.css
View file @9915a73
@@ -106,7 +106,7 @@
     }
     .open-icon-2 {
-        background: resolve("home/installment-icon2.png") no-repeat;
+        background: resolve("home/installment-icon2-change.png") no-repeat;
         background-size: contain;
         width: 67px;
         height: 67px;