Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/option/business/shipping-template.js
#	src/option/business/transport-plan.js
#	src/option/business/waybill-manage.js
#	src/views/business/components/business-crud-page.vue
#	src/views/business/components/master-order-detail.vue
#	src/views/business/components/master-order-editor.vue
#	src/views/business/components/waybill-import-dialog.vue

src/views/base/common-address.vue

@@ -267,6 +267,7 @@ import { createOption } from '@/option/base/common-address';
 import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { getToken } from '@/utils/auth';
+import { isMobile } from '@/utils/validate';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
@@ -830,12 +831,8 @@ export default {
         this.$message.warning('联系人不能超过50个字');
         return false;
       }
-      if (row.contactPhone && row.contactPhone.length > 20) {
-        this.$message.warning('联系方式不能超过20个字');
-        return false;
-      }
-      if (row.contactPhone && !/^\d+$/.test(row.contactPhone)) {
-        this.$message.warning('联系方式只能输入数字');
+      if (row.contactPhone && !isMobile(row.contactPhone)) {
+        this.$message.warning('联系方式格式不正确');
         return false;
       }
       if (row.remark && row.remark.length > 200) {