Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -10,7 +10,10 @@ const testUid = 8039837; // 测试uid
 
 
 const refund = {
 const refund = {
     refund(req, res) {
     refund(req, res) {
-        res.render('refund');
+        res.render('refund', {
+            module: 'me',
+            page: 'refund'
+        });
     },
     },
     order(req, res, next) {
     order(req, res, next) {
         const uid = req.user.uid || 8050882;
         const uid = req.user.uid || 8050882;

@@ -53,7 +53,7 @@ exports.cancelOrder = (orderCode, reasonId, reason) => {
         method: 'app.SpaceOrders.close',
         method: 'app.SpaceOrders.close',
         order_code: orderCode,
         order_code: orderCode,
         reason_id: reasonId,
         reason_id: reasonId,
-        reason: reason
+        reason: reason ? reason : ''
     });
     });
 };
 };
 
 

@@ -130,6 +130,20 @@ const matchHeader = (path, qs, titleMap) => {
         return header;
         return header;
     }
     }
 
 
+    if (/\/me\/return\/refund$/.test(path)) {
+        header = titleMap[3];
+        header.title.des = '退货申请';
+        header.right.action = 'submitForm';
+        return header;
+    }
+
+    if (/\/me\/return\/exchange$/.test(path)) {
+        header = titleMap[3];
+        header.title.des = '换货申请';
+        header.right.action = 'submitForm';
+        return header;
+    }
+
     if (/\/me\/return\/refund\/detail/.test(path)) {
     if (/\/me\/return\/refund\/detail/.test(path)) {
         header = titleMap[1];
         header = titleMap[1];
         header.title.des = '退货状态';
         header.title.des = '退货状态';

@@ -93,6 +93,8 @@
             }
             }
         },
         },
         created() {
         created() {
+            yoho.addNativeMethod('submitForm', this.submit.bind(this));
+
             $.ajax({
             $.ajax({
                 url: '/me/return/refund/order',
                 url: '/me/return/refund/order',
                 data: {
                 data: {
@@ -114,12 +116,12 @@
                     });
                     });
 
 
                     reasonConfig.specialReasons = [];
                     reasonConfig.specialReasons = [];
-                    res.data.specialExchangeReason.forEach(obj => reasonConfig.specialReasons.push(obj.id));
+                    res.data.specialReturnReason.forEach(obj => reasonConfig.specialReasons.push(obj.id));
                     reasonConfig.reasons = [{
                     reasonConfig.reasons = [{
                         id: 0,
                         id: 0,
                         name: '请选择'
                         name: '请选择'
-                    }].concat(res.data.exchangeReason);
-                    reasonConfig.specialNotice = res.data.specialNoticeBo;
+                    }].concat(res.data.returnReason);
+                    reasonConfig.specialNotice = res.data.specialNotice;
 
 
                     this.list = res.data.goodsList;
                     this.list = res.data.goodsList;
                     this.$set('refundData', res.data);
                     this.$set('refundData', res.data);