Merge branch 'feature/return' into develop

@@ -80,7 +80,7 @@ const refundDetail = (req, res, next) => {
 
 
 const exchange = (req, res, next) => {
 const exchange = (req, res, next) => {
     const code = req.params.orderCode;
     const code = req.params.orderCode;
-    const uid = req.user.uid;
+    const uid = req.user.uid || 8050882;
 
 
     returns.getChangeGoodsList(code, uid).then(result => {
     returns.getChangeGoodsList(code, uid).then(result => {
         res.display('index', {
         res.display('index', {

@@ -56,27 +56,32 @@ const getUserReturn = (uid, page) => {
             2: '换货'
             2: '换货'
         };
         };
 
 
-        const data = camelCase(result.data);
+        let data = {};
+        let paginationOpts = false;
 
 
-        const paginationOpts = data.total > pageSize ? {
-            paginationOpts: {
-                total: data.total,
-                page: data.page,
-                limit: pageSize
-            }
-        } : false;
-
-        data.list.forEach(item => {
-            item.orderGoods = item.goods;
-            item.createTime = item.orderCreateTime;
-            item.hidePrice = true;
-            item.showStatus = true;
-            item.refundStr = refundStr[item.refundType];
+        if (result && result.data) {
+            data = camelCase(result.data);
 
 
-            item.orderGoods.forEach(it => {
-                it.hidePrice = true;
+            paginationOpts = data.total > pageSize ? {
+                paginationOpts: {
+                    total: data.total,
+                    page: data.page,
+                    limit: pageSize
+                }
+            } : false;
+
+            data.list.forEach(item => {
+                item.orderGoods = item.goods;
+                item.createTime = item.orderCreateTime;
+                item.hidePrice = true;
+                item.showStatus = true;
+                item.refundStr = refundStr[item.refundType];
+
+                item.orderGoods.forEach(it => {
+                    it.hidePrice = true;
+                });
             });
             });
-        });
+        }
 
 
         return {
         return {
             returnsList: Object.assign(data, paginationOpts, basicData)
             returnsList: Object.assign(data, paginationOpts, basicData)

@@ -7,7 +7,7 @@
             <ul class="header">
             <ul class="header">
                 <li class="info">商品信息</li>
                 <li class="info">商品信息</li>
                 <li class="change-reason">换货原因</li>
                 <li class="change-reason">换货原因</li>
-                <li class="change-num">换货数量</li>
+                <li class="change-num hide">换货数量</li>
             </ul>
             </ul>
             {{#goodsList}}
             {{#goodsList}}
             <div class="change-info-box">
             <div class="change-info-box">

@@ -284,7 +284,7 @@ function bindConfirmEvent() {
         changeData.consignee_name = $('#user').val();
         changeData.consignee_name = $('#user').val();
         changeData.address = $('#addr').val();
         changeData.address = $('#addr').val();
         changeData.mobile = $('#mob').val();
         changeData.mobile = $('#mob').val();
-        changeData.delivery_type = $('.change-type .type.active').data('type');
+        changeData.delivery_tpye = $('.change-type .type.active').data('type');
 
 
         submitChange(changeData);
         submitChange(changeData);
     });
     });
@@ -297,9 +297,11 @@ function initAddr() {
     });
     });
 }
 }
 
 
-getProductInfo();
-bindSelectEvent();
-bindTypeEvent();
-bindCheckboxEvent();
-bindConfirmEvent();
-initAddr();
+$(document).on('ready', function() {
+    getProductInfo();
+    bindSelectEvent();
+    bindTypeEvent();
+    bindCheckboxEvent();
+    bindConfirmEvent();
+    initAddr();
+});

@@ -2,6 +2,14 @@
     .change-info-box {
     .change-info-box {
         margin-bottom: 20px;
         margin-bottom: 20px;
         border: 1px solid #f1f1f1;
         border: 1px solid #f1f1f1;
+        padding: 0 54px 20px;
+
+        .left {
+            &.left-title {
+                width: auto;
+                padding-left: 0;
+            }
+        }
     }
     }
 
 
     &.change {
     &.change {
@@ -13,6 +21,12 @@
             }
             }
         }
         }
 
 
+        .header {
+            .info {
+                width: 540px;
+            }
+        }
+
         .box-title {
         .box-title {
             display: block;
             display: block;
             padding: 20px 0;
             padding: 20px 0;