'取数据'

@@ -6,38 +6,39 @@
 
 
 'use strict';
 'use strict';
 
 
-// const indexModel = require('../models/index');
+const indexModel = require('../models/index');
 
 
 exports.index = (req, res, next) => {
 exports.index = (req, res, next) => {
     let params = {
     let params = {
-        uid: req.user.uid || ''
+        uid: req.user.uid || '6228593'
     };
     };
 
 
-    // indexModel.index(params).then(result => {
-    //     if (result) {
-    //         res.render('index', result);
-    //     }
-    // }).catch(next);
+    indexModel.index(params).then(result => {
+        if (result) {
+            console.log(result);
+            res.render('index', result);
+        }
+    }).catch(next);
 
 
-    res.render('index', {
-        myIndexPage: 1,
-        showDownloadApp: 1,
-        navHome: 1,
-        notice: [],
-        pageFooter: 1,
-        cartUrl: '//m.dev.yohobuy.com/cart/index/index',
-        signinUrl: '//m.dev.yohobuy.com/signin.html?refer=%2F%2Fm.dev.yohobuy.com%2Fhome',
-        isLogin: 1,
-        wait_pay_num: 0,
-        wait_cargo_num: 0,
-        send_cargo_num: 0,
-        brand_favorite_total: 0,
-        product_favorite_total: 0,
-        inbox_total: 0,
-        comment_total: 0,
-        refund_exchange_num: 0,
-        yoho_coin_num: 0,
-        coupon_num: 0,
-        product_browse: 0
-    });
+    // res.render('index', {
+    //     myIndexPage: 1,
+    //     showDownloadApp: 1,
+    //     navHome: 1,
+    //     notice: [],
+    //     pageFooter: 1,
+    //     cartUrl: '//m.dev.yohobuy.com/cart/index/index',
+    //     signinUrl: '//m.dev.yohobuy.com/signin.html?refer=%2F%2Fm.dev.yohobuy.com%2Fhome',
+    //     isLogin: 1,
+    //     wait_pay_num: 0,
+    //     wait_cargo_num: 0,
+    //     send_cargo_num: 0,
+    //     brand_favorite_total: 0,
+    //     product_favorite_total: 0,
+    //     inbox_total: 0,
+    //     comment_total: 0,
+    //     refund_exchange_num: 0,
+    //     yoho_coin_num: 0,
+    //     coupon_num: 0,
+    //     product_browse: 0
+    // });
 };
 };

@@ -12,18 +12,12 @@ const favApi = global.yoho.FavAPI;
 const api = global.yoho.API;
 const api = global.yoho.API;
 
 
 /**
 /**
- * 收藏数量接口
- * @param params
- * @returns {*|Promise.<TResult>}
+ * 个人详情数据
  */
  */
-const _favoriteData = (params) => {
-    return favApi.get('brower', {
-        method: 'app.favorite.getFavoriteCount',
-        uid: params.uid || '8039759'
-    }, {code: 200, cache: false}).then(result => {
-        if (result.data) {
-            return result;
-        }
+const _userData = (params) => {
+    return api.get('', {
+        method: 'app.passport.profile',
+        uid: params.uid,
     });
     });
 };
 };
 
 
@@ -33,44 +27,54 @@ const _favoriteData = (params) => {
 const _noticeData = () => {
 const _noticeData = () => {
     return api.get('', {
     return api.get('', {
         method: 'app.resources.getNotices',
         method: 'app.resources.getNotices',
-    }).then(result => {
-        return result;
     });
     });
 };
 };
 
 
 /**
 /**
- * 个人中心页面优惠券，收藏的商品等的数目数据
+ * 收藏数量接口
+ * @param params
+ * @returns {*|Promise.<TResult>}
  */
  */
-const _infoNum = (params) => {
-    return api.get('', {
-        method: 'app.home.getInfoNum',
-        uid: params.uid,
-        udid: params.udid,
-    }).then(result => {
-        return result;
+const _favoriteData = (params) => {
+    return favApi.get('brower', {
+        method: 'app.favorite.getFavoriteCount',
+        uid: params.uid || '8039759'
     });
     });
 };
 };
 
 
 /**
 /**
- * 个人详情数据
+ * 个人中心页面优惠券，收藏的商品等的数目数据
  */
  */
-const _userData = (params) => {
+const _infoNum = (params) => {
     return api.get('', {
     return api.get('', {
-        method: 'app.passport.profile',
+        method: 'app.home.getInfoNum',
         uid: params.uid,
         uid: params.uid,
-    }).then(result => {
-        return result;
-    });
+        udid: params.udid,
+    }, {code: 200});
 };
 };
 
 
-
 /**
 /**
  * 个人中心首页
  * 个人中心首页
  * @param params
  * @param params
  * @returns {function()}
  * @returns {function()}
  */
  */
 const index = (params) => {
 const index = (params) => {
-    return _favoriteData;
+    let finalResult = {};
+
+    return api.all([
+        _userData(params),
+        _noticeData(),
+        _favoriteData(params)
+    ]).then(result => {
+        // console.log(result);
+
+        if (result[2] && result[2].data) {
+            Object.assign(finalResult, {
+                product_favorite_total: result[2].data.product_favorite_total
+            });
+        }
+        return finalResult;
+    });
 };
 };
 
 
 module.exports = {
 module.exports = {

@@ -16,10 +16,14 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     domains: {
     domains: {
         // api: 'http://devapi.yoho.cn:58078/',
         // api: 'http://devapi.yoho.cn:58078/',
-        // service: 'http://devservice.yoho.cn:58077/'
+        // service: 'http://devservice.yoho.cn:58077/',
+
+        // api: 'http://api.yoho.yohoops.org/',
+        // service: 'http://service.yoho.yohoops.org/',
 
 
         api: 'http://testapi.yoho.cn:28078/',
         api: 'http://testapi.yoho.cn:28078/',
         service: 'http://testservice.yoho.cn:28077/',
         service: 'http://testservice.yoho.cn:28077/',
+
         favApi: 'http://192.168.102.31:8092/'
         favApi: 'http://192.168.102.31:8092/'
     },
     },
     subDomains: {
     subDomains: {