wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 王洪广
Commit a6a06bcc7e355b03cf71ba4261a48cbaa5ac2d88 1 parent 35b4412b

fix return bug

Inline Side-by-side
Showing 4 changed files with 12 additions and 1 deletions
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 <div class="special-tip"> 48 <div class="special-tip">
49 <span>{{specialNoticeBo.title}} <i class="doubt"></i></span> 49 <span>{{specialNoticeBo.title}} <i class="doubt"></i></span>
50 <div class="special-content"> 50 <div class="special-content">
51 - <span>{{specialNoticeBo.remark}}</span> 51 + <span>{{specialNoticeBo.remark1}}<br/>{{specialNoticeBo.remark2}}</span>
52 <i class="arrow"></i> 52 <i class="arrow"></i>
53 </div> 53 </div>
54 </div> 54 </div>
@@ -66,6 +66,9 @@ @@ -66,6 +66,9 @@
66 <div class="pay"> 66 <div class="pay">
67 {{pay}} 67 {{pay}}
68 <span class="pay-tip">(含快递:{{fregit}}元)</span> 68 <span class="pay-tip">(含快递:{{fregit}}元)</span>
  69 + {{#if isExchanged}}
  70 + <span class="return-order">换货订单</span>
  71 + {{/if}}
69 </div> 72 </div>
70 <div class="order-status"> 73 <div class="order-status">
71 {{#if noPay}} 74 {{#if noPay}}
This diff could not be displayed because it is too large.
@@ -172,6 +172,14 @@ @@ -172,6 +172,14 @@
172 line-height: 18px; 172 line-height: 18px;
173 color: #999; 173 color: #999;
174 } 174 }
  175 + .return-order{
  176 + display: inline-block;
  177 + padding: 3px 10px;
  178 + background: #FF7C48;
  179 + border-radius: 9px;
  180 + color: #fff;
  181 + text-align: center;
  182 + }
175 183
176 .op-item { 184 .op-item {
177 display: block; 185 display: block;