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

+Stack trace:
+Frame        Function    Args
+0000022A1F8  0018007208E (0018026056D, 00180215E46, 0000022A1F8, 000002290F0)
+0000022A1F8  00180046DF2 (0000022A158, 00000000000, 00000000000, 001005E6E6C)
+0000022A1F8  00180046E32 (00180260629, 0000022A0A8, 0000022A1F8, 00000000000)
+0000022A1F8  001800BDE7F (00000000000, 00000000000, 00000000000, 00000000000)
+0000022A1F8  001800BE09F (0000022A220, 00000000000, 00000000000, 00000000000)
+0000022A2A0  001800BF35A (0000022A220, 00000000000, 00000000000, 00000000000)
+End of stack trace

@@ -14838,16 +14838,23 @@ define("js/order/ensure", ["jquery","handlebars","source-map"], function(require
  * @time: 2015/12/21
  */
 
-var $ = require("jquery");
+var $ = require("jquery"),
+    $invoiceCheck = $('.invoice'),
+    $receiptInfo = $('.receipt-info'),
+    $receiptInfoSaveBtn = $('.receipt-info .save-receipt'),
+    $receiptInfoCancelBtn = $('.receipt-info .cancel-receipt'),
+    $eReceiptBtn = $('.receipt-type .e-receipt'),
+    $paperReceiptBtn = $('.receipt-type .paper-receipt');
 
-var address = require("js/order/address");
+var address = require("js/order/address"),
+    receiptTitle = "个人";
 
 var dialog = require("js/common/dialog");
 
 var accMul = function(arg1, arg2) {
     var m = 0,
- s1 = arg1.toString(),
- s2 = arg2.toString();
+    s1 = arg1.toString(),
+    s2 = arg2.toString();
 
     try {
         m += s1.split('.')[1].length;
@@ -15688,6 +15695,126 @@ $('.bag').find('ul').each(function() {
     }
 });
 
+$invoiceCheck.click(function(){
+
+    if ($invoiceCheck.hasClass('active')) {
+        $invoiceCheck.removeAttr('checked');
+        $invoiceCheck.removeClass('active');
+    } 
+
+    if ($invoiceCheck.attr('checked')) {
+        $invoiceCheck.addClass('active');
+        if ($('.invoice-content').hasClass('hide')) {
+            $receiptInfo.removeClass('hide');
+        }
+    }
+});
+
+//电子发票
+function saveReceiptInfo() {
+    var passInfoVerify = true,
+        receiptType,
+        receiptContent,
+        receiptMobile,
+        verifymobile,
+        invoiceType,
+        receiptTypeID,
+        invoiceTypeInt;
+
+    invoiceType = '个人';
+    
+    if ($eReceiptBtn.hasClass('receipt-type-selected')) {
+        receiptType = "电子发票";
+        invoiceTypeInt = '2';
+    } else {
+        receiptType = "纸质发票";
+        invoiceTypeInt = '1';
+    }
+
+    if (receiptTitle !== "个人") {  
+        invoiceType = '单位';
+        $('.input-line').each(function(){
+            if ($(this).find('input').val() === '') {
+                $(this).find('.enpty-input').removeClass('hide');
+                passInfoVerify = false;
+            };
+        })
+        receiptMobile = $('#input-mobile').val();
+        verifymobile = /[*0-9]{11}/;
+        if (!verifymobile.test(receiptMobile)) {
+            $('.invoice-phone .enpty-input').removeClass('hide');
+            passInfoVerify = false;
+        };
+        if (!passInfoVerify) {
+            return;
+        } else {
+            $('.invoice-title .enpty-input').addClass('hide');
+            $('.invoice-phone .enpty-input').addClass('hide');
+            receiptTitle = $('#input-organization-name').val();
+        }
+    }
+
+    receiptContent = $('input[name="content"]:checked').val();
+    receiptTypeID = $('input[name="content"]:checked').data('receiptid');
+    
+    $('.invoice-type').html(receiptType);
+    $('.invoice-partment').html(invoiceType);
+    $('.invoice-kind').html(receiptContent);
+
+    $('.invoice-upload-type').html(invoiceTypeInt);
+    $('.invoice-upload-content').html(receiptTypeID);
+    $('.invoice-upload-mobile').html(receiptMobile);
+    $('.invoice-upload-title').html(receiptTitle);
+
+    $receiptInfo.addClass('hide');
+    $('.invoice-content').removeClass('hide');
+}
+$receiptInfoSaveBtn.click(function(){
+    saveReceiptInfo();
+});
+
+$receiptInfoCancelBtn.click(function(){
+    $receiptInfo.addClass('hide');
+    
+    if ($('.invoice-content').hasClass('hide')) {
+        $invoiceCheck.removeAttr('checked');
+        $invoiceCheck.removeClass('active');
+    } else {
+
+    }
+});
+
+$('.revise').click(function(){
+    $receiptInfo.removeClass('hide');
+});
+
+$eReceiptBtn.click(function(){
+    $eReceiptBtn.addClass('receipt-type-selected');
+    $paperReceiptBtn.removeClass('receipt-type-selected');
+    $('.e-receipt-desc').removeClass('hide');
+});
+
+$paperReceiptBtn.click(function(){
+    $paperReceiptBtn.addClass('receipt-type-selected');
+    $eReceiptBtn.removeClass('receipt-type-selected');
+    $('.e-receipt-desc').addClass('hide');
+});
+
+$('.invoice-title').change(function(){
+    var selectType = $('input[name="title"]:checked').val();
+    if (selectType === "1") {
+        receiptTitle = "个人";
+        $('.invoice-title').addClass('invoice-title-personal-hight');
+        $('.invoice-title .input-line').addClass('hide');
+        $('.invoice-phone').addClass('hide');
+    } else {
+        receiptTitle = "单位";
+        $('.invoice-title').removeClass('invoice-title-personal-hight');
+        $('.invoice-title .input-line').removeClass('hide');
+        $('.invoice-phone').removeClass('hide');
+    }
+})
+
 });
 define("js/order/address", ["jquery","handlebars","source-map"], function(require, exports, module){
 /**
@@ -15718,7 +15845,8 @@ var $addressManage = $('.address-manage'),
     $useNewAddress = $('.use-new-address'),
     $existAddressList = $('.exist-address-list'),
     $loading = $('.loading'),
-    $orderEditMain = $('#order-edit-main');
+    $orderEditMain = $('#order-edit-main'),
+    $invoiceCheck = $('.invoice');
 
 var cartType = $addressManage.attr('cart-type');
 
@@ -16453,8 +16581,10 @@ $('.to-play input.submit').click(function() {
     var addressId = $('.exist-address-list input[name="address"]:checked').closest('li').attr('data-id'),
         deliveryTimeId = $('.pay-time-modify input[name="pay-time-radio"]:checked').val(),
         deliveryWayId = $('.select-express input[name="carriagegroup"]:checked').val(),
-        invoiceTitle = $('#piaodesc').val(),
-        invoiceId = $('#piaotype').val(),
+        invoiceType,
+        invoiceContent,
+        receiverMobile,
+        invoiceTitle,
         paymentType = $('.pay-time-modify input[name="pay-type"]:checked').val(),
         paymentId = $('.pay-time-modify input[name="pay-type"]:checked').data('pay'),
         remark = $('#notedesc').val(),
@@ -16466,6 +16596,13 @@ $('.to-play input.submit').click(function() {
         codeVal = $juangroupInput.val(),
         juanCode = !!codeVal ? codeVal : $juangroupInput.closest('li').find('#juancode').val();
 
+    if ($invoiceCheck.hasClass('active')) {
+        invoiceType = $('.invoice-upload-type').html();
+        invoiceContent = $('.invoice-upload-content').html();
+        receiverMobile = $('.invoice-upload-mobile').html();
+        invoiceTitle = $('.invoice-upload-title').html();
+    }
+
     $loading.show();
 
     if (!!$this.attr('disabled')) {
@@ -16483,8 +16620,10 @@ $('.to-play input.submit').click(function() {
             cartType: cartType,
             deliveryTimeId: deliveryTimeId,
             deliveryWayId: deliveryWayId,
+            invoiceType: invoiceType,
+            invoiceContent: invoiceContent,
+            receiverMobile: receiverMobile,
             invoiceTitle: invoiceTitle,
-            invoiceId: invoiceId,
             paymentId: paymentId,
             paymentType: paymentType,
             remark: remark,