fe / YOHOBUYWAP · Commits

Go to a project

Authored by yangyang
Commit 3cac309d0b7d5d48957d34ffbddc2def4fce7ba7 1 parent 20b22bab

new页面时间显示格式，new页面分类列表和新品上架列表顺序

Inline Side-by-side
Showing 2 changed files with 13 additions and 13 deletions
@@ -102,6 +102,10 @@ class HelperSearch @@ -102,6 +102,10 @@ class HelperSearch
102 if (isset($data['discount']['discount']) && !empty($data['discount']['discount'])) { 102 if (isset($data['discount']['discount']) && !empty($data['discount']['discount'])) {
103 $result['leftContent'][]['allDiscount'] = self::getDiscount($data['discount']['discount']); 103 $result['leftContent'][]['allDiscount'] = self::getDiscount($data['discount']['discount']);
104 } 104 }
  105 + //一周新品上架
  106 + if (isset($data['recent']['recent']) && !empty($data['recent']['recent'])) {
  107 + $result['leftContent'][]['newSales'] = self::recentShelve($data['recent']['recent']);
  108 + }
105 //分类条件(搜索页面) 109 //分类条件(搜索页面)
106 if (isset($data['sort']['sort'])) { 110 if (isset($data['sort']['sort'])) {
107 //分类条件(搜索页面) 111 //分类条件(搜索页面)
@@ -112,10 +116,7 @@ class HelperSearch @@ -112,10 +116,7 @@ class HelperSearch
112 $result['leftContent'][]['allSort'] = self::groupSort($data['sort']['sort']); 116 $result['leftContent'][]['allSort'] = self::groupSort($data['sort']['sort']);
113 } 117 }
114 } 118 }
115 - //一周新品上架  
116 - if (isset($data['recent']['recent']) && !empty($data['recent']['recent'])) {  
117 - $result['leftContent'][]['newSales'] = self::recentShelve($data['recent']['recent']);  
118 - } 119 +
119 //品牌banner 120 //品牌banner
120 $result['brandBanner'] = isset($data['brand']) && !empty($data['brand']) ? self::getBannerFormat($data['brand'], $options['brandBanner']) : array(); 121 $result['brandBanner'] = isset($data['brand']) && !empty($data['brand']) ? self::getBannerFormat($data['brand'], $options['brandBanner']) : array();
121 //总记录数 122 //总记录数
@@ -1096,7 +1097,7 @@ class HelperSearch @@ -1096,7 +1097,7 @@ class HelperSearch
1096 $data[$i]['active'] = true; 1097 $data[$i]['active'] = true;
1097 } 1098 }
1098 $data[$i]['href'] = self::buildUrl($query); 1099 $data[$i]['href'] = self::buildUrl($query);
1099 - $data[$i]['name'] = $k; 1100 + $data[$i]['name'] = date('m月d日', strtotime($k));
1100 $i++; 1101 $i++;
1101 } 1102 }
1102 $result = array( 1103 $result = array(
@@ -1104,6 +1105,7 @@ class HelperSearch @@ -1104,6 +1105,7 @@ class HelperSearch
1104 ); 1105 );
1105 unset($data); 1106 unset($data);
1106 unset($query); 1107 unset($query);
  1108 +
1107 return $result; 1109 return $result;
1108 } 1110 }
1109 /** 1111 /**
@@ -42,15 +42,13 @@ class SaleModel @@ -42,15 +42,13 @@ class SaleModel
42 } 42 }
43 $special = $specialInfo['data']; 43 $special = $specialInfo['data'];
44 44
45 - //Sale首页 banner数据  
46 - $data['saleBanner']['bannerHeight'] = $special['banner'][0]['height'];  
47 - $data['saleBanner']['img'] = $special['banner'][0]['img'];  
48 - $data['saleTitle']['name'] = '全部商品';  
49 - $data['saleTitle']['count'] = isset($data['totalCount']) ? $data['totalCount'] : 0; 45 + //Sale首页 banner数据
  46 + $data['saleBanner']['bannerHeight'] = $special['banner'][0]['height'];
  47 + $data['saleBanner']['img'] = $special['banner'][0]['img'];
  48 + $data['saleTitle']['name'] = '全部商品';
  49 + $data['saleTitle']['count'] = isset($data['totalCount']) ? $data['totalCount'] : 0;
50 } 50 }
51 -  
52 -  
53 - 51 +
54 //获取广告位数据 52 //获取广告位数据
55 if (isset($special['left_ad_code'])) { 53 if (isset($special['left_ad_code'])) {
56 $nodeContent = HelperSearch::getNodeContent($special['left_ad_code']); 54 $nodeContent = HelperSearch::getNodeContent($special['left_ad_code']);