Merge branch 'release/usercenter' of git.yoho.cn:fe/yohobuywap-node into release/usercenter

@@ -27,7 +27,7 @@ const favorite = (req, res) => {
 };
 
 let favProduct = (req, res, next) => {
-    let uid = req.user.uid || 5987341;
+    let uid = req.user.uid;
     let page = req.query.page || 1;
     let limit = 10;
 
@@ -45,7 +45,7 @@ let favProduct = (req, res, next) => {
 };
 
 let favfavBrand = (req, res, next) => {
-    let uid = req.user.uid || 8039759;
+    let uid = req.user.uid;
     let page = req.query.page || 1;
     let limit = 10;
 

@@ -32,7 +32,10 @@ exports.index = (req, res, next) => {
                 page: 'index',
                 title: 'Yoho!Buy 有货',
                 pageHeader: headerData,
-                pageFooter: true
+                pageFooter: true,
+                pageChannel: {
+                    boys: true,
+                },
             }));
         }
     }).catch(next);

@@ -11,7 +11,7 @@ const headerModel = require('../../../doraemon/models/header'); // 头部model
 const _ = require('lodash');
 
 const myCurrency = (req, res, next) => {
-    let uid = req.user.uid || 8039759;
+    let uid = req.user.uid;
     let contentCode = '05afedf76886d732573f10f7451a1703';
 
     myCurrencyModel.myCurrency(uid, contentCode).then(result => {
@@ -34,7 +34,7 @@ const myCurrency = (req, res, next) => {
 };
 
 const currencyDetail = (req, res, next) => {
-    let uid = req.user.uid || 8039759;
+    let uid = req.user.uid;
     let page = 1;
     let limit = 10;
 
@@ -57,7 +57,7 @@ const currencyDetail = (req, res, next) => {
 };
 
 let ajaxCurrencyDetail = (req, res, next) => {
-    let uid = req.user.uid || 8039759;
+    let uid = req.user.uid;
     let page = req.body.page || 1;
     let limit = 10;
 

@@ -10,8 +10,8 @@ const headerModel = require('../../../doraemon/models/header'); // 头部model
 const orderDetailModel = require('../models/orderDetail');
 
 const orderDetailData = (req, res, next) => {
-    let uid = req.user.uid || 8039759;
-    let orderCode = req.query.order_code || 1618346759;
+    let uid = req.user.uid;
+    let orderCode = req.query.order_code;
 
     orderDetailModel.orderDetailData(uid, orderCode).then(result => {
 
@@ -31,8 +31,8 @@ const orderDetailData = (req, res, next) => {
 
 // 删除订单
 const delOrder = (req, res, next) => {
-    let orderCode = req.query.order_code || 1612441404;
-    let uid = req.user.uid || 8039759;
+    let orderCode = req.query.order_code;
+    let uid = req.user.uid;
 
     orderDetailModel.delOrder(orderCode, uid).then((result) => {
         res.json(result);
@@ -41,8 +41,8 @@ const delOrder = (req, res, next) => {
 
 // 再次购买
 const readdData = (req, res, next) => {
-    let orderCode = req.query.order_code || 1606343171;
-    let uid = req.user.uid || 8039759;
+    let orderCode = req.query.order_code;
+    let uid = req.user.uid;
 
     orderDetailModel.readdData(orderCode, uid).then((result) => {
         res.json(result);
@@ -51,8 +51,8 @@ const readdData = (req, res, next) => {
 
 // 取消订单
 const cancelOrder = (req, res, next) => {
-    let orderCode = req.query.order_code || 1606343171;
-    let uid = req.user.uid || 8039759;
+    let orderCode = req.query.order_code;
+    let uid = req.user.uid;
     let reasonId = 1;
 
     orderDetailModel.cancelOrder(orderCode, uid, reasonId).then((result) => {

@@ -33,8 +33,8 @@ const suggestData = (req, res, next) => {
 };
 
 const upAndDown = (req, res, next) => {
-    let uid = req.user.uid || 8039759;
-    let udid = req.sessionID || 'yoho';
+    let uid = req.user.uid;
+    let udid = req.sessionID;
     let reliable = req.body.reliable || 1;
     let suggestId = req.body.suggest_id;
 
@@ -60,7 +60,7 @@ const suggestSub = (req, res) => {
 };
 
 const saveSuggest = (req, res, next) => {
-    let uid = req.user.uid || 8039759;
+    let uid = req.user.uid;
     let content = req.body.content;
     let image = req.body.image;
     let suggestType = req.body.suggest_type || 2;

@@ -36,19 +36,19 @@ router.get('/QRcode/:id', personalController.QRcode);
 /* 个人中心地址管理相关路由 */
 router.get('/address', auth, addressController.address); // 地址管理页面
 router.get('/addressAct', auth, addressController.addressAct); // 地址添加页面
-router.get('/addressAct/:id', addressController.addressAct); // 地址添加修改页面
+router.get('/addressAct/:id', auth, addressController.addressAct); // 地址添加修改页面
 router.post('/saveAddress', addressController.saveAddress); // 新增或者保存地址
 router.post('/defaultAddress', addressController.defaultAddress); // 设置默认地址
 router.post('/delAddress', addressController.delAddress); // 删除地址
-router.get('/locationList', addressController.locationList); // 异步获取三级地址数据
+router.get('/locationList', auth, addressController.locationList); // 异步获取三级地址数据
 
 /* 个人中心订单相关路由 */
-router.get('/orders', orderController.order); // 订单列表
-router.get('/getOrders', orderController.getOrders); // 获取订单列表数据
-router.get('/orderDetail', orderDetailController.orderDetailData); // 订单详情页
-router.get('/delOrder', orderDetailController.delOrder); // 删除订单
-router.get('/readd', orderDetailController.readdData); // 再次购买
-router.get('/cancelOrder', orderDetailController.cancelOrder); // 取消订单
+router.get('/orders', auth, orderController.order); // 订单列表
+router.get('/getOrders', auth, orderController.getOrders); // 获取订单列表数据
+router.get('/orderDetail', auth, orderDetailController.orderDetailData); // 订单详情页
+router.get('/delOrder', auth, orderDetailController.delOrder); // 删除订单
+router.get('/readd', auth, orderDetailController.readdData); // 再次购买
+router.get('/cancelOrder', auth, orderDetailController.cancelOrder); // 取消订单
 
 router.get('/', homeController.index); // 个人中心首页
 router.get('/mydetails', auth, homeController.myDetails); // 个人基本资料页面
@@ -56,18 +56,18 @@ router.get('/mydetails', auth, homeController.myDetails); // 个人基本资料
 router.get('/grade', auth, homeController.grade); // 会员等级页
 router.get('/privilege', homeController.preferential); // 会员特权列表页
 
-router.get('/mycurrency', currencyController.myCurrency); // yoho币总数
-router.get('/currencyDetail', currencyController.currencyDetail); // yoho币列表
-router.post('/ajaxCurrencyDetail', currencyController.ajaxCurrencyDetail); // yoho币列表
+router.get('/mycurrency', auth, currencyController.myCurrency); // yoho币总数
+router.get('/currencyDetail', auth, currencyController.currencyDetail); // yoho币列表
+router.post('/ajaxCurrencyDetail', auth, currencyController.ajaxCurrencyDetail); // yoho币列表
 
 router.get('/record', auth, homeController.record); // 浏览记录
 router.get('/recordContent', homeController.recordContent); // 浏览记录
 router.get('/delRecord', homeController.delRecord); // 删除浏览记录
 
-router.get('/favorite', favorite.favorite);// 我的收藏
-router.get('/favProduct', favorite.favProduct);// 收藏的商品
-router.get('/favBrand', favorite.favfavBrand);// 收藏的品牌
-router.post('/favoriteDel', favorite.favoriteDelete);// 取消收藏
+router.get('/favorite', auth, favorite.favorite);// 我的收藏
+router.get('/favProduct', auth, favorite.favProduct);// 收藏的商品
+router.get('/favBrand', auth, favorite.favfavBrand);// 收藏的品牌
+router.post('/favoriteDel', auth, favorite.favoriteDelete);// 取消收藏
 
 // 优惠券
 router.use('/coupons', auth, coupons.index);