Authored by 徐炜

Merge remote-tracking branch 'origin/feature/https'

Showing 57 changed files with 166 additions and 164 deletions
... ... @@ -22,19 +22,19 @@ const index = (req, res, next) => {
if (channel === 'women') {
contentCode = '527079e6c46d0f125eb46b835968971b';
name = 'WOMEN首页';
link = 'http://www.yohoblk.com/women';
link = '//www.yohoblk.com/women';
channel = 302;
gender = '2,3';
} else if (channel === 'lifestyle') {
contentCode = '94b5ed607b6d565ffc29c2c04be121dc';
name = 'LIFT STYLE首页';
link = 'http://www.yohoblk.com/lifestyle';
link = '//www.yohoblk.com/lifestyle';
channel = 303;
gender = '1,2,3';
} else {
contentCode = '81886aaa5e82e3741bc1ba1e04ec7706';
name = 'MEN首页';
link = 'http://www.yohoblk.com';
link = '//www.yohoblk.com';
channel = 301;
gender = '1,3';
}
... ...
... ... @@ -6,7 +6,7 @@
<ul class="clearfix">
{{#each tabs}}
<li>
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<div class="g-mask"></div>
<p class="tips">{{name}}</p>
<img class="lazy" data-original="{{image src 370 304 1}}"/>
... ...
<div class="ad-banner">
{{#adBanner}}
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="lazy-img" data-original="{{image src 1150 163}}" title="{{title}}" alt="{{alt}}">
</a>
{{/adBanner}}
... ...
<div class="ad-container clearfix">
{{# brandsAd}}
<div class="ad {{#if @first}}first{{/if}}">
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="lazy-img" data-original="{{image src 298 298}}" alt="">
</a>
{{> brand-text-box}}
... ...
{{# classicBrands}}
<div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
{{# big}}
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="big-img" src="{{image src 565 340}}">
</a>
{{/ big}}
{{# small}}
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="small-img {{#if @first}}first{{/if}}" src="{{image src 281 285}}">
</a>
{{/ small}}
... ...
<div class="brand-text-box">
<h4>{{productName}}</h4>
<p>{{productDesc}}</p>
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<button>{{btnText}}</button>
</a>
</div>
... ...
... ... @@ -5,7 +5,7 @@
<div class="news left">
{{# big}}
<span class="box">
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="lazy-img" data-original="{{image src 395 495}}" alt="{{alt}}">
</a>
<div class="editorial-title"><div><p>{{title}}</p></div></div>
... ... @@ -15,7 +15,7 @@
<div class="news right">
{{# small}}
<span class="box {{#if bottomSpace}}bottom-space{{/if}} {{#if rightSpace}}right-space{{/if}}">
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="lazy-img" data-original="{{image src 360 240}}" alt="{{alt}}">
</a>
<div class="editorial-title"><div><p>{{title}}</p></div></div>
... ...
... ... @@ -4,21 +4,21 @@
{{# newArrivals}}
<div class="arrival-item {{#if smallImg}}small-img{{/if}} {{#if @last}}last{{^}}normal{{/if}}">
{{#if even}}
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="lazy-img" data-original="{{#if smallImg}}{{image src 218 490}}{{^}}{{image src 327 490}}{{/if}}" alt="{{alt}}">
</a>
<div class="brand-name">
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<span class="bottom">{{title}}</span>
</a>
</div>
{{^}}
<div class="brand-name">
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<span class="top">{{title}}</span>
</a>
</div>
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="lazy-img" data-original="{{#if smallImg}}{{image src 218 490}}{{^}}{{image src 327 490}}{{/if}}" alt="{{alt}}">
</a>
{{/if}}
... ...
... ... @@ -3,7 +3,7 @@
<ul>
{{# slider}}
<li class="banner-item" style="{{#if bgColor}}background-color:{{bgColor}}{{/if}}; background-image:url('{{image src 1150 570}}')">
<a href="{{url}}" target= "_blank"></a>
<a href="{{https url}}" target= "_blank"></a>
{{# tips}}
<div class="slide-tips">
<div class="g-mark"></div>
... ... @@ -20,7 +20,7 @@
<ul class="clearfix">
{{# pagination}}
<li>
<a href="{{url}}" target="_blank"></a>
<a href="{{https url}}" target="_blank"></a>
<img src="{{image src 138 54}}" alt="">
</li>
{{/ pagination}}
... ...
... ... @@ -29,15 +29,15 @@ const index = (req, res, next) => {
if (channel === 'men') {
gender = '1,3';
name = 'MEN首页';
link = 'http://www.yohoblk.com';
link = '//www.yohoblk.com';
} else if (channel === 'women') {
gender = '2,3';
name = 'WOMEN首页';
link = 'http://www.yohoblk.com/women';
link = '//www.yohoblk.com/women';
} else {
gender = '3,3';
name = 'LIFESTYLE首页';
link = 'http://www.yohoblk.com/lifestyle';
link = '//www.yohoblk.com/lifestyle';
}
editorialModel.getIndexData(pageNum, limit, appType, udid, gender).then((result) => {
... ... @@ -95,15 +95,15 @@ const list = (req, res) => {
if (channel === 'men') {
gender = '1,3';
name = 'MEN首页';
link = 'http://www.yohoblk.com';
link = '//www.yohoblk.com';
} else if (channel === 'women') {
gender = '2,3';
name = 'WOMEN首页';
link = 'http://www.yohoblk.com/women';
link = '//www.yohoblk.com/women';
} else {
gender = '3,3';
name = 'LIFESTYLE首页';
link = 'http://www.yohoblk.com/lifestyle';
link = '//www.yohoblk.com/lifestyle';
}
if (tag) {
... ... @@ -126,7 +126,7 @@ const list = (req, res) => {
name: name
},
{
link: 'http://www.yohoblk.com/editorial',
link: '//www.yohoblk.com/editorial',
pathTitle: '资讯',
name: 'Editorial资讯'
},
... ... @@ -138,7 +138,7 @@ const list = (req, res) => {
pathTitle: req.query.query || result.authorName,
msg: result.tabs,
paginationOpts: {
page: pageNum, // current page: http://host/?page=2
page: pageNum, // current page: //host/?page=2
limit: 20, // per_page records' number
total: result.total, // total page number
queryParams: req.query
... ... @@ -171,15 +171,15 @@ const detail = (req, res, next) => {
if (channel === 'men') {
name = 'MEN首页';
link = 'http://www.yohoblk.com';
link = '//www.yohoblk.com';
gender = '1,3';
} else if (channel === 'women') {
name = 'WOMEN首页';
link = 'http://www.yohoblk.com/women';
link = '//www.yohoblk.com/women';
gender = '2,3';
} else {
name = 'LIFESTYLE首页';
link = 'http://www.yohoblk.com/lifestyle';
link = '//www.yohoblk.com/lifestyle';
gender = '3,3';
}
... ... @@ -196,7 +196,7 @@ const detail = (req, res, next) => {
name: name
},
{
link: 'http://www.yohoblk.com/editorial',
link: '//www.yohoblk.com/editorial',
pathTitle: '资讯',
name: 'Editorial资讯'
},
... ...
... ... @@ -9,13 +9,13 @@
<div class="article-info">
<div class="article-author">
<div class="author-avatar">
<a href="{{authorUrl}}" target="_blank">
<a href="{{https authorUrl}}" target="_blank">
<img class="lazy" data-original="{{avatar}}">
</a>
</div>
</div>
<div class="author-info">
<a class="author-name" href="{{authorUrl}}">{{name}}</a>
<a class="author-name" href="{{https authorUrl}}">{{name}}</a>
</div>
<div class="article-status">
<span class="article-time brown-light">{{time}}</span>
... ... @@ -105,7 +105,7 @@
<div class="brands">
{{# brands}}
<div class="brand">
<a class="thumb" href="{{url}}" target="_blank">
<a class="thumb" href="{{https url}}" target="_blank">
<img src="{{image thumb 100 100 2}}">
</a>
<p class="brand-name">{{name}}</p>
... ... @@ -144,7 +144,7 @@
<ul id="tags">
{{# tags}}
<li>
<a href="{{url}}" target="_blank">{{name}}</a>
<a href="{{https url}}" target="_blank">{{name}}</a>
</li>
{{/ tags}}
</ul>
... ... @@ -155,7 +155,7 @@
<p class="chapter-right">
<span>下一篇</span><br>
{{# nextArticle}}
<a href="{{href}}">{{nextChapter}}</a>
<a href="{{https href}}">{{nextChapter}}</a>
{{/ nextArticle}}
</p>
... ... @@ -163,7 +163,7 @@
<p class="chapter-left">
<span>上一篇</span><br>
{{# perArticle}}
<a href="{{href}}">{{lastChapter}}</a>
<a href="{{https href}}">{{lastChapter}}</a>
{{/ perArticle}}
</p>
... ...
<div class="good-info" data-skn="{{skn}}">
<a href="{{link}}" target="_blank">
<a href="{{https link}}" target="_blank">
<img class="thumb" src="{{image src 219 295}}">
</a>
<div class="desc">
<a class="name" href="{{link}}" target="_blank">{{name}}</a>
<a class="name" href="{{https link}}" target="_blank">{{name}}</a>
<p class="price">{{price}}</p>
</div>
</div>
... ...
... ... @@ -27,7 +27,7 @@ const favorite = {
content: {
nav: mcHandler.getMeCrumb('我的收藏'),
navigation: mcHandler.getSideMenu('我的收藏'),
banner: 'http://placehold.it/150x120',
banner: '//placehold.it/150x120',
collection: true,
favorite: {
product: true,
... ... @@ -108,7 +108,7 @@ const favorite = {
content: {
nav: mcHandler.getMeCrumb('我的收藏'),
navigation: mcHandler.getSideMenu('我的收藏'),
banner: 'http://placehold.it/150x120',
banner: '//placehold.it/150x120',
collection: true,
favorite: {
brand: true,
... ... @@ -178,7 +178,7 @@ const favorite = {
content: {
nav: mcHandler.getMeCrumb('我的收藏'),
navigation: mcHandler.getSideMenu('我的收藏'),
banner: 'http://placehold.it/150x120',
banner: '//placehold.it/150x120',
collection: true,
favorite: {
editorial: true,
... ...
... ... @@ -10,13 +10,13 @@
<ul class="nav">
{{#each navigation}}
<li class="nav-row{{#if focus}} focus{{/if}}">
<a href="{{link}}">{{name}}</a>
<a href="{{https link}}">{{name}}</a>
</li>
{{/each}}
</ul>
{{#banner}}
{{#if banner}}
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="banner-img" data-original="{{image banner 150 120}}">
</a>
{{/if}}
... ...
... ... @@ -26,15 +26,15 @@
{{/stateText}}
</div>
<div class="desc">
<div class="brand-name"><a href="{{url}}" target="_blank">{{brandName}}</a></div>
<div class="product-name"><a href="{{url}}" target="_blank">{{productName}}</a></div>
<div class="brand-name"><a href="{{https url}}" target="_blank">{{brandName}}</a></div>
<div class="product-name"><a href="{{https url}}" target="_blank">{{productName}}</a></div>
<p class="price">¥{{round salesPrice 2}}</p>
</div>
<div class="tool-area clearfix">
{{#if hideBtn}}
{{^}}
<a class="btn white" href="{{url}}" target="_blank">立即购买</a>
<a class="btn white" href="{{https url}}" target="_blank">立即购买</a>
{{/if}}
<span class="btn white cancel">取消收藏</span>
</div>
... ... @@ -58,7 +58,7 @@
</div>
{{^}}
<div class="favorite-empty">
<p>您还没有收藏的商品, 去<a href="{{siteUrl}}">首页</a>看看吧</p>
<p>您还没有收藏的商品, 去<a href="{{https siteUrl}}">首页</a>看看吧</p>
</div>
{{/if}}
{{/data}}
... ...
... ... @@ -56,7 +56,7 @@
{{#if auditSuccess}}
<div class="order">
<a href="{{view}}" target="_blank"><span class="check">查看</span></a>
<a href="{{https view}}" target="_blank"><span class="check">查看</span></a>
<span class="exchange-order">换货订单</span>
</div>
{{/if}}
... ...
... ... @@ -7,7 +7,7 @@
{{# btns}}
<li>
{{#if isPayBtn}}
<a href="{{payUrl}}" target="_blank">
<a href="{{https payUrl}}" target="_blank">
<span class="{{classStr}}">{{name}}</span>
</a>
{{^}}
... ...
<div class="good-info {{#if @last}}last{{/if}}">
<a href="{{goodUrl}}" target="_blank">
<a href="{{https goodUrl}}" target="_blank">
<img src="{{image goodsImage 65 90}}">
</a>
<div class="detail">
<a href="{{goodUrl}}" target="_blank">
<a href="{{https goodUrl}}" target="_blank">
<p class="with-bottom-space good-name-text">{{productName}}</p>
</a>
<span class="with-space">颜色:{{colorName}}</span>
... ...
... ... @@ -6,7 +6,7 @@
<p class="{{#if @last}}last{{/if}}">
¥{{goodsPrice}}
{{#if changed}}
<a href="{{returnUrl}}">
<a href="{{https returnUrl}}">
<span class="btn white change-tag">已退换</span>
</a>
{{/if}}
... ...
... ... @@ -14,7 +14,7 @@
</div>
<div class="common-column special-border status">
<p class="bold status-str">{{statusStr}}</p>
<a href="{{detailUrl}}" target="_blank">
<a href="{{https detailUrl}}" target="_blank">
<p class="subtext check-detail">查看详情</p>
</a>
</div>
... ... @@ -25,7 +25,7 @@
{{#if showLeftTime}}
<span class="iconfont hide-when-invalid">&#xe606;</span><p class="left-time" data-left="{{payLefttime}}"></p>
{{/if}}
<a href="{{payUrl}}">
<a href="{{https payUrl}}">
<span class="btn red hide-when-invalid ">立即付款</span>
</a>
{{/if}}
... ... @@ -33,10 +33,10 @@
</div>
{{/if}}
{{#if showEditOption}}
<a href="{{refundUrl}}" class="{{#if hideChange}}disable{{/if}}">
<a href="{{https refundUrl}}" class="{{#if hideChange}}disable{{/if}}">
<p class="subtext">申请退货</p>
</a>
<a href="{{exchangeUrl}}" class="{{#if hideChange}}disable{{/if}}">
<a href="{{https exchangeUrl}}" class="{{#if hideChange}}disable{{/if}}">
<p class="subtext">申请换货</p>
</a>
<p class="subtext delete">删除订单</p>
... ... @@ -66,7 +66,7 @@
{{#if showEmptyEn}}
<p class="msg-en">You do not have an order for the time being</p>
{{/if}}
<a href="{{url}}">
<a href="{{https url}}">
<span class="btn">{{btnText}}</span>
</a>
</div>
... ...
... ... @@ -140,7 +140,7 @@
<dd>
<label>照片凭证:</label>
{{# evidence}}
<a href="{{this}}" class="evidence-img" target="_blank">
<a href="{{https this}}" class="evidence-img" target="_blank">
<img class="lazy" data-original="{{this}}">
</a>
{{/ evidence}}
... ...
... ... @@ -17,12 +17,12 @@
<div class="goods-item clearfix">
<div class="check" data-skn="{{skn}}" data-skc="{{skc}}" data-sku="{{sku}}" data-price="{{price}}" data-type="{{typeId}}">{{> icon/checkbox}}</div>
<div class="img">
<a href="{{href}}" title="{{name}}" target="_blank">
<a href="{{https href}}" title="{{name}}" target="_blank">
<img class="lazy" data-original="{{image img 70 90}}">
</a>
</div>
<div class="info">
<p><a href="{{href}}" class="title" title="{{name}}" target="_blank">{{name}}</a></p>
<p><a href="{{https href}}" class="title" title="{{name}}" target="_blank">{{name}}</a></p>
<p>颜色:{{color}}&nbsp;尺码:{{size}}</p>
<p>×{{num}}</p>
</div>
... ...
... ... @@ -25,7 +25,7 @@
<p class="subtext cancel-apply" data-type="{{type}}" data-apply-id="{{id}}">取消申请</p>
{{/ ../this}}
{{/isY}}
<a href="{{detailUrl}}" target="_blank">
<a href="{{https detailUrl}}" target="_blank">
<p class="subtext check-detail">查看详情</p>
</a>
</div>
... ...
... ... @@ -39,7 +39,7 @@ const index = (req, res) => {
queryParams: req.query
},
goods: {
img: 'http://placehold.it/274x366',
img: '//placehold.it/274x366',
link: '',
name: 'Fred Perry Bomber jacket',
price: '1015.00'
... ...
... ... @@ -20,7 +20,7 @@ const Sources = {
wechat: '微信'
};
const DEFAULT_URL = 'http://img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100';
const DEFAULT_URL = '//img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100';
/**
* 首页
... ...
... ... @@ -5,7 +5,7 @@
'use strict';
const api = global.yoho.API;
const YOHOBUY_URL = 'http://www.yohobuy.com/';
const YOHOBUY_URL = '//www.yohobuy.com/';
/**
* 获取地区数据
... ...
... ... @@ -6,7 +6,7 @@
const api = require('./user-api');
const helpers = global.yoho.helpers;
const DEFAULT_HEAD_IMG_ICO = 'http://img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100';
const DEFAULT_HEAD_IMG_ICO = '//img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100';
/**
* 第三方登录 根据手机号获取用户相关信息
... ...
... ... @@ -59,7 +59,7 @@
<li class="clearfix">
<div>
<a class="btn to-my-email" href="{{email}}" target="_blank" class="btn_b_ar_r">去我的邮箱</a>
<a class="btn to-my-email" href="{{https email}}" target="_blank" class="btn_b_ar_r">去我的邮箱</a>
</div>
</li>
</ul>
... ...
... ... @@ -9,7 +9,7 @@
<img id="avatar" class="avatar" src="{{avatar}}">
{{^}}
<img id="avatar" class="avatar"
src="http://img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100">
src="//img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100">
{{/if}}
</div>
</li>
... ... @@ -44,8 +44,8 @@
<li>
<div class="quick-link">
<a class="blue left" href="{{bindUrl}}">绑定其他手机号</a>
<a class="blue right" href="{{loginUrl}}">使用手机号登录</a>
<a class="blue left" href="{{https bindUrl}}">绑定其他手机号</a>
<a class="blue right" href="{{https loginUrl}}">使用手机号登录</a>
</div>
</li>
</ul>
... ...
... ... @@ -9,7 +9,7 @@
<img id="avatar" class="avatar" src="{{avatar}}">
{{^}}
<img id="avatar" class="avatar"
src="http://img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100">
src="//img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100">
{{/if}}
</div>
</li>
... ... @@ -38,13 +38,13 @@
<li>
<div>
<a id="next" class="btn btn-fixed-height" href="{{bindUrl}}">绑定其他手机号</a>
<a id="next" class="btn btn-fixed-height" href="{{https bindUrl}}">绑定其他手机号</a>
</div>
</li>
<li>
<div class="quick-link center">
<a class="blue" href="{{loginUrl}}">使用手机号登录</a>
<a class="blue" href="{{https loginUrl}}">使用手机号登录</a>
</div>
</li>
</ul>
... ...
... ... @@ -17,7 +17,7 @@
<li>
<div>
<a class="btn btn-fixed-height" href="{{goShopping}}">开始购物</a>
<a class="btn btn-fixed-height" href="{{https goShopping}}">开始购物</a>
</div>
</li>
</ul>
... ...
... ... @@ -5,7 +5,7 @@
<li class="clearfix big-width">
<div id="avatar" class="center">
<img class="avatar"
src="http://img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100">
src="//img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100">
</div>
</li>
<li>
... ... @@ -20,7 +20,7 @@
<li class="clearfix">
<div id="confirmInfo" class="confirmInfo">
<div class="desc center">手机号{{mobile}}已经被以上用户注册,点击<a class="blue underline" href="{{signinUrl}}">登录该帐号</a>
<div class="desc center">手机号{{mobile}}已经被以上用户注册,点击<a class="blue underline" href="{{https signinUrl}}">登录该帐号</a>
</div>
<div class="desc"></div>
<div class="desc center">您可以使用此号码进行帐户关联或者更换一个新的手机号码</div>
... ... @@ -34,7 +34,7 @@
<li>
<div class="quick-btn">
<a id="relate-btn" class="btn btn-fixed-height left">关联此手机号</a>
<a class="btn btn-fixed-height right" href="{{relateUrl}}" >更换新手机号</a>
<a class="btn btn-fixed-height right" href="{{https relateUrl}}" >更换新手机号</a>
</div>
</li>
... ...
... ... @@ -16,7 +16,7 @@
<li>
<div>
<a class="btn btn-fixed-height" href="{{goShopping}}">开始购物</a>
<a class="btn btn-fixed-height" href="{{https goShopping}}">开始购物</a>
</div>
</li>
</ul>
... ...
... ... @@ -62,22 +62,22 @@
</span>
<span class="right">
<a class="blue forget-password" href="{{forgetPwd}}">忘记密码</a>
<a class="blue forget-password" href="{{https forgetPwd}}">忘记密码</a>
</span>
</li>
<li class="clearfix third-party-login">
<a href="{{weixinLogin}}">
<a href="{{https weixinLogin}}">
<span class="iconfont weixin">&#xe642;</span>
</a>
<a href="{{qqLogin}}">
<a href="{{https qqLogin}}">
<span class="iconfont qq">&#xe641;</span>
</a>
<a href="{{weiboLogin}}">
<a href="{{https weiboLogin}}">
<span class="iconfont weibo">&#xe640;</span>
</a>
<a href="{{alipayLogin}}">
<a href="{{https alipayLogin}}">
<span class="iconfont alipay">&#xe63f;</span>
</a>
</li>
... ... @@ -88,7 +88,7 @@
</span>
<span>
<a class="blue" href="{{fastReg}}">快速注册</a>
<a class="blue" href="{{https fastReg}}">快速注册</a>
</span>
</li>
</ul>
... ...
... ... @@ -73,7 +73,7 @@
我已阅读并同意遵守
</span>
<span class="right">
<a class="blue go-yoho-items" href="{{itemUrl}}" target="_blank">YOHO!有货服务条款</a>
<a class="blue go-yoho-items" href="{{https itemUrl}}" target="_blank">YOHO!有货服务条款</a>
</span>
</li>
<li class="clearfix">
... ... @@ -86,7 +86,7 @@
<li class="clearfix quick-login-container">
<div style="width: 100%;text-align: center">
已注册YOHO!BLK账号
<a class="blue go-login" href="{{loginUrl}}">快速登录</a>
<a class="blue go-login" href="{{https loginUrl}}">快速登录</a>
</div>
</li>
</ul>
... ...
... ... @@ -21,6 +21,7 @@ const Query = {
q.page = parseInt(q.page || 1, 10);
q.order = q.order || 's_n_desc';
q.yh_channel = channel;
let retData = {
module: 'product',
... ...
... ... @@ -37,18 +37,19 @@ function _paramHanlde(obj) {
// let _gender;
//
// if (obj.yh_channel) {
// switch (obj.yh_channel) {
// case 'men':
// _gender = '1,3';
// break;
// case 'women':
// _gender = '2,3';
// break;
// default:
// break;
// }
// }
if (obj.yh_channel) {
switch (obj.yh_channel) {
case 'men':
obj.yh_channel = '301';
break;
case 'women':
obj.yh_channel = '302';
break;
default:
obj.yh_channel = '303';
break;
}
}
// if (obj.gender || _gender) {
// obj.gender = obj.gender || _gender;
... ...
... ... @@ -19,7 +19,7 @@
{{#if banner.src}}
<div class="banner-img"
style="height: 200px;margin-bottom:30px;">
<a href="{{banner.url}}" target="_blank">
<a href="{{https banner.url}}" target="_blank">
<img src="{{image banner.src 850 200 1}}" alt="{{banner.alt}}" width="850" height="200">
</a>
</div>
... ...
... ... @@ -16,14 +16,14 @@
<div class="center-content clearfix slide-warp">
{{#each largeSlideImg}}
<div class="slide-left">
<a href="{{url}}">
<a href="{{https url}}">
<img src="{{src}}" alt="">
</a>
</div>
{{/each}}
<div class="slide-right">
{{#each oneRowTwoColImages}}
<a href="{{url}}">
<a href="{{https url}}">
<img src="{{src}}" alt="">
</a>
{{/each}}
... ... @@ -92,11 +92,11 @@
<div class="goods-wrap">
{{#each products}}
<div class="goods-info" data-skn="{{productSkn}}">
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="lazy thumb" data-original="{{image defaultImages 270 366}}" style="display: block;">
</a>
<div class="desc">
<a class="name" href="{{url}}" target="_blank">{{productName}}</a>
<a class="name" href="{{https url}}" target="_blank">{{productName}}</a>
<p class="price">¥{{round salesPrice 2}}</p>
</div>
</div>
... ... @@ -114,7 +114,7 @@
<div class="editorial-wrap clearfix">
{{#each editorial}}
<div class="editorial-info">
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="lazy thumb" alt="{{title}}" data-original="{{image src 368 240 1}}" width="368"
height="240" style="display: block;">
</a>
... ...
... ... @@ -4,20 +4,20 @@
<div class="opt-wrap">
<div class="center-content clearfix">
{{# brandLogo}}
<a href="{{link}}" class="brand-logo">
<a href="{{https link}}" class="brand-logo">
<img src="{{image img 108 45}}">
</a>
{{/ brandLogo}}
<p class="opt right">
{{# brandHome}}
<a href="{{link}}">
<a href="{{https link}}">
<i class="iconfont">&#xe634;</i>
{{text}}
</a>
{{/ brandHome}}
{{# brandIntro}}
<a href="{{link}}">
<a href="{{https link}}">
<i class="iconfont">&#xe63d;</i>
{{text}}
</a>
... ...
... ... @@ -2,7 +2,7 @@
{{#each products}}
<div class="goods" data-id="{{productId}}" data-url="{{url}}">
<div class="goods-img">
<a href="{{url}}" target="_blank">
<a href="{{https url}}" target="_blank">
<img class="lazy" data-original="{{image defaultImages 263 351}}" width="263" height="351" alt="">
</a>
</div>
... ... @@ -12,7 +12,7 @@
</div>
{{/if}}
<div class="goods-name">
<a href="{{url}}" target="_blank">{{productName}}</a>
<a href="{{https url}}" target="_blank">{{productName}}</a>
</div>
<div class="goods-price">
<span>¥{{round salesPrice}}</span>
... ...
... ... @@ -3,7 +3,7 @@
<ul class="shop-menu">
{{#each menus}}
<li>
<a href="{{url}}">
<a href="{{https url}}">
{{name}}
{{#icon}}
<i class="iconfont">&#xe60a;</i>
... ...
... ... @@ -8,71 +8,71 @@ const Bank = {
return {
BOCB2C: {
name: '中国银行',
ico: 'http://static.yohobuy.com/images/pay/icon/zhongguo.png'
ico: '//static.yohobuy.com/images/pay/icon/zhongguo.png'
},
ABC: {
name: '中国农业银行',
ico: 'http://static.yohobuy.com/images/pay/icon/nongye.png'
ico: '//static.yohobuy.com/images/pay/icon/nongye.png'
},
SPABANK: {
name: '平安银行',
ico: 'http://static.yohobuy.com/images/pay/icon/pingan.png'
ico: '//static.yohobuy.com/images/pay/icon/pingan.png'
},
CMBC: {
name: '中国民生银行',
ico: 'http://static.yohobuy.com/images/pay/icon/minsheng.png'
ico: '//static.yohobuy.com/images/pay/icon/minsheng.png'
},
ICBCB2C: {
name: '中国工商银行',
ico: 'http://static.yohobuy.com/images/pay/icon/gongshang.png'
ico: '//static.yohobuy.com/images/pay/icon/gongshang.png'
},
SPDB: {
name: '浦发银行',
ico: 'http://static.yohobuy.com/images/pay/icon/pufa.png'
ico: '//static.yohobuy.com/images/pay/icon/pufa.png'
},
BJRCB: {
name: '北京农商银行',
ico: 'http://static.yohobuy.com/images/pay/icon/beijingnongshang.png'
ico: '//static.yohobuy.com/images/pay/icon/beijingnongshang.png'
},
HZCBB2C: {
name: '杭州银行',
ico: 'http://static.yohobuy.com/images/pay/icon/hangzhou.png'
ico: '//static.yohobuy.com/images/pay/icon/hangzhou.png'
},
CMB: {
name: '招商银行',
ico: 'http://static.yohobuy.com/images/pay/icon/zhaoshang.png'
ico: '//static.yohobuy.com/images/pay/icon/zhaoshang.png'
},
CIB: {
name: '兴业银行',
ico: 'http://static.yohobuy.com/images/pay/icon/xingye.png'
ico: '//static.yohobuy.com/images/pay/icon/xingye.png'
},
FDB: {
name: '富滇银行',
ico: 'http://static.yohobuy.com/images/pay/icon/fudian.png'
ico: '//static.yohobuy.com/images/pay/icon/fudian.png'
},
CEBDEBIT: {
name: '中国光大银行',
ico: 'http://static.yohobuy.com/images/pay/icon/guangda.png'
ico: '//static.yohobuy.com/images/pay/icon/guangda.png'
},
CCB: {
name: '中国建设银行',
ico: 'http://static.yohobuy.com/images/pay/icon/zhongguojianshe.png'
ico: '//static.yohobuy.com/images/pay/icon/zhongguojianshe.png'
},
GDB: {
name: '广发银行',
ico: 'http://static.yohobuy.com/images/pay/icon/guangfa.png'
ico: '//static.yohobuy.com/images/pay/icon/guangfa.png'
},
POSTGC: {
name: '中国邮政储蓄',
ico: 'http://static.yohobuy.com/images/pay/icon/zhongguoyouzhengchuxu.png'
ico: '//static.yohobuy.com/images/pay/icon/zhongguoyouzhengchuxu.png'
},
SHBANK: {
name: '上海银行',
ico: 'http://static.yohobuy.com/images/pay/icon/shanghai.png'
ico: '//static.yohobuy.com/images/pay/icon/shanghai.png'
},
NBBANK: {
name: '宁波银行',
ico: 'http://static.yohobuy.com/images/pay/icon/ningbo.png'
ico: '//static.yohobuy.com/images/pay/icon/ningbo.png'
}
};
}
... ...
... ... @@ -43,7 +43,7 @@
<div class="order-inner">
<p class="title">
订单信息
<a class="right go-cart-link" href="{{goCartLink}}">
<a class="right go-cart-link" href="{{https goCartLink}}">
返回购物袋修改
<span class="iconfont">&#xe61e;</span>
</a>
... ... @@ -88,7 +88,7 @@
<ul class="order-table-body">
{{#each goods_list}}
<li class="order-goods clearfix">
<a class="goods-img inline-block" href="{{link}}" target="_blank">
<a class="goods-img inline-block" href="{{https link}}" target="_blank">
<img class="lazy" data-original="{{image goods_images 100 148}}">
{{#if isGift}}
... ... @@ -96,8 +96,8 @@
{{/if}}
</a>
<p class="brand-and-name inline-block">
<a class="brand-name" href="{{brandUrl}}" target="_blank">{{brand_name}}</a>
<a class="name" href="{{link}}" target="_blank">{{product_name}}</a>
<a class="brand-name" href="{{https brandUrl}}" target="_blank">{{brand_name}}</a>
<a class="name" href="{{https link}}" target="_blank">{{product_name}}</a>
</p>
<p class="color-size">
<span class="color">颜色:{{color_name}}</span>
... ...
... ... @@ -27,8 +27,8 @@
</div>
<div class="btns right">
<a class="btn go-check-order" href="{{orderHref}}">查看订单详情</a>
<a class="btn" href="{{walkHref}}">继续逛逛</a>
<a class="btn go-check-order" href="{{https orderHref}}">查看订单详情</a>
<a class="btn" href="{{https walkHref}}">继续逛逛</a>
</div>
</div>
... ...
... ... @@ -11,7 +11,7 @@ const isTest = process.env.NODE_ENV === 'test';
module.exports = {
app: 'web',
appVersion: '4.6.0', // 调用api接口版本
appVersion: '4.9.0', // 调用api接口版本
port: 6003,
siteUrl: '//www.yohoblk.com',
signExtend: {
... ...
... ... @@ -33,7 +33,7 @@ const getMenuData = () => (
cn: '潮流嘉年华',
en: 'YO\'HOOD'
}, {
link: '//www.yohobuy.com',
link: 'http://www.yohobuy.com',
cn: '有货',
en: 'YOHO!BUY'
}]
... ...
... ... @@ -3,6 +3,6 @@
<div class="tips">
<span class="tip">哎呀,您访问的页面走丢了...</span>
<span class="tips-english">404 File Not Found, Sorry</span>
<span>建议您:<a href="javascript:location.reload()">刷新该网页/ </a><a href="javascript:history.go(-1)">返回上一页/</a> <a href="http://www.yohoblk.com">去首页看看</a></span>
<span>建议您:<a href="javascript:location.reload()">刷新该网页/ </a><a href="javascript:history.go(-1)">返回上一页/</a> <a href="//www.yohoblk.com">去首页看看</a></span>
</div>
</div>
... ...
... ... @@ -3,6 +3,6 @@
<div class="tips">
<span class="tip">哎呀,程序出错了...</span>
<span class="tips-english">500-Server Internal Error</span>
<span>建议您:<a href="javascript:location.reload()">刷新该网页/ </a><a href="javascript:history.go(-1)">返回上一页/</a> <a href="http://www.yohoblk.com">去首页看看</a></span>
<span>建议您:<a href="javascript:location.reload()">刷新该网页/ </a><a href="javascript:history.go(-1)">返回上一页/</a> <a href="//www.yohoblk.com">去首页看看</a></span>
</div>
</div>
... ...
<div class="blk-footer">
<div class="center-content">
<ul class="about-us clearfix">
<li><a href="{{siteUrl}}">BLK首页</a></li>
<li><a href="{{https siteUrl}}">BLK首页</a></li>
<li>
<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank">客户服务</a>
</li>
<li><a href="{{siteUrl}}/help?id=2" target="_blank">支付方式</a></li>
<li><a href="{{siteUrl}}/help?id=31" target="_blank">配送方式</a></li>
<li><a href="{{siteUrl}}/help?id=41" target="_blank">售后服务</a></li>
<li><a href="{{https siteUrl}}/help?id=2" target="_blank">支付方式</a></li>
<li><a href="{{https siteUrl}}/help?id=31" target="_blank">配送方式</a></li>
<li><a href="{{https siteUrl}}/help?id=41" target="_blank">售后服务</a></li>
</ul>
<div class="record-info">
<p>
... ...
<div class="goods-info" data-skn="{{skn}}">
<a href="{{link}}" target="_blank">
<a href="{{https link}}" target="_blank">
<img class="lazy thumb" data-original="{{img}}">
</a>
<div class="desc">
<a class="name" href="{{link}}" target="_blank">{{name}}</a>
<a class="name" href="{{https link}}" target="_blank">{{name}}</a>
<p class="price">{{price}}</p>
</div>
</div>
... ...
... ... @@ -5,7 +5,7 @@
<ul class="main-nav-list">
{{# navbars}}
<li class="nav-item{{#if cur}} cur{{/if}}">
<a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>
<a href="{{https link}}"{{#if isNewPage}} target="_blank"{{/if}}>
<span class="nav-en">{{en}}</span>
<span class="nav-cn">{{cn}}</span>
</a>
... ... @@ -22,7 +22,7 @@
<ul class="sub-nav-list clearfix">
{{# subNav}}
<li{{#if thirdNav}} class="contain-third"{{/if}}>
<a href="{{link}}">
<a href="{{https link}}">
{{en}}{{cn}}
</a>
{{#if thirdNav}}
... ... @@ -33,14 +33,14 @@
{{# this}}
{{#if category}}
<dt>
<a href="{{link}}">{{name}}</a>
<a href="{{https link}}">{{name}}</a>
{{#if hot}}
<span class="hot iconfont">&#xe650;</span>
{{/if}}
</dt>
{{^}}
<dd>
<a href="{{link}}">{{name}}</a>
<a href="{{https link}}">{{name}}</a>
{{#if hot}}
<span class="hot iconfont">&#xe650;</span>
{{/if}}
... ...
... ... @@ -2,13 +2,13 @@
<p class="path-nav">
{{#each nav}}
{{#if link}}
<a {{#if @last}}class="last"{{/if}} href="{{link}}" title="{{pathTitle}}">{{{name}}}</a>
<a {{#if @last}}class="last"{{/if}} href="{{https link}}" title="{{pathTitle}}">{{{name}}}</a>
{{^}}
<span {{#if @last}}class="last"{{/if}} title="{{pathTitle}}">{{{name}}}</span>
{{/if}}
{{#unless @last}}
<span class="iconfont icon">&frasl;</span>
<span class="icon">&frasl;</span>
{{/unless}}
{{/each}}
</p>
... ...
<div class="blk-settle-header">
<div class="center-content">
<div class="main-logo">
<a href="{{siteUrl}}"></a>
<a href="{{https siteUrl}}"></a>
</div>
<ul class="header-tools right clearfix">
<li>
{{#if userName}}
Hi~
<a href="{{siteUrl}}/me">{{userName}}</a>
<a href="{{siteUrl}}/passport/logout">[退出]</a>
<a href="{{https siteUrl}}/me">{{userName}}</a>
<a href="{{https siteUrl}}/passport/logout">[退出]</a>
{{^}}
<a href="{{siteUrl}}/passport/login">登录</a> |
<a href="{{siteUrl}}/passport/reg">注册</a>
<a href="{{https siteUrl}}/passport/login">登录</a> |
<a href="{{https siteUrl}}/passport/reg">注册</a>
{{/if}}
</li>
<li><a href="{{siteUrl}}/me">个人中心</a></li>
<li><a href="{{siteUrl}}/help">帮助中心</a></li>
<li><a href="{{https siteUrl}}/me">个人中心</a></li>
<li><a href="{{https siteUrl}}/help">帮助中心</a></li>
</ul>
</div>
</div>
... ...
<div class="blk-sign-header">
<div class="center-content">
<div class="main-logo">
<a href="{{siteUrl}}"></a>
<a href="{{https siteUrl}}"></a>
</div>
<ul class="header-tools right clearfix">
<li>
{{#if userName}}
Hi~
<a href="{{siteUrl}}/me">{{userName}}</a>
<a href="{{siteUrl}}/passport/logout">[退出]</a>
<a href="{{https siteUrl}}/me">{{userName}}</a>
<a href="{{https siteUrl}}/passport/logout">[退出]</a>
{{^}}
<a href="{{siteUrl}}/passport/login">登录</a> |
<a href="{{siteUrl}}/passport/reg">注册</a>
<a href="{{https siteUrl}}/passport/login">登录</a> |
<a href="{{https siteUrl}}/passport/reg">注册</a>
{{/if}}
</li>
<li><a href="{{siteUrl}}">首页</a></li>
<li><a href="{{siteUrl}}/help">帮助中心</a></li>
<li><a href="{{https siteUrl}}">首页</a></li>
<li><a href="{{https siteUrl}}/help">帮助中心</a></li>
<li>客服电话<span>400-889-9646</span></li>
</ul>
</div>
... ...
... ... @@ -98,7 +98,7 @@ $('#collect-btn').click(function() {
new _alert(data.message).show();
$this.toggleClass('collected');
} else if (data.code === 400) {
window.location.href = 'http://www.yohoblk.com/passport/login';
window.location.href = '//www.yohoblk.com/passport/login';
} else {
new _alert(data.message).show();
}
... ... @@ -148,7 +148,7 @@ function comment() {
// clear comment-text
$('#comment-info').val('').keyup();
} else if (data.code === 400) {
window.location.href = 'http://www.yohoblk.com/passport/login';
window.location.href = '//www.yohoblk.com/passport/login';
} else {
new _alert(data.message).show();
}
... ...
... ... @@ -250,7 +250,7 @@ function submitChange(d) {
data: d
}).done(function(result) {
if (result.code === 200) {
location.href = 'http://www.yohoblk.com/me/return/exchange/detail/?orderCode=' + result.data.apply_id;
location.href = '//www.yohoblk.com/me/return/exchange/detail/?orderCode=' + result.data.apply_id;
} else {
new _alert('<h1>' + result.message + '</h1>').show();
}
... ...