Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -25,7 +25,7 @@ const index = (req, res, next) => {
 
     addressModel.getAddressDataAsync(uid, 20).then(result => {
         let resultData = result.data ? result.data : result;
-        let length = resultData.length ? resultData.length : 0;
+        let length = resultData.length ? (resultData.length > 7 ? 7 : resultData.length) : 0;
         let reg = /(\d{3})\d{4}(\d{4})/;
 
         for (let i = 0; i < length; i++) {

@@ -25,7 +25,7 @@ require('yoho-jquery-placeholder');
 
 $('[placeholder]').placeholder();
 
-$(function() {
+$(function () {
     var address = cascadingAddress({el: '#address'});
 
     /**
@@ -33,7 +33,7 @@ $(function() {
      */
     var Bll = {
         // 获取输入框输入的值
-        getInfo: function() {
+        getInfo: function () {
 
             return {
                 id: $addressId.val(),
@@ -45,7 +45,7 @@ $(function() {
         },
 
         // 清空输入框
-        clearInput: function() {
+        clearInput: function () {
             $consignee.val('');
             $address.val('');
             $mobile.val('');
@@ -54,7 +54,7 @@ $(function() {
         },
 
         // 校验
-        check: function(info) {
+        check: function (info) {
             var flag = true;
 
             info.consignee === '' ? $consignee.next().show() : $consignee.next().hide();
@@ -72,7 +72,7 @@ $(function() {
         },
 
         // 拼接一条数据的html
-        getHtml: function(info) {
+        getHtml: function (info) {
             var html = '<tr class="table-body">';
 
             html += '<input type="hidden" id="tr_' + info.address_id + '" value="' + info.address_id + '">' +
@@ -90,7 +90,7 @@ $(function() {
         },
 
         // 获取一条数据
-        setInfo: function(id, td) {
+        setInfo: function (id, td) {
             $addressId.val(id);
             $consignee.val(td.eq(0).text());
             $address.val(td.eq(2).text());
@@ -99,7 +99,7 @@ $(function() {
         },
 
         // 设置表格头部
-        setTableTile: function() {
+        setTableTile: function () {
             $('.table-title').text('已保存了' + currentLength +
                 '条地址，还能保存' + leftLength + '条地址');
         }
@@ -107,7 +107,7 @@ $(function() {
 
 
     // 保存收货地址
-    $(document).on('click', '#save-address', function() {
+    $(document).on('click', '#save-address', function () {
         var info,
             area,
             areaInfo;
@@ -125,36 +125,36 @@ $(function() {
                 if (currentLength >= 7) {
                     new _alert('您最多添加7个收货地址，可删除不需要的地址后再添加新地址！').show();
                     Bll.clearInput();
-                }
-
-                $.ajax({
-                    type: 'POST',
-                    url: '/me/address/add',
-                    dataType: 'json',
-                    data: info,
-                    success: function(data) {
-                        var html;
-
-                        if (data.code === 200) {
-                            html = Bll.getHtml(data.data);
-
-                            currentLength++;
-                            leftLength--;
-                            $('tbody').append(html);
-                            Bll.setTableTile();
-                            Bll.clearInput();
-                        } else {
-                            new _alert(data.message).show();
+                } else {
+                    $.ajax({
+                        type: 'POST',
+                        url: '/me/address/add',
+                        dataType: 'json',
+                        data: info,
+                        success: function (data) {
+                            var html;
+
+                            if (data.code === 200) {
+                                html = Bll.getHtml(data.data);
+
+                                currentLength++;
+                                leftLength--;
+                                $('tbody').append(html);
+                                Bll.setTableTile();
+                                Bll.clearInput();
+                            } else {
+                                new _alert(data.message).show();
+                            }
                         }
-                    }
-                });
+                    });
+                }
             } else { // 修改
                 $.ajax({
                     type: 'POST',
                     url: '/me/address/update',
                     dataType: 'json',
                     data: info,
-                    success: function(data) {
+                    success: function (data) {
                         if (data.code === 200) {
                             info.mobile = info.mobile.substring(0, 3) + '****' + info.mobile.substring(7, 11);
                             info.address_id = info.id;
@@ -171,7 +171,7 @@ $(function() {
     });
 
     // 修改收货地址
-    $(document).on('click', '.update-address', function() {
+    $(document).on('click', '.update-address', function () {
         var id = $(this).data('id');
         var tr = $(this).parents('.table-body');
         var td = tr.find('td');
@@ -185,13 +185,13 @@ $(function() {
     });
 
     // 删除收货地址
-    $(document).on('click', '.del-address', function() {
+    $(document).on('click', '.del-address', function () {
         var id = $(this).data('id');
         var tr = $(this).parents('.table-body');
 
         var a = new _confirm({
             content: '您确定要删除收货地址吗？',
-            cb: function() {
+            cb: function () {
                 $.ajax({
                     type: 'POST',
                     url: '/me/address/del',
@@ -199,7 +199,7 @@ $(function() {
                     data: {
                         id: id
                     },
-                    success: function() {
+                    success: function () {
                         currentLength--;
                         leftLength++;
                         tr.remove();
@@ -214,7 +214,7 @@ $(function() {
     });
 
     // 设置默认收货地址
-    $(document).on('click', '.set-default', function() {
+    $(document).on('click', '.set-default', function () {
         var tr = $(this).parents('.table-body');
         var tbody = tr.parent();
         var id = $(this).data('id');
@@ -227,7 +227,7 @@ $(function() {
             data: {
                 id: id
             },
-            success: function() {
+            success: function () {
                 $('.current-default').removeClass('current-default').text('设为默认');
                 $(self).addClass('current-default').text('默认地址');
                 tbody.find('.table-body').eq(0).before('<tr class=\'table-body\'>' + tr.html() + '</tr>');

@@ -139,7 +139,7 @@ $('.coin-ctrl, .remark-ctrl').click(function() {
 });
 
 // 使用有货币输入框联动
-$coin.on('input', function() {
+$coin.on('propertychange input', function() {
     var c = $.trim($coin.val());
     var err = true;
 

@@ -13,6 +13,8 @@ var $invoiceContent = $('#invoice-content');
 
 var $invoiceTitleInput;
 
+require('yoho-jquery-placeholder');
+
 // 发票信息验证
 function validateInvoice($el) {
     var pass = true;
@@ -137,6 +139,9 @@ function showInvoiceDialog() {
         }
     });
 
+    // placeholder for title
+    $('.invoice-title-input').placeholder();
+
     dialog.show();
 }