fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit 648507c03c7f8ae77c743efdae6fd82113f949be 2 parents c33a5d82 5097decf

merge new_customer

Inline Side-by-side
Showing 9 changed files with 373 additions and 74 deletions
No preview for this file type
... ... @@ -306,8 +306,8 @@ function phoneHidden(phone) {
return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
}
if ($('.user-name').text().length === 11) {
$('.user-name').html(phoneHidden($('.user-name').text()));
if ($footer.find('.user-name').text().length === 11) {
$footer.find('.user-name').html(phoneHidden($footer.find('.user-name').text()));
}
//暴露公共接口
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -288,8 +288,8 @@ function phoneHidden(phone) {
return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
}
if ($('.user-name').text().length === 11) {
$('.user-name').html(phoneHidden($('.user-name').text()));
if ($footer.find('.user-name').text().length === 11) {
$footer.find('.user-name').html(phoneHidden($footer.find('.user-name').text()));
}
//暴露公共接口
... ...
.coupon-area .banner-top {
float: left;
}
.just-img{
width: 100%;
float: left;
margin: 20rem / $pxConvertRem 0;
}
.coupon-floor {
float: left;
width: 100%;
.floor-title {
background-color: #fff;
text-align: center;
height: 96rem / $pxConvertRem;
line-height: 96rem / $pxConvertRem;
font-size: 30rem / $pxConvertRem;
}
.floor-main {
height: 180rem / $pxConvertRem;
width: 100%;
background-size: 100%;
background-repeat: no-repeat;
padding: 10rem / $pxConvertRem 30rem / $pxConvertRem;
box-sizing: border-box;
float: left;
.main-left {
float: left;
width: 467rem / $pxConvertRem;
height: 160rem / $pxConvertRem;
}
.main-right-receive, .main-right-use, .main-right-go {
float: right;
width: 113rem / $pxConvertRem;
height: 160rem / $pxConvertRem;
position: relative;
span {
background-repeat: no-repeat;
background-size: contain;
&.on-receive {
position: absolute;
left: 50%;
top: 50rem / $pxConvertRem;
margin-left: -26rem / $pxConvertRem;
display: inline-block;
width: 52rem / $pxConvertRem;
height: 54rem / $pxConvertRem;
background-image: image-url('coupon/click-txt.png');
}
&.received {
width: 113rem / $pxConvertRem;
height: 132rem / $pxConvertRem;
background-image: image-url('coupon/received.png');
position: absolute;
top: 0;
right: 0;
}
&.zero {
width: 111rem / $pxConvertRem;
height: 132rem / $pxConvertRem;
background-image: image-url('coupon/zero.png');
position: absolute;
top: 0;
right: 0;
}
}
}
}
}
.floor-mask {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, .5);
display: none;
z-index: 9;
}
.floor-message {
position: fixed;
top: 50%;
left: 50%;
width: 550rem/$pxConvertRem;
height: 250rem/$pxConvertRem;
margin-left: -275rem/$pxConvertRem;
margin-top: -125rem/$pxConvertRem;
z-index: 10;
background-color: rgba(250, 250, 250, .92);
display: none;
border-radius: 10px;
.coupon-message-content {
border-bottom: 1px solid rgb(197, 197, 197);
height: 160rem/$pxConvertRem;
text-align: center;
line-height: 160rem/$pxConvertRem;
font-size: 28rem/$pxConvertRem;
}
.coupon-message-op {
height: 90rem/$pxConvertRem;
text-align: center;
line-height: 90rem/$pxConvertRem;
font-size: 32rem/$pxConvertRem;
color: rgb(223, 98, 112);
}
}
.floor-tooltip{
position: fixed;
top: 50%;
left: 50%;
width: 220rem/$pxConvertRem;
height: 140rem/$pxConvertRem;
margin-left: -110rem/$pxConvertRem;
margin-top: -70rem/$pxConvertRem;
z-index: 11;
background-color: rgba(60, 60, 60, .7);
display: none;
border-radius: 8rem/$pxConvertRem;
color: #fff;
.icon-box{
height: 84rem/$pxConvertRem;
line-height: 84rem/$pxConvertRem;
text-align: center;
}
.icon-msg{
height: 56rem/$pxConvertRem;
text-align: center;
}
}
\ No newline at end of file
... ...
.coupon-area .banner-top {
float: left;
}
.just-img{
width: 100%;
float: left;
margin: 20rem / $pxConvertRem 0;
}
.coupon-floor {
float: left;
width: 100%;
.floor-title {
background-color: #fff;
text-align: center;
height: 96rem / $pxConvertRem;
line-height: 96rem / $pxConvertRem;
font-size: 30rem / $pxConvertRem;
}
.floor-main {
height: 180rem / $pxConvertRem;
width: 100%;
background-size: 100%;
background-repeat: no-repeat;
padding: 10rem / $pxConvertRem 30rem / $pxConvertRem;
box-sizing: border-box;
float: left;
.main-left {
float: left;
width: 467rem / $pxConvertRem;
height: 160rem / $pxConvertRem;
}
.main-right-receive, .main-right-use, .main-right-go {
float: right;
width: 113rem / $pxConvertRem;
height: 160rem / $pxConvertRem;
position: relative;
span {
background-repeat: no-repeat;
background-size: contain;
&.on-receive {
position: absolute;
left: 50%;
top: 50rem / $pxConvertRem;
margin-left: -26rem / $pxConvertRem;
display: inline-block;
width: 52rem / $pxConvertRem;
height: 54rem / $pxConvertRem;
background-image: image-url('coupon/click-txt.png');
}
&.received {
width: 113rem / $pxConvertRem;
height: 132rem / $pxConvertRem;
background-image: image-url('coupon/received.png');
position: absolute;
top: 0;
right: 0;
}
&.zero {
width: 111rem / $pxConvertRem;
height: 132rem / $pxConvertRem;
background-image: image-url('coupon/zero.png');
position: absolute;
top: 0;
right: 0;
}
}
}
}
}
.floor-mask {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, .5);
display: none;
z-index: 9;
}
.floor-message {
position: fixed;
top: 50%;
left: 50%;
width: 550rem/$pxConvertRem;
height: 250rem/$pxConvertRem;
margin-left: -275rem/$pxConvertRem;
margin-top: -125rem/$pxConvertRem;
z-index: 10;
background-color: rgba(250, 250, 250, .92);
display: none;
border-radius: 10px;
.coupon-message-content {
border-bottom: 1px solid rgb(197, 197, 197);
height: 160rem/$pxConvertRem;
text-align: center;
line-height: 160rem/$pxConvertRem;
font-size: 28rem/$pxConvertRem;
}
.coupon-message-op {
height: 90rem/$pxConvertRem;
text-align: center;
line-height: 90rem/$pxConvertRem;
font-size: 32rem/$pxConvertRem;
color: rgb(223, 98, 112);
}
}
.floor-tooltip{
position: fixed;
top: 50%;
left: 50%;
width: 220rem/$pxConvertRem;
height: 140rem/$pxConvertRem;
margin-left: -110rem/$pxConvertRem;
margin-top: -70rem/$pxConvertRem;
z-index: 11;
background-color: rgba(60, 60, 60, .7);
display: none;
border-radius: 8rem/$pxConvertRem;
color: #fff;
.icon-box{
height: 84rem/$pxConvertRem;
line-height: 84rem/$pxConvertRem;
text-align: center;
}
.icon-msg{
height: 56rem/$pxConvertRem;
text-align: center;
}
}
\ No newline at end of file
... ...
{{> layout/header}}
<div class="order-ensure-page yoho-page">
{{# orderEnsure}}
<a class="address-wrap block" data-id="{{addressId}}" data-support="{{isSupport}}" href="/cart/index/selectAddress">
<p class="infos">
收货地址
<span class="per-info">{{name}} {{phoneNum}}</span>
<span class="address">{{addressInfo}}</span>
</p>
<span class="iconfont">&#xe614;</span>
</a>
{{#if addressInfo}}
<div class="address block address-wrap {{#if pageHeader.boys}} boys{{/if}}{{#if pageHeader.girls}} girls{{/if}}{{#if pageHeader.kids}} kids{{/if}}{{#if pageHeader.lifeStyle}} life-style{{/if}}" data-id ="{{addressId}}">
<div class="info">
<span class="info-name">{{name}}</span>
<span class="info-phone">{{phoneNum}}</span>
<a href="/cart/index/selectAddress"><span class="info-address">{{addressInfo}}</span></a>
<i class="iconfont">&#xe637;</i>
</div>
<a class="rest" href="/cart/index/selectAddress">其他地址<span class="iconfont">&#xe614;</span></a>
</div>
{{^}}
<div class="address block address-wrap not-address">
<i class="iconfont">&#xe637;</i>
<a class="choose" href="/cart/index/selectAddress">请选择收货地址<span class="iconfont">&#xe614;</span></a>
</div>
{{/if}}
<section class="dispatch block">
<div class="sub-block">
<h3 class="title">配送方式</h3>
<ul class="dispatch-mode clearfix">
<div class="sub-block payment-type">
<h3>
<p>支付方式</p>
{{#each paymentWay}}
{{#if recommend}}<span>{{name}}</span>{{/if}}
{{/each}}
<i class="iconfont down">&#xe616;</i>
<i class="iconfont hide up">&#xe615;</i>
</h3>
<ul>
{{#each paymentWay}}
{{#if isSupport}}
<li {{#if recommend}}class="chosed"{{/if}}>
<span>{{name}}</span>
<i class="right iconfont {{#if recommend}}icon-cb-radio{{else}}icon-radio{{/if}}" data-id="{{paymentType}}"></i>
</li>
{{/if}}
{{/each}}
</ul>
</div>
<div class="sub-block delivery-id">
<h3>
<p>配送方式</p>
{{#each dispatchMode}}
{{#if isSelected}}<span>{{name}}：运费¥{{cost}}</span>{{/if}}
{{/each}}
<i class="iconfont down">&#xe616;</i>
<i class="iconfont hide up">&#xe615;</i>
</h3>
<ul class="dispatch-mode">
{{#each dispatchMode}}
<li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">{{name}}</li>
<li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
<span>{{name}}：运费¥{{cost}}</span>
<i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}"></i>
</li>
{{/each}}
</ul>
</div>
<div class="sub-block">
<h3 class="title">送货时间</h3>
<ul class="dispatch-time clearfix">
<div class="sub-block dispatch-time">
<h3>
<p>送货时间</p>
{{#each dispatchTime}}
<li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">{{name}}</li>
{{#if isSelected}}<span>{{name}}</span>{{/if}}
{{/each}}
<i class="iconfont down">&#xe616;</i>
<i class="iconfont hide up">&#xe615;</i>
</h3>
<ul>
{{#each dispatchTime}}
<li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
<span>{{name}}</span>
<i class="right iconfont radio {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}" ></i>
</li>
{{/each}}
</ul>
</div>
</section>
<section class="block">
<h3 class="title">商品</h3>
<div class="goods">
<section class="block" style="margin-bottom: 0;">
{{#each goods}}
{{> me/order/good}}
{{/each}}
</div>
</section>
<div class="goods-num">共{{num}}件商品 合计<span>¥{{goodsPrice}}</span></div>
<section class="block">
<ul class="sale-invoice">
... ... @@ -46,10 +89,6 @@
<a href="{{#if isLimit}}javascript:void(0);{{else}}/cart/index/selectCoupon{{/if}}">
<span class="title">优惠券</span>
{{# coupon}}
<!--<span class="coupon-count">
{{count}}张可用
</span>-->
{{#if couponName}}
<span class="used coupon-use" data-name="{{couponName}}">
{{couponName}}
... ... @@ -74,13 +113,13 @@
{{#if useYohoCoin}}
<span class="coin-check">
<em>- ¥ {{useYohoCoin}}</em>
<i class="iconfont checkbox icon-cb-checked"></i>
<!-- <em>- ¥ {{useYohoCoin}}</em> -->
<i class="iconfont checkbox icon-cb-radio"></i>
</span>
{{else}}
<span class="coin-check">
<em style="display: none;">- ¥ {{useYohoCoin}}</em>
<i class="iconfont checkbox icon-checkbox"></i>
<!-- <em style="display: none;">- ¥ {{useYohoCoin}}</em> -->
<i class="iconfont checkbox icon-radio"></i>
</span>
{{/if}}
{{^}}
... ... @@ -93,7 +132,7 @@
{{#if invoice}}
<li class="invoice {{#if needInvoice}}focus{{/if}}">
<span class="title">发票</span>
<span class="iconfont checkbox {{#if needInvoice}}icon-cb-checked{{else}}icon-checkbox{{/if}}"></span>
<span class="iconfont checkbox {{#if needInvoice}}icon-cb-radio{{else}}icon-radio{{/if}}"></span>
<form id="invoice">
<input type="text" name="invoice-title" value="{{invoiceText}}" maxlength="30" placeholder="发票抬头">
<label>
... ... @@ -113,50 +152,24 @@
<input type="text" name="msg" value="{{msg}}" maxlength="40" placeholder="留言">
</form>
</section>
<section class="price-cal block">
<section class="price-cal block">
<ul class="total">
{{#cartPayData}}
<li>
<span>{{promotion}}</span>
&nbsp;&nbsp;{{promotion_amount}}
<p>{{promotion}}</p>
<span>{{promotion_amount}}</span>
</li>
{{/cartPayData}}
<li class="cost">
应付金额： <em>¥{{price}}</em>
</li>
</ul>
<div class="price-cost">
实付金额
<span>¥{{price}}</span>
</div>
</section>
<ul class="pay-mode">
{{# paymentWay}}
{{#if isSupport}}
<li class="{{#if recommend}}default{{/if}}" data-pay-type="{{paymentType}}" data-pay-id="{{id}}">
<span class="iconfont">
{{#if recommend}}
&#xe62f;
{{else}}
&#xe62e;
{{/if}}
</span>
{{name}}
</li>
{{/if}}
{{/ paymentWay}}
</ul>
<div class="bill">
您需要支付：<span>¥{{price}}</span>
<a href="#">提交订单</a>
</div>
{{/ orderEnsure}}
</div>
<script id="tmpl-price" type="text/tmpl">
<ul class="total">
\{{#cartPayData}}
<li>
<span>\{{promotion}}</span>
&nbsp;&nbsp;\{{promotion_amount}}
</li>
\{{/cartPayData}}
<li class="cost">
应付金额： <em>¥\{{price}}</em>
</li>
</ul>
</script>
{{> layout/footer}}
{{> layout/footer}}
\ No newline at end of file
... ...