fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit 98246d03be8cb8d3620a623b4eabd54b32687534 2 parents f2ba4834 e20af320

Merge branch 'release/usercenter'

Inline Side-by-side
Showing 17 changed files with 48 additions and 37 deletions
... ... @@ -6,7 +6,7 @@
<strong class="fz18">现金券</strong>
<p class="fz9 bold">CPOUPON</p>
<div class="pirbox absolute">
<em class="absolute">￥</em>0
<em class="absolute">&yen;</em>0
</div>
</div>-->
<div class="coupon-box chit0"></div>
... ...
... ... @@ -6,7 +6,7 @@
<strong class="fz18">现金券</strong>
<p class="fz9 bold">CPOUPON</p>
<div class="pirbox absolute">
<em class="absolute">￥</em>{{amount}}
<em class="absolute">&yen;</em>{{amount}}
</div>
<div class="count-not fz11 absolute"><hr class="fn-left"><hr class="fn-right">已送达您的账户</div>
</div>
... ...
... ... @@ -90,9 +90,9 @@
<span class="reco-name">{{name}}</span>
</p>
<p class="price">
<span class="sale-price {{^price}}no-price{{/price}}">￥{{salePrice}}</span>
<span class="sale-price {{^price}}no-price{{/price}}">&yen;{{salePrice}}</span>
{{#price}}
<span class="market-price">￥{{.}}</span>
<span class="market-price">&yen;{{.}}</span>
{{/price}}
<a class="check-detail" href={{url}}>
查看详情
... ...
... ... @@ -49,7 +49,8 @@ exports.addressAct = (req, res, next) => {
module: 'home',
page: 'address-act',
pageHeader: headerModel.setNav({
navTitle: result.navTitle
navTitle: result.navTitle,
navBtn: false
}),
title: result.navTitle
};
... ... @@ -161,7 +162,8 @@ exports.addressModify = (req, res, next) => {
module: 'home',
page: 'address-modify',
pageHeader: headerModel.setNav({
navTitle: '选择地址'
navTitle: '选择地址',
navBtn: false
}),
title: '选择地址',
};
... ... @@ -184,6 +186,10 @@ exports.addressModify = (req, res, next) => {
* @param next
*/
exports.locationList = (req, res, next) => {
res.set({
'Cache-Control': 'max-age=600'
});
addressModel.locationList({
uid: req.user.uid
}).then(result => {
... ...
... ... @@ -9,11 +9,12 @@ exports.index = (req, res, next) => {
module: 'home',
page: 'help',
pageHeader: headerModel.setNav({
navTitle: '帮助中心'
navTitle: '帮助中心',
navBtn: false
}),
title: '帮助中心',
pageFooter: true,
iHelp: result,
iHelp: result
});
}).catch(next);
};
... ... @@ -24,7 +25,8 @@ exports.helpDetail = (req, res, next) => {
module: 'home',
page: 'help-detail',
pageHeader: headerModel.setNav({
navTitle: req.query.name
navTitle: req.query.name,
navBtn: false
}),
title: req.query.name,
pageFooter: true,
... ...
... ... @@ -21,7 +21,7 @@
{{# banner}}
{{# data}}
<a href="{{url}}">
<img src="{{image src 640 200 2}}" alt="img">
<img src="{{image src 640 200}}" alt="img">
</a>
{{/ data}}
{{/ banner}}
... ...
... ... @@ -23,7 +23,7 @@
{{# productList}}
<li class="swiper-slide">
<a href="{{link}}">
<img class="swiper-lazy" data-src="{{image imgUrl 97 150}}" alt=""/>
<img class="swiper-lazy" data-src="{{image imgUrl 235 314}}" alt=""/>
</a>
<div class="brand-product">
<div class="{{# discount}}price-discount{{/ discount}}">
... ...
... ... @@ -7,11 +7,11 @@
<ul class="cost block">
<li>
年度累计金额：
<span>￥{{costOfThisYear}}</span>
<span>&yen;{{costOfThisYear}}</span>
</li>
<li>
历史消费总金额：
<span>￥{{sumCost}}</span>
<span>&yen;{{sumCost}}</span>
</li>
</ul>
... ...
... ... @@ -7,7 +7,7 @@
您已升级至最高的等级啦！
</p>
<p class="sum-cost">
年度累计金额<span> ￥{{costOfThisYear}}</span>
年度累计金额<span> &yen;{{costOfThisYear}}</span>
</p>
<div class="progresser">
<div class="outer"></div>
... ... @@ -24,11 +24,11 @@
<span class="vip-icon vip-2"></span>
</p>
<p class="grade-desc">
还差<span class="cost-gap">￥{{costGap}}</span>就可以升级为白金会员!
还差<span class="cost-gap">&yen;{{costGap}}</span>就可以升级为白金会员!
<span class="sub-desc">(VIP金额累计需订单成功签收满15天并无退换货)</span>
</p>
<p class="sum-cost">
年度累计金额<span> ￥{{costOfThisYear}}</span>
年度累计金额<span> &yen;{{costOfThisYear}}</span>
</p>
<div class="progresser">
<div class="outer"></div>
... ... @@ -37,7 +37,7 @@
金卡会员
</span>
<span class="beacon beacon-max">白金卡会员</span>
<span class="cost-limit">￥5000.00</span>
<span class="cost-limit">&yen;5000.00</span>
</div>
{{/if}}
... ... @@ -47,11 +47,11 @@
<span class="vip-icon vip-1"></span>
</p>
<p class="grade-desc">
还差<span class="cost-gap">￥{{costGap}}</span>就可以升级为金卡会员!
还差<span class="cost-gap">&yen;{{costGap}}</span>就可以升级为金卡会员!
<span class="sub-desc">(VIP金额累计需订单成功签收满15天并无退换货)</span>
</p>
<p class="sum-cost">
年度累计金额<span> ￥{{costOfThisYear}}</span>
年度累计金额<span> &yen;{{costOfThisYear}}</span>
</p>
<div class="progresser">
<div class="outer"></div>
... ... @@ -60,7 +60,7 @@
银卡会员
</span>
<span class="beacon beacon-max">金卡会员</span>
<span class="cost-limit">￥2000.00</span>
<span class="cost-limit">&yen;2000.00</span>
</div>
{{/if}}
... ... @@ -70,11 +70,11 @@
<span>普通会员</span>
</p>
<p class="grade-desc">
还差<span class="cost-gap">￥{{costGap}}</span>就可以升级为银卡会员!
还差<span class="cost-gap">&yen;{{costGap}}</span>就可以升级为银卡会员!
<span class="sub-desc">(VIP金额累计需订单成功签收满15天并无退换货)</span>
</p>
<p class="sum-cost">
年度累计金额<span> ￥{{costOfThisYear}}</span>
年度累计金额<span> &yen;{{costOfThisYear}}</span>
</p>
<div class="progresser">
<div class="outer"></div>
... ... @@ -83,6 +83,6 @@
普通
</span>
<span class="beacon beacon-max">银卡会员</span>
<span class="cost-limit">￥600.00</span>
<span class="cost-limit">&yen;600.00</span>
</div>
{{/if}}
... ...
... ... @@ -9,7 +9,7 @@
</div>
<div class="price">
<span class="sale-price {{^price}}no-price{{/price}}">¥{{salePrice}}</span>
{{#price}}<span class="old-price">￥{{.}}</span>{{/price}}
{{#price}}<span class="old-price">&yen;{{.}}</span>{{/price}}
</div>
<div class="swiper-lazy-preloader"></div>
</a>
... ...
... ... @@ -14,13 +14,13 @@
<a href="{{url}}" class="nav-sub-right">{{text}}</a>
{{/shopPage}}
{{#currencyPage}}
<a href="/home/helpDetail?code=20151230-102233&caption=有货币介绍" class="iconfont nav-home">&#xe639;</a>
<a href="/home/helpDetail?code=20151230-102233&caption=有货币介绍&name=有货币介绍" class="iconfont nav-home">&#xe639;</a>
{{/currencyPage}}
{{#currencyDetailPage}}
<a href="/home/helpDetail?code=20111130-152530&caption=如何使用有货币支付" class="iconfont nav-home">&#xe639;</a>
<a href="/home/helpDetail?code=20111130-152530&caption=如何使用有货币支付&name=如何使用有货币支付" class="iconfont nav-home">&#xe639;</a>
{{/currencyDetailPage}}
{{#installmentPage}}
<a href="/home/helpDetail?code=20151230-102233&caption=有货分期" class="iconfont nav-home">&#xe639;</a>
<a href="/home/helpDetail?code=20151230-102233&caption=有货分期&name=有货分期" class="iconfont nav-home">&#xe639;</a>
{{/installmentPage}}
{{#navPhone}}
<a href="{{.}}" class="iconfont nav-home">&#xe641;</a>
... ...
... ... @@ -193,6 +193,7 @@ function bindAddressListEvent(html) {
if (window.localStorage && window.localStorage.getItem) {
chinaAddressList = window.localStorage.getItem('chinaAddressList');
}
if (chinaAddressList) {
bindAddressListEvent(chinaAddressList);
} else {
... ... @@ -201,12 +202,14 @@ if (chinaAddressList) {
$.ajax({
method: 'GET',
url: '/home/locationList',
timeout: 60000
timeout: 60000,
cache: true
}).then(function(html) {
bindAddressListEvent(html);
if (window.localStorage && window.localStorage.setItem) {
window.localStorage.setItem('chinaAddressList', html);
}
// if (window.localStorage && window.localStorage.setItem) {
// window.localStorage.setItem('chinaAddressList', html);
// }
}).fail(function() {
tip.show('获取省市区列表失败');
});
... ...
... ... @@ -223,7 +223,7 @@
height: auto;
color: #fff;
line-height: 40px;
font-size: 14px;
font-size: 14PX;
}
}
}
... ...
... ... @@ -30,7 +30,7 @@
.price {
margin: 0.3rem 0;
font-size: 16px;
font-size: 16PX;
}
.sale-price {
... ...
... ... @@ -107,7 +107,7 @@
font-size: 24px;
border-bottom: 1px solid #e0e0e0;
padding-bottom: 20px;
height: 120px;
height: 140px;
overflow: hidden;
position: relative;
... ... @@ -288,7 +288,7 @@
margin: 0 30px;
.swiper-slide {
width: 225px;
width: 255px;
height: 100%;
float: left;
padding-right: 30px;
... ...
... ... @@ -307,6 +307,7 @@
.num {
color: #e0e0e0;
float: right;
font-size: 16PX;
}
}
}
... ...
... ... @@ -124,14 +124,13 @@
.create-new-suggest {
display: block;
width: 100%;
height: 88px;
height: 150px;
line-height: 88px;
text-align: center;
font-size: 30px;
border-top: 30px solid #f0f0f0;
border-bottom: 30px solid #f0f0f0;
position: relative;
height: 88px;
.list-item {
padding: 0 35px;
... ...