退货详情组装

yyq
Commit b2d04be215cf6567e8eea88204feee46a0a4ef89 1 parent 9db04262
Showing 3 changed files with 83 additions and 24 deletions
apps/me/models/returns.js
apps/me/views/partial/refund-detail.hbs
public/scss/me/return/_refund-detail.css
--- a/apps/me/models/returns.js
View file @b2d04be
+++ b/apps/me/models/returns.js
View file @b2d04be
@@ -111,7 +111,7 @@ const _setDefaultStatus = (type) => {
     };
     return resData;
-}
+};
 const _setReturnStatus = (list, half) => {
     let resData = {};
@@ -188,7 +188,9 @@ const _setRefundGoodList = (data) => {
 };
 const _setRefundDetailData = (data) => {
-    let resData = {};
+    let resData = {
+        id: data.id || 0
+    };
     switch (data.status) {
         case 10:
@@ -210,6 +212,27 @@ const _setRefundDetailData = (data) => {
             break;
     }
+    let goods = [];
+
+    _.forEach(data.goods_list, value => {
+        let cnAlphabet = value.cn_alphabet ? value.cn_alphabet : '';
+
+        goods.push({
+            href: helpers.urlFormat(`/product/pro_${value.product_id}_${value.goods_id}/${cnAlphabet}.html`),
+            img: value.goods_image,
+            name: value.product_name,
+            size: value.size_name,
+            color: value.color_name,
+            num: 1, // 接口目前不支持
+            reason: value.reason_name || '--',
+            price: value.sales_price,
+            remark: value.remark,
+            evidence: value.evidence_images
+        });
+    });
+
+    resData.goods = goods;
+
     return resData;
 };
@@ -246,11 +269,14 @@ const getRefundDetailData = (applyId, uid) => {
         };
         if (result.data) {
+            let data = result.data;
+
             // console.log(_setRefundDetailData(result.data));
-            Object.assign(resData.refundDetail, _setReturnStatus(result.data.statusList));
-            Object.assign(resData.refundDetail, _setRefundDetailData(result.data));
+            Object.assign(resData.refundDetail, _setReturnStatus(data.statusList, !data.status));
+
+            Object.assign(resData.refundDetail, _setRefundDetailData(data));
         }
         return {returns: resData};
--- a/apps/me/views/partial/refund-detail.hbs
View file @b2d04be
+++ b/apps/me/views/partial/refund-detail.hbs
View file @b2d04be
 {{# refundDetail}}
-    <div class="refund-datail-wrap">
+    <div class="refund-datail-wrap" data-id="{{id}}">
         {{> returns/returns-status}}
         {{# orderReview}}
             <div class="top-tip">
-            {{#if pass}}
-                <p class="tip-status">
-                    <span class="iconfont blue">&#xe618;</span>
-                    <span class="blue">退货申请已通过</span>
-                </p>
-            {{^}}
-                <p class="tip-status">
-                    <span class="iconfont blue">&#xe618;</span>
-                    <span class="blue">退货申请审核中</span>
-                </p>
-            {{/if}}
+                {{#if pass}}
+                    <p class="tip-status">
+                        <span class="iconfont blue">&#xe60f;</span>
+                        <span class="blue">退货申请已通过</span>
+                    </p>
+                {{^}}
+                    <p class="tip-status">
+                        <span class="iconfont blue">&#xe618;</span>
+                        <span class="blue">退货申请审核中</span>
+                    </p>
+                {{/if}}
                 <p class="tip-text">
                     请将商品连同吊牌、包装、发货单（如无发货单，您可找张白纸上注明订单编号，收货人姓名及手机号码）、发票（如有）、 赠品（如有）一并寄回，如有 遗漏将影响您的退换货进度，敬请谅解<br>
                     非我司原因的退换货，寄回运费由您承担。商品客观问题的退换货，请您先行垫付运费，邮费会在退款中补贴给您，
@@ -31,7 +31,7 @@
         {{# backStorage}}
             <div class="storage-tip top-tip">
                 <p class="tip-status">
-                    <span class="iconfont blue">&#xe618;</span>
+                    <span class="iconfont blue">&#xe60f;</span>
                     <span class="blue">您寄回的商品已收到</span>
                 </p>
                 <p>
@@ -44,7 +44,7 @@
         {{# refundSure}}
             <div class="success-tip top-tip">
                 <p class="tip-status">
-                    <span class="iconfont blue">&#xe618;</span>
+                    <span class="iconfont blue">&#xe60f;</span>
                     <span class="blue">退款完成</span>
                 </p>
                 <p>退款方式：<em>由于银行内部处理流程的差异，储蓄卡需要3-7个工作日到账，信用卡需要7-15个工作日到账</em></p>
@@ -103,12 +103,27 @@
                         <p>颜色：{{color}}&nbsp;尺码：{{size}}</p>
                         <p>×{{num}}</p>
                     </div>
-                    <div class="reason">dsa{{reason}}</div>
-                    <div class="num">dasd{{num}}</div>
-                    <dl class="special-info hide">
-                        <dd>问题描述：</dd>
-                        <dd>照片凭证：</dd>
-                    </dl>
+                    <div class="reason">{{reason}}</div>
+                    <div class="num">{{num}}</div>
+                    {{#if remark}}
+                        <dl class="special-info">
+                            <dd class="remark">
+                                <label>问题描述：</label>
+                                {{remark}}
+                            </dd>
+
+                            {{#if evidence}}
+                                <dd>
+                                    <label>照片凭证：</label>
+                                    {{# evidence}}
+                                        <div class="evidence-img">
+                                            <img class="lazy" data-original="{{image . 70 90}}">
+                                        </div>
+                                    {{/ evidence}}
+                                </dd>
+                            {{/if}}
+                        </dl>
+                    {{/if}}
                 </div>
             {{/ goods}}
         </div>
--- a/public/scss/me/return/_refund-detail.css
View file @b2d04be
+++ b/public/scss/me/return/_refund-detail.css
View file @b2d04be
@@ -110,14 +110,32 @@
             .info {
                 width: 284px;
                 text-align: left;
+                line-height: 2;
+            }
+
+            .reason,
+            .num {
+                line-height: 90px;
             }
             .special-info {
                 width: 100%;
                 height: auto;
+                padding-left: 15px;
                 padding-top: 30px;
                 text-align: left;
             }
+
+            .remark {
+                padding-bottom: 15px;
+            }
+
+            .evidence-img {
+                width: 70px;
+                height: 90px;
+                display: inline-block;
+                vertical-align: top;
+            }
         }
     }
 }