Merge branch 'feature/feedBackFooter' of http://git.yoho.cn/fe/yohobuy-node into…

… feature/feedBackFooter

@@ -5,7 +5,7 @@ const helpers = global.yoho.helpers;
 const getQuestionnaire = (req, res) => {
     let id = req.params.id || '';
 
-    res.redirect(helpers.urlFormat(`/questionnaire/${id}`, null, 'm'));
+    res.redirect(helpers.urlFormat(`/3party/questionnaire/${id}`, null, 'm'));
 };
 
 module.exports = {

@@ -74,7 +74,7 @@
                                         <select class="exchange-color" {{#if isLimitSkn}}disabled{{/if}}>
                                             <option value="0">请选择颜色</option>
                                             {{# colorSize}}
-                                                <option value="{{skc}}">{{color}}</option>
+                                                <option value="{{skc}}" data-goodsid="{{goodsId}}">{{color}}</option>
                                             {{/ colorSize}}
                                         </select>
                                         {{# colorSize}}

@@ -362,7 +362,7 @@ function packGoogsList() {
     $checkBox.each(function() {
         var $par = $(this).parent().parent(),
             $next = $par.next(),
-            goodsInfo;
+            goodsInfo, cskc;
 
         if (verifyTip.length) {
             return;
@@ -382,9 +382,16 @@ function packGoogsList() {
                 goodsInfo.returned_reason = goodsInfo.reason;
             } else {
                 goodsInfo.exchange_reason = goodsInfo.reason;
-                goodsInfo.new_goods_id = $par.find('.exchange-color').val() * 1;
                 goodsInfo.new_product_sku = $par.find('.exchange-size').val() * 1;
 
+                cskc = $par.find('.exchange-color').val() * 1;
+
+                $par.find('.exchange-color').children().each(function() {
+                    if (cskc === +$(this).attr('value')) {
+                        goodsInfo.new_goods_id = $(this).data('goodsid');
+                    }
+                });
+
                 if (!verifyTip && !goodsInfo.new_goods_id) {
                     verifyTip = '请选择要换的颜色';
                 }