Authored by 郭成尧

Merge branch 'hotfix/agelevel' into 'master'

Hotfix/agelevel



See merge request !1180
{
"name": "yohobuywap-node",
"version": "6.3.1",
"version": "6.3.2",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
let tip = require('plugin/tip'),
moment = require('moment'),
Swiper = require('yoho-swiper');
// IScroll = require('yoho-iscroll');
... ... @@ -225,8 +224,13 @@ function removeByValue(arr, val) {
}
}
function _formatDay(day) {
return moment(day).format('MM月DD日 HH:mm');
function _formatDay(date) {
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
let h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
let m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
return `${M}${D} ${h}:${m}`;
}
function pullPicBig(cIndex) {
... ...
... ... @@ -16,7 +16,7 @@ let $listNav = $('#list-nav'); // 筛选项列表
*/
let productListWithFilter = new ProductListWithFilter({
shop_id: shopId
});
}, 'product/search/shop/goods');
productListWithFilter.scrollActived = false;
... ...
... ... @@ -75,7 +75,7 @@ $.each($goodsContainer, function(index, elem) {
switch (parseInt($(elem).data('type'), 10)) {
case 0:
url = '/product/search/search';
url = '/product/search/shop/goods';
Object.assign(data, {
shop_id: shopId,
order: $(elem).data('order')
... ... @@ -111,7 +111,7 @@ $.each($goodsContainer, function(index, elem) {
*/
$.ajax({
type: 'GET',
url: '/product/search/search',
url: '/product/search/shop/goods',
xhrFields: {
withCredentials: true
},
... ...
... ... @@ -213,6 +213,10 @@
padding: 0 25px;
background-color: #fff;
.swiper-wrapper {
display: block !important;
}
.swiper-slide {
border-radius: 10px;
overflow: hidden;
... ...