Authored by 徐炜

Merge remote-tracking branch 'origin/feature/installment2a' into feature/installment2a

@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <input id="list-{{key}}" type="checkbox" class="installment-check-btn" {{#if isChecked}}checked{{/if}}/> 13 <input id="list-{{key}}" type="checkbox" class="installment-check-btn" {{#if isChecked}}checked{{/if}}/>
14 <label for="list-{{key}}"> 14 <label for="list-{{key}}">
15 <div class="cont"> 15 <div class="cont">
16 - <p>¥{{currNoFeeAmt}}</p> 16 + <p>¥{{currAmt}}</p>
17 <p>【全{{stage}}期】{{billInfo}}</p> 17 <p>【全{{stage}}期】{{billInfo}}</p>
18 </div> 18 </div>
19 </label> 19 </label>
@@ -19,7 +19,7 @@ var repayment = new Repayment({ @@ -19,7 +19,7 @@ var repayment = new Repayment({
19 index: li.index(), 19 index: li.index(),
20 orderCode: li.data('billNo'), 20 orderCode: li.data('billNo'),
21 termNo: li.data('currterm'), 21 termNo: li.data('currterm'),
22 - amount: parseFloat(li.data('currnofeeamt')), 22 + amount: parseFloat(li.data('curramt')),
23 fee: parseFloat(li.data('currfee')) + 0 23 fee: parseFloat(li.data('currfee')) + 0
24 }; 24 };
25 25
@@ -49,10 +49,10 @@ $(CHECKBOX_SELECTOR + ':checkbox').click(function() { @@ -49,10 +49,10 @@ $(CHECKBOX_SELECTOR + ':checkbox').click(function() {
49 billNo = $(self).parent().data('billNo'), 49 billNo = $(self).parent().data('billNo'),
50 li = $('li[data-bill-no=' + billNo + ']'), 50 li = $('li[data-bill-no=' + billNo + ']'),
51 selection = li.find('input:checked'), 51 selection = li.find('input:checked'),
52 - lastIndex = li.eq(0).index(); 52 + lastIndex = li.eq(0).data('currterm');
53 53
54 selection.parent().each(function(index, sel) { 54 selection.parent().each(function(index, sel) {
55 - var key = $(sel).index(); 55 + var key = $(sel).data('currterm');
56 56
57 if ((key + 1) - lastIndex > 1) { 57 if ((key + 1) - lastIndex > 1) {
58 isSkipped = true; 58 isSkipped = true;