merge

@@ -20,7 +20,7 @@
                 <input type="number" placeholder="请输入银行预留手机号" id="mobile" name="mobile"  pattern="\d*" maxlength="11">
                 <input type="number" placeholder="请输入银行预留手机号" id="mobile" name="mobile"  pattern="\d*" maxlength="11">
             </li>
             </li>
         </ul>
         </ul>
-        <a href="" class="open-btn disabled">下一步</a>
+        <div class="open-btn disabled">下一步</div>
         <a href="" class="jumpResult">&nbsp;</a>
         <a href="" class="jumpResult">&nbsp;</a>
     {{/bindCard}}
     {{/bindCard}}
 
 

@@ -7,6 +7,7 @@
 var $ = require('yoho-jquery');
 var $ = require('yoho-jquery');
 var tip = require('../plugin/tip');
 var tip = require('../plugin/tip');
 var checkCard = require('./bind-card-check');
 var checkCard = require('./bind-card-check');
+var loading = require('../plugin/loading');
 var applyButton = $('.open-btn');
 var applyButton = $('.open-btn');
 var flag = true;
 var flag = true;
 var formData = {
 var formData = {
@@ -48,9 +49,6 @@ setInterval(function() {
 }, 500);
 }, 500);
 
 
 applyButton.on('click', function() {
 applyButton.on('click', function() {
-    var self = this;
-    var ret = false;
-
     if (!flag || $(this).hasClass('disabled') || !validateForm()) {
     if (!flag || $(this).hasClass('disabled') || !validateForm()) {
         return false;
         return false;
     }
     }
@@ -60,13 +58,14 @@ applyButton.on('click', function() {
         return false;
         return false;
     }
     }
 
 
+    loading.showLoadingMask();
+
     flag = false;
     flag = false;
 
 
     $.ajax({
     $.ajax({
         type: 'GET',
         type: 'GET',
         url: '/home/installment/post-account',
         url: '/home/installment/post-account',
         data: formData,
         data: formData,
-        async: false,
         success: function(data) {
         success: function(data) {
             var params = {
             var params = {
                 action: 'go.bindCardResult',
                 action: 'go.bindCardResult',
@@ -83,24 +82,25 @@ applyButton.on('click', function() {
 
 
             if (data.code === 200) {
             if (data.code === 200) {
                 params.params.status = 1;
                 params.params.status = 1;
-                ret = true;
             } else if (data.code === 500) {
             } else if (data.code === 500) {
                 tip.show('连接超时');
                 tip.show('连接超时');
                 flag = true;
                 flag = true;
             } else {
             } else {
                 params.params.message = data.message;
                 params.params.message = data.message;
-                ret = true;
             }
             }
 
 
             url += encodeURIComponent(JSON.stringify(params));
             url += encodeURIComponent(JSON.stringify(params));
 
 
-            $(self).attr('href', url);
+            loading.hideLoadingMask();
+
+            $('body').append('<a href=' + url + '><span class="jump">&npsb;</span></a>');
+
+            $('.jump').click();
         },
         },
         error: function() {
         error: function() {
+            loading.hideLoadingMask();
             tip.show('网络断开连接了~');
             tip.show('网络断开连接了~');
             flag = true;
             flag = true;
         }
         }
     });
     });
-
-    return ret;
 });
 });

-require('./shop/shop');
 require('./shop/coupon');
 require('./shop/coupon');
+require('./shop/shop');

@@ -33,6 +33,7 @@ shopCoupon = {
         $.ajax({
         $.ajax({
             method: 'GET',
             method: 'GET',
             url: _url,
             url: _url,
+            async: false,
             data: {
             data: {
                 shopId: that.common.shopId,
                 shopId: that.common.shopId,
                 brandId: that.common.brandId,
                 brandId: that.common.brandId,

@@ -58,9 +58,10 @@
         }
         }
 
 
         .limit-tag {
         .limit-tag {
-            width: 100px;
+            width: 60px;
             border: 1px solid #000;
             border: 1px solid #000;
             color: #000;
             color: #000;
+            line-height: 26px;
         }
         }
 
 
         .is-presell {
         .is-presell {

@@ -140,9 +140,12 @@ $basicBtnC: #eb0313;
             display: inline-block;
             display: inline-block;
             box-sizing: border-box;
             box-sizing: border-box;
             margin-left: 0.5px;
             margin-left: 0.5px;
-            padding: 1px 5PX;
+            padding: 0 5px;
             text-align: center;
             text-align: center;
             font-size: 18px;
             font-size: 18px;
+            height: 35px;
+            line-height: 35px;
+            vertical-align: top;
         }
         }
 
 
         .new-tag {
         .new-tag {
@@ -184,6 +187,7 @@ $basicBtnC: #eb0313;
             border: 1px solid #000;
             border: 1px solid #000;
             background-color: #fff;
             background-color: #fff;
             color: #000;
             color: #000;
+            line-height: 33px;
         }
         }
 
 
         .soon-sold-out-tag {
         .soon-sold-out-tag {