Authored by 郝肖肖

Merge branch 'feature/yohoCoin' into release/5.2

... ... @@ -387,7 +387,7 @@
<li>1.订单金额大于20元(含20元)</li>
<li>2.有货币数量大于<span class="num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>个(含<span class="num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>个)</li>
<li>3.每笔支付不得超过应付金额{{yohoCoinCompute.yoho_coin_pay_rule.max_pay_rate_desc}}</li>
<li>备注:使用有货币数量为<span class="num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>的整数倍,100有货币抵1元。</li>
<li class="coin-gray">备注:使用有货币数量为<span class="num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>的整数倍,100有货币抵1元。</li>
</ul>
</div>
</div>
... ...
... ... @@ -131,7 +131,7 @@
<li>1.订单金额大于20元(含20元)</li>
<li>2.有货币数量大于<span class="num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>个(含<span class="num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>个)</li>
<li>3.每笔支付不得超过应付金额{{yohoCoinCompute.yoho_coin_pay_rule.max_pay_rate_desc}}</li>
<li>备注:使用有货币数量为<span class="num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>的整数倍,100有货币抵1元。</li>
<li class="coin-gray">备注:使用有货币数量为<span class="num-limit-coin">{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}</span>的整数倍,100有货币抵1元。</li>
</ul>
</div>
</div>
... ...
... ... @@ -253,7 +253,8 @@
.play-right {
float: right;
width: 425px;
width: 405px;
font-size: 12px;
.pan {
text-align: right;
... ... @@ -355,11 +356,10 @@
.play-bi-pan {
.play-pan {
font-size: 14px;
width: 100%;
.num-list-width {
width: 380px;
width: 350px;
}
.yoho-coin-help-link {
... ... @@ -367,13 +367,13 @@
}
li {
margin-top: 15px;
margin-top: 12px;
overflow: hidden;
&:first-child {
margin-top: 0;
}
&:last-child {
margin-top: 28px;
margin-top: 20px;
}
}
... ... @@ -397,10 +397,10 @@
background-color: #fff;
border: 1px solid #000;
margin-top: 10px;
width: 280px;
height: 145px;
padding: 15px;
width: 240px;
padding: 15px 20px;
text-align: left;
font-size: 12px;
cursor: auto;
li {
... ... @@ -410,10 +410,13 @@
.yoho-coin-help-dialog-title {
font-weight: bold;
margin-bottom: 15px;
}
}
.coin-gray {
color: #999;
}
.sign-amount {
color: #d0021b;
padding: 0 2px;
... ...