fe / YOHOBUYWAP · Commits

Go to a project

Authored by 徐祁xuqi
Commit fb86a3b7a1fe5f130026c33ec92d686ef80b7dd4 2 parents 182cb3cc 2fd640c4

Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5

Inline Side-by-side
Showing 18 changed files with 44 additions and 36 deletions
@@ -204,6 +204,7 @@ class PlusstarData @@ -204,6 +204,7 @@ class PlusstarData
204 $result['getArticleByBrand'] = array(); 204 $result['getArticleByBrand'] = array();
205 $param = Yohobuy::param(); 205 $param = Yohobuy::param();
206 $param['brand_id'] = $brandInfo['data']['brand_id']; 206 $param['brand_id'] = $brandInfo['data']['brand_id'];
  207 + $param['uid'] = $uid;
207 $param['udid'] = $udid; 208 $param['udid'] = $udid;
208 $param['limit'] = 3; 209 $param['limit'] = 3;
209 $param['client_type'] = $clientType; 210 $param['client_type'] = $clientType;
@@ -36,7 +36,7 @@ class SearchData @@ -36,7 +36,7 @@ class SearchData
36 // return 'http://101.200.31.165/yohosearch/search.json'; 36 // return 'http://101.200.31.165/yohosearch/search.json';
37 return 'http://192.168.10.64:8080/yohosearch/search.json'; 37 return 'http://192.168.10.64:8080/yohosearch/search.json';
38 case 'testing': 38 case 'testing':
39 - return 'http://192.168.102.216:8080/yohosearch/search.json'; 39 + return 'http://testing.yohoops.org/yohosearch/search.json';
40 case 'developer': 40 case 'developer':
41 default: 41 default:
42 return 'http://searchyohoops.yohobuy.com/yohosearch/search.json'; 42 return 'http://searchyohoops.yohobuy.com/yohosearch/search.json';
@@ -354,7 +354,7 @@ class Helpers @@ -354,7 +354,7 @@ class Helpers
354 $result['showTags'] = $showTag; 354 $result['showTags'] = $showTag;
355 $result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : ''; 355 $result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : '';
356 //逛详情页app跳转url处理 20160601 356 //逛详情页app跳转url处理 20160601
357 - $result['url'] = self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":0,"url":"' .'https:'. self::url('/info/index', array(), 'guang') . '","islogin":"N"}}'; 357 + $result['url'] = self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' .'https:'. self::url('/info/index', array(), 'guang') . '","islogin":"N"}}';
358 //$result['url'] = $articleData['url']; //$isApp ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang'); 358 //$result['url'] = $articleData['url']; //$isApp ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang');
359 359
360 if (strrpos($result['url'], 'feature.yoho.cn') || strrpos($result['url'], 'cdn.yoho.cn')) { 360 if (strrpos($result['url'], 'feature.yoho.cn') || strrpos($result['url'], 'cdn.yoho.cn')) {
@@ -389,7 +389,6 @@ class Helpers @@ -389,7 +389,6 @@ class Helpers
389 } 389 }
390 //编辑人员 app跳转url处理 20160601 390 //编辑人员 app跳转url处理 20160601
391 $articleData['author']['url'] = self::getUrlSafe($articleData['author']['url']).'&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['author']['author_id'] . '"},"share":"","id":' . $articleData['author']['author_id'] . ',"type":0,"islogin":"N","url":"' .'https:'.self::url('/author/index', array(), 'guang') . '"}}'; 391 $articleData['author']['url'] = self::getUrlSafe($articleData['author']['url']).'&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['author']['author_id'] . '"},"share":"","id":' . $articleData['author']['author_id'] . ',"type":0,"islogin":"N","url":"' .'https:'.self::url('/author/index', array(), 'guang') . '"}}';
392 - $articleData['author']['url'] = self::getUrlSafe($articleData['author']['url']);  
393 $result['author'] = $articleData['author']; 392 $result['author'] = $articleData['author'];
394 if (isset($result['author']['avatar'])) { 393 if (isset($result['author']['avatar'])) {
395 $result['author']['avatar'] = strtr($result['author']['avatar'], array('http://' => '//')); 394 $result['author']['avatar'] = strtr($result['author']['avatar'], array('http://' => '//'));
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -197,14 +197,13 @@ function reMarginFooter(fixedElement) { @@ -197,14 +197,13 @@ function reMarginFooter(fixedElement) {
197 (function() { 197 (function() {
198 var uid = getUid(), 198 var uid = getUid(),
199 hasParentBp = false, // 判断是否有父级埋点，如果有，点击子埋点，不处罚父埋点。 199 hasParentBp = false, // 判断是否有父级埋点，如果有，点击子埋点，不处罚父埋点。
200 - basicBpDataLength = 3;  
201 -  
202 - var sendBpData, 200 + basicBpDataLength = 3,
  201 + sendBpData,
203 bindBpEvent; 202 bindBpEvent;
204 203
205 uid = uid === 0 ? '' : uid; 204 uid = uid === 0 ? '' : uid;
206 205
207 - window._ozuid = uid;//暴露ozuid 206 + window._ozuid = uid; // 暴露ozuid
208 207
209 if (window._yas) { 208 if (window._yas) {
210 window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', uid, '', ''); 209 window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', uid, '', '');
@@ -219,25 +218,29 @@ function reMarginFooter(fixedElement) { @@ -219,25 +218,29 @@ function reMarginFooter(fixedElement) {
219 floor: bpIdArr[1], 218 floor: bpIdArr[1],
220 data: bpIdArr[2] 219 data: bpIdArr[2]
221 }; 220 };
222 -  
223 - window._yas.sendCustomInfo(jsonData, Boolean(parseInt(bpIdArr[3]) || 1)); 221 + if (window._yas.sendCustomInfo) {
  222 + window._yas.sendCustomInfo(jsonData, Boolean(parseInt(bpIdArr[3]) || 1));
  223 + }
224 } 224 }
225 }; 225 };
226 226
227 // 绑定埋点点击事件 227 // 绑定埋点点击事件
228 bindBpEvent = function() { 228 bindBpEvent = function() {
229 - $(document).off('click').on('click', '.buriedpoint', function(e) { 229 + $('.buriedpoint').off('click').on('click', function(e) {
230 var databpid = $(this).attr('data-bp-id') || '', 230 var databpid = $(this).attr('data-bp-id') || '',
231 - bpIdArr = databpid.split('_'),  
232 - hasParentBp = false; 231 + bpIdArr = databpid.split('_');
233 232
  233 + var $target = $(e.target),
  234 + partentBpLength = $target.parents('.buriedpoint').length;
234 235
235 - if ($(e.target).parents('.buriedpoint').length > 0) {  
236 - hasParentBp = true;  
237 - }  
238 if (!hasParentBp && bpIdArr && bpIdArr.length >= basicBpDataLength) { 236 if (!hasParentBp && bpIdArr && bpIdArr.length >= basicBpDataLength) {
239 sendBpData(bpIdArr); 237 sendBpData(bpIdArr);
240 } 238 }
  239 +
  240 + if ($target.hasClass('buriedpoint') && partentBpLength > 0 ||
  241 + partentBpLength >= 2) {
  242 + hasParentBp = true;
  243 + }
241 }); 244 });
242 }; 245 };
243 246
@@ -250,7 +253,7 @@ function reMarginFooter(fixedElement) { @@ -250,7 +253,7 @@ function reMarginFooter(fixedElement) {
250 $(document).on('shouldSendBpData', function(e, dataPbId) { 253 $(document).on('shouldSendBpData', function(e, dataPbId) {
251 var bpIdArr; 254 var bpIdArr;
252 255
253 - if (dataPbId && (dataPbId.length && dataPbId.length > 0)) { 256 + if (dataPbId && dataPbId.length && dataPbId.length > 0) {
254 hasParentBp = false; 257 hasParentBp = false;
255 bpIdArr = dataPbId.split('_'); 258 bpIdArr = dataPbId.split('_');
256 sendBpData(bpIdArr); 259 sendBpData(bpIdArr);
@@ -68,6 +68,7 @@ $('#likeBtn').on('touchstart', function() { @@ -68,6 +68,7 @@ $('#likeBtn').on('touchstart', function() {
68 68
69 $('#addtoCart').on('touchstart', function() { 69 $('#addtoCart').on('touchstart', function() {
70 $('.cart-bar').hide(); 70 $('.cart-bar').hide();
  71 +
71 productCode && chosePanel.setLimitGoodModeWithSknId(productCode, skn); 72 productCode && chosePanel.setLimitGoodModeWithSknId(productCode, skn);
72 chosePanel.show(); 73 chosePanel.show();
73 74
@@ -81,3 +82,8 @@ $('#addtoCart').on('touchstart', function() { @@ -81,3 +82,8 @@ $('#addtoCart').on('touchstart', function() {
81 82
82 return false; 83 return false;
83 }); 84 });
  85 +
  86 +$('#buyLimit').on('touchstart', function() {
  87 + tip.show('打开APP可抢购该商品哦~');
  88 + return false;
  89 +});
@@ -40,7 +40,6 @@ @@ -40,7 +40,6 @@
40 } 40 }
41 41
42 .owner-info { 42 .owner-info {
43 - border-bottom: 1px solid #e0e0e0;  
44 line-height: 1.5; 43 line-height: 1.5;
45 } 44 }
46 .range{ 45 .range{
@@ -68,12 +68,13 @@ @@ -68,12 +68,13 @@
68 text-overflow: ellipsis; 68 text-overflow: ellipsis;
69 white-space: nowrap; 69 white-space: nowrap;
70 } 70 }
  71 +
71 .brand-name { 72 .brand-name {
72 - width: 60%;  
73 - font-size: 28px; 73 + width: 40%;
74 overflow: hidden; 74 overflow: hidden;
75 text-overflow: ellipsis; 75 text-overflow: ellipsis;
76 white-space: nowrap; 76 white-space: nowrap;
  77 + position: absolute;
77 } 78 }
78 79
79 .brand-thumb { 80 .brand-thumb {
@@ -85,7 +86,6 @@ @@ -85,7 +86,6 @@
85 } 86 }
86 87
87 .entry { 88 .entry {
88 - width: 150px;  
89 color: #999; 89 color: #999;
90 font-size: 28px; 90 font-size: 28px;
91 float: right; 91 float: right;
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 14
15 .shop-back-img { 15 .shop-back-img {
16 height: 100%; 16 height: 100%;
  17 + width: 100%;
17 } 18 }
18 } 19 }
19 20
@@ -38,10 +38,10 @@ @@ -38,10 +38,10 @@
38 </div> 38 </div>
39 39
40 <div id="load-more-info" class="load-more-info"> 40 <div id="load-more-info" class="load-more-info">
41 - <div class="loading status"> 41 + <div class="loading status hide">
42 正在加载... 42 正在加载...
43 </div> 43 </div>
44 - <span class="no-more status hide">没有更多啦</span> 44 + <span class="no-more status">没有更多啦</span>
45 </div> 45 </div>
46 <input id="gender" type="hidden" value={{gender}}> 46 <input id="gender" type="hidden" value={{gender}}>
47 {{/ guang}} 47 {{/ guang}}
@@ -20,10 +20,10 @@ @@ -20,10 +20,10 @@
20 </div> 20 </div>
21 21
22 <div id="load-more-info" class="load-more-info"> 22 <div id="load-more-info" class="load-more-info">
23 - <div class="loading status"> 23 + <div class="loading status hide">
24 正在加载... 24 正在加载...
25 </div> 25 </div>
26 - <span class="no-more status hide">没有更多啦</span> 26 + <span class="no-more status">没有更多啦</span>
27 </div> 27 </div>
28 28
29 {{#if tag}} 29 {{#if tag}}
@@ -152,7 +152,7 @@ @@ -152,7 +152,7 @@
152 {{/if}} 152 {{/if}}
153 153
154 {{#if canBuyLimit}} 154 {{#if canBuyLimit}}
155 - <a href="javascript:;" id="addtoCart" class="addto-cart">立即购买</a> 155 + <a href="javascript:;" id="buyLimit" class="addto-cart">立即购买</a>
156 {{/if}} 156 {{/if}}
157 157
158 {{#if noLimitCode}} 158 {{#if noLimitCode}}
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <img class="brand-thumb" src={{thumb}}> 17 <img class="brand-thumb" src={{thumb}}>
18 <span class="brand-name">{{name}}</span> 18 <span class="brand-name">{{name}}</span>
19 <span class="entry"> 19 <span class="entry">
20 - 进入品牌 20 + 进入店铺
21 <i class="iconfont">&#xe614;</i> 21 <i class="iconfont">&#xe614;</i>
22 </span> 22 </span>
23 </a> 23 </a>
@@ -295,8 +295,11 @@ class UserModel @@ -295,8 +295,11 @@ class UserModel
295 $brand['brandName'] = $val['brand_name']; 295 $brand['brandName'] = $val['brand_name'];
296 $brand['update'] = $val['new_product_num']; 296 $brand['update'] = $val['new_product_num'];
297 $brand['discount'] = $val['product_discount_num']; 297 $brand['discount'] = $val['product_discount_num'];
298 - $brand['link'] = Helpers::url('', array(), $val['brand_domain']);  
299 - 298 + if ($val['brandOrShopType'] == 'brandOrShopType') {
  299 + $brand['link'] = Helpers::url('/product/index/brand', array('shop_id' => $val['shop_id']));
  300 + } else {
  301 + $brand['link'] = Helpers::url('', array(), $val['brand_domain']);
  302 + }
300 // 处理品牌产品 303 // 处理品牌产品
301 $product = array(); 304 $product = array();
302 foreach ($val['new_product'] as $one) { 305 foreach ($val['new_product'] as $one) {
@@ -189,14 +189,8 @@ class IndexController extends AbstractAction @@ -189,14 +189,8 @@ class IndexController extends AbstractAction
189 // 构建资讯文章内容 189 // 构建资讯文章内容
190 if (!empty($article['data']['list']['artList'])) { 190 if (!empty($article['data']['list']['artList'])) {
191 $build = array(); 191 $build = array();
192 -// foreach ($article['data']['list']['artList'] as $article) {  
193 -// $build[] = Helpers::formatArticle($article, true, $isApp, false, $uid);  
194 -// }  
195 - foreach ($article['data']['list']['artList'] as $articlekey =>$article) {  
196 - $build[$articlekey] = Helpers::formatArticle($article, true, $isApp, false, $uid);  
197 - if($this->isApp()){  
198 - $build[$articlekey]['collect']['url'] = Helpers::url('/author/index', array('id' => $id), 'guang');  
199 - } 192 + foreach ($article['data']['list']['artList'] as $article) {
  193 + $build[] = Helpers::formatArticle($article, true, $isApp, false, $uid);
200 } 194 }
201 $data['guang']['infos'] = $build; 195 $data['guang']['infos'] = $build;
202 } 196 }
@@ -4,6 +4,7 @@ use Action\AbstractAction; @@ -4,6 +4,7 @@ use Action\AbstractAction;
4 use LibModels\Wap\Guang\PlusstarData; 4 use LibModels\Wap\Guang\PlusstarData;
5 use Plugin\Helpers; 5 use Plugin\Helpers;
6 use Plugin\Images; 6 use Plugin\Images;
  7 +use Plugin\UdpLog;
7 8
8 /** 9 /**
9 * 明星品牌和原创品牌 10 * 明星品牌和原创品牌
@@ -119,6 +120,7 @@ class PlusstarController extends AbstractAction @@ -119,6 +120,7 @@ class PlusstarController extends AbstractAction
119 } catch (\Exception $e) { 120 } catch (\Exception $e) {
120 // do nothing 121 // do nothing
121 } 122 }
  123 + UdpLog::info('==$brandInfo==', $brandInfo);
122 if (empty($brandInfo['getBrandInfo']['data']['brand_id'])) { 124 if (empty($brandInfo['getBrandInfo']['data']['brand_id'])) {
123 break; 125 break;
124 } 126 }