diff --git a/src/pages/register/index.vue b/src/pages/register/index.vue
index 8b84ce4..a016838 100644
--- a/src/pages/register/index.vue
+++ b/src/pages/register/index.vue
@@ -1,311 +1,451 @@
 <template>
-  <div class="list-card list-common-table" v-if="id!=0">
-    <t-card :bordered="false" v-if="show==1">
-      <t-steps :defaultCurrent="current" :style="{ width: '1200px',margin:'20px auto' }">
-        <t-step-item :title="info.association_name"></t-step-item>
-        <t-step-item title="会员信息填写"></t-step-item>
-        <t-step-item title="公司信息填写"></t-step-item>
-      </t-steps>
-      <div style="margin-top: 40px">
-        <template v-if="current==0">
-          <t-card :title="info.association_name+'入会须知'" :bordered="true" hover-shadow
-                  :style="{ width: '1200px',margin:'0 auto' }">
-            <div v-html="info.ruhuixizhu"
-                 style="height: 500px;    overflow-y: auto;white-space: break-spaces;line-height: 25px;"></div>
-            <div style="text-align: center;padding: 20px">
-              <t-checkbox v-model="ok">同意安装协议</t-checkbox>
-            </div>
-            <div style="text-align: center">
-              <t-button @click="okIns">下一步</t-button>
-            </div>
-          </t-card>
-        </template>
-        <template v-if="current==1">
-          <t-card title="会员信息填写" :bordered="true" hover-shadow :style="{ width: '1200px',margin:'0 auto' }">
-            <div style="padding: 20px">
-              <div style="padding-bottom: 20px;font-weight: bold">登陆信息</div>
-              <t-form
-                layout="inline"
-                labelAlign="top"
-              >
-                <t-form-item label="手机号" name="phone">
-                  <t-input v-model="formData.phone" placeholder="请输入手机号"></t-input>
+  <div style="padding: 20px">
+    <div style="width: 80%;margin: 0 auto;">
+      <div>
+        <div style="color: #2E2E2E;font-size: 30px;">1.入会资料</div>
+        <div style="height: 2px;background-color: #999999;width: 100%;margin-top: 20px"></div>
+        <div style="padding: 30px 0px">
+          <t-form layout="inline" labelAlign="top" :labelWidth="100">
+            <t-form-item name="name" label="推荐人">
+              <t-select 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-form-item>
+          </t-form>
+        </div>
+      </div>
+      <div style="margin-top: 20px">
+        <div style="color: #2E2E2E;font-size: 30px;">2.基本信息</div>
+        <div style="height: 2px;background-color: #999999;width: 100%;margin-top: 20px"></div>
+        <div style="display: flex;justify-items: center;padding: 30px 0px">
+          <div>
+            <t-space direction="vertical">
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="姓名" :rules="[ { required: true, message: '此项必填' }]">
+                  <t-input v-model="formData.nikename" placeholder="请输入姓名"/>
                 </t-form-item>
-                <t-form-item label="密码" name="password">
-                  <t-input v-model="formData.password" placeholder="请输入密码"></t-input>
-                </t-form-item>
-                <t-form-item label="申请职位" name="position_id">
-                  <t-select v-model="formData.position_id" :style="{ width: '200px' }">
-                    <t-option v-for="(item,index) in plan_list" :label="item.position_name" :value="item.id"></t-option>
-                  </t-select>
+                <t-form-item label="手机号" :rules="[ { required: true, message: '此项必填' }]">
+                  <t-input v-model="formData.phone" placeholder="请输入手机号"/>
                 </t-form-item>
 
               </t-form>
-            </div>
-            <div style="padding: 20px">
-              <div style="padding-bottom: 20px;font-weight: bold"></div>
-              <t-form
-                labelAlign="top"
-                layout="inline"
-              >
-                <t-form-item label="真实姓名" name="nikename">
-                  <t-input v-model="formData.nikename" placeholder="请输入真实姓名"></t-input>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="区域" name="region_id">
+                  <t-cascader v-model="formData.region_id" :options="region_list"></t-cascader>
                 </t-form-item>
-                <t-form-item label="性别" name="gender">
-                  <t-select v-model="formData.gender" :style="{ width: '200px' }">
-                    <t-option key="0" label="女" value="0"></t-option>
-                    <t-option key="1" label="男" value="1"></t-option>
-                  </t-select>
-                </t-form-item>
-                <t-form-item label="民族" name="nation">
-                  <t-input v-model="formData.nation" placeholder="请输入民族"></t-input>
-                </t-form-item>
-                <t-form-item label="政治面貌" name="political">
-                  <t-input v-model="formData.political" placeholder="请输入政治面貌"></t-input>
-                </t-form-item>
-                <t-form-item label="出生日期" name="birth_time">
+                <t-form-item label="出生年月日">
                   <t-date-picker :style="{ width: '200px' }" v-model="formData.birth_time"/>
                 </t-form-item>
-                <t-form-item label="身份证号码" name="card_number">
-                  <t-input v-model="formData.card_number" placeholder="请输入身份证号码"></t-input>
-                </t-form-item>
-                <t-form-item label="籍贯" name="jiguan">
-                  <t-input v-model="formData.jiguan" placeholder="请输入籍贯"></t-input>
-                </t-form-item>
-                <t-form-item label="毕业院校" name="institution">
-                  <t-input v-model="formData.institution" placeholder="请输入毕业院校"></t-input>
-                </t-form-item>
-                <t-form-item label="学历" name="education">
-                  <t-input v-model="formData.education" placeholder="请输入学历"></t-input>
-                </t-form-item>
-                <t-form-item label="学位" name="academic_degree">
-                  <t-input v-model="formData.academic_degree" placeholder="请输入学位"></t-input>
-                </t-form-item>
-                <t-form-item label="工作单位" name="academic_degree">
-                  <t-input v-model="formData.work_unit" placeholder="请输入工作单位"></t-input>
-                </t-form-item>
-                <t-form-item label="单位职务" name="unit_position">
-                  <t-input v-model="formData.unit_position" placeholder="请输入单位职务"></t-input>
-                </t-form-item>
-                <t-form-item label="微信号" name="wx_number">
-                  <t-input v-model="formData.wx_number" placeholder="请输入微信号"></t-input>
-                </t-form-item>
-                <t-form-item label="邮箱" name="mailbox">
-                  <t-input v-model="formData.mailbox" placeholder="请输入邮箱"></t-input>
-                </t-form-item>
-                <t-form-item label="固定电话" name="fixed_telephone">
-                  <t-input v-model="formData.fixed_telephone" placeholder="请输入固定电话"></t-input>
-                </t-form-item>
-                <t-form-item label="其他社会职务" name="other_social_positions">
-                  <t-input v-model="formData.other_social_positions" placeholder="请输入其他社会职务"></t-input>
-                </t-form-item>
-                <t-form-item label="其他联系人" name="other_contacts">
-                  <t-input v-model="formData.other_contacts" placeholder="请输入其他联系人"></t-input>
-                </t-form-item>
-<!--                <t-form-item label="意向协会职务" name="position">-->
-<!--                  <t-input v-model="formData.position" placeholder="请输入意向协会职务"></t-input>-->
-<!--                </t-form-item>-->
-                <t-form-item label="自我介绍" name="achievement_award">
-                  <t-textarea placeholder="请输入自我介绍" :autosize="{ minRows: 3, maxRows: 5 }"
-                              v-model="formData.introduction"/>
-                </t-form-item>
-                <t-form-item label="主要成就以及获奖情况" name="achievement_award">
-                  <t-textarea placeholder="请输入主要成就以及获奖情况" :autosize="{ minRows: 3, maxRows: 5 }"
-                              v-model="formData.achievement_award"/>
-                </t-form-item>
               </t-form>
-            </div>
-            <div style="padding: 0px 20px">
-              <t-form labelAlign="top"
-                      layout="inline">
-                <t-form-item label="形象照">
-                  <t-upload
-                    :action="$store.state.user.apiUrl+'/api/common/upload'"
-                    v-model="formData.photo_image_show"
-                    theme="image"
-                    tips="请选择形象照"
-                    accept="image/*"
-                    :format-response="(response) => formatResponse(response, 0)"
-                  ></t-upload>
-                </t-form-item>
-                <t-form-item label="身份证正面照">
-                  <t-upload
-                    :action="$store.state.user.apiUrl+'/api/common/upload'"
-                    v-model="formData.cardz_image_show"
-                    theme="image"
-                    tips="请选择身份证正面照"
-                    accept="image/*"
-                    :format-response="(response) => formatResponse(response, 1)"
-                  ></t-upload>
-                </t-form-item>
-                <t-form-item label="身份证反面照">
-                  <t-upload
-                    :action="$store.state.user.apiUrl+'/api/common/upload'"
-                    v-model="formData.cardf_image_show"
-                    theme="image"
-                    tips="请选择身份证反面照"
-                    accept="image/*"
-                    :format-response="(response) => formatResponse(response, 2)"
-                  ></t-upload>
-                </t-form-item>
-              </t-form>
-            </div>
-            <div style="text-align: center;margin-top: 40px">
-              <t-space :style="{ width: '300px',margin:'0 auto',textAlign:'center' }">
-                <t-button @click="okreceiveCode">下一步</t-button>
-              </t-space>
-            </div>
-          </t-card>
-        </template>
-        <template v-if="current==2">
-          <t-card title="公司信息填写" :bordered="true" hover-shadow :style="{ width: '1200px',margin:'0 auto' }">
-            <div style="padding: 20px">
-              <t-form labelAlign="top"
-                      layout="inline">
-                <t-form-item label="营业执照">
-                  <t-upload
-                    :action="$store.state.user.apiUrl+'/api/common/upload'"
-                    v-model="formData.business_license_image_show"
-                    theme="image"
-                    tips="请选择营业执照"
-                    accept="image/*"
-                    :format-response="(response) => formatResponse(response, 3)"
-                  ></t-upload>
-                </t-form-item>
-                <t-form-item label="统一社会信用代码" name="unified_code">
-                  <t-input v-model="formData.unified_code" placeholder="请输入统一社会信用代码"></t-input>
-                </t-form-item>
-                <t-form-item label="企业名称" name="enterprise_name">
-                  <t-input v-model="formData.enterprise_name" placeholder="请输入企业名称"></t-input>
-                </t-form-item>
-                <t-form-item label="企业性质" name="enterprise_nature">
-                  <t-input v-model="formData.enterprise_nature" placeholder="请输入企业性质"></t-input>
-                </t-form-item>
-                <t-form-item label="行业" name="industry_id">
-                  <t-select v-model="formData.industry_id" :style="{ width: '200px' }">
-                    <t-option v-for="(item,index) in industry_list" :label="item.industry_name" :value="item.id"></t-option>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="性别" name="name">
+                  <t-select v-model="formData.gender" :style="{ width: '200px' }">
+                    <t-option :key="0" label="女" :value="0"></t-option>
+                    <t-option :key="1" label="男" :value="1"></t-option>
                   </t-select>
                 </t-form-item>
-                <t-form-item label="企业网址" name="enterprise_website">
-                  <t-input v-model="formData.enterprise_website" placeholder="请输入企业网址"></t-input>
+                <t-form-item label="政治面貌">
+                  <t-input v-model="formData.political" placeholder="请输入政治面貌"/>
                 </t-form-item>
-                <t-form-item label="是否上市" name="if_list">
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="民族">
+                  <t-input v-model="formData.nation" placeholder="请输入民族"/>
+                </t-form-item>
+                <t-form-item label="毕业院校">
+                  <t-input v-model="formData.institution" placeholder="请输入毕业院校"/>
+                </t-form-item>
+              </t-form>
+
+            </t-space>
+          </div>
+          <div>
+            <t-space direction="vertical">
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="身份证号码">
+                  <t-input v-model="formData.card_number" placeholder="请输入身份证号码"/>
+                </t-form-item>
+                <t-form-item label="籍贯">
+                  <t-input v-model="formData.jiguan" placeholder="请输入籍贯"/>
+                </t-form-item>
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="邮箱">
+                  <t-input v-model="formData.mailbox" placeholder="请输入邮箱"/>
+                </t-form-item>
+                <t-form-item label="单位职务">
+                  <t-input v-model="formData.unit_position" placeholder="请输入单位职务"/>
+                </t-form-item>
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="其他联系人">
+                  <t-input v-model="formData.other_contacts" placeholder="请输入其他联系人"/>
+                </t-form-item>
+                <t-form-item label="其他社会职务">
+                  <t-input v-model="formData.other_social_positions" placeholder="请输入其他社会职务"/>
+                </t-form-item>
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+
+                <t-form-item label="学位">
+                  <t-input v-model="formData.academic_degree" placeholder="请输入学位"/>
+                </t-form-item>
+              </t-form>
+            </t-space>
+          </div>
+          <div>
+            <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 class="t-upload__card-container" style="cursor: pointer">
+                <img :src="$store.state.user.apiUrl+formData.photo_image" style="width: 110px;height: 110px;"
+                     v-if="formData.photo_image!=''">
+                <svg fill="none" viewBox="0 0 24 24" width="1em" height="1em" class="t-icon t-icon-add"
+                     v-if="formData.photo_image==''">
+                  <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
+                </svg>
+                <p class="t-size-s t-upload__add-text" v-if="formData.photo_image==''">点击上传图片</p>
+              </div>
+              <small class="t-upload__tips t-size-s">请上传证件照，照片将作为会员证照</small>
+            </div>
+          </div>
+        </div>
+        <div>
+          <div>身份证照</div>
+          <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
+          <div style="display: flex;justify-items: center;padding: 30px 0px">
+            <div>
+              <div class="sfz">
+                <span v-if="formData.cardz_image==''">请上传身份证正面照片</span>
+                <img v-if="formData.cardz_image!=''" :src="$store.state.user.apiUrl+formData.cardz_image"
+                     style="width: 100%;max-height: 200px;">
+              </div>
+              <t-upload
+                :action="$store.state.user.apiUrl+'/api/common/upload'"
+                v-model="formData.cardz_image_show"
+                theme="custom"
+                :data="{association_id:1}"
+                accept="image/*"
+                :format-response="(response) => formatResponse(response, 1)"
+              >
+                <t-button>上传图片</t-button>
+              </t-upload>
+            </div>
+            <div style="margin-left: 100px">
+              <div class="sfz">
+                <span v-if="formData.cardf_image==''">请上传身份证背面照片</span>
+                <img v-if="formData.cardf_image!=''" :src="$store.state.user.apiUrl+formData.cardf_image"
+                     style="width: 100%;max-height: 200px;">
+              </div>
+              <t-upload
+                :action="$store.state.user.apiUrl+'/api/common/upload'"
+                v-model="formData.cardf_image_show"
+                :data="{association_id:1}"
+                theme="custom"
+                accept="image/*"
+                :format-response="(response) => formatResponse(response, 2)"
+              >
+                <t-button>上传图片</t-button>
+              </t-upload>
+            </div>
+          </div>
+        </div>
+        <div style="display: flex;justify-items: center;justify-content: space-between">
+          <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.introduction"/>
+            </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>
+          </div>
+        </div>
+      </div>
+      <div style="margin-top: 30px">
+        <div style="color: #2E2E2E;font-size: 30px;">3.企业信息</div>
+        <div style="height: 2px;background-color: #999999;width: 100%;margin-top: 20px"></div>
+        <div style="display: flex;justify-items: center;padding: 30px 0px">
+          <div style="width: 20%">
+            <t-space direction="vertical">
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="企业注册地">
+                  <t-input v-model="formData.enterprise_location" placeholder="请输入企业注册地"/>
+                </t-form-item>
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="是否上市" name="name">
                   <t-select v-model="formData.if_list" :style="{ width: '200px' }">
                     <t-option key="0" label="是" value="0"></t-option>
                     <t-option key="1" label="否" value="1"></t-option>
                   </t-select>
                 </t-form-item>
-                <t-form-item label="员工人数" name="employee">
-                  <t-input v-model="formData.employee" placeholder="请输入员工人数"></t-input>
-                </t-form-item>
-                <t-form-item label="企业注册地" name="enterprise_location">
-                  <t-input v-model="formData.enterprise_location" placeholder="请输入企业注册地"></t-input>
-                </t-form-item>
-                <t-form-item label="上年度营业额" name="previous_revenue">
-                  <t-input v-model="formData.previous_revenue" placeholder="请输入上年度营业额"></t-input>
-                </t-form-item>
-                <t-form-item label="上年度纳税额" name="previous_tax">
-                  <t-input v-model="formData.previous_tax" placeholder="请输入上年度纳税额"></t-input>
-                </t-form-item>
-                <t-form-item label="上年度净利润" name="previous_profit">
-                  <t-input v-model="formData.previous_profit" placeholder="请输入上年度净利润"></t-input>
-                </t-form-item>
-                <t-form-item label="上年度公益性捐赠支出" name="previous_donation">
-                  <t-input v-model="formData.previous_donation" placeholder="上年度公益性捐赠支出"></t-input>
-                </t-form-item>
-                <t-form-item label="其他企业任职情况" name="qitaqiyerenzhiqingkuang">
-                  <t-input v-model="formData.qitaqiyerenzhiqingkuang" placeholder="其他企业任职情况"></t-input>
-                </t-form-item>
-                <t-form-item label="企业介绍" name="enterprise_Introduction">
-                  <t-textarea placeholder="请输入企业介绍" :autosize="{ minRows: 3, maxRows: 5 }"
-                              v-model="formData.enterprise_Introduction"/>
-                </t-form-item>
-                <t-form-item label="业务介绍" name="introdiction">
-                  <t-textarea placeholder="请输入业务介绍" :autosize="{ minRows: 3, maxRows: 5 }"
-                              v-model="formData.introdiction"/>
-                </t-form-item>
-                <t-form-item label="企业所获荣誉以及专利" name="enterprise_honor">
-                  <t-textarea placeholder="请输入企业所获荣誉以及专利" :autosize="{ minRows: 3, maxRows: 5 }"
-                              v-model="formData.enterprise_honor"/>
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="员工人数">
+                  <t-input v-model="formData.employee" placeholder="请输入员工人数"/>
                 </t-form-item>
               </t-form>
-              <t-form labelAlign="top"
-                      layout="inline">
-                <t-form-item label="是否建立团组织" name="if_organization">
-                  <t-select v-model="formData.if_organization" :style="{ width: '200px' }">
-                    <t-option key="0" label="是" value="0"></t-option>
-                    <t-option key="1" label="否" value="1"></t-option>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="所属行业" name="name">
+                  <t-select v-model="formData.industry_id" :style="{ width: '200px' }">
+                    <t-option v-for="(item,index) in industry_list" :label="item.industry_name"
+                              :value="item.id"></t-option>
                   </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 v-model="formData.nature" placeholder="团组织性质"></t-input>
-                </t-form-item>
-                <t-form-item label="建团时间" name="jiantuan_time">
-                  <t-date-picker :style="{ width: '200px' }" v-model="formData.jiantuan_time"/>
-                </t-form-item>
-                <t-form-item label="建团人数" name="jiantuan_number">
-                  <t-input v-model="formData.jiantuan_number" placeholder="建团人数"></t-input>
-                </t-form-item>
-                <t-form-item label="青年人数" name="youth_number">
-                  <t-input v-model="formData.youth_number" placeholder="青年人数"></t-input>
-                </t-form-item>
-                <t-form-item label="上级团组织" name="superior_nature">
-                  <t-input v-model="formData.superior_nature" placeholder="上级团组织"></t-input>
-                </t-form-item>
-                <t-form-item label="团委负责人信息" name="tuanweifuzerenxinxi">
-                  <t-input 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>
+              <!--              <t-form layout="inline" labelAlign="top" :labelWidth="100">-->
+              <!--                <t-form-item label="注册资金" name="name">-->
+              <!--                  <t-input placeholder="请输入注册资金"/>-->
+              <!--                </t-form-item>-->
+              <!--              </t-form>-->
+            </t-space>
+          </div>
+          <div style="width: 20%">
+            <t-space direction="vertical">
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="企业名称">
+                  <t-input v-model="formData.enterprise_name" placeholder="请输入企业名称"/>
                 </t-form-item>
               </t-form>
-              <div style="text-align: center;margin-top: 40px">
-                <t-space :style="{ width: '300px',margin:'0 auto',textAlign:'center' }">
-                  <t-button @click="current=1" theme="default">上一步</t-button>
-                  <t-button @click="submit">提交申请</t-button>
-                </t-space>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="企业网址">
+                  <t-input v-model="formData.enterprise_website" placeholder="请输入企业网址"/>
+                </t-form-item>
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="统一社会信用代码">
+                  <t-input v-model="formData.unified_code" placeholder="请输入统一社会信用代码"/>
+                </t-form-item>
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="企业性质">
+                  <t-input v-model="formData.enterprise_nature" placeholder="请输入企业性质"/>
+                </t-form-item>
+              </t-form>
+            </t-space>
+          </div>
+          <div style="width: 20%">
+            <t-space direction="vertical">
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="上年营业额（万元）">
+                  <t-input v-model="formData.previous_revenue" placeholder="请输入上年营业额（万元）"/>
+                </t-form-item>
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="上年纳税额（万元）">
+                  <t-input v-model="formData.previous_tax" placeholder="请输入上年纳税额（万元）"/>
+                </t-form-item>
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="上年度净利润（万元）">
+                  <t-input v-model="formData.previous_profit" placeholder="请输入上年度净利润（万元）"/>
+                </t-form-item>
+              </t-form>
+              <t-form layout="inline" labelAlign="top" :labelWidth="100">
+                <t-form-item label="上年公益性捐赠支出（万元）">
+                  <t-input v-model="formData.previous_donation" placeholder="请输入上年公益性捐赠支出（万元）"/>
+                </t-form-item>
+              </t-form>
+            </t-space>
+          </div>
+        </div>
+        <div>
+          <div>公司形象</div>
+          <div style="height: 1px;background-color: #999999;width: 100%;margin-top: 10px"></div>
+          <div style="display: flex;justify-items: center;padding: 30px 0px">
+            <div>
+              <div class="sfz">
+                <span v-if="formData.business_license_image==''">请上传营业执照</span>
+                <img v-if="formData.business_license_image!=''"
+                     :src="$store.state.user.apiUrl+formData.business_license_image"
+                     style="width: 100%;max-height: 200px;">
               </div>
+              <t-upload
+                :action="$store.state.user.apiUrl+'/api/common/upload'"
+                v-model="formData.business_license_image_show"
+                theme="custom"
+                :data="{association_id:1}"
+                accept="image/*"
+                :format-response="(response) => formatResponse(response, 3)"
+              >
+                <t-button>上传图片</t-button>
+              </t-upload>
             </div>
-          </t-card>
-        </template>
+            <div style="margin-left: 100px">
+              <div class="sfz">
+                <span v-if="formData.company_image==''">请上传公司LOGO</span>
+                <img v-if="formData.company_image!=''" :src="$store.state.user.apiUrl+formData.company_image"
+                     style="width: 100%;max-height: 200px;">
+              </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, 5)"
+              >
+                <t-button>上传图片</t-button>
+              </t-upload>
+            </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_Introduction"/>
+            </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>
+          </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_honor"/>
+            </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>
+          </div>
+        </div>
       </div>
-    </t-card>
-    <div class="result-success" v-if="show==0">
-      <check-circle-icon class="result-success-icon" />
-      <div class="result-success-title">申请已提交</div>
-      <div class="result-success-describe">登陆小程序可查看审核结果</div>
-      <div>
-        <t-button @click="() => this.$router.push('/login?id='+id)">返回首页</t-button>
+      <div style="margin-top: 30px">
+        <div style="color: #2E2E2E;font-size: 30px;">4.建团信息</div>
+        <div style="height: 2px;background-color: #999999;width: 100%;margin-top: 20px"></div>
+        <div style="padding: 30px 0px">
+          <t-space direction="vertical">
+            <t-form layout="inline" labelAlign="top" :labelWidth="100">
+              <t-form-item label="是否建立团组织" name="name">
+                <t-select v-model="formData.if_organization" :style="{ width: '200px' }">
+                  <t-option key="0" label="是" value="0"></t-option>
+                  <t-option key="1" label="否" value="1"></t-option>
+                </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 v-model="formData.nature" placeholder="团组织性质"></t-input>
+              </t-form-item>
+              <t-form-item label="建团时间" name="jiantuan_time">
+                <t-date-picker :style="{ width: '200px' }" v-model="formData.jiantuan_time"/>
+              </t-form-item>
+              <t-form-item label="建团人数" name="jiantuan_number">
+                <t-input v-model="formData.jiantuan_number" placeholder="建团人数"></t-input>
+              </t-form-item>
+              <t-form-item label="青年人数" name="youth_number">
+                <t-input v-model="formData.youth_number" placeholder="青年人数"></t-input>
+              </t-form-item>
+              <t-form-item label="上级团组织" name="superior_nature">
+                <t-input v-model="formData.superior_nature" placeholder="上级团组织"></t-input>
+              </t-form-item>
+              <t-form-item label="团委负责人信息" name="tuanweifuzerenxinxi">
+                <t-input 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>
+              </t-form-item>
+            </t-form>
+          </t-space>
+        </div>
+      </div>
+      <div style="padding: 100px 0px;text-align: center">
+        <t-button @click="submit">确定保存</t-button>
+        <t-button @click="download" theme="warning" style="margin-left: 40px">生成PDF</t-button>
       </div>
     </div>
+    <t-dialog header="图片上传" :visible="caiMode" width="40%" top="20px" :onClose="onCloseMy" @confirm="onSubmit">
+      <div class="cropper-content">
+        <div class="cropper">
+          <vue-cropper
+            ref="cropper"
+            :img="caiImg"
+            :canMoveBox="false"
+            :output-size="1"
+            output-type="png"
+            :info="true"
+            :full="false"
+            :auto-crop="true"
+            autoCropWidth="200px"
+            autoCropHeight="200px"
+            mode="100%"
+            @realTime="realTime"
+            @imgLoad="imgLoad"
+            :fixed="true"
+            :fixedNumber="[1,1]"
+          ></vue-cropper>
+        </div>
+        <div class="show-preview"
+             :style="{'width': previews.w + 'px', 'height': previews.h + 'px',  'overflow': 'hidden', 'margin': '5px'}">
+          <div :style="previews.div" class="preview">
+            <img :src="previews.url" :style="previews.img">
+          </div>
+        </div>
+      </div>
+      <div class="footer-btn">
+        <div class="scope-btn">
+          <label class="btn" for="uploads">上传图片</label>
+          <input type="file" id="uploads" style="position:absolute; clip:rect(0 0 0 0);"
+                 accept="image/png, image/jpeg, image/gif, image/jpg" @change="uploadImg($event, 1)">
+        </div>
+      </div>
+    </t-dialog>
   </div>
 </template>
-<script>
-import {UserIcon, LockOnIcon} from 'tdesign-icons-vue';
-import { CheckCircleIcon } from 'tdesign-icons-vue';
+<script lang="ts">
+import store from '@/store';
+import {VueCropper} from 'vue-cropper';
+import axios from 'axios';
+import {CheckCircleIcon, LockOnIcon, UserIcon} from "tdesign-icons-vue";
 
 export default {
   components: {
-    CheckCircleIcon,
-    UserIcon,
-    LockOnIcon,
+    VueCropper,
   },
   data() {
     return {
-      show:1,
+      caiMode: false,
+      previews: {},
+      caiImg: '',
       formData: {
-        position_id:null,
-        industry_id:null,
+        region_id: null,
+        recommendation_id: 0,
+        position_id: null,
+        industry_id: null,
         phone: '',
         password: '',
         nikename: '',
@@ -357,50 +497,238 @@ export default {
         tuanweifuzerenxinxi: '',
         documents_file: '',
         documents_file_show: [],
-        enterprise_location:'',
-        introduction:'',
-        enterprise_name:'',
+        enterprise_location: '',
+        introduction: '',
+        enterprise_name: '',
+        company_image: '',
+        company_image_show: [],
+        token: '',
+        openid: '',
       },
-      ok: false,
       current: 2,
-      id: 0,
-      info: '',
-      industry_list:[],
-      plan_list:[]
+      industry_list: [],
+      plan_list: [],
+      member_list: [],
+      region_list: [],
+
     };
   },
   mounted() {
     console.log(this.$route.query.id);
-    if (typeof (this.$route.query.id) != 'undefined') {
-      this.id = this.$route.query.id;
-      this.getInfo();
-      this.getPlan();
-      this.getIndustry();
-    } else {
-      this.$message.error('入会链接有误！', 0);
-    }
+    // if (typeof (this.$route.query.id) != 'undefined') {
+    //   this.id = .id;
+    //   this.getInfo();
+    //   this.getPlan();
+    //   this.getIndustry();
+    // } else {
+    //   this.$message.error('入会链接有误！', 0);
+    // }
+    console.log();
+    this.formData.token = this.$route.query.token;
+    this.formData.openid = this.$route.query.openid;
+    this.getIndustry();
+    this.getMemberList();
+    this.getRegion();
+    this.getInfo();
   },
   methods: {
-    getIndustry(){
+    download(){
+      //https://hnyea.0rui.cn/api/move/pdf_member/exportPdf      PDF导出
+     //window.location.href="https://hnyea.0rui.cn/api/move/pdf_member/exportPdf?openid="+this.formData.openid;
+      const link = document.createElement('a');
+      link.href = `https://hnyea.0rui.cn/api/move/pdf_member/exportPdf?openid=${this.formData.openid}`;
+      link.target = '_blank'; // 新标签页打开
+      link.rel = 'noopener noreferrer'; // 安全考虑
+      link.style.display = 'none';
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link); // 清理 DOM
+    },
+    uploadImg(e, num) {
+      // 上传图片
+      // this.option.img
+      const file = e.target.files[0]
+      if (!/\.(gif|jpg|jpeg|png|bmp|GIF|JPG|PNG)$/.test(e.target.value)) {
+        alert('图片类型必须是.gif,jpeg,jpg,png,bmp中的一种')
+        return false
+      }
+      const reader = new FileReader()
+      reader.onload = (e) => {
+        let data
+        if (typeof e.target.result === 'object') {
+          // 把Array Buffer转化为blob 如果是base64不需要
+          data = window.URL.createObjectURL(new Blob([e.target.result]))
+        } else {
+          data = e.target.result
+        }
+        if (num === 1) {
+          this.caiImg = data
+        } else if (num === 2) {
+          this.example2.img = data
+        }
+      }
+      // 转化为base64
+      // reader.readAsDataURL(file)
+      // 转化为blob
+      reader.readAsArrayBuffer(file)
+    },
+    onSubmit() {
+      this.$refs.cropper.getCropBlob(data => {
+        // do something
+        console.log(data)
+        console.log(this.caiImg);
+        const formData = new FormData();
+        formData.append('file', data, 'image.jpg');
+        formData.append('association_id', 1);
+        console.log(formData);
+        axios.post(`${store.state.user.apiUrl}/api/common/upload`, formData, {
+          headers: {
+            'Content-Type': 'multipart/form-data'
+          }
+        })
+          .then(response => {
+            console.log(response);
+            const {data} = response;
+            if (data.code == 1) {
+              this.formData.photo_image = data.data.url;
+              this.$message.success('图片上传成功！');
+              this.caiMode = false;
+              this.caiImg = '';
+              this.$refs.cropper.stopCrop();
+              this.$refs.cropper.clearCrop();
+            } else {
+              this.$message.error('图片上传失败！');
+            }
+          })
+          .catch(error => {
+            console.error('文件上传失败', error);
+          });
+      })
+    },
+    onCloseMy() {
+      this.caiMode = false;
+    },
+    realTime(data) {
+      this.previews = data
+    },
+    imgLoad(msg) {
+      console.log(msg)
+    },
+    openCai() {
+      this.caiImg=  store.state.user.apiUrl +this.formData.photo_image;
+      this.$refs.cropper.startCrop();
+      this.caiMode = true;
+    },
+    getInfo() {
       this.$request
-        .post("/industry",{association_id:this.id})
-        .then( (res) => {
+        .post("/move/temporary_token/tokenMember", {openid: this.formData.openid, token: this.formData.token})
+        .then((res) => {
           console.log(res);
-          if(res.code==1){
-            this.industry_list=res.data;
+          this.formData.phone = res.data.phone;
+          this.formData.position_id = res.data.position_id;
+          this.formData.industry_id = res.data.industry_id;
+          this.formData.region_id = res.data.region_id;
+          this.formData.password = res.data.password;
+          this.formData.nikename = res.data.nikename;
+          this.formData.gender = res.data.gender;
+          this.formData.birth_time = res.data.birth_time;
+          this.formData.nation = res.data.nation;
+          this.formData.political = res.data.political;
+          this.formData.jiguan = res.data.jiguan;
+          this.formData.institution = res.data.institution;
+          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.unit_position = res.data.unit_position;
+          this.formData.wx_number = res.data.wx_number;
+          this.formData.mailbox = res.data.mailbox;
+          this.formData.fixed_telephone = res.data.fixed_telephone;
+          this.formData.achievement_award = res.data.achievement_award;
+          this.formData.other_contacts = res.data.other_contacts;
+          this.formData.other_social_positions = res.data.other_social_positions;
+          this.formData.position = res.data.position;
+          this.formData.cardf_image = res.data.cardf_image == null ? '' : res.data.cardf_image;
+          this.formData.cardz_image = res.data.cardz_image == null ? '' : res.data.cardz_image;
+          this.formData.photo_image = res.data.photo_image == null ? '' : res.data.photo_image;
+          this.formData.company_image = res.data.company_image == null ? '' : res.data.company_image;
+          this.formData.business_license_image = res.data.business_license_image == null ? '' : res.data.business_license_image;
+          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.employee = res.data.employee;
+          this.formData.previous_revenue = res.data.previous_revenue;
+          this.formData.previous_tax = res.data.previous_tax;
+          this.formData.previous_profit = res.data.previous_profit;
+          this.formData.previous_donation = res.data.previous_donation;
+          this.formData.qitaqiyerenzhiqingkuang = res.data.qitaqiyerenzhiqingkuang;
+          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.nature = res.data.nature;
+          this.formData.jiantuan_time = res.data.jiantuan_time;
+          this.formData.jiantuan_number = res.data.jiantuan_number;
+          this.formData.youth_number = res.data.youth_number;
+          this.formData.superior_nature = res.data.superior_nature;
+          this.formData.tuanweifuzerenxinxi = res.data.tuanweifuzerenxinxi;
+          this.formData.documents_file = res.data.documents_file;
+          this.formData.enterprise_location = res.data.enterprise_location;
+          this.formData.introduction = res.data.introduction;
+          this.formData.enterprise_name = res.data.enterprise_name;
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    getRegion() {
+      this.$request
+        .post("/region")
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.region_list = res.data;
           }
         })
         .catch((e) => {
           console.log(e);
         });
     },
-    getPlan(){
+    getMemberList() {
       this.$request
-        .post("/position",{association_id:this.id})
-        .then( (res) => {
+        .post("/move/association/memberList")
+        .then((res) => {
           console.log(res);
-          if(res.code==1){
-            this.plan_list=res.data;
+          if (res.code == 1) {
+            this.member_list = res.data;
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    getIndustry() {
+      this.$request
+        .post("/industry")
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.industry_list = res.data;
+            this.industry_list.push({id: -1, industry_name: '其他行业'});
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    getPlan() {
+      this.$request
+        .post("/position", {association_id: 1})
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.plan_list = res.data;
           }
         })
         .catch((e) => {
@@ -417,142 +745,50 @@ export default {
         this.formData.cardf_image = res.data.url;
       } else if (type == 3) {
         this.formData.business_license_image = res.data.url;
-      } else {
+      } else if (type == 4) {
         this.formData.documents_file = res.data.url;
+      } else {
+        this.formData.company_image = res.data.url;
       }
-
       return {url: res.data.fullurl};
     },
-    getInfo() {
-      this.$request
-        .post("/association/find", {association_id: this.id})
-        .then((res) => {
-          console.log(res);
-          if (res.code == 1) {
-            this.info = res.data;
-          }
-        })
-        .catch((e) => {
-          console.log(e);
-        });
-    },
-    okIns() {
-      if (!this.ok) {
-        this.$message.error('请认真阅读且同意入会协议！');
+    submit() {
+      if (this.formData.nikename == '') {
+        this.$message.error('请输入姓名！');
         return;
       }
-      this.current = 1;
-      //this.getreceiveCode();
-    },
-    okreceiveCode() {
-      //检查是否填写
       if (this.formData.phone == '') {
         this.$message.error('请输入手机号！');
         return;
       }
-      if (this.formData.password == '') {
-        this.$message.error('请输入密码！');
+      if (this.formData.region_id == null) {
+        this.$message.error('请选择区域！');
         return;
       }
-      if (this.formData.nikename == '') {
-        this.$message.error('请输入真实姓名！');
-        return;
-      }
-      if (this.formData.position_id == null) {
-        this.$message.error('请选择申请职位！');
-        return;
-      }
-      if (this.formData.birth_time == '') {
-        this.$message.error('请输入出生日期！');
+      if (this.formData.birth_time == null) {
+        this.$message.error('请选择出生日期！');
         return;
       }
       if (this.formData.gender == null) {
         this.$message.error('请选择性别！');
         return;
       }
+      if (this.formData.political == '') {
+        this.$message.error('请输入政治面貌！');
+        return;
+      }
       if (this.formData.nation == '') {
         this.$message.error('请输入民族！');
         return;
       }
-      if (this.formData.political == '') {
-        this.$message.error('请输入政治面貌！');
+      if (this.formData.card_number == '') {
+        this.$message.error('请输入身份证号码！');
         return;
       }
       if (this.formData.jiguan == '') {
         this.$message.error('请输入籍贯！');
         return;
       }
-      if (this.formData.institution == '') {
-        this.$message.error('请输入毕业院校！');
-        return;
-      }
-      if (this.formData.education == '') {
-        this.$message.error('请输入学历！');
-        return;
-      }
-      if (this.formData.academic_degree == '') {
-        this.$message.error('请输入学位！');
-        return;
-      }
-      if (this.formData.card_number == '') {
-        this.$message.error('请输入身份证号！');
-        return;
-      }
-      if (this.formData.work_unit == '') {
-        this.$message.error('请输入工作单位！');
-        return;
-      }
-      if (this.formData.unit_position == '') {
-        this.$message.error('请输入单位职务！');
-        return;
-      }
-      if (this.formData.wx_number == '') {
-        this.$message.error('请输入微信号！');
-        return;
-      }
-      if (this.formData.mailbox == '') {
-        this.$message.error('请输入邮箱！');
-        return;
-      }
-      if (this.formData.fixed_telephone == '') {
-        this.$message.error('请输入固定电话！');
-        return;
-      }
-      if (this.formData.achievement_award == '') {
-        this.$message.error('请输主要成就以及获奖情况！');
-        return;
-      }
-      if (this.formData.other_contacts == '') {
-        this.$message.error('请输入其他联系人！');
-        return;
-      }
-      if (this.formData.other_social_positions == '') {
-        this.$message.error('请输入其他社会职务！');
-        return;
-      }
-      if (this.formData.position == '') {
-        this.$message.error('请输入意向协会职务！');
-        return;
-      }
-      if (this.formData.cardf_image == '') {
-        this.$message.error('请上传身份证正面！');
-        return;
-      }
-      if (this.formData.cardz_image == '') {
-        this.$message.error('请上传身份证反面！');
-        return;
-      }
-      if (this.formData.photo_image == '') {
-        this.$message.error('请上传个人照片！');
-        return;
-      }
-      if(this.formData.introduction==''){
-        this.$message.error('请填写自我介绍！');
-        return;
-      }
-      this.current = 2;
-    },
-    submit(){
       if (this.formData.business_license_image == '') {
         this.$message.error('请上传营业执照！');
         return;
@@ -561,113 +797,53 @@ export default {
         this.$message.error('请输入统一社会信用代码！');
         return;
       }
-      if(this.formData.enterprise_name==''){
+      if (this.formData.enterprise_name == '') {
         this.$message.error('请输入企业名称！');
         return;
       }
-      if (this.formData.enterprise_nature == '') {
-        this.$message.error('请输入企业性质！');
-        return;
-      }
       if (this.formData.industry_id == null) {
         this.$message.error('请选择行业！');
         return;
       }
-      if (this.formData.enterprise_website == '') {
-        this.$message.error('请输入企业网址！');
-        return;
-      }
-      if (this.formData.if_list == null) {
-        this.$message.error('请选择是否上市！');
-        return;
-      }
-      if (this.formData.employee == '') {
-        this.$message.error('请输入员工人数！');
-        return;
-      }
-      if (this.formData.enterprise_location == '') {
-        this.$message.error('请输入企业注册地！');
-        return;
-      }
-      if (this.formData.previous_revenue == '') {
-        this.$message.error('请输入上年度营业额！');
-        return;
-      }
-      if (this.formData.previous_tax == '') {
-        this.$message.error('请输入上年度纳税额！');
-        return;
-      }
-      if (this.formData.education == '') {
-        this.$message.error('请输入学历！');
-        return;
-      }
-      if (this.formData.previous_profit == '') {
-        this.$message.error('请输入上年度净利润！');
-        return;
-      }
-      if (this.formData.previous_donation == '') {
-        this.$message.error('请输入上年度公益性捐赠支出！');
-        return;
-      }
-      if (this.formData.qitaqiyerenzhiqingkuang == '') {
-        this.$message.error('请输入其他企业任职情况！');
-        return;
-      }
-      if (this.formData.enterprise_Introduction == '') {
-        this.$message.error('请输入企业介绍！');
-        return;
-      }
-      if (this.formData.introdiction == '') {
-        this.$message.error('请输入业务介绍！');
-        return;
-      }
-      if (this.formData.enterprise_honor == '') {
-        this.$message.error('请输入企业所获荣誉以及专利！');
-        return;
-      }
-      if (this.formData.if_organization == null) {
-        this.$message.error('是否建立团组织！');
-        return;
-      }
-      if(this.formData.if_organization==0){
-        if (this.formData.nature == '') {
-          this.$message.error('请输主团组织性质！');
-          return;
-        }
-        if (this.formData.jiantuan_time == '') {
-          this.$message.error('请输入建团时间！');
-          return;
-        }
-        if (this.formData.jiantuan_number == '') {
-          this.$message.error('请输入建团人数！');
-          return;
-        }
-        if (this.formData.youth_number == '') {
-          this.$message.error('请输入青年人数！');
-          return;
-        }
-        if (this.formData.superior_nature == '') {
-          this.$message.error('请输入上级团组织！');
-          return;
-        }
-        if (this.formData.tuanweifuzerenxinxi == '') {
-          this.$message.error('请输入团委负责人信息！');
-          return;
-        }
-        if (this.formData.documents_file == '') {
-          this.$message.error('请上传批复文件！');
-          return;
-        }
-      }
-      this.formData.association_id=this.id;
+      // if (this.formData.if_organization == 0) {
+      //   if (this.formData.nature == '') {
+      //     this.$message.error('请输主团组织性质！');
+      //     return;
+      //   }
+      //   if (this.formData.jiantuan_time == '') {
+      //     this.$message.error('请输入建团时间！');
+      //     return;
+      //   }
+      //   if (this.formData.jiantuan_number == '') {
+      //     this.$message.error('请输入建团人数！');
+      //     return;
+      //   }
+      //   if (this.formData.youth_number == '') {
+      //     this.$message.error('请输入青年人数！');
+      //     return;
+      //   }
+      //   if (this.formData.superior_nature == '') {
+      //     this.$message.error('请输入上级团组织！');
+      //     return;
+      //   }
+      //   if (this.formData.tuanweifuzerenxinxi == '') {
+      //     this.$message.error('请输入团委负责人信息！');
+      //     return;
+      //   }
+      //   if (this.formData.documents_file == '') {
+      //     this.$message.error('请上传批复文件！');
+      //     return;
+      //   }
+      // }
+      this.formData.association_id = 1;
       this.$request
-        .post("/move/login/add", this.formData)
+        .post("/move/temporary_token/shenqing", this.formData)
         .then((res) => {
           console.log(res);
-          if (res.code==1){
+          if (res.code == 1) {
             this.$message.success(res.msg);
-            this.show=0;
-          }else{
+            this.show = 0;
+          } else {
             this.$message.error(res.msg);
           }
           // setTimeout(() => {
@@ -718,4 +894,95 @@ export default {
 .t-button + .t-button {
   margin-left: var(--td-comp-margin-s);
 }
+
+.cropper-content {
+  display: flex;
+  display: -webkit-flex;
+  justify-content: flex-end;
+  -webkit-justify-content: flex-end;
+
+  .cropper {
+    width: 350px;
+    height: 300px;
+  }
+
+  .show-preview {
+    flex: 1;
+    -webkit-flex: 1;
+    display: flex;
+    display: -webkit-flex;
+    justify-content: center;
+    -webkit-justify-content: center;
+
+    .preview {
+      overflow: hidden;
+      border-radius: 50%;
+      border: 1px solid #cccccc;
+      background: #cccccc;
+      margin-left: 40px;
+    }
+  }
+}
+
+.footer-btn {
+  margin-top: 30px;
+  display: flex;
+  display: -webkit-flex;
+  justify-content: flex-end;
+  -webkit-justify-content: flex-end;
+
+  .scope-btn {
+    width: 350px;
+    display: flex;
+    display: -webkit-flex;
+    justify-content: space-between;
+    -webkit-justify-content: space-between;
+  }
+
+  .upload-btn {
+    flex: 1;
+    -webkit-flex: 1;
+    display: flex;
+    display: -webkit-flex;
+    justify-content: center;
+    -webkit-justify-content: center;
+  }
+
+  .btn {
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    white-space: nowrap;
+    cursor: pointer;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    padding: 8px 15px;
+    font-size: 12px;
+    border-radius: 3px;
+    color: #fff;
+    background-color: #67c23a;
+    border-color: #67c23a;
+  }
+}
+
+.sfz {
+  cursor: pointer;
+  text-align: center;
+  width: 300px;
+  height: 200px;
+  line-height: 200px;
+  border: 1px dashed #999999;
+  margin-bottom: 20px;
+}
+
+.sfz:hover {
+  border: 1px dashed #409EFF;
+}
 </style>
diff --git a/src/pages/tweets/pl_index.vue b/src/pages/tweets/pl_index.vue
new file mode 100644
index 0000000..a0d9ddf
--- /dev/null
+++ b/src/pages/tweets/pl_index.vue
@@ -0,0 +1,161 @@
+<template>
+  <t-card :bordered="false">
+    <div class="form-step-container">
+      <t-tabs v-model="state" @change="tabIndexChange">
+        <t-tab-panel :value="1" label="待审核" :destroyOnHide="false"></t-tab-panel>
+        <t-tab-panel :value="2" label="已通过" :destroyOnHide="false"></t-tab-panel>
+        <t-tab-panel :value="3" label="已拒绝" :destroyOnHide="false"></t-tab-panel>
+      </t-tabs>
+      <t-table
+        rowKey="index"
+        :data="list"
+        :columns="columns"
+        :stripe="false"
+        :bordered="false"
+        :hover="true"
+        size="large"
+        table-layout="auto"
+        cellEmptyContent="-"
+        :pagination="pagination"
+      >
+        <template #tweet="{ row }">
+          <div>{{row.tweet.title}}</div>
+        </template>
+        <template #member_info="{ row }">
+          <div>{{row.member.nikename}}</div>
+        </template>
+        <template #status="{ row }">
+          <t-tag v-if="row.status==1" theme="primary">待审核</t-tag>
+          <t-tag v-if="row.status==2" theme="success">已发布</t-tag>
+          <t-tag v-if="row.status==3" theme="danger">已拒绝</t-tag>
+        </template>
+        <template #select="{ row }">
+          <t-space :size="0">
+            <t-popconfirm v-if="row.status==1" content="确定要审核通过吗？" @confirm="review(row,1)">
+              <t-button theme="primary">通过</t-button>
+            </t-popconfirm>
+            <t-popconfirm v-if="row.status==1" theme="danger" @confirm="review(row,2)">
+              <template slot="content">
+                <p class="title">拒绝理由</p>
+                <p class="describe" style="margin-top: 10px">
+                  <t-input v-model="reason" placeholder="请输入拒绝理由"/>
+                </p>
+              </template>
+              <t-button theme="warning" style="margin: 0px 10px">拒绝</t-button>
+            </t-popconfirm>
+<!--            <t-popconfirm content="确认删除吗？" @confirm="del(row)">-->
+<!--              <t-button theme="danger">删除</t-button>-->
+<!--            </t-popconfirm>-->
+          </t-space>
+        </template>
+      </t-table>
+      <div style="margin-top: 30px">
+        <t-pagination
+          :total="pagination.total"
+          :page-size="pagination.size"
+          @current-change="onCurrentChange"
+          :showPageSize="false"
+        ></t-pagination>
+      </div>
+    </div>
+  </t-card>
+
+</template>
+<script lang="ts">
+import store from "@/store";
+
+export default {
+  data() {
+    return {
+      state: 1,
+      list: [],
+      reason:'',
+      columns: [
+        {colKey: 'tweet', title: '帖子标题', align: 'center'},
+        {colKey: 'content', title: '评论内容', align: 'center'},
+        {colKey: 'member_info', title: '发布者', align: 'center'},
+        {colKey: 'createtime', title: '评论时间', align: 'center'},
+        {colKey: 'status', title: '状态', align: 'center'},
+        {colKey: 'select', title: '操作', width: 200},
+      ],
+      pagination: {
+        page: 1,
+        size: 10,
+        total: 0,
+      },
+    }
+  },
+  mounted() {
+    //this.member_id=this.$route.query.id;
+    if(typeof (store.state.user.association)=='object'){
+      this.association=store.state.user.association;
+    }else{
+      this.association=JSON.parse(store.state.user.association);
+    }
+    this.getList();
+    //this.getGory();
+  },
+  methods: {
+    tabIndexChange(index){
+      this.state=index;
+      this.pagination.page=1;
+      this.list=[];
+      this.getList();
+    },
+    review(d,type){
+      console.log(d);
+      this.$request
+        .post('/tweet_comments/review', {id: d.id,status:type,reason:this.reason,member_id:d.member_id})
+        .then((res) => {
+          if (res.code == 1) {
+            this.$message.success(res.msg);
+            this.getList();
+          } else {
+            this.$message.error(res.msg);
+          }
+          console.log(res);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    del(d) {
+      console.log(d);
+      this.$request
+        .post('/tweets/destroy', {id: d.id})
+        .then((res) => {
+          if (res.code == 1) {
+            this.$message.success('删除成功！');
+            this.pagination.page=1;
+            this.getList();
+          } else {
+            this.$message.error(res.msg);
+          }
+          console.log(res);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onCurrentChange(d){
+      this.page=d;
+      this.getList();
+    },
+    getList() {
+      this.$request
+        .post("/tweet_comments/index", {state:this.state,page: this.pagination.page, size: this.pagination.size})
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.list = res.data.data;
+            this.pagination.total = res.data.total;
+          }
+
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+  }
+}
+</script>
diff --git a/src/pages/user/user_edit.vue b/src/pages/user/user_edit.vue
index cbbddcf..15d9b44 100644
--- a/src/pages/user/user_edit.vue
+++ b/src/pages/user/user_edit.vue
@@ -10,9 +10,9 @@
           <t-form-item label="手机号" name="phone" :requiredMark="true">
             <t-input v-model="formData.phone" placeholder="请输入手机号"></t-input>
           </t-form-item>
-          <t-form-item label="密码" name="password">
-            <t-input v-model="formData.password" placeholder="请输入密码"></t-input>
-          </t-form-item>
+<!--          <t-form-item label="密码" name="password">-->
+<!--            <t-input v-model="formData.password" placeholder="请输入密码"></t-input>-->
+<!--          </t-form-item>-->
           <t-form-item label="职位" name="position_id">
             <t-select v-model="formData.position_id" :style="{ width: '200px' }">
               <t-option v-for="(item,index) in plan_list" :label="item.position_name" :value="item.id"></t-option>
@@ -24,10 +24,10 @@
             </t-select>
           </t-form-item>
           <t-form-item label="区域" name="region_id">
-<!--            <t-select v-model="formData.region_id" :style="{ width: '200px' }">-->
-<!--              <t-option v-for="(item,index) in region_list" :label="item.region_name" :value="item.id"></t-option>-->
-<!--            </t-select>-->
-            <t-cascader v-model="formData.region_id" :options="region_list" clearable @change="onChange"></t-cascader>
+            <!--            <t-select v-model="formData.region_id" :style="{ width: '200px' }">-->
+            <!--              <t-option v-for="(item,index) in region_list" :label="item.region_name" :value="item.id"></t-option>-->
+            <!--            </t-select>-->
+            <t-cascader v-model="formData.region_id" :options="region_list" @change="onChange"></t-cascader>
           </t-form-item>
         </t-form>
       </div>
@@ -43,8 +43,8 @@
 
           <t-form-item label="性别" name="gender">
             <t-select v-model="formData.gender" :style="{ width: '200px' }">
-              <t-option key="0" label="女" value="0"></t-option>
-              <t-option key="1" label="男" value="1"></t-option>
+              <t-option :key="0" label="女" :value="0"></t-option>
+              <t-option :key="1" label="男" :value="1"></t-option>
             </t-select>
           </t-form-item>
           <t-form-item label="民族" name="nation">
@@ -111,8 +111,10 @@
           <t-form-item label="形象照">
             <div class="t-upload" @click="openCai">
               <div class="t-upload__card-container" style="cursor: pointer">
-                <img :src="$store.state.user.apiUrl+formData.photo_image" style="width: 110px;height: 110px;" v-if="formData.photo_image!=''">
-                <svg fill="none" viewBox="0 0 24 24" width="1em" height="1em" class="t-icon t-icon-add" v-if="formData.photo_image==''">
+                <img :src="$store.state.user.apiUrl+formData.photo_image" style="width: 110px;height: 110px;"
+                     v-if="formData.photo_image!=''">
+                <svg fill="none" viewBox="0 0 24 24" width="1em" height="1em" class="t-icon t-icon-add"
+                     v-if="formData.photo_image==''">
                   <path fill="currentColor" d="M13 4v7h7v2h-7v7h-2v-7H4v-2h7V4h2z"></path>
                 </svg>
                 <p class="t-size-s t-upload__add-text" v-if="formData.photo_image==''">点击上传图片</p>
@@ -272,7 +274,7 @@
     <t-dialog header="图片上传" :visible="caiMode" width="40%" top="20px" :onClose="onCloseMy" @confirm="onSubmit">
       <div class="cropper-content">
         <div class="cropper">
-          <vueCropper
+          <vue-cropper
             ref="cropper"
             :img="caiImg"
             :canMoveBox="false"
@@ -288,7 +290,7 @@
             @imgLoad="imgLoad"
             :fixed="true"
             :fixedNumber="[1,1]"
-          ></vueCropper>
+          ></vue-cropper>
         </div>
         <div class="show-preview"
              :style="{'width': previews.w + 'px', 'height': previews.h + 'px',  'overflow': 'hidden', 'margin': '5px'}">
@@ -308,8 +310,7 @@
   </div>
 </template>
 <script lang="ts">
-import {UserIcon, LockOnIcon} from 'tdesign-icons-vue';
-import {CheckCircleIcon} from 'tdesign-icons-vue';
+import {UserIcon, LockOnIcon,CheckCircleIcon} from 'tdesign-icons-vue';
 import store from '@/store';
 import {VueCropper} from 'vue-cropper';
 import axios from 'axios';
@@ -326,7 +327,7 @@ export default {
       caiMode: false,
       previews: {},
       caiImg: '',
-      association:{},
+      association: {},
       formData: {
         phone: '',
         password: '',
@@ -384,24 +385,24 @@ export default {
         documents_file_show: [],
         introduction: '',
         enterprise_name: '',
-        company_image:'',
-        company_image_show:[],
-        region_id:null,
+        company_image: '',
+        company_image_show: [],
+        region_id: null,
       },
       id: 0,
       info: '',
       plan_list: [],
-      region_list:[],
+      region_list: [],
       industry_list: []
     };
   },
   mounted() {
-    if(typeof (store.state.user.association)=='object'){
-      this.association=store.state.user.association;
-    }else{
-      this.association=JSON.parse(store.state.user.association);
+    if (typeof (store.state.user.association) === 'object') {
+      this.association = store.state.user.association;
+    } else {
+      this.association = JSON.parse(store.state.user.association);
     }
-    console.log( this.association);
+    console.log(this.association);
     this.id = this.$route.query.id;
     this.getInfo();
     this.getPlan();
@@ -414,28 +415,28 @@ export default {
         // do something
         console.log(data)
         console.log(this.caiImg);
-        let formData = new FormData();
+        const formData = new FormData();
         formData.append('file', data, 'image.jpg');
         formData.append('association_id', this.association.association_id);
         console.log(formData);
-        axios.post(store.state.user.apiUrl + '/api/common/upload', formData, {
+        axios.post(`${store.state.user.apiUrl  }/api/common/upload`, formData, {
           headers: {
             'Content-Type': 'multipart/form-data'
           }
         })
           .then(response => {
-              console.log(response);
-              var data=response.data;
-              if(data.code==1){
-                this.formData.photo_image=data.data.url;
-                this.$message.success('图片上传成功！');
-                this.caiMode=false;
-                this.caiImg='';
-                this.$refs.cropper.stopCrop();
-                this.$refs.cropper.clearCrop();
-              }else{
-                this.$message.error('图片上传失败！');
-              }
+            console.log(response);
+            const {data} = response;
+            if (data.code == 1) {
+              this.formData.photo_image = data.data.url;
+              this.$message.success('图片上传成功！');
+              this.caiMode = false;
+              this.caiImg = '';
+              this.$refs.cropper.stopCrop();
+              this.$refs.cropper.clearCrop();
+            } else {
+              this.$message.error('图片上传失败！');
+            }
           })
           .catch(error => {
             console.error('文件上传失败', error);
@@ -453,14 +454,14 @@ export default {
       this.previews = data
     },
     uploadImg(e, num) {
-      //上传图片
+      // 上传图片
       // this.option.img
-      var file = e.target.files[0]
+      const file = e.target.files[0]
       if (!/\.(gif|jpg|jpeg|png|bmp|GIF|JPG|PNG)$/.test(e.target.value)) {
         alert('图片类型必须是.gif,jpeg,jpg,png,bmp中的一种')
         return false
       }
-      var reader = new FileReader()
+      const reader = new FileReader()
       reader.onload = (e) => {
         let data
         if (typeof e.target.result === 'object') {
@@ -493,27 +494,31 @@ export default {
         this.formData.cardf_image = res.data.url;
       } else if (type == 3) {
         this.formData.business_license_image = res.data.url;
-      } else if(type==4){
+      } else if (type == 4) {
         this.formData.documents_file = res.data.url;
-      }else{
+      } else {
         this.formData.company_image = res.data.url;
       }
 
       return {url: res.data.fullurl};
     },
-getRegion() {
-  this.$request
-    .post("/region")
-    .then((res) => {
-      console.log(res);
-      if (res.code == 1) {
-        this.region_list = res.data;
-      }
-    })
-    .catch((e) => {
-      console.log(e);
-    });
-},
+    getRegion() {
+      this.$request
+        .post("/region")
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.region_list = res.data;
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onChange(val, context) {
+      console.log(val, context);
+      console.log('path: ', context.node.getPath());
+    },
     getIndustry() {
       this.$request
         .post("/industry")
@@ -562,7 +567,7 @@ getRegion() {
           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;
@@ -748,7 +753,6 @@ getRegion() {
       // }
       this.formData.member_id = this.id;
       console.log(this.formData);
-      return;
       this.$request
         .post("/member/update", this.formData)
         .then((res) => {
diff --git a/src/router/modules/components.ts b/src/router/modules/components.ts
index d771553..cad45b3 100644
--- a/src/router/modules/components.ts
+++ b/src/router/modules/components.ts
@@ -99,6 +99,11 @@ export default [
         name: 'tweetsIndex',
         component: () => import('@/pages/tweets/index.vue'),
         meta: {title: '内容列表'},
+      }, {
+        path: 'pl_index',
+        name: 'tweetsPlIndex',
+        component: () => import('@/pages/tweets/pl_index.vue'),
+        meta: {title: '评论列表'},
       },
     ],
   },