wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by yyq
Commit a576c596a62a3524d6167a02370cfdac407192b9 2 parents 43682b5f 868dfea2

merge outlets

Inline Side-by-side
Showing 16 changed files with 132 additions and 23 deletions
@@ -583,7 +583,9 @@ class WebAction extends Controller_Abstract @@ -583,7 +583,9 @@ class WebAction extends Controller_Abstract
583 else if(empty($uid) && $sysUserSession >= 20) { 583 else if(empty($uid) && $sysUserSession >= 20) {
584 $this->setSession('_SYS_USER_SESSION', 0); 584 $this->setSession('_SYS_USER_SESSION', 0);
585 } 585 }
586 - 586 + if ($channel === 'outlets') {
  587 + $header['outlets'] = true;
  588 + }
587 $this->_view->assign('headerdata', $header); 589 $this->_view->assign('headerdata', $header);
588 } 590 }
589 591
@@ -22,13 +22,13 @@ class Yohobuy @@ -22,13 +22,13 @@ class Yohobuy
22 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 22 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
23 23
24 //java API 24 //java API
25 - // const API_URL = 'http://api.yoho.yohoops.org/';//  
26 - // const API_URL2 = 'http://api.yoho.yohoops.org/';//  
27 - // const SERVICE_URL = 'http://service.yoho.yohoops.org/';  
28 - // const YOHOBUY_URL = 'http://www.yohobuy.com/';  
29 - // const API_OLD = 'http://api2.open.yohobuy.com/';  
30 -//// 支付回调地址  
31 - // const SERVICE_NOTIFY = 'http://service.yoho.cn/'; 25 +// const API_URL = 'http://api.yoho.yohoops.org/';//
  26 +// const API_URL2 = 'http://api.yoho.yohoops.org/';//
  27 +// const SERVICE_URL = 'http://service.yoho.yohoops.org/';
  28 +// const YOHOBUY_URL = 'http://www.yohobuy.com/';
  29 +// const API_OLD = 'http://api2.open.yohobuy.com/';
  30 +// // 支付回调地址
  31 +// const SERVICE_NOTIFY = 'http://service.yoho.cn/';
32 32
33 // 测试环境 */ 33 // 测试环境 */
34 const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/' 34 const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
1 {{#headerdata}} 1 {{#headerdata}}
2 -<div class="yoho-header"> 2 +<div class="yoho-header {{#if outlets}} outlets{{/if}}">
3 <div class="header-topwrapper clearfix"> 3 <div class="header-topwrapper clearfix">
4 <div class="header-top"> 4 <div class="header-top">
5 <div class="leftpart float-left"> 5 <div class="leftpart float-left">
@@ -74,13 +74,17 @@ @@ -74,13 +74,17 @@
74 <div class="header-navcontent"> 74 <div class="header-navcontent">
75 <ul class="first-nav-list float-left"> 75 <ul class="first-nav-list float-left">
76 {{# navbars}} 76 {{# navbars}}
77 - <li class="first-nav-item {{classname}}">  
78 - <h3 class="name-cn">  
79 - <a href="{{link}}">{{name_cn}}</a>  
80 - </h3>  
81 - <h3 class="name-en">  
82 - <a href="{{link}}">{{name_en}}</a>  
83 - </h3> 77 + <li class="first-nav-item {{classname}}" {{#if showIcon}} style="background: url({{icon}}) no-repeat center center"{{/if}}>
  78 + {{#if showIcon}}
  79 + <a href="{{link}}" class="menu-ico"></a>
  80 + {{^}}
  81 + <h3 class="name-cn">
  82 + <a href="{{link}}">{{name_cn}}</a>
  83 + </h3>
  84 + <h3 class="name-en">
  85 + <a href="{{link}}">{{name_en}}</a>
  86 + </h3>
  87 + {{/if}}
84 <div class='sub-nav-wrapper'> 88 <div class='sub-nav-wrapper'>
85 <ul class="sub-nav-list"> 89 <ul class="sub-nav-list">
86 {{# subnav}} 90 {{# subnav}}
@@ -125,6 +129,7 @@ @@ -125,6 +129,7 @@
125 </li> 129 </li>
126 {{/ navbars}} 130 {{/ navbars}}
127 </ul> 131 </ul>
  132 + <div class="outlets-logo"></div>
128 <div class="icon-logo"><a href="http://www.yohobuy.com/" class="main-link"></a></div> 133 <div class="icon-logo"><a href="http://www.yohobuy.com/" class="main-link"></a></div>
129 <div class="header-tool float-right"> 134 <div class="header-tool float-right">
130 <div class="search float-left {{searchcate}}" > 135 <div class="search float-left {{searchcate}}" >
This diff could not be displayed because it is too large.

2.73 KB | W: | H:

2.84 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.73 KB | W: | H:

2.84 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -94,7 +94,7 @@ if ($refundInfo.length) { @@ -94,7 +94,7 @@ if ($refundInfo.length) {
94 setBackInput($(this).val() * 1); 94 setBackInput($(this).val() * 1);
95 } 95 }
96 }); 96 });
97 -} else { 97 +} else if (defaultArea) {
98 syncRefundMode(defaultArea); 98 syncRefundMode(defaultArea);
99 } 99 }
100 100
@@ -393,6 +393,12 @@ @@ -393,6 +393,12 @@
393 .first-nav-item { 393 .first-nav-item {
394 float: left; 394 float: left;
395 padding: 8px 23px 0; 395 padding: 8px 23px 0;
  396 +
  397 + .menu-ico {
  398 + width: 84px;
  399 + height: 32px;
  400 + display: block;
  401 + }
396 } 402 }
397 403
398 .all a, 404 .all a,
@@ -468,6 +474,9 @@ @@ -468,6 +474,9 @@
468 .gobuylifestyle { 474 .gobuylifestyle {
469 background: url(/header/cart/lifestyle.png) no-repeat; 475 background: url(/header/cart/lifestyle.png) no-repeat;
470 } 476 }
  477 + .gobuyoutlets {
  478 + background: url(/header/cart/outlets.png) no-repeat;
  479 + }
471 .searchcatelifestyle { 480 .searchcatelifestyle {
472 .searchinput { 481 .searchinput {
473 border: 1px solid #5e4b3c !important 482 border: 1px solid #5e4b3c !important
@@ -528,6 +537,10 @@ @@ -528,6 +537,10 @@
528 } 537 }
529 } 538 }
530 539
  540 + .outlets > .sub-nav-wrapper {
  541 + display: block !important;
  542 + }
  543 +
531 .name-cn { 544 .name-cn {
532 text-align: center; 545 text-align: center;
533 line-height: 16px !important; 546 line-height: 16px !important;
@@ -747,6 +760,16 @@ @@ -747,6 +760,16 @@
747 margin-top: -2px; 760 margin-top: -2px;
748 } 761 }
749 762
  763 + .outlets-logo {
  764 + background: resolve(header/outlets.png) no-repeat center center;
  765 + width: 200px;
  766 + height: 34px;
  767 + left: 42%;
  768 + margin-top: 28px;
  769 + position: absolute;
  770 + display: none;
  771 + }
  772 +
750 .icon-logo { 773 .icon-logo {
751 background: resolve(/header/logo.png) no-repeat center center; 774 background: resolve(/header/logo.png) no-repeat center center;
752 width: 182px; 775 width: 182px;
@@ -1120,6 +1143,62 @@ @@ -1120,6 +1143,62 @@
1120 } 1143 }
1121 } 1144 }
1122 1145
  1146 +.yoho-header.outlets {
  1147 + .header-navwrapper {
  1148 + background-color: #3a3a3a;
  1149 +
  1150 + .sub-nav-wrapper {
  1151 + background-color: #e6e6e6;
  1152 + margin-top: 37px;
  1153 + }
  1154 +
  1155 + .third-nav-wrapper {
  1156 + border-top: 0;
  1157 + }
  1158 + }
  1159 +
  1160 + .outlets-logo {
  1161 + display: block;
  1162 + }
  1163 +
  1164 + .icon-logo {
  1165 + display: none;
  1166 + }
  1167 +
  1168 + .first-nav-item.cure {
  1169 + background: none;
  1170 + }
  1171 +
  1172 + .first-nav-item > h3 {
  1173 + display: none;
  1174 + }
  1175 +
  1176 + .header-tool > .search {
  1177 + display: none;
  1178 + }
  1179 +
  1180 + .sub-nav-list {
  1181 + padding-left: 15%;
  1182 +
  1183 + .sub-nav-item {
  1184 + width: 14%;
  1185 + text-align: center;
  1186 +
  1187 + & > a {
  1188 + color: #222!important;
  1189 + }
  1190 + }
  1191 +
  1192 + .sub-nav-item:hover a {
  1193 + border-color: #555;
  1194 + }
  1195 +
  1196 + .third-nav {
  1197 + text-align: left;
  1198 + }
  1199 + }
  1200 +}
  1201 +
1123 .simple-header { 1202 .simple-header {
1124 height: 66px; 1203 height: 66px;
1125 margin: 0 0 20px 0; 1204 margin: 0 0 20px 0;
@@ -287,7 +287,7 @@ class ReturnsModel @@ -287,7 +287,7 @@ class ReturnsModel
287 if (!empty($value['cn_alphabet'])) { 287 if (!empty($value['cn_alphabet'])) {
288 $cnAlphabet = $value['cn_alphabet']; 288 $cnAlphabet = $value['cn_alphabet'];
289 } 289 }
290 - $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_skn'], $value['goods_id'], $cnAlphabet); 290 + $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_id'], $value['goods_id'], $cnAlphabet);
291 $result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'],60,60); 291 $result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'],60,60);
292 $result['goods'][$key]['name'] = $value['product_name']; 292 $result['goods'][$key]['name'] = $value['product_name'];
293 $result['goods'][$key]['color'] = $value['color_name']; 293 $result['goods'][$key]['color'] = $value['color_name'];
@@ -354,7 +354,7 @@ class ReturnsModel @@ -354,7 +354,7 @@ class ReturnsModel
354 if (!empty($value['cn_alphabet'])) { 354 if (!empty($value['cn_alphabet'])) {
355 $cnAlphabet = $value['cn_alphabet']; 355 $cnAlphabet = $value['cn_alphabet'];
356 } 356 }
357 - $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_skn'], $value['goods_id'], $cnAlphabet); 357 + $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_id'], $value['goods_id'], $cnAlphabet);
358 $result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'],60,60); 358 $result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'],60,60);
359 $result['goods'][$key]['name'] = $value['product_name']; 359 $result['goods'][$key]['name'] = $value['product_name'];
360 $result['goods'][$key]['color'] = $value['color_name']; 360 $result['goods'][$key]['color'] = $value['color_name'];
@@ -91,6 +91,13 @@ class HomeModel @@ -91,6 +91,13 @@ class HomeModel
91 'is_new' => $val['is_new'] == 'Y' ? true : false, 91 'is_new' => $val['is_new'] == 'Y' ? true : false,
92 // 'subnav' => array() 92 // 'subnav' => array()
93 ); 93 );
  94 +
  95 + // 奥莱头部显示配置图标
  96 + if (strtolower($val['sort_name_en']) === 'outlets' &&
  97 + $channel !== 'outlets') {
  98 + $item['showIcon'] = true;
  99 + };
  100 +
94 $indexSub = 0; 101 $indexSub = 0;
95 foreach ($val['sub'] as $sub) { // 二级 102 foreach ($val['sub'] as $sub) { // 二级
96 $subnav = array( 103 $subnav = array(
@@ -63,6 +63,11 @@ class ItemModel @@ -63,6 +63,11 @@ class ItemModel
63 if (!empty($baseInfo['salesPhrase'])) { 63 if (!empty($baseInfo['salesPhrase'])) {
64 $goodsInfo['saleTip'] = $baseInfo['salesPhrase']; 64 $goodsInfo['saleTip'] = $baseInfo['salesPhrase'];
65 } 65 }
  66 +
  67 + //奥莱商品
  68 + if (!empty($baseInfo['isOutlets'])) {
  69 + $goodsInfo['isOutlets'] = $baseInfo['isOutlets'] == 'Y' ? 'outlets' : '';
  70 + }
66 71
67 // 商品价格 72 // 商品价格
68 if (isset($baseInfo['productPriceBo'])) { 73 if (isset($baseInfo['productPriceBo'])) {
@@ -46,6 +46,8 @@ class IndexController extends WebAction @@ -46,6 +46,8 @@ class IndexController extends WebAction
46 $result['shopTemplateType'] = $shopIntro['shopTemplateType']; 46 $result['shopTemplateType'] = $shopIntro['shopTemplateType'];
47 $result['multBrandShopType'] = $shopIntro['multBrandShopType']; 47 $result['multBrandShopType'] = $shopIntro['multBrandShopType'];
48 $result['shopId'] = $shopIntro['shopId']; 48 $result['shopId'] = $shopIntro['shopId'];
  49 + $result['brandNameEn'] = '';
  50 + $result['brandNameCn'] = $shopIntro['brandName'];
49 break; 51 break;
50 } 52 }
51 $this->shopHome($shopId); 53 $this->shopHome($shopId);
@@ -8,8 +8,6 @@ class ItemController extends WebAction @@ -8,8 +8,6 @@ class ItemController extends WebAction
8 { 8 {
9 public function indexAction() 9 public function indexAction()
10 { 10 {
11 - $this->setWebNavHeader();  
12 -  
13 $productId = $this->param('productId',''); 11 $productId = $this->param('productId','');
14 if (!is_numeric($productId)) { 12 if (!is_numeric($productId)) {
15 $this->error(); 13 $this->error();
@@ -53,12 +51,23 @@ class ItemController extends WebAction @@ -53,12 +51,23 @@ class ItemController extends WebAction
53 array('fullSortName'=> implode('-', $sortNames)), 51 array('fullSortName'=> implode('-', $sortNames)),
54 $productInfo['statGoodsInfo']), 52 $productInfo['statGoodsInfo']),
55 ); 53 );
  54 +
  55 + //设置头部
  56 + $this->setWebNavHeader($productInfo['goodsInfo']['isOutlets']);
56 //导航 57 //导航
57 - $data['detail']['pathNav'] = array_merge(  
58 - array(HomeModel::getHomeChannelNav()), 58 + if ($productInfo['goodsInfo']['isOutlets'] === 'outlets') {
  59 + $data['detail']['pathNav'] = array(
  60 + array('href' => '/', 'name' => 'OUTLETS', 'pathTitle' => 'OUTLETS'),// TODO 首页地址
  61 + //array('href' => '/', 'name' => 'OUTLETS', 'pathTitle' => 'OUTLETS'), TODO 奥莱频道
  62 + array('href' => '/', 'name' => $productInfo['goodsInfo']['name'], 'pathTitle' => $productInfo['goodsInfo']['name']),
  63 + );
  64 + } else {
  65 + $data['detail']['pathNav'] = array_merge(
  66 + array(HomeModel::getHomeChannelNav()),
59 $navs, 67 $navs,
60 array(array('name' => $productInfo['goodsInfo']['name'])) 68 array(array('name' => $productInfo['goodsInfo']['name']))
61 ); 69 );
  70 + }
62 $data['detail']['latestWalk'] = 5; 71 $data['detail']['latestWalk'] = 5;
63 $data['detail'] += $productInfo + $sizeInfo; 72 $data['detail'] += $productInfo + $sizeInfo;
64 $this->_view->display('index', $data); 73 $this->_view->display('index', $data);