Merge branch 'feature/coupon' into release/180420
Showing
4 changed files
with
6 additions
and
14 deletions
| @@ -107,7 +107,7 @@ | @@ -107,7 +107,7 @@ | ||
| 107 | <li class="coin" data-yoho-coin="{{yohoCoinCompute.yohoCoin}}" data-yoho-coin-click={{yohoCoinCompute.yohoCoinClick}}> | 107 | <li class="coin" data-yoho-coin="{{yohoCoinCompute.yohoCoin}}" data-yoho-coin-click={{yohoCoinCompute.yohoCoinClick}}> |
| 108 | <span class="title">有货币</span> | 108 | <span class="title">有货币</span> |
| 109 | <span class="desc msg">{{yohoCoinCompute.yohoCoinMsg}}</span> | 109 | <span class="desc msg">{{yohoCoinCompute.yohoCoinMsg}}</span> |
| 110 | - <span class="yoho-coin-help">?</span> | 110 | + <span class="iconfont icon-wenhao yoho-coin-help"></span> |
| 111 | {{#if yohoCoinCompute.useYohoCoin}} | 111 | {{#if yohoCoinCompute.useYohoCoin}} |
| 112 | <span class="coin-check"> | 112 | <span class="coin-check"> |
| 113 | <i class="iconfont checkbox icon-cb-radio"></i> | 113 | <i class="iconfont checkbox icon-cb-radio"></i> |
| @@ -112,7 +112,7 @@ | @@ -112,7 +112,7 @@ | ||
| 112 | <li class="coin" data-yoho-coin="{{yohoCoinCompute.yohoCoin}}" data-yoho-coin-click={{yohoCoinCompute.yohoCoinClick}}> | 112 | <li class="coin" data-yoho-coin="{{yohoCoinCompute.yohoCoin}}" data-yoho-coin-click={{yohoCoinCompute.yohoCoinClick}}> |
| 113 | <span class="title">有货币</span> | 113 | <span class="title">有货币</span> |
| 114 | <span class="desc msg">{{yohoCoinCompute.yohoCoinMsg}}</span> | 114 | <span class="desc msg">{{yohoCoinCompute.yohoCoinMsg}}</span> |
| 115 | - <span class="yoho-coin-help">?</span> | 115 | + <span class="iconfont icon-wenhao yoho-coin-help"></span> |
| 116 | {{#if yohoCoinCompute.useYohoCoin}} | 116 | {{#if yohoCoinCompute.useYohoCoin}} |
| 117 | <span class="coin-check"> | 117 | <span class="coin-check"> |
| 118 | <i class="iconfont checkbox icon-cb-radio"></i> | 118 | <i class="iconfont checkbox icon-cb-radio"></i> |
| @@ -750,16 +750,8 @@ | @@ -750,16 +750,8 @@ | ||
| 750 | } | 750 | } |
| 751 | 751 | ||
| 752 | .yoho-coin-help { | 752 | .yoho-coin-help { |
| 753 | - display: inline-block; | ||
| 754 | - background-color: #b0b0b0; | ||
| 755 | - border-radius: 28px; | ||
| 756 | - width: 28px; | ||
| 757 | - height: 28px; | ||
| 758 | - line-height: 36px; | ||
| 759 | - text-align: center; | ||
| 760 | - color: #fff; | ||
| 761 | - font-size: 22px; | ||
| 762 | - margin-left: 10px; | 753 | + color: #b0b0b0; |
| 754 | + margin-left: 16px; | ||
| 763 | } | 755 | } |
| 764 | 756 | ||
| 765 | .yoho-coin-help-dialog-bg { | 757 | .yoho-coin-help-dialog-bg { |
| @@ -294,7 +294,7 @@ body { | @@ -294,7 +294,7 @@ body { | ||
| 294 | width: 510px; | 294 | width: 510px; |
| 295 | height: 100px; | 295 | height: 100px; |
| 296 | float: left; | 296 | float: left; |
| 297 | - padding: 8px 20px; | 297 | + padding: 12px 20px; |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | .use-now-btn { | 300 | .use-now-btn { |
| @@ -309,7 +309,7 @@ body { | @@ -309,7 +309,7 @@ body { | ||
| 309 | p { | 309 | p { |
| 310 | font-size: 24px; | 310 | font-size: 24px; |
| 311 | text-align: right; | 311 | text-align: right; |
| 312 | - line-height: 46px; | 312 | + line-height: 42px; |
| 313 | } | 313 | } |
| 314 | 314 | ||
| 315 | .nums { | 315 | .nums { |
-
Please register or login to post a comment