快递数据格式处理

@@ -71,6 +71,20 @@ function getGoodsData(goods) {
 }
 
 /**
+ * 获得快递列表
+ * @return array
+ */
+const getExpressCompany = (expressList) => {
+    let data = [];
+    _.forEach(expressList, function(value) {
+        data.push(value);
+    });
+    data = _.flatten(data);
+
+    return data;
+}
+
+/**
  * 退换货列表页数据
  * @param  {string} uid   用户 uid
  * @param  {Number} page  当前页数
@@ -145,6 +159,12 @@ const getReturnsList = co(function*(uid, page, limit) {
     return obj;
 });
 
+/**
+ * 退货申请页数据
+ * @param $orderCode
+ * @param $uid
+ * @return array|mixed
+ */
 const getOrderRefund = (orderCode, uid) => {
     let process = function*() {
         let resData = {};
@@ -184,8 +204,8 @@ const getOrderRefund = (orderCode, uid) => {
                     };
 
                     // tar note 对数组做处理，为不显示的添加 inactive
-                    if (result.data.special_return_reason) {
-                        let spReason = result.data.special_return_reason;
+                    if (_.get(result, 'data.special_return_reason')) {
+                        let spReason = _.get(result, 'data.special_return_reason');
 
                         _.forEach(item.reason, (subVal, subKey) => { // eslint-disable-line
                             if (_.indexOf(spReason, subKey)) {
@@ -224,7 +244,7 @@ const getOrderRefund = (orderCode, uid) => {
             resData.returnAmountMode = result.data.return_amount_mode;
         }
 
-        return resData;
+        return {refund: resData};
     };
 
     return co(process)();
@@ -282,7 +302,7 @@ const getRefundDetail = (applyId, uid) => {
         }
 
         if (result[1].data && resData.detail) {
-            _.set(resData, 'detail.expressList', _.toArray(result[1].data.E));
+            _.set(resData, 'detail.express.expressList', getExpressCompany(result[1].data));
         }
 
         return resData;
@@ -342,7 +362,7 @@ const getChangeDetail = (applyId, uid) => {
         }
 
         if (result[1].data && resData.detail) {
-            _.set(resData, 'detail.expressList', _.toArray(result[1].data));
+            _.set(resData, 'detail.express.expressList', getExpressCompany(result[1].data));
         }
 
         return resData;
@@ -351,6 +371,12 @@ const getChangeDetail = (applyId, uid) => {
     return co(process)();
 };
 
+/**
+ * 换货申请页数据
+ * @param $orderCode
+ * @param $uid
+ * @return array|mixed
+ */
 const getOrderExchange = (orderCode, uid) => {
     let process = function*() {
         let resData = {};
@@ -366,7 +392,7 @@ const getOrderExchange = (orderCode, uid) => {
                 let cnAlphabet = value.cn_alphabet || 'cnalphabet';
                 let item = {
                     href: getProductUrlBySkc(value.product_id, value.goods_id, cnAlphabet),
-                    thumb: value.goods_image,
+                    thumb: helpers.image(value.goods_image, 60, 60),
                     name: value.product_name,
                     color: value.color_name,
                     size: value.size_name,
@@ -455,7 +481,7 @@ const getOrderExchange = (orderCode, uid) => {
             resData.goods = goods;
         }
 
-        return resData;
+        return {exchange: resData};
     };
 
     return co(process)();

@@ -75,12 +75,12 @@ router.get('/message/read', messageController.readMsg);
 router.get('/message/pickCoupon', messageController.pickCoupon);
 
 // 我的退/换货
-router.get('/returns', [getCommonHeader, getHomeNav], returnsController.index);
-router.get('/refund/apply', [getCommonHeader, getHomeNav], returnsController.refundApply);
-router.get('/returns/refundDetail', [getCommonHeader, getHomeNav], returnsController.refundDetail);
-router.get('/exchange/apply', [getCommonHeader, getHomeNav], returnsController.exchangeApply);
-router.get('/exchange/detail', [getCommonHeader, getHomeNav], returnsController.refundDetail);
-router.get('/returns/exchangeDetail', [getCommonHeader, getHomeNav], returnsController.exchangeDetail);
+router.get('/returns', tabsMiddleware.getCommonHeader, returnsController.index);
+router.get('/returns/refundrequest', tabsMiddleware.getCommonHeader, returnsController.refundApply);
+router.get('/returns/refundDetail', tabsMiddleware.getCommonHeader, returnsController.refundDetail);
+router.get('/returns/exchangerequest', tabsMiddleware.getCommonHeader, returnsController.exchangeApply);
+router.get('/exchange/detail', tabsMiddleware.getCommonHeader, returnsController.refundDetail);
+router.get('/returns/exchangeDetail', tabsMiddleware.getCommonHeader, returnsController.exchangeDetail);
 router.get('/returns/success', returnsController.index);
 
 // router.get('/index', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], IndexController.index);

@@ -75,11 +75,9 @@
                                 <td class="return-reason-wrap">
                                     <select class="return-reason">
                                         <option value="0">请选择换货原因</option>
-                                        {{#with exchange}}
                                             {{# reason}}
                                                 <option value="{{id}}">{{name}}</option>
                                             {{/ reason}}
-                                        {{/with}}
                                     </select>
                                 </td>
                                 {{/if}}
@@ -172,11 +170,9 @@
                                     {{^}}
                                         <select class="return-reason">
                                             <option value="0">请选择退货原因</option>
-                                            {{#with refund}}
                                                 {{# reason}}
                                                     <option value="{{id}}">{{name}}</option>
                                                 {{/ reason}}
-                                            {{/with}}
                                         </select>
                                     {{/if}}
                                 </td>