fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by hf
Commit 21ee47a69bbc85ba8886397eb85f5d82936ff70e 2 parents 08337ab5 14088047

Merge branch 'develop/wap' into beta/wap

Inline Side-by-side
Showing 14 changed files with 30 additions and 109 deletions
... ... @@ -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;
... ... @@ -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;
... ...
... ... @@ -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";
... ...
... ... @@ -44,8 +44,8 @@
</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>
<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">
<div class="img-box">
... ... @@ -55,8 +55,8 @@
</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>
<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">
<div class="img-box">
... ... @@ -66,8 +66,8 @@
</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>
<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">
<div class="img-box">
... ... @@ -77,8 +77,8 @@
</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>
<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">
<div class="img-box">
... ... @@ -88,8 +88,8 @@
</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>
<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">
... ...
... ... @@ -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">
我的订单
... ...
... ... @@ -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' => 508, //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', // 标识是否登录
... ...
... ... @@ -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,
... ...