Merge branch 'release/4.7' of http://git.yoho.cn/fe/yohobuypc into release/4.7

@@ -282,7 +282,7 @@
         <div class="section-play">
         <div class="section-play">
             <div class="section-head">发票信息</div>
             <div class="section-head">发票信息</div>
             <div class="play-pan">
             <div class="play-pan">
-                <input class="invoice mes" name="invoice" type="radio" id=""/>发票开具
+                <input class="invoice mes" name="invoice" type="radio" id="" autocomplete="off"/>发票开具
                 <div class="invoice-content hide">
                 <div class="invoice-content hide">
                     <div class="invoice-type mes">电子发票</div>
                     <div class="invoice-type mes">电子发票</div>
                     <div class="invoice-partment mes">个人</div>
                     <div class="invoice-partment mes">个人</div>
@@ -411,6 +411,7 @@
 
 
             <div class="receipt-container receipt-margin">
             <div class="receipt-container receipt-margin">
                 <div class="e-receipt-desc">
                 <div class="e-receipt-desc">
+                    <a href="{{invoiceUrl}}"></a>
                 </div>
                 </div>
 
 
                 <div class="invoice-list invoice-title invoice-title-personal-hight">
                 <div class="invoice-list invoice-title invoice-title-personal-hight">

@@ -15834,8 +15834,10 @@ function saveReceiptInfo() {
     } else {
     } else {
         $('.invoice-title .enpty-input').addClass('hide');
         $('.invoice-title .enpty-input').addClass('hide');
         $('.invoice-phone .enpty-input').addClass('hide');
         $('.invoice-phone .enpty-input').addClass('hide');
+        if (receiptTitle === "单位") {
             receiptTitle = $('#input-organization-name').val();
             receiptTitle = $('#input-organization-name').val();
         }
         }
+    }
 
 
     receiptContent = $('input[name="content"]:checked').val();
     receiptContent = $('input[name="content"]:checked').val();
     receiptTypeID = $('input[name="content"]:checked').data('receiptid');
     receiptTypeID = $('input[name="content"]:checked').data('receiptid');
@@ -15896,6 +15898,18 @@ $('.invoice-title').change(function(){
     }
     }
 })
 })
 
 
+$('#input-organization-name').bind('input propertychange', function() {
+    if ($(this).val().length >= 1) {
+        $('.invoice-title .enpty-input').addClass('hide');
+    }
+});
+
+$('#input-mobile').bind('input propertychange', function() {
+    if ($(this).val().length >= 1) {
+        $('.invoice-phone .enpty-input').addClass('hide');
+    }
+});
+
 });
 });
 define("js/order/address", ["jquery","handlebars","source-map"], function(require, exports, module){
 define("js/order/address", ["jquery","handlebars","source-map"], function(require, exports, module){
 /**
 /**

@@ -932,8 +932,10 @@ function saveReceiptInfo() {
     } else {
     } else {
         $('.invoice-title .enpty-input').addClass('hide');
         $('.invoice-title .enpty-input').addClass('hide');
         $('.invoice-phone .enpty-input').addClass('hide');
         $('.invoice-phone .enpty-input').addClass('hide');
+        if (receiptTitle === "单位") {
             receiptTitle = $('#input-organization-name').val();
             receiptTitle = $('#input-organization-name').val();
         }
         }
+    }
 
 
     receiptContent = $('input[name="content"]:checked').val();
     receiptContent = $('input[name="content"]:checked').val();
     receiptTypeID = $('input[name="content"]:checked').data('receiptid');
     receiptTypeID = $('input[name="content"]:checked').data('receiptid');
@@ -993,3 +995,15 @@ $('.invoice-title').change(function(){
         $('.invoice-title .input-line').removeClass('hide');
         $('.invoice-title .input-line').removeClass('hide');
     }
     }
 })
 })
+
+$('#input-organization-name').bind('input propertychange', function() {
+    if ($(this).val().length >= 1) {
+        $('.invoice-title .enpty-input').addClass('hide');
+    }
+});
+
+$('#input-mobile').bind('input propertychange', function() {
+    if ($(this).val().length >= 1) {
+        $('.invoice-phone .enpty-input').addClass('hide');
+    }
+});

@@ -660,9 +660,18 @@
         }
         }
         
         
         .e-receipt-desc {
         .e-receipt-desc {
+            position: relative;
             background: url(/order/invoice-desc.png);
             background: url(/order/invoice-desc.png);
             width: 100%;
             width: 100%;
             height: 108px;
             height: 108px;
+
+            a {
+                position: absolute;
+                left: 0;
+                bottom: 0;
+                width: 150px;
+                height: 40px;
+            }
         }
         }
         .receipt-margin {
         .receipt-margin {
             margin-left: 55px;
             margin-left: 55px;