Merge branch 'release/5.4' into 'grey'

新品到着最新排序要求不传 order 参数



See merge request !189

@@ -9,6 +9,7 @@ const co = Promise.coroutine;
 const headerModel = require('../../../doraemon/models/header'); // 头部model
 const headerModel = require('../../../doraemon/models/header'); // 头部model
 const _ = require('lodash');
 const _ = require('lodash');
 const productProcess = require(`${utils}/product-process`);
 const productProcess = require(`${utils}/product-process`);
+const stdntMrktModel = require('../models/student-market');
 
 
 const userAcquireStatus = (uid, couponIds) => {
 const userAcquireStatus = (uid, couponIds) => {
     if (couponIds != '') {
     if (couponIds != '') {
@@ -185,3 +186,25 @@ exports.index = (req, res, next) => {
         }).catch(next);
         }).catch(next);
     });
     });
 };
 };
+
+/**
+ * 新版学生营销页面
+ */
+exports.newIndex = (req, res, next) => {
+    stdntMrktModel.getStudentGoods({
+        limit: req.query.limit || '60',
+        stocknumber: req.query.stocknumber || '1'
+    }).then(result => {
+        let title = '有货学生专享优惠';
+
+        res.render('student-market-new', {
+            title: title,
+            pageHeader: headerModel.setNav({
+                navTitle: title,
+                navBtn: true
+            }),
+            page: 'student-market-new',
+            goods: result
+        });
+    }).catch(next);
+};

+/*
+ * @Author: Targaryen
+ * @Date: 2017-01-16 13:57:34
+ * @Last Modified by: Targaryen
+ * @Last Modified time: 2017-01-16 16:02:41
+ */
+// 新版学生营销页面
+
+'use strict';
+
+const utils = '../../../utils';
+const productProcess = require(`${utils}/product-process`);
+const api = global.yoho.API;
+const _ = require('lodash');
+
+const getStudentGoods = (params) => {
+    return api.get('', {
+        method: 'app.student.aggBrand',
+        limit: params.limit,
+        stocknumber: params.stocknumber,
+    }).then(result => {
+        return productProcess.processProductList(_.get(result, 'data.product_list', []));
+    });
+};
+
+module.exports = {
+    getStudentGoods
+};

@@ -72,6 +72,9 @@ router.get('/student/verify', student.isLogin, student.verifystudent);
 
 
 router.get('/student/detail/:type', student.getUser, student.detail);
 router.get('/student/detail/:type', student.getUser, student.detail);
 
 
+// 新版学生营销页面
+router.get('/studentnew', studentMarket.newIndex);
+
 // router.get('/student/getCoupons',student.getCoupons)
 // router.get('/student/getCoupons',student.getCoupons)
 
 
 router.get('/live', live.index);
 router.get('/live', live.index);

+<div id="goods-container" class="goods-container">
+    <div class="default-goods container  clearfix">
+        {{# goods}} {{> common/goods}} {{/ goods}}
+    </div>
+</div>

@@ -3,7 +3,7 @@
     <div class="filter-nav-wrap" data-sticky>
     <div class="filter-nav-wrap" data-sticky>
         {{> common/filter-nav 
         {{> common/filter-nav 
             firstOrderName='最新'
             firstOrderName='最新'
-            firstOrderValue='s_t_desc'}}
+            firstOrderValue=''}}
         <div id="js-filter"></div>
         <div id="js-filter"></div>
     </div>
     </div>
 
 

+var lazyLoad = require('yoho-jquery-lazyload');
+
+require('../common');
+lazyLoad($('img.lazy'));

@@ -822,7 +822,7 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
         }
         }
 
 
     }
     }
-
+    return false; // 阻止加入购物车按钮冒泡
 });
 });
 
 
 $('.close').on('click', function() {
 $('.close').on('click', function() {

@@ -61,6 +61,7 @@ plusstar = {
             if (!window._yas || !window._yas.sendCustomInfo) {
             if (!window._yas || !window._yas.sendCustomInfo) {
                 return;
                 return;
             }
             }
+
             // 点击潮流优选上方的TAB按钮时
             // 点击潮流优选上方的TAB按钮时
             window._yas.sendCustomInfo({
             window._yas.sendCustomInfo({
                 op: 'YB_FASHION_TAB_C',
                 op: 'YB_FASHION_TAB_C',
@@ -135,7 +136,7 @@ plusstar = {
                         F_NAME: '焦点图',
                         F_NAME: '焦点图',
                         F_URL: encodeURIComponent($dom.find('a').attr('href').replace(/\"/g, '\\"')),
                         F_URL: encodeURIComponent($dom.find('a').attr('href').replace(/\"/g, '\\"')),
                         F_INDEX: 1,
                         F_INDEX: 1,
-                        I_INDEX: index % 2 + 1// banner，li是双倍的
+                        I_INDEX: index
                     })
                     })
                 }, true);
                 }, true);
             } else if ($(event.target).closest('.speck-title-image a').length > 0) {
             } else if ($(event.target).closest('.speck-title-image a').length > 0) {
@@ -211,6 +212,7 @@ plusstar = {
                 success: function(data) {
                 success: function(data) {
                     resourcesTp[tabId] = data;
                     resourcesTp[tabId] = data;
                     execResData(data);
                     execResData(data);
+
                     // 页面中下拉曝光
                     // 页面中下拉曝光
                     setTimeout(function() {
                     setTimeout(function() {
                         if (window._yas && window._yas.sendAppLogs) {
                         if (window._yas && window._yas.sendAppLogs) {
@@ -252,12 +254,16 @@ plusstar = {
         }
         }
     },
     },
     resInit: function() {
     resInit: function() {
+        var that = this,
+            productSkns = '',
+            tabId;
+
         // 头部banner轮播
         // 头部banner轮播
         if ($('.banner-swiper').find('li').size() > 1) {
         if ($('.banner-swiper').find('li').size() > 1) {
             new Swiper('.banner-swiper', {
             new Swiper('.banner-swiper', {
                 lazyLoading: true,
                 lazyLoading: true,
                 lazyLoadingInPrevNext: true,
                 lazyLoadingInPrevNext: true,
-                loop: true,
+                loop: false,
                 autoplay: 3000,
                 autoplay: 3000,
                 autoplayDisableOnInteraction: false,
                 autoplayDisableOnInteraction: false,
                 paginationClickable: true,
                 paginationClickable: true,
@@ -267,16 +273,15 @@ plusstar = {
         }
         }
 
 
         $('.plusstar-resources').find('img.lazy').lazyload();
         $('.plusstar-resources').find('img.lazy').lazyload();
-        var productSkns = '';
         productSkns = $('.product-skns').val();
         productSkns = $('.product-skns').val();
+
         if (productSkns) {
         if (productSkns) {
             this.common.productSkns = productSkns.split(',');
             this.common.productSkns = productSkns.split(',');
         }
         }
 
 
         this.common.pageTotal = Math.ceil(this.common.productSkns.length / this.common.pagesize);
         this.common.pageTotal = Math.ceil(this.common.productSkns.length / this.common.pagesize);
 
 
-        var that = this;
-        var tabId = that.ParentLiDom.index() + 1;
+        tabId = that.ParentLiDom.index() + 1;
         setTimeout(function() {
         setTimeout(function() {
             $.ajax({
             $.ajax({
                 type: 'POST',
                 type: 'POST',

@@ -71,7 +71,7 @@ let searchView = function() {
      *  see: search-process.js
      *  see: search-process.js
      */
      */
     let searchParams = {
     let searchParams = {
-        order: 's_t_desc',
+        // order: 's_t_desc',
         filter: {
         filter: {
         },
         },
         page: {
         page: {

@@ -693,7 +693,7 @@
     top: 46px;
     top: 46px;
 
 
     &.call-by-fix {
     &.call-by-fix {
-        top: 80px;
+        top: 41PX;
         position: fixed;
         position: fixed;
         left: 0;
         left: 0;
     }
     }