Authored by yyq

Merge branch 'feature/growth' into release/6.6

@@ -13,11 +13,10 @@ @@ -13,11 +13,10 @@
13 <li><span class="l-b">订单金额: {{payment_amount}}</span></li> 13 <li><span class="l-b">订单金额: {{payment_amount}}</span></li>
14 <li> 14 <li>
15 <span class="l-b back-yoho-coin">共返有货币:{{yoho_give_coin}}</span> 15 <span class="l-b back-yoho-coin">共返有货币:{{yoho_give_coin}}</span>
16 - <a href="{{yohoCoinUrl}}" class="notice-link" target="_blank">有货币能做什么>></a>  
17 </li> 16 </li>
18 <li> 17 <li>
19 - <span class="l-b">获得VIP累计金额:{{payment_amount}}</span>  
20 - <a href="{{vipUrl}}" class="notice-link" target="_blank">查看VIP特权>></a> 18 + <span class="l-b">返成长值:{{growth_value}}</span>
  19 + <span class="notice-text"><em class="iconfont">&#xe6c2;</em>有货币与VIP成长值在确认收货后自动到账</span>
21 </li> 20 </li>
22 <li class="opt-btns"> 21 <li class="opt-btns">
23 <a href="{{detailUrl}}">查看订单详情</a> 22 <a href="{{detailUrl}}">查看订单详情</a>
@@ -40,21 +40,20 @@ @@ -40,21 +40,20 @@
40 40
41 .l-b { 41 .l-b {
42 display: inline-block; 42 display: inline-block;
43 - width: 200px;  
44 } 43 }
45 44
46 - .back-yoho-coin:after {  
47 - content: "";  
48 - display: inline-block;  
49 - width: 14px;  
50 - height: 14px;  
51 - background: resolve(cart/yoho-coin.png);  
52 - margin-left: 6px;  
53 - vertical-align: bottom; 45 + .notice-text,
  46 + .notice-link {
  47 + color: #017cf8;
  48 + margin-left: 50px;
54 } 49 }
55 50
56 - .notice-link {  
57 - color: #0883d1; 51 + .notice-text .iconfont {
  52 + color: #017cf8;
  53 + font-size: 18px;
  54 + position: absolute;
  55 + margin-left: -20px;
  56 + margin-top: -2px;
58 } 57 }
59 } 58 }
60 59
@@ -93,7 +92,7 @@ @@ -93,7 +92,7 @@
93 margin-top: 30px; 92 margin-top: 30px;
94 93
95 .notice-link { 94 .notice-link {
96 - color: #0883d1; 95 + color: #017cf8;
97 } 96 }
98 } 97 }
99 98