fe / YOHOBUYWAP · Commits

Go to a project

Authored by Rock Zhang
Commit 29206183ffbb7622b7bbcc8421c0ae03ff54de3e 2 parents 9b308b4d 0d10d59d

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

Inline Side-by-side
Showing 17 changed files with 76 additions and 17 deletions
@@ -17,10 +17,10 @@ use Plugin\Cache; @@ -17,10 +17,10 @@ use Plugin\Cache;
17 class Yohobuy 17 class Yohobuy
18 { 18 {
19 19
20 -// /* 正式环境 */  
21 -// const API_URL = 'http://api2.open.yohobuy.com/';  
22 -// const SERVICE_URL = 'http://service.api.yohobuy.com/';  
23 -// const YOHOBUY_URL = 'http://www.yohobuy.com/'; 20 + // /* 正式环境 */
  21 + // const API_URL = 'http://api2.open.yohobuy.com/';
  22 + // const SERVICE_URL = 'http://service.api.yohobuy.com/';
  23 + // const YOHOBUY_URL = 'http://www.yohobuy.com/';
24 24
25 /* 测试环境 */ 25 /* 测试环境 */
26 const API_URL = 'http://test2.open.yohobuy.com/'; 26 const API_URL = 'http://test2.open.yohobuy.com/';
No preview for this file type
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > 2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
3 <svg xmlns="http://www.w3.org/2000/svg"> 3 <svg xmlns="http://www.w3.org/2000/svg">
4 <metadata> 4 <metadata>
5 -Created by FontForge 20120731 at Fri Oct 30 10:27:45 2015 5 +Created by FontForge 20120731 at Sun Nov 1 15:22:48 2015
6 By Ads 6 By Ads
7 </metadata> 7 </metadata>
8 <defs> 8 <defs>
@@ -149,12 +149,13 @@ d="M459 754h22h23h20h22h22v-191v-191h191h191v-109h-191h-191v-191v-190h-109v190v1 @@ -149,12 +149,13 @@ d="M459 754h22h23h20h22h22v-191v-191h191h191v-109h-191h-191v-191v-190h-109v190v1
149 d="M77 372h873v-109h-873v109z" /> 149 d="M77 372h873v-109h-873v109z" />
150 <glyph glyph-name="uniE626" unicode="&#xe626;" 150 <glyph glyph-name="uniE626" unicode="&#xe626;"
151 d="M866.5 663.5q-97.5 97.5 -228 132t-261.5 0t-228.5 -132t-132 -228.5t0 -261.5t132 -228t228.5 -132t261.5 0t228 132t132 228t0 261.5t-132 228.5zM798 115l-101 -101l-187 186l-186 -186l-101 101l186 186l-186 187l101 101l186 -186l187 186l101 -101l-186 -187z" /> 151 d="M866.5 663.5q-97.5 97.5 -228 132t-261.5 0t-228.5 -132t-132 -228.5t0 -261.5t132 -228t228.5 -132t261.5 0t228 132t132 228t0 261.5t-132 228.5zM798 115l-101 -101l-187 186l-186 -186l-101 101l186 186l-186 187l101 101l186 -186l187 186l101 -101l-186 -187z" />
  152 + <glyph glyph-name="uniE627" unicode="&#xe627;"
  153 +d="M741 258q-23 9 -22 34q6 114 -8 186q-13 68 -37.5 125.5t-48 89.5t-50.5 57t-38 32t-18 10l-7 3l-7 -3q-7 -3 -18 -10t-38 -32t-50.5 -57t-48 -89.5t-37.5 -125.5q-14 -72 -8 -186q1 -25 -22 -34q-19 -9 -37 -19.5t-39 -29.5t-36 -41.5t-25.5 -56t-10.5 -72.5v-16h198
  154 +q2 -22 17.5 -36.5t37.5 -14.5h248q22 0 37.5 14.5t17.5 36.5h198v16q0 48 -14.5 87.5t-39 65t-47 40.5t-47.5 26zM512 442q-31 0 -53 22t-22 53t22 53t53 22q20 0 37.5 -10t27.5 -27t10 -38q0 -31 -22 -53t-53 -22zM453 -61q-14 0 -23.5 -10t-9.5 -24v-83q0 -10 4.5 -17.5
  155 +t12 -12t16.5 -4.5t17 4.5t12.5 12t4.5 17.5v83q0 9 -4.5 17t-12.5 12.5t-17 4.5zM571 -61q-7 0 -13.5 -2.5t-11 -7t-7 -11t-2.5 -13.5v-83q0 -14 10 -24t24 -10q6 0 12.5 2.5t11 7t7 11t2.5 13.5v83q0 9 -4.5 17t-12 12.5t-16.5 4.5z" />
152 <glyph glyph-name="uniE628" unicode="&#xe628;" 156 <glyph glyph-name="uniE628" unicode="&#xe628;"
153 d="M505 776q77 0 148.5 -23.5t129 -67t101 -101.5t67.5 -129.5t24 -147.5q0 -64 -17 -125t-47.5 -112t-74 -94.5t-94.5 -74t-112 -47.5t-125 -17q-95 0 -182 37.5t-150 100.5t-100 150t-37 182t37 182t100 150t150 100t182 37zM505 -104q112 0 206.5 55t149.5 149.5 157 d="M505 776q77 0 148.5 -23.5t129 -67t101 -101.5t67.5 -129.5t24 -147.5q0 -64 -17 -125t-47.5 -112t-74 -94.5t-94.5 -74t-112 -47.5t-125 -17q-95 0 -182 37.5t-150 100.5t-100 150t-37 182t37 182t100 150t150 100t182 37zM505 -104q112 0 206.5 55t149.5 149.5
154 t55 206.5q0 37 -6.5 73.5t-19.5 69.5t-30.5 64t-40.5 57.5t-49.5 49.5t-57.5 40.5t-64 30t-69.5 19t-73.5 6.5q-111 0 -205.5 -55t-149.5 -149.5t-55 -206t55 -206t149.5 -149.5t205.5 -55zM528 138v-59h-58v59h58zM470 564h58v-349h-58v349z" /> 158 t55 206.5q0 37 -6.5 73.5t-19.5 69.5t-30.5 64t-40.5 57.5t-49.5 49.5t-57.5 40.5t-64 30t-69.5 19t-73.5 6.5q-111 0 -205.5 -55t-149.5 -149.5t-55 -206t55 -206t149.5 -149.5t205.5 -55zM528 138v-59h-58v59h58zM470 564h58v-349h-58v349z" />
155 - <glyph glyph-name="uniE629" unicode="&#xe629;"  
156 -d="M442 274h-84v-76h-230v76h-81q-20 0 -33.5 -12.5t-13.5 -31.5v-395q0 -20 13.5 -33.5t33.5 -13.5h395q19 0 31.5 13.5t12.5 33.5v395q0 13 -5.5 23t-15.5 15.5t-23 5.5zM977 812h-81v-77h-230v77h-84q-10 0 -18 -3.5t-14 -10t-9 -15t-3 -18.5v-395q0 -13 5.5 -23  
157 -t15.5 -15.5t23 -5.5h395q20 0 33.5 12.5t13.5 31.5v395q0 20 -13.5 33.5t-33.5 13.5zM977 274h-81v-76h-230v76h-84q-13 0 -23 -5.5t-15.5 -15.5t-5.5 -23v-395q0 -13 5.5 -23.5t15.5 -17t23 -6.5h395q20 0 33.5 13.5t13.5 33.5v395q0 19 -13.5 31.5t-33.5 12.5z" />  
158 <glyph glyph-name="uniE62A" unicode="&#xe62a;" 159 <glyph glyph-name="uniE62A" unicode="&#xe62a;"
159 d="M497 806l-451 -386q-6 -6 -11 -13t-7 -15t-2 -17v-500q0 -32 22.5 -54.5t53.5 -22.5h256v333h308v-333h256q31 0 53.5 22.5t22.5 54.5v500q0 27 -20 45l-451 386q-15 13 -30 0z" /> 160 d="M497 806l-451 -386q-6 -6 -11 -13t-7 -15t-2 -17v-500q0 -32 22.5 -54.5t53.5 -22.5h256v333h308v-333h256q31 0 53.5 22.5t22.5 54.5v500q0 27 -20 45l-451 386q-15 13 -30 0z" />
160 <glyph glyph-name="uniE62B" unicode="&#xe62b;" 161 <glyph glyph-name="uniE62B" unicode="&#xe62b;"
No preview for this file type
No preview for this file type
@@ -108,7 +108,7 @@ function rePosFooter() { @@ -108,7 +108,7 @@ function rePosFooter() {
108 } 108 }
109 109
110 //页面通用底部位置及status设置 110 //页面通用底部位置及status设置
111 -(function () { 111 +(function() {
112 var $op = $footer.children('.op-row'); 112 var $op = $footer.children('.op-row');
113 113
114 var user = getUser(); 114 var user = getUser();
@@ -135,9 +135,21 @@ function rePosFooter() { @@ -135,9 +135,21 @@ function rePosFooter() {
135 ); 135 );
136 } 136 }
137 137
  138 + $op.find('.back-to-top').on('touchend', function() {
  139 + $(window).scrollTop(0);
  140 + return false;
  141 + });
138 $footer.removeClass('hide'); 142 $footer.removeClass('hide');
139 }()); 143 }());
140 144
  145 +(function() {
  146 + var uid = getUid();
  147 +
  148 + uid = uid === 0 ? '' : uid;
  149 + window._yas(1 * new Date(), '1.0.8', 'yohobuy_m', uid, '');
  150 +}());
  151 +
  152 +
141 //暴露公共接口 153 //暴露公共接口
142 window.cookie = cookie; 154 window.cookie = cookie;
143 155
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 4
5 .op-row { 5 .op-row {
6 position: relative; 6 position: relative;
7 - padding: 0 30px; 7 + padding: 0 15px;
8 height: 60px; 8 height: 60px;
9 line-height: 60px; 9 line-height: 60px;
10 10
@@ -152,6 +152,8 @@ @@ -152,6 +152,8 @@
152 } 152 }
153 153
154 .list-nav { 154 .list-nav {
  155 + border-bottom: 1px solid #e6e6e6;
  156 +
155 > li { 157 > li {
156 float: left; 158 float: left;
157 width: 25%; 159 width: 25%;
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 12
13 .iconfont { 13 .iconfont {
14 color: #fff; 14 color: #fff;
15 - font-size: 22px; 15 + font-size: 18px;
16 } 16 }
17 17
18 .cart-count { 18 .cart-count {
  1 + <!-- Google Tag Manager -->
  2 + <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
  3 + <script>
  4 + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
  5 + new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
  6 + j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
  7 + '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
  8 + })(window,document,'script','dataLayer','GTM-W958MG');
  9 + </script>
  10 + <!-- End Google Tag Manager -->
  11 +
  12 +<script type="text/javascript">
  13 + var _hmt = _hmt || [];
  14 + (function() {
  15 + var hm = document.createElement("script");
  16 + hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";
  17 + var s = document.getElementsByTagName("script")[0];
  18 + s.parentNode.insertBefore(hm, s);
  19 + })();
  20 +</script>
  21 +
  22 +<script>
  23 + var _hmt = _hmt || [];
  24 + (function() {
  25 + var hm = document.createElement("script");
  26 + hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";
  27 + var s = document.getElementsByTagName("script")[0];
  28 + s.parentNode.insertBefore(hm, s);
  29 + })();
  30 +</script>
  31 +
  32 +<script type="text/javascript">
  33 + (function(w,d,s,j,f){
  34 + w['YohoAcquisitionObject']=f;
  35 + w[f]=function(){w[f].p=arguments;};
  36 + var a=d.createElement(s);
  37 + var m=d.getElementsByTagName(s)[0];
  38 + a.async=1;
  39 + a.src=j;
  40 + m.parentNode.insertBefore(a,m);
  41 + })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');
  42 +</script>
@@ -19,6 +19,8 @@ @@ -19,6 +19,8 @@
19 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script> 19 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
20 <script>seajs.config({base: 'http://localhost:8000/'});</script> 20 <script>seajs.config({base: 'http://localhost:8000/'});</script>
21 {{/if}} 21 {{/if}}
  22 +
  23 +{{> layout/analysis}}
22 {{> layout/use}} 24 {{> layout/use}}
23 </body> 25 </body>
24 </html> 26 </html>
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <p class="tab-name">分类</p> 9 <p class="tab-name">分类</p>
10 </div> 10 </div>
11 <div class="tab-item {{#if guangHome}}current{{/if}}"> 11 <div class="tab-item {{#if guangHome}}current{{/if}}">
12 - <p class="iconfont tab-icon">&#xe611;</p> 12 + <p class="iconfont tab-icon">&#xe627;</p>
13 <p class="tab-name">逛</p> 13 <p class="tab-name">逛</p>
14 </div> 14 </div>
15 <div class="tab-item {{#if shoppingCartPage}}current{{/if}}"> 15 <div class="tab-item {{#if shoppingCartPage}}current{{/if}}">
@@ -31,7 +31,7 @@ class BoysController extends AbstractAction @@ -31,7 +31,7 @@ class BoysController extends AbstractAction
31 $this->_view->display('index', array( 31 $this->_view->display('index', array(
32 'boysHomePage' => true, 32 'boysHomePage' => true,
33 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 33 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
34 - 'showFooterTab' => false, 34 + 'showFooterTab' => true,
35 'maybeLike' => true, 35 'maybeLike' => true,
36 'content' => Index\HomeModel::getBoysFloor(), 36 'content' => Index\HomeModel::getBoysFloor(),
37 'pageFooter' => true, 37 'pageFooter' => true,
@@ -26,7 +26,7 @@ class GirlsController extends AbstractAction @@ -26,7 +26,7 @@ class GirlsController extends AbstractAction
26 $this->_view->display('index', array( 26 $this->_view->display('index', array(
27 'grilsHomePage' => true, 27 'grilsHomePage' => true,
28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
29 - 'showFooterTab' => false, 29 + 'showFooterTab' => true,
30 'maybeLike' => true, 30 'maybeLike' => true,
31 'content' => Index\HomeModel::getGirlsFloor(), 31 'content' => Index\HomeModel::getGirlsFloor(),
32 'pageFooter' => true, 32 'pageFooter' => true,
@@ -26,7 +26,7 @@ class KidsController extends AbstractAction @@ -26,7 +26,7 @@ class KidsController extends AbstractAction
26 $this->_view->display('index', array( 26 $this->_view->display('index', array(
27 'kidsHomePage' => true, 27 'kidsHomePage' => true,
28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
29 - 'showFooterTab' => false, 29 + 'showFooterTab' => true,
30 'maybeLike' => true, 30 'maybeLike' => true,
31 'content' => Index\HomeModel::getKidsFloor(), 31 'content' => Index\HomeModel::getKidsFloor(),
32 'pageFooter' => true, 32 'pageFooter' => true,
@@ -26,7 +26,7 @@ class LifestyleController extends AbstractAction @@ -26,7 +26,7 @@ class LifestyleController extends AbstractAction
26 $this->_view->display('index', array( 26 $this->_view->display('index', array(
27 'lifestyleHomePage' => true, 27 'lifestyleHomePage' => true,
28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
29 - 'showFooterTab' => false, 29 + 'showFooterTab' => true,
30 'maybeLike' => true, 30 'maybeLike' => true,
31 'content' => Index\HomeModel::getLifestyleFloor(), 31 'content' => Index\HomeModel::getLifestyleFloor(),
32 'pageFooter' => true, 32 'pageFooter' => true,
@@ -66,7 +66,7 @@ class BrandModel @@ -66,7 +66,7 @@ class BrandModel
66 $build = array(); 66 $build = array();
67 foreach ($brand['brandTop'][0]['data'] as $value) { 67 foreach ($brand['brandTop'][0]['data'] as $value) {
68 $build['url'] = Helpers::getFilterUrl($value['url']); 68 $build['url'] = Helpers::getFilterUrl($value['url']);
69 - $build['img'] = Helpers::getImageUrl($value['src'], 640, 300); 69 + $build['img'] = Helpers::getImageUrl($value['src'], 640, 310);
70 $build['title'] = $value['title']; 70 $build['title'] = $value['title'];
71 $result['bannerTop']['list'][] = $build; 71 $result['bannerTop']['list'][] = $build;
72 } 72 }