fe / yohobuywap-node · Commits

Go to a project

Authored by runner
Commit 22a24a5d18ceec8fb997fe02c452d6a0cb8d2164 2 parents 41b1c3a2 c0b2b8e3

Merge branch 'release/4.6' of http://git.yoho.cn/fe/yohobuywap-node into release/4.6

Inline Side-by-side
Showing 6 changed files with 13 additions and 59 deletions
... ... @@ -14,15 +14,15 @@ const helpers = require(`${library}/helpers`);
const headTab = [
{
url: '/guang/star?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star","param":{}}}', // eslint-disable-line
url: '/guang/star?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http:\/\/guang.m.yohobuy.com\/guang\/star","param":{}}}', // eslint-disable-line
name: '全部'
},
{
url: '/guang/star/special?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star\/special","param":{}}}', // eslint-disable-line
url: '/guang/star/special?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http:\/\/guang.m.yohobuy.com\/guang\/star\/special","param":{}}}', // eslint-disable-line
name: '星专题'
},
{
url: '/guang/star/collocation?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star\/collocation","param":{}}}', // eslint-disable-line
url: '/guang/star/collocation?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http:\/\/guang.m.yohobuy.com\/guang\/star\/collocation","param":{}}}', // eslint-disable-line
name: '星搭配'
}
];
... ... @@ -153,8 +153,8 @@ exports.setFavorite = (req, res, next) => {
refer: req.get('Referer') || url
});
} else {
urlEncode = '\\/guang\\/star\\/collocation';
result.data = `${url}?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"${urlEncode}","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}`; // eslint-disable-line
urlEncode = '\/guang\/star\/collocation';
result.data = `${url}?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"http:\/\/guang.m.yohobuy.com${urlEncode}","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}`; // eslint-disable-line
}
}
res.json(result);
... ...
... ... @@ -100,7 +100,7 @@ class Star {
// 首页明星头像数据处理
if (list.tags) {
_.forEach(list.tags, (data) => {
let url = `/guang/star/detail?tag=${data.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star\/detail?tag=${data.tagName}","param":{}}}`; // eslint-disable-line
let url = `/guang/star/detail?tag=${data.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"http:\/\/guang.m.yohobuy.com\/guang\/star\/detail?tag=${data.tagName}","param":{}}}`; // eslint-disable-line
formatData.starAvatar.push({
url: url,
... ...
... ... @@ -67,52 +67,6 @@
</div>
</div>
</li>
<li data-id="{{id}}">
<div class="star-avatar">
{{#if isSwiper}}
<div class="article-avatar-swiper">
<ul class="clearfix swiper-wrapper">
{{#each tags}}
<li class="swiper-slide">
<a href="{{avatarUrl}}">
<div data-avatar="{{image cover 100 100}}" class="rank-avatar" ></div>
<p class="name">{{tagName}}</p>
</a>
</li>
{{/each}}
</ul>
</div>
{{else}}
{{# tags}}
<a href="{{avatarUrl}}">
<div data-avatar="{{image cover 100 100}}" class="rank-avatar" ></div>
<p class="name">{{tagName}}</p>
</a>
{{/ tags}}
{{/if}}
</div>
<div class="star-article">
<i class="article-arrow"></i>
<a href="{{url}}"><h2 class="article-title">{{title}}</h2></a>
<div class="artice-cont">
<a href="{{url}}"><p>{{articeTxt}}</p></a>
<div class="artice-imgs-area">
<img src="{{image src 266 266}}" />
{{!-- <ul class="artice-imgs">
{{#each articeImg}}
<li><img src="{{image . 640 640}}" /></li>
{{/each}}
</ul> --}}
</div>
</div>
<div class="artice-o">
<span class="time"><i class="iconfont time-ico">&#xe603;</i>{{publishTime}}</span>
<span class="see"><i class="iconfont see-ico">&#xe602;</i>{{viewsNum}}</span>
</div>
</div>
</li>
{{/each}}
</ul>
</div>
... ...
... ... @@ -13,8 +13,8 @@ module.exports = {
port: 6001,
siteUrl: '//m.yohobuy.com',
domains: {
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/'
api: 'http://devapi.yoho.cn:58078/',
service: 'http://devservice.yoho.cn:58077/'
},
useOneapm: false,
useCache: false,
... ...
... ... @@ -76,7 +76,7 @@ function setIndexAction() {
// 下拉刷新，上拉加载
starIScroll = new PullRefresh('.star-wrap', {
height: $(window).height() - commonHeaderTop - avatarHeight - parseInt(infoTop) * 2,
height: $(window).height() - commonHeaderTop - avatarHeight - parseInt(infoTop, 10) * 2,
pullDown: function() {
if (!stopLoading) {
stopLoading = true;
... ... @@ -128,7 +128,7 @@ function setIndexAction() {
starIScroll.iScroll.on('scrollEnd', function() {
// 上滑
if (this.directionY === 1) {
$headTab.slideUp(1000);
$headTab.slideUp(600);
}
$loadingTip.slideUp();
... ...
... ... @@ -69,9 +69,9 @@ if ($('#index_nav').length > 0) {
}).goto($('#index_nav').find('.active').index());
}
if ($('#list-nav').length > 0) {
if ($('.outlet-category-nav').length > 0) {
iscroll({
el: '#list-nav'
el: '.outlet-category-nav'
}).goto(0);
}
... ... @@ -87,7 +87,7 @@ if ($('.back-ground-white').length > 10) {
$('.more-activity').click(function() {
$('.more-activity').hide();
$('.back-ground-white').each(function(index, e) {
if(index > 9) {
if (index > 9) {
$(e).show();
}
});
... ...