fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 3de400d596a62b6b5abdd3f38a465ba735aa7f9c 1 parent 8aed0e30

优惠码 是优惠劵码的一种形式

Inline Side-by-side
Showing 4 changed files with 3 additions and 6 deletions
@@ -337,7 +337,7 @@ @@ -337,7 +337,7 @@
337 <ul> 337 <ul>
338 <li> 338 <li>
339 <input checked name="juangroup" type="radio" value=""> 339 <input checked name="juangroup" type="radio" value="">
340 - <label>直接输入优惠码： </label> 340 + <label>直接输入优惠券码： </label>
341 <input type="text" class="textbox" id="juancode" /> 341 <input type="text" class="textbox" id="juancode" />
342 </li> 342 </li>
343 </ul> 343 </ul>
@@ -269,7 +269,7 @@ @@ -269,7 +269,7 @@
269 <ul> 269 <ul>
270 <li> 270 <li>
271 <input name="juangroup" type="radio" value=""> 271 <input name="juangroup" type="radio" value="">
272 - <label>直接输入优惠码： </label> 272 + <label>直接输入优惠券码： </label>
273 <input type="text" class="textbox" id="juancode" /> 273 <input type="text" class="textbox" id="juancode" />
274 </li> 274 </li>
275 {{#each juanlist}} 275 {{#each juanlist}}
@@ -269,7 +269,7 @@ @@ -269,7 +269,7 @@
269 <ul> 269 <ul>
270 <li> 270 <li>
271 <input name="juangroup" type="radio" value=""> 271 <input name="juangroup" type="radio" value="">
272 - <label>直接输入优惠码： </label> 272 + <label>直接输入优惠券码： </label>
273 <input type="text" class="textbox" id="juancode" /> 273 <input type="text" class="textbox" id="juancode" />
274 </li> 274 </li>
275 {{#each juanlist}} 275 {{#each juanlist}}
@@ -370,19 +370,16 @@ var Order = { @@ -370,19 +370,16 @@ var Order = {
370 var expressVal = $('.express-list input[name="carriagegroup"]:checked').val(); 370 var expressVal = $('.express-list input[name="carriagegroup"]:checked').val();
371 var biVal = $('#biprice.is-select').val(); 371 var biVal = $('#biprice.is-select').val();
372 var codeVal = $juangroupInput.val(); 372 var codeVal = $juangroupInput.val();
373 - var promotionVal = $juangroupInput.closest('li').find('#juancode').val();  
374 var cartType = $('.address-manage').attr('cart-type'); 373 var cartType = $('.address-manage').attr('cart-type');
375 var redEnvelopes = $('.use-envelopes input:checked').attr('data-use'); 374 var redEnvelopes = $('.use-envelopes input:checked').attr('data-use');
376 var resultData; 375 var resultData;
377 376
378 codeVal = codeVal ? codeVal : $juangroupInput.closest('li').find('#juancode').val(); 377 codeVal = codeVal ? codeVal : $juangroupInput.closest('li').find('#juancode').val();
379 378
380 -  
381 resultData = { 379 resultData = {
382 cartType: cartType, 380 cartType: cartType,
383 deliveryWay: expressVal, 381 deliveryWay: expressVal,
384 couponCode: codeVal, 382 couponCode: codeVal,
385 - promotionCode: promotionVal,  
386 yohoCoin: biVal 383 yohoCoin: biVal
387 384
388 //redEnvelopes: e.$useEnvelopesInput.length > 0 ? ~~e.$hasEnvelopes.text().substring(1) : '0' 385 //redEnvelopes: e.$useEnvelopesInput.length > 0 ? ~~e.$hasEnvelopes.text().substring(1) : '0'