fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit 04f23d9e25508cf6237a02757cb1e89c920ffcba 2 parents 4eef9b17 647f05a3

Merge branch 'master' into release/5.3

Inline Side-by-side
Showing 33 changed files with 152 additions and 65 deletions
'use strict';
const CloudModel = require('../models/ali-cloud');
const aliCloudbo = (req, res) => {
const aliCloudbo = (req, res, next) => {
let contentCode = '5ad7e20546e0a2662d351864929a40ab';
CloudModel.cloud(contentCode).then((result) => {
... ... @@ -10,10 +10,10 @@ const aliCloudbo = (req, res) => {
width750: true,
cloudBo: result
});
});
}).catch(next);
};
const aliCloudri = (req, res) => {
const aliCloudri = (req, res, next) => {
let contentCode = 'ec057186abced9d3b390c413c2548bf6';
CloudModel.cloud(contentCode).then((result) => {
... ... @@ -22,7 +22,7 @@ const aliCloudri = (req, res) => {
width750: true,
cloudRi: result
});
});
}).catch(next);
};
module.exports = {
... ...
... ... @@ -12,7 +12,7 @@ const _cloudData = (list) => {
let listData = {};
if (list.background && list.background.src) {
listData.backImg = list.background.src;
listData.backImg = list.background.src + '/format/jpg';
}
if (list.btn && list.btn[0]) {
... ... @@ -36,7 +36,7 @@ const cloud = (contentCode) => {
cache: true,
code: 200
}).then((result) => {
if (result && result.data) {
if (result && result.data && result.data[0] && result.data[0].data) {
return _cloudData(result.data[0].data);
}
... ...
... ... @@ -120,8 +120,8 @@ router.post('/vip-day1028/signin.json', vipDay1028.beforeIn, vipDay1028.signin);
router.post('/vip-day1028/isStudent', vipDay1028.beforeIn, vipDay1028.checkIsStudent);
// 阿里云广告
router.get('/ali-cloudbo', aliCloud.aliCloudbo);
router.get('/ali-cloudri', aliCloud.aliCloudri);
router.get('/ali-cloud-bottom', aliCloud.aliCloudbo);
router.get('/ali-cloud-right', aliCloud.aliCloudri);
// 获取活动页传来的参数
router.get('/wechat/1111', wechat.feature);
... ...
... ... @@ -26,7 +26,7 @@
<div class="liverec">
{{#best}}
<div class="liverec_child">
<a href='http://m.yohobuy.com/activity/live/{{room_id}}?openby:yohobuy={"action":"go.videolive", "params":{"type":"{{living}}","room":"{{room_id}}","bgpic":"{{pic}}"}}'>
<a href='/activity/live/{{room_id}}?openby:yohobuy={"action":"go.videolive", "params":{"type":"{{living}}","room":"{{room_id}}","bgpic":"{{pic}}"}}'>
<img class="liverec_pic" src="{{image pic 320 320}}" alt="直播预览">
{{#if now_living}}
<p class="living">直播</p>
... ... @@ -64,7 +64,7 @@
</div>
</header>
<section>
<a href='http://m.yohobuy.com/activity/live/{{room_id}}?openby:yohobuy={"action":"go.videolive", "params":{"type":"1","room":"{{room_id}}","bgpic":"{{pic}}"}}'>
<a href='/activity/live/{{room_id}}?openby:yohobuy={"action":"go.videolive", "params":{"type":"1","room":"{{room_id}}","bgpic":"{{pic}}"}}'>
<img class="main-bg" src="{{image pic 640 640}}" alt="正在直播">
<p class="main-living">直播</p>
<p class="main-intro">{{title}}</p>
... ... @@ -84,7 +84,7 @@
<ul class="list">
{{#pre}}
<li class="pre-list">
<a href='http://m.yohobuy.com/activity/live/{{room_id}}?openby:yohobuy={"action":"go.videolive", "params":{"type":"0","room":"{{room_id}}","bgpic":"{{pic}}"}}'>
<a href='/activity/live/{{room_id}}?openby:yohobuy={"action":"go.videolive", "params":{"type":"0","room":"{{room_id}}","bgpic":"{{pic}}"}}'>
<img class="pre-pic" src="{{image pic 150 150}}" alt="直播预览图">
<p class="pre-icon">预告</p>
<p class="pre-time">{{starting_time}}</p>
... ... @@ -113,7 +113,7 @@
</div>
</header>
<section>
<a href='http://m.yohobuy.com/activity/live/replay/{{video_id}}?openby:yohobuy={"action":"go.videoreplay", "params":{"videoid":"{{video_id}}","bgpic":"{{pic}}"}}'>
<a href='/activity/live/replay/{{video_id}}?openby:yohobuy={"action":"go.videoreplay", "params":{"videoid":"{{video_id}}","bgpic":"{{pic}}"}}'>
<div class="record-icon"></div>
<img class="main-bg" src="{{image pic 640 640}}" alt="精彩回放">
<p class="main-living">回放</p>
... ...
... ... @@ -20,7 +20,8 @@ let index = (req, res, next) => {
let responseData = {
module: 'channel',
page: 'brand',
title: '品牌一览 | Yoho!Buy有货 | 潮流购物逛不停',
// title: '品牌一览 | Yoho!Buy有货 | 潮流购物逛不停',
showFooterTab: footerModel.getUrlData('category')
};
... ...
... ... @@ -121,7 +121,8 @@ let switchChannel = (req, res, next) => {
let boys = (req, res, next) => {
_channelPage(req, res, {
gender: 'boys',
title: '男生 | Yoho!Buy有货 | 潮流购物逛不停',
// title: '男生 | Yoho!Buy有货 | 潮流购物逛不停',
boysHomePage: true
}).catch(next); // TODO 我们在路由处理的最上层的方法处理catch
};
... ... @@ -132,7 +133,8 @@ let boys = (req, res, next) => {
let girls = (req, res, next) => {
_channelPage(req, res, {
gender: 'girls',
title: '女生 | Yoho!Buy有货 | 潮流购物逛不停',
// title: '女生 | Yoho!Buy有货 | 潮流购物逛不停',
girlsHomePage: true
}).catch(next);
};
... ... @@ -144,7 +146,8 @@ let girls = (req, res, next) => {
let kids = (req, res, next) => {
_channelPage(req, res, {
gender: 'kids',
title: '潮童 | Yoho!Buy有货 | 潮流购物逛不停',
// title: '潮童 | Yoho!Buy有货 | 潮流购物逛不停',
kidsHomePage: true
}).catch(next);
};
... ... @@ -155,7 +158,8 @@ let kids = (req, res, next) => {
let lifestyle = (req, res, next) => {
_channelPage(req, res, {
gender: 'lifestyle',
title: '创意生活 | Yoho!Buy有货 | 潮流购物逛不停',
// title: '创意生活 | Yoho!Buy有货 | 潮流购物逛不停',
lifestyleHomePage: true
}).catch(next);
};
... ...
... ... @@ -129,7 +129,7 @@ const index = (req, res) => {
res.cookie('udid', req.query.udid);
res.cookie('clientType', req.query.client_type);
res.cookie('appVersion', req.query.app_version);
res.render('installment/open-index', _.assign({
module: 'home',
page: 'installment',
... ...
... ... @@ -2,6 +2,7 @@
const aes = require('./aes-pwd');
const sign = global.yoho.sign;
const api = global.yoho.API;
const uuid = require('uuid');
class Auth {
... ... @@ -67,23 +68,31 @@ class Auth {
});
}
return Auth.profile(uid).then((userInfo) => {
let token = sign.makeToken(uid);
let salt = uuid.v4().substr(0, 8);
let saltedUid = uid + salt;
let saltedToken = sign.makeToken(saltedUid);
let publicToken = saltedToken + salt;
let data = userInfo.data;
let encryptionUid = aes.encryptionUid(uid);
if (data) {
data.profile_name = (data.profile_name || '').replace(/::/g, '');
let uidCookie = `${data.profile_name}::${encryptionUid}::${data.vip_info && data.vip_info.title}::${token}`;
let uidCookie =
`${data.profile_name}::${encryptionUid}::${data.vip_info && data.vip_info.title}::${saltedToken}`;
res.cookie('_UID', uidCookie, {
domain: 'yohobuy.com',
expires: new Date(Date.now() + 2592000000) // 有效期一年
});
}
req.session.TOKEN = token;
req.session.TOKEN = publicToken;
req.session.LOGIN_UID = uid;
res.cookie('_TOKEN', token, {
res.cookie('_TOKEN', publicToken, {
httpOnly: true,
domain: 'yohobuy.com',
expires: new Date(Date.now() + 2592000000) // 有效期一年
});
... ...
... ... @@ -341,7 +341,10 @@ exports.index = (req, res, next) => {
page: 'detail',
title: result.goodsName,
pageFooter: true,
localCss: true
localCss: true,
cononical: {
currentHref: result.cononical
}
});
}).catch(next);
};
... ...
... ... @@ -39,7 +39,8 @@ const newGoods = (req, res, next) => {
res.render('new/new', {
module: 'product',
page: 'new',
title: '新品到着',
// title: '新品到着',
pageHeader: headerModel.setNav({
navTitle: '新品到着'
}),
... ...
... ... @@ -33,7 +33,8 @@ const _processPublicData = (req, title, page, backUrl) => {
renderData: {
module: 'product',
page: page,
title: title,
// title: title,
saleNav: true,
pageHeader: headerModel.setNav({
navTitle: title,
... ...
... ... @@ -1119,6 +1119,10 @@ let getProductData = (data) => {
consults: _.take(info[2], 2)
});
}
/* tar add 161129 SEO 优化使用 */
finalResult.cononical = result.product_url;
return finalResult;
});
... ... @@ -1597,6 +1601,7 @@ let getProductAsyncData = (data) => {
return Promise.all([_getPromotionInfo(result.product_skn), _getFavorite(result.product_id, data.uid)]).then((res) => {
result.promotionBoList = res[0];
var isFavorite = res[1];
return _detailDataPkgAsync(result, data.uid, data.vipLevel, data.ua).then(pkg => {
finalResult = pkg;
finalResult.isCollect = isFavorite;
... ... @@ -1881,6 +1886,7 @@ let _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
// 限购商品有关的展示状态
let showStatus = 1;
origin.showStatus && (showStatus = parseInt(result.data.showStatus, 10));
// 处理限购商品有关的按钮状态
... ...
... ... @@ -18,6 +18,7 @@ const cachePage = {
// 商品详情页
'/product/\\/pro_([\\d]+)_([\\d]+)\\/(.*)/': 30 * MINUTE,
'/product/\\/show_([\\d]+)/': 30 * MINUTE,
// 商品详情ajax
// 逛
... ...
... ... @@ -51,7 +51,7 @@ module.exports = {
activity: '//activity.yohobuy.com',
index: '//m.yohobuy.com'
},
useCache: true,
useCache: false,
memcache: {
master: ['127.0.0.1:11211'],
slave: ['127.0.0.1:11211'],
... ... @@ -84,7 +84,7 @@ module.exports = {
port: '4444' // influxdb port
},
console: {
level: 'debug',
level: 'info',
colorize: 'all',
prettyPrint: true
}
... ...
... ... @@ -5,13 +5,12 @@ const seoMap = require('./seoConfig');
/**
* 设置seo相关的数据，包括title, keywords, description
* @param {undefined}
* @return {Function} 中间件函数，用于给res.locals对象添加属性
*/
module.exports = () => {
return (req, res, next) => {
if (!req.xhr) {
Object.assign(res.locals, seoMap[req.path] || seoMap['/']);
Object.assign(res.locals, seoMap[req.originalUrl] || seoMap['/']);
}
next();
};
... ...
const seoMap = {
/* eslint-disable */
'/': {
title: 'YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证',
keywords: 'Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款',
description: 'YOHO!BUY有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。'
title: 'Yoho!BuyBuy有货|年轻人潮流购物中心,中国潮流购物风向标',
keywords: 'Yoho!BuyBuy有货 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款',
description: 'Yoho!BuyBuy有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。'
},
'/woman': {
title: '女生|时尚潮流女装,日韩女装,潮牌女装全球购|YOHO!BUY有货 100%正品保证',
keywords: '女生服饰,时尚潮流女装,日韩女装,女装正品购物网站,女装全球购',
description: 'YOHO!BUY有货官网女生频道汇集了全球女装潮流时尚,提供时尚潮流女装,日版女装,韩版女装,潮牌女装正品全球购。YOHO!BUY有货购物100%正品保证，支持货到付款。'
'/boys': {
title: '男式服饰|男装,休闲男装,时尚男装品牌|Yoho!Buy有货',
keywords: '男装,休闲男装,时尚男装品牌,男式服饰,Yoho!Buy有货',
description: 'Yoho!Buy有货男装汇集国内国际各大男装品牌,提供品牌男装、休闲男装、商务男装、外套，100%正品保证！'
},
'/girls': {
title: '潮流女装|时尚女装,日韩女装,潮牌女装全球购|Yoho!BuyBUY有货',
keywords: '潮流女装,女生服饰,时尚潮流女装,日韩女装,女装正品购物网站,女装全球购',
description: 'Yoho!BuyBUY有货官网女生频道汇集了全球女装潮流时尚,提供时尚潮流女装,日版女装,韩版女装,潮牌女装正品全球购，100%正品保证！'
},
'/kids': {
title: '潮童|男童装,女童装,韩版童装,儿童服装服饰|YOHO!BUY有货 100%正品保证',
title: '潮童|男童装,女童装,韩版儿童服装服饰|Yoho!BuyBUY有货',
keywords: '潮童,男童装,女童装,韩版童装,儿童服装服饰',
description: 'YOHO!BUY有货官网潮童频道汇集了全球潮童潮流时尚,提供新款男童装,女童装,韩版童装,儿童服装服饰正品全球购。YOHO!BUY有货购物100%正品保证，支持货到付款。'
description: 'Yoho!BuyBUY有货官网潮童频道汇集了全球潮童潮流时尚,提供新款男童装,女童装,韩版童装,儿童服装服饰正品全球购。'
},
'/lifestyle': {
title: '创意生活|创意生活馆,潮流创意家居,家居生活用品|YOHO!BUY 有货 100%正品保证',
keywords: '创意生活,创意生活馆,潮流家居,潮流创意家居,家居生活用品,YOHO!BUY有货',
description: 'YOHO!BUY有货官网创意生活频道汇集了创意生活馆,潮流创意家居,家居生活用品等正品网购，给您的生活带来更多创意。YOHO!BUY有货购物100%正品保证，支持货到付款。'
}
title: '创意生活|创意生活馆,潮流创意家居,家居生活用品|Yoho!BuyBUY有货',
keywords: '创意生活,创意生活馆,潮流家居,潮流创意家居,家居生活用品,Yoho!Buy有货',
description: 'Yoho!BuyBUY有货官网创意生活频道提供了潮流创意家居,家居生活用品等正品网购，给您的生活带来更多创意。'
},
'/product/sale?channel=boys': {
title: '折扣男装专区|男装SALE折扣,男款鞋包配饰特卖|Yoho!Buy有货 100%正品保证',
keywords: 'SALE,男装SALE,男装折扣,男款鞋包配饰特卖',
description: 'Yoho!Buy有货SALE频道提供男装折扣，精致品牌男装sale,限时特惠。Yoho!Buy有货男装折扣,100%正品保证！'
},
'/product/sale?gender=2,3': {
title: '折扣女装专区|女装SALE折扣,女款鞋包配饰特卖|Yoho!Buy有货',
keywords: 'SALE,女装SALE,女装折扣,女款鞋包配饰特卖',
description: 'Yoho!Buy有货SALE频道提供女装折扣，精致品牌女装sale,限时特惠。Yoho!Buy有货女装折扣,100%正品保证！'
},
'/product/new?gender=1,3': {
title: '男生潮装新品|男装新品发布,饰品推荐|Yoho!Buy有货 ',
keywords: '男生潮装新品,新品发布,新品男装,新款男装推荐,新款男鞋推荐,新款男包推荐,新款男饰品推荐,Yoho!Buy有货',
description: 'Yoho!Buy有货男装新品到着为您提供新品男装,男装新品直达就选Yoho!Buy有货，100%正品保证！'
},
'/product/new?gender=2,3': {
title: '女生潮装新品|女装新品发布,饰品推荐|Yoho!Buy有货 ',
keywords: '女生潮流新品,女款新品发布,新品女装,新款女装推荐,新款女鞋推荐,新款女包推荐,新款饰品推荐,Yoho!Buy有货',
description: 'Yoho!Buy有货女装新品到着为您提供新品女装,女装样品,女装新款推荐;汇集国内外最新款女装,鞋,女包,饰品，100%正品保证！'
},
'/product/new?msort=365&channel=4': {
title: '新品到着|潮童新品发布,新款童装童鞋,包包配饰推荐|Yoho!Buy有货',
keywords: '潮童新品发布,新品童装,新款童装推荐,新款童鞋,新款儿童鞋包,儿童配饰新品,Yoho!Buy有货',
description: 'Yoho!Buy有货潮童新品到着为您提供新品童装,童装样品,童装新款推荐;汇集国内外最新款童装,童鞋,儿童鞋包配饰。'
},
'/product/new?msort=10&channel=4': {
title: '新品到着|数码3c,居家,玩具娱乐,文具,美妆|Yoho!Buy有货',
keywords: '数码3c,居家,玩具娱乐,文具,美妆,Yoho!Buy有货',
description: 'Yoho!Buy有货创意生活新品到着为您提供潮流创意生活，汇集国内外最新款数码3c,居家,玩具娱乐,文具,美妆。'
},
'/brands?channel=1': {
title: '潮流男装品牌|男装品牌排行榜,男装品牌大全|Yoho!Buy有货',
keywords: '潮流男装品牌,男装品牌,男装品牌排行榜,男装品牌大全,Yoho!Buy有货',
description: 'Yoho!Buy有货男装品牌一览汇集国内国际各大男装品牌大全,为广大爱好时尚的男士青年提供品牌男装、休闲男装、商务男装.Yoho!Buy有货,100%正品保证'
},
'/brands?channel=2': {
title: '潮流女装品牌|女装品牌排行榜,女装品牌大全|Yoho!Buy有货',
keywords: '潮流女装品牌,女装品牌,女装品牌排行榜,女装品牌大全,Yoho!Buy有货',
description: 'Yoho!Buy有货女装品牌一览汇集各大女装品牌,提供品牌女装、休闲女装、商务女装.Yoho!Buy有货品牌女装100%正品保证。'
},
'/brands?channel=3': {
title: '品牌一览|童装童鞋品牌,儿童鞋包配饰排行榜大全|Yoho!Buy有货',
keywords: '童装品牌,童装童鞋排行榜,儿童鞋包配饰排行榜,潮童品牌大全,品牌一览,Yoho!Buy有货',
description: 'Yoho!Buy有货童装品牌一览汇集国内国际各大童装品牌大全,提供品牌童装、童鞋，儿童鞋包配饰,100%正品保证'
},
'/brands?channel=4': {
title: '品牌一览|数码3c,居家,玩具娱乐,文具,美妆品牌|Yoho!Buy有货',
keywords: '数码3c品牌,居家品牌,玩具娱乐品牌,文具品牌,美妆品牌',
description: 'Yoho!Buy有货女装品牌一览汇集国内国际各大数码3c品牌,居家品牌,玩具娱乐品牌,文具品牌,美妆品牌.'
},
/* eslint-enable */
};
... ...
... ... @@ -10,6 +10,9 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta content="telephone=no" name="format-detection" />
<meta content="email=no" name="format-detection" />
{{# cononical}}
<link rel=”cononical” href=“{{currentHref}}”/>
{{/ cononical}}
{{#dnsPrefetch.hosts}}
<link rel="dns-prefetch" href="{{this}}">
{{/dnsPrefetch.hosts}}
... ...
... ... @@ -15,7 +15,7 @@
<li class="more">
<a class="{{#unless image.src}}default{{/unless}}" href="{{image.url}}">
<img class="lazy" data-original="{{image2 image.src w=320 h=172 q=60}}">
<img src="{{image2 image.src w=320 h=172 q=60}}">
</a>
</li>
</ul>
... ...
... ... @@ -4,7 +4,7 @@
{{# banner}}
<a class="category-banner" href="{{url}}">
<img class="lazy" data-original="{{image2 src q=60}}">
<img src="{{image2 src q=60}}">
</a>
{{/ banner}}
<ul class="category-list clearfix">
... ... @@ -12,7 +12,7 @@
<li>
<a href="{{url}}">
<div class="img-box">
<img class="lazy" data-original="{{image2 src w=140 h=140 q=60}}" alt="">
<img src="{{image2 src w=140 h=140 q=60}}" alt="">
</div>
</a>
</li>
... ...
{
"name": "m-yohobuy-node",
"version": "5.2.14",
"version": "5.2.16",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ... @@ -31,6 +31,7 @@
"feed": "^0.3.0",
"lodash": "^4.16.1",
"md5": "^2.1.0",
"memory-cache": "^0.1.6",
"moment": "^2.15.1",
"oneapm": "^1.2.20",
"passport": "^0.3.2",
... ... @@ -42,7 +43,7 @@
"request-promise": "^3.0.0",
"serve-favicon": "^2.3.0",
"uuid": "^2.0.3",
"yoho-node-lib": "0.1.30",
"yoho-node-lib": "0.2.2",
"yoho-zookeeper": "^1.0.4"
},
"devDependencies": {
... ... @@ -95,7 +96,7 @@
"yoho-handlebars": "^4.0.5",
"yoho-iscroll": "^5.2.0",
"yoho-jquery": "^2.2.4",
"yoho-jquery-lazyload": "^1.9.9",
"yoho-jquery-lazyload": "^1.9.10",
"yoho-jquery-qrcode": "^0.14.0",
"yoho-mlellipsis": "0.0.3",
"yoho-qs": "^1.0.1",
... ...
... ... @@ -4,7 +4,7 @@
{{# banner}}
<a class="category-banner" href="{{url}}">
<img class="lazy" data-original="{{image2 src q=60}}">
<img src="{{image2 src q=60}}">
</a>
{{/ banner}}
<ul class="category-list clearfix">
... ... @@ -12,7 +12,7 @@
<li>
<a href="{{url}}">
<div class="img-box">
<img class="lazy" data-original="{{image2 src w=140 h=140 q=60}}" alt="">
<img src="{{image2 src w=140 h=140 q=60}}" alt="">
</div>
</a>
</li>
... ...
... ... @@ -3,8 +3,8 @@
* @author: liangzhifeng<zhifeng.liang@yoho.cn>
* @date: 2015/10/12
*/
//加载css
require("channel/home.page.css")
// 加载css
require('channel/home.page.css');
var $ = require('yoho-jquery'),
... ...
module.exports = function (url, opts) {
module.exports = function(url, opts) {
if (url) {
let params = opts.hash;
let urls = url.split('?');
... ...
... ... @@ -7,6 +7,9 @@
var $ = require('yoho-jquery');
var $cart = $('#suspend-cart');
require('../common');
if ($('#remove-cart-count').length) {
$.ajax({
type: 'GET',
... ...
... ... @@ -3,7 +3,7 @@
* @author: xuqi<qi.xu@yoho.cn>
* @date: 2015/10/10
*/
require("guang/index-editor.page.css")
require('guang/index-editor.page.css');
var $ = require('yoho-jquery');
... ...
... ... @@ -3,7 +3,7 @@
* @author: xuqi<qi.xu@yoho.cn>
* @date: 2015/10/10
*/
require("guang/index.page.css")
require('guang/index.page.css');
... ...
... ... @@ -3,7 +3,7 @@
* @author: xuqi<qi.xu@yoho.cn>
* @date: 2015/10/13
*/
require("guang/info-index.page.css")
require('guang/info-index.page.css');
var $ = require('yoho-jquery'),
ellipsis = require('yoho-mlellipsis'),
... ...
... ... @@ -175,4 +175,4 @@ $disLikeBtn.bind('click', function() {
dialogText: '网络错误~'
});
});
});
\ No newline at end of file
});
... ...
var $ = require('yoho-jquery'),
// Swiper = require('yoho.iswiper'),
Swiper = require('yoho-swiper'),
lazyLoad = require('yoho-jquery-lazyload'),
loading = require('../plugin/loading');
... ...
... ... @@ -666,14 +666,14 @@ function search(opt, callback) {
bindGoodThumbClick();
setTimeout(function() {
callback && callback();
callback && typeof callback === 'function' && callback();
}, 0);
},
error: function() {
tip.show('网络断开连接了~');
searching = false;
loading.hideLoadingMask();
callback && callback();
callback && typeof callback === 'function' && callback();
}
});
}
... ...
.ali-cloud-page {
overflow: hidden;
position: relative;
.back-img {
width: 100%;
... ... @@ -7,7 +8,7 @@
}
.btn {
position: relative;
position: absolute;
display: block;
width: 240px;
height: 80px;
... ... @@ -19,7 +20,7 @@
}
.receive-bottom-btn {
bottom: 225px;
bottom: 147px;
left: 254px;
}
... ...
... ... @@ -41,7 +41,7 @@
img {
max-width: 100%;
max-height: 100%;
height: 100%;
}
}
... ...
... ... @@ -48,7 +48,7 @@ module.exports = {
var opt = args[args.length - 1];
var isTrue = false;
for (var i = 0; i < args.length - 1; i ++ ) {
for (var i = 0; i < args.length - 1; i++) {
if (args[i]) {
isTrue = true;
break;
... ...