fe / YOHOBUYWAP · Commits

Go to a project

Authored by yyq
Commit d98f69cec7efdf3985116a37647bb629dcba537d 2 parents f3c6c189 d319fd8f

Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4

Inline Side-by-side
Showing 14 changed files with 18 additions and 23 deletions
@@ -69,9 +69,7 @@ class ListData @@ -69,9 +69,7 @@ class ListData
69 $param['method'] = 'app.shopsdecorator.getList'; 69 $param['method'] = 'app.shopsdecorator.getList';
70 $param['shop_id'] = $shopId; 70 $param['shop_id'] = $shopId;
71 $param['client_secret'] = Sign::getSign($param); 71 $param['client_secret'] = Sign::getSign($param);
72 - //TODO  
73 -// return Yohobuy::get(Yohobuy::API_URL, $param);  
74 - return Yohobuy::get('http://192.168.102.218:8080/gateway/', $param, 0); 72 + return Yohobuy::get(Yohobuy::API_URL, $param);
75 } 73 }
76 74
77 /** 75 /**

16.3 KB | W: | H:

17.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 <h2>相关品牌</h2> 112 <h2>相关品牌</h2>
113 <ul class="brand-list clearfix"> 113 <ul class="brand-list clearfix">
114 {{# relatedBrand}} 114 {{# relatedBrand}}
115 - <li class="brand"> 115 + <li class="brand buriedpoint">
116 <a href={{url}}> 116 <a href={{url}}>
117 <div class="brand-logo"> 117 <div class="brand-logo">
118 <img class="lazy" data-original={{thumb}}> 118 <img class="lazy" data-original={{thumb}}>
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 <div class="tag-bg"></div> 130 <div class="tag-bg"></div>
131 <ul class="tag-list clearfix"> 131 <ul class="tag-list clearfix">
132 {{# relatedTag}} 132 {{# relatedTag}}
133 - <li> 133 + <li class="buriedpoint">
134 <a href={{url}}>{{name}}</a> 134 <a href={{url}}>{{name}}</a>
135 </li> 135 </li>
136 {{/ relatedTag}} 136 {{/ relatedTag}}
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
143 <h2>相关文章</h2> 143 <h2>相关文章</h2>
144 <ul class="info-list"> 144 <ul class="info-list">
145 {{# relatedInfo}} 145 {{# relatedInfo}}
146 - <li> 146 + <li class="buriedpoint">
147 <a class="clearfix" href={{url}}> 147 <a class="clearfix" href={{url}}>
148 <img class="lazy {{#if squareThumb}}square{{/if}}" data-original={{thumb}}> 148 <img class="lazy {{#if squareThumb}}square{{/if}}" data-original={{thumb}}>
149 <span class="title">{{title}}</span> 149 <span class="title">{{title}}</span>
1 {{#each collocationList}} 1 {{#each collocationList}}
2 - <li articleId="{{articleId}}"> 2 + <li articleId="{{articleId}}" class="buriedpoint">
3 {{#if img}} 3 {{#if img}}
4 <a href="{{url}}"><img class="lazy" src ="" data-original="{{img}}" /></a> 4 <a href="{{url}}"><img class="lazy" src ="" data-original="{{img}}" /></a>
5 {{/if}} 5 {{/if}}
6 - <div class="cont-area"> 6 + <div class="cont-area ">
7 <a href="{{url}}"><h2 class="title">{{title}}</h2></a> 7 <a href="{{url}}"><h2 class="title">{{title}}</h2></a>
8 <p class="cont-txt">{{content}}</p> 8 <p class="cont-txt">{{content}}</p>
9 <div class="count-area"> 9 <div class="count-area">
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 {{/if}} 21 {{/if}}
22 22
23 {{#if video}} 23 {{#if video}}
24 - <div class="subject-video-area"> 24 + <div class="subject-video-area buriedpoint">
25 <video id="subject-video" controls="controls" poster="{{videoImg}}" autobuffer> 25 <video id="subject-video" controls="controls" poster="{{videoImg}}" autobuffer>
26 <source src="{{videoUrl}}"> 26 <source src="{{videoUrl}}">
27 </video> 27 </video>
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <ul class="subject-list"> 6 <ul class="subject-list">
7 {{#each resources}} 7 {{#each resources}}
8 {{#if video}} 8 {{#if video}}
9 - <li> 9 + <li class="buriedpoint">
10 <a href="{{videoUrl}}"> 10 <a href="{{videoUrl}}">
11 <img class="lazy" data-original="{{videoImg}}" alt="{{alt}}"/> 11 <img class="lazy" data-original="{{videoImg}}" alt="{{alt}}"/>
12 <p>{{title}}</p> 12 <p>{{title}}</p>
@@ -3,13 +3,13 @@ @@ -3,13 +3,13 @@
3 <ul class="swiper-wrapper"> 3 <ul class="swiper-wrapper">
4 {{#each banner}} 4 {{#each banner}}
5 {{#if @first}} 5 {{#if @first}}
6 - <li class="swiper-slide"> 6 + <li class="swiper-slide buriedpoint>
7 <a href="{{url}}"> 7 <a href="{{url}}">
8 <img src="{{img}}"> 8 <img src="{{img}}">
9 </a> 9 </a>
10 </li> 10 </li>
11 {{^}} 11 {{^}}
12 - <li class="swiper-slide"> 12 + <li class="swiper-slide buriedpoint ">
13 <a href="{{url}}"> 13 <a href="{{url}}">
14 <img class="swiper-lazy" data-src="{{img}}"> 14 <img class="swiper-lazy" data-src="{{img}}">
15 </a> 15 </a>
1 <ul class="head-tab"> 1 <ul class="head-tab">
2 {{#each headTab}} 2 {{#each headTab}}
3 - <li {{#if cur}} class="cur" {{/if}}><a href="{{ url }}">{{ name }}</a></li> 3 + <li {{#if cur}} class="cur" {{/if}} ><a href="{{ url }}" class="buriedpoint">{{ name }}</a></li>
4 {{/each}} 4 {{/each}}
5 </ul> 5 </ul>
@@ -3,14 +3,14 @@ @@ -3,14 +3,14 @@
3 <div class="home-floor-collocation"> 3 <div class="home-floor-collocation">
4 <ul class="collocation-big-img"> 4 <ul class="collocation-big-img">
5 {{#each collocationBigImg}} 5 {{#each collocationBigImg}}
6 - <li><a href="{{url}}"><img class="lazy" data-original="{{img}}"/></a></li> 6 + <li class="buriedpoint"><a href="{{url}}"><img class="lazy" data-original="{{img}}"/></a></li>
7 {{/each}} 7 {{/each}}
8 </ul> 8 </ul>
9 <div class="collocation-img"> 9 <div class="collocation-img">
10 <div class="collocation-swiper swiper-container"> 10 <div class="collocation-swiper swiper-container">
11 <ul class="swiper-wrapper"> 11 <ul class="swiper-wrapper">
12 {{#each collocationList}} 12 {{#each collocationList}}
13 - <li class="swiper-slide"> 13 + <li class="swiper-slide buriedpoint">
14 <a href="{{url}}"> 14 <a href="{{url}}">
15 <img class="swiper-lazy" data-src="{{img}}"> 15 <img class="swiper-lazy" data-src="{{img}}">
16 </a> 16 </a>
1 {{# starSubject}} 1 {{# starSubject}}
2 {{> home/floor_header_more}} 2 {{> home/floor_header_more}}
3 - <div class="home-floor-subject"> 3 + <div class="home-floor-subject buriedpoint">
4 {{# subjectBanner}} 4 {{# subjectBanner}}
5 <a href="{{url}}"><img class="lazy subject-banner" data-original="{{img}}" /></a> 5 <a href="{{url}}"><img class="lazy subject-banner" data-original="{{img}}" /></a>
6 {{/ subjectBanner}} 6 {{/ subjectBanner}}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="floor-header-more"> 2 <div class="floor-header-more">
3 <h2>{{title}}</h2> 3 <h2>{{title}}</h2>
4 {{#if more_url}} 4 {{#if more_url}}
5 - <a class="more-btn iconfont" href="{{more_url}}">&#xe618;</a> 5 + <a class="more-btn iconfont buriedpoint" href="{{more_url}}">&#xe618;</a>
6 {{/if}} 6 {{/if}}
7 </div> 7 </div>
8 {{/ title}} 8 {{/ title}}
@@ -36,7 +36,7 @@ class SearchController extends AbstractAction @@ -36,7 +36,7 @@ class SearchController extends AbstractAction
36 { 36 {
37 // 过滤请求参数 37 // 过滤请求参数
38 $condition = filter_input_array(INPUT_GET, array( 38 $condition = filter_input_array(INPUT_GET, array(
39 - 'shop' => FILTER_DEFAULT, 39 + 'shop_id' => FILTER_DEFAULT,
40 'categoryId' => FILTER_DEFAULT, 40 'categoryId' => FILTER_DEFAULT,
41 'subCategoryId' => FILTER_DEFAULT, 41 'subCategoryId' => FILTER_DEFAULT,
42 'title' => FILTER_DEFAULT, 42 'title' => FILTER_DEFAULT,
@@ -105,7 +105,7 @@ class SearchController extends AbstractAction @@ -105,7 +105,7 @@ class SearchController extends AbstractAction
105 $brandNames = array(); 105 $brandNames = array();
106 106
107 // 跳转到品牌商品列表页 107 // 跳转到品牌商品列表页
108 - if ($domain !== null) { 108 + if ($domain !== null && empty($condition['shop_id'])) {
109 $url = Helpers::url('', array( 109 $url = Helpers::url('', array(
110 'from' => 'search', 110 'from' => 'search',
111 'query' => $query 111 'query' => $query
@@ -64,7 +64,7 @@ class RegController extends AbstractAction @@ -64,7 +64,7 @@ class RegController extends AbstractAction
64 'backUrl' => SITE_MAIN . '/?go=1', // 返回的URL链接 64 'backUrl' => SITE_MAIN . '/?go=1', // 返回的URL链接
65 'headerText' => '注册', // 头部信息 65 'headerText' => '注册', // 头部信息
66 'isPassportPage' => true, // 模板中模块标识 66 'isPassportPage' => true, // 模板中模块标识
67 - 'areaCode' => '+' . $area, // 地区编号 67 + 'areaCode' => $area, // 地区编号
68 'phoneNum' => $mobile, // 手机号 68 'phoneNum' => $mobile, // 手机号
69 'token' => $token, // 访问令牌 69 'token' => $token, // 访问令牌
70 'serviceUrl'=>'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info='//在线客服 70 'serviceUrl'=>'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info='//在线客服
@@ -141,10 +141,7 @@ class IndexController extends AbstractAction @@ -141,10 +141,7 @@ class IndexController extends AbstractAction
141 // 存标题信息 141 // 存标题信息
142 $title = ''; 142 $title = '';
143 $brandLogo = Product\ListModel::getBrandLogoByDomain($domain, $title); 143 $brandLogo = Product\ListModel::getBrandLogoByDomain($domain, $title);
144 -// print_r($brandLogo); exit;  
145 //无店铺：0--->品牌页 无单品店有多品店：1--->搜索页 有单品店：2--->店铺页面 144 //无店铺：0--->品牌页 无单品店有多品店：1--->搜索页 有单品店：2--->店铺页面
146 -// $brandLogo['shopId'] = 672;  
147 -// $brandLogo['type'] = 2;  
148 if ($brandLogo['type'] == 2 && !empty($brandLogo['shopId'])) { 145 if ($brandLogo['type'] == 2 && !empty($brandLogo['shopId'])) {
149 $this->shop($brandLogo['shopId'], $uid); 146 $this->shop($brandLogo['shopId'], $uid);
150 exit; 147 exit;