fe / yoho-blk · Commits

Go to a project

Authored by biao
Commit 2f7783f75630f32b6e1346f5a7c934ad2d24dee5 2 parents 074efdd3 8d21c023 master ... develop feature/catch feature/docker feature/login-msg feature/login-ua-ip feature/removCamel feature/safe-bug feature/sessionKey feature/setting feature/vip feature/webpack2 feature/wsl5.3 gray release/2.0 release/fontBack2.0

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

Inline Side-by-side
Showing 37 changed files with 1555 additions and 1511 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 37 of 37+ files are displayed.

{{# classicBrands}}
<div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
{{# big}}
<a href="{{url}}" target="_blank">
<img class="big-img" src="{{image src 565 340}}">
</a>
{{/ big}}
{{# small}}
<a href="{{url}}" target="_blank">
<img class="small-img {{#if @first}}first{{/if}}" src="{{image src 281 285}}">
</a>
{{/ small}}
</div>
{{/ classicBrands}}
{{# classicBrands}}
<div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
{{# big}}
<a href="{{url}}" target="_blank">
<img class="big-img" src="{{image src 565 340}}">
</a>
{{/ big}}
{{# small}}
<a href="{{url}}" target="_blank">
<img class="small-img {{#if @first}}first{{/if}}" src="{{image src 281 285}}">
</a>
{{/ small}}
</div>
{{/ classicBrands}}
... ...
... ... @@ -36,7 +36,7 @@
{{/ singleImage}}
{{# smallPic}}
<span class="article-pictwo">
{{# data}}
{{# data}}
<img class="lazy" data-original="{{image src 460 660 1}}">
{{/ data}}
</span>
... ... @@ -49,9 +49,9 @@
</div>
{{/ text}}
{{# related}}
{{# related}}
<div class="related-reco related-collo">
<div class="related-reco related-collo">
<div class="article-title">
<div class="title-line"></div>
<div class="text-center">
... ... @@ -67,7 +67,7 @@
{{/ relatedReco}}
</div>
</div>
<div class="related-reco related-group">
<div class="article-title">
<div class="title-line"></div>
... ... @@ -77,7 +77,7 @@
</div>
</div>
</div>
<div class="related-groups">
<div class="related-goods goods">
{{# relatedGroup}}
... ... @@ -101,7 +101,7 @@
</div>
</div>
</div>
<div class="brands">
{{# brands}}
<div class="brand">
... ... @@ -151,22 +151,22 @@
</div>
<div class="chapter">
<p class="chapter-right">
<span>下一篇</span><br>
{{# nextArticle}}
<a href="{{href}}">{{nextChapter}}</a>
{{/ nextArticle}}
</p>
<p class="chapter-left">
<span>上一篇</span><br>
{{# perArticle}}
<a href="{{href}}">{{lastChapter}}</a>
{{/ perArticle}}
</p>
</div>
<div id="comment-area" class="comment-area">
... ...
... ... @@ -144,7 +144,7 @@ const favorite = {
retData.brandList.forEach(b => {
if (b.newProduct && b.newProduct.length > 0) {
b.newProduct.forEach(p => {
p.url = `${config.siteUrl}/product/pro_${p.productId}_${p.goods[0].id}/${p.cnAlphabet}.html`; // eslint-disable-line
p.url = `${config.siteUrl}/product/pro_${p.productId}_${p.goods[0].id}/${p.cnAlphabet}.html`; // eslint-disable-line
});
b.newProduct.push({
more: true
... ...
... ... @@ -669,7 +669,7 @@ const _setExchangeDetailData = (data) => {
list.reminder = true;
list.inDoor = true;
list.auditSuccess = true;
list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
list.view = `/me/order/detail/?orderCode=${data.orderCode}`;
}
break;
... ... @@ -677,7 +677,7 @@ const _setExchangeDetailData = (data) => {
if (data.deliveryTpyeName === '寄回换货') {
list.takeGoods = true;
list.auditSuccess = true;
list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
list.view = `/me/order/detail/?orderCode=${data.orderCode}`;
} else {
list.takeGoods = true;
}
... ... @@ -687,14 +687,14 @@ const _setExchangeDetailData = (data) => {
send: true,
doubt: true,
auditSuccess: true,
view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
view: `/me/order/detail/?orderCode=${data.orderCode}`
});
break;
case 40:
Object.assign(list, {
finish: true,
auditSuccess: true,
view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
view: `/me/order/detail/?orderCode=${data.orderCode}`
});
break;
case 91:
... ...
... ... @@ -152,6 +152,7 @@
<p class="subtext">color: {{newColorName}}<br>size: {{newSizeName}}</p>
</div>
</div>
{{#if evidenceImages}}
<div class="reason-info">
<span>问题描述：{{remark}}</span>
<div class="reason-img">照片凭证：
... ... @@ -164,6 +165,7 @@
</div>
</div>
</div>
{{/if}}
{{/ goodsList}}
</div>
</div>
... ...
{{# refundDetail}}
<div class="refund-datail-wrap" data-id="{{id}}">
<a href="/help?id=43" class="refund-notice" target="_blank">退货须知</a>
{{> returns/returns-status}}
{{# orderReview}}
<div class="top-tip">
{{#if pass}}
<p class="tip-status">
<span class="iconfont blue">&#xe60f;</span>
<span class="blue">退货申请已通过</span>
</p>
{{^}}
<p class="tip-status">
<span class="iconfont blue">&#xe618;</span>
<span class="blue">退货申请审核中</span>
</p>
{{/if}}
<p class="tip-text">
请将商品连同吊牌、包装、发货单（如无发货单，您可找张白纸上注明订单编号，收货人姓名及手机号码）、发票（如有）、 赠品（如有）一并寄回，如有 遗漏将影响您的退换货进度，敬请谅解<br>
非我司原因的退换货，寄回运费由您承担。商品客观问题的退换货，请您先行垫付运费，邮费会在退款中补贴给您，
<b>我们不接受平邮和到付</b>
，感谢您的理解与支持
</p>
<p>
如果您不想退货了，您可以
<span class="cancel-btn btn">取消申请</span>
</p>
</div>
{{/ orderReview}}
{{# backStorage}}
<div class="storage-tip top-tip">
<p class="tip-status">
<span class="iconfont blue">&#xe60f;</span>
<span class="blue">您寄回的商品已收到</span>
</p>
<p>
我们会在入库后的1-3个工作日内处理您的退款，如有疑问，请联系
<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" class="online-service" target="_blank">
<span class="iconfont blue">&#xe61c;</span>
<span class="blue">在线客服</span>
</a>
</p>
</div>
{{/ backStorage}}
{{# refundSure}}
<div class="success-tip top-tip">
<p class="tip-status">
<span class="iconfont blue">&#xe60f;</span>
<span class="blue">退款完成</span>
</p>
<p>退款方式：{{mode}}<em>由于银行内部处理流程的差异，储蓄卡需要3-7个工作日到账，信用卡需要7-15个工作日到账</em></p>
<p class="tip-pad-top">退款账户：{{account}}</p>
<p class="tip-pad-top">金额：¥{{amount}}</p>
<p class="tip-pad-top">有货币：{{coin}}个</p>
</div>
{{/ refundSure}}
{{# cancelApply}}
<div class="top-tip">
<span class="blue">您已取消申请</span>
</div>
{{/ cancelApply}}
{{# refundExpress}}
<div class="return-express">
{{#if number}}
<div class="show-content" data-id="{{id}}">
<h4 class="third-title">寄回物流信息 <label class="reset-express btn white">修改</label></h4>
<p>请您耐心等待，我们会在收到货物后快速为您处理</p>
<p>物流公司：{{company}}</p>
<p>快递单号：{{number}}</p>
</div>
{{/if}}
<div class="edit-content{{#if number}} hide{{/if}}"{{# expressList}} data-{{id}}="{{name}}"{{/ expressList}}>
<h4 class="third-title">填写物流</h4>
<p>请您在<span class="blue">7天内</span>将商品寄回并填写物流，逾期将自动取消申请</p>
<dl class="express-wrap">
<dd>
物流公司：
<select class="express-company">
<option value="0">选择快递公司</option>
{{# expressList}}
<option value="{{id}}">{{name}}</option>
{{/ expressList}}
</select>
</dd>
<dd>
快递单号：
<input type="text" class="express-code" placeholder="填写快递单号" value="{{number}}">
</dd>
<dd>
<span class="submit-express btn">提交</span>
<span class="error-tip blue hide">请填写完整寄回物流信息</span>
</dd>
</dl>
</div>
</div>
{{/ refundExpress}}
{{# refundAddress}}
<div class="return-address">
<h4 class="third-title">寄回地址</h4>
<p>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址：{{address}}</p>
<p>收&nbsp;&nbsp;件&nbsp;&nbsp;人：{{name}}</p>
<p>邮&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;编：{{code}}</p>
<p>联系电话：{{phone}}</p>
</div>
{{/ refundAddress}}
<div class="refund-detail-goods">
<h4 class="third-title">退货商品&nbsp;&nbsp;&nbsp;&nbsp;订单编号：{{orderCode}}</h4>
<ul class="goods-header">
<li class="info">商品信息</li>
<li>退货原因</li>
<li>退货数量</li>
</ul>
{{# goods}}
<div class="goods-item clearfix">
<div class="img">
<img class="lazy" title="{{name}}" data-original="{{image img 70 90}}">
</div>
<div class="info">
<p class="title" title="{{name}}">{{name}}</p>
<p>颜色：{{color}}&nbsp;尺码：{{size}}</p>
</div>
<div class="reason">{{reason}}</div>
<div class="num">{{num}}</div>
{{#if remark}}
<dl class="special-info">
<dd class="remark">
<label>问题描述：</label>
{{remark}}
</dd>
{{#if evidence}}
<dd>
<label>照片凭证：</label>
{{# evidence}}
<a href="{{this}}" class="evidence-img" target="_blank">
<img class="lazy" data-original="{{this}}">
</a>
{{/ evidence}}
</dd>
{{/if}}
</dl>
{{/if}}
</div>
{{/ goods}}
</div>
</div>
{{# refundDetail}}
<div class="refund-datail-wrap" data-id="{{id}}">
<a href="/help?id=43" class="refund-notice" target="_blank">退货须知</a>
{{> returns/returns-status}}
{{# orderReview}}
<div class="top-tip">
{{#if pass}}
<p class="tip-status">
<span class="iconfont blue">&#xe60f;</span>
<span class="blue">退货申请已通过</span>
</p>
{{^}}
<p class="tip-status">
<span class="iconfont blue">&#xe618;</span>
<span class="blue">退货申请审核中</span>
</p>
{{/if}}
<p class="tip-text">
请将商品连同吊牌、包装、发货单（如无发货单，您可找张白纸上注明订单编号，收货人姓名及手机号码）、发票（如有）、 赠品（如有）一并寄回，如有 遗漏将影响您的退换货进度，敬请谅解<br>
非我司原因的退换货，寄回运费由您承担。商品客观问题的退换货，请您先行垫付运费，邮费会在退款中补贴给您，
<b>我们不接受平邮和到付</b>
，感谢您的理解与支持
</p>
<p>
如果您不想退货了，您可以
<span class="cancel-btn btn">取消申请</span>
</p>
</div>
{{/ orderReview}}
{{# backStorage}}
<div class="storage-tip top-tip">
<p class="tip-status">
<span class="iconfont blue">&#xe60f;</span>
<span class="blue">您寄回的商品已收到</span>
</p>
<p>
我们会在入库后的1-3个工作日内处理您的退款，如有疑问，请联系
<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" class="online-service" target="_blank">
<span class="iconfont blue">&#xe61c;</span>
<span class="blue">在线客服</span>
</a>
</p>
</div>
{{/ backStorage}}
{{# refundSure}}
<div class="success-tip top-tip">
<p class="tip-status">
<span class="iconfont blue">&#xe60f;</span>
<span class="blue">退款完成</span>
</p>
<p>退款方式：{{mode}}<em>由于银行内部处理流程的差异，储蓄卡需要3-7个工作日到账，信用卡需要7-15个工作日到账</em></p>
<p class="tip-pad-top">退款账户：{{account}}</p>
<p class="tip-pad-top">金额：¥{{amount}}</p>
<p class="tip-pad-top">有货币：{{coin}}个</p>
</div>
{{/ refundSure}}
{{# cancelApply}}
<div class="top-tip">
<span class="blue">您已取消申请</span>
</div>
{{/ cancelApply}}
{{# refundExpress}}
<div class="return-express">
{{#if number}}
<div class="show-content" data-id="{{id}}">
<h4 class="third-title">寄回物流信息 <label class="reset-express btn white">修改</label></h4>
<p>请您耐心等待，我们会在收到货物后快速为您处理</p>
<p>物流公司：{{company}}</p>
<p>快递单号：{{number}}</p>
</div>
{{/if}}
<div class="edit-content{{#if number}} hide{{/if}}"{{# expressList}} data-{{id}}="{{name}}"{{/ expressList}}>
<h4 class="third-title">填写物流</h4>
<p>请您在<span class="blue">7天内</span>将商品寄回并填写物流，逾期将自动取消申请</p>
<dl class="express-wrap">
<dd>
物流公司：
<select class="express-company">
<option value="0">选择快递公司</option>
{{# expressList}}
<option value="{{id}}">{{name}}</option>
{{/ expressList}}
</select>
</dd>
<dd>
快递单号：
<input type="text" class="express-code" placeholder="填写快递单号" value="{{number}}">
</dd>
<dd>
<span class="submit-express btn">提交</span>
<span class="error-tip blue hide">请填写完整寄回物流信息</span>
</dd>
</dl>
</div>
</div>
{{/ refundExpress}}
{{# refundAddress}}
<div class="return-address">
<h4 class="third-title">寄回地址</h4>
<p>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址：{{address}}</p>
<p>收&nbsp;&nbsp;件&nbsp;&nbsp;人：{{name}}</p>
<p>邮&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;编：{{code}}</p>
<p>联系电话：{{phone}}</p>
</div>
{{/ refundAddress}}
<div class="refund-detail-goods">
<h4 class="third-title">退货商品&nbsp;&nbsp;&nbsp;&nbsp;订单编号：{{orderCode}}</h4>
<ul class="goods-header">
<li class="info">商品信息</li>
<li>退货原因</li>
<li>退货数量</li>
</ul>
{{# goods}}
<div class="goods-item clearfix">
<div class="img">
<img class="lazy" title="{{name}}" data-original="{{image img 70 90}}">
</div>
<div class="info">
<p class="title" title="{{name}}">{{name}}</p>
<p>颜色：{{color}}&nbsp;尺码：{{size}}</p>
</div>
<div class="reason">{{reason}}</div>
<div class="num">{{num}}</div>
{{#if remark}}
<dl class="special-info">
<dd class="remark">
<label>问题描述：</label>
{{remark}}
</dd>
{{#if evidence}}
<dd>
<label>照片凭证：</label>
{{# evidence}}
<a href="{{this}}" class="evidence-img" target="_blank">
<img class="lazy" data-original="{{this}}">
</a>
{{/ evidence}}
</dd>
{{/if}}
</dl>
{{/if}}
</div>
{{/ goods}}
</div>
</div>
{{/ refundDetail}}
\ No newline at end of file
... ...
... ... @@ -43,7 +43,7 @@ const list = {
retData.filter = DataHelper.filterHandle(data.filter, q);
retData.filter.showPrice = data.total > 10;
retData.filter.showInfo = (retData.filter.style && retData.filter.style.length > 0)
|| (data.standard && data.standard.length > 0); //eslint-disable-line
|| (data.standard && data.standard.length > 0); //eslint-disable-line
nav = _.concat(nav, retData.filter.nav);
}
... ...
... ... @@ -46,7 +46,7 @@ const Query = {
retData.filter = DataHelper.filterHandle(data.filter, q);
retData.filter.showPrice = data.total > 10;
retData.filter.showInfo = (retData.filter.style && retData.filter.style.length > 0)
|| (data.standard && data.standard.length > 0); //eslint-disable-line
|| (data.standard && data.standard.length > 0); //eslint-disable-line
retData.filter.useSmallSort = 1;
}
... ...
... ... @@ -143,7 +143,7 @@ const shop = {
data.filter = DataHelper.filterHandle(ret.filter, q);
data.filter.showPrice = ret.total > 10;
data.filter.showInfo = (data.filter.style && data.filter.style.length > 0)
|| (ret.standard && ret.standard.length > 0); //eslint-disable-line
|| (ret.standard && ret.standard.length > 0); //eslint-disable-line
}
... ...
... ... @@ -184,7 +184,7 @@ const setSeoInfo = (goodInfo, nav) => {
* @return { Object } 面包屑导航数据
*/
const setPathNav = (data, name, channel) => {
let resData = {};
let navs = [];
let link = channel,
gender;
... ... @@ -203,11 +203,11 @@ const setPathNav = (data, name, channel) => {
break;
}
navs.push({
link: helpers.urlFormat(`/${link}`),
name: `${_.toUpper(channel)}首页`
});
if (!_.isEmpty(data)) {
let navs = [{
link: helpers.urlFormat(`/${link}`),
name: `${_.toUpper(channel)}首页`
}];
let sort = _.get(data, 'sort[0]', {});
if (!_.isEmpty(sort)) {
... ... @@ -222,27 +222,27 @@ const setPathNav = (data, name, channel) => {
// 二级分类
if (!_.isEmpty(sort.sub)) {
let subSort = sort.sub[0];
navs.push({
link: helpers.urlFormat('/product/list', {
msort: sort.sort_id,
misort: sort.sub.sort_id,
misort: subSort.sort_id,
gender: gender
}),
name: sort.sub[0].sort_name,
pathTitle: sort.sub[0].sort_name
name: subSort.sort_name,
pathTitle: subSort.sort_name
});
}
}
navs.push({
name: name,
pathTitle: name
});
resData.nav = navs;
}
return resData;
navs.push({
name: name,
pathTitle: name
});
return {nav: navs};
};
/**
... ...
... ... @@ -153,8 +153,8 @@ const ShopService = {
info.sorts = sorts;
if (resources.shopTopBanner) { // eslint-disable-line
info.banner = resources.shopTopBanner.shopSrc; // eslint-disable-line
if (resources.shopTopBanner) { // eslint-disable-line
info.banner = resources.shopTopBanner.shopSrc; // eslint-disable-line
}
info.resources = resources;
info.menus = shopMenu(domain, resources.navigationBar);
... ...
... ... @@ -167,8 +167,8 @@
<div class="info-block">
<div class="block-title">
<label class="title-wrapper">
<span class="en">{{titleEn}}</span><br>
<span class="cn">{{titleCn}}</span>
<div class="en">{{titleEn}}</div>
<div class="cn">{{titleCn}}</div>
</label>
</div>
<div class="intro-block">
... ... @@ -193,8 +193,8 @@
<div class="info-block">
<div class="block-title">
<label class="title-wrapper">
<span class="en">{{titleEn}}</span><br>
<span class="cn">{{titleCn}}</span>
<div class="en">{{titleEn}}</div>
<div class="cn">{{titleCn}}</div>
</label>
</div>
<div class="des-wrapper">
... ... @@ -202,7 +202,7 @@
{{# basic}}
<li>
<label class="title">{{key}}<span></span></label>
: <span class="info">{{value}}</span>
：<span class="info">{{value}}</span>
</li>
{{/ basic}}
</ul>
... ... @@ -211,7 +211,7 @@
{{# comfort}}
<li>
<label class="title">{{name}}<span></span></label>
: <span class="min-des info">{{minDes}}</span>
：<span class="min-des info">{{minDes}}</span>
{{# blocks}}
<span class="comfort-block{{#if cur}} cur{{/if}}"></span>
{{/ blocks}}
... ... @@ -228,8 +228,8 @@
<div class="info-block">
<div class="block-title">
<label class="title-wrapper">
<span class="en">{{titleEn}}</span><br>
<span class="cn">{{titleCn}}</span>
<div class="en">{{titleEn}}</div>
<div class="cn">{{titleCn}}</div>
</label>
</div>
{{#if detail}}
... ... @@ -266,8 +266,8 @@
<div class="info-block">
<div class="block-title">
<label class="title-wrapper">
<span class="en">{{titleEn}}</span><br>
<span class="cn">{{titleCn}}</span>
<div class="en">{{titleEn}}</div>
<div class="cn">{{titleCn}}</div>
</label>
</div>
<div class="size-info" data-img="{{sizeImage}}">
... ... @@ -293,8 +293,8 @@
<div class="info-block">
<div class="block-title">
<label class="title-wrapper">
<span class="en">{{titleEn}}</span><br>
<span class="cn">{{titleCn}}</span>
<div class="en">{{titleEn}}</div>
<div class="cn">{{titleCn}}</div>
</label>
</div>
<div class="detail-content">{{{content}}}</div>
... ... @@ -303,4 +303,4 @@
</div>
</div>
{{/ content}}
</div>
\ No newline at end of file
</div>
... ...
<div class="blk-page yoho-product-list">
<div class="center-content">
{{# navPath}}
{{> path-nav}}
{{/ navPath}}
</div>
<div class="center-content clearfix">
{{#filter}}
<div class="left">
{{!-- 筛选区域 --}}
{{> list/filter}}
</div>
{{/filter}}
{{#if paginationData.total}}
<div class="right">
{{!-- 已选中条件 --}}
{{#filter}}
{{> list/filter-area}}
{{/filter}}
{{!-- 排序 --}}
{{> list/order-area}}
{{!-- 商品列表 --}}
{{> list/goods-box}}
{{!-- 分页 --}}
{{{ pagination paginationData }}}
</div>
{{^}}
{{!-- 空结果 --}}
{{> list/empty}}
{{/if}}
</div>
</div>
<div class="blk-page yoho-product-list">
<div class="center-content">
{{# navPath}}
{{> path-nav}}
{{/ navPath}}
</div>
<div class="center-content clearfix">
{{#filter}}
<div class="left">
{{!-- 筛选区域 --}}
{{> list/filter}}
</div>
{{/filter}}
{{#if paginationData.total}}
<div class="right">
{{!-- 已选中条件 --}}
{{#filter}}
{{> list/filter-area}}
{{/filter}}
{{!-- 排序 --}}
{{> list/order-area}}
{{!-- 商品列表 --}}
{{> list/goods-box}}
{{!-- 分页 --}}
{{{ pagination paginationData }}}
</div>
{{^}}
{{!-- 空结果 --}}
{{> list/empty}}
{{/if}}
</div>
</div>
... ...
<div class="yoho-ui-accordion">
<h3>适用人群</h3>
<div class="body sex-body">
{{#each people}}
<div class="input-radio" data-value="{{value}}">
{{> icon/radio}}
<label>{{name}}</label>
</div>
{{/each}}
</div>
</div>
<div class="blank-div"></div>
{{#if singleSort}}
<div class="yoho-ui-accordion">
<h3>全部品类</h3>
<div class="body">
<div class="list-body nano">
<div class="nano-content">
{{#each sortData}}
<div class="input-radio" data-value="{{relationParameter.sort}}" data-usesmall="{{../useSmallSort}}"
data-category="{{categoryId}}">
{{> icon/radio }}
<label>{{categoryName}}</label>
</div>
{{/each}}
</div>
</div>
</div>
</div>
{{^}}
<div class="title">全部品类</div>
<div class="yoho-ui-accordion no-active">
{{#each sortData}}
<h3 {{#if checked}}class="active"{{/if}}>{{categoryName}}</h3>
<div class="body" data-value="{{categoryId}}">
<div class="list-body nano">
<div class="nano-content">
{{#each sub}}
<div class="input-radio" data-value="{{relationParameter.sort}}" data-usesmall="{{../../useSmallSort}}"
data-category="{{categoryId}}">
{{> icon/radio }}
<label>{{categoryName}}</label>
</div>
{{/each}}
</div>
</div>
</div>
{{/each}}
</div>
{{/if}}
<div class="blank-div"></div>
{{#if brandData}}
<div class="yoho-ui-accordion">
<h3>品牌</h3>
<div class="body">
<div class="brand-body">
<input type="text" class="brand-search" placeholder="输入您要查找的品牌">
</div>
<div class="brand-letter-items">
<span class="item item-all" data-value="">全部</span>
{{#each letters}}
<span class="item" data-value="{{letter}}">{{letter}}</span>
{{/each}}
<span class="mulit-choose">
多选 ＋
</span>
</div>
<div class="brand-list nano">
<div class="nano-content">
{{#each brandData}}
<div class="input-radio {{#if checked}}default-check{{/if}}" data-value="{{id}}"
data-word="{{brandAlif}}">
{{> icon/radio}}
{{#if brandNameEn}}
<label>{{brandNameEn}}</label>
{{^}}
<label>{{brandName}}</label>
{{/if}}
</div>
{{/each}}
</div>
</div>
<div class="brand-btns">
<span class="btn disable large confirm">确定</span>
<span class="btn white large cancel">取消</span>
</div>
</div>
</div>
{{/if}}
{{#if showPrice}}
<div class="yoho-ui-accordion">
<h3>价格</h3>
<div class="body price-body">
{{#each priceRange}}
<div class="input-radio" data-value="{{lower}},{{higher}}">
{{> icon/radio }}
<label>¥{{lower}}-¥{{higher}}</label>
</div>
{{/each}}
<div class="price-btns">
<div class="price-input inline-block">
<span class="iconfont">&#xe63a;</span>
<input type="text" class="price-low" value="{{customPriceLow}}">
</div>
<span>－</span>
<div class="price-input inline-block">
<span class="iconfont">&#xe63a;</span>
<input type="text" class="price-high" value="{{customPriceHigh}}">
</div>
<span class="btn large confirm">确定</span>
</div>
</div>
</div>
{{/if}}
{{#if showSize}}
<div class="yoho-ui-accordion">
<h3>尺码</h3>
<div class="body">
<div class="size-body nano">
<div class="nano-content">
{{#each size}}
<div class="input-radio" data-value="{{sizeId}}">
{{> icon/radio }}
<label>{{sizeName}}</label>
</div>
{{/each}}
</div>
</div>
</div>
</div>
{{/if}}
{{#if colors}}
<div class="yoho-ui-accordion">
<h3>颜色</h3>
<div class="body">
<div class="color-body nano">
<div class="nano-content">
{{#each colors}}
<div class="input-radio" data-value="{{id}}">
{{> round-color}}
<label>{{title}}</label>
</div>
{{/each}}
</div>
</div>
</div>
</div>
{{/if}}
{{#if showInfo}}
<div class="blank-div"></div>
<div class="title">商品属性</div>
<div class="yoho-ui-accordion no-active">
{{#if style}}
<h3>风格</h3>
<div class="body">
<div class="style-mulit-btn">
<span class="btn white">多选</span>
</div>
<div class="style-body nano">
<div class="nano-content">
{{#each style}}
<div class="input-radio {{#if checked}}default-check{{/if}}" data-value="{{styleId}}">
{{> icon/radio }}
<label>{{styleName}}</label>
</div>
{{/each}}
</div>
</div>
<div class="style-btns">
<span class="btn disable large confirm">确定</span>
<span class="btn white large cancel">取消</span>
</div>
</div>
{{/if}}
{{#each standard}}
<h3>{{standardName}}</h3>
<div class="body" data-value="{{standardId}}">
<div class="standard-body nano">
<div class="nano-content">
{{#each sub}}
<div class="input-radio" data-value="{{standardId}}">
{{> icon/radio }}
<label>{{standardName}}</label>
</div>
{{/each}}
</div>
</div>
</div>
{{/each}}
</div>
{{/if}}
<div class="blank-div" style="margin-bottom: 10px;"></div>
<div class="yoho-ui-accordion">
<h3>适用人群</h3>
<div class="body sex-body">
{{#each people}}
<div class="input-radio" data-value="{{value}}">
{{> icon/radio}}
<label>{{name}}</label>
</div>
{{/each}}
</div>
</div>
<div class="blank-div"></div>
{{#if singleSort}}
<div class="yoho-ui-accordion">
<h3>全部品类</h3>
<div class="body">
<div class="list-body nano">
<div class="nano-content">
{{#each sortData}}
<div class="input-radio" data-value="{{relationParameter.sort}}" data-usesmall="{{../useSmallSort}}"
data-category="{{categoryId}}">
{{> icon/radio }}
<label>{{categoryName}}</label>
</div>
{{/each}}
</div>
</div>
</div>
</div>
{{^}}
<div class="title">全部品类</div>
<div class="yoho-ui-accordion no-active">
{{#each sortData}}
<h3 {{#if checked}}class="active"{{/if}}>{{categoryName}}</h3>
<div class="body" data-value="{{categoryId}}">
<div class="list-body nano">
<div class="nano-content">
{{#each sub}}
<div class="input-radio" data-value="{{relationParameter.sort}}" data-usesmall="{{../../useSmallSort}}"
data-category="{{categoryId}}">
{{> icon/radio }}
<label>{{categoryName}}</label>
</div>
{{/each}}
</div>
</div>
</div>
{{/each}}
</div>
{{/if}}
<div class="blank-div"></div>
{{#if brandData}}
<div class="yoho-ui-accordion">
<h3>品牌</h3>
<div class="body">
<div class="brand-body">
<input type="text" class="brand-search" placeholder="输入您要查找的品牌">
</div>
<div class="brand-letter-items">
<span class="item item-all" data-value="">全部</span>
{{#each letters}}
<span class="item" data-value="{{letter}}">{{letter}}</span>
{{/each}}
<span class="mulit-choose">
多选 ＋
</span>
</div>
<div class="brand-list nano">
<div class="nano-content">
{{#each brandData}}
<div class="input-radio {{#if checked}}default-check{{/if}}" data-value="{{id}}"
data-word="{{brandAlif}}">
{{> icon/radio}}
{{#if brandNameEn}}
<label>{{brandNameEn}}</label>
{{^}}
<label>{{brandName}}</label>
{{/if}}
</div>
{{/each}}
</div>
</div>
<div class="brand-btns">
<span class="btn disable large confirm">确定</span>
<span class="btn white large cancel">取消</span>
</div>
</div>
</div>
{{/if}}
{{#if showPrice}}
<div class="yoho-ui-accordion">
<h3>价格</h3>
<div class="body price-body">
{{#each priceRange}}
<div class="input-radio" data-value="{{lower}},{{higher}}">
{{> icon/radio }}
<label>¥{{lower}}-¥{{higher}}</label>
</div>
{{/each}}
<div class="price-btns">
<div class="price-input inline-block">
<span class="iconfont">&#xe63a;</span>
<input type="text" class="price-low" value="{{customPriceLow}}">
</div>
<span>－</span>
<div class="price-input inline-block">
<span class="iconfont">&#xe63a;</span>
<input type="text" class="price-high" value="{{customPriceHigh}}">
</div>
<span class="btn large confirm">确定</span>
</div>
</div>
</div>
{{/if}}
{{#if showSize}}
<div class="yoho-ui-accordion">
<h3>尺码</h3>
<div class="body">
<div class="size-body nano">
<div class="nano-content">
{{#each size}}
<div class="input-radio" data-value="{{sizeId}}">
{{> icon/radio }}
<label>{{sizeName}}</label>
</div>
{{/each}}
</div>
</div>
</div>
</div>
{{/if}}
{{#if colors}}
<div class="yoho-ui-accordion">
<h3>颜色</h3>
<div class="body">
<div class="color-body nano">
<div class="nano-content">
{{#each colors}}
<div class="input-radio" data-value="{{id}}">
{{> round-color}}
<label>{{title}}</label>
</div>
{{/each}}
</div>
</div>
</div>
</div>
{{/if}}
{{#if showInfo}}
<div class="blank-div"></div>
<div class="title">商品属性</div>
<div class="yoho-ui-accordion no-active">
{{#if style}}
<h3>风格</h3>
<div class="body">
<div class="style-mulit-btn">
<span class="btn white">多选</span>
</div>
<div class="style-body nano">
<div class="nano-content">
{{#each style}}
<div class="input-radio {{#if checked}}default-check{{/if}}" data-value="{{styleId}}">
{{> icon/radio }}
<label>{{styleName}}</label>
</div>
{{/each}}
</div>
</div>
<div class="style-btns">
<span class="btn disable large confirm">确定</span>
<span class="btn white large cancel">取消</span>
</div>
</div>
{{/if}}
{{#each standard}}
<h3>{{standardName}}</h3>
<div class="body" data-value="{{standardId}}">
<div class="standard-body nano">
<div class="nano-content">
{{#each sub}}
<div class="input-radio" data-value="{{standardId}}">
{{> icon/radio }}
<label>{{standardName}}</label>
</div>
{{/each}}
</div>
</div>
</div>
{{/each}}
</div>
{{/if}}
<div class="blank-div" style="margin-bottom: 10px;"></div>
... ...
{{> settle-header}}
<div class="shopping-order-page blk-page">
{{# content}}
<div class="center-content">
{{> bc-nav}}
<div class="address-info order-block">
<p class="title">
收货信息
<span class="right new-address">
新增收货地址
<i class="iconfont">&#xe61f;</i>
</span>
</p>
<div class="content">
<ul id="address-list" class="clearfix address-list shrink"></ul>
<p class="address-all vhide">
显示全部地址
<span class="iconfont">&#xe616;</span>
</p>
</div>
</div>
<div class="payment-type order-block">
<p class="title">支付方式</p>
<ul class="content">
<li class="chose-row clearfix focus">
<span class="chose-block">在线支付</span>
<span class="tip-text">支持主流银行卡、微信、支付宝、银联等平台付款，方便快捷</span>
</li>
</ul>
</div>
<div class="dispatch-type order-block">
<p class="title">配送方式</p>
<ul class="content">
{{#each delivery_way}}
<li class="chose-row clearfix{{#if @first}} focus{{/if}}" data-id="{{delivery_way_id}}">
<span class="chose-block">{{delivery_way_name}}：运费¥{{round delivery_way_cost 2}}</span>
</li>
{{/each}}
</ul>
</div>
<div class="order-info order-block">
<div class="order-inner">
<p class="title">
订单信息
<a class="right go-cart-link" href="{{goCartLink}}">
返回购物袋修改
<span class="iconfont">&#xe61e;</span>
</a>
</p>
{{#with shopping_cart_data}}
{{#isY is_multi_package}}
<div class="multi-package-row">
温馨提示：您购买的商品<em class="blue">分属不同仓库</em>，需要调拨，将被拆分成多个包裹送达
<span class="iconfont show-package">&#xe643;</span>
<div class="package-list hide">
<div class="package-up-icon"></div>
{{#each ../package_list}}
<div class="package-item">
<p class="package-title bold">包裹{{math @index '+' 1}}:{{#if @first}}总仓发货{{^}}异地调拨{{/if}}</p>
{{#if showToggle}}
<span class="iconfont toggle-icon left-icon">&#xe607;</span>
<span class="iconfont toggle-icon right-icon">&#xe61e;</span>
{{/if}}
<div class="package-goods-wrap">
<ul class="package-goods clearfix">
{{#each goods_list}}
<li class="left">
<img class="lazy package-goods-img" data-original="{{image goods_images 100 134}}">
</li>
{{/each}}
</ul>
</div>
<p class="package-shipping">运费：¥{{shopping_cost}}元（原价{{shopping_orig_cost}}元，优惠{{shopping_cut_cost}}元）</p>
</div>
{{/each}}
</div>
</div>
{{/isY}}
{{/with}}
<div class="content">
<p class="order-table-head clearfix">
<span class="info">商品信息</span>
<span class="color-size">颜色尺码</span>
<span class="price">单价</span>
<span class="number">数量</span>
</p>
<ul class="order-table-body">
{{#each goods_list}}
<li class="order-goods clearfix">
<a class="goods-img inline-block" href="{{link}}" target="_blank">
<img class="lazy" data-original="{{image goods_images 100 148}}">
{{#if isGift}}
<span class="gift-tag">赠品</span>
{{/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>
</p>
<p class="color-size">
<span class="color">颜色：{{color_name}}</span>
<span class="size">尺码：{{size_name}}</span>
</p>
<p class="price">
¥{{round last_price 2}}
</p>
<p class="number">
<span class="iconfont">&#xe61d;</span>
{{buy_number}}
</p>
</li>
{{/each}}
</ul>
</div>
</div>
</div>
<div class="invoice-info order-block">
<p class="title">发票信息</p>
<div id="invoice-content" class="content">
<div class="invoice-radio">
{{> icon/radio}}
<label>发票开具</label>
</div>
</div>
</div>
<div class="coin-and-remark">
<div class="coin">
<p class="title">
<span class="iconfont coin-ctrl">&#xe639;</span>
<span class="coin-ctrl">使用有货币</span>
</p>
<div class="content hide">
<div class="using-coin">
本次使用有货币
<input id="input-coin" class="input coin-input" type="text" data-max="{{yoho_coin}}">
个
您当前共有有货币<em class="blue">{{yoho_coin}}</em>个
<span id="coin-tip" class="coin-tip block blue vhide">抵扣¥<em class="balance-coin"></em></span>
<span id="coin-sure" class="btn disable">确定</span>
</div>
<div class="used-coin hide">
本次使用有货币<em id="coin-used" class="blue"></em>个，本次抵扣<span class="blue">¥<em id="coin-deduction"></em></span>
<span class="btn white modify">修改</span>
<span class="btn white cancel">取消使用</span>
</div>
</div>
</div>
<div class="remark">
<p class="title">
<span class="iconfont remark-ctrl">&#xe639;</span>
<span class="remark-ctrl">添加备注信息</span>
</p>
<div class="content hide">
<textarea id="remark-content" class="remark-content" placeholder="声明：备注中有关收货人信息、支付方式、配送方式、发票信息等购买要求一律以上面的选择为准，备注无效"></textarea>
<div id="print-price" class="print-price">
是否打印价格：
<div class="print-price-radio-group">
{{#each printPriceRadio}}
<div class="print-price-radio" data-value="{{value}}">
<label>{{name}}</label>
{{> icon/radio}}
</div>
{{/each}}
<span class="remark-tip">（如：送朋友的商品可不打印价格哦！）</span>
</div>
</div>
</div>
</div>
</div>
<div class="balance clearfix">
{{# shopping_cart_data}}
<div class="balance-info left">
<p class="receiver-wrap">
{{#with ../delivery_address}}
<i>收货信息：</i>
<em id="receiver">{{consignee}} {{mobile}} {{area}} {{address}}</em>
{{/with}}
<span class="right">{{selected_goods_count}}件商品</span>
</p>
<p>
支付方式：<em id="balance-pay-type">在线支付</em>
</p>
</div>
<ul id="balance-list" class="balance-list right">
{{#each promotion_formula_list}}
<li>
<span class="balance-title">
{{promotion}}
{{#if shippingCut}}
<em>(原价：{{shippingOrigin}}元，优惠：{{shippingCut}}元)</em>
{{/if}}
</span>
<span class="balance-cost">{{promotion_amount}}</span>
</li>
{{/each}}
<li class="need-pay">
<span class="balance-title">应付金额{{#if shipping_cost}}（含运费）{{/if}}：</span>
<span id="balance-cost" class="balance-cost" data-cost="{{last_order_amount}}">¥<em>{{round last_order_amount 2}}</em></span>
</li>
<li>
<span id="submit-order" class="btn submit-order">提交订单</span>
</li>
</ul>
{{/ shopping_cart_data}}
</div>
{{!-- 服务端渲染,客户端使用 --}}
<script id="invoice-dialog-tpl" type="text/html">
<p class="dialog-title">发票信息</p>
<ul class="invoice-tab">
<li class="btn paper-invoice">纸质发票</li>
</ul>
<div class="invoice-entity el">
<div class="row clearfix">
<span class="label">
<em class="required-mark">*</em>
发票抬头：
</span>
<div class="row-content">
<div class="invoice-title-radio-group">
{{#each invoices.invoiceTitle}}
<div class="invoice-title-radio{{#if myClass}} {{myClass}}{{/if}}" data-value="{{value}}">
{{> icon/radio}}
<label>{{name}}</label>
</div>
{{/each}}
</div>
<div>
<input class="input invoice-title-input hide" type="text" maxlength="30" placeholder="请填写单位名称">
<span class="input-tip invoice-title-tip blue hide">
<span class="iconfont">&#xe60c;</span>
请填写发票抬头
</span>
</div>
</div>
</div>
<div class="row clearfix">
<span class="label">
<em class="required-mark">*</em>
发票内容：
</span>
<div class="row-content">
<div class="invoice-content-radio-group">
{{#each invoices.invoiceContentList}}
<div class="invoice-content-radio" data-value="{{invoices_type_id}}">
{{> icon/radio}}
<label>{{invoices_type_name}}</label>
</div>
{{/each}}
</div>
</div>
</div>
</div>
</script>
</div>
{{/ content}}
{{> settle-header}}
<div class="shopping-order-page blk-page">
{{# content}}
<div class="center-content">
{{> bc-nav}}
<div class="address-info order-block">
<p class="title">
收货信息
<span class="right new-address">
新增收货地址
<i class="iconfont">&#xe61f;</i>
</span>
</p>
<div class="content">
<ul id="address-list" class="clearfix address-list shrink"></ul>
<p class="address-all vhide">
显示全部地址
<span class="iconfont">&#xe616;</span>
</p>
</div>
</div>
<div class="payment-type order-block">
<p class="title">支付方式</p>
<ul class="content">
<li class="chose-row clearfix focus">
<span class="chose-block">在线支付</span>
<span class="tip-text">支持主流银行卡、微信、支付宝、银联等平台付款，方便快捷</span>
</li>
</ul>
</div>
<div class="dispatch-type order-block">
<p class="title">配送方式</p>
<ul class="content">
{{#each delivery_way}}
<li class="chose-row clearfix{{#if @first}} focus{{/if}}" data-id="{{delivery_way_id}}">
<span class="chose-block">{{delivery_way_name}}：运费¥{{round delivery_way_cost 2}}</span>
</li>
{{/each}}
</ul>
</div>
<div class="order-info order-block">
<div class="order-inner">
<p class="title">
订单信息
<a class="right go-cart-link" href="{{goCartLink}}">
返回购物袋修改
<span class="iconfont">&#xe61e;</span>
</a>
</p>
{{#with shopping_cart_data}}
{{#isY is_multi_package}}
<div class="multi-package-row">
温馨提示：您购买的商品<em class="blue">分属不同仓库</em>，需要调拨，将被拆分成多个包裹送达
<span class="iconfont show-package">&#xe643;</span>
<div class="package-list hide">
<div class="package-up-icon"></div>
{{#each ../package_list}}
<div class="package-item">
<p class="package-title bold">包裹{{math @index '+' 1}}:{{#if @first}}总仓发货{{^}}异地调拨{{/if}}</p>
{{#if showToggle}}
<span class="iconfont toggle-icon left-icon">&#xe607;</span>
<span class="iconfont toggle-icon right-icon">&#xe61e;</span>
{{/if}}
<div class="package-goods-wrap">
<ul class="package-goods clearfix">
{{#each goods_list}}
<li class="left">
<img class="lazy package-goods-img" data-original="{{image goods_images 100 134}}">
</li>
{{/each}}
</ul>
</div>
<p class="package-shipping">运费：¥{{shopping_cost}}元（原价{{shopping_orig_cost}}元，优惠{{shopping_cut_cost}}元）</p>
</div>
{{/each}}
</div>
</div>
{{/isY}}
{{/with}}
<div class="content">
<p class="order-table-head clearfix">
<span class="info">商品信息</span>
<span class="color-size">颜色尺码</span>
<span class="price">单价</span>
<span class="number">数量</span>
</p>
<ul class="order-table-body">
{{#each goods_list}}
<li class="order-goods clearfix">
<a class="goods-img inline-block" href="{{link}}" target="_blank">
<img class="lazy" data-original="{{image goods_images 100 148}}">
{{#if isGift}}
<span class="gift-tag">赠品</span>
{{/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>
</p>
<p class="color-size">
<span class="color">颜色：{{color_name}}</span>
<span class="size">尺码：{{size_name}}</span>
</p>
<p class="price">
¥{{round last_price 2}}
</p>
<p class="number">
<span class="iconfont">&#xe61d;</span>
{{buy_number}}
</p>
</li>
{{/each}}
</ul>
</div>
</div>
</div>
<div class="invoice-info order-block">
<p class="title">发票信息</p>
<div id="invoice-content" class="content">
<div class="invoice-radio">
{{> icon/radio}}
<label>发票开具</label>
</div>
</div>
</div>
<div class="coin-and-remark">
<div class="coin">
<p class="title">
<span class="iconfont coin-ctrl">&#xe639;</span>
<span class="coin-ctrl">使用有货币</span>
</p>
<div class="content hide">
<div class="using-coin">
本次使用有货币
<input id="input-coin" class="input coin-input" type="text" data-max="{{yoho_coin}}">
个
您当前共有有货币<em class="blue">{{yoho_coin}}</em>个
<span id="coin-tip" class="coin-tip block blue vhide">抵扣¥<em class="balance-coin"></em></span>
<span id="coin-sure" class="btn disable">确定</span>
</div>
<div class="used-coin hide">
本次使用有货币<em id="coin-used" class="blue"></em>个，本次抵扣<span class="blue">¥<em id="coin-deduction"></em></span>
<span class="btn white modify">修改</span>
<span class="btn white cancel">取消使用</span>
</div>
</div>
</div>
<div class="remark">
<p class="title">
<span class="iconfont remark-ctrl">&#xe639;</span>
<span class="remark-ctrl">添加备注信息</span>
</p>
<div class="content hide">
<textarea id="remark-content" class="remark-content" placeholder="声明：备注中有关收货人信息、支付方式、配送方式、发票信息等购买要求一律以上面的选择为准，备注无效"></textarea>
<div id="print-price" class="print-price">
是否打印价格：
<div class="print-price-radio-group">
{{#each printPriceRadio}}
<div class="print-price-radio" data-value="{{value}}">
<label>{{name}}</label>
{{> icon/radio}}
</div>
{{/each}}
<span class="remark-tip">（如：送朋友的商品可不打印价格哦！）</span>
</div>
</div>
</div>
</div>
</div>
<div class="balance clearfix">
{{# shopping_cart_data}}
<div class="balance-info left">
<p class="receiver-wrap">
{{#with ../delivery_address}}
<i>收货信息：</i>
<em id="receiver">{{consignee}} {{mobile}} {{area}} {{address}}</em>
{{/with}}
<span class="right">{{selected_goods_count}}件商品</span>
</p>
<p>
支付方式：<em id="balance-pay-type">在线支付</em>
</p>
</div>
<ul id="balance-list" class="balance-list right">
{{#each promotion_formula_list}}
<li>
<span class="balance-title">
{{promotion}}
{{#if shippingCut}}
<em>(原价：{{shippingOrigin}}元，优惠：{{shippingCut}}元)</em>
{{/if}}
</span>
<span class="balance-cost">{{promotion_amount}}</span>
</li>
{{/each}}
<li class="need-pay">
<span class="balance-title">应付金额{{#if shipping_cost}}（含运费）{{/if}}：</span>
<span id="balance-cost" class="balance-cost" data-cost="{{last_order_amount}}">¥<em>{{round last_order_amount 2}}</em></span>
</li>
<li>
<span id="submit-order" class="btn submit-order">提交订单</span>
</li>
</ul>
{{/ shopping_cart_data}}
</div>
{{!-- 服务端渲染,客户端使用 --}}
<script id="invoice-dialog-tpl" type="text/html">
<p class="dialog-title">发票信息</p>
<ul class="invoice-tab">
<li class="btn paper-invoice">纸质发票</li>
</ul>
<div class="invoice-entity el">
<div class="row clearfix">
<span class="label">
<em class="required-mark">*</em>
发票抬头：
</span>
<div class="row-content">
<div class="invoice-title-radio-group">
{{#each invoices.invoiceTitle}}
<div class="invoice-title-radio{{#if myClass}} {{myClass}}{{/if}}" data-value="{{value}}">
{{> icon/radio}}
<label>{{name}}</label>
</div>
{{/each}}
</div>
<div>
<input class="input invoice-title-input hide" type="text" maxlength="30" placeholder="请填写单位名称">
<span class="input-tip invoice-title-tip blue hide">
<span class="iconfont">&#xe60c;</span>
请填写发票抬头
</span>
</div>
</div>
</div>
<div class="row clearfix">
<span class="label">
<em class="required-mark">*</em>
发票内容：
</span>
<div class="row-content">
<div class="invoice-content-radio-group">
{{#each invoices.invoiceContentList}}
<div class="invoice-content-radio" data-value="{{invoices_type_id}}">
{{> icon/radio}}
<label>{{invoices_type_name}}</label>
</div>
{{/each}}
</div>
</div>
</div>
</div>
</script>
</div>
{{/ content}}
</div>
\ No newline at end of file
... ...
{{> settle-header}}
<div class="center-content pay-online-wrapper">
{{# order}}
<div class="title">
<div class="content">
<span class="desc left">订单已提交成功，请您尽快付款！订单编号：{{orderCode}}</span>
<span class="cash right">应付金额：{{paymentAmount}}</span>
</div>
<div class="footer">
<span class="desc pay-notice left">{{../username}}如果<span class="blue">2小时</span>内您无法完成付款，系统会将您的订单取消</span>
<span id="order-detail-ctrl" class="right order-detail-ctrl">
<em>收起详情</em>
<i class="iconfont down">&#xe616;</i>
<i class="iconfont up">&#xe617;</i>
</span>
</div>
</div>
<div class="order-detail">
<div class="row">
<div class="item receiver-address">
<span class="label"> 收货地址：</span>
<span>{{area}} {{address}}</span>
</div>
</div>
<div class="row">
<div class="item">
<span class="label">收&nbsp;&nbsp;货&nbsp;&nbsp;人：</span>
<span>{{userName}}</span>
</div>
<div class="item">
<span class="label">联系方式：</span>
<span>{{mobile}}</span>
</div>
</div>
<div class="row">
<div class="item">
<span class="label">支付方式：</span>
<span>在线支付</span>
</div>
<div class="item">
<span class="label">送货时间：</span>
<span>{{deliveryTime}}</span>
</div>
</div>
</div>
{{/order}}
{{# pay}}
<div class="pay-type">
<div class="pay-nav">
<ul class="tabs clearfix">
{{#each type}}
<li{{#if selected}} class="active"{{/if}} data-type="{{id}}">{{name}}</li>
{{/each}}
</ul>
</div>
<div id="online">
{{# onlinePay}}
<div class="pay-type-icon online-pay{{#if selected}} active{{/if}}" data-name="{{name}}" data-id="{{id}}">
<img src="{{img}}">
<span class="choose-tag iconfont">&#xe63b;</span>
</div>
{{/ onlinePay}}
</div>
</div>
{{/ pay}}
<div class="pay-ctrl">
<span id="go-pay-btn" class="btn btn-shape right" data-order="{{order.orderCode}}">去<em id="pay-type-name">支付宝</em>支付</span>
</div>
</div>
{{> settle-header}}
<div class="center-content pay-online-wrapper">
{{# order}}
<div class="title">
<div class="content">
<span class="desc left">订单已提交成功，请您尽快付款！订单编号：{{orderCode}}</span>
<span class="cash right">应付金额：{{paymentAmount}}</span>
</div>
<div class="footer">
<span class="desc pay-notice left">{{../username}}如果<span class="blue">2小时</span>内您无法完成付款，系统会将您的订单取消</span>
<span id="order-detail-ctrl" class="right order-detail-ctrl">
<em>收起详情</em>
<i class="iconfont down">&#xe616;</i>
<i class="iconfont up">&#xe617;</i>
</span>
</div>
</div>
<div class="order-detail">
<div class="row">
<div class="item receiver-address">
<span class="label"> 收货地址：</span>
<span>{{area}} {{address}}</span>
</div>
</div>
<div class="row">
<div class="item">
<span class="label">收&nbsp;&nbsp;货&nbsp;&nbsp;人：</span>
<span>{{userName}}</span>
</div>
<div class="item">
<span class="label">联系方式：</span>
<span>{{mobile}}</span>
</div>
</div>
<div class="row">
<div class="item">
<span class="label">支付方式：</span>
<span>在线支付</span>
</div>
<div class="item">
<span class="label">送货时间：</span>
<span>{{deliveryTime}}</span>
</div>
</div>
</div>
{{/order}}
{{# pay}}
<div class="pay-type">
<div class="pay-nav">
<ul class="tabs clearfix">
{{#each type}}
<li{{#if selected}} class="active"{{/if}} data-type="{{id}}">{{name}}</li>
{{/each}}
</ul>
</div>
<div id="online">
{{# onlinePay}}
<div class="pay-type-icon online-pay{{#if selected}} active{{/if}}" data-name="{{name}}" data-id="{{id}}">
<img src="{{img}}">
<span class="choose-tag iconfont">&#xe63b;</span>
</div>
{{/ onlinePay}}
</div>
</div>
{{/ pay}}
<div class="pay-ctrl">
<span id="go-pay-btn" class="btn btn-shape right" data-order="{{order.orderCode}}">去<em id="pay-type-name">支付宝</em>支付</span>
</div>
</div>
... ...
... ... @@ -22,10 +22,13 @@ module.exports = {
},
cookieDomain: 'yohoblk.com',
domains: {
// singleApi: 'http://192.168.102.31:8092/brower',
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/',
singleApi: 'http://192.168.102.31:8092/'
singleApi: 'http://192.168.102.31:8092/',
api: 'http://api-test2.yohops.com:9999/',
service: 'http://service-test2.yohops.com:9999/',
// api: 'http://api.yoho.yohoops.org/',
// service: 'http://service.yoho.yohoops.org/',
search: 'http://192.168.102.216:8080/yohosearch/'
},
useOneapm: false,
useCache: false,
... ... @@ -36,6 +39,17 @@ module.exports = {
timeout: 1000,
retries: 0
},
interfaceShunt: {
useInterfaceShunt: false,
tencentServers: {
api: ['123.206.1.98', '123.206.2.80'],
service: ['123.206.1.98', '123.206.2.80']
},
awsServers: {
api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
}
},
loggers: {
infoFile: {
name: 'info',
... ... @@ -103,13 +117,24 @@ if (isProduction) {
useCache: true,
pay: {
serviceNotify: 'http://service.yoho.cn/'
},
interfaceShunt: {
useInterfaceShunt: false,
tencentServers: {
api: ['123.206.1.98', '123.206.2.80'],
service: ['123.206.1.98', '123.206.2.80']
},
awsServers: {
api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
}
}
});
} else if (isTest) {
Object.assign(module.exports, {
appName: 'www.yohoblk.com for test',
domains: {
singleApi: 'http://192.168.102.31:8092/brower',
singleApi: 'http://192.168.102.31:8092/',
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/',
search: 'http://192.168.102.216:8080/yohosearch/'
... ...
... ... @@ -10,6 +10,7 @@ const LoginService = require('../../apps/passport/models/login-service');
*/
module.exports = () => {
return (req, res, next) => {
req.user.uid = 8039837;
// 从 SESSION 中获取到当前登录用户的 UID
if (req.session && _.isNumber(req.session._LOGIN_UID)) {
... ...
... ... @@ -259,7 +259,6 @@ if ($('.chapter-right').find('a').text() === '') {
$('.comments-list').find('li:last').css('border-bottom', 'none');
// $('.good-info').find('.price')
$('.good-info').each(function() {
var $this = $(this).find('.price');
... ... @@ -267,3 +266,9 @@ $('.good-info').each(function() {
$this.html($this.text() + '.00');
}
});
$('.good-info').each(function(i, ele) {
if (i % 4 === 3) {
$(ele).css('margin-right', '0');
}
});
... ...
... ... @@ -127,7 +127,7 @@ function validatePhoneNumLocal() {
*/
function validatePhoneNum() {
function validate() {
var defer = $.Deferred(); //eslint-disable-line
var defer = $.Deferred(); //eslint-disable-line
if (validatePhoneNumLocal()) {
validatePhoneNumAsync().then(function(result) {
... ... @@ -197,7 +197,7 @@ function validateImgCaptchaAsync() {
*/
function validateImgCaptcha() {
function validate() {
var defer = $.Deferred(); //eslint-disable-line
var defer = $.Deferred(); //eslint-disable-line
if (validateImgCaptchaLocal()) {
validateImgCaptchaAsync().then(function(result) {
... ...
... ... @@ -48,6 +48,7 @@ function getResponse(cb) {
if (num > 20 || res) {
uping = false;
$filename.val('');
clearInterval(inter);
}
... ... @@ -63,9 +64,11 @@ function getResponse(cb) {
}
$filename.change(function() {
uping = true;
$upload.submit();
getResponse(callback);
if ($(this).val()) {
uping = true;
$upload.submit();
getResponse(callback);
}
});
exports.up = up;
... ...
... ... @@ -360,7 +360,7 @@ var YohoListPage = {
},
filterBrand: function(letter) {
$('.yoho-product-list .brand-list .input-radio').each(function() {
var first = $(this).data('word').toString(); // eslint-disable-line
var first = $(this).data('word').toString(); // eslint-disable-line
var name = $(this).find('label').text().toLowerCase();
first = first.toLowerCase();
... ...
... ... @@ -11,8 +11,8 @@
position: relative;
h4 {
height: 18px;
line-height: 18px;
height: 40px;
line-height: 40px;
padding-right: 20px;
display: -webkit-box;
font-size: 16px;
... ... @@ -20,6 +20,7 @@
overflow: hidden;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
color: #1b1b1b;
}
p {
... ... @@ -28,11 +29,11 @@
margin: 25px 0;
padding-right: 20px;
font-size: $size;
line-height: $line-height;
line-height: 24px;
overflow: hidden;
-webkit-line-clamp: $lines-to-show;
-webkit-box-orient: vertical;
color: #505050;
color: #1b1b1b;
}
button {
... ... @@ -42,9 +43,10 @@
bottom: 50px;
background-color: white;
outline: none;
border: 2px solid black;
border: 1px solid black;
font-size: 14px;
font-weight: bold;
cursor: pointer;
color: #1b1b1b;
}
}
... ...
... ... @@ -68,7 +68,6 @@
.slide-container-placeholder {
height: $sliderHeight;
width: 100%;
}
.slide-thumb-container-placeholder {
... ... @@ -270,7 +269,7 @@
}
.floor-header {
height: 90px;
height: 74px;
line-height: 1.4;
font-size: 16px;
}
... ...
... ... @@ -3,12 +3,15 @@
line-height: 27px;
text-align: center;
font-weight: bold;
color: #1b1b1b;
}
.en-size {
font-size: 24px;
font-size: 18px;
line-height: 18px;
}
.zh-size {
font-size: 18px;
font-size: 14px;
line-height: 24px;
}
... ...
.share {
height: 25px;
width: 300px;
line-height: 25px;
position: relative;
.share-title {
font-size: 14px;
float: left;
}
.share-wrapper {
i {
float: left;
margin-right: 15px;
cursor: pointer;
font-size: 20px;
}
}
.weixin-share-box {
position: absolute;
margin-top: 9px;
text-align: center;
top: 15px;
left: 26px;
z-index: 2;
h2 {
display: block;
height: 46px;
line-height: 46px;
color: #000;
font-size: 18px;
}
img {
width: 140px;
height: 140px;
}
.top {
position: absolute;
color: #bbb;
background: #fff;
width: 12px;
left: 89px;
z-index: 100;
height: 12px;
display: block;
background-image: resolve("layout/up.png");
top: 9px;
}
}
.con {
width: 250px;
height: 310px;
position: relative;
overflow: hidden;
background-color: #fff;
border: 1px solid #bbb;
box-shadow: 0 2px 4px #d1d1d1;
margin-top: 15px;
}
.hide {
display: none;
}
.pic {
overflow: hidden;
margin: 30px auto;
}
.w {
font-size: 13px;
color: #9f9f9f;
line-height: 20px;
}
}
.share {
height: 25px;
width: 300px;
line-height: 25px;
position: relative;
.share-title {
font-size: 14px;
float: left;
}
.share-wrapper {
i {
float: left;
margin-right: 15px;
cursor: pointer;
font-size: 20px;
}
}
.weixin-share-box {
position: absolute;
margin-top: 9px;
text-align: center;
top: 15px;
left: 26px;
z-index: 2;
h2 {
display: block;
height: 46px;
line-height: 46px;
color: #000;
font-size: 18px;
}
img {
width: 140px;
height: 140px;
}
.top {
position: absolute;
color: #bbb;
background: #fff;
width: 12px;
left: 89px;
z-index: 100;
height: 12px;
display: block;
background-image: resolve("layout/up.png");
top: 9px;
}
}
.con {
width: 250px;
height: 310px;
position: relative;
overflow: hidden;
background-color: #fff;
border: 1px solid #bbb;
box-shadow: 0 2px 4px #d1d1d1;
margin-top: 15px;
}
.hide {
display: none;
}
.pic {
overflow: hidden;
margin: 30px auto;
}
.w {
font-size: 13px;
color: #9f9f9f;
line-height: 20px;
}
}
... ...
.content-msg {
margin-top: 40px;
margin-left: 110px;
.msg-left {
position: relative;
float: left;
width: 200px;
height: 30px;
margin-right: 90px;
line-height: 30px;
text-align: center;
border-bottom: 1px solid #bbb;
color: #999;
}
.msg-right {
float: left;
width: 643px;
border-bottom: 1px solid #eee;
margin-top: 2px;
padding-bottom: 5px;
a {
img {
margin-top: 10px;
}
}
}
.msg-title {
font-size: 20px;
color: #1b1b1b;
line-height: 30px;
max-height: 64px;
overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.msg-title:hover {
color: #666;
}
.lazy {
width: 640px;
height: 430px;
margin-top: 15px;
}
.content {
display: block;
font-size: 14px;
line-height: 24px;
word-wrap: break-word;
margin-top: 15px;
overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.msg-app {
height: 50px;
line-height: 50px;
font-size: 14px;
}
.time {
color: #a6a6a6;
margin-left: 3px;
}
.iconfont {
font-size: 14px;
margin-top: 0;
}
.time-word {
font-weight: normal;
}
.like-comment {
color: #999;
cursor: pointer;
font-size: 14px;
.like-icon {
cursor: pointer;
&.liked {
color: #000;
}
}
}
.like-num {
font-weight: normal;
}
}
.content-msg {
margin-top: 40px;
margin-left: 110px;
.msg-left {
position: relative;
float: left;
width: 200px;
height: 30px;
margin-right: 90px;
line-height: 30px;
text-align: center;
border-bottom: 1px solid #bbb;
color: #999;
}
.msg-right {
float: left;
width: 643px;
border-bottom: 1px solid #eee;
margin-top: 2px;
padding-bottom: 5px;
a {
img {
margin-top: 10px;
}
}
}
.msg-title {
font-size: 20px;
color: #1b1b1b;
line-height: 30px;
max-height: 64px;
overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.msg-title:hover {
color: #666;
}
.lazy {
width: 640px;
height: 430px;
margin-top: 15px;
}
.content {
display: block;
font-size: 14px;
line-height: 24px;
word-wrap: break-word;
margin-top: 15px;
overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.msg-app {
height: 50px;
line-height: 50px;
font-size: 14px;
}
.time {
color: #a6a6a6;
margin-left: 3px;
}
.iconfont {
font-size: 14px;
margin-top: 0;
}
.time-word {
font-weight: normal;
}
.like-comment {
color: #999;
cursor: pointer;
font-size: 14px;
.like-icon {
cursor: pointer;
&.liked {
color: #000;
}
}
}
.like-num {
font-weight: normal;
}
}
... ...
.help-page {
padding-bottom: 30px;
background: #f5f5f5;
.help-navigation {
width: 150px;
margin-right: 10px;
background: #fff;
.title {
height: 60px;
line-height: 60px;
text-align: center;
background: #fff;
}
.nav {
li {
cursor: pointer;
padding: 10px 15px;
width: 200px;
font-size: 14px;
.plus {
cursor: pointer;
margin-right: 10px;
height: 14px;
width: 14px;
background-repeat: no-repeat;
background-image: resolve("help/plus.png");
background-size: 14px 14px;
position: relative;
top: 3px;
}
.mult {
margin-right: 26px;
height: 14px;
width: 14px;
}
}
li.selected > a {
color: #379ed6;
}
.smll-category {
display: none;
}
}
}
.help-main {
width: 990px;
padding: 35px 30px;
background-color: #fff;
font-size: 14px;
.normal-data,
.step-data {
padding: 2px;
line-height: 25px;
}
.big-title {
font-size: 20px;
}
.step-title {
font-weight: bolder;
padding-bottom: 5px;
}
.step {
list-style: disc;
}
}
}
.help-page {
padding-bottom: 30px;
background: #f5f5f5;
.help-navigation {
width: 150px;
margin-right: 10px;
background: #fff;
.title {
height: 60px;
line-height: 60px;
text-align: center;
background: #fff;
}
.nav {
li {
cursor: pointer;
padding: 10px 15px;
width: 200px;
font-size: 14px;
.plus {
cursor: pointer;
margin-right: 10px;
height: 14px;
width: 14px;
background-repeat: no-repeat;
background-image: resolve("help/plus.png");
background-size: 14px 14px;
position: relative;
top: 3px;
}
.mult {
margin-right: 26px;
height: 14px;
width: 14px;
}
}
li.selected > a {
color: #379ed6;
}
.smll-category {
display: none;
}
}
}
.help-main {
width: 990px;
padding: 35px 30px;
background-color: #fff;
font-size: 14px;
.normal-data,
.step-data {
padding: 2px;
line-height: 25px;
}
.big-title {
font-size: 20px;
}
.step-title {
font-weight: bolder;
padding-bottom: 5px;
}
.step {
list-style: disc;
}
}
}
... ...
.favorite-brands {
position: relative;
.num {
position: absolute;
top: -30px;
left: 600px;
font-size: 16px;
color: #666;
}
.brand-raw > div {
float: left;
}
.brand-raw {
padding: 30px 0;
border-bottom: 1px solid #eee;
.check {
padding: 56px 0;
margin-right: 20px;
cursor: pointer;
.iconfont {
font-size: 14px;
color: #666;
}
}
.brand-info {
.brand-icon {
border: 1px solid #eee;
}
.brand-name {
text-align: center;
background-color: #eee;
padding: 5px;
font-size: 14px;
width: 147px;
color: #666;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.tool-area {
height: 26px;
margin-top: 15px;
}
.tool-area > .btn {
display: none;
}
}
.brand-info:hover {
.btn {
display: block;
float: left;
}
.btn.cancel {
display: block;
float: right;
}
}
.brand-products {
float: right;
width: 685px;
position: relative;
}
.no-product-info {
text-align: center;
margin-top: 65px;
a {
color: #379ed6;
}
}
}
.goods-info {
float: left;
width: 148px;
margin: 0 5px;
img {
width: 148px;
height: 195px;
}
.name {
display: block;
height: 36px;
overflow: hidden;
text-overflow: ellipsis;
line-height: 18px;
margin-top: 10px;
padding: 0 15px;
}
.price {
margin-top: 15px;
}
}
.goods-more {
float: left;
width: 147px;
height: 195px;
background-color: #eee;
margin: 0 7px 67px;
text-align: center;
position: relative;
.more-text {
position: absolute;
top: 70px;
color: #fff;
width: 55px;
left: 46px;
font-size: 18px;
background-color: #000;
}
p {
position: relative;
top: 93px;
font-size: 12px;
}
}
.slide-container {
.slide-switch {
display: block;
position: absolute;
top: 90px;
width: 100%;
.iconfont {
color: #fff;
}
}
.slide-wrap {
overflow: hidden;
width: 625px;
margin: 0 auto;
ul {
position: relative;
li {
float: left;
width: 635px;
overflow: hidden;
margin: 0 -5px;
display: none;
}
li.show {
display: block;
}
}
}
}
}
.favorite-brands {
position: relative;
.num {
position: absolute;
top: -30px;
left: 600px;
font-size: 16px;
color: #666;
}
.brand-raw > div {
float: left;
}
.brand-raw {
padding: 30px 0;
border-bottom: 1px solid #eee;
.check {
padding: 56px 0;
margin-right: 20px;
cursor: pointer;
.iconfont {
font-size: 14px;
color: #666;
}
}
.brand-info {
.brand-icon {
border: 1px solid #eee;
}
.brand-name {
text-align: center;
background-color: #eee;
padding: 5px;
font-size: 14px;
width: 147px;
color: #666;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.tool-area {
height: 26px;
margin-top: 15px;
}
.tool-area > .btn {
display: none;
}
}
.brand-info:hover {
.btn {
display: block;
float: left;
}
.btn.cancel {
display: block;
float: right;
}
}
.brand-products {
float: right;
width: 685px;
position: relative;
}
.no-product-info {
text-align: center;
margin-top: 65px;
a {
color: #379ed6;
}
}
}
.goods-info {
float: left;
width: 148px;
margin: 0 5px;
img {
width: 148px;
height: 195px;
}
.name {
display: block;
height: 36px;
overflow: hidden;
text-overflow: ellipsis;
line-height: 18px;
margin-top: 10px;
padding: 0 15px;
}
.price {
margin-top: 15px;
}
}
.goods-more {
float: left;
width: 147px;
height: 195px;
background-color: #eee;
margin: 0 7px 67px;
text-align: center;
position: relative;
.more-text {
position: absolute;
top: 70px;
color: #fff;
width: 55px;
left: 46px;
font-size: 18px;
background-color: #000;
}
p {
position: relative;
top: 93px;
font-size: 12px;
}
}
.slide-container {
.slide-switch {
display: block;
position: absolute;
top: 90px;
width: 100%;
.iconfont {
color: #fff;
}
}
.slide-wrap {
overflow: hidden;
width: 625px;
margin: 0 auto;
ul {
position: relative;
li {
float: left;
width: 635px;
overflow: hidden;
margin: 0 -5px;
display: none;
}
li.show {
display: block;
}
}
}
}
}
... ...
.order-dialog {
$bigSpace: 30px;
$smallSpace: 10px;
$space: 20px;
$normalSize: 14px;
$borderColor: #f1f1f1;
$skyBlue: #379ed6;
.cancel-btn {
background-color: #fff;
color: #1b1b1b;
border: 1px solid #1b1b1b;
}
.btns,
.btn {
text-align: center !important;
}
.dialog-title {
padding-bottom: $space;
border-bottom: 1px solid #f1f1f1;
font-size: 16px;
}
&.alert {
h1 {
margin-bottom: $space;
font-size: 22px;
font-weight: bold;
}
span {
font-size: $normalSize;
}
}
&.delete-dialog {
.content {
h1 {
font-size: 24px;
font-weight: bold;
margin-bottom: 24px;
}
p {
height: 18px;
font-size: 12px;
color: #a3a3a3;
}
}
.btns {
margin-top: 5px;
}
}
&.cancel-dialog {
min-width: 660px;
* {
text-align: left;
color: #1b1b1b;
}
.btn {
&.confirm {
color: #fff;
}
}
.tip {
display: block;
margin: $space 0 10px;
font-size: 12px;
font-weight: bold;
}
.tip-item {
height: $space;
margin-bottom: $smallSpace;
line-height: $space;
font-size: $normalSize;
}
.radio {
color: #ccc !important;
&.checked {
color: #1b1b1b !important;
}
}
.row {
height: $bigSpace;
line-height: $bigSpace;
.other {
width: 90%;
p {
width: 20%;
}
input {
height: 25px;
width: 50%;
padding: 5px;
}
}
p {
width: 49%;
display: inline-block;
box-sizing: border-box;
font-size: $normalSize;
}
.iconfont {
display: inline-block;
margin-right: 3px;
font-size: $normalSize;
cursor: pointer;
}
}
}
&.edit-dialog {
min-width: 750px;
background-color: #fff;
* {
text-align: left;
}
.form {
margin: $bigSpace 0 $space;
}
}
.cascading-address {
display: inline-block;
border: 1px solid #f0f0f0;
.dist-item {
height: 32px;
margin-right: 0;
border: none;
background-color: #fff;
}
.items-panel {
border-color: #f0f0f0;
}
}
.form {
.input-row {
height: 25px;
line-height: 25px;
margin-bottom: $space;
font-size: $normalSize;
label {
display: inline-block;
width: 70px;
text-align: left;
span {
margin-right: 7px;
}
}
input {
width: 190px;
&.long {
width: 270px;
}
}
&.selector {
height: 32px;
line-height: 1;
> span,
> label {
position: relative;
top: -12px !important;
}
}
}
}
}
.order-dialog {
$bigSpace: 30px;
$smallSpace: 10px;
$space: 20px;
$normalSize: 14px;
$borderColor: #f1f1f1;
$skyBlue: #379ed6;
.cancel-btn {
background-color: #fff;
color: #1b1b1b;
border: 1px solid #1b1b1b;
}
.btns,
.btn {
text-align: center !important;
}
.dialog-title {
padding-bottom: $space;
border-bottom: 1px solid #f1f1f1;
font-size: 16px;
}
&.alert {
h1 {
margin-bottom: $space;
font-size: 22px;
font-weight: bold;
}
span {
font-size: $normalSize;
}
}
&.delete-dialog {
.content {
h1 {
font-size: 24px;
font-weight: bold;
margin-bottom: 24px;
}
p {
height: 18px;
font-size: 12px;
color: #a3a3a3;
}
}
.btns {
margin-top: 5px;
}
}
&.cancel-dialog {
min-width: 660px;
* {
text-align: left;
color: #1b1b1b;
}
.btn {
&.confirm {
color: #fff;
}
}
.tip {
display: block;
margin: $space 0 10px;
font-size: 12px;
font-weight: bold;
}
.tip-item {
height: $space;
margin-bottom: $smallSpace;
line-height: $space;
font-size: $normalSize;
}
.radio {
color: #ccc !important;
&.checked {
color: #1b1b1b !important;
}
}
.row {
height: $bigSpace;
line-height: $bigSpace;
.other {
width: 90%;
p {
width: 20%;
}
input {
height: 25px;
width: 50%;
padding: 5px;
}
}
p {
width: 49%;
display: inline-block;
box-sizing: border-box;
font-size: $normalSize;
}
.iconfont {
display: inline-block;
margin-right: 3px;
font-size: $normalSize;
cursor: pointer;
}
}
}
&.edit-dialog {
min-width: 750px;
background-color: #fff;
* {
text-align: left;
}
.form {
margin: $bigSpace 0 $space;
}
}
.cascading-address {
display: inline-block;
border: 1px solid #f0f0f0;
.dist-item {
height: 32px;
margin-right: 0;
border: none;
background-color: #fff;
}
.items-panel {
border-color: #f0f0f0;
}
}
.form {
.input-row {
height: 25px;
line-height: 25px;
margin-bottom: $space;
font-size: $normalSize;
label {
display: inline-block;
width: 70px;
text-align: left;
span {
margin-right: 7px;
}
}
input {
width: 190px;
&.long {
width: 270px;
}
}
&.selector {
height: 32px;
line-height: 1;
> span,
> label {
position: relative;
top: -12px !important;
}
}
}
}
}
... ...
... ... @@ -176,7 +176,6 @@
}
.reset-pwd-page {
.blank {
height: 20px;
}
... ... @@ -227,6 +226,7 @@ $step-line: calc(($item-width - 3 * $step-circle) / 2);
.indicator {
.draw {
width: $item-width;
.step {
color: $captcha-btn-fg;
font-weight: bold;
... ... @@ -242,7 +242,6 @@ $step-line: calc(($item-width - 3 * $step-circle) / 2);
}
margin-top: calc(($step-height - 2px) / 2);
}
.circle {
... ... @@ -250,6 +249,7 @@ $step-line: calc(($item-width - 3 * $step-circle) / 2);
height: @width;
background: $theme-color;
border-radius: calc(@width / 2);
&.ring {
border: 2px solid $theme-color;
background-color: white;
... ... @@ -287,5 +287,4 @@ $step-line: calc(($item-width - 3 * $step-circle) / 2);
}
}
}
}
... ...
... ... @@ -46,7 +46,6 @@ $option-color: #f8f8f8;
width: 50px;
height: $item-height;
line-height: $item-height;
text-align: center;
white-space: nowrap;
font-size: 16px;
... ...
.brand-banner {
position: relative;
.banner-img {
min-height: 45px;
}
.opt-wrap {
width: 100%;
height: 45px;
position: absolute;
top: 50%;
margin-top: -23px;
.brand-logo {
display: inline-block;
height: 45px;
> img {
height: 100%;
}
}
.opt > * {
height: 32px;
line-height: 32px;
padding: 0 10px;
margin: 6px 0 0 5px;
color: #fff;
font-size: 14px;
border: 1px solid #fff;
display: inline-block;
}
.brand-info {
cursor: pointer;
}
.brand-fav {
cursor: pointer;
}
.coll {
color: #fc0d1b;
}
.iconfont {
font-size: 12px;
}
}
}
.brand-banner {
position: relative;
.banner-img {
min-height: 45px;
}
.opt-wrap {
width: 100%;
height: 45px;
position: absolute;
top: 50%;
margin-top: -23px;
.brand-logo {
display: inline-block;
height: 45px;
> img {
height: 100%;
}
}
.opt > * {
height: 32px;
line-height: 32px;
padding: 0 10px;
margin: 6px 0 0 5px;
color: #fff;
font-size: 14px;
border: 1px solid #fff;
display: inline-block;
}
.brand-info {
cursor: pointer;
}
.brand-fav {
cursor: pointer;
}
.coll {
color: #fc0d1b;
}
.iconfont {
font-size: 12px;
}
}
}
... ...
... ... @@ -99,7 +99,6 @@
.title {
color: #c1c1c1;
}
}
.color-list {
... ... @@ -169,7 +168,7 @@
.lc-arrow {
width: 12px;
height: 7px;
background: url('/product/code-horn.png') no-repeat;
background: url("/product/code-horn.png") no-repeat;
position: absolute;
top: -7px;
left: 85px;
... ... @@ -204,7 +203,6 @@
.iconfont {
font-size: 14px;
}
}
.collected {
... ... @@ -319,7 +317,7 @@
height: 12px;
border: 1px solid #1d1d1d;
display: inline-block;
margin: 0 4px;
margin: 0 3px;
position: relative;
top: 1px;
}
... ... @@ -430,7 +428,7 @@
}
img {
margin-top: -7px;
margin-top: -5px;
display: inline-block;
border: 1px solid #fff;
border-radius: 50%;
... ... @@ -468,7 +466,7 @@
text-align: center;
display: block;
position: relative;
top: -66px;
top: -58px;
.title-wrapper {
line-height: 1.3;
... ... @@ -478,7 +476,13 @@
}
.cn {
font-size: 16px;
font-size: 14px;
line-height: 24px;
}
.en {
font-size: 18px;
line-height: 18px;
}
}
}
... ...
... ... @@ -202,11 +202,12 @@
.floor-header {
position: relative;
margin-bottom: 7px;
.floor-more {
position: absolute;
right: 0;
bottom: 0;
bottom: 3px;
font-size: 14px;
font-weight: 700;
}
... ...
... ... @@ -4,10 +4,11 @@
}
.cart-header {
margin: 10px auto;
margin: 12px auto 48px;
width: 100%;
padding: 30px;
border-bottom: 1px solid #eee;
padding-bottom: 20px;
.titles {
position: relative;
... ...
... ... @@ -2,8 +2,8 @@ $hoverColor: #379ed6;
.blk-cart-page {
.pros-group {
margin-bottom: 30px;
border-top: 1px solid #eee;
/*margin-bottom: 30px;
border-top: 1px solid #eee;*/
&:first-child {
border-top: none;
... ...