Authored by 毕凯

Merge branch 'develop/wap' into feature/wap/postcss

Showing 53 changed files with 157 additions and 209 deletions
... ... @@ -216,6 +216,10 @@ $('.btn-balance').on('touchend', function() {
}
});
$('.off-shell-goods').on('touchstart touchend', function() {
return false;
});
$('.chose').on('touchend', function() {
chosePanel.show();
});
... ...
... ... @@ -34,6 +34,7 @@ var $chosePanel = $('#chose-panel'),
$allChoseItems,
queryString,
$choseArea,
$cartBar,
$soonSoldOut = $('.soonSoldOut-tag'),
$yohoPage = $('.yoho-page');
... ... @@ -54,6 +55,7 @@ function init() {
$sizeRowList = $('.size-list ul');
$colorRowList = $('.color-list ul');
$leftNum = $('#left-num');
$cartBar = $('.cart-bar');
curColorIndex = 0;
curSizeIndex = 0;
isEdit = 0;
... ... @@ -136,6 +138,10 @@ function show(html, cb) {
function hide() {
$('.chose-panel').hide();
innerScroll.enableScroll($choseArea);
if ($cartBar.length > 0) {
$cartBar.show();
}
}
//修改加入购物车的文字和背景
... ... @@ -228,8 +234,6 @@ $yohoPage.on('touchstart', '.chose-panel', function(e) {
//点击蒙版消失
hide();
enableScroll();
return false;
});
... ...
... ... @@ -128,6 +128,11 @@ $('.icon-edit').on('touchstart', function(e) {
count,
canEditNum;
if ($this.parents('.off-shell-goods').length) {
tip.show('商品已下架');
return false;
}
//如果点击的是上次编辑的商品,直接显示chose-pannel
if (skn === previousEditSkn) {
chosePanel.show();
... ... @@ -173,6 +178,11 @@ $('.icon-edit').on('touchstart', function(e) {
$('.icon-del').on('touchstart', function(e) {
var $this = $(this);
if ($this.parents('.off-shell-goods').length) {
tip.show('商品已下架');
return false;
}
e.stopPropagation();
dialog.showDialog({
... ...
... ... @@ -23,11 +23,9 @@ var start = 0,
openSideNav = false,
isen = true;
var innerScroll = require('../plugin/inner-scroll');
lazyLoad($('img.lazy'));
$('.nav-btn').on('touchstart', function(event) {
$('.nav-btn').on('touchstart', function() {
$sideNav.css('pointer-events', 'none');
$mobileWrap.addClass('menu-open');
$overlay.show().css('opacity', 0.3);
... ... @@ -38,7 +36,7 @@ $('.nav-btn').on('touchstart', function(event) {
$sideNav.css('pointer-events', 'auto');
}, 400);
innerScroll.disableScroll($sideNav);
//innerScroll.disableScroll($sideNav);
return false;
});
... ... @@ -54,11 +52,14 @@ function hideSideBar() {
}
$('.overlay').on('touchstart', function(e) {
innerScroll.enableScroll($sideNav);
hideSideBar();
return false;
});
$sideNav.on('touchmove', function(e) {
return false;
});
// 点击一级导航,弹出二级导航
$sideNav.on('touchend', 'li', function(e) {
if ($(this).find('.sub-nav').size() > 0) {
... ...
... ... @@ -119,4 +119,10 @@ $page.on('touchstart', '.del-icon', function() {
}
});
});
});
\ No newline at end of file
});
$('.deps').on('touchstart', 'span', function() {
$(this).css('background', '#eee');
}).on('touchend touchcancel', 'span', function() {
$(this).css('background', 'transparent');
});
... ...
... ... @@ -3,8 +3,7 @@
* @author: bikai<kai.bi@yoho.cn>
* @date: 2015/11/12
*/
var $ = require('jquery'),
noticeScroll = require('../plugin/notice-scroll');
var $ = require('jquery');
var $userAvatar = $('.user-avatar'),
$listItem = $('.list-item');
var myImage = new Image(),
... ... @@ -20,8 +19,6 @@ myImage.onload = function() {
$userAvatar.css('background-image', 'url(' + avatar + ')');
};
noticeScroll('.notice');
$('.yoho-page').on('touchstart', '.list-item, .type-item, .order-title', function() {
$listItem.removeClass('highlight');
$(this).addClass('highlight');
... ...
/**
* 公告栏目滚动
* bikai kai.bi@yoho.cn
*/
var $ = require('jquery');
function noticeScroll(selecter, time) {
var $notice = $(selecter),
$noticeItem = $notice.find('.notice-item'),
count = $noticeItem.length,
i = 1;
selecter = selecter || '.notice';
time = time || 3000;
if (count > 1) {
setInterval(function() {
if (i >= count) {
i = 0;
}
$noticeItem.fadeOut();
$notice.find('.item-' + i).fadeIn();
i++;
}, time);
}
}
module.exports = noticeScroll;
... ... @@ -64,6 +64,7 @@ $('#likeBtn').on('touchstart', function() {
});
$('#addtoCart').on('touchstart', function() {
$('.cart-bar').hide();
chosePanel.show();
//统计代码:用于统计用户加入购物车的动作
... ...
... ... @@ -98,8 +98,8 @@
.first {
li {
height: 100rem / $pxConvertRem;
line-height: 100rem / $pxConvertRem;
height: 88rem / $pxConvertRem;
line-height: 88rem / $pxConvertRem;
border-bottom: 1px solid #e0e0e0;
&:last-child {
... ...
... ... @@ -9,6 +9,10 @@
height: 160rem / $pxConvertRem;
}
.sold-out {
display: inline;
}
.deps {
margin-left: 135rem / $pxConvertRem;
padding: 0.5rem 0;
... ... @@ -43,7 +47,7 @@
}
.sold-out-tag {
font-size: 16px;
font-size: 12px;
line-height: 30rem / $pxConvertRem;
text-align: center;
color: #fff;
... ...
... ... @@ -52,9 +52,9 @@
font-size: 50px;
}
p{
width: 59.517241%;
width: 61.517241%;
height: auto;
margin: 0 3% 16em / $pxConvertRem;
margin: 0 2% 16em / $pxConvertRem;
float: left;
&:first-of-type{
margin-top: 0.75rem;
... ...
... ... @@ -86,6 +86,7 @@
}
.my-link {
margin-bottom: pxToRem(30px);
padding: pxToRem(6px) 0;
text-align: center;
background: rgba(0,0,0,0.8);
... ... @@ -132,34 +133,6 @@
}
}
.notice {
margin-bottom: pxToRem(30px);
padding: 0 pxToRem(30px);
background: #fff;
height: pxToRem(72px);
overflow: hidden;
.notice-item {
display: block;
width: 100%;
font-size: pxToRem(24px);
line-height: pxToRem(72px);
color: #444;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.notice-icon {
display: inline-block;
margin-right: pxToRem(10px);
width: pxToRem(28px);
height: pxToRem(28px);
@include rem-sprite($index, volume);
vertical-align: middle;
}
}
.my-order {
margin-bottom: pxToRem(30px);
border-top: 1px solid #e0e0e0;
... ... @@ -233,18 +206,17 @@
padding: 0 pxToRem(30px);
font-size: 16px;
line-height: pxToRem(88px);
.opinion{
width: 1.3rem;
height: 1.3rem;
overflow: hidden;
display: inline-block;
@include rem-sprite($index, talk);
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");
background-size:100% 100%;
position: relative;
top: .36rem;
margin-right: pxToRem(12px);
}
&.highlight {
background: #eee;
}
... ...
$vip: sprite-map("me/vip/*.png", $spacing: 10px);
$fav: sprite-map("me/fav/*.png", $spacing: 5px);
$index: sprite-map("me/index/*.png", $spacing: 5px);
@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";
... ...
... ... @@ -21,90 +21,90 @@
</head>
<body>
<div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/01.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/02.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/03.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/04.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/01.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/02.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/03.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/04.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/05.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/05.jpg">
<a class="href href-right" href="{{url_yohope}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/06.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/06.jpg">
<a class="href href-center" href="{{url_mycoupon}}"></a>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/07.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/07.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/08.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/08.jpg">
<a class="href href-left" href="{{url_more}}"></a>
<a class="href href-right" href="{{url_more}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/09.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12258"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12259"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/09.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12311"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12312"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/10.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/10.jpg">
<a class="href href-left" href="{{url_more}}"></a>
<a class="href href-right" href="{{url_1}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/11.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12260"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12261"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/11.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12313"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12314"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/12.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/12.jpg">
<a class="href href-left" href="{{url_1}}"></a>
<a class="href href-right" href="{{url_2}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/13.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12262"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12263"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/13.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12315"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12316"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/14.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/14.jpg">
<a class="href href-left" href="{{url_3}}"></a>
<a class="href href-right" href="{{url_4}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/15.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12264"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12265"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/15.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12317"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12318"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/16.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/16.jpg">
<a class="href href-left" href="{{url_5}}"></a>
<a class="href href-right" href="{{url_6}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/17.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12266"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12267"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/17.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12319"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12320"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-2.jpg">
<a class="show-more" href="{{url_help}}"></a>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/26.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/27.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/26.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/27.jpg">
</div>
<script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
<script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
... ...
... ... @@ -14,97 +14,97 @@
.img-box .href-right {right: 0}
.img-box .href-center {width: 90%;height: 100%;position: absolute;top: 0;left: 5%;}
.show-more {height: 100%;width: 25%;position: absolute;top: 0;right: 10%;}
.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;}
.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;}
</style>
<link rel="dns-prefetch" href="//cdn.yoho.cn">
<link rel="dns-prefetch" href="//static.yohobuy.com">
</head>
<body>
<div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/01.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/02.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/03.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/04.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/01.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/02.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/03.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/04.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/05.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/05.jpg">
<a class="href href-right" href="{{url_yohope}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/06.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/06.jpg">
<a class="href href-center" href="{{url_mycoupon}}"></a>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/07.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/07.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/08.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/08.jpg">
<a class="href href-left" href="{{url_more}}"></a>
<a class="href href-right" href="{{url_more}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/09.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="18719"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="18723"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/09.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="18881"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="18883"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/10.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/10.jpg">
<a class="href href-left" href="{{url_more}}"></a>
<a class="href href-right" href="{{url_1}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/11.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="18725"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="18727"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/11.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="18885"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="18887"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/12.jpg">
<a class="href href-left" href="{{url_1}}"></a>
<a class="href href-right" href="{{url_2}}"></a>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/12.jpg">
<a class="href href-left" href="{{url_2}}"></a>
<a class="href href-right" href="{{url_3}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/13.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="18717"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="18729"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/13.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="18895"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="18889"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/14.jpg">
<a class="href href-left" href="{{url_3}}"></a>
<a class="href href-right" href="{{url_4}}"></a>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/14.jpg">
<a class="href href-left" href="{{url_4}}"></a>
<a class="href href-right" href="{{url_5}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/15.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="18731"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="18733"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/15.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="18893"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="18891"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/16.jpg">
<a class="href href-left" href="{{url_5}}"></a>
<a class="href href-right" href="{{url_6}}"></a>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/16.jpg">
<a class="href href-left" href="{{url_6}}"></a>
<a class="href href-right" href="{{url_7}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/17.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="18735"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="18737"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/17.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="18897"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="18899"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-2.jpg">
<a class="show-more" href="{{url_help}}"></a>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/26.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160219/27.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/26.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160301/27.jpg">
</div>
<script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
<script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
... ...
... ... @@ -10,7 +10,7 @@
<span class="market-price"{{market_price}}</span>
{{/if}}
</p>
<p class="row">
<p class="sold-out row">
{{#unless storage}}
<span class="sold-out-tag">已售罄</span>
{{/unless}}
... ...
... ... @@ -33,16 +33,6 @@
<p>浏览记录</p>
</a>
</div>
{{#if notice}}
<div class="notice">
{{#notice}}
<a class="notice-item item-{{@index}}" href="{{url}}">
<span class="notice-icon"></span>
{{title}}
</a>
{{/notice}}
</div>
{{/if}}
<div class="my-order">
<a class="order-title" href="/home/orders">
我的订单
... ...
... ... @@ -13,7 +13,7 @@
{{/if}}
{{#if offShelveGoods}}
<div class="invalid-goods">
<div class="invalid-goods off-shell-goods">
{{# offShelveGoods}}
{{> cart/good}}
{{/ offShelveGoods}}
... ...
... ... @@ -552,8 +552,8 @@ class CouponController extends HuodongAction
}
$url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}';
$this->_view->display('newuser3', array(
'activityId' => 498, //492, // 94活动ID
$this->_view->display('newuser3-test', array(
'activityId' => 489, //508, //498, //492, // 94活动ID
'staticTitle' => '新人潮这看,超值惊喜等你领', // 标题
'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录
... ... @@ -561,13 +561,20 @@ class CouponController extends HuodongAction
'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}',
'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
'url_more' => $url,
// '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":"冬装"}}',
// 'url_2' => 'http://list.m.yohobuy.com/?msort=6&misort=45&title=靴子&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"靴子"}}',
// '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":"春装"}}',
// 'url_4' => 'http://list.m.yohobuy.com/?msort=3,4&title=下装&openby:yohobuy={"action":"go.list","params":{"msort":"3,4","title":"下装"}}',
// 'url_3' => 'http://list.m.yohobuy.com/?msort=7,8&title=包配&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
// '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":"反季"}}',
'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":"冬装"}}',
'url_2' => 'http://list.m.yohobuy.com/?msort=6&misort=45&title=靴子&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"靴子"}}',
'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":"春装"}}',
'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":"春装外套"}}',
'url_3' => 'http://list.m.yohobuy.com/?msort=6&misort=45&title=靴子&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"靴子"}}',
'url_4' => 'http://list.m.yohobuy.com/?msort=3,4&title=下装&openby:yohobuy={"action":"go.list","params":{"msort":"3,4","title":"下装"}}',
'url_3' => 'http://list.m.yohobuy.com/?msort=7,8&title=包配&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
'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":"反季"}}',
'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":"冬装"}}',
'url_5' => 'http://list.m.yohobuy.com/?msort=7,8&title=包配&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
'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":"春装"}}',
'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":"夏装"}}',
));
}
... ...
... ... @@ -51,24 +51,6 @@ class HomeController extends AbstractAction
'myIndexPage' => true,
'showDownloadApp' => true,
'navHome' => true,
'notice' => array(
array(
'title' => '1. 通知内容内容通知内容内容通知内容内容通知内容内容通知内容内容',
'url' => 'http://www.yoho.cn'
),
array(
'title' => '2. 通知内容内容通知内容内容通知内容内容通知内容内容通知内容内容',
'url' => 'http://www.yoho.cn'
),
array(
'title' => '3. 通知内容内容通知内容内容通知内容内容通知内容内容通知内容内容',
'url' => 'http://www.yoho.cn'
),
array(
'title' => '4. 通知内容内容通知内容内容通知内容内容通知内容内容通知内容内容',
'url' => 'http://www.yoho.cn'
)
),
'pageFooter' => true,
'cartUrl' => Helpers::url('/cart/index/index', null),
'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home'))),
... ... @@ -487,7 +469,7 @@ class HomeController extends AbstractAction
$info = 'userId=' . $uid . '&name=' . $this->_uname . '&memo=&hashCode=' . md5( strtoupper( rawurlencode($uid . $this->_uname . $time . '1231') ) ) . '&timestamp=' . $time;
$serviceUrl .= rawurlencode($info);
}
$this->_view->display('online-service', array(
'onlineServicePage' => true,
'pageFooter' => true,
... ...