Merge branch 'hotfix/agelevel' into 'master'

Hotfix/agelevel



See merge request !1180

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.3.1",
+  "version": "6.3.2",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

 let tip = require('plugin/tip'),
 let tip = require('plugin/tip'),
-    moment = require('moment'),
     Swiper = require('yoho-swiper');
     Swiper = require('yoho-swiper');
 
 
     // IScroll = require('yoho-iscroll');
     // 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) {
 function pullPicBig(cIndex) {

@@ -16,7 +16,7 @@ let $listNav = $('#list-nav'); // 筛选项列表
  */
  */
 let productListWithFilter = new ProductListWithFilter({
 let productListWithFilter = new ProductListWithFilter({
     shop_id: shopId
     shop_id: shopId
-});
+}, 'product/search/shop/goods');
 
 
 productListWithFilter.scrollActived = false;
 productListWithFilter.scrollActived = false;
 
 

@@ -75,7 +75,7 @@ $.each($goodsContainer, function(index, elem) {
 
 
     switch (parseInt($(elem).data('type'), 10)) {
     switch (parseInt($(elem).data('type'), 10)) {
         case 0:
         case 0:
-            url = '/product/search/search';
+            url = '/product/search/shop/goods';
             Object.assign(data, {
             Object.assign(data, {
                 shop_id: shopId,
                 shop_id: shopId,
                 order: $(elem).data('order')
                 order: $(elem).data('order')
@@ -111,7 +111,7 @@ $.each($goodsContainer, function(index, elem) {
  */
  */
 $.ajax({
 $.ajax({
     type: 'GET',
     type: 'GET',
-    url: '/product/search/search',
+    url: '/product/search/shop/goods',
     xhrFields: {
     xhrFields: {
         withCredentials: true
         withCredentials: true
     },
     },

@@ -213,6 +213,10 @@
         padding: 0 25px;
         padding: 0 25px;
         background-color: #fff;
         background-color: #fff;
 
 
+        .swiper-wrapper {
+            display: block !important;
+        }
+
         .swiper-slide {
         .swiper-slide {
             border-radius: 10px;
             border-radius: 10px;
             overflow: hidden;
             overflow: hidden;