fe / yohobuy-node · Commits

Go to a project

Authored by OF1706
Commit ca50354cd975566c31d88cca173c176cd3311d59 2 parents cdf38b8b 09d83f85

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

… feature/feedBackFooter
Inline Side-by-side
Showing 3 changed files with 11 additions and 4 deletions
@@ -5,7 +5,7 @@ const helpers = global.yoho.helpers; @@ -5,7 +5,7 @@ const helpers = global.yoho.helpers;
5 const getQuestionnaire = (req, res) => { 5 const getQuestionnaire = (req, res) => {
6 let id = req.params.id || ''; 6 let id = req.params.id || '';
7 7
8 - res.redirect(helpers.urlFormat(`/questionnaire/${id}`, null, 'm')); 8 + res.redirect(helpers.urlFormat(`/3party/questionnaire/${id}`, null, 'm'));
9 }; 9 };
10 10
11 module.exports = { 11 module.exports = {
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 <select class="exchange-color" {{#if isLimitSkn}}disabled{{/if}}> 74 <select class="exchange-color" {{#if isLimitSkn}}disabled{{/if}}>
75 <option value="0">请选择颜色</option> 75 <option value="0">请选择颜色</option>
76 {{# colorSize}} 76 {{# colorSize}}
77 - <option value="{{skc}}">{{color}}</option> 77 + <option value="{{skc}}" data-goodsid="{{goodsId}}">{{color}}</option>
78 {{/ colorSize}} 78 {{/ colorSize}}
79 </select> 79 </select>
80 {{# colorSize}} 80 {{# colorSize}}
@@ -362,7 +362,7 @@ function packGoogsList() { @@ -362,7 +362,7 @@ function packGoogsList() {
362 $checkBox.each(function() { 362 $checkBox.each(function() {
363 var $par = $(this).parent().parent(), 363 var $par = $(this).parent().parent(),
364 $next = $par.next(), 364 $next = $par.next(),
365 - goodsInfo; 365 + goodsInfo, cskc;
366 366
367 if (verifyTip.length) { 367 if (verifyTip.length) {
368 return; 368 return;
@@ -382,9 +382,16 @@ function packGoogsList() { @@ -382,9 +382,16 @@ function packGoogsList() {
382 goodsInfo.returned_reason = goodsInfo.reason; 382 goodsInfo.returned_reason = goodsInfo.reason;
383 } else { 383 } else {
384 goodsInfo.exchange_reason = goodsInfo.reason; 384 goodsInfo.exchange_reason = goodsInfo.reason;
385 - goodsInfo.new_goods_id = $par.find('.exchange-color').val() * 1;  
386 goodsInfo.new_product_sku = $par.find('.exchange-size').val() * 1; 385 goodsInfo.new_product_sku = $par.find('.exchange-size').val() * 1;
387 386
  387 + cskc = $par.find('.exchange-color').val() * 1;
  388 +
  389 + $par.find('.exchange-color').children().each(function() {
  390 + if (cskc === +$(this).attr('value')) {
  391 + goodsInfo.new_goods_id = $(this).data('goodsid');
  392 + }
  393 + });
  394 +
388 if (!verifyTip && !goodsInfo.new_goods_id) { 395 if (!verifyTip && !goodsInfo.new_goods_id) {
389 verifyTip = '请选择要换的颜色'; 396 verifyTip = '请选择要换的颜色';
390 } 397 }