diff --git a/debug.log b/debug.log
new file mode 100644
index 0000000..81a0025
--- /dev/null
+++ b/debug.log
@@ -0,0 +1,2 @@
+[0517/095630.764:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0517/145027.865:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
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 931a5c0..42a31ff 100644
--- a/src/components/EntityApply/EntityApplyAdd.vue
+++ b/src/components/EntityApply/EntityApplyAdd.vue
@@ -101,31 +101,22 @@
           <a-input placeholder="璇疯緭鍏ョ敵璇蜂汉鑱屽姟..." v-model.trim="platform.position" />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鑱旂郴鐢佃瘽" required>
-          <a-input @change="changePhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�.." type="tel" v-decorator="['tel', { rules: phoneRules }]" />
+          <a-input 
+            @change="changePhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�.." type="tel" 
+            v-decorator="['tel', { rules: phoneRules,initialValue: platform.tel }]"
+          />
         </a-form-item>
-        <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鍥剧墖楠岃瘉鐮�" required>
-          <div class="d-flex flex-nowrap">
-            <a-input placeholder="鍥剧墖楠岃瘉鐮�" type="number" v-model="codeNum" />
-            <img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
-            <a-button @click="changePicCode" class="code_img ml-2" size="small" v-else>鑾峰彇楠岃瘉鐮�</a-button>
-          </div>
-        </a-form-item> -->
-        <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鐭俊楠岃瘉鐮�" required>
-          <div class="d-flex flex-nowrap">
-            <a-input placeholder="璇疯緭鍏ラ獙璇佺爜" type="number" v-model="platform.code" />
-            <a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">閲嶆柊鍙戦�� {{ interval }}</a-button>
-            <a-button :disabled="platform.isTel === false" @click="getCode" class="code_img ml-2" type="primary" v-else
-              >鑾峰彇楠岃瘉鐮�</a-button
-            >
-          </div>
-        </a-form-item> -->
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鐢靛瓙閭">
           <!-- 鐢靛瓙閭 -->
-          <a-input @change="changeEamil" placeholder="璇疯緭鍏ョ數瀛愰偖绠�..." type="email" v-decorator="['email', { rules: emailRules }]" />
+          <a-input @change="changeEamil" placeholder="璇疯緭鍏ョ數瀛愰偖绠�..." type="email" 
+          v-decorator="['email', { rules: emailRules,initialValue: platform.email }]"
+          />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="韬唤璇佸彿">
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="韬唤璇佸彿" required>
           <!-- 韬唤璇佸彿 -->
-          <a-input @change="changeIdCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�..." v-decorator="['idCard']" />
+          <a-input @change="changeIdCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�..." 
+            v-decorator="['idCard', { rules: idCardRules,initialValue: platform.idCard }]"
+          />
         </a-form-item>
       </a-form>
       <a-steps :current="current">
@@ -219,17 +210,18 @@ export default {
           message: '璇疯緭鍏ユ纭殑閭鏍煎紡',
         },
       ],
-      // idCardRules: [
-      //   {
-      //     required: true,
-      //     pattern: new RegExp(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/),
-      //     whitespace: true,
-      //     message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
-      //   },
-      // ],
+      idCardRules: [
+        {
+          required: true,
+          pattern: new RegExp(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/),
+          whitespace: true,
+          message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
+        },
+      ],
       codeNum: '',
       showInterval: false,
       codeTimer: null,
+      filesUpload: [],
       interval: 120, // 楠岃瘉鐮佹湁鏁堟椂闂村�掕鏃�
     };
   },
@@ -342,9 +334,11 @@ export default {
           this.$message.error('璇疯緭鍏ヨ亴鍔�');
         } else if (this.platform.isTel === false) {
           this.$message.error('璇疯緭鍏ヨ仈绯荤數璇�');
+        } else if (this.platform.idCard === '') {
+          this.$message.error('璇疯緭鍏ヨ韩浠借瘉鍙�');
         } else {
           for (var i = 0; i < this.fileList.length; i++) {
-            this.platform.files = this.platform.files.concat(this.fileList[i].response.data[0].id);
+            this.filesUpload = this.filesUpload.concat(this.fileList[i].response.data[0].id);
           }
           this.addSettled();
         }
@@ -360,7 +354,7 @@ export default {
             company: this.platform.company,
             electricDesign: this.platform.electricDesign,
             email: this.platform.email,
-            fileList: this.platform.files,
+            fileList: this.filesUpload,
             friendCompany: this.platform.friendCompany,
             gender: this.platform.sex,
             idCard: this.platform.idCard,
@@ -372,7 +366,7 @@ export default {
             patentGrented: this.platform.patentGrented,
             patentInvent: this.platform.patentInvent,
             phone: this.platform.tel,
-            placeType: this.placeType, //     store閲岄潰鐨� 0:绾夸笂锛�1:涓撲笟锛�2锛氶珮鏂颁紬鍒�
+            placeType: this.placeType, //     store閲岄潰鐨� 0:铏氭嫙锛�1:瀹炰綋
             plantKind: this.platform.plantKind,
             position: this.platform.position,
             productTech: this.platform.productTech,
@@ -388,7 +382,6 @@ export default {
         // console.log(res);
         const { code, msg, data } = res.data;
         if (code === 200) {
-          this.$message.success('鐢宠鎴愬姛');
           this.visible = false;
           this.confirmLoading = false;
           for (let key in this.platform) {
@@ -396,7 +389,20 @@ export default {
           }
           this.platform.isTel = false;
           this.platform.isEmail = false;
-          this.platform.isIdCard = false;
+          this.platform.isIdCard =false;
+          this.platform.buildTime= 0 // 鎴愮珛鏃堕棿锛堟椂闂存埑锛�       
+          this.platform.registerMoney= 0 // 娉ㄥ唽璧勯噾
+          this.platform.staffCount= 0 // 鍛樺伐浜烘暟
+          this.platform.resarchStaff= 0 // 鐮斿彂浜烘暟
+          this.platform.juniorCollege =0 // 澶т笓浠ヤ笂浜哄憳
+          this.platform.businessIncome = 0 // 钀ヤ笟鏀跺叆
+          this.platform.productTech= 0 // 浜у搧闃舵
+          this.platform.patentApply= 0 // 鐢宠涓撳埄鏁�
+          this.platform.patentGrented= 0 // 鎺堟潈涓撳埄鏁�
+          this.platform.patentInvent= 0 // 鍙戞槑涓撳埄鏁�
+          this.platform.sex = 1
+          this.$emit('getData');
+          this.$message.success('鐢宠鎴愬姛');
         } else {
           throw msg;
           // console.log('澶辫触1');
diff --git a/src/components/EntityApply/EntityApplyEdit.vue b/src/components/EntityApply/EntityApplyEdit.vue
index e021587..2eb8c28 100644
--- a/src/components/EntityApply/EntityApplyEdit.vue
+++ b/src/components/EntityApply/EntityApplyEdit.vue
@@ -7,9 +7,9 @@
       title="淇敼浼佷笟鍩烘湰淇℃伅"
       v-model="editVisible"
       width="700px"
-	    :confirm-loading="confirmLoading" 
-	    @ok="handleOk"
-    >
+		 	:confirm-loading="confirmLoading" 
+		  @ok="handleOk"
+		>
       <a-form :form="form" v-if="current === 0">
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鍏徃鍚嶇О" required>
           <a-input placeholder="璇疯緭鍏ュ叕鍙稿悕绉�..." v-model.trim="platform.company" />
@@ -17,8 +17,11 @@
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鎴愮珛鏃堕棿" required>
           <!-- 鏃堕棿閫夋嫨鍣紙鏃堕棿鐐癸級 -->
           <!-- <div>{{ platform.buildTime}}</div> -->
-          
-          <a-date-picker :default-value="$moment(+platform.buildTime).format('YYYY-MM-DD HH:mm:ss')" @change="changeBirthday" />
+          <!-- moment($moment(+platform.buildTime).format('YYYY-MM-DD'), 'YYYY-MM-DD') -->
+          <!-- <a-date-picker :default-value="$moment(+platform.buildTime).format('YYYY-MM-DD HH:mm:ss')" @change="changeBirthday" /> -->
+          <a-date-picker 
+            :default-value="$moment($moment(+platform.buildTime).format('YYYY-MM-DD'), 'YYYY-MM-DD')" @change="changeBirthday"
+          />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="娉曚汉浠ｇ爜" required>
           <a-input placeholder="璇疯緭鍏ユ硶浜轰唬鐮�..." v-model.trim="platform.legalPerson" />
@@ -78,6 +81,13 @@
           <a-input placeholder="璇疯緭鍏ュ悎浣滃崟浣�..." v-model.trim="platform.friendCompany" />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="涓婁紶闄勪欢">
+          <div v-if="editData.picUrl" class="d-flex align-end">
+            <img :src="editData.picUrl" style="height:100px;" alt=""> 
+            <div>
+              <a-icon @click="deleteFileList" class="ml-5" type="close-circle" />
+            </div>
+            
+          </div>
           <a-upload
             :action="action"
             :before-upload="beforeUpload"
@@ -89,7 +99,7 @@
             <p>1.钀ヤ笟鎵х収澶嶅嵃浠讹紙灏氭棤娉ㄥ唽鐨勬棤闇�姊帶锛�</p>
             <p>2.娉曞畾浠ｈ〃鎴栨巿鏉冧唬琛ㄨ韩浠借瘉澶嶅嵃浠�</p>
             <p>3.涓诲浜у搧鎴栨妧鏈畝浠�</p>
-            <a-button> <a-icon type="upload" />鐐瑰嚮涓婁紶闄勪欢 </a-button>
+            <a-button v-show="fileList.length - 0 === 0"><a-icon type="upload" />鐐瑰嚮涓婁紶闄勪欢 </a-button>
           </a-upload>
         </a-form-item>
       </a-form>
@@ -98,11 +108,12 @@
           <a-input v-model.trim="platform.companyName" placeholder="璇疯緭鍏ュ叕鍙稿悕绉�..." />
         </a-form-item>-->
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="濮撳悕" required>
-          <a-input placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕..." v-model.trim="platform.manName" />
+          <a-input placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕..." v-model.trim="platform.name" />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鎬у埆" required>
           <!-- 鍗曢�� -->
-          <a-radio-group v-model="platform.sex">
+          <a-radio-group v-model="platform.gender">
+
             <a-radio :value="1" style="margin-right: 100px">鐢�</a-radio>
             <a-radio :value="0">濂�</a-radio>
           </a-radio-group>
@@ -111,31 +122,22 @@
           <a-input placeholder="璇疯緭鍏ョ敵璇蜂汉鑱屽姟..." v-model.trim="platform.position" />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鑱旂郴鐢佃瘽" required>
-          <a-input @change="changePhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�.." type="tel" v-decorator="['tel', { rules: phoneRules }]" />
+          <a-input 
+            @change="changePhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�.." type="tel" 
+            v-decorator="['tel', { rules: phoneRules,initialValue: platform.phone }]" 
+            />
         </a-form-item>
-        <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鍥剧墖楠岃瘉鐮�" required>
-          <div class="d-flex flex-nowrap">
-            <a-input placeholder="鍥剧墖楠岃瘉鐮�" type="number" v-model="codeNum" />
-            <img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
-            <a-button @click="changePicCode" class="code_img ml-2" size="small" v-else>鑾峰彇楠岃瘉鐮�</a-button>
-          </div>
-        </a-form-item> -->
-        <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鐭俊楠岃瘉鐮�" required>
-          <div class="d-flex flex-nowrap">
-            <a-input placeholder="璇疯緭鍏ラ獙璇佺爜" type="number" v-model="platform.code" />
-            <a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">閲嶆柊鍙戦�� {{ interval }}</a-button>
-            <a-button :disabled="platform.isTel === false" @click="getCode" class="code_img ml-2" type="primary" v-else
-              >鑾峰彇楠岃瘉鐮�</a-button
-            >
-          </div>
-        </a-form-item> -->
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="鐢靛瓙閭">
           <!-- 鐢靛瓙閭 -->
-          <a-input @change="changeEamil" placeholder="璇疯緭鍏ョ數瀛愰偖绠�..." type="email" v-decorator="['email', { rules: emailRules }]" />
+          <a-input @change="changeEamil" placeholder="璇疯緭鍏ョ數瀛愰偖绠�..." type="email" 
+            v-decorator="['email', { rules: emailRules,initialValue: platform.email }]" 
+          />
         </a-form-item>
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="韬唤璇佸彿">
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="韬唤璇佸彿" required>
           <!-- 韬唤璇佸彿 -->
-          <a-input @change="changeIdCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�..." v-decorator="['idCard']" />
+          <a-input @change="changeIdCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�..." 
+            v-decorator="['idCard', { rules: idCardRules,initialValue: platform.idCard }]" 
+          />
         </a-form-item>
       </a-form>
       <a-steps :current="current">
@@ -192,19 +194,19 @@ export default {
           message: '璇疯緭鍏ユ纭殑閭鏍煎紡',
         },
       ],
-    //   idCardRules: [
-    //     {
-    //       required: true,
-    //       pattern: new RegExp(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/),
-    //       whitespace: true,
-    //       message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
-    //     },
-    //   ],
-      
+      idCardRules: [
+        {
+          required: true,
+          pattern: new RegExp(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/),
+          whitespace: true,
+          message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
+        },
+      ],
       action: upload,
-	    platform: {},
-	    current: 0,
+			platform: {},
+			current: 0,
       confirmLoading: false,
+      filesUpload: []
       
     };
   },
@@ -218,13 +220,36 @@ export default {
       if( this.platform.buildTime === null){
         this.platform.buildTime = 0
       }
+
+      //鍦ㄨ繖涓湴鏂规潵瀹屾垚鐩稿叧鐨勪笂浼犻檮浠跺洖鏄�
+      if(val.picUrl){
+        var temp = {
+          uid: '1',
+          name: '1.png',
+          status: 'done',
+          url: val.picUrl,
+          thumbUrl: val.picUrl,
+        }
+        this.fileList.push(temp)
+      }
+
       console.log("========>",this.platform)
-      
+
 
     },
     
   },
   methods: {
+
+    // 鍒犻櫎fileList
+    deleteFileList(){
+      console.log("杩涘叆浜嬩欢")
+
+      this.fileList = []
+      this.editData.picUrl = ''
+   
+
+    },
     beforeUpload(file) {
       return new Promise((resolve, reject) => {
         const isLt5M = file.size / 1024 / 1024 < 5;
@@ -276,22 +301,21 @@ export default {
           this.$message.error('璇疯緭鍏ヨ亴鍔�');
         } else if (this.platform.isTel === false) {
           this.$message.error('璇疯緭鍏ヨ仈绯荤數璇�');
-        } else if(this.platform.email === ''){
-          this.$message.error('璇疯緭鍏ラ偖绠�');
-        } else if(this.platform.sex === undefined){
+        } 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++) {
-            this.platform.files = this.platform.files.concat(this.fileList[i].response.data[0].id);
+            console.log(this.fileList[i].response.data[0].id)
+            // this.platform.files = this.platform.files.concat(this.fileList[i].response.data[0].id);
+            this.filesUpload = this.filesUpload.concat(this.fileList[i].response.data[0].id);
+            console.log(this.filesUpload )
           }
           this.updateSettled();
         }
       }
     },
-
-
-
-
     async updateSettled() {
       this.confirmLoading = true;
       try {
@@ -303,9 +327,9 @@ export default {
             company: this.platform.company,
             electricDesign: this.platform.electricDesign,
             email: this.platform.email,
-            fileList: this.platform.files,
+            fileList: this.filesUpload,
             friendCompany: this.platform.friendCompany,
-            gender: this.platform.sex,
+            gender: this.platform.gender,
             idCard: this.platform.idCard,
             juniorCollege: this.platform.juniorCollege,
             legalPerson: this.platform.legalPerson,
@@ -326,7 +350,7 @@ export default {
             staffCount: this.platform.staffCount,
           },
         };
-        console.log(params);
+        console.log("updatePlace",params);
         const res = await updatePlace(params);
         // console.log(res);
         const { code, msg, data } = res.data;
@@ -348,6 +372,10 @@ export default {
       }
     },
 
+
+
+
+  
   },
 };
 </script>
diff --git a/src/components/EntityApply/EntityApplySearch.vue b/src/components/EntityApply/EntityApplySearch.vue
index d1487f3..ed75ac5 100644
--- a/src/components/EntityApply/EntityApplySearch.vue
+++ b/src/components/EntityApply/EntityApplySearch.vue
@@ -24,7 +24,7 @@
     <!-- <a-button @click="showModal" class="editable-add-btn mb-3" type="primary">澧炲姞</a-button> -->
 
     <!-- 娣诲姞 -->
-    <entity-apply-add :visible="visible" @closeModal="closeModal" />
+    <entity-apply-add :visible="visible" @closeModal="closeModal" @getData="getData" />
   </div>
 </template>
 
@@ -48,6 +48,10 @@ export default {
     };
   },
   methods: {
+    getData() {
+      this.$emit('entityApplicationSearch');
+    },
+
     handleChangeName(value) {
       console.log('value: ', value);
       this.companyName = value;
diff --git a/src/components/Policy/PolicyEdit.vue b/src/components/Policy/PolicyEdit.vue
index 0d174f5..019c5ca 100644
--- a/src/components/Policy/PolicyEdit.vue
+++ b/src/components/Policy/PolicyEdit.vue
@@ -2,9 +2,9 @@
   <div class="d-flex flex-wrap pb-3">
     <!-- 缂栬緫 -->
     <a-modal
-      :maskClosable="false"
+      :mask-closable="false"
       @cancel="$emit('closeModal')"
-      destroyOnClose
+      destroy-on-close
       footer
       title="淇敼鍒涙柊鏀跨瓥"
       v-model="editVisible"
@@ -91,7 +91,7 @@
             style="height:120px"
             placeholder="鍘熸枃閾炬帴"
             v-decorator="[
-              'url',
+              'intro',
               {
                 initialValue: editItem.intro,
               },
@@ -131,8 +131,8 @@ const tailItemLayout = { wrapperCol: { span: 16, offset: 6 } };
 
 export default {
   name: 'PolicyEdit',
-  props: { editVisible: { type: Boolean, default: false }, editItem: { type: Object, default: () => {} } },
   components: { QuillEditor },
+  props: { editVisible: { type: Boolean, default: false }, editItem: { type: Object, default: () => {} } },
   data() {
     return {
       formItemLayout,