fe / YOHOBUYWAP · Commits

Go to a project

Authored by uedxwg
Commit b4f29352036c58160d3cfaafce8195cb91ef223b 2 parents 4943c284 648507c0

结算页面冲突修改

Inline Side-by-side
Showing 12 changed files with 295 additions and 5 deletions
... ... @@ -22,7 +22,7 @@ _site
sea-modules
spm_modules
.cache
dist
static/dist
coverage
css/
.sass-cache/
... ...
No preview for this file type
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
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
... ...
... ... @@ -21,7 +21,9 @@
<div class="sub-block payment-type">
<h3>
<p>支付方式</p>
<span>在线支付(推荐)</span>
{{#each paymentWay}}
{{#if recommend}}<span>{{name}}</span>{{/if}}
{{/each}}
<i class="iconfont down">&#xe616;</i>
<i class="iconfont hide up">&#xe615;</i>
</h3>
... ... @@ -57,7 +59,9 @@
<div class="sub-block dispatch-time">
<h3>
<p>送货时间</p>
<span>工作日、双休日和节假日均送货</span>
{{#each dispatchTime}}
{{#if isSelected}}<span>{{name}}</span>{{/if}}
{{/each}}
<i class="iconfont down">&#xe616;</i>
<i class="iconfont hide up">&#xe615;</i>
</h3>
... ...