fix:开发票弹框相关优化

src/jfw/modules/app/src/web/templates/invoice/invoicing.html

@@ -134,57 +134,124 @@
         var applybill_status = ""
         var sys_err = ""
         var c = {{.T.c}}
-            $(function () {
-                $.ajax({
-                    url:"/jypay/invoice/show",
-                    type:"POST",
-                    data:{"order_code":order_code},
-                    success:function (r) {
-                        if(r.status == "fail"){
-                            if (r.datas != ""){
-                                applybill_status = r.datas.applybill_status
-                                product_name = r.datas.product_type
-                                if (product_name == "历史数据"){  //历史数据
-                                    $(".user-phone").attr("value",r.datas.user_phone)
-                                    $(".user-mail").attr("value",r.datas.user_mail)
-                                    invoice.phoneStatus = true;
-                                    invoice.emailStatus = true;
-                                    $(".j-button-confirm").removeAttr("disabled")
-                                }
-                                if (r.datas.applybill_status == 1){
-                                    $(".j-footer").hide();
-                                    $(".v-cell-input").attr("disabled","disabled");
-                                    $(".invoice-title").unbind("click");
-                                }
+        $(function () {
+          switchInvoice()
+          // 发票功能是否开启
+          function switchInvoice() {
+            $.ajax({
+                url: '/jypay/invoice/switch?t=' + Date.now(),
+                type: "GET",
+                success: function(res) {
+                  if (res.code === '1001') {
+                    $('.j-button-confirm').attr('disabled',true)
+                    return weui.alert(res.messge, {
+                        title: '温馨提醒',
+                        className: 'jy-alert',
+                        buttons: [{
+                          label: '我知道了',
+                          onClick: function(){ 
+                            history.back()
+                          }
+                        }]
+                    })
+                  } else {
+                    showData()
+                  }
+                },
+                fail: function(err) {
+                  console.log(err)
+                }
+            })
+          }
+          function showData () {
+            $.ajax({
+                url:"/jypay/invoice/show",
+                type:"POST",
+                data:{"order_code":order_code},
+                success:function (r) {
+                    if(r.status == "fail"){
+                        if (r.datas != ""){
+                            applybill_status = r.datas.applybill_status
+                            product_name = r.datas.product_type
+                            if (product_name == "历史数据"){  //历史数据
+                                $(".user-phone").attr("value",r.datas.user_phone)
+                                $(".user-mail").attr("value",r.datas.user_mail)
+                                invoice.phoneStatus = true;
+                                invoice.emailStatus = true;
+                                $(".j-button-confirm").removeAttr("disabled")
+                            }
+                            if (r.datas.applybill_status == 1){
+                                $(".j-footer").hide();
+                                $(".v-cell-input").attr("disabled","disabled");
+                                $(".invoice-title").unbind("click");
+                            }
+                        }
+                    }else{
+                        applybill_status = r.data.invoice_status,
+                        product_name = r.data.product_type
+                        if (r.data.invoice_status == -1){
+                            sys_err = -1
+                            if (r.data.invoice_type == "单位"){
+                                $('.company-cell').show()
+                                $('.invoice-value').text("单位")
+                                $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                $(".company_name").attr("value",r.data.company_name)
+                                $(".user-phone").attr("value",r.data.phone)
+                                $(".user-mail").attr("value",r.data.mail)
+                                invoice.phoneStatus = true;
+                                invoice.emailStatus = true;
+                                invoice.cnameStatus = true;
+                                invoice.codeStatus = true;
+                                $(".j-button-confirm").removeAttr("disabled")
+                            }else{
+                                $('.invoice-value').text("个人")
+                                $(".user-phone").attr("value",r.data.phone)
+                                $(".user-mail").attr("value",r.data.mail)
+                                invoice.phoneStatus = true;
+                                invoice.emailStatus = true;
+                                $(".j-button-confirm").removeAttr("disabled")
                             }
                         }else{
-                            applybill_status = r.data.invoice_status,
-                            product_name = r.data.product_type
-                            if (r.data.invoice_status == -1){
-                                sys_err = -1
-                                if (r.data.invoice_type == "单位"){
-                                    $('.company-cell').show()
-                                    $('.invoice-value').text("单位")
-                                    $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                    $(".company_name").attr("value",r.data.company_name)
-                                    $(".user-phone").attr("value",r.data.phone)
-                                    $(".user-mail").attr("value",r.data.mail)
-                                    invoice.phoneStatus = true;
-                                    invoice.emailStatus = true;
-                                    invoice.cnameStatus = true;
-                                    invoice.codeStatus = true;
-                                    $(".j-button-confirm").removeAttr("disabled")
+                            if (product_name == "历史数据"){
+                                if (r.data.invoice_changed == 1){
+                                    if (r.data.invoice_type == "单位"){
+                                        $('.company-cell').show()
+                                        $('.invoice-value').text("单位")
+                                        $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                        $(".company_name").attr("value",r.data.company_name)
+                                        $(".user-phone").attr("value",r.data.phone)
+                                        $(".user-mail").attr("value",r.data.mail)
+                                        $(".v-cell-input").attr("disabled", "disabled");
+                                        $(".invoice-title").unbind("click");
+                                        $(".j-footer").hide()
+                                    }else{
+                                        $('.invoice-value').text("个人")
+                                        $(".user-phone").attr("value",r.data.phone)
+                                        $(".user-mail").attr("value",r.data.mail)
+                                        $(".v-cell-input").attr("disabled", "disabled");
+                                        $(".invoice-title").unbind("click");
+                                        $(".j-footer").hide()
+                                    }
                                 }else{
-                                    $('.invoice-value').text("个人")
-                                    $(".user-phone").attr("value",r.data.phone)
-                                    $(".user-mail").attr("value",r.data.mail)
-                                    invoice.phoneStatus = true;
-                                    invoice.emailStatus = true;
-                                    $(".j-button-confirm").removeAttr("disabled")
-                                }
-                            }else{
-                                if (product_name == "历史数据"){
-                                    if (r.data.invoice_changed == 1){
+                                    if (c==1){
+                                        if (r.data.invoice_type == "单位"){
+                                            /* $('.company-cell').show()
+                                            $('.invoice-value').text("单位")
+                                            $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                            $(".company_name").attr("value",r.data.company_name)
+                                            $(".user-phone").attr("value",r.data.phone)
+                                            $(".user-mail").attr("value",r.data.mail)*/
+                                            $('.invoice-value').text("个人")
+                                            $(".user-phone").attr("value",r.data.phone)
+                                            $(".user-mail").attr("value",r.data.mail)
+                                        }else{
+
+                                            $('.invoice-value').text("个人")
+                                            $(".user-phone").attr("value",r.data.phone)
+                                            $(".user-mail").attr("value",r.data.mail)
+
+                                        }
+                                    }else{
                                         if (r.data.invoice_type == "单位"){
                                             $('.company-cell').show()
                                             $('.invoice-value').text("单位")
@@ -203,49 +270,34 @@
                                             $(".invoice-title").unbind("click");
                                             $(".j-footer").hide()
                                         }
-                                    }else{
-                                        if (c==1){
-                                            if (r.data.invoice_type == "单位"){
-    /*                                            $('.company-cell').show()
-                                                $('.invoice-value').text("单位")
-                                                $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                                $(".company_name").attr("value",r.data.company_name)
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)*/
-                                                $('.invoice-value').text("个人")
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-                                            }else{
-
-                                                $('.invoice-value').text("个人")
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-
-                                            }
-                                        }else{
-                                            if (r.data.invoice_type == "单位"){
-                                                $('.company-cell').show()
-                                                $('.invoice-value').text("单位")
-                                                $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                                $(".company_name").attr("value",r.data.company_name)
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-                                                $(".v-cell-input").attr("disabled", "disabled");
-                                                $(".invoice-title").unbind("click");
-                                                $(".j-footer").hide()
-                                            }else{
-                                                $('.invoice-value').text("个人")
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-                                                $(".v-cell-input").attr("disabled", "disabled");
-                                                $(".invoice-title").unbind("click");
-                                                $(".j-footer").hide()
-                                            }
-                                        }
+                                    }
 
+                                }
+                            }else{
+                                if (r.data.invoice_changed == 1){
+                                    if (r.data.invoice_type == "单位"){
+                                        $('.company-cell').show()
+                                        $('.invoice-value').text("单位")
+                                        $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                        $(".company_name").attr("value",r.data.company_name)
+                                        $(".user-phone").attr("value",r.data.phone)
+                                        $(".user-mail").attr("value",r.data.mail)
+                                        $(".v-cell-input").attr("disabled", "disabled");
+                                        $(".invoice-title").unbind("click");
+                                        $(".j-footer").hide()
+                                    }else{
+                                        $('.invoice-value').text("个人")
+                                        $(".user-phone").attr("value",r.data.phone)
+                                        $(".user-mail").attr("value",r.data.mail)
+                                        $(".v-cell-input").attr("disabled", "disabled");
+                                        $(".invoice-title").unbind("click");
+                                        $(".j-footer").hide()
                                     }
                                 }else{
-                                    if (r.data.invoice_changed == 1){
+                                    if (c==1){
+                                        $('.invoice-value').text("个人")
+                                        $('.company-cell').hide()
+                                    }else{
                                         if (r.data.invoice_type == "单位"){
                                             $('.company-cell').show()
                                             $('.invoice-value').text("单位")
@@ -264,42 +316,18 @@
                                             $(".invoice-title").unbind("click");
                                             $(".j-footer").hide()
                                         }
-                                    }else{
-                                        if (c==1){
-                                            $('.invoice-value').text("个人")
-                                            $('.company-cell').hide()
-                                        }else{
-                                            if (r.data.invoice_type == "单位"){
-                                                $('.company-cell').show()
-                                                $('.invoice-value').text("单位")
-                                                $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                                $(".company_name").attr("value",r.data.company_name)
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-                                                $(".v-cell-input").attr("disabled", "disabled");
-                                                $(".invoice-title").unbind("click");
-                                                $(".j-footer").hide()
-                                            }else{
-                                                $('.invoice-value').text("个人")
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-                                                $(".v-cell-input").attr("disabled", "disabled");
-                                                $(".invoice-title").unbind("click");
-                                                $(".j-footer").hide()
-                                            }
-                                        }
-
                                     }
 
                                 }
-                            }
 
+                            }
                         }
+
                     }
-                })
+                }
             })
-
-
+          }
+        })
         var invoice = {
             reg:{
                 tel:/^1[3456789]{1}\d{9}$/,
@@ -325,7 +353,6 @@
                 this.checkCode();
                 this.checkInput();
                 this.submitHandle()
-                this.switchInvoice(); // 是否可以开发票
             },
             // 控制单位和个人填写
             isShowForm:function(){
@@ -546,31 +573,6 @@
                     $('#rules_dialog').hide()
                 })
             },
-            // 发票功能是否开启
-            switchInvoice: function() {
-              $.ajax({
-                  url: '/jypay/invoice/switch?t=' + Date.now(),
-                  type: "GET",
-                  success: function(res) {
-                    if (res.code === '1001') {
-                      $('.j-button-confirm').attr('disabled',true)
-                      return weui.alert(res.messge, {
-                          title: '温馨提醒',
-                          className: 'jy-alert',
-                          buttons: [{
-                            label: '我知道了',
-                            onClick: function(){ 
-                              history.back()
-                            }
-                          }]
-                      })
-                    }
-                  },
-                  fail: function(err) {
-                    console.log(err)
-                  }
-              })
-            },
             // 提交
             submitHandle:function(){
                 var that = this

src/web/staticres/electronic_invoice/css/invoice.css

@@ -263,4 +263,4 @@ input[type="number"] {
   border: 0;
   color: #fff;
   outline: 0;
-}
+}

src/web/templates/pc/invoice.html

@@ -145,8 +145,8 @@
 	    </div>
 	  </div>
     <div class="modal fade" id="switchModal" tabindex="-1" data-keyboard="false" role="dialog" data-backdrop="static" aria-labelledby="myModalLabel" aria-hidden="true">
-	    <div class="modal-dialog">
-	        <div class="modal-content" style="max-width:400px;">
+	    <div class="modal-dialog" style="max-width:400px;">
+	        <div class="modal-content">
 	            <div class="modal-header">
 	                <h4 class="modal-title" style="font-weight: 700;">温馨提醒</h4>
 	            </div>

src/web/templates/weixin/invoice/invoicing.html

@@ -140,178 +140,205 @@
         var sys_err = ""
         var c = {{.T.c}}
             $(function () {
-                $.ajax({
-                    url:"/jypay/invoice/show",
-                    type:"POST",
-                    data:{"order_code":order_code},
-                    success:function (r) {
-                        if(r.status == "fail"){
-                            if (r.datas != ""){
-                                applybill_status = r.datas.applybill_status
-								product_name = r.datas.product_type
-								if (product_name == "历史数据"){  //历史数据
-                                    $(".user-phone").attr("value",r.datas.user_phone)
-                                    $(".user-mail").attr("value",r.datas.user_mail)
-									invoice.phoneStatus = true;
-									invoice.emailStatus = true;
-									$("#commit").removeAttr("disabled")
-                                }
-                                if (r.datas.applybill_status == 1){
-                                    $(".j-footer").hide();
-                                    $(".v-cell-input").attr("disabled","disabled");
-                                    $(".invoice-title").unbind("click");
-                                }
-                            }
-                        }else{
-                            applybill_status = r.data.invoice_status,
-                            product_name = r.data.product_type
-                            if (r.data.invoice_status == -1){
-                                sys_err = -1
-                                if (r.data.invoice_type == "单位"){
-                                    $('.company-cell').show()
-                                    $('.invoice-value').text("单位")
-                                    $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                    $(".company_name").attr("value",r.data.company_name)
-                                    $(".user-phone").attr("value",r.data.phone)
-                                    $(".user-mail").attr("value",r.data.mail)
-                                    invoice.phoneStatus = true;
-                                    invoice.emailStatus = true;
-                                    invoice.cnameStatus = true;
-                                    invoice.codeStatus = true;
-                                    $(".j-button-confirm").removeAttr("disabled")
-
-                                }else{
-                                    $('.invoice-value').text("个人")
-                                    $(".user-phone").attr("value",r.data.phone);
-                                    $(".user-mail").attr("value",r.data.mail);
-                                    invoice.phoneStatus = true;
-                                    invoice.emailStatus = true;
-                                    $("#commit").removeAttr("disabled")
+              switchInvoice()
+               // 发票功能是否开启
+                function switchInvoice() {
+                  $.ajax({
+                      url: '/jypay/invoice/switch?t=' + Date.now(),
+                      type: "GET",
+                      success: function(res) {
+                        if (res.code === '1001') {
+                          $('.j-button-confirm').attr('disabled',true)
+                          return weui.alert(res.messge, {
+                              title: '温馨提醒',
+                              className: 'jy-alert',
+                              buttons: [{
+                                label: '我知道了',
+                                onClick: function(){ 
+                                  history.back()
                                 }
-                            }else{
-                                if (product_name == "历史数据"){
-                                    if (r.data.invoice_changed == 1){
-                                        if (r.data.invoice_type == "单位"){
-                                            $('.company-cell').show()
-                                            $('.invoice-value').text("单位")
-                                            $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                            $(".company_name").attr("value",r.data.company_name)
-                                            $(".user-phone").attr("value",r.data.phone)
-                                            $(".user-mail").attr("value",r.data.mail)
-                                            $(".v-cell-input").attr("disabled", "disabled");
-                                            $(".invoice-title").unbind("click");
-                                            $(".j-footer").hide()
-                                        }else{
-                                            $('.invoice-value').text("个人")
-                                            $(".user-phone").attr("value",r.data.phone)
-                                            $(".user-mail").attr("value",r.data.mail)
-                                            $(".v-cell-input").attr("disabled", "disabled");
-                                            $(".invoice-title").unbind("click");
-                                            $(".j-footer").hide()
-                                        }
-                                    }else{
-                                        if (c==1){
-                                            if (r.data.invoice_type == "单位"){
-                                                /*$('.company-cell').show()
-                                                $('.invoice-value').text("单位")
-                                                $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                                $(".company_name").attr("value",r.data.company_name)
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)*/
-                                                $('.invoice-value').text("个人")
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-                                            }else{
-                                                $('.invoice-value').text("个人")
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
+                              }]
+                          })
+                        } else {
+                          showData()
+                        }
+                      },
+                      fail: function(err) {
+                        console.log(err)
+                      }
+                  })
+                }
+                function showData () {
+                    $.ajax({
+                      url:"/jypay/invoice/show",
+                      type:"POST",
+                      data:{"order_code":order_code},
+                      success:function (r) {
+                          if(r.status == "fail"){
+                              if (r.datas != ""){
+                                  applybill_status = r.datas.applybill_status
+                                  product_name = r.datas.product_type
+                                  if (product_name == "历史数据"){  //历史数据
+                                      $(".user-phone").attr("value",r.datas.user_phone)
+                                      $(".user-mail").attr("value",r.datas.user_mail)
+                                      invoice.phoneStatus = true;
+                                      invoice.emailStatus = true;
+                                      $("#commit").removeAttr("disabled")
+                                  }
+                                  if (r.datas.applybill_status == 1){
+                                      $(".j-footer").hide();
+                                      $(".v-cell-input").attr("disabled","disabled");
+                                      $(".invoice-title").unbind("click");
+                                  }
+                              }
+                          }else {
+                              applybill_status = r.data.invoice_status,
+                              product_name = r.data.product_type
+                              if (r.data.invoice_status == -1){
+                                  sys_err = -1
+                                  if (r.data.invoice_type == "单位"){
+                                      $('.company-cell').show()
+                                      $('.invoice-value').text("单位")
+                                      $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                      $(".company_name").attr("value",r.data.company_name)
+                                      $(".user-phone").attr("value",r.data.phone)
+                                      $(".user-mail").attr("value",r.data.mail)
+                                      invoice.phoneStatus = true;
+                                      invoice.emailStatus = true;
+                                      invoice.cnameStatus = true;
+                                      invoice.codeStatus = true;
+                                      $(".j-button-confirm").removeAttr("disabled")
 
-                                            }
-                                        }else{
-                                            if (r.data.invoice_type == "单位"){
-                                                $('.company-cell').show()
-                                                $('.invoice-value').text("单位")
-                                                $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                                $(".company_name").attr("value",r.data.company_name)
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-                                                $(".v-cell-input").attr("disabled", "disabled");
-                                                $(".invoice-title").unbind("click");
-                                                $(".j-footer").hide()
-                                            }else{
+                                  }else{
+                                      $('.invoice-value').text("个人")
+                                      $(".user-phone").attr("value",r.data.phone);
+                                      $(".user-mail").attr("value",r.data.mail);
+                                      invoice.phoneStatus = true;
+                                      invoice.emailStatus = true;
+                                      $("#commit").removeAttr("disabled")
+                                  }
+                              }else{
+                                  if (product_name == "历史数据"){
+                                      if (r.data.invoice_changed == 1){
+                                          if (r.data.invoice_type == "单位"){
+                                              $('.company-cell').show()
+                                              $('.invoice-value').text("单位")
+                                              $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                              $(".company_name").attr("value",r.data.company_name)
+                                              $(".user-phone").attr("value",r.data.phone)
+                                              $(".user-mail").attr("value",r.data.mail)
+                                              $(".v-cell-input").attr("disabled", "disabled");
+                                              $(".invoice-title").unbind("click");
+                                              $(".j-footer").hide()
+                                          }else{
+                                              $('.invoice-value').text("个人")
+                                              $(".user-phone").attr("value",r.data.phone)
+                                              $(".user-mail").attr("value",r.data.mail)
+                                              $(".v-cell-input").attr("disabled", "disabled");
+                                              $(".invoice-title").unbind("click");
+                                              $(".j-footer").hide()
+                                          }
+                                      }else{
+                                          if (c==1){
+                                              if (r.data.invoice_type == "单位"){
+                                                  /*$('.company-cell').show()
+                                                  $('.invoice-value').text("单位")
+                                                  $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                                  $(".company_name").attr("value",r.data.company_name)
+                                                  $(".user-phone").attr("value",r.data.phone)
+                                                  $(".user-mail").attr("value",r.data.mail)*/
+                                                  $('.invoice-value').text("个人")
+                                                  $(".user-phone").attr("value",r.data.phone)
+                                                  $(".user-mail").attr("value",r.data.mail)
+                                              }else{
+                                                  $('.invoice-value').text("个人")
+                                                  $(".user-phone").attr("value",r.data.phone)
+                                                  $(".user-mail").attr("value",r.data.mail)
 
-                                                $('.invoice-value').text("个人")
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-                                                $(".v-cell-input").attr("disabled", "disabled");
-                                                $(".invoice-title").unbind("click");
-                                                $(".j-footer").hide()
-                                            }
-                                        }
+                                              }
+                                          }else{
+                                              if (r.data.invoice_type == "单位"){
+                                                  $('.company-cell').show()
+                                                  $('.invoice-value').text("单位")
+                                                  $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                                  $(".company_name").attr("value",r.data.company_name)
+                                                  $(".user-phone").attr("value",r.data.phone)
+                                                  $(".user-mail").attr("value",r.data.mail)
+                                                  $(".v-cell-input").attr("disabled", "disabled");
+                                                  $(".invoice-title").unbind("click");
+                                                  $(".j-footer").hide()
+                                              }else{
 
-                                    }
-                                }else{
-                                    if (r.data.invoice_changed == 1){
-                                        if (r.data.invoice_type == "单位"){
-                                            $('.company-cell').show()
-                                            $('.invoice-value').text("单位")
-                                            $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                            $(".company_name").attr("value",r.data.company_name)
-                                            $(".user-phone").attr("value",r.data.phone)
-                                            $(".user-mail").attr("value",r.data.mail)
-                                            $(".v-cell-input").attr("disabled", "disabled");
-                                            $(".invoice-title").unbind("click");
-                                            $(".j-footer").hide()
-                                        }else{
-                                            $('.invoice-value').text("个人")
-                                            $(".user-phone").attr("value",r.data.phone)
-                                            $(".user-mail").attr("value",r.data.mail)
-                                            $(".v-cell-input").attr("disabled", "disabled");
-                                            $(".invoice-title").unbind("click");
-                                            $(".j-footer").hide()
-                                        }
-                                    }else{
-                                        if (c==1){
+                                                  $('.invoice-value').text("个人")
+                                                  $(".user-phone").attr("value",r.data.phone)
+                                                  $(".user-mail").attr("value",r.data.mail)
+                                                  $(".v-cell-input").attr("disabled", "disabled");
+                                                  $(".invoice-title").unbind("click");
+                                                  $(".j-footer").hide()
+                                              }
+                                          }
 
-                                            $('.company-cell').show()
-                                            $('.invoice-value').text("个人")
-                                            $('.company-cell').hide()
+                                      }
+                                  }else{
+                                      if (r.data.invoice_changed == 1){
+                                          if (r.data.invoice_type == "单位"){
+                                              $('.company-cell').show()
+                                              $('.invoice-value').text("单位")
+                                              $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                              $(".company_name").attr("value",r.data.company_name)
+                                              $(".user-phone").attr("value",r.data.phone)
+                                              $(".user-mail").attr("value",r.data.mail)
+                                              $(".v-cell-input").attr("disabled", "disabled");
+                                              $(".invoice-title").unbind("click");
+                                              $(".j-footer").hide()
+                                          }else{
+                                              $('.invoice-value').text("个人")
+                                              $(".user-phone").attr("value",r.data.phone)
+                                              $(".user-mail").attr("value",r.data.mail)
+                                              $(".v-cell-input").attr("disabled", "disabled");
+                                              $(".invoice-title").unbind("click");
+                                              $(".j-footer").hide()
+                                          }
+                                      }else{
+                                          if (c==1){
 
+                                              $('.company-cell').show()
+                                              $('.invoice-value').text("个人")
+                                              $('.company-cell').hide()
 
 
-                                        }else{
-                                            if (r.data.invoice_type == "单位"){
-                                                $('.company-cell').show()
-                                                $('.invoice-value').text("单位")
-                                                $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                                $(".company_name").attr("value",r.data.company_name)
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-                                                $(".v-cell-input").attr("disabled", "disabled");
-                                                $(".invoice-title").unbind("click");
-                                                $(".j-footer").hide()
-                                            }else{
-                                                $('.invoice-value').text("个人")
-                                                $(".user-phone").attr("value",r.data.phone)
-                                                $(".user-mail").attr("value",r.data.mail)
-                                                $(".v-cell-input").attr("disabled", "disabled");
-                                                $(".invoice-title").unbind("click");
-                                                $(".j-footer").hide()
-                                            }
-                                        }
 
-                                    }
+                                          }else{
+                                              if (r.data.invoice_type == "单位"){
+                                                  $('.company-cell').show()
+                                                  $('.invoice-value').text("单位")
+                                                  $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                                  $(".company_name").attr("value",r.data.company_name)
+                                                  $(".user-phone").attr("value",r.data.phone)
+                                                  $(".user-mail").attr("value",r.data.mail)
+                                                  $(".v-cell-input").attr("disabled", "disabled");
+                                                  $(".invoice-title").unbind("click");
+                                                  $(".j-footer").hide()
+                                              }else{
+                                                  $('.invoice-value').text("个人")
+                                                  $(".user-phone").attr("value",r.data.phone)
+                                                  $(".user-mail").attr("value",r.data.mail)
+                                                  $(".v-cell-input").attr("disabled", "disabled");
+                                                  $(".invoice-title").unbind("click");
+                                                  $(".j-footer").hide()
+                                              }
+                                          }
 
-                                }
-                                invoice.checkCName();
-                                invoice.checkCode();
-                            }
-
-                        }
-
-                    }
-                })
+                                      }
 
+                                  }
+                                  invoice.checkCName();
+                                  invoice.checkCode();
+                              }
+                          }
+                      }
+                  })
+                }
             })
         var invoice = {
             reg:{
@@ -338,7 +365,6 @@
                 this.checkCode();
                 this.checkInput();
                 this.submitHandle();
-                this.switchInvoice(); // 是否可以开发票
             },
             // 控制单位和个人填写
             isShowForm:function(){
@@ -596,31 +622,6 @@
                     $('#rules_dialog').hide()
                 })
             },
-            // 发票功能是否开启
-            switchInvoice: function() {
-              $.ajax({
-                  url: '/jypay/invoice/switch?t=' + Date.now(),
-                  type: "GET",
-                  success: function(res) {
-                    if (res.code === '1001') {
-                      $('.j-button-confirm').attr('disabled',true)
-                      return weui.alert(res.messge, {
-                          title: '温馨提醒',
-                          className: 'jy-alert',
-                          buttons: [{
-                            label: '我知道了',
-                            onClick: function(){ 
-                              history.back()
-                            }
-                          }]
-                      })
-                    }
-                  },
-                  fail: function(err) {
-                    console.log(err)
-                  }
-              })
-            },
             // 提交
             submitHandle:function(){
                 var that = this