Authored by 郝肖肖

Merge branch 'hotfix/coincss' into release/5.4

... ... @@ -407,14 +407,15 @@ $('.dispatch-time').on('touchend', 'li', function() {
orderInfo('deliveryTimeId', $(this).data('id'));
});
$('.yoho-coin-help-dialog-bg, .yoho-coin-footer').on('touchend', function(e) {
$('.yoho-coin-help-dialog-bg, .yoho-coin-footer').on('click', function(e) {
e.preventDefault();
$('.yoho-coin-help-dialog-bg').addClass('hide');
$('.yoho-coin-help-dialog').addClass('hide');
});
$('.coin').on('touchend', function(e) {
$('.coin').on('click', function(e) {
var $this = $(this);
e.preventDefault();
if ($(e.target).closest('.yoho-coin-help').length) {
$('.yoho-coin-help-dialog-bg').removeClass('hide');
... ...
... ... @@ -499,16 +499,14 @@
}
.yoho-coin-help {
background: resolve("help.png") no-repeat;
display: inline-block;
background-color: #b0b0b0;
border-radius: 28px;
background-size: 28px;
width: 28px;
height: 28px;
line-height: 28px;
text-align: center;
color: #fff;
font-size: 22px;
margin-left: 10px;
cursor: pointer;
vertical-align: middle;
}
}
... ... @@ -656,12 +654,11 @@
height: 510px;
background-color: #fff;
z-index: 2;
margin: auto;
left: 0;
right: 0;
top: 0;
bottom: 0;
border-radius: 10px;
left: 50%;
margin-left: -270px;
top: 50%;
margin-top: -255px;
.yoho-coin-title {
font-size: 34px;
... ... @@ -773,4 +770,4 @@
color: #b0b0b0;
}
}
}
}
\ No newline at end of file
... ...
... ... @@ -116,7 +116,7 @@
<li class="coin" data-yoho-coin="{{yohoCoinCompute.yohoCoin}}" data-yoho-coin-click={{yohoCoinCompute.yohoCoinClick}}>
<span class="title">有货币</span>
<span class="desc msg">{{yohoCoinCompute.yohoCoinMsg}}</span>
<span class="yoho-coin-help">?</span>
<span class="yoho-coin-help"></span>
{{#if yohoCoinCompute.useYohoCoin}}
<span class="coin-check">
<i class="iconfont checkbox icon-cb-radio"></i>
... ...
... ... @@ -36,7 +36,7 @@
<li class="coin" data-yoho-coin="{{yohoCoinCompute.yohoCoin}}" data-yoho-coin-click={{yohoCoinCompute.yohoCoinClick}}>
<span class="title">有货币</span>
<span class="desc msg">{{yohoCoinCompute.yohoCoinMsg}}</span>
<span class="yoho-coin-help">?</span>
<span class="yoho-coin-help"></span>
{{#if yohoCoinCompute.useYohoCoin}}
<span class="coin-check">
<i class="iconfont checkbox icon-cb-radio"></i>
... ...