Authored by 郭成尧

qs-params

... ... @@ -19,9 +19,9 @@ let headerData = headerModel.setNav({
});
/**
* hotfix Android 6.5.5 版本隐藏设置提醒按钮
* hotfix ios 6.5.5 版本隐藏设置提醒按钮
*/
const _androidHideRemindBtn = (products) => {
const _iosHideRemindBtn = (products) => {
return _.map(products, goods => {
goods.hideRemind = true;
return goods;
... ... @@ -239,8 +239,8 @@ const indexData = (req, res, next) => {
return fetchProductList(activityInfo, uid).then((resultProducts) => {
result.products = resultProducts;
if (req.query.app_version === '6.5.5' && req.query.client_type === 'android') {
result.products = _androidHideRemindBtn(resultProducts);
if (/^6.5.5/.test(req.query.app_version) && req.query.client_type === 'iphone') {
result.products = _iosHideRemindBtn(resultProducts);
}
res.json(result);
... ... @@ -271,8 +271,8 @@ const getProductList = (req, res, next) => {
};
return fetchProductList(activityInfo, uid).then(resultProducts => {
if (req.query.app_version === '6.5.5' && req.query.client_type === 'android') {
resultProducts = _androidHideRemindBtn(resultProducts);
if (/^6.5.5/.test(req.query.app_version) && req.query.client_type === 'iphone') {
resultProducts = _iosHideRemindBtn(resultProducts);
}
res.json({products: resultProducts});
}).catch(error => {
... ...
... ... @@ -11,6 +11,7 @@ let $ = require('yoho-jquery'),
loading = require('plugin/loading'),
lazyload = require('yoho-jquery-lazyload'),
tip = require('plugin/tip');
let qs = require('yoho-qs');
loading.init($(document.body));
... ... @@ -243,16 +244,22 @@ seckillObj = {
refreshProductList: function(activityId, startTime) {
let self = this;
let url = '/product/seckill/get-product-list';
let reqData = {
uid: yoho.isLogin(), // only app use;
activityId: activityId,
startTime: startTime
};
if (qs.app_version && qs.client_type) {
reqData.app_version = qs.app_version;
reqData.client_type = qs.client_type;
}
loading.showLoading();
self.el.$navList.toggleClass('fix-top', false);
$.ajax({
url: url,
data: {
uid: yoho.isLogin(), // only app use;
activityId: activityId,
startTime: startTime
},
data: reqData,
success: function(data) {
data = $.extend(data, {isApp: yoho.isApp});
$('.product-list').html(self.listTemplate(data));
... ...