fe / yoho-blk · Commits

Go to a project

Authored by 郝肖肖
Commit 219a53c4e300286bff22e4688f028b3991388bb8 2 parents 99f11859 6ac266e9

Merge branch 'feature/balancePage' into release/2.0

Inline Side-by-side
Showing 4 changed files with 33 additions and 22 deletions
<p id="coin-tip" class="blue">{{yoho_msg}}</p>
<div>
有货币满<em class="blue">{{yoho_coin_pay_rule.num_limit}}</em>个即可使用，每次使用有货币为<em class="blue">{{yoho_coin_pay_rule.num_limit}}</em>的整数倍
<span class="yoho-coin-help">?
有货币满<em class="blue">{{yoho_coin_pay_rule.num_limit}}个</em>即可使用，每次使用有货币为<em class="blue">{{yoho_coin_pay_rule.num_limit}}</em>的整数倍
<span class="yoho-coin-help">
<span class="coin-help-dialog hide">
<span class="arrow-left"></span>
<div class="coin-dialog-title">有货币使用提示：</div>
... ... @@ -15,13 +15,13 @@
</span>
</div>
<div>您当前共有有货币<em class="blue">{{total_yoho_coin_num}}</em>个，可用<em class="blue">{{yoho_coin_num}}</em>个</div>
<div>本次使用有货币<em class="blue">{{yoho_coin_num}}</em>个 抵扣<em class="blue">¥{{yoho_coin}}</em></div>
<div>本次使用有货币<em class="blue">{{yoho_coin_num}}</em>个&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em class="blue">抵扣¥{{yoho_coin}}</em></div>
<div class="coin-footer">
<div class="left">
<span id="coin-sure" class="btn {{#unless yoho_coin_num}}disable{{/unless}}" data-yoho_coin_num="{{yoho_coin_num}}">确定</span>
<span class="btn white cancel">取消</span>
</div>
<div class="right">
<a class="blue" href="/help/?category_id=87" target="_blank">有货币使用规则?</a>
<div class="right yoho-rule">
<a class="blue" href="/help/?category_id=87" target="_blank">有货币使用规则？</a>
</div>
</div>
\ No newline at end of file
... ...
... ... @@ -613,21 +613,18 @@
.yoho-coin-help {
display: inline-block;
background-color: #000;
border-radius: 16px;
width: 16px;
height: 16px;
line-height: 20px;
text-align: center;
color: #fff;
font-size: 14px;
cursor: pointer;
margin-left: 20px;
padding-right: 1px;
margin-left: 10px;
background-image: resolve("layout/help.png");
background-size: 16px 16px;
vertical-align: bottom;
}
.coin-help-dialog {
width: 280px;
width: 290px;
position: absolute;
background-color: #fff;
margin-left: 15px;
... ... @@ -639,6 +636,7 @@
cursor: auto;
margin-top: -10px;
font-size: 12px;
margin-left: 30px;
}
.coin-dialog-title {
... ... @@ -703,6 +701,14 @@
}
}
.yoho-rule {
margin: 5px;
a {
text-decoration: underline;
}
}
.remark-content {
width: 1110px;
height: 118px;
... ...
<p id="coin-tip" class="blue">{{yoho_msg}}</p>
<div data-yoho_coin_num="{{yoho_coin_num}}">
有货币满<em class="blue">{{yoho_coin_pay_rule.num_limit}}</em>个即可使用，每次使用有货币为<em class="blue">{{yoho_coin_pay_rule.num_limit}}</em>的整数倍
<span class="yoho-coin-help">?
<div>
有货币满<em class="blue">{{yoho_coin_pay_rule.num_limit}}个</em>即可使用，每次使用有货币为<em class="blue">{{yoho_coin_pay_rule.num_limit}}</em>的整数倍
<span class="yoho-coin-help">
<span class="coin-help-dialog hide">
<span class="arrow-left"></span>
<div class="coin-dialog-title">有货币使用条件：</div>
<div class="coin-dialog-title">有货币使用提示：</div>
<div class="coin-dialog-content">
<p>（1）订单金额大于20元（含20元）</p>
<p>（2）有货币数量大于{{yoho_coin_pay_rule.num_limit}}个（含{{yoho_coin_pay_rule.num_limit}}个）</p>
<p>（3）每笔支付不得超过应付金额的{{yoho_coin_pay_rule.max_pay_rate_desc}}</p>
<p>（3）有货币支付上限为每笔订单应付金额的{{yoho_coin_pay_rule.max_pay_rate_desc}}</p>
<p>备注：使用有货币数量为{{yoho_coin_pay_rule.num_limit}}的整数倍，<br />100个有货币抵1元。</p>
</div>
</span>
</span>
</div>
<div>您当前共有有货币<em class="blue">{{total_yoho_coin_num}}</em>个，可用<em class="blue">{{yoho_coin_num}}</em>个</div>
<div>本次使用有货币<em class="blue">{{yoho_coin_num}}</em>个 抵扣<em class="blue">¥{{yoho_coin}}</em></div>
<div>
<span id="coin-sure" class="btn {{#unless yoho_coin_num}}disable{{/unless}}" data-yoho_coin_num="{{yoho_coin_num}}">确定</span>
<span class="btn white cancel">取消</span>
<div>本次使用有货币<em class="blue">{{yoho_coin_num}}</em>个&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em class="blue">抵扣¥{{yoho_coin}}</em></div>
<div class="coin-footer">
<div class="left">
<span id="coin-sure" class="btn {{#unless yoho_coin_num}}disable{{/unless}}" data-yoho_coin_num="{{yoho_coin_num}}">确定</span>
<span class="btn white cancel">取消</span>
</div>
<div class="right yoho-rule">
<a class="blue" href="/help/?category_id=87" target="_blank">有货币使用规则？</a>
</div>
</div>
\ No newline at end of file
... ...