Merge branch 'feature/vip' into 'master'

Feature/vip



See merge request !8

@@ -77,8 +77,9 @@ let index = (req, res) => {
             captchaUrl: helpers.urlFormat('/passport/images', {
                 t: Date.now()
             }),
-            itemUrl: helpers.urlFormat('/help', {
-                id: 5
+            itemUrl: helpers.urlFormat('/help/detail', {
+                id: 103,
+                contId: 239
             }),
             referUrl: refer,
             loginUrl: helpers.urlFormat('/passport/login', {

+/**
+ * 登录注册密码加密,uid加密
+ * @author: wsl<shuiling.wang@yoho.cn>
+ * @date: 2016/07/07
+ */
+
+'use strict';
+
+const crypto = global.yoho.crypto;
+
+/**
+ * 密码加密
+ **/
+const aesPwd = (pwd) => {
+    return crypto.encryption('yoho9646yoho9646', pwd);
+};
+
+module.exports = {
+    aesPwd
+};

@@ -3,18 +3,18 @@
  */
 
 'use strict';
-
+const aes = require('./aes-pwd');
 const api = global.yoho.API;
 
 /**
- * 手机或邮箱登录
+ * 手机或邮箱登录 app.passport.signin => app.passport.signinAES 加密
  */
 const signinAsync = (area, profile, password, shoppingKey) => {
     let param = {
-        method: 'app.passport.signin',
+        method: 'app.passport.signinAES',
         area: area,
         profile: profile,
-        password: password
+        password: aes.aesPwd(password)
     };
 
     if (shoppingKey) {

@@ -40,13 +40,13 @@
 
                 <div class="goods-wrap">
                     {{#each newProducts}}
-                        <div class="goods-info" data-skn="{{product_skn}}">
-                            <a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">
+                        <div class="goods-info" data-skn="{{productSkn}}">
+                            <a href="/product/pro_{{productId}}_{{goodsId}}/{{cnAlphabet}}.html" target="_blank">
                                 <img class="lazy thumb" data-original="{{src}}">
                             </a>
                             <div class="desc">
-                                <a class="name" href="" target="_blank">{{product_name}}</a>
-                                <p class="price">¥{{round sales_price 2}}</p>
+                                <a class="name" href="" target="_blank">{{productName}}</a>
+                                <p class="price">¥{{round salesPrice 2}}</p>
                             </div>
                         </div>
                     {{/each}}

+Stack trace:
+Frame        Function    Args
+000FFFFA318  0018007164E (0018026F12D, 00180224DC6, 000FFFFA318, 000FFFF9210)
+000FFFFA318  00180046669 (00000000000, 00000000000, 00000000000, 001005E6E6C)
+000FFFFA318  001800466A2 (0018026F1E9, 000FFFFA1C8, 000FFFFA318, 00000000000)
+000FFFFA318  001800BDFEF (00000000000, 00000000000, 00000000000, 00000000000)
+000FFFFA318  001800BE20F (000FFFFA340, 00000000000, 00000000000, 00000000000)
+000FFFFA3C0  001800BF4AD (000FFFFA340, 00000000000, 00000000000, 00000000000)
+End of stack trace

@@ -5,9 +5,9 @@
             <li>
                 <a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank">客户服务</a>
             </li>
-            <li><a href="{{https siteUrl}}/help?id=2" target="_blank">支付方式</a></li>
-            <li><a href="{{https siteUrl}}/help?id=31" target="_blank">配送方式</a></li>
-            <li><a href="{{https siteUrl}}/help?id=41" target="_blank">售后服务</a></li>
+            <li><a href="{{https siteUrl}}/help/detail?id=29" target="_blank">支付方式</a></li>
+            <li><a href="{{https siteUrl}}/help/detail?id=109" target="_blank">配送方式</a></li>
+            <li><a href="{{https siteUrl}}/help/detail?id=49" target="_blank">售后服务</a></li>
         </ul>
         <div class="record-info">
             <p>