gulp ge

@@ -13630,17 +13630,17 @@ var $invoice = $('.invoice'),
 
 
 var orderCont = window.cookie('order-info') && JSON.parse(window.cookie('order-info'));
 var orderCont = window.cookie('order-info') && JSON.parse(window.cookie('order-info'));
 var invoiceCont = {
 var invoiceCont = {
-        1: '服装',
-        2: '图书',
-        3: '配件',
-        4: '日用品',
-        5: '办公用品',
+        7: '服装',
+        1: '图书',
+        9: '配件',
+        11: '日用品',
+        3: '办公用品',
         6: '体育用品',
         6: '体育用品',
-        7: '数码产品'
+        10: '数码产品'
     },
     },
     invoicesType = {
     invoicesType = {
         1: '纸质',
         1: '纸质',
-        2: '电子',
+        2: '电子'
     };
     };
 
 
 require("js/common");
 require("js/common");
@@ -13728,7 +13728,7 @@ $invoice.on('touchend', '.checkbox', function() {
     if ($this.hasClass('icon-cb-radio')) {
     if ($this.hasClass('icon-cb-radio')) {
         $invoice.addClass('focus');
         $invoice.addClass('focus');
         orderInfo('invoiceText', '');
         orderInfo('invoiceText', '');
-        orderInfo('invoiceType', '1');
+        orderInfo('invoiceType', '7');
         orderInfo('receiverMobile', $('.user-mobile').val());
         orderInfo('receiverMobile', $('.user-mobile').val());
         orderInfo('invoicesType', '2');
         orderInfo('invoicesType', '2');
         orderInfo('invoiceTitle', '个人');
         orderInfo('invoiceTitle', '个人');
@@ -14091,21 +14091,6 @@ var $invoiceNotice = $('.invoice-notice'),
 var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/,
 var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/,
     linkUrl = '/cart/index/orderEnsure?cartType=ordinary';
     linkUrl = '/cart/index/orderEnsure?cartType=ordinary';
 
 
-// var orderCont = window.cookie('order-info') && JSON.parse(window.cookie('order-info'));
-// var invoiceCont = {
-//         1: '服装',
-//         2: '图书',
-//         3: '配件',
-//         4: '日用品',
-//         5: '办公用品',
-//         6: '体育用品',
-//         7: '数码产品'
-//     },
-//     invoicesType = {
-//         1: '电子',
-//         2: '纸质'
-//     };
-
 require("js/common");
 require("js/common");
 
 
 if (window.getUid() !== orderInfo('uid')) {
 if (window.getUid() !== orderInfo('uid')) {
@@ -14126,30 +14111,6 @@ function chooseAction(pDom, dom) {
     }
     }
 }
 }
 
 
-// 初始化页面数据
-// function initData() {
-//     if (orderCont.invoicesType !== null) {
-//         $invoiceType.find('span').each(function() {
-//             if (parseInt($(this).data('id')) === orderCont.invoicesType) {
-//                 $(this).addClass('on');
-//             } else {
-//                 $(this).removeClass('on');
-//             }
-//         });
-//     }
-
-//     if (orderCont.invoiceType !== null) {
-//         chooseAction($invoiceCont, $invoiceCont.find('span').eq(orderCont.invoiceType-1))
-//         // $invoiceCont.find('span').each(function() {
-//         //     if (parseInt($(this).data('id')) === orderCont.invoiceType) {
-//         //         $(this).addClass('on');
-//         //     } else {
-//         //         $(this).removeClass('on');
-//         //     }
-//         // });
-//     }
-// }
-
 // 确认表单事件
 // 确认表单事件
 function confirmAction() {
 function confirmAction() {
     var type = $invoiceType.find('.on').data('id'),
     var type = $invoiceType.find('.on').data('id'),
@@ -14167,6 +14128,10 @@ function confirmAction() {
             tip.show('请填写发票抬头');
             tip.show('请填写发票抬头');
             $company.focus();
             $company.focus();
             return false;
             return false;
+        } else if (title === '单位' && company.length > 30) {
+            tip.show('发票抬头不得超过30个汉字');
+            $company.focus();
+            return false;
         } else {
         } else {
             dialog.showDialog({
             dialog.showDialog({
                 dialogText: '确认保存修改内容？',
                 dialogText: '确认保存修改内容？',