setExpressNumber

@@ -3,7 +3,7 @@
  *  @author 陈轩 <xuan.chen@yoho.cn>
  */
 'use strict';
-
+const helpers = global.yoho.helpers;
 const returnsModel = require('../models/returns');
 
 /*
@@ -49,6 +49,42 @@ const saveRefund = (req, res, next) => {
 };
 
 /*
+ 退货成功
+ */
+const refundSuccess = (req, res) => {
+    let resData = {
+        save: {
+            type: '退货',
+            ordersHref: helpers.urlFormat('/home/orders'),
+            returnsHref: helpers.urlFormat('/home/returns'),
+            refund: {// 退货时传退货收件地址
+                address: '南京市江宁区江宁经济技术开发区苏源大道87号YOHO!有货物流中心东一楼',
+                name: 'YOHO！有货',
+                phone: '400－889－9646',
+                postcode: '211106'
+            }
+        }
+    }
+
+    res.render('returns/returns-save', {returns: resData});
+};
+
+/*
+ 换货成功
+ */
+const exchangeSuccess = (req, res) => {
+    let resData = {
+        save: {
+            type: '换货',
+            ordersHref: helpers.urlFormat('/home/orders'),
+            returnsHref: helpers.urlFormat('/home/returns')
+        }
+    }
+
+    res.render('returns/returns-save', {returns: resData});
+};
+
+/*
  我的退换货-退货详情页
  */
 const refundDetail = (req, res, next) => {
@@ -130,14 +166,6 @@ const setExpressNumber = (req, res, next) => {
     let expressNumber = req.body.expressNumber;
     let expressCompany = req.body.expressCompany;
 
-
-    console.log('uid' + uid);
-    console.log('id' + id);
-    console.log('isChange' + isChange);
-    console.log('expressId' + expressId);
-    console.log('expressNumber' + expressNumber);
-    console.log('expressCompany' + expressCompany);
-
     returnsModel.setExpressNumber(id, expressId, expressNumber, uid, expressCompany, isChange).then(result => {
 
         if (res.code && res.code == 201) {
@@ -156,8 +184,10 @@ module.exports = {
     index,
     refundApply,
     saveRefund,
+    refundSuccess,
     refundDetail,
     exchangeApply,
+    exchangeSuccess,
     exchangeDetail,
     cancelRefund,
     cancelChange,

@@ -125,8 +125,6 @@ const setExpressNumberAsync = (id, expressId, expressNumber, uid, expressCompany
         express_company: expressCompany
     };
 
-    console.log(options);
-
     return api.post('', options);
 };
 

@@ -263,8 +263,8 @@ const getOrderRefund = (orderCode, uid) => {
 const saveRefund = (req, uid) => {
     let process = function*() {
         let orderCode = req.body.orderCode,
-            goods = req.body.goods,
-            payment = req.body.payment;
+            goods = JSON.parse(req.body.goods),
+            payment = JSON.parse(req.body.payment);
 
 
         if (_.isEmpty(orderCode) || orderCode < 1 ||
@@ -294,8 +294,8 @@ const saveRefund = (req, uid) => {
 
         if (_.get(result, 'code') === 200) {
             // 退货成功发送站内信
-            let da = yield returnAPI.sendMessage(uid, title, content);
-            console.log(da);
+            returnAPI.sendMessage(uid, title, content);
+
             result.data.refer = helpers.urlFormat('/home/returns/refundSuccess', {orderCode: orderCode});
         }
 
@@ -323,7 +323,6 @@ const getRefundDetail = (applyId, uid) => {
             let data = result[0].data;
             let detail = {
                 isChange: false,
-                returnId: applyId,
                 orderNum: data.source_order_code,
                 nowStatus: data.status_name,
                 applyTime: data.create_time,
@@ -335,6 +334,7 @@ const getRefundDetail = (applyId, uid) => {
             if (+data.status !== 0) {
                 detail.express = {
                     id: _.get(data, 'notice.express_id', ''),
+                    returnId: applyId,
                     company: _.get(data, 'notice.express_company', ''),
                     number: _.get(data, 'notice.express_number', '')
                 };
@@ -384,7 +384,6 @@ const getChangeDetail = (applyId, uid) => {
             let data = result[0].data;
             let detail = {
                 isChange: true,
-                returnId: applyId,
                 orderNum: data.source_order_code,
                 nowStatus: data.status_name,
                 applyTime: data.create_time,
@@ -394,6 +393,7 @@ const getChangeDetail = (applyId, uid) => {
             if (+data.status !== 0 && +data.delivery_tpye !== 20) {
                 detail.express = {
                     id: _.get(data, 'notice.express_id', ''),
+                    returnId: applyId,
                     company: _.get(data, 'notice.express_company', ''),
                     number: _.get(data, 'notice.express_number', ''),
                     expressDeadLine: _.get(data, 'notice.date', '')

@@ -76,15 +76,16 @@ router.get('/message/pickCoupon', messageController.pickCoupon);
 
 // 我的退/换货
 router.get('/returns', tabsMiddleware.getCommonHeader, returnsController.index);
-router.get('/returns/refundrequest', tabsMiddleware.getCommonHeader, returnsController.refundApply);
-router.post('/returns/saveRefund', tabsMiddleware.getCommonHeader, returnsController.saveRefund);
-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.post('/returns/cancelRefund', tabsMiddleware.getCommonHeader, returnsController.cancelRefund);// 取消换货
-router.post('/returns/cancelChange', tabsMiddleware.getCommonHeader, returnsController.cancelChange);// 取消退货
-router.post('/returns/setExpressNumber', tabsMiddleware.getCommonHeader, returnsController.setExpressNumber);// 取消退货
+router.get('/returns/refundrequest', tabsMiddleware.getCommonHeader, returnsController.refundApply);//退货申请
+router.post('/returns/saveRefund', tabsMiddleware.getCommonHeader, returnsController.saveRefund);//提交退货
+router.get('/returns/refundSuccess', tabsMiddleware.getCommonHeader, returnsController.refundSuccess);//退货成功
+router.get('/returns/refundDetail', tabsMiddleware.getCommonHeader, returnsController.refundDetail);//退货详情
+router.get('/returns/exchangerequest', tabsMiddleware.getCommonHeader, returnsController.exchangeApply);//换货申请
+router.get('/returns/exchangeSuccess', tabsMiddleware.getCommonHeader, returnsController.refundSuccess);//换货成功
+router.get('/returns/exchangeDetail', tabsMiddleware.getCommonHeader, returnsController.exchangeDetail);//换货详情
+router.get('/returns/cancelRefund', tabsMiddleware.getCommonHeader, returnsController.cancelRefund);// 取消退货
+router.post('/returns/cancelChange', tabsMiddleware.getCommonHeader, returnsController.cancelChange);// 取消换货
+router.post('/returns/setExpressNumber', tabsMiddleware.getCommonHeader, returnsController.setExpressNumber);// 设置快递
 router.get('/returns/success', returnsController.index);
 
 // router.get('/index', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], IndexController.index);

-{{> layout/header}}
 <div class="save-returns-page me-page yoho-page clearfix">
+    {{> path}}
+    {{> navigation}}
     {{# returns}}
-        {{> path}}
-
-        {{> navigation}}
-
         <div class="me-main">
             {{# save}}
                 <div class="returns-save block{{#unless refund}} exchange{{/unless}}">
@@ -46,4 +43,3 @@
         </div>
     {{/ returns}}
 </div>
-{{> layout/footer}}

@@ -73,9 +73,6 @@ function sendExpressCode() {
         return;
     }
 
-    console.log('returnId' + returnId);
-    console.log('isChange' + isChange);
-
     $.ajax({
         type: 'POST',
         url: '/home/returns/setExpressNumber',