fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 098424e23f0cb6b309024b26f675f29ca97d50f6 2 parents e9c64a6f 3e5aa6e2

Merge remote-tracking branch 'origin/hotfix/apichange-bug' into develop

Inline Side-by-side
Showing 2 changed files with 4 additions and 14 deletions
@@ -46,9 +46,9 @@ class HomeModel @@ -46,9 +46,9 @@ class HomeModel
46 const COOKIE_NAME_LIFESTYLE = 'lifestyle'; 46 const COOKIE_NAME_LIFESTYLE = 'lifestyle';
47 47
48 /* COOKIE标识访问的是男生频道底部Banner */ 48 /* COOKIE标识访问的是男生频道底部Banner */
49 - const CODE_NAME_BOYS_BOTTOM_BANNER = '8c48745a39373d621bf5fd80edf59b5e'; 49 + const CODE_NAME_BOYS_BOTTOM_BANNER = 'a2ec977c027d0cd9cdccb356ddf16b08';
50 /* COOKIE标识访问的是女生频道频道底部Banner */ 50 /* COOKIE标识访问的是女生频道频道底部Banner */
51 - const CODE_NAME_GIRLS_BOTTOM_BANNER = 'c63939b2ad458e9cb51147940c1da2e5'; 51 + const CODE_NAME_GIRLS_BOTTOM_BANNER = '8c8bd1b89a22e5895f05882e0825b493';
52 52
53 /** 53 /**
54 * 选择频道 54 * 选择频道
@@ -31,7 +31,7 @@ class DetailModel @@ -31,7 +31,7 @@ class DetailModel
31 31
32 if (is_numeric($productId) && is_numeric($goodsId)) { 32 if (is_numeric($productId) && is_numeric($goodsId)) {
33 // 调用服务 33 // 调用服务
34 - $baseInfo = DetailData::baseInfo($productId, $uid); 34 + $baseInfo = DetailData::baseInfo($productId, $uid);
35 35
36 // 判断商品是否在架 36 // 判断商品是否在架
37 if (empty($baseInfo['status'])) { 37 if (empty($baseInfo['status'])) {
@@ -69,16 +69,6 @@ class DetailModel @@ -69,16 +69,6 @@ class DetailModel
69 } 69 }
70 } 70 }
71 71
72 - // 新品标签  
73 - if (isset($baseInfo['isNew']) && $baseInfo['isNew'] === 'Y') {  
74 - $result['tags']['is_new'] = true;  
75 - }  
76 -  
77 - // NEW和SALE只显示一个  
78 - if (isset($result['tags']['is_new']) && isset($result['tags']['is_discount'])) {  
79 - unset($result['tags']['is_discount']);  
80 - }  
81 -  
82 // 商品价格 72 // 商品价格
83 if (isset($baseInfo['productPriceBo'])) { 73 if (isset($baseInfo['productPriceBo'])) {
84 $result['goodsPrice'] = array(); 74 $result['goodsPrice'] = array();
@@ -141,7 +131,7 @@ class DetailModel @@ -141,7 +131,7 @@ class DetailModel
141 $build = array(); 131 $build = array();
142 foreach ($baseInfo['commentBoWrapper']['commentBoList'] as $value) { 132 foreach ($baseInfo['commentBoWrapper']['commentBoList'] as $value) {
143 $build['userName'] = $value['nickName']; 133 $build['userName'] = $value['nickName'];
144 - $build['desc'] = $value['colorName'] . $value['sizeName']; 134 + $build['desc'] = $value['colorName'] . '/' . $value['sizeName'];
145 $build['content'] = $value['content']; 135 $build['content'] = $value['content'];
146 $build['time'] = $value['createTime']; 136 $build['time'] = $value['createTime'];
147 $result['feedbacks']['comments'][] = $build; 137 $result['feedbacks']['comments'][] = $build;