diff --git a/index.html b/index.html
index d1743bb..eb90767 100644
--- a/index.html
+++ b/index.html
@@ -39,14 +39,14 @@
   // } catch (error) {
   //   console.error('Error setting favicon:', error);
   // }
-    if(typeof (store.state.user.association)=='object'){
-      var association=store.state.user.association;
-    }else{
-      var association=JSON.parse(store.state.user.association);
-    }
-    console.log(association);
+  //   if(typeof (store.state.user.association)=='object'){
+  //     var association=store.state.user.association;
+  //   }else{
+  //     var association=JSON.parse(store.state.user.association);
+  //   }
+  //   console.log(association);
     let formData = new FormData();
-    formData.append('association_id', association.association_id);
+    formData.append('association_id', 1);
     axios.post(store.state.user.apiUrl + '/api/common/icoImage', formData)
       .then(response => {
         console.log(response);
diff --git a/src/App.vue b/src/App.vue
index 554771e..2eecfc4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,7 +19,7 @@ export default Vue.extend({
       name: 'user',
       component: Layout,
       redirect: '/user/user_index',
-      meta: {title: '会员管理123', icon: UsergroupIcon},
+      meta: {title: '会员管理', icon: UsergroupIcon},
     };
     console.log(newRouteConfig);
     this.$router.addRoute(newRouteConfig);
diff --git a/src/pages/activity/activity_index.vue b/src/pages/activity/activity_index.vue
index 9070cf4..c2f8cf3 100644
--- a/src/pages/activity/activity_index.vue
+++ b/src/pages/activity/activity_index.vue
@@ -1098,5 +1098,8 @@ export default {
   table-layout: fixed;
   border-collapse: collapse;
 }
+.w-e-full-screen-container{
+  z-index: 1024;
+}
 </style>
 <style src="@wangeditor/editor/dist/css/style.css"></style>
diff --git a/src/pages/register/index.vue b/src/pages/register/index.vue
index dbafda7..5c35bdb 100644
--- a/src/pages/register/index.vue
+++ b/src/pages/register/index.vue
@@ -11,7 +11,7 @@
           <div style="padding: 30px 0px">
             <t-form layout="inline" labelAlign="top" :labelWidth="100">
               <t-form-item name="name" label="推荐方式">
-                <t-select size="large" filterable v-model="formData.reporting_method">
+                <t-select size="large" v-model="formData.reporting_method">
                   <t-option label="个人自荐" value="3"/>
                   <t-option label="会员推荐" value="2"/>
                   <t-option label="组织推荐" value="1"/>
@@ -19,7 +19,7 @@
               </t-form-item>
               <template v-if="formData.reporting_method==3">
                 <t-form-item name="name" label="来源渠道">
-                  <t-select size="large" v-model="formData.recommended_cities" placeholder="请选择来源渠道">
+                  <t-select size="large" v-model="formData.source_channel" placeholder="请选择来源渠道">
                     <t-option value="网络来源" label="网络来源" key="网络来源"></t-option>
                     <t-option value="微信公众号来源" label="微信公众号来源" key="微信公众号来源"></t-option>
                     <t-option value="朋友推荐" label="朋友推荐" key="朋友推荐"></t-option>
@@ -29,27 +29,25 @@
               </template>
               <template v-if="formData.reporting_method==1">
                 <t-form-item name="name" label="推荐地市">
-                <t-select size="large" v-model="formData.recommended_cities" placeholder="请选择推荐地市">
-                  <t-option v-for="item in region_list" :value="item.value" :label="item.label" :key="item.value"></t-option>
-                </t-select>
+                  <t-select size="large" v-model="formData.recommended_cities" placeholder="请选择推荐地市">
+                    <t-option v-for="item in region_list" :value="item.label" :label="item.label"
+                              :key="item.label"></t-option>
+                  </t-select>
                 </t-form-item>
               </template>
               <template v-if="formData.reporting_method==2">
                 <t-form-item name="name" label="推荐人姓名">
-                  <t-select size="large" filterable v-model="formData.recommendation_id">
-                    <t-option label="无" :value="0"/>
-                    <t-option v-for="item in member_list" :label="item.nikename" :value="item.id"/>
-                  </t-select>
+                  <t-input size="large" v-model="formData.recommendation_id" placeholder="推荐人姓名"/>
                 </t-form-item>
                 <t-form-item label="推荐人单位名称及职务">
                   <t-input size="large" v-model="formData.recommendation_content" placeholder="推荐人单位名称及职务"/>
                 </t-form-item>
               </template>
               <t-form-item label="意向协会职务">
-                <t-select size="large" :style="{ width: '200px' }">
-                  <t-option :key="0" label="会员" :value="0"></t-option>
-                  <t-option :key="1" label="理事" :value="1"></t-option>
-                  <t-option :key="2" label="常务理事" :value="2"></t-option>
+                <t-select size="large" v-model="formData.intentional_association_position" :style="{ width: '200px' }">
+                  <t-option key="会员" label="会员" value="会员"></t-option>
+                  <t-option key="理事" label="理事" value="理事"></t-option>
+                  <t-option key="常务理事" label="常务理事" value="常务理事"></t-option>
                 </t-select>
               </t-form-item>
             </t-form>
@@ -63,10 +61,12 @@
               <div>证件照</div>
               <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
               <div class="t-upload" @click="openCai" style="margin-top: 20px;">
-                <div style="cursor: pointer;text-align: center;width: 200px;height: 200px;line-height: 200px;border: 1px dashed #999999;">
+                <div
+                  style="cursor: pointer;text-align: center;width: 200px;height: 200px;line-height: 200px;border: 1px dashed #999999;">
                   <img :src="$store.state.user.apiUrl+formData.photo_image" style="width: 200px;display: block"
                        v-if="formData.photo_image!=''">
-                  <svg style="    font-size: 35px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
+                  <svg style="    font-size: 35px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px"
+                       class="t-icon t-icon-add"
                        v-if="formData.photo_image==''">
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg>
@@ -93,7 +93,8 @@
                     <t-input size="large" v-model="formData.nation" placeholder="请输入民族"/>
                   </t-form-item>
                   <t-form-item label="政治面貌">
-                    <t-select size="large" v-model="formData.political" placeholder="请选择政治面貌" :style="{ width: '200px' }">
+                    <t-select size="large" v-model="formData.political" placeholder="请选择政治面貌"
+                              :style="{ width: '200px' }">
                       <t-option value="中共党员" label="中共党员" key="中共党员"></t-option>
                       <t-option value="中共预备党员" label="中共预备党员" key="中共预备党员"></t-option>
                       <t-option value="共青团员" label="共青团员" key="共青团员"></t-option>
@@ -119,7 +120,7 @@
                     <t-input size="large" v-model="formData.unit_position" placeholder="请输入单位职务"/>
                   </t-form-item>
                   <t-form-item label="通讯地址">
-                    <t-input size="large" placeholder="请输入通讯地址"/>
+                    <t-input size="large" v-model="formData.mail_address" placeholder="请输入通讯地址"/>
                   </t-form-item>
                   <t-form-item label="籍贯">
                     <t-input size="large" v-model="formData.jiguan" placeholder="请输入籍贯"/>
@@ -128,7 +129,8 @@
                     <t-input size="large" v-model="formData.institution" placeholder="请输入毕业院校"/>
                   </t-form-item>
                   <t-form-item label="学历">
-                    <t-select size="large" v-model="formData.education" placeholder="请选择学历" :style="{ width: '200px' }">
+                    <t-select size="large" v-model="formData.education" placeholder="请选择学历"
+                              :style="{ width: '200px' }">
                       <t-option value="博士研究生" label="博士研究生" key="博士研究生"></t-option>
                       <t-option value="硕士研究生" label="硕士研究生" key="硕士研究生"></t-option>
                       <t-option value="本科" label="本科" key="本科"></t-option>
@@ -137,7 +139,8 @@
                     </t-select>
                   </t-form-item>
                   <t-form-item label="学位">
-                    <t-select size="large" v-model="formData.academic_degree" placeholder="请选择学位" :style="{ width: '200px' }">
+                    <t-select size="large" v-model="formData.academic_degree" placeholder="请选择学位"
+                              :style="{ width: '200px' }">
                       <t-option value="博士" label="博士" key="博士"></t-option>
                       <t-option value="硕士" label="硕士" key="硕士"></t-option>
                       <t-option value="学士" label="学士" key="学士"></t-option>
@@ -145,7 +148,7 @@
                     </t-select>
                   </t-form-item>
                   <t-form-item label="邮编">
-                    <t-input size="large" placeholder="请输入邮编"/>
+                    <t-input size="large" v-model="formData.zip_code" placeholder="请输入邮编"/>
                   </t-form-item>
                   <t-form-item label="手机号" :rules="[ { required: true, message: '此项必填' }]">
                     <t-input size="large" v-model="formData.phone" placeholder="请输入手机号"/>
@@ -160,7 +163,8 @@
                     <t-input size="large" v-model="formData.fixed_telephone" placeholder="请输入固定电话"/>
                   </t-form-item>
                   <t-form-item label="所在区域" name="region_id">
-                    <t-cascader size="large" v-model="formData.region_id" :options="region_list" :style="{ width: '200px' }"></t-cascader>
+                    <t-cascader size="large" v-model="formData.region_id" :options="region_list"
+                                :style="{ width: '200px' }"></t-cascader>
                   </t-form-item>
                 </t-form>
               </t-space>
@@ -172,7 +176,8 @@
             <div style="display: flex;justify-items: center;padding: 30px 0px">
               <div style="text-align: center">
                 <div class="sfz">
-                  <span v-if="formData.cardz_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
+                  <span v-if="formData.cardz_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24"
+                                                             width="100px" height="100px" class="t-icon t-icon-add"
                                                              v-if="formData.cardz_image==''">
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
@@ -193,7 +198,8 @@
               </div>
               <div style="margin-left: 100px;text-align: center">
                 <div class="sfz">
-                  <span v-if="formData.cardf_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
+                  <span v-if="formData.cardf_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24"
+                                                             width="100px" height="100px" class="t-icon t-icon-add"
                                                              v-if="formData.cardf_image==''">
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
@@ -219,16 +225,52 @@
               <div>个人简介</div>
               <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
               <div style="margin-top: 20px;">
-                <t-textarea placeholder="请输入个人简介" :autosize="{ minRows: 15, maxRows: 20 }"
-                            v-model="formData.introduction"/>
+<!--                <t-textarea placeholder="请输入个人简介" :autosize="{ minRows: 15, maxRows: 20 }"-->
+<!--                            v-model="formData.introduction"/>-->
+                <div style="border: 1px solid #ccc;">
+                  <!-- 工具栏 -->
+                  <Toolbar
+                    style="border-bottom: 1px solid #ccc"
+                    mode="default"
+                    :editor="editorJJ"
+                    :defaultConfig="toolbarConfig"
+                  />
+
+                  <Editor
+                    style="height: 300px"
+                    v-model="formData.introduction"
+                    :defaultConfig="editorConfig"
+                    mode="default"
+                    @customPaste="customPaste"
+                    @onCreated="(e) => onCreatedJJ(e)"
+                  />
+                </div>
               </div>
             </div>
             <div style="width: 49%">
               <div>主要成就以及获奖情况</div>
               <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
               <div style="margin-top: 20px;">
-                <t-textarea placeholder="请输入主要成就以及获奖情况" :autosize="{ minRows: 15, maxRows: 20 }"
-                            v-model="formData.achievement_award"/>
+<!--                <t-textarea placeholder="请输入主要成就以及获奖情况" :autosize="{ minRows: 15, maxRows: 20 }"-->
+<!--                            v-model="formData.achievement_award"/>-->
+                <div style="border: 1px solid #ccc;">
+                  <!-- 工具栏 -->
+                  <Toolbar
+                    style="border-bottom: 1px solid #ccc"
+                    mode="default"
+                    :editor="editorCJ"
+                    :defaultConfig="toolbarConfig"
+                  />
+
+                  <Editor
+                    style="height: 300px"
+                    v-model="formData.achievement_award"
+                    :defaultConfig="editorConfig"
+                    mode="default"
+                    @customPaste="customPaste"
+                    @onCreated="(e) => onCreatedCJ(e)"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -240,8 +282,8 @@
             <t-space direction="vertical">
               <t-form labelAlign="top" :labelWidth="100">
                 <t-form-item label="起止日期">
-<!--                  <t-input v-model="work.time" placeholder="起止日期"/>-->
-                  <t-date-range-picker size="large" v-model="work_time" allow-input  @change="onChange" />
+                  <!--                  <t-input v-model="work.time" placeholder="起止日期"/>-->
+                  <t-date-range-picker size="large" mode="month" v-model="work_time" allow-input @change="onChange"/>
                 </t-form-item>
                 <t-form-item label="地区单位">
                   <t-input size="large" v-model="work.address" placeholder="请输入地区单位"/>
@@ -255,13 +297,13 @@
           </div>
           <div style="width: 100%">
             <table style=";width: 100%; border-collapse: collapse;">
-              <tr align="center" >
+              <tr align="center">
                 <th>起止日期</th>
                 <th>地区单位</th>
                 <th>担任职务</th>
                 <th>操作</th>
               </tr>
-              <tr align="center"  v-for="(item, index) in workList" :key="index">
+              <tr align="center" v-for="(item, index) in workList" :key="index">
                 <td>{{ item.time }}</td>
                 <td>{{ item.address }}</td>
                 <td>{{ item.book }}</td>
@@ -281,7 +323,7 @@
               <t-space direction="vertical">
                 <t-form>
                   <t-form-item>
-                    <t-checkbox-group  v-model="social_duties">
+                    <t-checkbox-group v-model="social_duties">
                       <t-checkbox value="全国人大代表">全国人大代表</t-checkbox>
                       <t-checkbox value="全国政协委员">全国政协委员</t-checkbox>
                       <t-checkbox value="全国青联委员">全国青联委员</t-checkbox>
@@ -366,7 +408,7 @@
                     <t-input size="large" v-model="formData.enterprise_location" placeholder="请输入企业注册地"/>
                   </t-form-item>
                   <t-form-item label="注册资金（万元）">
-                    <t-input size="large" placeholder="注册资金（万元）"/>
+                    <t-input size="large" v-model="formData.registered_capital" placeholder="注册资金（万元）"/>
                   </t-form-item>
                   <t-form-item label="是否上市" name="name">
                     <t-select size="large" v-model="formData.if_list" :style="{ width: '200px' }">
@@ -419,7 +461,9 @@
             <div style="display: flex;justify-items: center;padding: 30px 0px">
               <div style="text-align: center">
                 <div class="sfz">
-                  <span v-if="formData.business_license_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
+                  <span v-if="formData.business_license_image==''"><svg style=" font-size: 30px;" fill="none"
+                                                                        viewBox="0 0 24 24" width="100px" height="100px"
+                                                                        class="t-icon t-icon-add"
                                                                         v-if="formData.business_license_image==''">
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
@@ -441,7 +485,8 @@
               </div>
               <div style="margin-left: 100px;text-align: center">
                 <div class="sfz">
-                  <span v-if="formData.company_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
+                  <span v-if="formData.company_image==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24"
+                                                               width="100px" height="100px" class="t-icon t-icon-add"
                                                                v-if="formData.company_image==''">
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
@@ -467,16 +512,52 @@
               <div>公司介绍</div>
               <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
               <div style="margin-top: 20px;">
-                <t-textarea placeholder="请输入公司介绍" :autosize="{ minRows: 15, maxRows: 20 }"
-                            v-model="formData.enterprise_Introduction"/>
+<!--                <t-textarea placeholder="请输入公司介绍" :autosize="{ minRows: 15, maxRows: 20 }"-->
+<!--                            v-model="formData.enterprise_Introduction"/>-->
+                <div style="border: 1px solid #ccc;">
+                  <!-- 工具栏 -->
+                  <Toolbar
+                    style="border-bottom: 1px solid #ccc"
+                    mode="default"
+                    :editor="editorGS"
+                    :defaultConfig="toolbarConfig"
+                  />
+
+                  <Editor
+                    style="height: 300px"
+                    v-model="formData.enterprise_Introduction"
+                    :defaultConfig="editorConfig"
+                    mode="default"
+                    @customPaste="customPaste"
+                    @onCreated="(e) => onCreatedGS(e)"
+                  />
+                </div>
               </div>
             </div>
             <div style="width: 49%">
               <div>主营业务介绍</div>
               <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
               <div style="margin-top: 20px;">
-                <t-textarea placeholder="请输入主营业务介绍" :autosize="{ minRows: 15, maxRows: 20 }"
-                            v-model="formData.introdiction"/>
+<!--                <t-textarea placeholder="请输入主营业务介绍" :autosize="{ minRows: 15, maxRows: 20 }"-->
+<!--                            v-model="formData.introdiction"/>-->
+                <div style="border: 1px solid #ccc;">
+                  <!-- 工具栏 -->
+                  <Toolbar
+                    style="border-bottom: 1px solid #ccc"
+                    mode="default"
+                    :editor="editorZY"
+                    :defaultConfig="toolbarConfig"
+                  />
+
+                  <Editor
+                    style="height: 300px"
+                    v-model="formData.introdiction"
+                    :defaultConfig="editorConfig"
+                    mode="default"
+                    @customPaste="customPaste"
+                    @onCreated="(e) => onCreatedZY(e)"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -485,16 +566,80 @@
               <div>企业所获荣誉以及专利</div>
               <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
               <div style="margin-top: 20px;">
-                <t-textarea placeholder="请输入企业所获荣誉以及专利" :autosize="{ minRows: 15, maxRows: 20 }"
-                            v-model="formData.enterprise_honor"/>
+<!--                <t-textarea placeholder="请输入企业所获荣誉以及专利" :autosize="{ minRows: 15, maxRows: 20 }"-->
+<!--                            v-model="formData.enterprise_honor"/>-->
+                <div style="border: 1px solid #ccc;">
+                  <!-- 工具栏 -->
+                  <Toolbar
+                    style="border-bottom: 1px solid #ccc"
+                    mode="default"
+                    :editor="editorRY"
+                    :defaultConfig="toolbarConfig"
+                  />
+
+                  <Editor
+                    style="height: 300px"
+                    v-model="formData.enterprise_honor"
+                    :defaultConfig="editorConfig"
+                    mode="default"
+                    @customPaste="customPaste"
+                    @onCreated="(e) => onCreatedRY(e)"
+                  />
+                </div>
               </div>
             </div>
             <div style="width: 49%">
               <div>其他企业任职情况</div>
               <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
               <div style="margin-top: 20px;">
-                <t-textarea placeholder="请输入其他企业任职情况" :autosize="{ minRows: 15, maxRows: 20 }"
-                            v-model="formData.qitaqiyerenzhiqingkuang"/>
+<!--                <t-textarea placeholder="请输入其他企业任职情况" :autosize="{ minRows: 15, maxRows: 20 }"-->
+<!--                            v-model="formData.qitaqiyerenzhiqingkuang"/>-->
+                <div style="border: 1px solid #ccc;">
+                  <!-- 工具栏 -->
+                  <Toolbar
+                    style="border-bottom: 1px solid #ccc"
+                    mode="default"
+                    :editor="editorQT"
+                    :defaultConfig="toolbarConfig"
+                  />
+
+                  <Editor
+                    style="height: 300px"
+                    v-model="formData.qitaqiyerenzhiqingkuang"
+                    :defaultConfig="editorConfig"
+                    mode="default"
+                    @customPaste="customPaste"
+                    @onCreated="(e) => onCreatedQT(e)"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+          <div style="display: flex;justify-items: center;justify-content: space-between;margin-top: 20px">
+            <div style="width: 49%">
+              <div>企业履行社会责任情况</div>
+              <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
+              <div style="margin-top: 20px;">
+<!--                <t-textarea placeholder="请输入企业履行社会责任情况" :autosize="{ minRows: 15, maxRows: 20 }"-->
+<!--                            v-model="formData.enterprise_lvxingzeren"/>-->
+                <div style="border: 1px solid #ccc;">
+                  <!-- 工具栏 -->
+                  <Toolbar
+                    style="border-bottom: 1px solid #ccc"
+                    mode="default"
+                    :editor="editorLX"
+                    :defaultConfig="toolbarConfig"
+                  />
+
+                  <Editor
+                    style="height: 300px"
+                    v-model="formData.enterprise_lvxingzeren"
+                    :defaultConfig="editorConfig"
+                    mode="default"
+                    @customPaste="customPaste"
+                    @onCreated="(e) => onCreatedLX(e)"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -512,58 +657,121 @@
                   </t-select>
                 </t-form-item>
               </t-form>
-              <t-form v-if="formData.if_organization==0" labelAlign="top"
-                      layout="inline">
-                <t-form-item label="团组织性质" name="nature">
-                  <t-input size="large" v-model="formData.nature" placeholder="团组织性质"></t-input>
-                </t-form-item>
-                <t-form-item label="建团时间" name="jiantuan_time">
-                  <t-date-picker size="large" :style="{ width: '200px' }" v-model="formData.jiantuan_time"/>
-                </t-form-item>
-                <t-form-item label="建团人数" name="jiantuan_number">
-                  <t-input size="large" v-model="formData.jiantuan_number" placeholder="建团人数"></t-input>
-                </t-form-item>
-                <t-form-item label="青年人数" name="youth_number">
-                  <t-input size="large" v-model="formData.youth_number" placeholder="青年人数"></t-input>
-                </t-form-item>
-                <t-form-item label="上级团组织" name="superior_nature">
-                  <t-input size="large" v-model="formData.superior_nature" placeholder="上级团组织"></t-input>
-                </t-form-item>
-                <t-form-item label="团委负责人信息" name="tuanweifuzerenxinxi">
-                  <t-input size="large" v-model="formData.tuanweifuzerenxinxi" placeholder="团委负责人信息"></t-input>
-                </t-form-item>
-                <t-form-item label="批复文件">
-<!--                  <t-upload-->
-<!--                    :action="$store.state.user.apiUrl+'/api/common/upload'"-->
-<!--                    v-model="formData.documents_file_show"-->
-<!--                    theme="image"-->
-<!--                    tips="请选择批复文件(图片)"-->
-<!--                    accept="image/*"-->
-<!--                    :format-response="(response) => formatResponse(response, 4)"-->
-<!--                  ></t-upload>-->
-                  <div style="text-align: center">
-                    <div class="sfz">
-                  <span v-if="formData.documents_file==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
-                                                               v-if="formData.documents_file==''">
+              <div v-if="formData.if_organization==0">
+                <div style="display: flex">
+                  <div>
+                    <t-form labelAlign="top"
+                            layout="inline">
+                      <t-form-item label="团组织性质" name="nature">
+                        <t-select size="large" v-model="formData.nature" placeholder="团组织性质"
+                                  :style="{ width: '200px' }">
+                          <t-option value="团支部" label="团支部" key="团支部"></t-option>
+                          <t-option value="团总支部" label="团总支部" key="团总支部"></t-option>
+                          <t-option value="团的基层委员会" label="团的基层委员会" key="团的基层委员会"></t-option>
+                        </t-select>
+                      </t-form-item>
+                      <t-form-item label="建团时间" name="jiantuan_time">
+                        <t-date-picker size="large" :style="{ width: '200px' }" v-model="formData.jiantuan_time"/>
+                      </t-form-item>
+                      <t-form-item label="建团人数" name="jiantuan_number">
+                        <t-input size="large" v-model="formData.jiantuan_number" placeholder="建团人数"></t-input>
+                      </t-form-item>
+
+                      <!--                <t-form-item label="团委负责人信息" name="tuanweifuzerenxinxi">-->
+                      <!--                  <t-input size="large" v-model="formData.tuanweifuzerenxinxi" placeholder="团委负责人信息"></t-input>-->
+                      <!--                </t-form-item>-->
+                    </t-form>
+                    <t-form labelAlign="top"
+                            layout="inline" style="margin-top: 10px">
+                      <t-form-item label="青年人数" name="youth_number">
+                        <t-input size="large" v-model="formData.youth_number" placeholder="青年人数"></t-input>
+                      </t-form-item>
+                      <t-form-item label="上级团组织" name="superior_nature">
+                        <t-input size="large" v-model="formData.superior_nature" placeholder="上级团组织"></t-input>
+                      </t-form-item>
+                    </t-form>
+                  </div>
+                  <div>
+                    <div style="text-align: center">
+                      <div class="sfz">
+                  <span v-if="formData.documents_file==''"><svg style=" font-size: 30px;" fill="none"
+                                                                viewBox="0 0 24 24" width="100px" height="100px"
+                                                                class="t-icon t-icon-add"
+                                                                v-if="formData.documents_file==''">
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
-                      <img v-if="formData.documents_file!=''" :src="$store.state.user.apiUrl+formData.documents_file"
-                           style="width: 100%;max-height: 200px;">
+                        <img v-if="formData.documents_file!=''"
+                             :src="$store.state.user.apiUrl+formData.documents_file"
+                             style="width: 100%;max-height: 200px;">
+                      </div>
+                      <div style="margin: 10px 0px">请上传批复文件</div>
+                      <t-upload
+                        :action="$store.state.user.apiUrl+'/api/common/upload'"
+                        v-model="formData.documents_file_show"
+                        :data="{association_id:1}"
+                        theme="custom"
+                        accept="image/*"
+                        :format-response="(response) => formatResponse(response, 4)"
+                      >
+                        <t-button>上传图片</t-button>
+                      </t-upload>
                     </div>
-                    <div style="margin: 10px 0px">请上传批复文件</div>
-                    <t-upload
-                      :action="$store.state.user.apiUrl+'/api/common/upload'"
-                      v-model="formData.company_image_show"
-                      :data="{association_id:1}"
-                      theme="custom"
-                      accept="image/*"
-                      :format-response="(response) => formatResponse(response, 4)"
-                    >
-                      <t-button>上传图片</t-button>
-                    </t-upload>
                   </div>
-                </t-form-item>
-              </t-form>
+                </div>
+
+                <div style="margin-top: 30px">团委负责人信息</div>
+                <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
+                <div style="display: flex;margin-top: 20px">
+                  <div style="width: 30%">
+                    <t-space direction="vertical">
+                      <t-form labelAlign="top" :labelWidth="100">
+                        <t-form-item label="姓名">
+                          <t-input size="large" v-model="tuan.name" placeholder="姓名"/>
+                        </t-form-item>
+                        <t-form-item label="性别">
+                          <t-input size="large" v-model="tuan.sex" placeholder="性别"/>
+                        </t-form-item>
+                        <t-form-item label="单位职务">
+                          <t-input size="large" v-model="tuan.job" placeholder="单位职务"/>
+                        </t-form-item>
+                        <t-form-item label="团委职务">
+                          <t-input size="large" v-model="tuan.tun_job" placeholder="团委职务"/>
+                        </t-form-item>
+                        <t-form-item label="手机号">
+                          <t-input size="large" v-model="tuan.phone" placeholder="手机号"/>
+                        </t-form-item>
+                      </t-form>
+                      <t-button @click="addTuan" theme="primary">添加</t-button>
+                    </t-space>
+                  </div>
+                  <div style="width: 100%">
+                    <table style="width: 100%; border-collapse: collapse;">
+                      <thead>
+                      <tr align="center">
+                        <th>姓名</th>
+                        <th>性别</th>
+                        <th>单位职务</th>
+                        <th>团委职务</th>
+                        <th>手机号</th>
+                        <th>操作</th>
+                      </tr>
+                      </thead>
+                      <tbody>
+                      <tr align="center" v-for="(item, index) in tuan_list" :key="index">
+                        <td>{{ item.name }}</td>
+                        <td>{{ item.sex }}</td>
+                        <td>{{ item.job }}</td>
+                        <td>{{ item.tun_job }}</td>
+                        <td>{{ item.phone }}</td>
+                        <td style="text-align: center">
+                          <t-button @click="delTuan(index)" theme="danger" size="small">移除</t-button>
+                        </td>
+                      </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                </div>
+              </div>
             </t-space>
           </div>
         </div>
@@ -612,6 +820,7 @@
   </div>
 </template>
 <script lang="ts">
+import {Editor, Toolbar} from '@wangeditor/editor-for-vue';
 import store from '@/store';
 import {VueCropper} from 'vue-cropper';
 import axios from 'axios';
@@ -619,10 +828,37 @@ import {CheckCircleIcon, LockOnIcon, UserIcon} from "tdesign-icons-vue";
 
 export default {
   components: {
-    VueCropper,
+    VueCropper,Editor, Toolbar
   },
   data() {
     return {
+      editorJJ:null,
+      editorCJ:null,
+      editorGS:null,
+      editorZY:null,
+      editorRY:null,
+      editorQT:null,
+      editorLX:null,
+      toolbarConfig: {
+        showLinkImg: false,
+        uploadImgShowBase64: true,
+        excludeKeys: [
+          'insertVideo', // 删除视频
+          'uploadVideo',
+          'group-video',
+          'insertImage',// 删除网络图片上传
+          'uploadImage',
+          'group-image',
+          'insertLink',// 删除链接
+          'insertTable',// 删除表格
+          'codeBlock',// 删除代码块
+        ]
+      },
+      editorConfig: {
+        placeholder: '',
+        readOnly: false, // 是否只允许阅读，不可编辑
+        autoFocus: true,
+      },
       show: false,
       caiMode: false,
       previews: {},
@@ -632,7 +868,7 @@ export default {
         address: '',
         book: '',
       },
-      work_time:[],
+      work_time: [],
       workList: [],
       contacts: {
         name: '',
@@ -641,9 +877,23 @@ export default {
       },
       contactsList: [],
       social_duties: [],
+      tuan:{
+        name: '',
+        sex: '',
+        job: '',
+        tun_job: '',
+        phone: '',
+      },
+      tuan_list: [],
       formData: {
+        enterprise_lvxingzeren:'',
+        registered_capital: '',
+        zip_code: '',
+        mail_address: '',
+        intentional_association_position: '',
+        source_channel: '',
         region_id: null,
-        recommendation_id: 0,
+        recommendation_id: '',
         position_id: null,
         industry_id: null,
         phone: '',
@@ -708,7 +958,7 @@ export default {
         main_social_positions: '',
         reporting_method: '3',
         recommendation_content: '',
-        recommended_cities:'',
+        recommended_cities: '',
       },
       current: 2,
       industry_list: [],
@@ -731,15 +981,63 @@ export default {
     this.formData.token = this.$route.query.token;
     this.formData.openid = this.$route.query.openid;
     this.getIndustry();
-    this.getMemberList();
+    //this.getMemberList();
     this.getRegion();
     this.getInfo();
   },
   methods: {
-    onChange(value, context){
-      this.work.time=value[0]+'至'+value[1];
+    onChange(value, context) {
+      this.work.time = value[0] + '至' + value[1];
+    },
+    addTuan(){
+      if(this.tuan.name==''){
+        this.$message.error('请输入姓名！', 1500);
+        return;
+      }
+      if(this.tuan.sex==''){
+        this.$message.error('请输入性别！', 1500);
+        return;
+      }
+      if(this.tuan.job==''){
+        this.$message.error('请输入单位职务！', 1500);
+        return;
+      }
+      if(this.tuan.tun_job==''){
+        this.$message.error('请输入团委职务！', 1500);
+        return;
+      }
+      if(this.tuan.phone==''){
+        this.$message.error('请输入手机号！', 1500);
+        return;
+      }
+      var k = {...this.tuan};
+      this.tuan_list.push(k);
+      this.tuan.name = '';
+      this.tuan.sex = '';
+      this.tuan.job = '';
+      this.tuan.tun_job = '';
+      this.tuan.phone = '';
+    },
+    delTuan(index) {
+      this.tuan_list.splice(index, 1);
     },
     addWork() {
+      if(this.workList.length>=12){
+        this.$message.error('最多添加12条数据！', 1500);
+        return;
+      }
+      if(this.work.time==''){
+        this.$message.error('请输入起止日期！', 1500);
+        return;
+      }
+      if(this.work.address==''){
+        this.$message.error('请输入地区单位！', 1500);
+        return;
+      }
+      if(this.work.book==''){
+        this.$message.error('请输入担任职务！', 1500);
+        return;
+      }
       var k = {...this.work};
       this.workList.push(k);
       this.work.time = '';
@@ -747,10 +1045,23 @@ export default {
       this.work.book = '';
       this.work_time=[];
     },
+
     delWork(index) {
       this.workList.splice(index, 1);
     },
     addContacts() {
+      if(this.contacts.name==''){
+        this.$message.error('请输入姓名！', 1500);
+        return;
+      }
+      if(this.contacts.post==''){
+        this.$message.error('请输入职务！', 1500);
+        return;
+      }
+      if(this.contacts.phone==''){
+        this.$message.error('请输入电话！', 1500);
+        return;
+      }
       var k = {...this.contacts};
       this.contactsList.push(k);
       this.contacts.name = '';
@@ -858,7 +1169,7 @@ export default {
             this.show = true;
             this.formData.phone = res.data.phone;
             this.formData.position_id = res.data.position_id;
-            this.formData.industry_id = res.data.industry_id==0?null:res.data.industry_id;
+            this.formData.industry_id = res.data.industry_id == 0 ? null : res.data.industry_id;
             this.formData.region_id = res.data.region_id;
             this.formData.password = res.data.password;
             this.formData.nikename = res.data.nikename;
@@ -871,7 +1182,7 @@ export default {
             this.formData.education = res.data.education;
             this.formData.academic_degree = res.data.academic_degree;
             this.formData.card_number = res.data.card_number;
-            // this.formData.work_unit = res.data.work_unit;
+            this.formData.work_unit = res.data.work_unit;
             this.formData.unit_position = res.data.unit_position;
             this.formData.wx_number = res.data.wx_number;
             this.formData.mailbox = res.data.mailbox;
@@ -913,17 +1224,27 @@ export default {
             this.social_duties = res.data.main_social_positions.split(',');
             this.contactsList = JSON.parse(res.data.other_contacts);
             this.formData.work_experience = res.data.work_experience;
+
             this.workList = JSON.parse(res.data.work_experience);
+
+            this.tuan_list = JSON.parse(res.data.tuanweifuzerenxinxi);
+
             this.formData.reporting_method = res.data.reporting_method;
             this.formData.recommendation_content = res.data.recommendation_content;
-            this.formData.recommendation_id=res.data.recommendation_id;
-            this.formData.documents_file=res.data.documents_file;
-            if( res.data.documents_file==''){
+            this.formData.recommendation_id = res.data.recommendation_id == 0 ? '' : res.data.recommendation_id;
+            this.formData.documents_file = res.data.documents_file;
+            if (res.data.documents_file == '') {
               this.formData.documents_file_show = [];
-            }else{
+            } else {
               this.formData.documents_file_show = [{url: store.state.user.apiUrl + res.data.documents_file}];
             }
-            this.formData.recommended_cities=res.data.recommended_cities;
+            this.formData.recommended_cities = res.data.recommended_cities;
+            this.formData.source_channel = res.data.source_channel;
+            this.formData.intentional_association_position = res.data.intentional_association_position;
+            this.formData.mail_address = res.data.mail_address;
+            this.formData.zip_code = res.data.zip_code;
+            this.formData.registered_capital = res.data.registered_capital;
+            this.formData.enterprise_lvxingzeren=res.data.enterprise_lvxingzeren;
           }
         })
         .catch((e) => {
@@ -958,7 +1279,7 @@ export default {
     },
     getIndustry() {
       this.$request
-        .post("/industry")
+        .post("/move/industry/index", {association_id: 1})
         .then((res) => {
           console.log(res);
           if (res.code == 1) {
@@ -1091,9 +1412,15 @@ export default {
       if (this.contactsList.length > 0) {
         this.formData.other_contacts = JSON.stringify(this.contactsList);
       }
-
+      if (this.tuan_list.length > 0) {
+        this.formData.tuanweifuzerenxinxi = JSON.stringify(this.tuan_list);
+      }
       if (this.social_duties.length > 0) {
-        const splitAndJoin = this.social_duties.map(item => item.split(',')).flat().join(',');
+        const splitAndJoin = this.social_duties
+          .map(item => item.split(','))
+          .flat()
+          .filter(item => item.trim() !== '') // 过滤掉空字符串和仅含空格的字符串
+          .join(',');
         this.formData.main_social_positions = splitAndJoin;
       }
       this.$request
@@ -1114,10 +1441,41 @@ export default {
           console.log(e);
         });
     },
+    onCreatedJJ(editor) {
+      this.editorJJ= Object.seal(editor);
+    },
+    onCreatedCJ(editor) {
+      this.editorCJ= Object.seal(editor);
+    },
+    onCreatedGS(editor) {
+      this.editorGS= Object.seal(editor);
+    },
+    onCreatedZY(editor) {
+      this.editorZY= Object.seal(editor);
+    },
+    onCreatedRY(editor) {
+      this.editorRY= Object.seal(editor);
+    },
+    onCreatedQT(editor) {
+      this.editorQT= Object.seal(editor);
+    },
+    onCreatedLX(editor) {
+      this.editorLX= Object.seal(editor);
+    },
+    customPaste(editor, event, callback) {
+      console.log('ClipboardEvent 粘贴事件对象', event)
+      var text = event.clipboardData.getData('text/plain')
+      text=text.replace(/\s+/g, '');
+      editor.insertText(text)
+      event.preventDefault()
+      callback(false)
+      // 返回 true ，继续默认的粘贴行为
+    },
   },
 
 };
 </script>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
 <style lang="less" scoped>
 @import '@/style/variables.less';
 
@@ -1244,4 +1602,7 @@ export default {
   color: #409EFF;
   border: 1px dashed #409EFF;
 }
+.w-e-full-screen-container{
+  z-index: 1024;
+}
 </style>
diff --git a/src/pages/user/user_edit.vue b/src/pages/user/user_edit.vue
index 16f5497..248fb08 100644
--- a/src/pages/user/user_edit.vue
+++ b/src/pages/user/user_edit.vue
@@ -9,7 +9,7 @@
             <div style="padding: 30px 0px">
               <t-form layout="inline" labelAlign="top" :labelWidth="100">
                 <t-form-item name="name" label="推荐方式">
-                  <t-select size="large" filterable v-model="formData.reporting_method">
+                  <t-select size="large" v-model="formData.reporting_method">
                     <t-option label="个人自荐" value="3"/>
                     <t-option label="会员推荐" value="2"/>
                     <t-option label="组织推荐" value="1"/>
@@ -17,7 +17,7 @@
                 </t-form-item>
                 <template v-if="formData.reporting_method==3">
                   <t-form-item name="name" label="来源渠道">
-                    <t-select size="large"  placeholder="请选择来源渠道">
+                    <t-select size="large" v-model="formData.source_channel"  placeholder="请选择来源渠道">
                       <t-option value="网络来源" label="网络来源" key="网络来源"></t-option>
                       <t-option value="微信公众号来源" label="微信公众号来源" key="微信公众号来源"></t-option>
                       <t-option value="朋友推荐" label="朋友推荐" key="朋友推荐"></t-option>
@@ -28,26 +28,23 @@
                 <template v-if="formData.reporting_method==1">
                   <t-form-item name="name" label="推荐地市">
                     <t-select size="large" v-model="formData.recommended_cities" placeholder="请选择推荐地市">
-                      <t-option v-for="item in region_list" :value="item.value" :label="item.label" :key="item.value"></t-option>
+                      <t-option v-for="item in region_list" :value="item.label" :label="item.label" :key="item.label"></t-option>
                     </t-select>
                   </t-form-item>
                 </template>
                 <template v-if="formData.reporting_method==2">
                   <t-form-item name="name" label="推荐人姓名">
-                    <t-select size="large" filterable v-model="formData.recommendation_id">
-                      <t-option label="无" :value="0"/>
-                      <t-option v-for="item in member_list" :label="item.nikename" :value="item.id"/>
-                    </t-select>
+                    <t-input size="large" v-model="formData.recommendation_id" placeholder="推荐人姓名"/>
                   </t-form-item>
                   <t-form-item label="推荐人单位名称及职务">
                     <t-input size="large" v-model="formData.recommendation_content" placeholder="推荐人单位名称及职务"/>
                   </t-form-item>
                 </template>
                 <t-form-item label="意向协会职务">
-                  <t-select size="large" :style="{ width: '200px' }">
-                    <t-option :key="0" label="会员" :value="0"></t-option>
-                    <t-option :key="1" label="理事" :value="1"></t-option>
-                    <t-option :key="2" label="常务理事" :value="2"></t-option>
+                  <t-select size="large" v-model="formData.intentional_association_position" :style="{ width: '200px' }">
+                    <t-option key="会员" label="会员" value="会员"></t-option>
+                    <t-option key="理事" label="理事" value="理事"></t-option>
+                    <t-option key="常务理事" label="常务理事" value="常务理事"></t-option>
                   </t-select>
                 </t-form-item>
               </t-form>
@@ -117,7 +114,7 @@
                       <t-input size="large" v-model="formData.unit_position" placeholder="请输入单位职务"/>
                     </t-form-item>
                     <t-form-item label="通讯地址">
-                      <t-input size="large" placeholder="请输入通讯地址"/>
+                      <t-input size="large" v-model="formData.mail_address" placeholder="请输入通讯地址"/>
                     </t-form-item>
                     <t-form-item label="籍贯">
                       <t-input size="large" v-model="formData.jiguan" placeholder="请输入籍贯"/>
@@ -143,7 +140,7 @@
                       </t-select>
                     </t-form-item>
                     <t-form-item label="邮编">
-                      <t-input size="large" placeholder="请输入邮编"/>
+                      <t-input size="large" v-model="formData.zip_code" placeholder="请输入邮编"/>
                     </t-form-item>
                     <t-form-item label="手机号" :rules="[ { required: true, message: '此项必填' }]">
                       <t-input size="large" v-model="formData.phone" placeholder="请输入手机号"/>
@@ -217,16 +214,48 @@
                 <div>个人简介</div>
                 <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
                 <div style="margin-top: 20px;">
-                  <t-textarea placeholder="请输入个人简介" :autosize="{ minRows: 15, maxRows: 20 }"
-                              v-model="formData.introduction"/>
+                  <div style="border: 1px solid #ccc;">
+                    <!-- 工具栏 -->
+                    <Toolbar
+                      style="border-bottom: 1px solid #ccc"
+                      mode="default"
+                      :editor="editorJJ"
+                      :defaultConfig="toolbarConfig"
+                    />
+
+                    <Editor
+                      style="height: 300px"
+                      v-model="formData.introduction"
+                      :defaultConfig="editorConfig"
+                      mode="default"
+                      @customPaste="customPaste"
+                      @onCreated="(e) => onCreatedJJ(e)"
+                    />
+                  </div>
                 </div>
               </div>
               <div style="width: 49%">
                 <div>主要成就以及获奖情况</div>
                 <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
                 <div style="margin-top: 20px;">
-                  <t-textarea placeholder="请输入主要成就以及获奖情况" :autosize="{ minRows: 15, maxRows: 20 }"
-                              v-model="formData.achievement_award"/>
+                  <div style="border: 1px solid #ccc;">
+                    <!-- 工具栏 -->
+                    <Toolbar
+                      style="border-bottom: 1px solid #ccc"
+                      mode="default"
+                      :editor="editorCJ"
+                      :defaultConfig="toolbarConfig"
+                    />
+
+                    <Editor
+                      style="height: 300px"
+                      v-model="formData.achievement_award"
+                      :defaultConfig="editorConfig"
+                      mode="default"
+                      @customPaste="customPaste"
+                      @onCreated="(e) => onCreatedCJ(e)"
+                    />
+                  </div>
                 </div>
               </div>
             </div>
@@ -238,8 +267,7 @@
               <t-space direction="vertical">
                 <t-form labelAlign="top" :labelWidth="100">
                   <t-form-item label="起止日期">
-                    <!--                  <t-input v-model="work.time" placeholder="起止日期"/>-->
-                    <t-date-range-picker size="large" v-model="work_time" allow-input  @change="onChange" />
+                    <t-date-range-picker mode="month" size="large" v-model="work_time" allow-input  @change="onChange" />
                   </t-form-item>
                   <t-form-item label="地区单位">
                     <t-input size="large" v-model="work.address" placeholder="请输入地区单位"/>
@@ -364,7 +392,7 @@
                       <t-input size="large" v-model="formData.enterprise_location" placeholder="请输入企业注册地"/>
                     </t-form-item>
                     <t-form-item label="注册资金（万元）">
-                      <t-input size="large" placeholder="注册资金（万元）"/>
+                      <t-input size="large" v-model="formData.registered_capital" placeholder="注册资金（万元）"/>
                     </t-form-item>
                     <t-form-item label="是否上市" name="name">
                       <t-select size="large" v-model="formData.if_list" :style="{ width: '200px' }">
@@ -444,7 +472,7 @@
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
                     <img v-if="formData.company_image!=''" :src="$store.state.user.apiUrl+formData.company_image"
-                         style="width: 100%;max-height: 200px;">
+                         style="width: 200px;max-height: 200px;">
                   </div>
                   <div style="margin: 10px 0px">请上传公司LOGO</div>
                   <t-upload
@@ -465,16 +493,48 @@
                 <div>公司介绍</div>
                 <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
                 <div style="margin-top: 20px;">
-                  <t-textarea placeholder="请输入公司介绍" :autosize="{ minRows: 15, maxRows: 20 }"
-                              v-model="formData.enterprise_Introduction"/>
+                  <div style="border: 1px solid #ccc;">
+                    <!-- 工具栏 -->
+                    <Toolbar
+                      style="border-bottom: 1px solid #ccc"
+                      mode="default"
+                      :editor="editorGS"
+                      :defaultConfig="toolbarConfig"
+                    />
+
+                    <Editor
+                      style="height: 300px"
+                      v-model="formData.enterprise_Introduction"
+                      :defaultConfig="editorConfig"
+                      mode="default"
+                      @customPaste="customPaste"
+                      @onCreated="(e) => onCreatedGS(e)"
+                    />
+                  </div>
                 </div>
               </div>
               <div style="width: 49%">
                 <div>主营业务介绍</div>
                 <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
                 <div style="margin-top: 20px;">
-                  <t-textarea placeholder="请输入主营业务介绍" :autosize="{ minRows: 15, maxRows: 20 }"
-                              v-model="formData.introdiction"/>
+                  <div style="border: 1px solid #ccc;">
+                    <!-- 工具栏 -->
+                    <Toolbar
+                      style="border-bottom: 1px solid #ccc"
+                      mode="default"
+                      :editor="editorZY"
+                      :defaultConfig="toolbarConfig"
+                    />
+
+                    <Editor
+                      style="height: 300px"
+                      v-model="formData.introdiction"
+                      :defaultConfig="editorConfig"
+                      mode="default"
+                      @customPaste="customPaste"
+                      @onCreated="(e) => onCreatedZY(e)"
+                    />
+                  </div>
                 </div>
               </div>
             </div>
@@ -483,16 +543,74 @@
                 <div>企业所获荣誉以及专利</div>
                 <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
                 <div style="margin-top: 20px;">
-                  <t-textarea placeholder="请输入企业所获荣誉以及专利" :autosize="{ minRows: 15, maxRows: 20 }"
-                              v-model="formData.enterprise_honor"/>
+                  <div style="border: 1px solid #ccc;">
+                    <!-- 工具栏 -->
+                    <Toolbar
+                      style="border-bottom: 1px solid #ccc"
+                      mode="default"
+                      :editor="editorRY"
+                      :defaultConfig="toolbarConfig"
+                    />
+
+                    <Editor
+                      style="height: 300px"
+                      v-model="formData.enterprise_honor"
+                      :defaultConfig="editorConfig"
+                      mode="default"
+                      @customPaste="customPaste"
+                      @onCreated="(e) => onCreatedRY(e)"
+                    />
+                  </div>
                 </div>
               </div>
               <div style="width: 49%">
                 <div>其他企业任职情况</div>
                 <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
                 <div style="margin-top: 20px;">
-                  <t-textarea placeholder="请输入其他企业任职情况" :autosize="{ minRows: 15, maxRows: 20 }"
-                              v-model="formData.qitaqiyerenzhiqingkuang"/>
+                  <div style="border: 1px solid #ccc;">
+                    <!-- 工具栏 -->
+                    <Toolbar
+                      style="border-bottom: 1px solid #ccc"
+                      mode="default"
+                      :editor="editorQT"
+                      :defaultConfig="toolbarConfig"
+                    />
+
+                    <Editor
+                      style="height: 300px"
+                      v-model="formData.qitaqiyerenzhiqingkuang"
+                      :defaultConfig="editorConfig"
+                      mode="default"
+                      @customPaste="customPaste"
+                      @onCreated="(e) => onCreatedQT(e)"
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div style="display: flex;justify-items: center;justify-content: space-between;margin-top: 20px">
+              <div style="width: 49%">
+                <div>企业履行社会责任情况</div>
+                <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
+                <div style="margin-top: 20px;">
+                  <div style="border: 1px solid #ccc;">
+                    <!-- 工具栏 -->
+                    <Toolbar
+                      style="border-bottom: 1px solid #ccc"
+                      mode="default"
+                      :editor="editorLX"
+                      :defaultConfig="toolbarConfig"
+                    />
+
+                    <Editor
+                      style="height: 300px"
+                      v-model="formData.enterprise_lvxingzeren"
+                      :defaultConfig="editorConfig"
+                      mode="default"
+                      @customPaste="customPaste"
+                      @onCreated="(e) => onCreatedLX(e)"
+                    />
+                  </div>
                 </div>
               </div>
             </div>
@@ -510,58 +628,121 @@
                     </t-select>
                   </t-form-item>
                 </t-form>
-                <t-form v-if="formData.if_organization==0" labelAlign="top"
-                        layout="inline">
-                  <t-form-item label="团组织性质" name="nature">
-                    <t-input size="large" v-model="formData.nature" placeholder="团组织性质"></t-input>
-                  </t-form-item>
-                  <t-form-item label="建团时间" name="jiantuan_time">
-                    <t-date-picker size="large" :style="{ width: '200px' }" v-model="formData.jiantuan_time"/>
-                  </t-form-item>
-                  <t-form-item label="建团人数" name="jiantuan_number">
-                    <t-input size="large" v-model="formData.jiantuan_number" placeholder="建团人数"></t-input>
-                  </t-form-item>
-                  <t-form-item label="青年人数" name="youth_number">
-                    <t-input size="large" v-model="formData.youth_number" placeholder="青年人数"></t-input>
-                  </t-form-item>
-                  <t-form-item label="上级团组织" name="superior_nature">
-                    <t-input size="large" v-model="formData.superior_nature" placeholder="上级团组织"></t-input>
-                  </t-form-item>
-                  <t-form-item label="团委负责人信息" name="tuanweifuzerenxinxi">
-                    <t-input size="large" v-model="formData.tuanweifuzerenxinxi" placeholder="团委负责人信息"></t-input>
-                  </t-form-item>
-                  <t-form-item label="批复文件">
-                    <!--                  <t-upload-->
-                    <!--                    :action="$store.state.user.apiUrl+'/api/common/upload'"-->
-                    <!--                    v-model="formData.documents_file_show"-->
-                    <!--                    theme="image"-->
-                    <!--                    tips="请选择批复文件(图片)"-->
-                    <!--                    accept="image/*"-->
-                    <!--                    :format-response="(response) => formatResponse(response, 4)"-->
-                    <!--                  ></t-upload>-->
-                    <div style="text-align: center">
-                      <div class="sfz">
-                  <span v-if="formData.documents_file==''"><svg style=" font-size: 30px;" fill="none" viewBox="0 0 24 24" width="100px" height="100px" class="t-icon t-icon-add"
+                <div v-if="formData.if_organization==0">
+                  <div style="display: flex">
+                    <div>
+                      <t-form labelAlign="top"
+                              layout="inline">
+                        <t-form-item label="团组织性质" name="nature">
+                          <t-select size="large" v-model="formData.nature" placeholder="团组织性质"
+                                    :style="{ width: '200px' }">
+                            <t-option value="团支部" label="团支部" key="团支部"></t-option>
+                            <t-option value="团总支部" label="团总支部" key="团总支部"></t-option>
+                            <t-option value="团的基层委员会" label="团的基层委员会" key="团的基层委员会"></t-option>
+                          </t-select>
+                        </t-form-item>
+                        <t-form-item label="建团时间" name="jiantuan_time">
+                          <t-date-picker size="large" :style="{ width: '200px' }" v-model="formData.jiantuan_time"/>
+                        </t-form-item>
+                        <t-form-item label="建团人数" name="jiantuan_number">
+                          <t-input size="large" v-model="formData.jiantuan_number" placeholder="建团人数"></t-input>
+                        </t-form-item>
+
+                        <!--                <t-form-item label="团委负责人信息" name="tuanweifuzerenxinxi">-->
+                        <!--                  <t-input size="large" v-model="formData.tuanweifuzerenxinxi" placeholder="团委负责人信息"></t-input>-->
+                        <!--                </t-form-item>-->
+                      </t-form>
+                      <t-form labelAlign="top"
+                              layout="inline" style="margin-top: 10px">
+                        <t-form-item label="青年人数" name="youth_number">
+                          <t-input size="large" v-model="formData.youth_number" placeholder="青年人数"></t-input>
+                        </t-form-item>
+                        <t-form-item label="上级团组织" name="superior_nature">
+                          <t-input size="large" v-model="formData.superior_nature" placeholder="上级团组织"></t-input>
+                        </t-form-item>
+                      </t-form>
+                    </div>
+                    <div>
+                      <div style="text-align: center">
+                        <div class="sfz">
+                  <span v-if="formData.documents_file==''"><svg style=" font-size: 30px;" fill="none"
+                                                                viewBox="0 0 24 24" width="100px" height="100px"
+                                                                class="t-icon t-icon-add"
                                                                 v-if="formData.documents_file==''">
                     <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                   </svg></span>
-                        <img v-if="formData.documents_file!=''" :src="$store.state.user.apiUrl+formData.documents_file"
-                             style="width: 100%;max-height: 200px;">
+                          <img v-if="formData.documents_file!=''"
+                               :src="$store.state.user.apiUrl+formData.documents_file"
+                               style="width: 100%;max-height: 200px;">
+                        </div>
+                        <div style="margin: 10px 0px">请上传批复文件</div>
+                        <t-upload
+                          :action="$store.state.user.apiUrl+'/api/common/upload'"
+                          v-model="formData.company_image_show"
+                          :data="{association_id:1}"
+                          theme="custom"
+                          accept="image/*"
+                          :format-response="(response) => formatResponse(response, 4)"
+                        >
+                          <t-button>上传图片</t-button>
+                        </t-upload>
                       </div>
-                      <div style="margin: 10px 0px">请上传批复文件</div>
-                      <t-upload
-                        :action="$store.state.user.apiUrl+'/api/common/upload'"
-                        v-model="formData.company_image_show"
-                        :data="{association_id:1}"
-                        theme="custom"
-                        accept="image/*"
-                        :format-response="(response) => formatResponse(response, 4)"
-                      >
-                        <t-button>上传图片</t-button>
-                      </t-upload>
                     </div>
-                  </t-form-item>
-                </t-form>
+                  </div>
+
+                  <div style="margin-top: 30px">团委负责人信息</div>
+                  <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
+                  <div style="display: flex;margin-top: 20px">
+                    <div style="width: 30%">
+                      <t-space direction="vertical">
+                        <t-form labelAlign="top" :labelWidth="100">
+                          <t-form-item label="姓名">
+                            <t-input size="large" v-model="tuan.name" placeholder="姓名"/>
+                          </t-form-item>
+                          <t-form-item label="性别">
+                            <t-input size="large" v-model="tuan.sex" placeholder="性别"/>
+                          </t-form-item>
+                          <t-form-item label="单位职务">
+                            <t-input size="large" v-model="tuan.job" placeholder="单位职务"/>
+                          </t-form-item>
+                          <t-form-item label="团委职务">
+                            <t-input size="large" v-model="tuan.tun_job" placeholder="团委职务"/>
+                          </t-form-item>
+                          <t-form-item label="手机号">
+                            <t-input size="large" v-model="tuan.phone" placeholder="手机号"/>
+                          </t-form-item>
+                        </t-form>
+                        <t-button @click="addTuan" theme="primary">添加</t-button>
+                      </t-space>
+                    </div>
+                    <div style="width: 100%">
+                      <table style="width: 100%; border-collapse: collapse;">
+                        <thead>
+                        <tr align="center">
+                          <th>姓名</th>
+                          <th>性别</th>
+                          <th>单位职务</th>
+                          <th>团委职务</th>
+                          <th>手机号</th>
+                          <th>操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr align="center" v-for="(item, index) in tuan_list" :key="index">
+                          <td>{{ item.name }}</td>
+                          <td>{{ item.sex }}</td>
+                          <td>{{ item.job }}</td>
+                          <td>{{ item.tun_job }}</td>
+                          <td>{{ item.phone }}</td>
+                          <td style="text-align: center">
+                            <t-button @click="delTuan(index)" theme="danger" size="small">移除</t-button>
+                          </td>
+                        </tr>
+                        </tbody>
+                      </table>
+                    </div>
+                  </div>
+                </div>
               </t-space>
             </div>
           </div>
@@ -610,6 +791,7 @@
   </div>
 </template>
 <script lang="ts">
+import {Editor, Toolbar} from '@wangeditor/editor-for-vue';
 import {UserIcon, LockOnIcon, CheckCircleIcon} from 'tdesign-icons-vue';
 import store from '@/store';
 import {VueCropper} from 'vue-cropper';
@@ -621,9 +803,37 @@ export default {
     CheckCircleIcon,
     UserIcon,
     LockOnIcon,
+  Editor, Toolbar
   },
   data() {
     return {
+      editorJJ:null,
+      editorCJ:null,
+      editorGS:null,
+      editorZY:null,
+      editorRY:null,
+      editorQT:null,
+      editorLX:null,
+      toolbarConfig: {
+        showLinkImg: false,
+        uploadImgShowBase64: true,
+        excludeKeys: [
+          'insertVideo', // 删除视频
+          'uploadVideo',
+          'group-video',
+          'insertImage',// 删除网络图片上传
+          'uploadImage',
+          'group-image',
+          'insertLink',// 删除链接
+          'insertTable',// 删除表格
+          'codeBlock',// 删除代码块
+        ]
+      },
+      editorConfig: {
+        placeholder: '',
+        readOnly: false, // 是否只允许阅读，不可编辑
+        autoFocus: true,
+      },
       caiMode: false,
       previews: {},
       caiImg: '',
@@ -640,11 +850,22 @@ export default {
         post: '',
         phone: '',
       },
+      tuan:{
+        name: '',
+        sex: '',
+        job: '',
+        tun_job: '',
+        phone: '',
+      },
+      tuan_list: [],
       contactsList: [],
       social_duties: [],
       member_list:[],
       formData: {
-        work_unit:'',
+        enterprise_lvxingzeren:'',
+        mail_address:'',
+        source_channel:'',
+        intentional_association_position:'',
         recommended_cities:'',
         recommendation_id:'',
         reporting_method:'',
@@ -661,7 +882,8 @@ export default {
         education: '',
         academic_degree: '',
         card_number: '',
-        // work_unit: '',
+        work_unit: '',
+        zip_code:'',
         unit_position: '',
         wx_number: '',
         mailbox: '',
@@ -731,7 +953,58 @@ export default {
     this.getMemberList();
   },
   methods: {
+    onChange(value, context) {
+      this.work.time = value[0] + '至' + value[1];
+    },
+    addTuan(){
+      if(this.tuan.name==''){
+        this.$message.error('请输入姓名！', 1500);
+        return;
+      }
+      if(this.tuan.sex==''){
+        this.$message.error('请输入性别！', 1500);
+        return;
+      }
+      if(this.tuan.job==''){
+        this.$message.error('请输入单位职务！', 1500);
+        return;
+      }
+      if(this.tuan.tun_job==''){
+        this.$message.error('请输入团委职务！', 1500);
+        return;
+      }
+      if(this.tuan.phone==''){
+        this.$message.error('请输入手机号！', 1500);
+        return;
+      }
+      var k = {...this.tuan};
+      this.tuan_list.push(k);
+      this.tuan.name = '';
+      this.tuan.sex = '';
+      this.tuan.job = '';
+      this.tuan.tun_job = '';
+      this.tuan.phone = '';
+    },
+    delTuan(index) {
+      this.tuan_list.splice(index, 1);
+    },
     addWork() {
+      if(this.workList.length>=12){
+        this.$message.error('最多添加12条数据！', 1500);
+        return;
+      }
+      if(this.work.time==''){
+        this.$message.error('请输入起止日期！', 1500);
+        return;
+      }
+      if(this.work.address==''){
+        this.$message.error('请输入地区单位！', 1500);
+        return;
+      }
+      if(this.work.book==''){
+        this.$message.error('请输入担任职务！', 1500);
+        return;
+      }
       var k = {...this.work};
       this.workList.push(k);
       this.work.time = '';
@@ -739,10 +1012,23 @@ export default {
       this.work.book = '';
       this.work_time=[];
     },
+
     delWork(index) {
       this.workList.splice(index, 1);
     },
     addContacts() {
+      if(this.contacts.name==''){
+        this.$message.error('请输入姓名！', 1500);
+        return;
+      }
+      if(this.contacts.post==''){
+        this.$message.error('请输入职务！', 1500);
+        return;
+      }
+      if(this.contacts.phone==''){
+        this.$message.error('请输入电话！', 1500);
+        return;
+      }
       var k = {...this.contacts};
       this.contactsList.push(k);
       this.contacts.name = '';
@@ -870,10 +1156,6 @@ export default {
           console.log(e);
         });
     },
-    onChange(val, context) {
-      console.log(val, context);
-      console.log('path: ', context.node.getPath());
-    },
     getIndustry() {
       this.$request
         .post("/industry")
@@ -922,7 +1204,7 @@ export default {
           this.formData.education = res.data.education;
           this.formData.academic_degree = res.data.academic_degree;
           this.formData.card_number = res.data.card_number;
-          // this.formData.work_unit = res.data.work_unit;
+          this.formData.work_unit = res.data.work_unit;
           this.formData.unit_position = res.data.unit_position;
           this.formData.wx_number = res.data.wx_number;
           this.formData.mailbox = res.data.mailbox;
@@ -964,7 +1246,7 @@ export default {
           this.formData.unified_code = res.data.unified_code;
           this.formData.enterprise_nature = res.data.enterprise_nature;
           this.formData.enterprise_website = res.data.enterprise_website;
-          this.formData.if_list = res.data.if_list;
+          this.formData.if_list = res.data.if_list+'';
           this.formData.employee = res.data.employee;
           this.formData.previous_revenue = res.data.previous_revenue;
           this.formData.previous_tax = res.data.previous_tax;
@@ -974,7 +1256,7 @@ export default {
           this.formData.enterprise_Introduction = res.data.enterprise_Introduction;
           this.formData.introdiction = res.data.introdiction;
           this.formData.enterprise_honor = res.data.enterprise_honor;
-          this.formData.if_organization = res.data.if_organization;
+          this.formData.if_organization = res.data.if_organization+'';
           this.formData.nature = res.data.nature;
           this.formData.jiantuan_time = res.data.jiantuan_time;
           this.formData.jiantuan_number = res.data.jiantuan_number;
@@ -986,13 +1268,29 @@ export default {
           this.formData.documents_file_show = [{url: store.state.user.apiUrl + res.data.documents_file}];
           this.formData.introduction = res.data.introduction;
           this.formData.enterprise_name = res.data.enterprise_name;
-          this.workList = JSON.parse(res.data.work_experience);
+          if(res.data.work_experience==null||res.data.work_experience==''){
+            this.workList = [];
+          }else{
+            this.workList = JSON.parse(res.data.work_experience);
+          }
           this.social_duties = res.data.main_social_positions.split(',');
-          this.contactsList = JSON.parse(res.data.other_contacts);
+          if(res.data.other_contacts==null||res.data.other_contacts==''){
+            this.contactsList = [];
+          }else{
+            this.contactsList = JSON.parse(res.data.other_contacts);
+          }
+
           this.formData.reporting_method = res.data.reporting_method;
           this.formData.recommendation_id=res.data.recommendation_id;
           this.formData.recommendation_content = res.data.recommendation_content;
           this.formData.recommended_cities=res.data.recommended_cities;
+          this.formData.source_channel=res.data.source_channel;
+          this.formData.intentional_association_position=res.data.intentional_association_position;
+          this.formData.mail_address=res.data.mail_address;
+          this.formData.zip_code=res.data.zip_code;
+          this.formData.registered_capital=res.data.registered_capital;
+          this.tuan_list = JSON.parse(res.data.tuanweifuzerenxinxi);
+          this.formData.enterprise_lvxingzeren=res.data.enterprise_lvxingzeren;
         })
         .catch((e) => {
           console.log(e);
@@ -1113,7 +1411,24 @@ export default {
       //   }
       // }
       this.formData.member_id = this.id;
-      console.log(this.formData);
+      if (this.workList.length > 0) {
+
+        this.formData.work_experience = JSON.stringify(this.workList);
+      }
+      if (this.contactsList.length > 0) {
+        this.formData.other_contacts = JSON.stringify(this.contactsList);
+      }
+      if (this.tuan_list.length > 0) {
+        this.formData.tuanweifuzerenxinxi = JSON.stringify(this.tuan_list);
+      }
+      if (this.social_duties.length > 0) {
+        const splitAndJoin = this.social_duties
+          .map(item => item.split(','))
+          .flat()
+          .filter(item => item.trim() !== '') // 过滤掉空字符串和仅含空格的字符串
+          .join(',');
+        this.formData.main_social_positions = splitAndJoin;
+      }
       this.$request
         .post("/member/update", this.formData)
         .then((res) => {
@@ -1129,10 +1444,41 @@ export default {
           console.log(e);
         });
     },
+    onCreatedJJ(editor) {
+      this.editorJJ= Object.seal(editor);
+    },
+    onCreatedCJ(editor) {
+      this.editorCJ= Object.seal(editor);
+    },
+    onCreatedGS(editor) {
+      this.editorGS= Object.seal(editor);
+    },
+    onCreatedZY(editor) {
+      this.editorZY= Object.seal(editor);
+    },
+    onCreatedRY(editor) {
+      this.editorRY= Object.seal(editor);
+    },
+    onCreatedQT(editor) {
+      this.editorQT= Object.seal(editor);
+    },
+    onCreatedLX(editor) {
+      this.editorLX= Object.seal(editor);
+    },
+    customPaste(editor, event, callback) {
+      console.log('ClipboardEvent 粘贴事件对象', event)
+      var text = event.clipboardData.getData('text/plain')
+      text=text.replace(/\s+/g, '');
+      editor.insertText(text)
+      event.preventDefault()
+      callback(false)
+      // 返回 true ，继续默认的粘贴行为
+    },
   },
 
 };
 </script>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
 <style scoped lang="less">
 .cropper-content {
   display: flex;
diff --git a/src/pages/user/user_index.vue b/src/pages/user/user_index.vue
index 353b067..63792ea 100644
--- a/src/pages/user/user_index.vue
+++ b/src/pages/user/user_index.vue
@@ -15,44 +15,39 @@
               class="form-item-content"
               type="search"
               placeholder="请输入会员姓名"
+              style="width: 150px"
             />
           </t-form-item>
           <t-form-item label="手机号" name="phone">
             <t-input
               v-model="formData.phone"
               class="form-item-content"
-              placeholder="请输入手机号"
+              placeholder="请输入手机号" style="width: 150px"
             />
           </t-form-item>
           <t-form-item label="职务" name="phone">
-            <t-select v-model="formData.position_id" style="width: 200px">
+            <t-select v-model="formData.position_id" style="width: 150px">
               <t-option label="全部" value=""/>
               <t-option v-for="(item,index) in positionList" :label="item.position_name" :value="item.id"/>
             </t-select>
           </t-form-item>
           <t-form-item label="区域" name="phone">
-            <t-cascader v-model="formData.region_id" :options="region_list"></t-cascader>
-<!--            <t-select v-model="formData.region_id" style="width: 200px">-->
-<!--              <t-option label="全部" value=""/>-->
-<!--              <t-option v-for="(item,index) in region_list" :label="item.region_name" :value="item.id"/>-->
-<!--            -->
-<!--            </t-select>-->
+            <t-cascader v-model="formData.region_id" :options="region_list" style="width: 150px"></t-cascader>
           </t-form-item>
           <t-form-item label="届数" name="phone">
-            <t-select v-model="formData.number_of_sessions" style="width: 200px">
+            <t-select v-model="formData.number_of_sessions" style="width: 150px">
               <t-option label="全部" :value="0"/>
               <t-option label="第十二届" :value="12"/>
             </t-select>
           </t-form-item>
-           <div>
-             <t-space>
-             <t-button theme="primary" type="submit" :style="{ marginLeft: '8px' }"> 查询</t-button>
-             <t-button theme="success" @click="()=>$router.push('/user/user_add')"> 新增会员</t-button>
-               <t-button @click="dow" shape="circle" theme="primary">
-                 <cloud-download-icon slot="icon" />
-               </t-button>
-             </t-space>
-           </div>
+          <div>
+            <t-space>
+              <t-button theme="primary" type="submit" :style="{ marginLeft: '8px' }"> 查询</t-button>
+              <t-button theme="success" @click="()=>$router.push('/user/user_add')"> 新增会员</t-button>
+              <t-button @click="dow" theme="primary">{{ selectedRowKeys.length > 0 ? '选中导出' : '导出全部' }}
+              </t-button>
+            </t-space>
+          </div>
         </t-row>
       </t-form>
       <t-tabs v-model="tabIndex" @change="tabIndexChange">
@@ -62,7 +57,7 @@
         <t-tab-panel :value="2" label="已拒绝" :destroyOnHide="false"></t-tab-panel>
       </t-tabs>
       <t-table
-        rowKey="index"
+        row-key="member_id"
         :data="list"
         :columns="columns"
         :stripe="false"
@@ -70,7 +65,9 @@
         :hover="true"
         size="large"
         table-layout="auto"
-        cellEmptyContent="-" c
+        cellEmptyContent="-"
+        :selected-row-keys="selectedRowKeys"
+        @select-change="rehandleSelectChange"
       >
         <template #photo_image="{ row }">
           <img v-if="row.photo_image" :src="$store.state.user.apiUrl+row.photo_image" style="width: 50px;height: 50px">
@@ -113,6 +110,7 @@
 import store from "@/store";
 import {toInteger} from "lodash";
 import {CloudDownloadIcon} from 'tdesign-icons-vue';
+
 export default {
   components: {
     CloudDownloadIcon,
@@ -122,7 +120,13 @@ export default {
       association: {},
       list: [],
       tabIndex: 1,
+      selectedRowKeys: [],
       columns: [
+        {
+          colKey: 'row-select',
+          type: 'multiple',
+          width: 50,
+        },
         {colKey: 'member_id', title: '会员ID'},
         {colKey: 'photo_image', title: '形象照'},
         {colKey: 'nikename', title: '会员姓名'},
@@ -138,10 +142,10 @@ export default {
       size: 10,
       formData: {
         position_id: '',
-        region_id:'' ,
+        region_id: '',
         nikename: '',
         phone: '',
-        number_of_sessions:0,
+        number_of_sessions: 0,
       },
       positionList: [],
       region_list: [],
@@ -166,9 +170,17 @@ export default {
     this.getRegion();
   },
   methods: {
-    dow(){
+    rehandleSelectChange(value, {selectedRowData}) {
+      this.selectedRowKeys = value;
+      console.log(value, selectedRowData);
+    },
+    dow() {
+      var ids = '';
+      if (this.selectedRowKeys.length > 0) {
+        ids = JSON.stringify(this.selectedRowKeys);
+      }
       var token = store.state.user.token;
-      window.location.href="https://hnyea.0rui.cn/api/excel_controller/memberexport?token="+token;
+      window.location.href = "https://hnyea.0rui.cn/api/excel_controller/memberexport?token=" + token + "&ids=" + ids+"&if_xianshi="+this.tabIndex;
     },
     getRegion() {
       this.$request
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index 6369b87..1eea367 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -13,16 +13,30 @@
           <div style="color: #2E2E2E;font-size: 28px;font-weight: bold">1.入会资料</div>
           <div style="height: 2px;background-color: #999999;width: 100%;margin-top: 20px"></div>
           <div style="padding: 30px 0px">
-            <table>
+            <table class="my_table">
               <tr>
-                <td style="padding:0px 30px">
-                  推荐方式：
+                <td>推荐方式</td>
+                <td>
                   <span v-if="info.reporting_method==1">组织推荐</span>
                   <span v-if="info.reporting_method==2">会员推荐</span>
                   <span v-if="info.reporting_method==3">个人自荐</span>
                 </td>
-                <td style="padding:0px 30px">推荐人：{{ info.recommendation_name }}</td>
-                <td style="padding:0px 30px">推荐人单位名称及职务：{{ info.recommendation_content }}</td>
+                <template v-if="info.reporting_method==1">
+                  <td>推荐地市</td>
+                  <td>{{ info.recommended_cities }}</td>
+                </template>
+                <template v-if="info.reporting_method==3">
+                  <td>来源渠道</td>
+                  <td>{{ info.source_channel }}</td>
+                </template>
+                <template v-if="info.reporting_method==2">
+                  <td>推荐人姓名</td>
+                  <td>{{ info.recommendation_id }}</td>
+                  <td>推荐人单位及职务</td>
+                  <td>{{ info.recommendation_content }}</td>
+                </template>
+                <td>意向协会职务</td>
+                <td>{{ info.intentional_association_position }}</td>
               </tr>
             </table>
           </div>
@@ -31,66 +45,115 @@
           <div style="color: #2E2E2E;font-size: 28px;font-weight: bold">2.基本信息</div>
           <div style="height: 2px;background-color: #999999;width: 100%;margin-top: 20px"></div>
           <div style="padding: 30px 0px">
-            <table>
+            <table class="my_table">
               <tr>
-                <td rowspan="3" style="padding:0px 30px">
-                  <img :src="$store.state.user.apiUrl+info.photo_image" style="width: 110px;height: 110px;"></td>
-                <td style="padding:0px 30px">姓名：{{ info.nikename }}</td>
-                <td style="padding:0px 30px">性别：{{ info.gender == 0 ? '女' : '男' }}</td>
-                <td style="padding:0px 30px">手机号：{{ info.phone }}</td>
-                <td style="padding:0px 30px">区域：{{ info.region_name }}</td>
-                <td style="padding:0px 30px">出生年月日：{{ info.birth_time }}</td>
-              </tr>
-              <tr>
-                <td style="padding:0px 30px">毕业院校：{{ info.institution }}</td>
-                <td style="padding:0px 30px" colspan="2">身份证号码：{{ info.card_number }}</td>
-                <td style="padding:0px 30px">籍贯：{{ info.jiguan }}</td>
-                <td style="padding:0px 30px">邮箱：{{ info.mailbox }}</td>
-              </tr>
-              <tr>
-                <td style="padding:0px 30px">政治面貌：{{ info.political }}</td>
-                <td style="padding:0px 30px">民族：{{ info.nation }}</td>
-                <td style="padding:0px 30px">单位职务：{{ info.unit_position }}</td>
-                <td style="padding:0px 30px">学位：{{ info.academic_degree }}</td>
-              </tr>
-              <tr align="center">
-                <td colspan="4" style="padding-top: 30px">
-                  身份证正面照：
-                  <img :src="$store.state.user.apiUrl+info.cardz_image" style="height: 150px;"></td>
-                <td colspan="4" style="padding-top: 30px">
-                  身份证背面照：
-                  <img :src="$store.state.user.apiUrl+info.cardf_image" style="height: 150px;"></td>
-              </tr>
-              <tr align="center">
-                <td colspan="4" style="padding-top: 50px">
-                  <div style="font-size: 18px;font-weight: 600;">个人简介</div>
-                  <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
+                <td rowspan="5">
+                  <t-image-viewer :images="[$store.state.user.apiUrl+info.photo_image]" mode="modeless"
+                                  :closeOnEscKeydown="false">
+                    <template #trigger="{ open }">
+                      <div style="cursor: pointer" @click="open">
+                        <img :src="$store.state.user.apiUrl+info.photo_image" style="width: 200px;height: 200px;">
+                      </div>
+                    </template>
+                  </t-image-viewer>
                 </td>
-                <td colspan="4" style="padding-top: 50px">
+                <td>姓名</td>
+                <td>{{ info.nikename }}</td>
+                <td>性别</td>
+                <td>{{ info.gender == 0 ? '女' : '男' }}</td>
+                <td>出生年月日</td>
+                <td>{{ info.birth_time }}</td>
+                <td>民族</td>
+                <td>{{ info.nation }}</td>
+              </tr>
+              <tr>
+                <td>政治面貌</td>
+                <td>{{ info.political }}</td>
+                <td>身份证号码</td>
+                <td>{{ info.card_number }}</td>
+                <td>工作单位</td>
+                <td>{{ info.work_unit }}</td>
+                <td>单位职务</td>
+                <td>{{ info.unit_position }}</td>
+              </tr>
+              <tr>
+                <td>通讯地址</td>
+                <td>{{ info.mail_address }}</td>
+                <td>籍贯</td>
+                <td>{{ info.jiguan }}</td>
+                <td>毕业院校</td>
+                <td>{{ info.institution }}</td>
+                <td>学历</td>
+                <td>{{ info.education }}</td>
+              </tr>
+              <tr>
+                <td>学位</td>
+                <td>{{ info.academic_degree }}</td>
+                <td>邮编</td>
+                <td>{{ info.zip_code }}</td>
+                <td>手机号</td>
+                <td>{{ info.phone }}</td>
+                <td>邮箱</td>
+                <td>{{ info.mailbox }}</td>
+              </tr>
+              <tr>
+                <td>微信</td>
+                <td>{{ info.wx_number }}</td>
+                <td>固定电话</td>
+                <td>{{ info.fixed_telephone }}</td>
+                <td>所在区域</td>
+                <td colspan="3">{{ info.region_name }}</td>
+              </tr>
+              <tr align="center">
+                <td>身份证正面照</td>
+                <td colspan="4" style="padding-top: 30px">
+                  <t-image-viewer :images="[$store.state.user.apiUrl+info.cardz_image]" mode="modeless"
+                                  :closeOnEscKeydown="false">
+                    <template #trigger="{ open }">
+                      <div style="cursor: pointer" @click="open">
+                        <img :src="$store.state.user.apiUrl+info.cardz_image" style="height: 150px;">
+                      </div>
+                    </template>
+                  </t-image-viewer>
+                </td>
+                <td>身份证背面照</td>
+                <td colspan="4" style="padding-top: 30px">
+                  <t-image-viewer :images="[$store.state.user.apiUrl+info.cardf_image]" mode="modeless"
+                                  :closeOnEscKeydown="false">
+                    <template #trigger="{ open }">
+                      <div style="cursor: pointer" @click="open">
+                        <img :src="$store.state.user.apiUrl+info.cardf_image" style="height: 150px;">
+                      </div>
+                    </template>
+                  </t-image-viewer>
+                </td>
+              </tr>
+              <tr align="center">
+                <td colspan="5">
+                  <div style="font-size: 18px;font-weight: 600;">个人简介</div>
+                </td>
+                <td colspan="5">
                   <div style="font-size: 18px;font-weight: 600">主要成就以及获奖情况</div>
-                  <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
                 </td>
               </tr>
               <tr >
-                <td colspan="4" style="width: 50%;padding:0px 30px">
-                  {{info.introduction}}
+                <td colspan="5">
+                  <div style="text-align: left" v-html="info.introduction"></div>
                 </td>
-                <td colspan="4" style="width: 50%;padding:0px 30px">
-                  {{info.achievement_award}}
+                <td colspan="5">
+                  <div style="text-align: left" v-html="info.achievement_award"></div>
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="4" style="padding-top: 50px">
+                <td colspan="5">
                   <div style="font-size: 18px;font-weight: 600">学习工作经历</div>
-                  <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
                 </td>
-                <td colspan="4" style="padding-top: 50px">
+                <td colspan="5">
                   <div style="font-size: 18px;font-weight: 600">社会职务资料</div>
-                  <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="4">
+                <td colspan="5">
                   <table style="width: 100%; text-align: center; border-collapse: collapse;">
                     <thead>
                     <tr>
@@ -108,21 +171,17 @@
                     </tbody>
                   </table>
                 </td>
-                <td colspan="4">
-                  {{info.main_social_positions}},{{info.other_social_positions}}
+                <td colspan="5">
+                  {{ info.main_social_positions }},{{ info.other_social_positions }}
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="4" style="padding-top: 30px">
-                  <div style="font-size: 18px;font-weight: 600">其他联系人</div>
-                  <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
-                </td>
-                <td colspan="4" style="padding-top: 30px">
-
+                <td colspan="5">
+                  <div style="font-size: 18px;font-weight: 600">紧急（助理）联系人</div>
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="4">
+                <td colspan="5">
                   <table style="width: 100%; text-align: center; border-collapse: collapse;">
                     <thead>
                     <tr>
@@ -146,38 +205,179 @@
         </div>
         <div style="margin-top: 30px">
           <div style="color: #2E2E2E;font-size: 28px;font-weight: bold">3.企业信息</div>
+          <div style="height: 2px;background-color: #999999;width: 100%;margin-top: 20px"></div>
           <div style="padding: 30px 0px">
-            <table>
-              <tr style="padding-top: 30px;display: inline-block">
-                <td style="padding:0px 30px" colspan="3">企业名称 ：{{ info.nikename }}</td>
-                <td style="padding:0px 30px" >统一社会信用代码 ：{{ info.unified_code }}</td>
-                <td style="padding:0px 30px">企业注册地 ：{{ info.enterprise_location }}</td>
-                <td style="padding:0px 30px">员工人数 ：{{ info.employee }}</td>
-                <td style="padding:0px 30px">是否上市 ：{{ info.if_list==0?'是':'否' }}</td>
-                <td style="padding:0px 30px">企业性质 ：{{ info.enterprise_nature }}</td>
+            <table class="my_table">
+              <tr>
+                <td>企业名称</td>
+                <td>{{ info.nikename }}</td>
+                <td>统一社会信用代码</td>
+                <td colspan="2">{{ info.unified_code }}</td>
+                <td>企业注册地</td>
+                <td colspan="2">{{ info.enterprise_location }}</td>
+                <td>注册资金（万元）</td>
+                <td>{{ info.registered_capital }}</td>
               </tr>
-              <tr style="padding-top: 30px;display: inline-block">
-                <td style="padding:0px 30px">所属行业 ：{{ info.industry_name }}</td>
-                <td style="padding:0px 30px">企业网址 ：{{ info.enterprise_website }}</td>
+              <tr>
+                <td>员工人数</td>
+                <td>{{ info.employee }}</td>
+                <td>是否上市</td>
+                <td>{{ info.if_list == 0 ? '是' : '否' }}</td>
+                <td>企业性质</td>
+                <td>{{ info.enterprise_nature }}</td>
+                <td>所属行业</td>
+                <td>{{ info.industry_name }}</td>
+                <td>企业网址</td>
+                <td>{{ info.enterprise_website }}</td>
               </tr>
-              <tr style="padding-top: 30px;display: inline-block">
-                <td style="padding:0px 30px">上年营业额（万元） ：{{ info.previous_revenue }}</td>
-                <td style="padding:0px 30px">上年纳税额（万元） ：{{ info.previous_tax }}</td>
-                <td style="padding:0px 30px">上年度净利润（万元） ：{{ info.previous_profit }}</td>
-                <td style="padding:0px 30px">上年公益性捐赠支出（万元） ：{{ info.previous_donation }}</td>
+              <tr>
+                <td>上年营业额（万元）</td>
+                <td>{{ info.previous_revenue }}</td>
+                <td>上年纳税额（万元）</td>
+                <td>{{ info.previous_tax }}</td>
+                <td>上年度净利润（万元）</td>
+                <td colspan="2">{{ info.previous_profit }}</td>
+                <td>上年公益性捐赠支出（万元）</td>
+                <td colspan="2">{{ info.previous_donation }}</td>
+              </tr>
+              <tr>
+                <td>
+                  营业执照
+                </td>
+                <td colspan="4">
+                  <t-image-viewer :images="[$store.state.user.apiUrl+info.business_license_image]" mode="modeless"
+                                  :closeOnEscKeydown="false">
+                    <template #trigger="{ open }">
+                      <div style="cursor: pointer" @click="open">
+                        <img :src="$store.state.user.apiUrl + info.business_license_image" style="height: 150px; ">
+                      </div>
+                    </template>
+                  </t-image-viewer>
+                </td>
+                <td>
+                  公司LOGO
+                </td>
+                <td colspan="4">
+                  <t-image-viewer :images="[$store.state.user.apiUrl+info.company_image]" mode="modeless"
+                                  :closeOnEscKeydown="false">
+                    <template #trigger="{ open }">
+                      <div style="cursor: pointer" @click="open">
+                        <img :src="$store.state.user.apiUrl + info.company_image" style="height: 150px; ">
+                      </div>
+                    </template>
+                  </t-image-viewer>
+                </td>
+              </tr>
+              <tr align="center">
+                <td colspan="5">
+                  <div style="font-size: 18px;font-weight: 600">公司介绍</div>
+                </td>
+                <td colspan="5">
+                  <div style="font-size: 18px;font-weight: 600">主营业务介绍</div>
+                </td>
+              </tr>
+              <tr align="center">
+                <td colspan="5">
+                  <div style="text-align: left" v-html="info.enterprise_Introduction"></div>
+                </td>
+                <td colspan="5">
+                  <div style="text-align: left" v-html="info.introdiction"></div>
+                </td>
+              </tr>
+              <tr align="center">
+                <td colspan="5">
+                  <div style="font-size: 18px;font-weight: 600">企业所获荣誉以及专利</div>
+                </td>
+                <td colspan="5">
+                  <div style="font-size: 18px;font-weight: 600">其他企业任职情况</div>
+                </td>
+              </tr>
+              <tr align="center">
+                <td colspan="5">
+                  <div style="text-align: left" v-html="info.enterprise_honor"></div>
+                </td>
+                <td colspan="5">
+                  <div style="text-align: left" v-html="info.qitaqiyerenzhiqingkuang"></div>
+                </td>
+              </tr>
+              <tr align="center">
+                <td colspan="5">
+                  <div style="font-size: 18px;font-weight: 600">企业履行社会责任情况</div>
+                </td>
+              </tr>
+              <tr align="center">
+                <td colspan="5">
+                  <div style="text-align: left" v-html="info.enterprise_lvxingzeren"></div>
+                </td>
               </tr>
             </table>
-            <table align="center" style="margin-top: 50px">
-              <tr align="center">
-                <td style="text-align: center;">
-                  营业执照：<br>
-                  <img :src="$store.state.user.apiUrl + info.business_license_image" style="height: 150px; ">
-                </td>
-                <td style="text-align: center;padding-left: 100px">
-                  公司LOGO：<br>
-                  <img :src="$store.state.user.apiUrl + info.company_image" style="height: 150px; ">
-                </td>
+          </div>
+        </div>
+        <div style="margin-top: 30px">
+          <div style="color: #2E2E2E;font-size: 28px;font-weight: bold">4.建团信息</div>
+          <div style="height: 2px;background-color: #999999;width: 100%;margin-top: 20px"></div>
+          <div style="margin-top: 30px">
+            <table class="my_table">
+              <tr>
+                <td>是否建立团组织</td>
+                <td>{{ info.if_organization == 0 ? '是' : '否' }}</td>
+                <template v-if="info.if_organization==0">
+                  <td>团组织性质</td>
+                  <td>{{ info.nature }}</td>
+                  <td>建团时间</td>
+                  <td>{{ info.jiantuan_time }}</td>
+                </template>
               </tr>
+              <template v-if="info.if_organization==0">
+                <tr>
+                  <td>建团人数</td>
+                  <td>{{ info.jiantuan_number }}</td>
+                  <td>青年人数</td>
+                  <td>{{ info.youth_number }}</td>
+                  <td>上级团组织</td>
+                  <td>{{ info.superior_nature }}</td>
+                </tr>
+                <tr align="center">
+                  <td rowspan="2">批复文件</td>
+                  <td rowspan="2" style="padding-top: 30px">
+                    <t-image-viewer :images="[$store.state.user.apiUrl+info.documents_file]" mode="modeless"
+                                    :closeOnEscKeydown="false">
+                      <template #trigger="{ open }">
+                        <div style="cursor: pointer" @click="open">
+                          <img :src="$store.state.user.apiUrl + info.documents_file" style="height: 150px; ">
+                        </div>
+                      </template>
+                    </t-image-viewer>
+                  </td>
+                  <td colspan="4">
+                    <div style="font-size: 18px;font-weight: 600">团委负责人信息</div>
+                  </td>
+                </tr>
+                <tr align="center">
+                  <td colspan="5">
+                    <table style="width: 100%; text-align: center; border-collapse: collapse;">
+                      <thead>
+                      <tr>
+                        <th>姓名</th>
+                        <th>性别</th>
+                        <th>单位职务</th>
+                        <th>团委职务</th>
+                        <th>手机号</th>
+                      </tr>
+                      </thead>
+                      <tbody>
+                      <tr v-for="(item, index) in info.tuanweifuzerenxinxi">
+                        <td>{{ item.name }}</td>
+                        <td>{{ item.sex }}</td>
+                        <td>{{ item.job }}</td>
+                        <td>{{ item.tun_job }}</td>
+                        <td>{{ item.phone }}</td>
+                      </tr>
+                      </tbody>
+                    </table>
+                  </td>
+                </tr>
+              </template>
             </table>
           </div>
         </div>
@@ -231,9 +431,10 @@ export default {
       this.$request
         .post("/member/find", {member_id: this.member_id})
         .then((res) => {
-          var key=res.data;
+          var key = res.data;
           key.work_experience = JSON.parse(key.work_experience);
           key.other_contacts = JSON.parse(key.other_contacts);
+          key.tuanweifuzerenxinxi = JSON.parse(key.tuanweifuzerenxinxi);
           this.info = key;
           console.log(key);
 
@@ -244,7 +445,12 @@ export default {
     },
     tgSelect(type) {
       this.$request
-        .post("/member/examine", {if_member:type==1?1:2,member_id: this.member_id, if_xianshi: type, content: this.reason})
+        .post("/member/examine", {
+          if_member: type == 1 ? 1 : 2,
+          member_id: this.member_id,
+          if_xianshi: type,
+          content: this.reason
+        })
         .then((res) => {
           console.log(res);
           if (res.code == 1) {
@@ -265,4 +471,16 @@ export default {
 .info-block {
   margin-bottom: 20px;
 }
+
+.my_table {
+  border-collapse: collapse; /* 合并边框 */
+  width: 100%;
+}
+
+.my_table td {
+  border: 1px solid black; /* 设置单元格边框 */
+  text-align: center;
+  min-width: 100px;
+  padding: 13px;
+}
 </style>
diff --git a/src/permission.js b/src/permission.js
index bbd4c70..66f71f7 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -7,7 +7,7 @@ const whiteListRouters = store.getters['permission/whiteListRouters'];
 NProgress.configure({ showSpinner: false });
 router.beforeEach(async (to, from, next) => {
   NProgress.start();
-  document.title = '智慧云商协-'+to.meta.title;
+  document.title = '河南省青年企业家协会-'+to.meta.title;
   const token = localStorage.getItem('associationToken');
 if(store.state.user.association!=''){
   if(typeof (store.state.user.association)=='object'){
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 198bb5a..e4e9c64 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -33,7 +33,7 @@ instance.interceptors.request.use((config) => {
       // 添加token请求头
       config.headers.token = token;
     }
-    config.data = { ...config.data, association_id: association.association_id};
+    config.data = { ...config.data, association_id: 1};
   }
   return config;
 });