Merge branch 'feature/installment' of git.yoho.cn:fe/yohobuywap-node into feature/installment

@@ -61,7 +61,7 @@
                                 本金:¥{{currPrincipalAmt}}
 
                                 {{#if currFeeAmt}}
-                                    服务费:¥{{currFeeAmt}}
+                                    手续费:¥{{currFeeAmt}}
                                 {{/if}}
 
                                 {{#greaterThanZero currDealyFeeAmt}}

@@ -55,7 +55,7 @@
             <input id="accept-agreements" name="agreements" type="checkbox" class="installment-check-btn"/>
             <label for="accept-agreements">
                 <span>免费开通，详情请见
-                    <a href="/home/installment/agreement">《有货分期服务协议》&《第三方支付协议》</a>
+                    <a id="agreements" href="" data-href="/home/installment/agreement">《有货分期服务协议》&《第三方支付协议》</a>
                 </span>
             </label>
             <div class="clearfix"></div>

@@ -15,7 +15,7 @@
     <input id="repayment-total" type="checkbox" class="installment-check-btn" {{#if isAllChecked}}checked{{/if}}/>
     <label for="repayment-total">
         <p class="repay-price">待支付：<span>¥<span class="curr-amt">{{round currAmtCount}}</span></span></p>
-        <p class="serve-price" {{#if isCurrFee}}style="display:block;"{{/if}}>含服务费¥<span class="curr-fee">{{round currFeeCount}}</span></p>
+        <p class="serve-price" {{#if isCurrFee}}style="display:block;"{{/if}}>含逾期服务费¥<span class="curr-fee">{{round currFeeCount}}</span></p>
     </label>
     <a href='' class="repayment-btn">立即还款</a>
 </div>

@@ -14,7 +14,7 @@ var repayment = new Repayment({
                 orderCode: input.data('orderCode'),
                 termNo: input.data('sortId'),
                 amount: parseFloat(input.data('amount')),
-                fee: parseFloat(input.data('fee')) + parseFloat(input.data('delayFee'))
+                fee: parseFloat(input.data('delayFee'))
             };
 
             ret.push(data);

@@ -32,6 +32,7 @@ var validateForm = function() {
     if (formModel.userName &&
         formModel.identityCardNo &&
         formModel.cardNo &&
+        formModel.bankCode &&
         formModel.mobile &&
         formModel.snsCheckCode &&
         formModel.agreements === 'on') {
@@ -51,6 +52,9 @@ const clearVerifyCode = function() {
 };
 
 var debounceFn = debounce(function(cardNo) {
+    formModel.bankCode = '';
+    formModel.bankName = '';
+
     // 获取银行信息
     $.get('/home/installment/bank-info', {cardNo: cardNo}).then(function(result) {
         if (result.code === 200) {
@@ -62,12 +66,20 @@ var debounceFn = debounce(function(cardNo) {
                 $('#bank-name').text(result.data.bankName);
 
                 // 设置银行图标
-                $('#bank-icon').attr('src',
+                $('#bank-icon').show().attr('src',
                     window.STATIC_RESOURCE_PATH +
                     '/img/home/bank-icons/' + result.data.bankCode + '.png');
                 $('#bank-desc').show();
             }
+
+            // 返回1不支持, 孟令阶
+            if (result && result.data && result.data.businessSupport === '1') {
+                $('#bank-name').text('暂不支持此银行卡');
+                $('#bank-desc').show();
+                $('#bank-icon').hide();
+            }
         } else {
+            tip.show(result.message);
             $('#bank-desc').hide();
         }
     });
@@ -298,3 +310,14 @@ $('input[maxlength]').keyup(function() {
 
     $(this).val(value.slice(0, length));
 });
+
+$('#agreements').click(function() {
+    const params = {
+        action: 'go.instalmentProtocol',
+        params: {
+            protocolUrl: location.protocol + '//' + location.hostname + location.port + $(this).data('href')
+        }
+    };
+
+    $(this).attr('href', location.pathname + '?openby:yohobuy=' + encodeURIComponent(JSON.stringify(params)));
+});