Authored by 郭成尧

'订单tap切换'

@@ -51,7 +51,6 @@ exports.getOrders = (req, res, next) => { @@ -51,7 +51,6 @@ exports.getOrders = (req, res, next) => {
51 yh_channel: req.query.channel || 1, 51 yh_channel: req.query.channel || 1,
52 uid: req.user.uid || 8039759 // TODO 待删除 52 uid: req.user.uid || 8039759 // TODO 待删除
53 }).then(result => { 53 }).then(result => {
54 - console.log(result);  
55 res.render('order-content', { 54 res.render('order-content', {
56 layout: false, 55 layout: false,
57 orders: result 56 orders: result
@@ -231,14 +231,19 @@ const _getOrderStatus = (order, showLogistics) => { @@ -231,14 +231,19 @@ const _getOrderStatus = (order, showLogistics) => {
231 * @private 231 * @private
232 */ 232 */
233 const _getNavs = (type) => { 233 const _getNavs = (type) => {
234 - let navType = ['全部', '待付款', '待发货', '待收货']; 234 + let navType = {
  235 + 1: '全部',
  236 + 2: '待付款',
  237 + 3: '待发货',
  238 + 4: '待收货'
  239 + };
235 let nav = []; 240 let nav = [];
236 241
237 _.forEach(navType, (obj, key) => { 242 _.forEach(navType, (obj, key) => {
238 nav.push({ 243 nav.push({
239 name: obj, 244 name: obj,
240 typeId: key, 245 typeId: key,
241 - active: key === type, 246 + active: parseInt(key, 10) === parseInt(type, 10),
242 url: helpers.urlFormat('/home/orders', {type: key}) 247 url: helpers.urlFormat('/home/orders', {type: key})
243 }); 248 });
244 }); 249 });