From 8e805ddd70e14b9d5672041342d75648aef3f443 Mon Sep 17 00:00:00 2001
From: rose <1942951600@qq.com>
Date: Wed, 19 May 2021 17:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E5=8F=96=E6=B6=88=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                    | 12 ++++++------
 src/components/EntityApply/EntityApplyAdd.vue  |  4 +---
 src/components/EntityApply/EntityApplyEdit.vue |  2 --
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7f8ff7b..cd168e2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
 <template>
   <a-config-provider :locale="zh_CN">
     <div class="d-flex flex-row flex-nowrap" id="app">
-      <!-- <btn-con /> -->
+      <btn-con />
       <router-view class="flex-1 bg pa-3"></router-view>
     </div>
   </a-config-provider>
@@ -17,11 +17,11 @@
 <script>
 import { mapState, mapActions, mapMutations } from 'vuex';
 import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN';
-// import BtnCon from 'components/BtnCom/BtnCon.vue';
+import BtnCon from 'components/BtnCom/BtnCon.vue';
 
 export default {
   name: 'App',
-  // components: { BtnCon },
+  components: { BtnCon },
   data() {
     return { zh_CN };
   },
@@ -40,9 +40,9 @@ export default {
 
   created() {
     // // 测试数据
-    // const userId = '1218763410024566784';
-    // const params = { userId };
-    // this.getUserId(params);
+    const userId = '1218763410024566784';
+    const params = { userId };
+    this.getUserId(params);
 
     const that = this;
     window.plugin = window.TallPlugin.init();
diff --git a/src/components/EntityApply/EntityApplyAdd.vue b/src/components/EntityApply/EntityApplyAdd.vue
index 42a31ff..52cf2d4 100644
--- a/src/components/EntityApply/EntityApplyAdd.vue
+++ b/src/components/EntityApply/EntityApplyAdd.vue
@@ -334,9 +334,7 @@ export default {
           this.$message.error('请输入职务');
         } else if (this.platform.isTel === false) {
           this.$message.error('请输入联系电话');
-        } else if (this.platform.idCard === '') {
-          this.$message.error('请输入身份证号');
-        } else {
+        }  else {
           for (var i = 0; i < this.fileList.length; i++) {
             this.filesUpload = this.filesUpload.concat(this.fileList[i].response.data[0].id);
           }
diff --git a/src/components/EntityApply/EntityApplyEdit.vue b/src/components/EntityApply/EntityApplyEdit.vue
index 2eb8c28..73edd5a 100644
--- a/src/components/EntityApply/EntityApplyEdit.vue
+++ b/src/components/EntityApply/EntityApplyEdit.vue
@@ -303,8 +303,6 @@ export default {
           this.$message.error('请输入联系电话');
         } else if(this.platform.gender === undefined){
           this.$message.error('请输入申请人性别');
-        } else if (this.platform.idCard === '') {
-          this.$message.error('请输入身份证号');
         } else {
           for (var i = 0; i < this.fileList.length; i++) {
             console.log(this.fileList[i].response.data[0].id)