From 405cb75140b9dae2302c9a70bb761265a5771000 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 28 Oct 2021 16:45:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/AddOrDetailMeet.vue            | 26 ++++++++++++++++---
 .../meetManage/meetingValidate.js             |  6 -----
 src/views/signUp/SignUpEntrance.vue           | 12 +++------
 src/views/signUp/SignUpPage.vue               | 18 +++++--------
 4 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 0c1bf4c..6c8789b 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -82,10 +82,9 @@
               <a-form-item label="报名截止时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-date placeholder="请选择报名截止时间" style="width: 100%;"
                         v-decorator="['registerDeadline',validatorRules.registerDeadline]" :trigger-change="true"
-                        date-format="YYYY-MM-DD HH:mm:ss" :show-time="true"/>
+                        date-format="YYYY-MM-DD HH:mm" :show-time="true"/>
               </a-form-item>
             </a-col>
-
           </a-row>
 
           <a-row>
@@ -271,7 +270,7 @@
                   <a-input
                     @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"
                     :maxLength="15"
-                    v-decorator="['hotelContactsList['+index+'].hotelContactsPhone',validatorRules.telephoneNumber]"
+                    v-decorator="['hotelContactsList['+index+'].hotelContactsPhone',validateInviteCode.telephoneNumber]"
                     placeholder="请输入联系人手机号"></a-input>
                 </a-form-item>
               </a-col>
@@ -346,7 +345,7 @@ import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import JImageUpload from '@comp/jero/JImageUpload'
 import {checkMeetingName} from '@/utils/validateOnly'
 import {addZero} from '@/utils/util'
-import {money} from '@/utils/validate'
+import {money,phoneReg} from '@/utils/validate'
 
 export default {
   name: 'AddOrDetailMeet',
@@ -425,6 +424,12 @@ export default {
           ],
           validateTrigger: ['blur']
         },
+        telephoneNumber:{
+          rules: [
+            { required: true, validator:this.validatePhone },
+          ],
+          validateTrigger:['blur']
+        }
       },
       url: {
         add: '/meeting/payMeeting/add',
@@ -843,6 +848,19 @@ export default {
         callback('请输入合法的金额数字，最多2位小数,10位正数')
       }
     },
+    /*
+    * 手机号码校验
+    * */
+    validatePhone(rule, value, callback){
+      if (value === undefined || value === '' || value === null) {
+        callback('请输入联系人手机号')
+      }
+      if (value && phoneReg(value)) {
+        callback()
+      } else {
+        callback('请输入正确的手机号')
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/incomePayments/meetManage/meetingValidate.js b/src/views/incomePayments/meetManage/meetingValidate.js
index 6675201..d8c00ce 100644
--- a/src/views/incomePayments/meetManage/meetingValidate.js
+++ b/src/views/incomePayments/meetManage/meetingValidate.js
@@ -82,11 +82,5 @@ export default {
       { required: true, message: '请输入酒店联系人' },
     ],
         validateTrigger:['blur']
-  },
-  telephoneNumber:{
-    rules: [
-      { required: true, message: '请输入联系人手机号' },
-    ],
-        validateTrigger:['blur']
   }
 }
diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue
index 4ddde5e..afd4f24 100644
--- a/src/views/signUp/SignUpEntrance.vue
+++ b/src/views/signUp/SignUpEntrance.vue
@@ -28,10 +28,10 @@
               <label>负责人：</label>
               <span>{{ currentMeetingInfo.directorName }} {{currentMeetingInfo.directorPhone}}</span>
             </a-col>
-            <a-col :span="12">
-              <label>预计参加人数：</label>
-              <span>{{ currentMeetingInfo.estimatedNumber }}</span>
-            </a-col>
+<!--            <a-col :span="12">-->
+<!--              <label>预计参加人数：</label>-->
+<!--              <span>{{ currentMeetingInfo.estimatedNumber }}</span>-->
+<!--            </a-col>-->
           </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
@@ -44,10 +44,6 @@
             </a-col>
           </a-row>
           <a-row :gutter="24">
-            <a-col :span="12">
-              <label>召开地点：</label>
-              <span>{{ holdAddress }}</span>
-            </a-col>
             <a-col :span="12">
               <label>备注：</label>
               <span>{{ currentMeetingInfo.remark }}</span>
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index b8b0e2f..04e58db 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -39,9 +39,13 @@
               <span>{{ currentMeetingInfo.directorName }}({{ currentMeetingInfo.directorPhone }})</span>
             </a-col>
             <a-col :span="12">
-              <label>预计参加人数：</label>
-              <span>{{ currentMeetingInfo.estimatedNumber }}</span>
+              <label>召开地点：</label>
+              <span>{{ holdAddress }}</span>
             </a-col>
+<!--            <a-col :span="12">-->
+<!--              <label>预计参加人数：</label>-->
+<!--              <span>{{ currentMeetingInfo.estimatedNumber }}</span>-->
+<!--            </a-col>-->
           </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
@@ -53,16 +57,6 @@
               <span>{{ currentMeetingInfo.meetingContent }}</span>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <label>召开地点：</label>
-              <span>{{ holdAddress }}</span>
-            </a-col>
-            <!--            <a-col :span="12">-->
-            <!--              <label>备注：</label>-->
-            <!--              <span>{{ currentMeetingInfo.remark }}</span>-->
-            <!--            </a-col>-->
-          </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
               <label>报名截止时间：</label>