Merge branch 'dev_partymember_sync' into dev

# Conflicts:
#	src/views/components/editResi.vue

src/views/components/editResi.vue

@@ -308,7 +308,7 @@
 </template>
 
 <script>
-import { isCard, isMobile } from '@/utils/validate'
+import { isCard, isMobile, isPhone } from '@/utils/validate'
 import { requestPost } from "@/js/dai/request";
 
 export default {
@@ -373,7 +373,7 @@ export default {
       if (value === '') {
         callback(new Error('请输入手机号'))
       } else {
-        if (!isMobile(value)) {
+        if (!isMobile(value) && !isPhone(value)) {
           callback(new Error('手机号格式不正确'))
         }
         callback()

src/views/components/resiForm.vue

@@ -258,7 +258,7 @@
 </template>
 
 <script>
-import { isCard, isPassport, isMobile } from '@/utils/validate'
+import { isCard, isPassport, isMobile, isPhone } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
 
 export default {
@@ -305,7 +305,7 @@ export default {
       if (value === '') {
         callback(new Error('请输入手机号'))
       } else {
-        if (!isMobile(value)) {
+        if (!isMobile(value) && !isPhone(value)) {
           callback(new Error('手机号格式不正确'))
         }
         callback()

src/views/modules/communityParty/members/crateForm.vue

@@ -238,7 +238,7 @@
 </template>
 
 <script>
-import { isCard, isMobile } from '@/utils/validate'
+import { isCard, isMobile, isPhone } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
 
 import pointsInfo from './cpts/points.vue'
@@ -268,7 +268,7 @@ export default {
       if (value === '') {
         callback(new Error('请输入手机号'))
       } else {
-        if (!isMobile(value)) {
+        if (!isMobile(value) && !isPhone(value)) {
           callback(new Error('手机号格式不正确'))
         }
         callback()