fe / YOHOBUYWAP · Commits

Go to a project

Authored by hf
Commit 68ecc2cbf68bb3fc80f19724a3894324913c8558 1 parent 7e3e8cde

fixes bug to maylike data show

Inline Side-by-side
Showing 4 changed files with 39 additions and 67 deletions
1 <?php 1 <?php
2 2
3 namespace Plugin\DataProcess; 3 namespace Plugin\DataProcess;
  4 +
4 use Plugin\Helpers; 5 use Plugin\Helpers;
5 6
6 /** 7 /**
@@ -19,8 +20,7 @@ class ListProcess @@ -19,8 +20,7 @@ class ListProcess
19 { 20 {
20 $result = array(); 21 $result = array();
21 22
22 - if(isset($data['product_list']))  
23 - { 23 + if (isset($data['product_list'])) {
24 $result['new'] = self::getProductData($data['product_list']); 24 $result['new'] = self::getProductData($data['product_list']);
25 } 25 }
26 if ($returnFilter && isset($data['filter'])) { 26 if ($returnFilter && isset($data['filter'])) {
@@ -28,7 +28,6 @@ class ListProcess @@ -28,7 +28,6 @@ class ListProcess
28 } 28 }
29 29
30 return $result; 30 return $result;
31 -  
32 } 31 }
33 32
34 /** 33 /**
@@ -47,7 +46,6 @@ class ListProcess @@ -47,7 +46,6 @@ class ListProcess
47 } 46 }
48 47
49 return $products; 48 return $products;
50 -  
51 } 49 }
52 50
53 /** 51 /**
@@ -60,23 +58,21 @@ class ListProcess @@ -60,23 +58,21 @@ class ListProcess
60 public static function getFilterData($data, $gender = '1,2,3') 58 public static function getFilterData($data, $gender = '1,2,3')
61 { 59 {
62 // 过滤条件数据 60 // 过滤条件数据
63 - $filters = array('classify'=>array()); 61 + $filters = array('classify' => array());
64 62
65 // 返回数据中有没有gender时要添加gender 63 // 返回数据中有没有gender时要添加gender
66 // $data['gender'] = array('2,3'=>'GIRLS','1,3'=>'BOYS'); 64 // $data['gender'] = array('2,3'=>'GIRLS','1,3'=>'BOYS');
67 65
68 $num = 1; 66 $num = 1;
69 foreach ($data as $key => $val) { 67 foreach ($data as $key => $val) {
70 - if(empty($val))  
71 - { 68 + if (empty($val)) {
72 continue; 69 continue;
73 } 70 }
74 if (!is_callable("self::$key")) { 71 if (!is_callable("self::$key")) {
75 continue; 72 continue;
76 } 73 }
77 $build = self::$key($val, $gender); 74 $build = self::$key($val, $gender);
78 - if($num === 1)  
79 - { 75 + if ($num === 1) {
80 $build['active'] = true; 76 $build['active'] = true;
81 } 77 }
82 78
@@ -88,7 +84,6 @@ class ListProcess @@ -88,7 +84,6 @@ class ListProcess
88 self::sortArrByField($filters['classify'], 'sort_col'); 84 self::sortArrByField($filters['classify'], 'sort_col');
89 85
90 return $filters; 86 return $filters;
91 -  
92 } 87 }
93 88
94 private static function brand($data) 89 private static function brand($data)
@@ -167,7 +162,7 @@ class ListProcess @@ -167,7 +162,7 @@ class ListProcess
167 foreach ($data as $key => $one) { 162 foreach ($data as $key => $one) {
168 $discount = array(); 163 $discount = array();
169 $discount['dataId'] = $key; 164 $discount['dataId'] = $key;
170 - $discount['name'] = $one['name'] .'折商品'; 165 + $discount['name'] = $one['name'] . '折商品';
171 166
172 $result['subs'][] = $discount; 167 $result['subs'][] = $discount;
173 } 168 }
@@ -200,7 +195,9 @@ class ListProcess @@ -200,7 +195,9 @@ class ListProcess
200 195
201 // 处理选中状态 196 // 处理选中状态
202 foreach ($result['subs'] as &$val) { 197 foreach ($result['subs'] as &$val) {
203 - $val['dataId'] === $gender && $val['chosed'] = true; 198 + if ($val['dataId'] === $gender) {
  199 + $val['chosed'] = true;
  200 + }
204 } 201 }
205 202
206 return $result; 203 return $result;
@@ -222,23 +219,24 @@ class ListProcess @@ -222,23 +219,24 @@ class ListProcess
222 ) 219 )
223 ); 220 );
224 221
  222 + $category = array();
225 foreach ($data as $one) { 223 foreach ($data as $one) {
226 - $category = array(); 224 +
227 $category['dataId'] = isset($one['relation_parameter']) ? $one['relation_parameter']['sort'] : 0; 225 $category['dataId'] = isset($one['relation_parameter']) ? $one['relation_parameter']['sort'] : 0;
228 $category['name'] = $one['category_name']; 226 $category['name'] = $one['category_name'];
229 227
230 - /*// 子品类（目前h5不支持二级）  
231 - if(isset($one['sub']))  
232 - {  
233 - $category['subs'] = array();  
234 - foreach ($one['sub'] as $single) {  
235 - $subitem = array();  
236 - $subitem['dataId'] = $single['category_id'];  
237 - $subitem['name'] = $single['category_name']; 228 + /* // 子品类（目前h5不支持二级）
  229 + if(isset($one['sub']))
  230 + {
  231 + $category['subs'] = array();
  232 + foreach ($one['sub'] as $single) {
  233 + $subitem = array();
  234 + $subitem['dataId'] = $single['category_id'];
  235 + $subitem['name'] = $single['category_name'];
238 236
239 - $category['subs'][] = $subitem;  
240 - }  
241 - }*/ 237 + $category['subs'][] = $subitem;
  238 + }
  239 + } */
242 240
243 $result['subs'][] = $category; 241 $result['subs'][] = $category;
244 } 242 }
@@ -262,8 +260,9 @@ class ListProcess @@ -262,8 +260,9 @@ class ListProcess
262 ) 260 )
263 ); 261 );
264 262
  263 + $price = array();
265 foreach ($data as $key => $one) { 264 foreach ($data as $key => $one) {
266 - $price = array(); 265 +
267 $price['dataId'] = $key; 266 $price['dataId'] = $key;
268 $price['name'] = $one; 267 $price['name'] = $one;
269 268
@@ -289,9 +288,10 @@ class ListProcess @@ -289,9 +288,10 @@ class ListProcess
289 ) 288 )
290 ); 289 );
291 290
  291 + $size = array();
292 foreach ($data as $one) { 292 foreach ($data as $one) {
293 - $size = array();  
294 - $size['dataId'] = $one['size_id']; 293 +
  294 + $size['dataId'] = $one['size_id'];
295 $size['name'] = $one['size_name']; 295 $size['name'] = $one['size_name'];
296 296
297 $result['subs'][] = $size; 297 $result['subs'][] = $size;
@@ -307,7 +307,8 @@ class ListProcess @@ -307,7 +307,8 @@ class ListProcess
307 * @param string $field 字段名称 307 * @param string $field 字段名称
308 * @param boolean $desc 时候降序排列，默认为false 308 * @param boolean $desc 时候降序排列，默认为false
309 */ 309 */
310 - private static function sortArrByField(&$array, $field, $desc = false){ 310 + private static function sortArrByField(&$array, $field, $desc = false)
  311 + {
311 $fieldArr = array(); 312 $fieldArr = array();
312 foreach ($array as $k => $v) { 313 foreach ($array as $k => $v) {
313 $fieldArr[$k] = $v[$field]; 314 $fieldArr[$k] = $v[$field];
@@ -315,4 +316,5 @@ class ListProcess @@ -315,4 +316,5 @@ class ListProcess
315 $sort = $desc == false ? SORT_ASC : SORT_DESC; 316 $sort = $desc == false ? SORT_ASC : SORT_DESC;
316 array_multisort($fieldArr, $sort, $array); 317 array_multisort($fieldArr, $sort, $array);
317 } 318 }
  319 +
318 } 320 }
@@ -19,7 +19,7 @@ class HomeController extends AbstractAction @@ -19,7 +19,7 @@ class HomeController extends AbstractAction
19 public function indexAction() 19 public function indexAction()
20 { 20 {
21 // 目前跳到老站 21 // 目前跳到老站
22 - $this->go(OLD_MAIN . '/home'); 22 + // $this->go(OLD_MAIN . '/home');
23 } 23 }
24 24
25 } 25 }
@@ -16,6 +16,6 @@ class IndexController extends AbstractAction @@ -16,6 +16,6 @@ class IndexController extends AbstractAction
16 public function indexAction() 16 public function indexAction()
17 { 17 {
18 // 跳转到老版 18 // 跳转到老版
19 - $this->go(OLD_MAIN . '/cart/index/index'); 19 + // $this->go(OLD_MAIN . '/cart/index/index');
20 } 20 }
21 } 21 }
@@ -36,11 +36,11 @@ class RecomController extends AbstractAction @@ -36,11 +36,11 @@ class RecomController extends AbstractAction
36 $gender = $this->get('gender', '1,3'); 36 $gender = $this->get('gender', '1,3');
37 // 女 37 // 女
38 if ($gender === '2,3') { 38 if ($gender === '2,3') {
39 - $recom = RecomData::mayLike('2,3', 2); 39 + $recom = RecomData::mayLike('2,3', 2, $page);
40 } 40 }
41 // 男 41 // 男
42 else { 42 else {
43 - $recom = RecomData::mayLike('1,3', 1); 43 + $recom = RecomData::mayLike('1,3', 1, $page);
44 } 44 }
45 45
46 /* 判断是否有内容返回 */ 46 /* 判断是否有内容返回 */
@@ -59,6 +59,9 @@ class RecomController extends AbstractAction @@ -59,6 +59,9 @@ class RecomController extends AbstractAction
59 $data['goods'][] = Helpers::formatProduct($value, true, true, true, 276, 366); 59 $data['goods'][] = Helpers::formatProduct($value, true, true, true, 276, 366);
60 } 60 }
61 $this->_view->display('maylike', $data); 61 $this->_view->display('maylike', $data);
  62 +
  63 + exit();
  64 +
62 } while (false); 65 } while (false);
63 66
64 echo ' '; 67 echo ' ';
@@ -101,6 +104,7 @@ class RecomController extends AbstractAction @@ -101,6 +104,7 @@ class RecomController extends AbstractAction
101 $data['goods'][] = Helpers::formatProduct($value, true); 104 $data['goods'][] = Helpers::formatProduct($value, true);
102 } 105 }
103 $this->_view->display('maylike', $data); 106 $this->_view->display('maylike', $data);
  107 + exit();
104 108
105 } while (false); 109 } while (false);
106 110
@@ -179,45 +183,11 @@ class RecomController extends AbstractAction @@ -179,45 +183,11 @@ class RecomController extends AbstractAction
179 // } 183 // }
180 184
181 $this->_view->display('maylikelife', $data); 185 $this->_view->display('maylikelife', $data);
  186 + exit();
182 187
183 } while (false); 188 } while (false);
184 189
185 echo ' '; 190 echo ' ';
186 } 191 }
187 192
188 -// /**  
189 -// * 你可能喜欢的  
190 -// *  
191 -// * 备注：  
192 -// * 调用位于男生(BOYS),女生(GIRLS),潮童(KIDS),创意生活(LifeStyle)页面的底部.  
193 -// * 调用方式为AJAX,需要用JS遍历该数据集,替换图片URL地址中的{width},{height},{mode}.  
194 -// * JS替换示例: str.replace("{width}", 300).replace("{height}", 300).replace("{mode}", 2);  
195 -// *  
196 -// * @param string gender "1,3"表示男, "2,3"表示女, 当channel为3时该参数可不传  
197 -// * @param string channel 1表示男, 2表示女, 3表示潮童  
198 -// * @return json  
199 -// */  
200 -// public function maylikeAction()  
201 -// {  
202 -// if ($this->isAjax()) {  
203 -// $data = '';  
204 -// $gender = $this->get('gender', '1,3');  
205 -// $channel = $this->get('channel', '1');  
206 -//  
207 -// switch (strval($channel)) {  
208 -// case '1': // 男(Boys)  
209 -// case '2': // 女(Girls)  
210 -// $data = RecomData::mayLike($gender, $channel);  
211 -// break;  
212 -// case '3': // 潮童(Kids)  
213 -// $data = RecomData::mayLikeKids();  
214 -// break;  
215 -// case '4': // 创意生活(LifeStyle)  
216 -// $data = RecomData::mayLikeLifestyle();  
217 -// break;  
218 -// }  
219 -//  
220 -// $this->echoJson($data);  
221 -// }  
222 -// }  
223 } 193 }