fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by ccbikai
Commit a050b417e7c768b22672f1860ecc7342f69415d5 2 parents e5e0cce6 06d05838

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

Inline Side-by-side
Showing 12 changed files with 112 additions and 48 deletions
@@ -149,7 +149,7 @@ function rePosFooter() { @@ -149,7 +149,7 @@ function rePosFooter() {
149 window._ozuid = uid;//暴露ozuid 149 window._ozuid = uid;//暴露ozuid
150 150
151 if (window._yas) { 151 if (window._yas) {
152 - window._yas(1 * new Date(), '1.0.13', 'yohobuy_m', uid, ''); 152 + window._yas(1 * new Date(), '1.0.13.1', 'yohobuy_m', uid, '');
153 } 153 }
154 }()); 154 }());
155 155
@@ -2,10 +2,12 @@ var $ = require('jquery'), @@ -2,10 +2,12 @@ var $ = require('jquery'),
2 Hammer = require('yoho.hammer'); 2 Hammer = require('yoho.hammer');
3 var employ; 3 var employ;
4 4
  5 +window.rePosFooter();
5 $('.employ span').each(function(index) { 6 $('.employ span').each(function(index) {
6 employ = new Hammer($('.employ span')[index]); 7 employ = new Hammer($('.employ span')[index]);
7 employ.on('tap', function(e) { 8 employ.on('tap', function(e) {
8 $('.employ-list').addClass('none').eq(index).removeClass('none'); 9 $('.employ-list').addClass('none').eq(index).removeClass('none');
9 $('.employ span').removeClass('active').eq(index).addClass('active'); 10 $('.employ span').removeClass('active').eq(index).addClass('active');
  11 + window.rePosFooter();
10 }); 12 });
11 }); 13 });
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
34 background: image-url('me/employ/employ.jpg') top center no-repeat; 34 background: image-url('me/employ/employ.jpg') top center no-repeat;
35 background-size: 100% 100%; 35 background-size: 100% 100%;
36 color: #fff; 36 color: #fff;
  37 + position: relative;
37 span{ 38 span{
38 width: 34.482759%; 39 width: 34.482759%;
39 height: 100%; 40 height: 100%;
@@ -52,16 +53,60 @@ @@ -52,16 +53,60 @@
52 font-size: 60em / $pxConvertRem; 53 font-size: 60em / $pxConvertRem;
53 } 54 }
54 } 55 }
  56 + i{
  57 + width: 100%;
  58 + height: 100%;
  59 + overflow: hidden;
  60 + display: block;
  61 + position: absolute;
  62 + top: 0;
  63 + left: 0;
  64 + background: image-url('me/employ/employsy.png') right top no-repeat;
  65 + background-size:auto 100%;
  66 + }
55 } 67 }
56 .null{ 68 .null{
57 - text-align: center;  
58 - color: #333;  
59 - margin-top: 55%;  
60 - font-size:56em / $pxConvertRem;  
61 - color: #333; 69 + width: 100%;
  70 + height:auto;
  71 + overflow: hidden;
  72 + position: absolute;
  73 + left: 0;
  74 + top:50%;
  75 + @include transform(translateY(-60%));
  76 + i{
  77 + width: 100%;
  78 + height: 120rem / $pxConvertRem;
  79 + overflow: hidden;
  80 + display: block;
  81 + background: image-url('me/employ/not.png') center top no-repeat;
  82 + background-size:auto 100%;
  83 + }
  84 + p{
  85 + width: 100%;
  86 + height: auto;
  87 + overflow: hidden;
  88 + padding:20rem / $pxConvertRem 0 0;
  89 + font-size: 48em / $pxConvertRem;
  90 + text-align: center;
  91 + color: #444;
  92 + }
  93 + a{
  94 + width: 73.75%;
  95 + height: 80rem / $pxConvertRem;
  96 + overflow: hidden;
  97 + font-size: 56em / $pxConvertRem;
  98 + line-height: 80rem / $pxConvertRem;
  99 + display: block;
  100 + background: #444444;
  101 + color: #fff;
  102 + text-align: center;
  103 + margin: 32em / $pxConvertRem auto;
  104 + @include border-radius(.2rem);
  105 +
  106 + }
62 } 107 }
63 108
64 } 109 }
65 .none{ 110 .none{
66 display: none; 111 display: none;
67 -}  
  112 +}
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 position: absolute; 58 position: absolute;
59 right: 40rem / $pxConvertRem; 59 right: 40rem / $pxConvertRem;
60 top:50%; 60 top:50%;
61 - @include transform(translateY(-50%)) 61 + @include transform(translateY(-50%));
62 } 62 }
63 span{ 63 span{
64 color: #b0b0b0; 64 color: #b0b0b0;
@@ -4,32 +4,6 @@ $subFontC:#b0b0b0; @@ -4,32 +4,6 @@ $subFontC:#b0b0b0;
4 $borderC:#e0e0e0; 4 $borderC:#e0e0e0;
5 $tableCellC:#eee; 5 $tableCellC:#eee;
6 $basicBtnC:#eb0313; 6 $basicBtnC:#eb0313;
7 -.my-swiper-button-prev,  
8 -.my-swiper-button-next {  
9 - position: absolute;  
10 - top: 50%;  
11 - width: pxToRem(48px);  
12 - height: pxToRem(48px);  
13 - margin-top: pxToRem(-44px);  
14 - cursor: pointer;  
15 - -moz-background-size: pxToRem(48px) pxToRem(48px);  
16 - -webkit-background-size: pxToRem(48px) pxToRem(48px);  
17 - background-size: pxToRem(48px) pxToRem(48px);  
18 - background-position: center;  
19 - background-repeat: no-repeat;  
20 -}  
21 -  
22 -.next-grey {  
23 - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23f0f0f0'%2F%3E%3C%2Fsvg%3E");  
24 - right: pxToRem(30px);  
25 - left: auto;  
26 -}  
27 -  
28 -.prev-grey {  
29 - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23f0f0f0'%2F%3E%3C%2Fsvg%3E");  
30 - left: pxToRem(30px);  
31 - right: auto;  
32 -}  
33 7
34 .good-detail-page { 8 .good-detail-page {
35 overflow: hidden; 9 overflow: hidden;
@@ -78,11 +52,38 @@ $basicBtnC:#eb0313; @@ -78,11 +52,38 @@ $basicBtnC:#eb0313;
78 border-right: none; 52 border-right: none;
79 } 53 }
80 } 54 }
81 - // }  
82 } 55 }
83 } 56 }
84 } 57 }
85 58
  59 + .my-swiper-button-prev,
  60 + .my-swiper-button-next {
  61 + position: absolute;
  62 + top: 50%;
  63 + width: pxToRem(48px);
  64 + height: pxToRem(48px);
  65 + margin-top: pxToRem(-44px);
  66 + cursor: pointer;
  67 + -moz-background-size: pxToRem(48px) pxToRem(48px);
  68 + -webkit-background-size: pxToRem(48px) pxToRem(48px);
  69 + background-size: pxToRem(48px) pxToRem(48px);
  70 + background-position: center;
  71 + background-repeat: no-repeat;
  72 + }
  73 +
  74 + .next-grey {
  75 + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23f0f0f0'%2F%3E%3C%2Fsvg%3E");
  76 + right: pxToRem(30px);
  77 + left: auto;
  78 + }
  79 +
  80 + .prev-grey {
  81 + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23f0f0f0'%2F%3E%3C%2Fsvg%3E");
  82 + left: pxToRem(30px);
  83 + right: auto;
  84 + }
  85 +
  86 +
86 .tag-container { 87 .tag-container {
87 position: absolute; 88 position: absolute;
88 left: pxToRem(108px); 89 left: pxToRem(108px);
@@ -256,7 +257,7 @@ $basicBtnC:#eb0313; @@ -256,7 +257,7 @@ $basicBtnC:#eb0313;
256 height: pxToRem(32px); 257 height: pxToRem(32px);
257 } 258 }
258 &:nth-child(1) { 259 &:nth-child(1) {
259 - text-align: right; 260 + text-align: left;
260 .vip-img { 261 .vip-img {
261 background: image-url('product/silver.png') no-repeat; 262 background: image-url('product/silver.png') no-repeat;
262 } 263 }
@@ -267,7 +268,7 @@ $basicBtnC:#eb0313; @@ -267,7 +268,7 @@ $basicBtnC:#eb0313;
267 } 268 }
268 } 269 }
269 &:nth-child(3) { 270 &:nth-child(3) {
270 - text-align: left; 271 + text-align: right;
271 .vip-img { 272 .vip-img {
272 background: image-url('product/platinum.png') no-repeat; 273 background: image-url('product/platinum.png') no-repeat;
273 } 274 }
@@ -13,7 +13,11 @@ @@ -13,7 +13,11 @@
13 </div> 13 </div>
14 {{/ used}} 14 {{/ used}}
15 {{^ used}} 15 {{^ used}}
16 - <p class="null">未找到相关相关优惠券</p> 16 + <div class="null">
  17 + <i></i>
  18 + <p>您还没有未使用的优惠券</p>
  19 + <a href="{{topURL}}">随便逛逛</a>
  20 + </div>
17 {{/ used}} 21 {{/ used}}
18 </div> 22 </div>
19 <div class="employ-list not none"> 23 <div class="employ-list not none">
@@ -22,10 +26,15 @@ @@ -22,10 +26,15 @@
22 <span>{{ money}}</span> 26 <span>{{ money}}</span>
23 <p>{{ coupon_name}}</p> 27 <p>{{ coupon_name}}</p>
24 <p>{{ couponValidity}}</p> 28 <p>{{ couponValidity}}</p>
  29 + <i></i>
25 </div> 30 </div>
26 {{/ unused}} 31 {{/ unused}}
27 {{^ unused}} 32 {{^ unused}}
28 - <p class="null">未找到相关相关优惠券</p> 33 + <div class="null">
  34 + <i></i>
  35 + <p>您还没有已使用的优惠券</p>
  36 + <a href="{{topURL}}">随便逛逛</a>
  37 + </div>
29 {{/ unused}} 38 {{/ unused}}
30 </div> 39 </div>
31 {{/ couponsUrl}} 40 {{/ couponsUrl}}
@@ -66,20 +66,28 @@ @@ -66,20 +66,28 @@
66 66
67 {{# goodsDiscount}} 67 {{# goodsDiscount}}
68 <div class="goodsDiscount"> 68 <div class="goodsDiscount">
69 - {{# list}} 69 + {{# list}}
70 {{#if @first}} 70 {{#if @first}}
71 - <h1 class="first-item">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1> 71 + {{#if text}}
  72 + <h1 class="first-item">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>
  73 + {{/if}}
  74 + {{/if}}
  75 + {{/ list}}
72 <div class="discount-folder"> 76 <div class="discount-folder">
  77 + {{# list}}
  78 + {{#if @first}}
73 {{else}} 79 {{else}}
  80 + {{#if text}}
74 <h1 class="folder-item">{{text}}</h1> 81 <h1 class="folder-item">{{text}}</h1>
75 {{/if}} 82 {{/if}}
76 - {{/ list}}  
77 - </div> 83 + {{/if}}
  84 + {{/list}}
  85 + </div>
78 </div> 86 </div>
79 {{/ goodsDiscount}} 87 {{/ goodsDiscount}}
80 88
81 - <div class="feedback-list ">  
82 {{# feedbacks}} 89 {{# feedbacks}}
  90 + <div class="feedback-list ">
83 {{#if commentsNum}} 91 {{#if commentsNum}}
84 {{> product/feedback-tab}} 92 {{> product/feedback-tab}}
85 {{else}} 93 {{else}}
@@ -92,8 +100,8 @@ @@ -92,8 +100,8 @@
92 </div> 100 </div>
93 {{/if}} 101 {{/if}}
94 {{/if}} 102 {{/if}}
95 - {{/ feedbacks}}  
96 </div> 103 </div>
  104 + {{/ feedbacks}}
97 105
98 {{# enterStore}} 106 {{# enterStore}}
99 <div id="enter-store" class="enter-store page-block"> 107 <div id="enter-store" class="enter-store page-block">
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 a.async=1; 28 a.async=1;
29 a.src=j; 29 a.src=j;
30 m.parentNode.insertBefore(a,m); 30 m.parentNode.insertBefore(a,m);
31 - })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13/yas-debug.js','_yas'); 31 + })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13.1/yas.js','_yas');
32 </script> 32 </script>
33 {{> layout/use}} 33 {{> layout/use}}
34 {{> layout/analysis}} 34 {{> layout/analysis}}
@@ -15,7 +15,6 @@ @@ -15,7 +15,6 @@
15 </div> 15 </div>
16 </div> 16 </div>
17 17
18 - <!-- 如果需要导航按钮 -->  
19 <div class="my-swiper-button-prev prev-grey"></div> 18 <div class="my-swiper-button-prev prev-grey"></div>
20 <div class="my-swiper-button-next next-grey"></div> 19 <div class="my-swiper-button-next next-grey"></div>
21 </div> 20 </div>
@@ -243,7 +243,7 @@ class HomeController extends AbstractAction @@ -243,7 +243,7 @@ class HomeController extends AbstractAction
243 'couponsUrl' => UserModel::getCouponData($uid), 243 'couponsUrl' => UserModel::getCouponData($uid),
244 'couponsPage' => true 244 'couponsPage' => true
245 ); 245 );
246 - 246 + $coupons['pageFooter'] = true;
247 $this->_view->display('coupons', $coupons); 247 $this->_view->display('coupons', $coupons);
248 } 248 }
249 249