fe / yohobuywap-node · Commits

Go to a project

Authored by 王水玲
Commit b1c73985630f1edac0444f7a828c22dd34f9b713 1 parent cbd78e02

星潮教室修改

Inline Side-by-side
Showing 7 changed files with 36 additions and 65 deletions
... ... @@ -9,8 +9,6 @@ const mRoot = '../models';
const _ = require('lodash');
const starModel = require(`${mRoot}/star`);
// const headerModel = require('../../../doraemon/models/header');
const headTab = [
{
url: '/guang/star',
... ... @@ -21,22 +19,15 @@ const headTab = [
name: '星专题'
},
{
url: '/guang/star/collocation?uid=',
url: '/guang/star/collocation',
name: '星搭配'
}
];
const processPublicData = (req, title) => {
// let headerData = headerModel.setNav({
// navTitle: title,
// navBtn: navBtn
// });
let renderData = {
module: 'guang',
title: title
// pageHeader: headerData
};
if (req.query.app_version || req.query.appVersion) {
... ... @@ -56,15 +47,8 @@ exports.index = (req, res, next) => {
const pageHeadTab = _.cloneDeep(headTab);
pageHeadTab[0].cur = true;
pageHeadTab[2].url += (req.query.uid || 0);
// res.render('star/index', _.assign({
// page: 'star',
// isStarIndexPage: true,
// headTab: pageHeadTab
// }, processPublicData(req, '星潮教室')));
starModel.getIndexData((req.query.uid || 0)).then((result) => {
starModel.getIndexData().then((result) => {
res.render('star/index', _.assign({
page: 'star',
isStarIndexPage: true,
... ... @@ -73,21 +57,21 @@ exports.index = (req, res, next) => {
focus: true,
data: result.ads
},
starAvatar: result.starAvatar.concat(result.starAvatar).concat(result.starAvatar), // 需要优化，数组重复三次
starAvatar: result.starAvatar ? result.starAvatar : '',
articles: result.articles
}, processPublicData(req, '星潮教室')));
}).catch(next);
};
exports.getIndexHtml = (req, res, next) => {
starModel.getIndexData((req.query.uid || 0)).then((result) => {
starModel.getIndexData().then((result) => {
res.render('star/index-html', _.assign({
layout: false,
content: {
focus: true,
data: result.ads
},
starAvatar: result.starAvatar.concat(result.starAvatar).concat(result.starAvatar), // 需要优化，数组重复三次
starAvatar: result.starAvatar ? result.starAvatar : '',
articles: result.articles
}));
}).catch(next);
... ... @@ -104,7 +88,6 @@ exports.special = (req, res, next) => {
const pageHeadTab = _.cloneDeep(headTab);
pageHeadTab[1].cur = true;
pageHeadTab[2].url += (req.query.uid || 0);
res.render('star/special', _.assign({
page: 'special'
}, processPublicData(req, '星潮教室'), {
... ... @@ -126,7 +109,6 @@ exports.collocation = (req, res) => {
const pageHeadTab = _.cloneDeep(headTab);
pageHeadTab[2].cur = true;
pageHeadTab[2].url += (req.query.uid || 0);
res.render('star/collocation', _.assign({
isStarDetailPage: true,
page: 'collocation'
... ... @@ -144,7 +126,7 @@ exports.collocation = (req, res) => {
*/
exports.collocationList = (req, res, next) => {
let params = req.query;
let uid = req.query.uid || 0; // 客户端访问，不能使用 cookie
let uid = req.cookies.guangStarUid || 0; // 客户端访问，不能使用 cookie
starModel.getCollocationListData(params, uid).then((result) => {
res.render('star/list', _.assign({
... ... @@ -163,7 +145,7 @@ exports.collocationList = (req, res, next) => {
* @return {[type]}
*/
exports.setFavorite = (req, res, next) => {
let uid = req.body.uid || 0; // 客户端访问，不能使用 cookie
let uid = req.cookies.guangStarUid || 0;
let urlEncode = '';
let url = '';
let params = {
... ... @@ -172,10 +154,10 @@ exports.setFavorite = (req, res, next) => {
};
if (req.body.pageType === '1') {
url = `/guang/star/collocation?uid=${uid}`;
url = '/guang/star/collocation';
urlEncode = '\/guang\/star\/collocation';
} else {
url = `/guang/star/detail?tag=${req.body.tag}&uid=${uid}`;
url = `/guang/star/detail?tag=${req.body.tag}`;
urlEncode = '\/guang\/star\/detail';
}
... ...
... ... @@ -45,7 +45,7 @@ const _getResources = (page) => {
* @param {[array]} list
* @return {[array]}
*/
const _processIndexData = (list, uid) => {
const _processIndexData = (list) => {
const formatData = {
ads: [],
starAvatar: [],
... ... @@ -78,8 +78,8 @@ const _processIndexData = (list, uid) => {
_.forEach(data.ext.tags, (tags) => {
avatar.tags.push({
avatarUrl: `/guang/star/detail?tag=${tags.tagName}&uid=${uid}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http://m.yohobuy.com/guang/star/detail","param":{"tag":"${tags.tagName}"}}}`, // eslint-disable-line
cover: tags.cover,
avatarUrl: `/guang/star/detail?tag=${tags.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http://m.yohobuy.com/guang/star/detail","param":{"tag":"${tags.tagName}"}}}`, // eslint-disable-line
cover: tags.cover ? (tags.cover + '?imageView2/2/w/104/h/104') : tags.cover,
tagName: tags.tagName
});
});
... ... @@ -100,11 +100,11 @@ const _processIndexData = (list, uid) => {
// 首页明星头像数据处理
if (list.tags) {
_.forEach(list.tags, (data) => {
let url = `/guang/star/detail?tag=${data.tagName}&uid=${uid}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http://m.yohobuy.com/guang/star/detail","param":{"tag":"${data.tagName}"}}}`; // eslint-disable-line
let url = `/guang/star/detail?tag=${data.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http://m.yohobuy.com/guang/star/detail","param":{"tag":"${data.tagName}"}}}`; // eslint-disable-line
formatData.starAvatar.push({
url: url,
cover: data.cover
cover: data.cover ? (data.cover + '?imageView2/2/w/180/h/180') : data.cover
});
});
}
... ... @@ -164,14 +164,14 @@ const _processCollocationData = (list) => {
/**
* 星潮首页
*/
const getIndexData = (uid) => {
const getIndexData = () => {
return api.get('', sign.apiSign({
method: 'app.starClass.index',
code: '8adc27fcf5676f356602889afcfd2a8e',
client_type: 'iphone'
})).then((result) => {
if (result && result.code === 200) {
return _processIndexData(result.data, uid);
return _processIndexData(result.data);
} else {
logger.error('星潮教室首页数据返回 code 不是 200');
return {};
... ... @@ -232,7 +232,6 @@ const getSpecialData = () => {
* 星搭配
*/
const getCollocationListData = (params, uid) => {
return serviceAPI.get('guang/api/v5/article/getStarClassroomArticleList', sign.apiSign(Object.assign({
limit: '20',
uid: uid
... ...
... ... @@ -12,7 +12,7 @@
<ul class="clearfix swiper-wrapper">
{{# starAvatar}}
<li class="swiper-slide">
<a href='{{url}}' data-avatar="{{image cover 180 180}}" class="rank-avatar"></a>
<a href='{{url}}' style="background-image: url({{image cover 180 180}})" class="star"></a>
</li>
{{/ starAvatar}}
</ul>
... ...
... ... @@ -36,7 +36,6 @@ $('.collocation-list,.detail-list').on('click', '.collection', function() {
data: {
articleId: $that.parents('li').attr('articleId'),
type: type,
uid: window.queryString.uid,
pageType: pageType,
tag: tag
},
... ... @@ -66,21 +65,3 @@ $('.collocation-list,.detail-list').on('click', '.collection', function() {
}
});
});
// 分享成功
window.successShare = function() {
$.ajax({
type: 'POST',
url: '/guang/starclass/forward',
success: function(data) {
var code = data.code;
if (code === 200 && data.data > 0) {
tip.show('分享成功，亲密度+10');
}
},
error: function() {
tip.show('网络断开连接了~');
}
});
};
... ...
... ... @@ -17,7 +17,6 @@ var $window = $(window),
$starMain = $('.star-main');
/*
$headTab = $('.head-tab'),
$swiperView = $('.swiper-view'),
$viewImg = $('.view-img'),
$body = $('body'),
... ... @@ -75,7 +74,7 @@ function bindAvatar(dom) {
avatarSwiper.slideTo(bannerLen + 1, 200);
} else if (avatarKey <= (bannerLen - 1)) {
avatarSwiperClone && avatarSwiperClone.slideTo(2 * bannerLen - 1, 200);
avatarSwiper.slideTo(2 * bannerLen - 1, 200);
avatarSwiper.slideTo(2 * bannerLen - (bannerLen - avatarKey), 200);
} else {
avatarSwiperClone && avatarSwiperClone.slideTo(avatarKey, 200);
avatarSwiper.slideTo(avatarKey, 200);
... ... @@ -111,8 +110,6 @@ function setIndexAction() {
starIScroll.iScroll.on('scrollStart', function() {
// 下拉
if (this.directionY === -1) {
// $headTab.slideDown();
$loadingTip.slideDown();
}
});
... ... @@ -151,11 +148,6 @@ function setIndexAction() {
});
starIScroll.iScroll.on('scrollEnd', function() {
// 上滑
// if (this.directionY === 1) {
// $headTab.slideUp(600);
// }
$loadingTip.slideUp();
});
... ... @@ -220,6 +212,12 @@ function setIndexAction() {
setAvatar($(item));
});
$('.star').each(function(key, item) {
if ($(item).attr('src') === '') {
$(item).addClass('default-avater');
}
});
$('#yoho-header, .head-tab').on('touchmove', function() {
return false;
});
... ... @@ -279,9 +277,10 @@ getIndexHtml = function() {
}
});
};
initAction();
// getIndexHtml();
window.setCookie('guangStarUid', window.queryString.uid);
// 明星动态文章图片相关操作
/*
... ...
... ... @@ -12,6 +12,7 @@
img {
width: 100%;
min-height: 310px;
}
p {
... ...
... ... @@ -386,6 +386,15 @@
background-size: contain;
}
.star {
display: block;
width: 100%;
height: 100%;
background-color: #000;
background-repeat: no-repeat;
background-size: contain;
}
.default-avater {
background-image: resolve('guang/star/user-avatar.png');
}
... ...