Merge branch 'feature/invoice' into feature/buynow

@@ -175,7 +175,10 @@ exports.orderSub = (uid, addressId, cartType, deliveryTime,
         params.is_continue_buy = 'N';
         params.is_continue_buy = 'N';
     }
     }
 
 
-    params.invoice_content = 12; // 发票内容写死明细
+    // 发票内容写死明细
+    if (invoices.invoices_type_id) {
+        params.invoice_content = 12;
+    }
 
 
     // 发票类型 纸质 1 ，电子 2
     // 发票类型 纸质 1 ，电子 2
     if (invoices.invoices_type) {
     if (invoices.invoices_type) {

@@ -21,7 +21,7 @@
         </li>
         </li>
         <li class="company-area">
         <li class="company-area">
             <span class="title">发票抬头</span>
             <span class="title">发票抬头</span>
-            <input type="text" name="company" class="company" value="{{companyName}}" placeholder="填写发票抬头" maxlength="30"></li>
+            <input type="text" name="company" class="company" value="个人（不可修改）" placeholder="请输入单位名称" maxlength="30" disabled></li>
         <li class="tax-number" {{#isCompany}}style="display: none;"{{/isCompany}}>
         <li class="tax-number" {{#isCompany}}style="display: none;"{{/isCompany}}>
             <span class="title">税号</span>
             <span class="title">税号</span>
             <input type="text" id="buyerTaxNumber" name="buyerTaxNumber" class="number" value="{{taxNumber}}" placeholder="请输入正确的纳税人识别号" maxlength="30">
             <input type="text" id="buyerTaxNumber" name="buyerTaxNumber" class="number" value="{{taxNumber}}" placeholder="请输入正确的纳税人识别号" maxlength="30">
@@ -38,7 +38,7 @@
         </li>
         </li>
     </section>
     </section>
 
 
-    <div class="btn-area"><span class="confirm-btn">确认</span></div>
+    <div class="btn-area"><span class="confirm-btn active">确认</span></div>
 
 
     <div class="invoice-notice">
     <div class="invoice-notice">
         <div class="mask-bg"></div>
         <div class="mask-bg"></div>

@@ -51,7 +51,7 @@ function switchBtnStatus() {
             $confirmBtn.removeClass('active');
             $confirmBtn.removeClass('active');
         }
         }
     } else {
     } else {
-        if ($company.val() && $tel.attr('data-tel')) {
+        if ($tel.attr('data-tel')) {
             $confirmBtn.addClass('active');
             $confirmBtn.addClass('active');
         } else {
         } else {
             $confirmBtn.removeClass('active');
             $confirmBtn.removeClass('active');
@@ -153,10 +153,14 @@ $('.invoice-top span, .invoice-cont li').not('.invoice-cont .cont-title').on('to
     chooseAction($(this).parent(), $(this).find('.choose'));
     chooseAction($(this).parent(), $(this).find('.choose'));
 
 
     if ($(this).text() === '单位') {
     if ($(this).text() === '单位') {
+        $company.val('');
+        $company.removeAttr('disabled');
         $taxNumber.slideDown();
         $taxNumber.slideDown();
     }
     }
 
 
     if ($(this).text() === '个人') {
     if ($(this).text() === '个人') {
+        $company.val('个人（不可修改）');
+        $company.attr('disabled', 'true');
         $taxNumber.slideUp();
         $taxNumber.slideUp();
     }
     }
     switchBtnStatus();
     switchBtnStatus();