diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index 192005c26..6df530c1c 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -54,9 +54,7 @@
                         <el-input v-model="dialogForm.socialCreditCode" maxlength="18"></el-input>
                     </el-form-item>
                     <el-form-item label="统一社会信用证有效期">
-                        <el-date-picker
-                            editable
-                            v-model="dialogForm.socialCreditCodeExpires"
+                        <el-date-picker editable v-model="dialogForm.socialCreditCodeExpires"
                             type="date"
                             placeholder="有效期格式为20190909"
                             format="yyyyMMdd"
@@ -82,6 +80,7 @@
                             format="yyyyMMdd"
                             value-format="yyyyMMdd">
                         </el-date-picker>
+                        <el-checkbox v-model="legalCertIdChecked" @change="legalCertIdaChange">长期</el-checkbox>
                     </el-form-item>
                     <el-form-item label="法人手机号" prop="legalMp">
                         <el-input v-model="dialogForm.legalMp"></el-input>
@@ -145,16 +144,15 @@
                             <div slot="tip" class="el-upload__tip">只能上传jpg/png文件格式</div>
                         </el-upload>
                     </el-form-item>
-
                     <el-form-item label="银行类型" prop="bankCode">
                          <el-select v-model="dialogForm.bankCode" filterable placeholder="请选择">
-    <el-option
-      v-for="item in cityList"
-      :key="item.bankCode"
-      :label="item.bankName"
-      :value="item.bankCode">
-    </el-option>
-  </el-select>
+                            <el-option
+                            v-for="item in cityList"
+                            :key="item.bankCode"
+                            :label="item.bankName"
+                            :value="item.bankCode">
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item label="银行卡号" prop="cardNo">
                         <el-input v-model="dialogForm.cardNo"></el-input>
@@ -210,7 +208,7 @@
         <el-card class="box-card" shadow="hover" style="padding: 20px" v-if="showAdapayCorp != null">
             <h2>对公结算账户</h2>
             <hr>
-            <template v-if="adapayCorpMember.auditState == 'A'">
+            <template v-if="adapayCorpMember.auditState === 'A'">
                 <div class="status-card">
                     <div class="status-i">
                         <i class="el-icon-s-claim "></i>
@@ -234,7 +232,7 @@
                     </el-form-item>
                 </el-form>
             </template>
-            <template v-if="adapayCorpMember.auditState == 'B'">
+            <template v-if="adapayCorpMember.auditState === 'B'">
                 <div class="status-card">
                     <div class="status-i">
                         <i class="el-icon-error"></i>
@@ -261,7 +259,7 @@
                     </el-form-item>
                 </el-form>
             </template>
-            <template v-if="adapayCorpMember.auditState == 'E'">
+            <template v-if="adapayCorpMember.auditState === 'E'">
                 <div class="status-card">
                     <div class="status-i">
                         <i class="el-icon-success"></i>
@@ -335,20 +333,6 @@
                </el-form>
                <hr>
            </div>
-
-
-
-<!--                <el-form ref="form" :model="adapayCorpMember" label-width="120px">-->
-<!--                    <el-form-item label="企业名称：">-->
-<!--                        <div class="font-w">{{adapayCorpMember.name}}</div>-->
-<!--                    </el-form-item>-->
-<!--                    <el-form-item label="审核状态：">-->
-<!--                        <div class="font-w">{{auditStatus(adapayCorpMember.auditState)}}</div>-->
-<!--                    </el-form-item>-->
-<!--                    <el-form-item label="审核状态描述：">-->
-<!--                        <div class="font-w">{{adapayCorpMember.auditDesc}}</div>-->
-<!--                    </el-form-item>-->
-<!--                </el-form>-->
             </template>
         </el-card>
         <el-dialog title="修改信息" :visible.sync="updateDialog" width="50%">
@@ -356,7 +340,7 @@
                 <el-form-item label="统一社会信用码" prop="socialCreditCode">
                     <el-input v-model="adapayCorpMember.socialCreditCode" maxlength="18"></el-input>
                 </el-form-item>
-                <el-form-item label="统一社会信用证有效期" prop="socialCreditCodeExpires">
+                <el-form-item label="统一社会信用证有效期">
                     <el-date-picker
                         editable
                         v-model="adapayCorpMember.socialCreditCodeExpires"
@@ -365,6 +349,7 @@
                         format="yyyyMMdd"
                         value-format="yyyyMMdd">
                     </el-date-picker>
+                    <el-checkbox v-model="adapaySocialCredChecked" @change="adapaySocialCredChange">长期</el-checkbox>
                 </el-form-item>
                 <el-form-item label="经营范围" prop="businessScope">
                     <el-input type="textarea" v-model="adapayCorpMember.businessScope" maxlength="200"></el-input>
@@ -375,7 +360,7 @@
                 <el-form-item label="法人身份证号码" prop="legalCertId">
                     <el-input v-model="adapayCorpMember.legalCertId" maxlength="20"></el-input>
                 </el-form-item>
-                <el-form-item label="法人身份证有效期" prop="legalCertIdExpires">
+                <el-form-item label="法人身份证有效期">
                     <el-date-picker
                         editable
                         v-model="adapayCorpMember.legalCertIdExpires"
@@ -384,6 +369,7 @@
                         format="yyyyMMdd"
                         value-format="yyyyMMdd">
                     </el-date-picker>
+                    <el-checkbox v-model="adapayLegalCertIdChecked" @change="adapayLegalCertIdChange">长期</el-checkbox>
                 </el-form-item>
                 <el-form-item label="法人手机号" prop="legalMp">
                     <el-input v-model="adapayCorpMember.legalMp"></el-input>
@@ -400,8 +386,8 @@
                 <el-form-item label="企业邮箱">
                     <el-input v-model="adapayCorpMember.email"></el-input>
                 </el-form-item>
-                <el-form-item  label="上传法人身份证正面照">
-                    <el-upload list-type="picture-card" :action="actionUrl" :headers="headers" :on-success="idCardSuccess"
+                <el-form-item  label="上传法人身份证正面照" >
+                    <el-upload list-type="picture-card" :class="{hide:uploadDisable}" :action="actionUrl" :headers="headers" :on-success="idCardSuccess"
                                :on-remove="idCardRemove"
                                :file-list="idCardList"
                                :limit="1"
@@ -411,8 +397,8 @@
                         <div slot="tip" class="el-upload__tip">只能上传jpg/png文件格式</div>
                     </el-upload>
                 </el-form-item>
-                <el-form-item  label="上传法人身份证反面照">
-                    <el-upload :action="actionUrl" :headers="headers" :on-success="sideCardSuccess"
+                <el-form-item  label="上传法人身份证反面照" >
+                    <el-upload :class="{hide:sideDisable}" :action="actionUrl" :headers="headers" :on-success="sideCardSuccess"
                                :on-remove="sideCardRemove"
                                :file-list="sideCardList"
                                list-type="picture-card"
@@ -423,8 +409,8 @@
                         <div slot="tip" class="el-upload__tip">只能上传jpg/png文件格式</div>
                     </el-upload>
                 </el-form-item>
-                <el-form-item  label="上传开户银行许可证">
-                    <el-upload :action="actionUrl" :headers="headers" :on-success="depositBankSuccess"
+                <el-form-item  label="上传开户银行许可证" >
+                    <el-upload :class="{hide:depositBankDisable}" :action="actionUrl" :headers="headers" :on-success="depositBankSuccess"
                                :on-remove="depositBankRemove"
                                :file-list="depositBankList"
                                list-type="picture-card"
@@ -435,8 +421,8 @@
                         <div slot="tip" class="el-upload__tip">只能上传jpg/png文件格式</div>
                     </el-upload>
                 </el-form-item>
-                <el-form-item  label="上传营业执照">
-                    <el-upload :action="actionUrl" :headers="headers" :on-success="businessSuccess"
+                <el-form-item  label="上传营业执照" >
+                    <el-upload :class="{hide:businessDisable}" :action="actionUrl" :headers="headers" :on-success="businessSuccess"
                                :on-remove="businessRemove"
                                :file-list="businessList"
                                list-type="picture-card"
@@ -469,7 +455,10 @@ export default {
     props: ["merchantId"],
     data() {
         return {
-            pickerChecked:false,
+            adapayLegalCertIdChecked:false,
+            adapaySocialCredChecked:false,
+            pickerChecked:false,// 统一社会编码有效期 长期
+            legalCertIdChecked:false, // 身份证长期
             areaList:[],
             bankValue:'',
             cityList:[], // 银行代码JSON数据
@@ -490,14 +479,6 @@ export default {
                         trigger: "blur",
                     },
                 ],
-
-                socialCreditCodeExpires:[
-                    {
-                        required: true,
-                        message: "请填写统一社会信用证有效期",
-                        trigger: "blur",
-                    },
-                ],
                 businessScope:[
                     {
                         required: true,
@@ -677,12 +658,6 @@ export default {
                     trigger: "blur",
                 },
                 ],
-                legalCertIdExpires:[{
-                    required: true,
-                    message: "请输入法人身份证有效期",
-                    trigger: "blur",
-                }
-                ],
                 legalMp:[{
                     required: true,
                     message: "请输入法人手机号",
@@ -727,6 +702,29 @@ export default {
         };
     },
     methods: {
+        adapayLegalCertIdChange(e){
+            if(e===true){
+                return this.adapayCorpMember.legalCertIdExpires = '20991231'
+            } else {
+                return this.adapayCorpMember.legalCertIdExpires = ''
+            }
+        },
+        adapaySocialCredChange(e){
+            if(e===true){
+                return this.adapayCorpMember.socialCreditCodeExpires = '20991231'
+            } else {
+                return this.adapayCorpMember.socialCreditCodeExpires = ''
+            }
+        },
+        // 法人身份证有效期 当用户点击长期时出现的事件
+        legalCertIdaChange(e){
+            if(e===true){
+                return this.dialogForm.legalCertIdExpires = '20991231'
+            } else {
+                return this.dialogForm.legalCertIdExpires = ''
+            }
+        },
+        // 统一社会编码有效期 点击长期时出现的事件
         dataChange(e){
             if(e===true){
                 return this.dialogForm.socialCreditCodeExpires = '20991231'
@@ -828,8 +826,17 @@ export default {
             this.$refs[form].validate((valid) =>{
                 if (valid) {
                     console.log(valid,'valid');
+                    if (!this.adapayCorpMember.socialCreditCodeExpires) return this.$message.warning('请输入统一社会信用证有效期')
+                    if(!this.adapayCorpMember.legalCertIdExpires) return this.$message.warning('请输入法人身份证有效期')
+                    if(!this.idCardList[0] || !this.sideCardList[0] || !this.depositBankList[0] ||!this.businessList[0]){
+                        return this.$message.warning('请上传图片')
+                    } else{
+                        this.adapayCorpMember.imgList = [this.idCardList[0].url,this.sideCardList[0].url,this.depositBankList[0].url,this.businessList[0].url]
+                        console.log(this.adapayCorpMember.imgList,'this.adapayCorpMember.imgList')
+                    }
                     updateAdapayMember(this.adapayCorpMember).then((response) =>{
                         console.log('修改',response);
+                    this.$message.success('修改成功')
                         this.updateDialog = false
                         this.selectAdapayMember();
                     })
@@ -868,26 +875,28 @@ export default {
             this.dialogForm.provCode = value[0]
             this.dialogForm.areaCode = value[1]
         },
+        // 新建提交按钮
         submitDialogForm(dialogForm){
             this.$refs[dialogForm].validate((valid) =>{
                 if (valid) {
                     console.log(this.dialogForm,'this.dialogForm')
                     console.log(valid,dialogForm)
-                    if (this.dialogForm.bankAcctType === '1'){
+                    if (this.dialogForm.bankAcctType === '1')  {
                         if (!this.dialogForm.socialCreditCodeExpires) return this.$message.warning('请输入统一社会信用证有效期')
+                        if(!this.dialogForm.legalCertIdExpires) return this.$message.warning('请输入法人身份证有效期')
                         if(!this.idCardList[0] || !this.sideCardList[0] || !this.depositBankList[0] ||!this.businessList[0]){
                             return this.$message.warning('请上传图片')
                         } else{
                             this.dialogForm.imgList = [this.idCardList[0].url,this.sideCardList[0].url,this.depositBankList[0].url,this.businessList[0].url]
                         }
-                        console.log(this.dialogForm.imgList.length,'this.dialogForm.imgList')
                     }
-                    createSettleAccount(this.dialogForm).then((response) =>{
-                        console.log('新增',response);
-                        this.$message.success('新增成功，请勿重新提交')
-                        this.dialog = false
-                        this.selectAdapayMember();
-                    })
+                    console.log('执行请求，创建成功')
+                    // createSettleAccount(this.dialogForm).then((response) =>{
+                    //     console.log('新增',response);
+                    //     this.$message.success('新增成功，请勿重新提交')
+                    //     this.dialog = false
+                    //     this.selectAdapayMember();
+                    // })
                 } else {
                     console.log('表格提交失败');
                     return false