Merge branch 'feature/vip' into 'master'

修改yoho接口变动 blk没同步更改的问题



See merge request !7

@@ -255,7 +255,7 @@ let mobileRegister = (req, res, next) => {
         }
 
         /* 手机注册: 调用注册接口*/
-        let regResult = yield RegService.regMobileAsync(area, mobile, password, cookie.getShoppingKey(req));
+        let regResult = yield RegService.regMobileAsync(area, mobile, password, code, cookie.getShoppingKey(req));
 
         if (!regResult.code || regResult.code !== 200) {
             data.message = '注册失败';

@@ -3,6 +3,7 @@
  */
 'use strict';
 const api = global.yoho.API;
+const crypto = global.yoho.crypto;
 
 /**
  * 发送注册验证码
@@ -31,15 +32,20 @@ let validMobileCodeAsync = (area, mobile, code) => {
     return api.post('', params);
 };
 
+let aesPwd = (pwd) => {
+    return crypto.encryption('yoho9646yoho9646', pwd);
+};
+
 /**
  * 注册帐号
  */
-let regMobileAsync = (area, mobile, password, shoppingKey)=> {
+let regMobileAsync = (area, mobile, password, code, shoppingKey)=> {
     let params = {
-        method: 'app.passport.register',
+        method: 'app.passport.registerAES',
         area: area,
         profile: mobile,
-        password: password
+        password: aesPwd(password),
+        verifyCode: code
     };
 
     if (shoppingKey) {

@@ -115,61 +115,55 @@ const shop = {
                 data.banner.banner = data.banner.banner.split('?')[0];
             }
 
-            if (result.brandId) {
-                q.brand = result.brandId;
-                q.shop_id = result.shopId;
-                nav.push({
-                    name: result.name
-                });
-            }
+            q.brand = result.brandId;
+            q.shop_id = result.shopId;
+            nav.push({
+                name: result.name
+            });
             return result.brandId;
         }).then((brandId) => {
-            if (brandId) {
-                return Promise.all([Search.queryAllSort({
-                    brand: q.brand,
-                    shop: q.shop_id,
-                    small_sort: 1
-                }), Search.queryProductOfBrand(q)]).then(allResult => {
-                    let allSort = allResult[0];
-                    let result = allResult[1];
-
-                    if (result && result.code === 200 && result.data) {
-                        let ret = result.data;
-
-                        if (ret.filter) {
-                            ret.filter.standard = ret.standard;
-                            ret.filter.group_sort = DataHelper.sortConvert(allSort.data.sort);
-                            ret.filter.singleBrand = true;
-                            data.filter = DataHelper.filterHandle(ret.filter, q);
-                            data.filter.showPrice = ret.total > 10;
-                            data.filter.showInfo = (data.filter.style && data.filter.style.length > 0)
-                                || (ret.standard && ret.standard.length > 0);  //eslint-disable-line
-
-                        }
-
-                        data.paginationData = {
-                            page: q.page,
-                            limit: ret.limit || 45,
-                            total: ret.total,
-                            pageTotal: ret.page_total,
-                            queryParams: req.query
-                        };
-
-                        data.navPath = {
-                            nav: nav
-                        };
-
-                        res.display('shop-list', _.assign(data, {
-                            products: DataHelper.handleProductList(ret.product_list, q, false),
-                            order: q.order
-                        }));
-                    } else {
-                        return Promise.reject('query shop index error');
+            return Promise.all([Search.queryAllSort({
+                brand: q.brand,
+                shop: q.shop_id,
+                small_sort: 1
+            }), Search.queryProductOfBrand(q)]).then(allResult => {
+                let allSort = allResult[0];
+                let result = allResult[1];
+
+                if (result && result.code === 200 && result.data) {
+                    let ret = result.data;
+
+                    if (ret.filter) {
+                        ret.filter.standard = ret.standard;
+                        ret.filter.group_sort = DataHelper.sortConvert(allSort.data.sort);
+                        ret.filter.singleBrand = true;
+                        data.filter = DataHelper.filterHandle(ret.filter, q);
+                        data.filter.showPrice = ret.total > 10;
+                        data.filter.showInfo = (data.filter.style && data.filter.style.length > 0) ||
+                            (ret.standard && ret.standard.length > 0); //eslint-disable-line
+
                     }
-                });
-            } else {
-                return next();
-            }
+
+                    data.paginationData = {
+                        page: q.page,
+                        limit: ret.limit || 45,
+                        total: ret.total,
+                        pageTotal: ret.page_total,
+                        queryParams: req.query
+                    };
+
+                    data.navPath = {
+                        nav: nav
+                    };
+
+                    res.display('shop-list', _.assign(data, {
+                        products: DataHelper.handleProductList(ret.product_list, q, false),
+                        order: q.order
+                    }));
+                } else {
+                    return Promise.reject('query shop index error');
+                }
+            });
         }).catch(next);
     },
 

@@ -27,16 +27,16 @@ module.exports = {
         // service: 'http://192.168.102.205:8080/gateway/',
         // search: 'http://192.168.102.216:8080/yohosearch/'
 
-        // singleApi: 'http://single.yoho.cn/',
-        // api: 'http://api.yoho.yohoops.org/',
-        // service: 'http://service.yoho.yohoops.org/',
-        // search: 'http://search.yohoops.org/yohosearch/'
-
         singleApi: 'http://single.yoho.cn/',
-        api: 'http://api-test3.yohops.com:9999/',
-        service: 'http://service-test3.yohops.com:9999/',
+        api: 'http://api.yoho.cn/',
+        service: 'http://service.yoho.cn/',
         search: 'http://search.yohoops.org/yohosearch/'
 
+        // singleApi: 'http://single.yoho.cn/',
+        // api: 'http://api-test3.yohops.com:9999/',
+        // service: 'http://service-test3.yohops.com:9999/',
+        // search: 'http://search.yohoops.org/yohosearch/'
+
         // api: 'http://dev-api.yohops.com:9999/',
         // service: 'http://dev-service.yohops.com:9999/',
         // singleApi: 'http://api-test1.yohops.com:9999/',