Authored by Rock Zhang

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

Showing 57 changed files with 341 additions and 204 deletions
@@ -216,8 +216,8 @@ $('.btn-balance').on('touchend', function() { @@ -216,8 +216,8 @@ $('.btn-balance').on('touchend', function() {
216 } 216 }
217 }); 217 });
218 218
219 -$('.off-shell-goods .shopping-cart-good').on('touchend', function() {  
220 - tip.show('商品已下架'); 219 +$('.off-shell-goods').on('touchstart touchend', function() {
  220 + return false;
221 }); 221 });
222 222
223 $('.chose').on('touchend', function() { 223 $('.chose').on('touchend', function() {
@@ -34,6 +34,7 @@ var $chosePanel = $('#chose-panel'), @@ -34,6 +34,7 @@ var $chosePanel = $('#chose-panel'),
34 $allChoseItems, 34 $allChoseItems,
35 queryString, 35 queryString,
36 $choseArea, 36 $choseArea,
  37 + $cartBar,
37 $soonSoldOut = $('.soonSoldOut-tag'), 38 $soonSoldOut = $('.soonSoldOut-tag'),
38 $yohoPage = $('.yoho-page'); 39 $yohoPage = $('.yoho-page');
39 40
@@ -54,6 +55,7 @@ function init() { @@ -54,6 +55,7 @@ function init() {
54 $sizeRowList = $('.size-list ul'); 55 $sizeRowList = $('.size-list ul');
55 $colorRowList = $('.color-list ul'); 56 $colorRowList = $('.color-list ul');
56 $leftNum = $('#left-num'); 57 $leftNum = $('#left-num');
  58 + $cartBar = $('.cart-bar');
57 curColorIndex = 0; 59 curColorIndex = 0;
58 curSizeIndex = 0; 60 curSizeIndex = 0;
59 isEdit = 0; 61 isEdit = 0;
@@ -136,6 +138,10 @@ function show(html, cb) { @@ -136,6 +138,10 @@ function show(html, cb) {
136 function hide() { 138 function hide() {
137 $('.chose-panel').hide(); 139 $('.chose-panel').hide();
138 innerScroll.enableScroll($choseArea); 140 innerScroll.enableScroll($choseArea);
  141 +
  142 + if ($cartBar.length > 0) {
  143 + $cartBar.show();
  144 + }
139 } 145 }
140 146
141 //修改加入购物车的文字和背景 147 //修改加入购物车的文字和背景
@@ -128,6 +128,11 @@ $('.icon-edit').on('touchstart', function(e) { @@ -128,6 +128,11 @@ $('.icon-edit').on('touchstart', function(e) {
128 count, 128 count,
129 canEditNum; 129 canEditNum;
130 130
  131 + if ($this.parents('.off-shell-goods').length) {
  132 + tip.show('商品已下架');
  133 + return false;
  134 + }
  135 +
131 //如果点击的是上次编辑的商品,直接显示chose-pannel 136 //如果点击的是上次编辑的商品,直接显示chose-pannel
132 if (skn === previousEditSkn) { 137 if (skn === previousEditSkn) {
133 chosePanel.show(); 138 chosePanel.show();
@@ -173,6 +178,11 @@ $('.icon-edit').on('touchstart', function(e) { @@ -173,6 +178,11 @@ $('.icon-edit').on('touchstart', function(e) {
173 $('.icon-del').on('touchstart', function(e) { 178 $('.icon-del').on('touchstart', function(e) {
174 var $this = $(this); 179 var $this = $(this);
175 180
  181 + if ($this.parents('.off-shell-goods').length) {
  182 + tip.show('商品已下架');
  183 + return false;
  184 + }
  185 +
176 e.stopPropagation(); 186 e.stopPropagation();
177 187
178 dialog.showDialog({ 188 dialog.showDialog({
@@ -119,4 +119,10 @@ $page.on('touchstart', '.del-icon', function() { @@ -119,4 +119,10 @@ $page.on('touchstart', '.del-icon', function() {
119 } 119 }
120 }); 120 });
121 }); 121 });
122 -});  
  122 +});
  123 +
  124 +$('.deps').on('touchstart', 'span', function() {
  125 + $(this).css('background', '#eee');
  126 +}).on('touchend touchcancel', 'span', function() {
  127 + $(this).css('background', 'transparent');
  128 +});
@@ -3,8 +3,7 @@ @@ -3,8 +3,7 @@
3 * @author: bikai<kai.bi@yoho.cn> 3 * @author: bikai<kai.bi@yoho.cn>
4 * @date: 2015/11/12 4 * @date: 2015/11/12
5 */ 5 */
6 -var $ = require('jquery'),  
7 - noticeScroll = require('../plugin/notice-scroll'); 6 +var $ = require('jquery');
8 var $userAvatar = $('.user-avatar'), 7 var $userAvatar = $('.user-avatar'),
9 $listItem = $('.list-item'); 8 $listItem = $('.list-item');
10 var myImage = new Image(), 9 var myImage = new Image(),
@@ -20,8 +19,6 @@ myImage.onload = function() { @@ -20,8 +19,6 @@ myImage.onload = function() {
20 $userAvatar.css('background-image', 'url(' + avatar + ')'); 19 $userAvatar.css('background-image', 'url(' + avatar + ')');
21 }; 20 };
22 21
23 -noticeScroll('.notice');  
24 -  
25 $('.yoho-page').on('touchstart', '.list-item, .type-item, .order-title', function() { 22 $('.yoho-page').on('touchstart', '.list-item, .type-item, .order-title', function() {
26 $listItem.removeClass('highlight'); 23 $listItem.removeClass('highlight');
27 $(this).addClass('highlight'); 24 $(this).addClass('highlight');
1 -/**  
2 - * 公告栏目滚动  
3 - * bikai kai.bi@yoho.cn  
4 - */  
5 -  
6 -var $ = require('jquery');  
7 -  
8 -function noticeScroll(selecter, time) {  
9 - var $notice = $(selecter),  
10 - $noticeItem = $notice.find('.notice-item'),  
11 - count = $noticeItem.length,  
12 - i = 1;  
13 -  
14 - selecter = selecter || '.notice';  
15 - time = time || 3000;  
16 -  
17 - if (count > 1) {  
18 - setInterval(function() {  
19 - if (i >= count) {  
20 - i = 0;  
21 - }  
22 - $noticeItem.fadeOut();  
23 - $notice.find('.item-' + i).fadeIn();  
24 - i++;  
25 - }, time);  
26 - }  
27 -}  
28 -  
29 -module.exports = noticeScroll;  
@@ -64,6 +64,7 @@ $('#likeBtn').on('touchstart', function() { @@ -64,6 +64,7 @@ $('#likeBtn').on('touchstart', function() {
64 }); 64 });
65 65
66 $('#addtoCart').on('touchstart', function() { 66 $('#addtoCart').on('touchstart', function() {
  67 + $('.cart-bar').hide();
67 chosePanel.show(); 68 chosePanel.show();
68 69
69 //统计代码:用于统计用户加入购物车的动作 70 //统计代码:用于统计用户加入购物车的动作
@@ -9,6 +9,10 @@ @@ -9,6 +9,10 @@
9 height: 160rem / $pxConvertRem; 9 height: 160rem / $pxConvertRem;
10 } 10 }
11 11
  12 + .sold-out {
  13 + display: inline;
  14 + }
  15 +
12 .deps { 16 .deps {
13 margin-left: 135rem / $pxConvertRem; 17 margin-left: 135rem / $pxConvertRem;
14 padding: 0.5rem 0; 18 padding: 0.5rem 0;
@@ -43,7 +47,7 @@ @@ -43,7 +47,7 @@
43 } 47 }
44 48
45 .sold-out-tag { 49 .sold-out-tag {
46 - font-size: 16px; 50 + font-size: 12px;
47 line-height: 30rem / $pxConvertRem; 51 line-height: 30rem / $pxConvertRem;
48 text-align: center; 52 text-align: center;
49 color: #fff; 53 color: #fff;
@@ -52,9 +52,9 @@ @@ -52,9 +52,9 @@
52 font-size: 50px; 52 font-size: 50px;
53 } 53 }
54 p{ 54 p{
55 - width: 59.517241%; 55 + width: 61.517241%;
56 height: auto; 56 height: auto;
57 - margin: 0 3% 16em / $pxConvertRem; 57 + margin: 0 2% 16em / $pxConvertRem;
58 float: left; 58 float: left;
59 &:first-of-type{ 59 &:first-of-type{
60 margin-top: 0.75rem; 60 margin-top: 0.75rem;
@@ -86,6 +86,7 @@ @@ -86,6 +86,7 @@
86 } 86 }
87 87
88 .my-link { 88 .my-link {
  89 + margin-bottom: pxToRem(30px);
89 padding: pxToRem(6px) 0; 90 padding: pxToRem(6px) 0;
90 text-align: center; 91 text-align: center;
91 background: rgba(0,0,0,0.8); 92 background: rgba(0,0,0,0.8);
@@ -132,34 +133,6 @@ @@ -132,34 +133,6 @@
132 } 133 }
133 } 134 }
134 135
135 - .notice {  
136 - margin-bottom: pxToRem(30px);  
137 - padding: 0 pxToRem(30px);  
138 - background: #fff;  
139 - height: pxToRem(72px);  
140 - overflow: hidden;  
141 -  
142 - .notice-item {  
143 - display: block;  
144 - width: 100%;  
145 - font-size: pxToRem(24px);  
146 - line-height: pxToRem(72px);  
147 - color: #444;  
148 - white-space: nowrap;  
149 - overflow: hidden;  
150 - text-overflow: ellipsis;  
151 - }  
152 -  
153 - .notice-icon {  
154 - display: inline-block;  
155 - margin-right: pxToRem(10px);  
156 - width: pxToRem(28px);  
157 - height: pxToRem(28px);  
158 - @include rem-sprite($index, volume);  
159 - vertical-align: middle;  
160 - }  
161 - }  
162 -  
163 .my-order { 136 .my-order {
164 margin-bottom: pxToRem(30px); 137 margin-bottom: pxToRem(30px);
165 border-top: 1px solid #e0e0e0; 138 border-top: 1px solid #e0e0e0;
@@ -233,18 +206,17 @@ @@ -233,18 +206,17 @@
233 padding: 0 pxToRem(30px); 206 padding: 0 pxToRem(30px);
234 font-size: 16px; 207 font-size: 16px;
235 line-height: pxToRem(88px); 208 line-height: pxToRem(88px);
236 -  
237 .opinion{ 209 .opinion{
238 width: 1.3rem; 210 width: 1.3rem;
239 height: 1.3rem; 211 height: 1.3rem;
240 overflow: hidden; 212 overflow: hidden;
241 display: inline-block; 213 display: inline-block;
242 - @include rem-sprite($index, talk); 214 + background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDY3IDc5LjE1Nzc0NywgMjAxNS8wMy8zMC0yMzo0MDo0MiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTkyQTQ3NkNCOEQ4MTFFNUIzNTY5MTI2NjU5ODYzQkQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTkyQTQ3NkJCOEQ4MTFFNUIzNTY5MTI2NjU5ODYzQkQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDMkMzNzRFRkFFMEYxMUU1OEM0Q0U0Q0M3NkZCNzIyMCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDMkMzNzRGMEFFMEYxMUU1OEM0Q0U0Q0M3NkZCNzIyMCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhkYSdAAAAS0SURBVHja7FpZSFRhFL6TrUZJC0K2WFlmL0Y7thcjkWZlQfVQ0QJWD+09tEMb9BAkPlVQCYVESJtlhhbRJkVqiCHtqylRD5Ut0GLfyTPxe/zvvePM3JlJPPD537n33HPOd8+//7rq6uqM5iCtjGYizYZIa/rjcrn8MuJ2u/ugGAuMBgYD/YBoIEpR+wi8A54DlcAd4FZRUdErf3x7moaLLnwhguBjUSwGZgOJfsRSDpwGskHqZdCIgMBwFDuA6QGumr+BC8AuECpxjAgI9EaRyRlwWihDa0HodUCJgEQGiv1AJwu1x8B1oISvqe5/Ar4D7YHOALWlgQBldQJfm8lnYCPIHPabCAhEojgILDSxQ8EeAU7C4SMf2lk8ivnAMiapk+PACtj/6hMROIniOjtO8/4zYDdwAg5++luP4It6zwXAdqC/RuUmtUn4+tgkIjDcEcVVYJR4j4LeC+yD0e+BbhjwS1VwE7DVMzQocheYAr9fvCICYxEozgMpwtAbYC4MFTvd0hFDEopTQC/xKB+YgRh+SSK67nOzhsQDICkYJEjYTxL7VSWF42skDTKCLzGMUxih6DwFxsD4u2BPOxAPzQ5uA3HKbcrGKMRTapWRTEGC6mNqKEhwZshvKsfhkQiOUz9pBHtK23jxfA2MPQzlZJD9rxG3x3O82tnvaqFMk7qjYTK5PcrxGGbx/m0jycnJPXD9VjYsfI1L4TJNRwamca+lSkxhYWG1mpE0zYBXEGZLjgKOS5U0WbVk2ziHbITVGpjjOSfbiiQi1xM3wnQhKONKbLBChMRqBkC7FeFhnsLQuJMhV3qB0rGJK1ZmJEoovLf5MjnAVKALlzkO6ljFFWW3+fDbxuBYm9+B1PEqLg+RWnG/q43BRza/A6ljFVetJFItFOJtDC4Bavi6hn87pWMVV7UkUi4URtt0hbd5ik3bPr34tyM6NnGVy16Lps1zFIWZwE4bMjQLfREMHRGXKsUyI3lCYSi6xhHhNIBwPEPF7bwGRHjjoFQobQmzwVDGU6pueKjdb5ZQTMdXcIdJNiiOdHE7y2wan6Pp/rJho3uISZD/bE03naMlgjT9QLFevNATyIWxdiEiQX5zOQ5V1nO82owQmYsa9hOZTGSQSUQyiYmylnCchikRllVAhbhHG9aFMB4TJBKDuPpMF48qOD7DlgjY1vK2S5V4NAa4DyezHCZB9ss01amKV621tttBwuAAFFcM/Z4sLTm3wWhZAAnQGLFHs6dGQpvhw+HviXzg7SY2TR/OAGaDYz6vJ/Jl4/My+DYceIYJAY+Q7SHwUekTEaXnOACstHBEX+yyoRwrwOl7k65UPVagNUhnL3mT7UlyCe7LQc8kFIe8mBl75JvR+Hykg581cCmIHPOLCJOhSeYio377v28IhpYPQIKabatNbKuZ6k+ANsvieCvmLH9xf4TepyMMb7Zluxn1J2fe91pNHLjcRsPj6WiLVyjgf8fT9d+n6CvstMX1PGADNWwbt5PxzjWfq1YTyXnO2ck4eft7zm52hCben8LTpVQTlXuwM9JxIgH8IAko1nG7bK8ucUEk5r8hIrpt6v6Xc++3GkSyGxFpDtLy30EtRBySPwIMACKUEyE6TctsAAAAAElFTkSuQmCC");
  215 + background-size:100% 100%;
243 position: relative; 216 position: relative;
244 top: .36rem; 217 top: .36rem;
245 margin-right: pxToRem(12px); 218 margin-right: pxToRem(12px);
246 } 219 }
247 -  
248 &.highlight { 220 &.highlight {
249 background: #eee; 221 background: #eee;
250 } 222 }
1 $vip: sprite-map("me/vip/*.png", $spacing: 10px); 1 $vip: sprite-map("me/vip/*.png", $spacing: 10px);
2 $fav: sprite-map("me/fav/*.png", $spacing: 5px); 2 $fav: sprite-map("me/fav/*.png", $spacing: 5px);
3 -$index: sprite-map("me/index/*.png", $spacing: 5px);  
4 3
5 @import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp", "browse-record", "logistic", "pay","yoho-coin-new", "yoho-coin-detail"; 4 @import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp", "browse-record", "logistic", "pay","yoho-coin-new", "yoho-coin-detail";
1 -@import "new-arrival", "discount", "list", "detail", "suspend-cart", "hot-rank", "_recommend-for-you.scss";  
  1 +@import "new-arrival", "discount", "list", "detail", "suspend-cart", "hot-rank", "_recommend-for-you.scss", "limit";
  1 +.limit-good-page {
  2 + background-color: #f4f4f4;
  3 + color: #444;
  4 +
  5 + .top {
  6 + font-size: 0.6rem;
  7 + height: 2rem;
  8 + line-height: 2.2rem;
  9 + margin-bottom: 0.1rem;
  10 + background-color: #fff;
  11 + padding: 0.2rem 0;
  12 +
  13 +
  14 + div {
  15 + width: 20%;
  16 + display: inline-block;
  17 + float: left;
  18 + img {
  19 + width: 1.5rem;
  20 + border: 1px solid #ccc;
  21 + border-radius: 100%;
  22 + position: relative;
  23 + top: 0.25rem;
  24 + }
  25 + }
  26 +
  27 + p {
  28 + display: inline-block;
  29 + float: left;
  30 + width: 80%;
  31 + }
  32 + }
  33 +
  34 + .detail {
  35 + background-color: #fff;
  36 + padding: 0.6rem 0.8rem;
  37 + border-bottom: 1px solid #e6e6e6;
  38 +
  39 + .name {
  40 + font-size: 0.9rem;
  41 + margin-bottom: 0.5rem;
  42 + }
  43 + .sale-info {
  44 + height: 1rem;
  45 + line-height: 1rem;
  46 + }
  47 + .price {
  48 + font-size: 0.8rem;
  49 + color: #d0021b;
  50 + float: left;
  51 + }
  52 +
  53 + .date {
  54 + font-size: 0.6rem;
  55 + float: right;
  56 +
  57 + .text {
  58 + position: relative;
  59 + top: 0.08rem;
  60 + }
  61 + }
  62 + }
  63 +
  64 + .goodDesc {
  65 + margin-top: 1rem;
  66 + }
  67 +
  68 + .bottom {
  69 + background-color: #fff;
  70 + border-top: 1px solid #e6e6e6;
  71 + padding: 0.5rem 2rem 2rem 2rem;
  72 + height: 3rem;
  73 + position: absolute;
  74 + bottom: 0;
  75 + width: 12rem;
  76 + margin: 0 auto;
  77 +
  78 + .logo {
  79 + width: 100;
  80 + height: 2.5rem;
  81 +
  82 + background-image: image-url('logo-bottom.png');
  83 + background-size: 100%;
  84 + background-repeat: no-repeat;
  85 + background-position: center;
  86 + }
  87 +
  88 + .btn {
  89 + font-size: 0.8rem;
  90 + background-color: #fff;
  91 + border: 1px solid #444;
  92 + border-radius: 0.2rem;
  93 + padding: 0.3rem 0.6rem;
  94 + }
  95 +
  96 + .btn:active {
  97 + background-color: #ccc;
  98 + }
  99 +
  100 + .left, .right {
  101 + display: inline-block;
  102 + float: left;
  103 + }
  104 +
  105 + .left {
  106 + width: 39%;
  107 + }
  108 +
  109 + .right {
  110 + width: 60%;
  111 + font-size: 0.65rem;
  112 +
  113 + span {
  114 + display: block;
  115 + width: 95%;
  116 + margin: 0 auto;
  117 + }
  118 + }
  119 + }
  120 +}
@@ -21,90 +21,90 @@ @@ -21,90 +21,90 @@
21 </head> 21 </head>
22 <body> 22 <body>
23 <div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}"> 23 <div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}">
24 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/01.jpg">  
25 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/02.jpg">  
26 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/03.jpg">  
27 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">  
28 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/04.jpg"> 24 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/01.jpg">
  25 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/02.jpg">
  26 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/03.jpg">
  27 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
  28 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/04.jpg">
29 <div class="img-box"> 29 <div class="img-box">
30 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/05.jpg"> 30 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/05.jpg">
31 <a class="href href-right" href="{{url_yohope}}"></a> 31 <a class="href href-right" href="{{url_yohope}}"></a>
32 </div> 32 </div>
33 <div class="img-box"> 33 <div class="img-box">
34 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/06.jpg"> 34 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/06.jpg">
35 <a class="href href-center" href="{{url_mycoupon}}"></a> 35 <a class="href href-center" href="{{url_mycoupon}}"></a>
36 </div> 36 </div>
37 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-2.jpg"> 37 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-2.jpg">
38 38
39 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/07.jpg"> 39 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/07.jpg">
40 <div class="img-box"> 40 <div class="img-box">
41 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/08.jpg"> 41 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/08.jpg">
42 <a class="href href-left" href="{{url_more}}"></a> 42 <a class="href href-left" href="{{url_more}}"></a>
43 <a class="href href-right" href="{{url_more}}"></a> 43 <a class="href href-right" href="{{url_more}}"></a>
44 </div> 44 </div>
45 <div class="img-box"> 45 <div class="img-box">
46 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/09.jpg">  
47 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12258"></span>  
48 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12259"></span> 46 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/09.jpg">
  47 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12311"></span>
  48 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12312"></span>
49 </div> 49 </div>
50 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 50 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
51 <div class="img-box"> 51 <div class="img-box">
52 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/10.jpg"> 52 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/10.jpg">
53 <a class="href href-left" href="{{url_more}}"></a> 53 <a class="href href-left" href="{{url_more}}"></a>
54 <a class="href href-right" href="{{url_1}}"></a> 54 <a class="href href-right" href="{{url_1}}"></a>
55 </div> 55 </div>
56 <div class="img-box"> 56 <div class="img-box">
57 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/11.jpg">  
58 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12260"></span>  
59 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12261"></span> 57 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/11.jpg">
  58 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12313"></span>
  59 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12314"></span>
60 </div> 60 </div>
61 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 61 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
62 <div class="img-box"> 62 <div class="img-box">
63 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/12.jpg"> 63 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/12.jpg">
64 <a class="href href-left" href="{{url_1}}"></a> 64 <a class="href href-left" href="{{url_1}}"></a>
65 <a class="href href-right" href="{{url_2}}"></a> 65 <a class="href href-right" href="{{url_2}}"></a>
66 </div> 66 </div>
67 <div class="img-box"> 67 <div class="img-box">
68 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/13.jpg">  
69 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12262"></span>  
70 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12263"></span> 68 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/13.jpg">
  69 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12315"></span>
  70 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12316"></span>
71 </div> 71 </div>
72 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 72 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
73 <div class="img-box"> 73 <div class="img-box">
74 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/14.jpg"> 74 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/14.jpg">
75 <a class="href href-left" href="{{url_3}}"></a> 75 <a class="href href-left" href="{{url_3}}"></a>
76 <a class="href href-right" href="{{url_4}}"></a> 76 <a class="href href-right" href="{{url_4}}"></a>
77 </div> 77 </div>
78 <div class="img-box"> 78 <div class="img-box">
79 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/15.jpg">  
80 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12264"></span>  
81 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12265"></span> 79 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/15.jpg">
  80 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12317"></span>
  81 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12318"></span>
82 </div> 82 </div>
83 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 83 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
84 <div class="img-box"> 84 <div class="img-box">
85 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/16.jpg"> 85 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/16.jpg">
86 <a class="href href-left" href="{{url_5}}"></a> 86 <a class="href href-left" href="{{url_5}}"></a>
87 <a class="href href-right" href="{{url_6}}"></a> 87 <a class="href href-right" href="{{url_6}}"></a>
88 </div> 88 </div>
89 <div class="img-box"> 89 <div class="img-box">
90 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/17.jpg">  
91 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12266"></span>  
92 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12267"></span> 90 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/17.jpg">
  91 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12319"></span>
  92 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12320"></span>
93 </div> 93 </div>
94 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 94 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
95 95
96 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-1.jpg"> 96 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-1.jpg">
97 <div class="img-box"> 97 <div class="img-box">
98 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-2.jpg"> 98 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-2.jpg">
99 <a class="show-more" href="{{url_help}}"></a> 99 <a class="show-more" href="{{url_help}}"></a>
100 </div> 100 </div>
101 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-3.jpg">  
102 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-2.jpg">  
103 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-1.jpg">  
104 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-2.jpg">  
105 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-3.jpg">  
106 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/26.jpg">  
107 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/27.jpg"> 101 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-3.jpg">
  102 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-2.jpg">
  103 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-1.jpg">
  104 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-2.jpg">
  105 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-3.jpg">
  106 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/26.jpg">
  107 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/27.jpg">
108 </div> 108 </div>
109 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script> 109 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
110 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script> 110 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
@@ -14,97 +14,97 @@ @@ -14,97 +14,97 @@
14 .img-box .href-right {right: 0} 14 .img-box .href-right {right: 0}
15 .img-box .href-center {width: 90%;height: 100%;position: absolute;top: 0;left: 5%;} 15 .img-box .href-center {width: 90%;height: 100%;position: absolute;top: 0;left: 5%;}
16 .show-more {height: 100%;width: 25%;position: absolute;top: 0;right: 10%;} 16 .show-more {height: 100%;width: 25%;position: absolute;top: 0;right: 10%;}
17 - .yoho-tip {position: fixed;display: none;textlign: center;width: 70%;padding: 34px 0;top: 50%;left: 50%;margin-left: -35%;margin-top: -45px;background-color: #000;opacity: 0.9;color: #fff;font-size: 18px;border: none;border-radius: 10px;} 17 + .yoho-tip {position: fixed;display: none;text-align: center;width: 70%;padding: 34px 0;top: 50%;left: 50%;margin-left: -35%;margin-top: -45px;background-color: #000;opacity: 0.9;color: #fff;font-size: 18px;border: none;border-radius: 10px;}
18 </style> 18 </style>
19 <link rel="dns-prefetch" href="//cdn.yoho.cn"> 19 <link rel="dns-prefetch" href="//cdn.yoho.cn">
20 <link rel="dns-prefetch" href="//static.yohobuy.com"> 20 <link rel="dns-prefetch" href="//static.yohobuy.com">
21 </head> 21 </head>
22 <body> 22 <body>
23 <div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}"> 23 <div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}">
24 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/01.jpg">  
25 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/02.jpg">  
26 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/03.jpg">  
27 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">  
28 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/04.jpg"> 24 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/01.jpg">
  25 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/02.jpg">
  26 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/03.jpg">
  27 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
  28 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/04.jpg">
29 <div class="img-box"> 29 <div class="img-box">
30 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/05.jpg"> 30 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/05.jpg">
31 <a class="href href-right" href="{{url_yohope}}"></a> 31 <a class="href href-right" href="{{url_yohope}}"></a>
32 </div> 32 </div>
33 <div class="img-box"> 33 <div class="img-box">
34 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/06.jpg"> 34 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/06.jpg">
35 <a class="href href-center" href="{{url_mycoupon}}"></a> 35 <a class="href href-center" href="{{url_mycoupon}}"></a>
36 </div> 36 </div>
37 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-2.jpg"> 37 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-2.jpg">
38 38
39 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/07.jpg"> 39 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/07.jpg">
40 <div class="img-box"> 40 <div class="img-box">
41 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/08.jpg"> 41 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/08.jpg">
42 <a class="href href-left" href="{{url_more}}"></a> 42 <a class="href href-left" href="{{url_more}}"></a>
43 <a class="href href-right" href="{{url_more}}"></a> 43 <a class="href href-right" href="{{url_more}}"></a>
44 </div> 44 </div>
45 <div class="img-box"> 45 <div class="img-box">
46 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/09.jpg">  
47 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18719"></span>  
48 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18723"></span> 46 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/09.jpg">
  47 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18881"></span>
  48 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18883"></span>
49 </div> 49 </div>
50 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 50 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
51 <div class="img-box"> 51 <div class="img-box">
52 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/10.jpg"> 52 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/10.jpg">
53 <a class="href href-left" href="{{url_more}}"></a> 53 <a class="href href-left" href="{{url_more}}"></a>
54 <a class="href href-right" href="{{url_1}}"></a> 54 <a class="href href-right" href="{{url_1}}"></a>
55 </div> 55 </div>
56 <div class="img-box"> 56 <div class="img-box">
57 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/11.jpg">  
58 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18725"></span>  
59 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18727"></span> 57 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/11.jpg">
  58 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18885"></span>
  59 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18887"></span>
60 </div> 60 </div>
61 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 61 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
62 <div class="img-box"> 62 <div class="img-box">
63 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/12.jpg">  
64 - <a class="href href-left" href="{{url_1}}"></a>  
65 - <a class="href href-right" href="{{url_2}}"></a> 63 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/12.jpg">
  64 + <a class="href href-left" href="{{url_2}}"></a>
  65 + <a class="href href-right" href="{{url_3}}"></a>
66 </div> 66 </div>
67 <div class="img-box"> 67 <div class="img-box">
68 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/13.jpg">  
69 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18717"></span>  
70 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18729"></span> 68 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/13.jpg">
  69 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18895"></span>
  70 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18889"></span>
71 </div> 71 </div>
72 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 72 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
73 <div class="img-box"> 73 <div class="img-box">
74 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/14.jpg">  
75 - <a class="href href-left" href="{{url_3}}"></a>  
76 - <a class="href href-right" href="{{url_4}}"></a> 74 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/14.jpg">
  75 + <a class="href href-left" href="{{url_4}}"></a>
  76 + <a class="href href-right" href="{{url_5}}"></a>
77 </div> 77 </div>
78 <div class="img-box"> 78 <div class="img-box">
79 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/15.jpg">  
80 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18731"></span>  
81 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18733"></span> 79 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/15.jpg">
  80 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18893"></span>
  81 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18891"></span>
82 </div> 82 </div>
83 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 83 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
84 <div class="img-box"> 84 <div class="img-box">
85 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/16.jpg">  
86 - <a class="href href-left" href="{{url_5}}"></a>  
87 - <a class="href href-right" href="{{url_6}}"></a> 85 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/16.jpg">
  86 + <a class="href href-left" href="{{url_6}}"></a>
  87 + <a class="href href-right" href="{{url_7}}"></a>
88 </div> 88 </div>
89 <div class="img-box"> 89 <div class="img-box">
90 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/17.jpg">  
91 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18735"></span>  
92 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18737"></span> 90 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/17.jpg">
  91 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18897"></span>
  92 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18899"></span>
93 </div> 93 </div>
94 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 94 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
95 95
96 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-1.jpg"> 96 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-1.jpg">
97 <div class="img-box"> 97 <div class="img-box">
98 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-2.jpg"> 98 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-2.jpg">
99 <a class="show-more" href="{{url_help}}"></a> 99 <a class="show-more" href="{{url_help}}"></a>
100 </div> 100 </div>
101 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-3.jpg">  
102 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-2.jpg">  
103 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-1.jpg">  
104 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-2.jpg">  
105 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-3.jpg">  
106 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/26.jpg">  
107 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/27.jpg"> 101 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-3.jpg">
  102 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-2.jpg">
  103 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-1.jpg">
  104 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-2.jpg">
  105 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-3.jpg">
  106 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/26.jpg">
  107 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/27.jpg">
108 </div> 108 </div>
109 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script> 109 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
110 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script> 110 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <span class="market-price"{{market_price}}</span> 10 <span class="market-price"{{market_price}}</span>
11 {{/if}} 11 {{/if}}
12 </p> 12 </p>
13 - <p class="row"> 13 + <p class="sold-out row">
14 {{#unless storage}} 14 {{#unless storage}}
15 <span class="sold-out-tag">已售罄</span> 15 <span class="sold-out-tag">已售罄</span>
16 {{/unless}} 16 {{/unless}}
@@ -33,16 +33,6 @@ @@ -33,16 +33,6 @@
33 <p>浏览记录</p> 33 <p>浏览记录</p>
34 </a> 34 </a>
35 </div> 35 </div>
36 - {{#if notice}}  
37 - <div class="notice">  
38 - {{#notice}}  
39 - <a class="notice-item item-{{@index}}" href="{{url}}">  
40 - <span class="notice-icon"></span>  
41 - {{title}}  
42 - </a>  
43 - {{/notice}}  
44 - </div>  
45 - {{/if}}  
46 <div class="my-order"> 36 <div class="my-order">
47 <a class="order-title" href="/home/orders"> 37 <a class="order-title" href="/home/orders">
48 我的订单 38 我的订单
  1 +{{> layout/header}}
  2 +<div class="yoho-page">
  3 + <div class="goodDesc"></div>
  4 +</div>
  5 +{{> layout/footer}}
  1 +{{> layout/header}}
  2 +<div class="limit-good-page yoho-page">
  3 + <div class="top clearfix">
  4 + <div>
  5 + <img src="{{profile}}" alt="">
  6 + </div>
  7 + <p>我在Yoho!Buy有货发现了一个限定发售商品</p>
  8 + </div>
  9 + <div class="banner">
  10 + <a href="{{bannerSrc}}">
  11 + <img src="{{banner}}" alt="">
  12 + </a>
  13 + </div>
  14 + <div class="detail clearfix">
  15 + <p class="name">{{name}}</p>
  16 + <div class="sale-info">
  17 + <span class="price">¥{{price}}</span>
  18 + <span class="date">
  19 + <span class="iconfont">&#xe603;</span>
  20 + <span class="text">{{releaseDate}}</span>
  21 + </span>
  22 + </div>
  23 + </div>
  24 +
  25 + <div class="goodDesc"></div>
  26 +
  27 + <div class="bottom">
  28 + <div class="logo"></div>
  29 + <div class="left">
  30 + <a href="{{appSrc}}">
  31 + <button class="btn">
  32 + 立即下载
  33 + </button>
  34 + </a>
  35 + </div>
  36 + <div class="right">
  37 + <span>下载Yoho!Buy有货APP</span>
  38 + <span>抢购超级限量款</span>
  39 + </div>
  40 + </div>
  41 +
  42 +</div>
  43 +{{> layout/footer}}
@@ -552,8 +552,8 @@ class CouponController extends HuodongAction @@ -552,8 +552,8 @@ class CouponController extends HuodongAction
552 } 552 }
553 $url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}'; 553 $url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}';
554 554
555 - $this->_view->display('newuser3', array(  
556 - 'activityId' => 498, //492, // 94活动ID 555 + $this->_view->display('newuser3-test', array(
  556 + 'activityId' => 489, //508, //498, //492, // 94活动ID
557 'staticTitle' => '新人潮这看,超值惊喜等你领', // 标题 557 'staticTitle' => '新人潮这看,超值惊喜等你领', // 标题
558 'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}', 558 'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
559 'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录 559 'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录
@@ -561,13 +561,20 @@ class CouponController extends HuodongAction @@ -561,13 +561,20 @@ class CouponController extends HuodongAction
561 'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}', 561 'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}',
562 'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}', 562 'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
563 'url_more' => $url, 563 'url_more' => $url,
  564 +// 'url_1' => 'http://list.m.yohobuy.com/?msort=1&misort=18,20,21,22&title=冬装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22","title":"冬装"}}',
  565 +// 'url_2' => 'http://list.m.yohobuy.com/?msort=6&misort=45&title=靴子&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"靴子"}}',
  566 +// 'url_5' => 'http://list.m.yohobuy.com/?msort=1&misort=16,257&title=春装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"16,257","title":"春装"}}',
  567 +// 'url_4' => 'http://list.m.yohobuy.com/?msort=3,4&title=下装&openby:yohobuy={"action":"go.list","params":{"msort":"3,4","title":"下装"}}',
  568 +// 'url_3' => 'http://list.m.yohobuy.com/?msort=7,8&title=包配&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
  569 +// 'url_6' => 'http://list.m.yohobuy.com/?msort=1,3,6&misort=11,28,12,46&title=反季&openby:yohobuy={"action":"go.list","params":{"msort":"1,3,6","misort":"11,28,12,46","title":"反季"}}',
  570 +
564 'url_1' => 'http://list.m.yohobuy.com/?msort=1&misort=18,20,21,22&title=冬装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22","title":"冬装"}}', 571 'url_1' => 'http://list.m.yohobuy.com/?msort=1&misort=18,20,21,22&title=冬装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22","title":"冬装"}}',
565 - 'url_2' => 'http://list.m.yohobuy.com/?msort=6&misort=45&title=靴子&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"靴子"}}',  
566 - 'url_5' => 'http://list.m.yohobuy.com/?msort=1&misort=16,257&title=春装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"16,257","title":"春装"}}', 572 + 'url_2' => 'http://list.m.yohobuy.com/?msort=1&misort=21,22,226&title=春装外套&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22","title":"春装外套"}}',
  573 + 'url_3' => 'http://list.m.yohobuy.com/?msort=6&misort=45&title=靴子&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"靴子"}}',
567 'url_4' => 'http://list.m.yohobuy.com/?msort=3,4&title=下装&openby:yohobuy={"action":"go.list","params":{"msort":"3,4","title":"下装"}}', 574 'url_4' => 'http://list.m.yohobuy.com/?msort=3,4&title=下装&openby:yohobuy={"action":"go.list","params":{"msort":"3,4","title":"下装"}}',
568 - 'url_3' => 'http://list.m.yohobuy.com/?msort=7,8&title=包配&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',  
569 - 'url_6' => 'http://list.m.yohobuy.com/?msort=1,3,6&misort=11,28,12,46&title=反季&openby:yohobuy={"action":"go.list","params":{"msort":"1,3,6","misort":"11,28,12,46","title":"反季"}}',  
570 - 'url_7' => 'http://list.m.yohobuy.com/?msort=1&misort=18,20,21,22&title=冬装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22","title":"冬装"}}', 575 + 'url_5' => 'http://list.m.yohobuy.com/?msort=7,8&title=包配&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
  576 + 'url_6' => 'http://list.m.yohobuy.com/?msort=1&misort=16,257&title=春装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"16,257","title":"春装"}}',
  577 + 'url_7' => 'http://list.m.yohobuy.com/?msort=1,3,6&misort=11,28,12,46&title=夏装&openby:yohobuy={"action":"go.list","params":{"msort":"1,3,6","misort":"11,28,12,46","title":"夏装"}}',
571 )); 578 ));
572 } 579 }
573 580
@@ -51,24 +51,6 @@ class HomeController extends AbstractAction @@ -51,24 +51,6 @@ class HomeController extends AbstractAction
51 'myIndexPage' => true, 51 'myIndexPage' => true,
52 'showDownloadApp' => true, 52 'showDownloadApp' => true,
53 'navHome' => true, 53 'navHome' => true,
54 - 'notice' => array(  
55 - array(  
56 - 'title' => '1. 通知内容内容通知内容内容通知内容内容通知内容内容通知内容内容',  
57 - 'url' => 'http://www.yoho.cn'  
58 - ),  
59 - array(  
60 - 'title' => '2. 通知内容内容通知内容内容通知内容内容通知内容内容通知内容内容',  
61 - 'url' => 'http://www.yoho.cn'  
62 - ),  
63 - array(  
64 - 'title' => '3. 通知内容内容通知内容内容通知内容内容通知内容内容通知内容内容',  
65 - 'url' => 'http://www.yoho.cn'  
66 - ),  
67 - array(  
68 - 'title' => '4. 通知内容内容通知内容内容通知内容内容通知内容内容通知内容内容',  
69 - 'url' => 'http://www.yoho.cn'  
70 - )  
71 - ),  
72 'pageFooter' => true, 54 'pageFooter' => true,
73 'cartUrl' => Helpers::url('/cart/index/index', null), 55 'cartUrl' => Helpers::url('/cart/index/index', null),
74 'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home'))), 56 'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home'))),
@@ -487,7 +469,7 @@ class HomeController extends AbstractAction @@ -487,7 +469,7 @@ class HomeController extends AbstractAction
487 $info = 'userId=' . $uid . '&name=' . $this->_uname . '&memo=&hashCode=' . md5( strtoupper( rawurlencode($uid . $this->_uname . $time . '1231') ) ) . '&timestamp=' . $time; 469 $info = 'userId=' . $uid . '&name=' . $this->_uname . '&memo=&hashCode=' . md5( strtoupper( rawurlencode($uid . $this->_uname . $time . '1231') ) ) . '&timestamp=' . $time;
488 $serviceUrl .= rawurlencode($info); 470 $serviceUrl .= rawurlencode($info);
489 } 471 }
490 - 472 +
491 $this->_view->display('online-service', array( 473 $this->_view->display('online-service', array(
492 'onlineServicePage' => true, 474 'onlineServicePage' => true,
493 'pageFooter' => true, 475 'pageFooter' => true,
@@ -218,6 +218,7 @@ class UserModel @@ -218,6 +218,7 @@ class UserModel
218 $product['discountPrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '¥' . Helpers::transPrice($val['sales_price']) : false; 218 $product['discountPrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '¥' . Helpers::transPrice($val['sales_price']) : false;
219 $product['savePrice'] = ($val['price_down'] > 0) ? '¥' . Helpers::transPrice($val['price_down']) : false; 219 $product['savePrice'] = ($val['price_down'] > 0) ? '¥' . Helpers::transPrice($val['price_down']) : false;
220 $product['sellOut'] = ($val['storage'] <= 0); 220 $product['sellOut'] = ($val['storage'] <= 0);
  221 + $product['invalidGoods'] = ($val['status'] == 0); // 下架商品
221 222
222 $datas[] = $product; 223 $datas[] = $product;
223 } 224 }
@@ -358,9 +359,9 @@ class UserModel @@ -358,9 +359,9 @@ class UserModel
358 $record = array(); 359 $record = array();
359 foreach ($data as &$val) { 360 foreach ($data as &$val) {
360 // 排除下架的商品 361 // 排除下架的商品
361 - if ($val['status'] == 0) { 362 + /*if ($val['status'] == 0) {
362 continue; 363 continue;
363 - } 364 + }*/
364 365
365 $record = array(); 366 $record = array();
366 $record['product_name'] = $val['product_name']; 367 $record['product_name'] = $val['product_name'];
@@ -369,6 +370,7 @@ class UserModel @@ -369,6 +370,7 @@ class UserModel
369 $record['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : ''; 370 $record['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
370 $record['sales_price'] = Helpers::transPrice($val['sales_price']); 371 $record['sales_price'] = Helpers::transPrice($val['sales_price']);
371 $record['market_price'] = ($val['market_price'] - $val['sales_price'] > 0) ? Helpers::transPrice($val['market_price']) : false; 372 $record['market_price'] = ($val['market_price'] - $val['sales_price'] > 0) ? Helpers::transPrice($val['market_price']) : false;
  373 + $record['invalidGoods'] = ($val['status'] == 0); // 下架商品
372 $record['storage'] = $val['storage']; 374 $record['storage'] = $val['storage'];
373 $allRecords[] = $record; 375 $allRecords[] = $record;
374 } 376 }
@@ -229,4 +229,26 @@ class IndexController extends AbstractAction @@ -229,4 +229,26 @@ class IndexController extends AbstractAction
229 $this->_view->display('index', $data); 229 $this->_view->display('index', $data);
230 } 230 }
231 231
  232 + public function limitDetailAction()
  233 + {
  234 + $data = array();
  235 + $this->_view->display('limit-detail', $data);
  236 + }
  237 +
  238 + public function limitAction()
  239 + {
  240 + $data = array(
  241 + 'profile' => 'http://cdn.yoho.cn/myohobuy/assets/img/me/index/user-avatar.png?1455719653',
  242 + 'banner' => 'http://img11.static.yhbimg.com/yhb-img01/2016/02/25/02/016ed5a17fb9d9bc7542174c22dccb4acf.jpg?imageView/2/w/640/h/240',
  243 + 'bannerSrc' => './',
  244 + 'name' => '潮流尖端商品啊啊啊啊',
  245 + 'price' => '1999',
  246 + 'releaseDate' => '2016年12月发售',
  247 + 'appSrc' => './'
  248 + );
  249 +
  250 +
  251 +
  252 + $this->_view->display('limit', $data);
  253 + }
232 } 254 }