wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit bf60eb92a433c7e590264c91687c9230cb8a671c 2 parents c2af5d49 fdcb7cd3

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 6 changed files with 26 additions and 16 deletions
@@ -489,6 +489,10 @@ @@ -489,6 +489,10 @@
489 }, 489 },
490 ... 490 ...
491 ], 491 ],
  492 + customPrice: {
  493 + min: 1,
  494 + max: 99
  495 + },
492 color: [ 496 color: [
493 { 497 {
494 href: '', 498 href: '',
@@ -15,8 +15,8 @@ @@ -15,8 +15,8 @@
15 {{# list}} 15 {{# list}}
16 {{#unless @last}} 16 {{#unless @last}}
17 <li> 17 <li>
18 - <a href="{{href}}">  
19 - <img class="lazy" data-original="{{img}}" alt=""> 18 + <a href="{{href}}" target= "_blank">
  19 + <img class="lazy" data-original="{{img}}" alt="" >
20 </a> 20 </a>
21 </li> 21 </li>
22 {{/unless}} 22 {{/unless}}
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 {{# list}} 26 {{# list}}
27 {{#if @last}} 27 {{#if @last}}
28 <div class="last-item"> 28 <div class="last-item">
29 - <a href="{{href}}"> 29 + <a href="{{href}}" target= "_blank">
30 <img class="lazy" data-original="{{img}}" alt=""> 30 <img class="lazy" data-original="{{img}}" alt="">
31 </a> 31 </a>
32 </div> 32 </div>
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <ul class="img-list clearfix"> 43 <ul class="img-list clearfix">
44 {{# imgBrand}} 44 {{# imgBrand}}
45 <li class="img-item"> 45 <li class="img-item">
46 - <a href="{{href}}"> 46 + <a href="{{href}}" target= "_blank">
47 <img src="{{img}}" alt=""> 47 <img src="{{img}}" alt="">
48 </a> 48 </a>
49 </li> 49 </li>
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 {{! 广告}} 70 {{! 广告}}
71 {{# adbanner}} 71 {{# adbanner}}
72 <div class="floor-ad"> 72 <div class="floor-ad">
73 - <a href="{{href}}" target= "_blank"><img class="lazy" data-original="{{img}}"/></a> 73 + <a href="{{href}}" target= "_blank"><img class="lazy" data-original="{{img}}"/></a>
74 </div> 74 </div>
75 {{/ adbanner}} 75 {{/ adbanner}}
76 76
@@ -133,9 +133,9 @@ @@ -133,9 +133,9 @@
133 133
134 <div class="ud-price-range"> 134 <div class="ud-price-range">
135 ¥ 135 ¥
136 - <input type="text" class="min limit"> 136 + <input type="text" class="min limit" value="{{customPrice.min}}">
137 <span class="price-sep">-</span> 137 <span class="price-sep">-</span>
138 - <input type="text" class="max limit"> 138 + <input type="text" class="max limit" value="{{customPrice.max}}">
139 139
140 <button class="price-sure hide">确定</button> 140 <button class="price-sure hide">确定</button>
141 </div> 141 </div>
@@ -74,7 +74,7 @@ class HomeModel @@ -74,7 +74,7 @@ class HomeModel
74 'index_main' => 0, 74 'index_main' => 0,
75 'is_hot' => $val['is_hot'] == 'Y' ? true : false, 75 'is_hot' => $val['is_hot'] == 'Y' ? true : false,
76 'is_new' => $val['is_new'] == 'Y' ? true : false, 76 'is_new' => $val['is_new'] == 'Y' ? true : false,
77 - 'subnav' => array() 77 + // 'subnav' => array()
78 ); 78 );
79 foreach ($val['sub'] as $sub) { // 二级 79 foreach ($val['sub'] as $sub) { // 二级
80 $index_sub = 0; 80 $index_sub = 0;
@@ -84,7 +84,7 @@ class HomeModel @@ -84,7 +84,7 @@ class HomeModel
84 'link' => $sub['sort_url'], 84 'link' => $sub['sort_url'],
85 'is_hot' => $sub['is_hot'] == 'Y' ? true : false, 85 'is_hot' => $sub['is_hot'] == 'Y' ? true : false,
86 'is_new' => $sub['is_new'] == 'Y' ? true : false, 86 'is_new' => $sub['is_new'] == 'Y' ? true : false,
87 - 'thirdnav' => array(), 87 + // 'thirdnav' => array(),
88 'index_sub' => $index_sub ++ 88 'index_sub' => $index_sub ++
89 ); 89 );
90 if (isset($sub['sub'])) { 90 if (isset($sub['sub'])) {
@@ -93,7 +93,7 @@ class HomeModel @@ -93,7 +93,7 @@ class HomeModel
93 'title' => $thirdsub['sort_name'], 93 'title' => $thirdsub['sort_name'],
94 'name_en' => $thirdsub['sort_name_en'], 94 'name_en' => $thirdsub['sort_name_en'],
95 'link' => $thirdsub['sort_url'], 95 'link' => $thirdsub['sort_url'],
96 - 'branditems' => array() 96 + // 'branditems' => array()
97 ); 97 );
98 if (isset($thirdsub['sub'])) { 98 if (isset($thirdsub['sub'])) {
99 foreach ($thirdsub['sub'] as $fourthnav) { // 四级 99 foreach ($thirdsub['sub'] as $fourthnav) { // 四级
@@ -107,6 +107,7 @@ class HomeModel @@ -107,6 +107,7 @@ class HomeModel
107 $subnav['thirdnav'][] = $thirdnav; 107 $subnav['thirdnav'][] = $thirdnav;
108 } 108 }
109 } 109 }
  110 +
110 $item['subnav'][] = $subnav; 111 $item['subnav'][] = $subnav;
111 } 112 }
112 $menu[] = $item; 113 $menu[] = $item;
@@ -236,12 +237,13 @@ class HomeModel @@ -236,12 +237,13 @@ class HomeModel
236 $val['price'] = $val['salePrice']; 237 $val['price'] = $val['salePrice'];
237 } 238 }
238 //TODO 字段要调整 239 //TODO 字段要调整
239 - $val['tags']['isFew'] = $val['is_soon_sold_out'];  
240 - $val['tags']['isLimit'] = $val['tags']['is_discount'];  
241 - $val['tags']['is_discount'] = $val['is_soon_sold_out'];  
242 - $val['tags']['isNew'] = false;//$val['tags']['is_new']; 240 + $val['isFew'] = $val['is_soon_sold_out'];
  241 + $val['tags']['isLimit'] = $val['tags']['is_limited'];
  242 + $val['tags']['isSale'] = false;//$val['tags']['is_discount'];暂时不显示
  243 + $val['tags']['isNew'] = false;//$val['tags']['is_new'];暂时不显示
243 $val['tags']['isYearMidPromotion'] = $val['tags']['midYear']; 244 $val['tags']['isYearMidPromotion'] = $val['tags']['midYear'];
244 $val['tags']['isYearEndPromotion'] = $val['tags']['yearEnd']; 245 $val['tags']['isYearEndPromotion'] = $val['tags']['yearEnd'];
  246 + $val['tags']['isReNew'] = false;//$val['tags']['is_advance'];暂时不显示
245 unset($val['tags']['is_advance'], $val['tags']['is_discount'], $val['tags']['is_limited'], $val['tags']['is_new'], 247 unset($val['tags']['is_advance'], $val['tags']['is_discount'], $val['tags']['is_limited'], $val['tags']['is_new'],
246 $val['tags']['is_yohood'], $val['tags']['midYear'], $val['tags']['yearEnd']); 248 $val['tags']['is_yohood'], $val['tags']['midYear'], $val['tags']['yearEnd']);
247 if (! empty($val)) { 249 if (! empty($val)) {
@@ -20,7 +20,7 @@ class RegisterController extends WebAction @@ -20,7 +20,7 @@ class RegisterController extends WebAction
20 'actionUrl' => '/passport/register/mobileregister', 20 'actionUrl' => '/passport/register/mobileregister',
21 'region' => RegData::getAreasData(), 21 'region' => RegData::getAreasData(),
22 'location' => '+86', 22 'location' => '+86',
23 - 'captchaUrl' => 'http://web.dev.yohobuy.com/passport/images?t=1449799445', 23 + 'captchaUrl' => '/passport/images?t=1449799445',
24 'itemUrl' => '##', 24 'itemUrl' => '##',
25 'referUrl' => $refer, 25 'referUrl' => $refer,
26 'loginUrl' => '/signin.html?refer='.$refer, 26 'loginUrl' => '/signin.html?refer='.$refer,
@@ -48,7 +48,7 @@ class RegisterController extends WebAction @@ -48,7 +48,7 @@ class RegisterController extends WebAction
48 'actionUrl' => '/passport/register/mobileregister', 48 'actionUrl' => '/passport/register/mobileregister',
49 'region' => RegData::getAreasData(), 49 'region' => RegData::getAreasData(),
50 'location' => '+86', 50 'location' => '+86',
51 - 'captchaUrl' => 'http://web.dev.yohobuy.com/passport/images?t=1449799445', 51 + 'captchaUrl' => '/passport/images?t=1449799445',
52 'itemUrl' => '##', 52 'itemUrl' => '##',
53 'referUrl' => $refer, 53 'referUrl' => $refer,
54 'skipUrl' => '/signin.html?refer='.$refer, 54 'skipUrl' => '/signin.html?refer='.$refer,
@@ -198,6 +198,10 @@ class Index1Controller extends AbstractAction @@ -198,6 +198,10 @@ class Index1Controller extends AbstractAction
198 'name' => '240-329' 198 'name' => '240-329'
199 ) 199 )
200 ), 200 ),
  201 + 'customPrice' => array(
  202 + 'min' => 1,
  203 + 'max' => 99
  204 + ),
201 'color' => array( 205 'color' => array(
202 array( 206 array(
203 'href' => '', 207 'href' => '',