fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 5d6671425f91acd6b1ca414b85f5bcf655940e19 1 parent f69d2ba9

return

Inline Side-by-side
Showing 3 changed files with 5 additions and 2 deletions
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 {{/if}} 28 {{/if}}
29 <div class="detail-container"> 29 <div class="detail-container">
30 {{# express}} 30 {{# express}}
31 - <h2>{{noticeTitle}}</h2> 31 + <h2>{{#if expressDeadLine}}请您在<span>{{expressDeadLine}}</span>前将商品寄回并填写物流，逾期将自动取消申请 {{^}}请填写寄回快递单号，以便我们查询{{/if}}</h2>
32 <div class="courier-code{{#unless id}} in-edit{{/unless}}"> 32 <div class="courier-code{{#unless id}} in-edit{{/unless}}">
33 {{#with detail}} 33 {{#with detail}}
34 <ul style="display: none;"> 34 <ul style="display: none;">
@@ -59,6 +59,9 @@ @@ -59,6 +59,9 @@
59 color: #333; 59 color: #333;
60 font-weight: 400; 60 font-weight: 400;
61 margin-bottom: 10px; 61 margin-bottom: 10px;
  62 + span {
  63 + color: #e8044f;
  64 + }
62 } 65 }
63 .courier-code { 66 .courier-code {
64 margin: 60px auto; 67 margin: 60px auto;
@@ -155,7 +155,7 @@ class ReturnsModel @@ -155,7 +155,7 @@ class ReturnsModel
155 $detail['express']['id'] = isset($res['notice']['express_id']) ? $res['notice']['express_id'] : ''; 155 $detail['express']['id'] = isset($res['notice']['express_id']) ? $res['notice']['express_id'] : '';
156 $detail['express']['company'] = isset($res['notice']['express_company']) ? $res['notice']['express_company'] : ''; 156 $detail['express']['company'] = isset($res['notice']['express_company']) ? $res['notice']['express_company'] : '';
157 $detail['express']['number'] = isset($res['notice']['express_number']) ? $res['notice']['express_number'] : ''; 157 $detail['express']['number'] = isset($res['notice']['express_number']) ? $res['notice']['express_number'] : '';
158 - $detail['express']['noticeTitle'] = isset($res['notice']['title']) ? $res['notice']['title'] : ''; 158 + $detail['express']['expressDeadLine'] = isset($res['notice']['date']) ? $res['notice']['date'] : '';
159 } 159 }
160 foreach ($res['statusList'] as $key => $value) { 160 foreach ($res['statusList'] as $key => $value) {
161 $detail['statusList'][$key]['act'] = ($value['act'] == 'Y') ? true : false; 161 $detail['statusList'][$key]['act'] = ($value['act'] == 'Y') ? true : false;