diff --git a/src/languages/zh.js b/src/languages/zh.js
index 79d3397..b2e8c5f 100644
--- a/src/languages/zh.js
+++ b/src/languages/zh.js
@@ -1862,7 +1862,7 @@ export default {
         certificateExpirationDate: '证件有效期',
         failureReason: '失败原因',
         electronicContract: '电子合同',
-        earnestMoney: '保证金',
+        earnestMoney: '保证金缴纳证明',
         registeredAgentName: '注册代理名称',
         authenticatedAgentName: '认证代理名称',
         registeredLegalPersonName: '注册法人姓名',
diff --git a/src/views/business/agentVerification/index.vue b/src/views/business/agentVerification/index.vue
index 4ba691d..97986ce 100644
--- a/src/views/business/agentVerification/index.vue
+++ b/src/views/business/agentVerification/index.vue
@@ -47,13 +47,10 @@
     </el-row>
 
     <el-table v-loading="loading" :data="merchantVerificationList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column :label="$t('business.agent.agentVerification.userAccount')" align="center" prop="userAccount"/>
-      <el-table-column :label="$t('business.agent.agentVerification.agentName')" align="center" prop="agentName"/>
-      <el-table-column :label="$t('business.agent.agentVerification.businessLicenseNumber')" align="center" prop="businessLicenseNumber"/>
-      <el-table-column :label="$t('business.agent.agentVerification.legalPersonInfoName')" align="center" prop="legalPersonInfoName"/>
-      <el-table-column :label="$t('business.agent.agentVerification.legalPersonIdCard')" align="center" prop="legalPersonIdCard"/>
-      <el-table-column :label="$t('business.agent.agentVerification.certificateExpirationDate')" align="center" prop="legalPersonExpirationTime"/>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column :label="$t('business.agent.agentVerification.userAccount')" align="center" prop="userAccount" />
+      <el-table-column :label="$t('business.agent.agentVerification.agentName')" align="center" prop="agentInfoName" />
+      <el-table-column :label="$t('business.merchant.merchantVerification.certificateExpirationDate')" align="center" prop="legalPersonExpirationTime" />
       <el-table-column :label="$t('business.agent.agentVerification.status')" align="center" prop="status">
         <template slot-scope="scope">
           <el-tag type="primary" v-if="scope.row.status == '0'  || scope.row.status == null">{{ $t('business.agent.agentVerification.statusOption.unverified') }}</el-tag>
@@ -62,8 +59,12 @@
           <el-tag type="danger" v-if="scope.row.status == '3'">{{ $t('business.agent.agentVerification.statusOption.verificationFailed') }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('business.agent.agentVerification.authenticationDate')" align="center" prop="authenticationDate" width="180"/>
-      <el-table-column :label="$t('business.agent.agentVerification.failureReason')" align="center" prop="failureReason"/>
+      <el-table-column :label="$t('business.agent.agentVerification.authenticationDate')" align="center"
+                       prop="authenticationDate" width="180" />
+      <el-table-column :label="$t('business.merchant.userInfoBus.operatingAddress')" align="center"
+                       prop="operateAddressShow" width="180" />
+      <el-table-column :label="$t('business.agent.agentVerification.failureReason')" align="center"
+                       prop="failureReason" />
       <el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-if="(scope.row.status == null || scope.row.status == 0 || scope.row.status == 3)"
@@ -99,66 +100,218 @@
     <!-- 添加或修改商户认证信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
-        <el-form-item :label="$t('business.agent.agentVerification.agentName')" prop="agentName">
-          <el-input v-model="form.agentName" :placeholder="$t('business.agent.agentVerification.placeholder.agentNamePlaceholder')"/>
-        </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.businessLicenseNumber')" prop="businessLicenseNumber">
-          <el-input v-model="form.businessLicenseNumber" :placeholder="$t('business.agent.agentVerification.businessLicenseNumber')"/>
-        </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.legalPersonName')" prop="legalPersonName">
-          <el-input v-model="form.legalPersonName" :placeholder="$t('business.agent.agentVerification.legalPersonName')"/>
-        </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCard')" prop="legalPersonIdCard">
-          <el-input v-model="form.legalPersonIdCard" :placeholder="$t('business.agent.agentVerification.placeholder.legalPersonIdCardPlaceholder')"/>
-        </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.idCardFront')" prop="idCardFrontImagePath">
-          <el-upload
-            class="upload-demo"
-            :action="uploadUrl"
-            :on-success="handleSuccess_idCardFrontImagePath"
-            :limit="1"
-            :accept="'image/jpg,image/png'"
-            :file-list="fileList"
-            list-type="picture">
+        <!--    是否有营业执照：1-有，2-无    -->
+        <el-form-item :label="$t('business.merchant.merchantVerification.businessLicense')" prop="hasLicense">
+          <el-radio-group v-model="form.hasLicense">
+            <el-radio :label="1">{{ $t('business.merchant.merchantVerification.yes') }}</el-radio>
+            <el-radio :label="0">{{ $t('business.merchant.merchantVerification.no') }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.businessLicenseNumber')"
+                      prop="businessLicenseNumber">
+          <el-input v-model="form.businessLicenseNumber"
+                    :placeholder="$t('business.merchant.merchantVerification.businessLicenseNumberPlaceholder')" />
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.businessLicense')"
+                      prop="businessLicenseImage">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_businessLicenseImage" :limit="1"
+                     :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.doorPhoto')"
+                      prop="shopDoorImagePath">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_shopDoorImagePath" :limit="1"
+                     :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
+          </el-upload>
+        </el-form-item>
+        <!--  有营业执照的认证方式：1-身份证，2-护照    -->
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.userManager.userVerification.verifiedType')" prop="licenseType">
+          <el-radio-group v-model="form.licenseType">
+            <el-radio :label="1">{{ $t('business.userManager.userVerification.idCardVerification') }}</el-radio>
+            <el-radio :label="0">{{ $t('business.userManager.userVerification.license') }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!--    有营业执照的认证方式认证基础字段    -->
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonName')" prop="legalPersonName">
+          <el-input v-model="form.legalPersonName"
+                    :placeholder="$t('business.merchant.merchantVerification.legalPersonNamePlaceholder')" />
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonPhone')" prop="contactPersonPhone">
+          <el-input v-model="form.contactPersonPhone"
+                    :placeholder="$t('business.merchant.merchantVerification.legalPersonPhonePlaceholder')" />
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonEmail')" prop="contactPersonEmail">
+          <el-input v-model="form.contactPersonEmail"
+                    :placeholder="$t('business.merchant.merchantVerification.legalPersonEmailPlaceholder')" />
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonIdCard')" prop="legalPersonIdCard">
+          <el-input v-model="form.legalPersonIdCard"
+                    :placeholder="$t('business.merchant.merchantVerification.legalPersonIdCardPlaceholder')" />
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.userManager.userVerification.certificateStartDate')" prop="legalPersonDateOfIssue">
+          <el-date-picker clearable
+                          v-model="form.legalPersonDateOfIssue"
+                          type="date"
+                          format="dd/MM/yyyy"
+                          value-format="dd/MM/yyyy"
+                          :placeholder="$t('business.userManager.userVerification.dateOfIssueRequired')">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.userManager.userVerification.certificateEndDate')" prop="legalPersonExpirationTime">
+          <el-date-picker clearable
+                          v-model="form.legalPersonExpirationTime"
+                          type="date"
+                          format="dd/MM/yyyy"
+                          value-format="dd/MM/yyyy"
+                          :placeholder="$t('business.userManager.userVerification.expirationTimeRequired')">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.userInfoBus.operatingAddress')" prop="operateAddress">
+          <el-cascader
+            v-model="form.operateAddress"
+            :options="options_addr"
+            @change="handleChange"></el-cascader>
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.userManager.userInfo.detailAddr')" prop="operateAddressDetail">
+          <el-input v-model="form.operateAddressDetail	" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
+        </el-form-item>
+        <!--    有营业执照的认证方式身份证上传    -->
+        <el-form-item v-if="form.hasLicense == '1' && form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardFront')"
+                      prop="idCardFrontImagePath">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_idCardFrontImagePath" :limit="1"
+                     :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1' && form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardBack')"
+                      prop="idCardBackImagePath">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_idCardBackImagePath" :limit="1"
+                     :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1' && form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardHolding')"
+                      prop="userWithIdCardImagePath">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_userWithIdCardImagePath"
+                     :limit="1" :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
+          </el-upload>
+        </el-form-item>
+        <!--    有营业执照的认证方式护照上传    -->
+        <el-form-item v-if="form.hasLicense == '1' && form.licenseType == '0'" :label="$t('business.userManager.userVerification.license')"
+                      prop="passportImagePath">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_passportImagePath"
+                     :limit="1" :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
             <el-button size="small" type="primary">点击上传</el-button>
             <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
           </el-upload>
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.idCardBack')" prop="idCardBackImagePath">
-          <el-upload
-            class="upload-demo"
-            :action="uploadUrl"
-            :on-success="handleSuccess_idCardBackImagePath"
-            :limit="1"
-            :accept="'image/jpg,image/png'"
-            :file-list="fileList"
-            list-type="picture">
+        <!-------------------------------------------------------------有无营业执照分割线------------------------------------------------------------------->
+        <!--  无营业执照的认证方式：1-身份证，2-护照    -->
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.userManager.userVerification.verifiedType')" prop="shopkeeperLicenseType">
+          <el-radio-group v-model="form.shopkeeperLicenseType">
+            <el-radio :label="1">{{ $t('business.userManager.userVerification.idCardVerification') }}</el-radio>
+            <el-radio :label="0">{{ $t('business.userManager.userVerification.license') }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!--    无营业执照的认证方式认证基础字段    -->
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperName')" prop="shopkeeperName">
+          <el-input v-model="form.shopkeeperName"
+                    :placeholder="$t('business.merchant.merchantVerification.legalPersonNamePlaceholder')" />
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperPhone')" prop="contactPersonPhone">
+          <el-input v-model="form.contactPersonPhone"
+                    :placeholder="$t('business.merchant.merchantVerification.legalPersonPhonePlaceholder')" />
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperEmail')" prop="contactPersonEmail">
+          <el-input v-model="form.contactPersonEmail"
+                    :placeholder="$t('business.merchant.merchantVerification.legalPersonEmailPlaceholder')" />
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperIdCardNumber')" prop="shopkeeperIdCard">
+          <el-input v-model="form.shopkeeperIdCard"
+                    :placeholder="$t('business.merchant.merchantVerification.legalPersonIdCardPlaceholder')" />
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.userManager.userVerification.certificateStartDate')" prop="shopkeeperDateOfIssue">
+          <el-date-picker clearable
+                          v-model="form.shopkeeperDateOfIssue"
+                          type="date"
+                          format="dd/MM/yyyy"
+                          value-format="dd/MM/yyyy"
+                          :placeholder="$t('business.userManager.userVerification.dateOfIssueRequired')">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.userManager.userVerification.certificateEndDate')" prop="shopkeeperExpirationTime">
+          <el-date-picker clearable
+                          v-model="form.shopkeeperExpirationTime"
+                          type="date"
+                          format="dd/MM/yyyy"
+                          value-format="dd/MM/yyyy"
+                          :placeholder="$t('business.userManager.userVerification.expirationTimeRequired')">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.userInfoBus.operatingAddress')" prop="operateAddress">
+          <el-cascader
+            v-model="form.operateAddress"
+            :options="options_addr"
+            @change="handleChange"></el-cascader>
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.userManager.userInfo.detailAddr')" prop="operateAddressDetail">
+          <el-input v-model="form.operateAddressDetail	" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
+        </el-form-item>
+        <!--    无营业执照的认证方式身份证上传    -->
+        <el-form-item v-if="form.hasLicense == '0' && form.shopkeeperLicenseType == '1'" :label="$t('business.userManager.userVerification.idCardFront')"
+                      prop="shopkeeperIdCardFrontImagePath">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_shopkeeperIdCardFrontImagePath" :limit="1"
+                     :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
             <el-button size="small" type="primary">点击上传</el-button>
             <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
           </el-upload>
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.idCardHolding')" prop="userWithIdCardImagePath">
-          <el-upload
-            class="upload-demo"
-            :action="uploadUrl"
-            :on-success="handleSuccess_userWithIdCardImagePath"
-            :limit="1"
-            :accept="'image/jpg,image/png'"
-            :file-list="fileList"
-            list-type="picture">
+        <el-form-item v-if="form.hasLicense == '0' && form.shopkeeperLicenseType == '1'" :label="$t('business.userManager.userVerification.idCardBack')"
+                      prop="shopkeeperIdCardBackImagePath">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_shopkeeperIdCardBackImagePath" :limit="1"
+                     :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
             <el-button size="small" type="primary">点击上传</el-button>
             <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
           </el-upload>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.electronicContract')" prop="electronicContract">
-          <el-input v-model="form.electronicContract" :placeholder="$t('business.agent.agentVerification.electronicContract')"/>
+        <el-form-item v-if="form.hasLicense == '0' && form.shopkeeperLicenseType == '1'" :label="$t('business.userManager.userVerification.idCardHolding')"
+                      prop="shopkeeperWithIdCardImagePath">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_shopkeeperWithIdCardImagePath"
+                     :limit="1" :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
+          </el-upload>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.earnestMoney')" prop="earnestMoney">
-          <el-input v-model="form.earnestMoney" :placeholder="$t('business.agent.agentVerification.earnestMoney')"/>
+        <!--    无营业执照的认证方式护照上传    -->
+        <el-form-item v-if="form.hasLicense == '0' && form.shopkeeperLicenseType == '0'" :label="$t('business.userManager.userVerification.license')"
+                      prop="shopkeeperPassportImagePath">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_shopkeeperPassportImagePath"
+                     :limit="1" :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
+          </el-upload>
+        </el-form-item>
+        <!--    保证金缴纳证明上传    -->
+        <el-form-item :label="$t('business.agent.agentVerification.earnestMoney')"
+                      prop="earnestMoney">
+          <el-upload class="upload-demo" :action="uploadUrl" :on-success="handleSuccess_earnestMoney"
+                     :limit="1" :accept="'image/jpg,image/png'" :file-list="fileList" list-type="picture">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
+          </el-upload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">{{ $t('common.button.confirm') }}</el-button>
+        <el-button :loading="buttonLoading" type="primary"
+                   @click="submitForm">{{ $t('common.button.confirm') }}</el-button>
         <el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button>
       </div>
     </el-dialog>
@@ -166,39 +319,104 @@
     <!--  认证审核  -->
     <el-dialog :title="title" :visible.sync="auditOpen" width="700px" append-to-body>
       <el-form ref="auditForm" :model="auditForm" :rules="rules" label-width="auto">
-        <el-form-item :label="$t('business.agent.agentVerification.registeredAgentName') + '：'">
-          {{auditForm.agentInfoName}}
-        </el-form-item>
         <el-form-item :label="$t('business.agent.agentVerification.authenticatedAgentName') + '：'">
           {{auditForm.agentName}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.registeredLegalPersonName') + '：'">
-          {{auditForm.legalPersonInfoName}}
+        <el-form-item v-if="auditForm.hasLicense ==1" :label="$t('business.merchant.merchantVerification.businessLicenseNumber') + '：'">
+          {{auditForm.businessLicenseNumber}}
+        </el-form-item>
+        <el-form-item v-if="auditForm.hasLicense ==1" :label="$t('business.merchant.merchantVerification.businessLicense') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.businessLicenseImage"
+                    :preview-src-list="[auditForm.businessLicenseImage]" />
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.authenticatedLegalPersonName') + '：'">
+        <el-form-item v-if="auditForm.hasLicense ==0" :label="$t('business.merchant.merchantVerification.doorPhoto') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.shopDoorImagePath"
+                    :preview-src-list="[auditForm.shopDoorImagePath]" />
+        </el-form-item>
+        <!--    有营业执照的法人审核信息    -->
+        <el-form-item v-if="auditForm.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonName') + '：'">
           {{auditForm.legalPersonName}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCardNumber') + '：'">
-          {{auditForm.legalPersonIdCardShow}}
+        <el-form-item v-if="auditForm.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonPhone') + '：'">
+          {{auditForm.contactPersonPhone}}
+        </el-form-item>
+        <el-form-item v-if="auditForm.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonEmail') + '：'">
+          {{auditForm.contactPersonEmail}}
         </el-form-item>
-        <el-form-item v-if="auditForm.licenseType ==1" :label="$t('business.userManager.userVerification.idCardFront') + '：'">
-          <el-image style="width: 90px; height: 30px" :src="auditForm.idCardFrontImagePath" :preview-src-list="[auditForm.idCardFrontImagePath]"/>
+        <el-form-item v-if="auditForm.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonIdCard') + '：'">
+          {{auditForm.legalPersonIdCard}}
         </el-form-item>
-        <el-form-item v-if="auditForm.licenseType ==1" :label="$t('business.userManager.userVerification.idCardBack') + '：'">
-          <el-image style="width: 90px; height: 30px" :src="auditForm.idCardBackImagePath" :preview-src-list="[auditForm.idCardBackImagePath]"/>
+        <el-form-item v-if="auditForm.hasLicense == '1'" :label="$t('business.userManager.userVerification.certificateStartDate') + '：'">
+          {{auditForm.legalPersonDateOfIssue}}
         </el-form-item>
-        <el-form-item v-if="auditForm.licenseType ==1" :label="$t('business.userManager.userVerification.idCardHolding') + '：'">
-          <el-image style="width: 90px; height: 30px" :src="auditForm.userWithIdCardImagePath" :preview-src-list="[auditForm.userWithIdCardImagePath]"/>
+        <el-form-item v-if="auditForm.hasLicense == '1'" :label="$t('business.userManager.userVerification.certificateEndDate') + '：'">
+          {{auditForm.legalPersonExpirationTime}}
         </el-form-item>
-        <el-form-item v-if="auditForm.licenseType == 0" :label="$t('business.userManager.userVerification.license')">
+        <el-form-item v-if="auditForm.hasLicense == '1'" :label="$t('business.merchant.userInfoBus.operatingAddress') + '：'">
+          {{auditForm.operateAddressShow}}
+        </el-form-item>
+        <el-form-item v-if="auditForm.licenseType == '1' && auditForm.hasLicense == '1'" :label="$t('business.userManager.userVerification.idCardFront') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.legalPersonIdCardFrontImagePath"
+                    :preview-src-list="[auditForm.legalPersonIdCardFrontImagePath]" />
+        </el-form-item>
+        <el-form-item v-if="auditForm.licenseType == '1' && auditForm.hasLicense == '1'" :label="$t('business.userManager.userVerification.idCardBack') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.legalPersonIdCardBackImagePath"
+                    :preview-src-list="[auditForm.legalPersonIdCardBackImagePath]" />
+        </el-form-item>
+        <el-form-item v-if="auditForm.licenseType == '1' && auditForm.hasLicense == '1'" :label="$t('business.userManager.userVerification.idCardHolding') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.legalPersonUserWithIdCardImagePath"
+                    :preview-src-list="[auditForm.legalPersonUserWithIdCardImagePath]" />
+        </el-form-item>
+        <el-form-item v-if="auditForm.licenseType == '0' && auditForm.hasLicense == '1'" :label="$t('business.userManager.userVerification.license') + '：'">
           <el-image style="width: 90px; height: 30px" :src="auditForm.passportImagePath"
-            :preview-src-list="[auditForm.passportImagePath]" />
+                    :preview-src-list="[auditForm.passportImagePath]" />
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.businessLicense') + '：'">
-          {{auditForm.businessLicenseNumber}}
+        <!--    无营业执照的店主审核信息    -->
+        <el-form-item v-if="auditForm.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperName') + '：'">
+          {{auditForm.shopkeeperName}}
+        </el-form-item>
+        <el-form-item v-if="auditForm.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperPhone') + '：'">
+          {{auditForm.contactPersonPhone}}
+        </el-form-item>
+        <el-form-item v-if="auditForm.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperEmail') + '：'">
+          {{auditForm.contactPersonEmail}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.authenticationFailureReason') + '：'" prop="failureReason">
-          <el-input v-model="auditForm.failureReason" :placeholder="$t('business.agent.agentVerification.authenticationFailureReason')" />
+        <el-form-item v-if="auditForm.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperIdCardNumber') + '：'">
+          {{auditForm.shopkeeperIdCard}}
+        </el-form-item>
+        <el-form-item v-if="auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.certificateStartDate') + '：'">
+          {{auditForm.shopkeeperDateOfIssue}}
+        </el-form-item>
+        <el-form-item v-if="auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.certificateEndDate') + '：'">
+          {{auditForm.shopkeeperExpirationTime}}
+        </el-form-item>
+        <el-form-item v-if="auditForm.hasLicense == '0'" :label="$t('business.merchant.userInfoBus.operatingAddress') + '：'">
+          {{auditForm.operateAddressShow}}
+        </el-form-item>
+        <el-form-item v-if="auditForm.shopkeeperLicenseType == '1' && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardFront') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.shopkeeperIdCardFrontImagePath"
+                    :preview-src-list="[auditForm.shopkeeperIdCardFrontImagePath]" />
+        </el-form-item>
+        <el-form-item v-if="auditForm.shopkeeperLicenseType == '1' && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardBack') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.shopkeeperIdCardBackImagePath"
+                    :preview-src-list="[auditForm.shopkeeperIdCardBackImagePath]" />
+        </el-form-item>
+        <el-form-item v-if="auditForm.shopkeeperLicenseType	== '1' && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardHolding') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.shopkeeperWithIdCardImagePath"
+                    :preview-src-list="[auditForm.shopkeeperWithIdCardImagePath]" />
+        </el-form-item>
+        <el-form-item v-if="auditForm.shopkeeperLicenseType == '0' && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.license') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.shopkeeperPassportImagePath"
+                    :preview-src-list="[auditForm.shopkeeperPassportImagePath]" />
+        </el-form-item>
+        <el-form-item :label="$t('business.agent.agentVerification.earnestMoney') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.earnestMoney"
+                    :preview-src-list="[auditForm.earnestMoney]" />
+        </el-form-item>
+        <el-form-item :label="$t('business.merchant.merchantVerification.authenticationFailureReason') + '：'"
+                      prop="failureReason">
+          <el-input v-model="auditForm.failureReason"
+                    :placeholder="$t('business.merchant.merchantVerification.authenticationFailureReasonPlaceholder')" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -214,40 +432,100 @@
         <el-form-item :label="$t('business.agent.agentVerification.agentName') + '：'">
           {{ form.agentName }}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.businessLicenseNumber') + '：'">
-          {{ form.businessLicenseNumber }}
+        <el-form-item v-if="form.hasLicense ==1" :label="$t('business.merchant.merchantVerification.businessLicenseNumber') + '：'">
+          {{form.businessLicenseNumber}}
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense ==1" :label="$t('business.merchant.merchantVerification.businessLicense') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="form.businessLicenseImage"
+                    :preview-src-list="[form.businessLicenseImage]" />
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense ==0" :label="$t('business.merchant.merchantVerification.doorPhoto') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="form.shopDoorImagePath"
+                    :preview-src-list="[form.shopDoorImagePath]" />
+        </el-form-item>
+        <!--    有营业执照的法人信息详情     -->
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonName') + '：'">
+          {{form.legalPersonName}}
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonPhone') + '：'">
+          {{form.contactPersonPhone}}
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonEmail') + '：'">
+          {{form.contactPersonEmail}}
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonIdCard') + '：'">
+          {{form.legalPersonIdCard}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.legalPersonName') + '：'">
-          {{ form.legalPersonName }}
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.userManager.userVerification.certificateStartDate') + '：'">
+          {{form.legalPersonDateOfIssue}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCard') + '：'">
-          {{ form.legalPersonIdCard }}
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.userManager.userVerification.certificateEndDate') + '：'">
+          {{form.legalPersonExpirationTime}}
         </el-form-item>
-        <el-form-item v-if="form.licenseType ==1" :label="$t('business.userManager.userVerification.idCardFront') + '：'">
-          <el-image style="width: 90px; height: 30px" :src="form.idCardFrontImagePath" :preview-src-list="[form.idCardFrontImagePath]"/>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.userInfoBus.operatingAddress') + '：'">
+          {{form.operateAddressShow}}
         </el-form-item>
-        <el-form-item v-if="form.licenseType ==1" :label="$t('business.userManager.userVerification.idCardBack') + '：'">
-          <el-image style="width: 90px; height: 30px" :src="form.idCardBackImagePath" :preview-src-list="[form.idCardBackImagePath]"/>
+        <el-form-item v-if="form.licenseType ==1 && form.hasLicense == '1'" :label="$t('business.userManager.userVerification.idCardFront') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="form.legalPersonIdCardFrontImagePath"
+                    :preview-src-list="[form.legalPersonIdCardFrontImagePath]" />
         </el-form-item>
-        <el-form-item v-if="form.licenseType ==1" :label="$t('business.userManager.userVerification.idCardHolding') + '：'">
-          <el-image style="width: 90px; height: 30px" :src="form.userWithIdCardImagePath" :preview-src-list="[form.userWithIdCardImagePath]"/>
+        <el-form-item v-if="form.licenseType ==1 && form.hasLicense == '1'" :label="$t('business.userManager.userVerification.idCardBack') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="form.legalPersonIdCardBackImagePath"
+                    :preview-src-list="[form.legalPersonIdCardBackImagePath]" />
         </el-form-item>
-        <el-form-item v-if="form.licenseType == 0" :label="$t('business.userManager.userVerification.license')">
+        <el-form-item v-if="form.licenseType ==1 && form.hasLicense == '1'" :label="$t('business.userManager.userVerification.idCardHolding') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="form.legalPersonUserWithIdCardImagePath"
+                    :preview-src-list="[form.legalPersonUserWithIdCardImagePath]" />
+        </el-form-item>
+        <el-form-item v-if="form.licenseType == 0 && form.hasLicense == '1'" :label="$t('business.userManager.userVerification.license') + '：'">
           <el-image style="width: 90px; height: 30px" :src="form.passportImagePath"
-            :preview-src-list="[form.passportImagePath]" />
+                    :preview-src-list="[form.passportImagePath]" />
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.electronicContract') + '：'">
-          {{ form.electronicContract }}
+        <!--    无营业执照的店主信息详情    -->
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperName') + '：'">
+          {{form.shopkeeperName}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.earnestMoney') + '：'">
-          {{ form.earnestMoney }}
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperPhone') + '：'">
+          {{form.contactPersonPhone}}
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperEmail') + '：'">
+          {{form.contactPersonEmail}}
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperIdCardNumber') + '：'">
+          {{form.shopkeeperIdCard}}
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.userManager.userVerification.certificateStartDate') + '：'">
+          {{form.shopkeeperDateOfIssue}}
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.userManager.userVerification.certificateEndDate') + '：'">
+          {{form.shopkeeperExpirationTime}}
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.userInfoBus.operatingAddress') + '：'">
+          {{form.operateAddressShow}}
+        </el-form-item>
+        <el-form-item v-if="form.shopkeeperLicenseType == '1' && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardFront') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="form.shopkeeperIdCardFrontImagePath"
+                    :preview-src-list="[form.shopkeeperIdCardFrontImagePath]" />
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.authenticationDate') + '：'" prop="authenticationDate">
-          {{ form.authenticationDate }}
+        <el-form-item v-if="form.shopkeeperLicenseType == '1' && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardBack') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="form.shopkeeperIdCardBackImagePath"
+                    :preview-src-list="[form.shopkeeperIdCardBackImagePath]" />
+        </el-form-item>
+        <el-form-item v-if="form.shopkeeperLicenseType == '1' && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardHolding') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="form.shopkeeperWithIdCardImagePath"
+                    :preview-src-list="[form.shopkeeperWithIdCardImagePath]" />
+        </el-form-item>
+        <el-form-item v-if="form.shopkeeperLicenseType == '0' && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.license') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="form.shopkeeperPassportImagePath"
+                    :preview-src-list="[form.shopkeeperPassportImagePath]" />
+        </el-form-item>
+        <el-form-item :label="$t('business.agent.agentVerification.earnestMoney') + '：'">
+          <el-image style="width: 90px; height: 30px" :src="form.earnestMoney"
+                    :preview-src-list="[form.earnestMoney]" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">{{$t('common.button.cancel')}}</el-button>
+        <el-button @click="cancel">{{$t('common.button.close')}}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -291,6 +569,8 @@ export default {
       detailOpen: false,
       // 是否显示详情弹出层
       auditOpen: false,
+      //地址选择列表
+      options_addr:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -324,6 +604,9 @@ export default {
         legalPersonName: [
           { required: true, message: this.$t('business.agent.agentVerification.legalPersonNameRequired'), trigger: "blur" }
         ],
+        shopkeeperName: [
+          { required: true, message: this.$t('business.merchant.merchantVerification.shopKeeperNamePlaceholder'), trigger: "blur" }
+        ],
         idCardFrontImagePath: [
           { required: true, message: this.$t('business.userManager.userVerification.idCardFrontRequired'), trigger: "blur" }
         ],
@@ -333,6 +616,11 @@ export default {
         userWithIdCardImagePath: [
           { required: true, message: this.$t('business.userManager.userVerification.idCardHoldingRequired'), trigger: "blur" }
         ],
+        passportImagePath: [{
+          required: true,
+          message: this.$t('business.userManager.userVerification.passportRequired'),
+          trigger: "blur"
+        }],
         electronicContract: [
           { required: true, message: this.$t('business.agent.agentVerification.electronicContractRequired'), trigger: "blur" }
         ],
@@ -342,14 +630,94 @@ export default {
         legalPersonIdCard: [
           { required: true,pattern: /^\d+$/, message: this.$t('business.agent.agentVerification.legalPersonIdCardPattern'), trigger: "blur" }
         ],
-        failureReason: [
-          {  }
-        ],
+        failureReason: [{}],
+        businessLicenseNumber: [{
+          required: true,
+          message: this.$t('business.merchant.merchantVerification.businessLicenseNumberPlaceholder'),
+          trigger: "blur"
+        }],
+        businessLicenseImage: [{
+          required: true,
+          message: this.$t('business.merchant.merchantVerification.businessLicensePhotoPlaceholder'),
+          trigger: "blur"
+        }],
+        shopDoorImagePath: [{
+          required: true,
+          message: this.$t('business.merchant.merchantVerification.doorPhotoPlaceholder'),
+          trigger: "blur"
+        }],
+        legalPersonDateOfIssue: [{
+          required: true,
+          message: this.$t('business.userManager.userVerification.expirationTimeRequired'),
+          trigger: "blur"
+        }],
+        legalPersonExpirationTime: [{
+          required: true,
+          message: this.$t('business.userManager.userVerification.expirationTimeRequired'),
+          trigger: "blur"
+        }],
+        operateAddress: [{
+          required: true,
+          message: this.$t('business.userManager.userInfo.addrPlaceholder'),
+          trigger: "blur"
+        }],
+        operateAddressDetail: [{
+          required: true,
+          message: this.$t('business.userManager.userInfo.addrPlaceholder'),
+          trigger: "blur"
+        }],
+        shopkeeperIdCard: [{
+          required: true,
+          pattern: /^\d+$/,
+          message: this.$t('business.merchant.merchantVerification.shopKeeperIdCardPlaceholder'),
+          trigger: "blur"
+        }],
+        contactPersonPhone: [{
+          required: true,
+          message: this.$t('business.merchant.merchantVerification.shopKeeperPhonePlaceholder'),
+          trigger: "blur"
+        }],
+        contactPersonEmail: [{
+          required: true,
+          message: this.$t('business.merchant.merchantVerification.shopKeeperEmailPlaceholder'),
+          trigger: "blur"
+        }],
+        shopkeeperIdCardFrontImagePath: [{
+          required: true,
+          message: this.$t('business.userManager.userVerification.idCardFrontRequired'),
+          trigger: "blur"
+        }],
+        shopkeeperIdCardBackImagePath: [{
+          required: true,
+          message: this.$t('business.userManager.userVerification.idCardBackRequired'),
+          trigger: "blur"
+        }],
+        shopkeeperWithIdCardImagePath: [{
+          required: true,
+          message: this.$t('business.userManager.userVerification.idCardHoldingRequired'),
+          trigger: "blur"
+        }],
+        shopkeeperPassportImagePath: [{
+          required: true,
+          message: this.$t('business.userManager.userVerification.passportRequired'),
+          trigger: "blur"
+        }],
+        shopkeeperDateOfIssue: [{
+          required: true,
+          message: this.$t('business.userManager.userVerification.expirationTimeRequired'),
+          trigger: "blur"
+        }],
+        shopkeeperExpirationTime: [{
+          required: true,
+          message: this.$t('business.userManager.userVerification.expirationTimeRequired'),
+          trigger: "blur"
+        }],
       }
     };
   },
   created() {
     this.getList();
+    this.getAddress();
   },
   computed: {
     // 计算属性：动态生成上传URL
@@ -364,6 +732,12 @@ export default {
     /** 查询商户认证信息列表 */
     getList() {
       this.loading = true;
+      const languageMap = {
+        'zh': 1,
+        'en': 2,
+        'la': 3
+      };
+      this.queryParams.language = languageMap[this.$i18n.locale] || null;
       listAgentVerification(this.queryParams).then(response => {
         this.merchantVerificationList = response.rows;
         this.total = response.total;
@@ -399,7 +773,9 @@ export default {
         updateTime: undefined,
         createBy: undefined,
         updateBy: undefined,
-        delFlag: undefined
+        delFlag: undefined,
+        hasLicense: 1,
+        licenseType: 1
       };
       this.resetForm("form");
     },
@@ -422,11 +798,40 @@ export default {
     /** 新增按钮操作 */
     handleAdd(row) {
       this.reset()
+      this.form.agentName = row.agentInfoName;
       if (row.id != null){
         this.form = row;
-        this.form.idCardFrontImagePath = null;
-        this.form.idCardBackImagePath = null;
-        this.form.userWithIdCardImagePath = null;
+        // 处理地址回显
+        const addrValue = this.form.operateAddress	;
+        if (addrValue) {
+          const addrArray = addrValue.split(',');
+          const provinceValue = addrArray[0];
+          const cityValue = addrArray[1];
+
+          const province = this.options_addr.find(item => item.value === provinceValue);
+          if (province) {
+            if (cityValue) {
+              const city = province.children.find(item => item.value === cityValue);
+              if (city) {
+                this.form.operateAddress	 = [provinceValue, cityValue];
+                console.log(this.form);
+              }
+            } else {
+              this.form.operateAddress	 = [provinceValue];
+            }
+          }
+        }
+        this.form.businessLicenseImage = undefined;
+        this.form.shopDoorImagePath = undefined;
+        this.form.idCardFrontImagePath = undefined;
+        this.form.idCardBackImagePath = undefined;
+        this.form.userWithIdCardImagePath = undefined;
+        this.form.passportImagePath = undefined;
+        this.form.shopkeeperIdCardFrontImagePath = undefined;
+        this.form.shopkeeperIdCardBackImagePath = undefined;
+        this.form.shopkeeperWithIdCardImagePath = undefined;
+        this.form.shopkeeperPassportImagePath = undefined;
+        this.form.earnestMoney = undefined;
         this.open = true;
         this.title = this.$t('business.agent.agentVerification.authenticateTitle');
       }else {
@@ -466,6 +871,9 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+          this.form.operateAddress = this.form.operateAddress + "," + this.form.operateAddressDetail;
+          if (this.form.electronicContract == null || this.form.electronicContract == '')
+            this.form.electronicContract = 1;
           if (this.form.id != null) {
             updateAgentVerification(this.form).then(response => {
               this.$modal.msgSuccess(this.$t('business.agent.agentVerification.updateSuccess'));
@@ -543,23 +951,82 @@ export default {
           });
       })
     },
-    //身份证正面上传成功
+    //身份证正面上传成功-法人
     handleSuccess_idCardFrontImagePath(response) {
       if (response.code === 200) {
         this.form.idCardFrontImagePath = this.getImgUrl + response.data;  // 保存 URL 到表单
       }
     },
-    //身份证反面上传成功
+    //身份证反面上传成功-法人
     handleSuccess_idCardBackImagePath(response) {
       if (response.code === 200) {
         this.form.idCardBackImagePath = this.getImgUrl + response.data;  // 保存 URL 到表单
       }
     },
-    //身份证手持上传成功
+    //身份证手持上传成功-法人
     handleSuccess_userWithIdCardImagePath(response) {
       if (response.code === 200) {
         this.form.userWithIdCardImagePath = this.getImgUrl + response.data;  // 保存 URL 到表单
       }
+    },
+    //护照上传成功-法人
+    handleSuccess_passportImagePath(response) {
+      if (response.code === 200) {
+        this.form.passportImagePath = this.getImgUrl + response.data; // 保存 URL 到表单
+      }
+    },
+    //身份证正面上传成功-店主
+    handleSuccess_shopkeeperIdCardFrontImagePath(response) {
+      if (response.code === 200) {
+        this.form.shopkeeperIdCardFrontImagePath = this.getImgUrl + response.data; // 保存 URL 到表单
+      }
+    },
+    //身份证反面上传成功-店主
+    handleSuccess_shopkeeperIdCardBackImagePath(response) {
+      if (response.code === 200) {
+        this.form.shopkeeperIdCardBackImagePath = this.getImgUrl + response.data; // 保存 URL 到表单
+      }
+    },
+    //身份证手持上传成功-店主
+    handleSuccess_shopkeeperWithIdCardImagePath(response) {
+      if (response.code === 200) {
+        this.form.shopkeeperWithIdCardImagePath = this.getImgUrl + response.data; // 保存 URL 到表单
+      }
+    },
+    //护照上传成功-店主
+    handleSuccess_shopkeeperPassportImagePath(response) {
+      if (response.code === 200) {
+        this.form.shopkeeperPassportImagePath = this.getImgUrl + response.data; // 保存 URL 到表单
+      }
+    },
+    //门头照片
+    handleSuccess_shopDoorImagePath(response) {
+      if (response.code === 200) {
+        this.form.shopDoorImagePath = this.getImgUrl + response.data; // 保存 URL 到表单
+      }
+    },
+    //营业执照照片
+    handleSuccess_businessLicenseImage(response) {
+      if (response.code === 200) {
+        this.form.businessLicenseImage = this.getImgUrl + response.data; // 保存 URL 到表单
+      }
+    },
+    //保证金照片
+    handleSuccess_earnestMoney(response) {
+      if (response.code === 200) {
+        this.form.earnestMoney = this.getImgUrl + response.data; // 保存 URL 到表单
+      }
+    },
+    /** 获取地址列表 */
+    getAddress() {
+      this.loading = true;
+      getAddress(this.$i18n.locale).then(response => {
+        this.options_addr = response.data;
+      });
+    },
+    /** 地址联动事件 **/
+    handleChange(value) {
+      this.form.operateAddress = value;
     }
   }
 };
diff --git a/src/views/business/merchantVerification/index.vue b/src/views/business/merchantVerification/index.vue
index f2f0d17..3b04637 100644
--- a/src/views/business/merchantVerification/index.vue
+++ b/src/views/business/merchantVerification/index.vue
@@ -56,6 +56,8 @@
       </el-table-column>
       <el-table-column :label="$t('business.merchant.merchantVerification.authenticationDate')" align="center"
         prop="authenticationDate" width="180" />
+      <el-table-column :label="$t('business.merchant.userInfoBus.operatingAddress')" align="center"
+                       prop="operateAddressShow" width="180" />
       <el-table-column :label="$t('business.merchant.merchantVerification.failureReason')" align="center"
         prop="failureReason" />
       <el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200"
@@ -154,8 +156,8 @@
             :options="options_addr"
             @change="handleChange"></el-cascader>
         </el-form-item>
-        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.userManager.userInfo.detailAddr')" prop="addrDetail">
-          <el-input v-model="form.addrDetail" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.userManager.userInfo.detailAddr')" prop="operateAddressDetail">
+          <el-input v-model="form.operateAddressDetail" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
         </el-form-item>
         <!--    有营业执照的认证方式身份证上传    -->
         <el-form-item v-if="form.hasLicense == '1' && form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardFront')"
@@ -240,8 +242,8 @@
             :options="options_addr"
             @change="handleChange"></el-cascader>
         </el-form-item>
-        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.userManager.userInfo.detailAddr')" prop="addrDetail">
-          <el-input v-model="form.addrDetail" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.userManager.userInfo.detailAddr')" prop="operateAddressDetail">
+          <el-input v-model="form.operateAddressDetail" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
         </el-form-item>
         <!--    无营业执照的认证方式身份证上传    -->
         <el-form-item v-if="form.hasLicense == '0' && form.shopkeeperLicenseType == '1'" :label="$t('business.userManager.userVerification.idCardFront')"
@@ -322,7 +324,7 @@
           {{auditForm.legalPersonExpirationTime}}
         </el-form-item>
         <el-form-item v-if="auditForm.hasLicense == '1'" :label="$t('business.merchant.userInfoBus.operatingAddress') + '：'">
-          {{auditForm.operateAddress}}
+          {{auditForm.operateAddressShow}}
         </el-form-item>
         <el-form-item v-if="auditForm.licenseType ==1 && auditForm.hasLicense == '1'" :label="$t('business.userManager.userVerification.idCardFront')">
           <el-image style="width: 90px; height: 30px" :src="auditForm.legalPersonIdCardFrontImagePath"
@@ -340,7 +342,7 @@
           <el-image style="width: 90px; height: 30px" :src="auditForm.passportImagePath"
             :preview-src-list="[auditForm.passportImagePath]" />
         </el-form-item>
-    <!--    法营业执照的店主审核信息    -->
+    <!--    无营业执照的店主审核信息    -->
         <el-form-item v-if="auditForm.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperName') + '：'">
           {{auditForm.shopkeeperName}}
         </el-form-item>
@@ -360,21 +362,21 @@
           {{auditForm.shopkeeperExpirationTime}}
         </el-form-item>
         <el-form-item v-if="auditForm.hasLicense == '0'" :label="$t('business.merchant.userInfoBus.operatingAddress') + '：'">
-          {{auditForm.operateAddress}}
+          {{auditForm.operateAddressShow}}
         </el-form-item>
-        <el-form-item v-if="auditForm.licenseType ==1 && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardFront')">
+        <el-form-item v-if="auditForm.shopkeeperLicenseType == '1' && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardFront')">
           <el-image style="width: 90px; height: 30px" :src="auditForm.shopkeeperIdCardFrontImagePath"
                     :preview-src-list="[auditForm.shopkeeperIdCardFrontImagePath]" />
         </el-form-item>
-        <el-form-item v-if="auditForm.licenseType ==1 && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardBack')">
+        <el-form-item v-if="auditForm.shopkeeperLicenseType == '1' && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardBack')">
           <el-image style="width: 90px; height: 30px" :src="auditForm.shopkeeperIdCardBackImagePath"
                     :preview-src-list="[auditForm.shopkeeperIdCardBackImagePath]" />
         </el-form-item>
-        <el-form-item v-if="auditForm.licenseType ==1 && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardHolding')">
+        <el-form-item v-if="auditForm.shopkeeperLicenseType == '1' && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardHolding')">
           <el-image style="width: 90px; height: 30px" :src="auditForm.shopkeeperWithIdCardImagePath"
                     :preview-src-list="[auditForm.shopkeeperWithIdCardImagePath]" />
         </el-form-item>
-        <el-form-item v-if="auditForm.licenseType == 0 && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.license')">
+        <el-form-item v-if="auditForm.shopkeeperLicenseType == '0' && auditForm.hasLicense == '0'" :label="$t('business.userManager.userVerification.license')">
           <el-image style="width: 90px; height: 30px" :src="auditForm.shopkeeperPassportImagePath"
                     :preview-src-list="[auditForm.shopkeeperPassportImagePath]" />
         </el-form-item>
@@ -430,7 +432,7 @@
           {{form.legalPersonExpirationTime}}
         </el-form-item>
         <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.merchant.userInfoBus.operatingAddress') + '：'">
-          {{form.operateAddress}}
+          {{form.operateAddressShow}}
         </el-form-item>
         <el-form-item v-if="form.licenseType ==1 && form.hasLicense == '1'" :label="$t('business.userManager.userVerification.idCardFront')">
           <el-image style="width: 90px; height: 30px" :src="form.legalPersonIdCardFrontImagePath"
@@ -448,7 +450,7 @@
           <el-image style="width: 90px; height: 30px" :src="form.passportImagePath"
                     :preview-src-list="[form.passportImagePath]" />
         </el-form-item>
-        <!--    法营业执照的店主审核信息详情    -->
+        <!--    无营业执照的店主审核信息详情    -->
         <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperName') + '：'">
           {{form.shopkeeperName}}
         </el-form-item>
@@ -468,21 +470,21 @@
           {{form.shopkeeperExpirationTime}}
         </el-form-item>
         <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.userInfoBus.operatingAddress') + '：'">
-          {{form.operateAddress}}
+          {{form.operateAddressShow}}
         </el-form-item>
-        <el-form-item v-if="form.licenseType ==1 && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardFront')">
+        <el-form-item v-if="form.shopkeeperLicenseType == '1' && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardFront')">
           <el-image style="width: 90px; height: 30px" :src="form.shopkeeperIdCardFrontImagePath"
                     :preview-src-list="[form.shopkeeperIdCardFrontImagePath]" />
         </el-form-item>
-        <el-form-item v-if="form.licenseType ==1 && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardBack')">
+        <el-form-item v-if="form.shopkeeperLicenseType == '1' && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardBack')">
           <el-image style="width: 90px; height: 30px" :src="form.shopkeeperIdCardBackImagePath"
                     :preview-src-list="[form.shopkeeperIdCardBackImagePath]" />
         </el-form-item>
-        <el-form-item v-if="form.licenseType ==1 && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardHolding')">
+        <el-form-item v-if="form.shopkeeperLicenseType == '1' && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.idCardHolding')">
           <el-image style="width: 90px; height: 30px" :src="form.shopkeeperWithIdCardImagePath"
                     :preview-src-list="[form.shopkeeperWithIdCardImagePath]" />
         </el-form-item>
-        <el-form-item v-if="form.licenseType == 0 && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.license')">
+        <el-form-item v-if="form.shopkeeperLicenseType == '0' && form.hasLicense == '0'" :label="$t('business.userManager.userVerification.license')">
           <el-image style="width: 90px; height: 30px" :src="form.shopkeeperPassportImagePath"
                     :preview-src-list="[form.shopkeeperPassportImagePath]" />
         </el-form-item>
@@ -628,7 +630,7 @@
             message: this.$t('business.userManager.userInfo.addrPlaceholder'),
             trigger: "blur"
           }],
-          addrDetail: [{
+          operateAddressDetail: [{
             required: true,
             message: this.$t('business.userManager.userInfo.addrPlaceholder'),
             trigger: "blur"
@@ -774,9 +776,37 @@
         this.reset();
         if (row.id != null) {
           this.form = row;
-          this.form.legalPersonIdCardFrontImagePath = null;
-          this.form.legalPersonIdCardBackImagePath = null;
-          this.form.legalPersonUserWithIdCardImagePath = null;
+          // 处理地址回显
+          const addrValue = this.form.operateAddress	;
+          if (addrValue) {
+            const addrArray = addrValue.split(',');
+            const provinceValue = addrArray[0];
+            const cityValue = addrArray[1];
+
+            const province = this.options_addr.find(item => item.value === provinceValue);
+            if (province) {
+              if (cityValue) {
+                const city = province.children.find(item => item.value === cityValue);
+                if (city) {
+                  this.form.operateAddress	 = [provinceValue, cityValue];
+                  console.log(this.form);
+                }
+              } else {
+                this.form.operateAddress	 = [provinceValue];
+              }
+            }
+          }
+          this.form.businessLicenseImage = undefined;
+          this.form.shopDoorImagePath = undefined;
+          this.form.idCardFrontImagePath = undefined;
+          this.form.idCardBackImagePath = undefined;
+          this.form.userWithIdCardImagePath = undefined;
+          this.form.passportImagePath = undefined;
+          this.form.shopkeeperIdCardFrontImagePath = undefined;
+          this.form.shopkeeperIdCardBackImagePath = undefined;
+          this.form.shopkeeperWithIdCardImagePath = undefined;
+          this.form.shopkeeperPassportImagePath = undefined;
+          this.form.earnestMoney = undefined;
           this.open = true;
           this.title = this.$t('business.merchant.merchantVerification.authenticateTitle');
         } else {
@@ -816,7 +846,7 @@
       submitForm() {
         this.$refs["form"].validate(valid => {
           if (valid) {
-            this.form.operateAddress = this.form.operateAddress + "," + this.form.addrDetail;
+            this.form.operateAddress = this.form.operateAddress + "," + this.form.operateAddressDetail;
             this.buttonLoading = true;
             if (this.form.id != null) {
               updateMerchantVerification(this.form).then(response => {
@@ -920,7 +950,7 @@
           this.form.legalPersonUserWithIdCardImagePath = this.getImgUrl + response.data; // 保存 URL 到表单
         }
       },
-      //身份证手持上传成功-法人
+      //护照上传成功-法人
       handleSuccess_passportImagePath(response) {
         if (response.code === 200) {
           this.form.passportImagePath = this.getImgUrl + response.data; // 保存 URL 到表单
diff --git a/src/views/business/userInfoAgent/index.vue b/src/views/business/userInfoAgent/index.vue
index b29ad01..0bf0488 100644
--- a/src/views/business/userInfoAgent/index.vue
+++ b/src/views/business/userInfoAgent/index.vue
@@ -29,13 +29,13 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('business.agent.userInfoAgent.account')" align="center" prop="account" />
       <el-table-column :label="$t('business.agent.userInfoAgent.agentName')" align="center" prop="agentName" />
-      <el-table-column :label="$t('business.agent.userInfoAgent.license')" align="center" prop="license" />
-      <el-table-column :label="$t('business.agent.userInfoAgent.licenseOther')" align="center" prop="licenseOther" />
-      <el-table-column :label="$t('business.agent.userInfoAgent.legalPerson')" align="center" prop="legalPerson" />
-      <el-table-column :label="$t('business.agent.userInfoAgent.operateStatus')" align="center" prop="operateStatus" />
-      <el-table-column :label="$t('business.agent.userInfoAgent.contactAddress')" align="center"
-        prop="contactAddress" />
-      <el-table-column :label="$t('business.agent.userInfoAgent.operateAddr')" align="center" prop="operateAddr" />
+      <el-table-column :label="$t('business.userManager.userInfo.email')" align="center" prop="email" />
+      <el-table-column :label="$t('business.merchant.indexBus.operateTypeLabel')" align="center">
+        <template slot-scope="scope">
+          {{getOperateType(scope.row.operateType)}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('business.agent.userInfoAgent.contactAddress')" align="center" prop="contactAddress" />
       <el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200"
         class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -51,27 +51,32 @@
     <!-- 添加或修改代理商信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
-        <el-form-item :label="$t('business.agent.userInfoAgent.agentName')" prop="agentName">
-          <el-input v-model="form.agentName" :placeholder="$t('business.agent.userInfoAgent.placeholder.agentName')" />
+        <el-form-item :label="$t('business.agent.agentRegister.agentName')" prop="agentName">
+          <el-input v-model="form.agentName"
+                    :placeholder="$t('business.agent.agentRegister.placeholder.agentName')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.userInfoAgent.license')" prop="license">
-          <el-input v-model="form.license" :placeholder="$t('business.agent.userInfoAgent.placeholder.license')" />
+        <el-form-item :label="$t('business.userManager.userInfo.email')" prop="email">
+          <el-input v-model="form.email" :placeholder="$t('business.userManager.userInfo.emailPlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.userInfoAgent.licenseOther')" prop="licenseOther">
-          <el-input v-model="form.licenseOther"
-            :placeholder="$t('business.agent.userInfoAgent.placeholder.licenseOther')" />
+        <el-form-item :label="$t('business.merchant.indexBus.operateTypeLabel')" prop="operateType">
+          <el-select v-model="form.operateType"
+                     :placeholder="$t('business.merchant.indexBus.operateTypePlaceholder')">
+            <el-option
+              v-for="item in options_operateType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.userInfoAgent.legalPerson')" prop="legalPerson">
-          <el-input v-model="form.legalPerson"
-            :placeholder="$t('business.agent.userInfoAgent.placeholder.legalPerson')" />
+        <el-form-item :label="$t('business.merchant.indexBus.addr')" prop="contactAddress">
+          <el-cascader
+            v-model="form.contactAddress"
+            :options="options_addr"
+            @change="handleChange"></el-cascader>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.userInfoAgent.contactAddress')" prop="contactAddress">
-          <el-input v-model="form.contactAddress"
-            :placeholder="$t('business.agent.userInfoAgent.placeholder.contactAddress')" />
-        </el-form-item>
-        <el-form-item :label="$t('business.agent.userInfoAgent.operateAddr')" prop="operateAddr">
-          <el-input v-model="form.operateAddr"
-            :placeholder="$t('business.agent.userInfoAgent.placeholder.operateAddr')" />
+        <el-form-item :label="$t('business.userManager.userInfo.detailAddr')" prop="addrDetail">
+          <el-input v-model="form.addrDetail" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -92,6 +97,7 @@
     addUserInfoAgent,
     updateUserInfoAgent
   } from "@/api/business/userInfoAgent";
+  import {getAddress} from "@/api/business/userRegister";
 
   export default {
     name: "UserInfoAgent",
@@ -132,6 +138,64 @@
         },
         // 表单参数
         form: {},
+        //地址选择列表
+        options_addr:[],
+        //经营类别
+        options_operateType: [{
+          value: '0',
+          label: this.$t('common.operateType.type0')
+        }, {
+          value: '1',
+          label: this.$t('common.operateType.type1')
+        },{
+          value: '2',
+          label: this.$t('common.operateType.type2')
+        },{
+          value: '3',
+          label: this.$t('common.operateType.type3')
+        },{
+          value: '4',
+          label: this.$t('common.operateType.type4')
+        },{
+          value: '5',
+          label: this.$t('common.operateType.type5')
+        },{
+          value: '6',
+          label: this.$t('common.operateType.type6')
+        },{
+          value: '7',
+          label: this.$t('common.operateType.type7')
+        },{
+          value: '8',
+          label: this.$t('common.operateType.type8')
+        },{
+          value: '9',
+          label: this.$t('common.operateType.type9')
+        },{
+          value: '10',
+          label: this.$t('common.operateType.type10')
+        },{
+          value: '11',
+          label: this.$t('common.operateType.type11')
+        },{
+          value: '12',
+          label: this.$t('common.operateType.type12')
+        },{
+          value: '13',
+          label: this.$t('common.operateType.type13')
+        },{
+          value: '14',
+          label: this.$t('common.operateType.type14')
+        },{
+          value: '15',
+          label: this.$t('common.operateType.type15')
+        },{
+          value: '16',
+          label: this.$t('common.operateType.type16')
+        },{
+          value: '17',
+          label: this.$t('common.operateType.type17')
+        },],
         // 表单校验
         rules: {
           id: [{
@@ -139,11 +203,15 @@
             message: this.$t('business.agent.userInfoAgent.rule.idRequired'),
             trigger: "blur"
           }],
-          /* userId: [{
-            required: true,
-            message: this.$t('business.agent.userInfoAgent.rule.userIdRequired'),
-            trigger: "blur"
-          }], */
+          operateType: [
+            {required: true, message: this.$t('business.merchant.indexBus.operateTypeRequired'), trigger: "change"}
+          ],
+          email: [
+            { required: true, pattern: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+\.[a-zA-Z]{2,}(?:\.[a-zA-Z]{2,})?$/, message: this.$t('business.userManager.userInfo.emailRequired'), trigger: "blur" }
+          ],
+          addrDetail: [
+            {required: true, message: this.$t('business.merchant.indexBus.contactAddressRequired'), trigger: "blur"}
+          ],
           agentName: [{
             required: true,
             message: this.$t('business.agent.userInfoAgent.rule.agentNameRequired'),
@@ -184,11 +252,18 @@
     },
     created() {
       this.getList();
+      this.getAddress();
     },
     methods: {
       /** 查询代理商信息列表 */
       getList() {
         this.loading = true;
+        const languageMap = {
+          'zh': 1,
+          'en': 2,
+          'la': 3
+        };
+        this.queryParams.language = languageMap[this.$i18n.locale] || null;
         listUserInfoAgent(this.queryParams).then(response => {
           this.userInfoAgentList = response.rows;
           this.total = response.total;
@@ -250,6 +325,27 @@
         getUserInfoAgent(id).then(response => {
           this.loading = false;
           this.form = response.data;
+
+          // 处理地址回显
+          const addrValue = this.form.contactAddress;
+          if (addrValue) {
+            const addrArray = addrValue.split(',');
+            const provinceValue = addrArray[0];
+            const cityValue = addrArray[1];
+
+            const province = this.options_addr.find(item => item.value === provinceValue);
+            if (province) {
+              if (cityValue) {
+                const city = province.children.find(item => item.value === cityValue);
+                if (city) {
+                  this.form.contactAddress = [provinceValue, cityValue];
+                  console.log(this.form);
+                }
+              } else {
+                this.form.contactAddress = [provinceValue];
+              }
+            }
+          }
           this.open = true;
           this.title = this.$t('business.agent.userInfoAgent.editTitle');
         });
@@ -258,6 +354,7 @@
       submitForm() {
         this.$refs["form"].validate(valid => {
           if (valid) {
+            this.form.contactAddress = this.form.contactAddress + "," + this.form.addrDetail;
             this.buttonLoading = true;
             if (this.form.id != null) {
               updateUserInfoAgent(this.form).then(response => {
@@ -300,6 +397,40 @@
         this.download('business/userInfoAgent/export', {
           ...this.queryParams
         }, `userInfoAgent_${new Date().getTime()}.xlsx`)
+      },
+      getOperateType(type){
+        const typeMap = {
+          '0': this.$t('common.operateType.type0'),
+          '1': this.$t('common.operateType.type1'),
+          '2': this.$t('common.operateType.type2'),
+          '3': this.$t('common.operateType.type3'),
+          '4': this.$t('common.operateType.type4'),
+          '5': this.$t('common.operateType.type5'),
+          '6': this.$t('common.operateType.type6'),
+          '7': this.$t('common.operateType.type7'),
+          '8': this.$t('common.operateType.type8'),
+          '9': this.$t('common.operateType.type9'),
+          '10': this.$t('common.operateType.type10'),
+          '11': this.$t('common.operateType.type11'),
+          '12': this.$t('common.operateType.type12'),
+          '13': this.$t('common.operateType.type13'),
+          '14': this.$t('common.operateType.type14'),
+          '15': this.$t('common.operateType.type15'),
+          '16': this.$t('common.operateType.type16'),
+          '17': this.$t('common.operateType.type17')
+        };
+        return  typeMap[type] || null;
+      },
+      /** 获取地址列表 */
+      getAddress() {
+        this.loading = true;
+        getAddress(this.$i18n.locale).then(response => {
+          this.options_addr = response.data;
+        });
+      },
+      /** 地址联动事件 **/
+      handleChange(value) {
+        this.formInfo.addr = value;
       }
     }
   };
diff --git a/src/views/business/userInfoBus/index.vue b/src/views/business/userInfoBus/index.vue
index f8bf3a5..69b9681 100644
--- a/src/views/business/userInfoBus/index.vue
+++ b/src/views/business/userInfoBus/index.vue
@@ -118,7 +118,8 @@
           <el-cascader
             v-model="form.contactAddress"
             :options="options_addr"
-            @change="handleChange"></el-cascader>
+            @change="handleChange"
+            clearable></el-cascader>
         </el-form-item>
         <el-form-item :label="$t('business.userManager.userInfo.detailAddr')" prop="addrDetail">
           <el-input v-model="form.addrDetail" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
@@ -368,6 +369,27 @@ export default {
       getUserInfoBus(id).then(response => {
         this.loading = false;
         this.form = response.data;
+
+        // 处理地址回显
+        const addrValue = this.form.contactAddress;
+        if (addrValue) {
+          const addrArray = addrValue.split(',');
+          const provinceValue = addrArray[0];
+          const cityValue = addrArray[1];
+
+          const province = this.options_addr.find(item => item.value === provinceValue);
+          if (province) {
+            if (cityValue) {
+              const city = province.children.find(item => item.value === cityValue);
+              if (city) {
+                this.form.contactAddress = [provinceValue, cityValue];
+                console.log(this.form);
+              }
+            } else {
+              this.form.contactAddress = [provinceValue];
+            }
+          }
+        }
         this.open = true;
         this.title = this.$t('business.merchant.userInfoBus.editUserInfoBus');
       });
@@ -430,6 +452,7 @@ export default {
         ...this.queryParams
       }, `${this.$t('business.merchant.userInfoBus.userInfoBus')}_${new Date().getTime()}.xlsx`)
     },
+    //经营类型
     getOperateType(type){
       const typeMap = {
         '0': this.$t('common.operateType.type0'),
diff --git a/src/views/business/userRegister/indexAgent.vue b/src/views/business/userRegister/indexAgent.vue
index 0847e1c..566ee32 100644
--- a/src/views/business/userRegister/indexAgent.vue
+++ b/src/views/business/userRegister/indexAgent.vue
@@ -254,43 +254,35 @@
       </div>
     </el-dialog>
 
-    <!-- 添加或修改用户信息-商户扩展对话框 -->
+    <!-- 添加或修改代理商信息 -->
     <el-dialog :title="title" :visible.sync="openInfoAgent" width="700px" append-to-body>
       <el-form ref="formInfoAgent" :model="formInfoAgent" :rules="rules" label-width="auto">
         <el-form-item :label="$t('business.agent.agentRegister.agentName')" prop="agentName">
           <el-input v-model="formInfoAgent.agentName"
                     :placeholder="$t('business.agent.agentRegister.placeholder.agentName')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.license')" prop="license">
-          <el-input v-model="formInfoAgent.license"
-                    :placeholder="$t('business.agent.agentRegister.placeholder.license')"/>
+        <el-form-item :label="$t('business.userManager.userInfo.email')" prop="email">
+          <el-input v-model="formInfoAgent.email" :placeholder="$t('business.userManager.userInfo.emailPlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.licenseOther')" prop="licenseOther">
-          <el-input v-model="formInfoAgent.licenseOther"
-                    :placeholder="$t('business.agent.agentRegister.placeholder.licenseOther')"/>
-        </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.legalPerson')" prop="legalPerson">
-          <el-input v-model="formInfoAgent.legalPerson"
-                    :placeholder="$t('business.agent.agentRegister.placeholder.legalPerson')"/>
-        </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.operateStatus')" prop="operateStatus">
-          <el-select v-model="formInfoAgent.operateStatus"
-                     :placeholder="$t('business.agent.agentRegister.placeholder.operateStatus')">
+        <el-form-item :label="$t('business.merchant.indexBus.operateTypeLabel')" prop="operateType">
+          <el-select v-model="formInfoAgent.operateType"
+                     :placeholder="$t('business.merchant.indexBus.operateTypePlaceholder')">
             <el-option
-              v-for="item in options_operateStatus"
+              v-for="item in options_operateType"
               :key="item.value"
               :label="item.label"
               :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.operateAddr')" prop="operateAddr">
-          <el-input v-model="formInfoAgent.operateAddr"
-                    :placeholder="$t('business.agent.agentRegister.placeholder.operateAddr')"/>
+        <el-form-item :label="$t('business.merchant.indexBus.addr')" prop="contactAddress">
+          <el-cascader
+            v-model="formInfoAgent.contactAddress"
+            :options="options_addr"
+            @change="handleChange"></el-cascader>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.contactAddress')" prop="contactAddress">
-          <el-input v-model="formInfoAgent.contactAddress"
-                    :placeholder="$t('business.agent.agentRegister.placeholder.contactAddress')"/>
+        <el-form-item :label="$t('business.userManager.userInfo.detailAddr')" prop="detail">
+          <el-input v-model="formInfoAgent.detail" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -305,28 +297,26 @@
     <!--    用户注册详情-代理商-->
     <el-dialog :title="title" :visible.sync="detailOpenAgent" width="700px" append-to-body>
       <el-form ref="formDetailAgent" :model="formDetailAgent" label-width="auto">
-        <el-form-item :label="$t('business.agent.agentRegister.account') + '：'">
+        <el-form-item :label="$t('business.agent.agentRegister.account')">
           {{ formDetailAgent.account }}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.agentName') + '：'">
+        <el-form-item :label="$t('business.agent.agentRegister.agentName')">
           {{ formDetailAgent.userInfoAgentVo.agentName }}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.license') + '：'">
-          {{ formDetailAgent.userInfoAgentVo.license }}
-        </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.licenseOther') + '：'">
-          {{ formDetailAgent.userInfoAgentVo.licenseOther }}
+        <el-form-item :label="$t('business.userManager.userInfo.email')">
+          {{ formDetailAgent.userInfoAgentVo.email}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.legalPerson') + '：'">
-          {{ formDetailAgent.userInfoAgentVo.legalPerson }}
-        </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.operateStatus') + '：'">
-          {{ formDetailAgent.userInfoAgentVo.operateStatus }}
-        </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.operateAddr') + '：'">
-          {{ formDetailAgent.userInfoAgentVo.operateAddr }}
+        <el-form-item :label="$t('business.merchant.indexBus.operateTypeLabel')">
+          <el-select v-model="formDetailAgent.userInfoAgentVo.operateType" disabled="disabled">
+            <el-option
+              v-for="item in options_operateType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentRegister.contactAddress') + '：'">
+        <el-form-item :label="$t('business.merchant.indexBus.contactAddress')">
           {{ formDetailAgent.userInfoAgentVo.contactAddress }}
         </el-form-item>
       </el-form>
@@ -343,12 +333,9 @@ import {
   delUserRegister,
   addUserRegister,
   updateUserRegister,
-  addUserInfo,
-  addUserInfoBus,
   resetUserPassword,
   accountLock,
-  listUserRegisterBus,
-  listUserRegisterAgent, addUserInfoAgen
+  listUserRegisterAgent, addUserInfoAgen, getAddress
 } from "@/api/business/userRegister";
 
 export default {
@@ -381,6 +368,64 @@ export default {
       openInfoAgent: false,
       // 是否展示用户信息弹窗层-商企
       openInfoBus: false,
+      //地址选择列表
+      options_addr:[],
+      //经营类别
+      options_operateType: [{
+        value: '0',
+        label: this.$t('common.operateType.type0')
+      }, {
+        value: '1',
+        label: this.$t('common.operateType.type1')
+      },{
+        value: '2',
+        label: this.$t('common.operateType.type2')
+      },{
+        value: '3',
+        label: this.$t('common.operateType.type3')
+      },{
+        value: '4',
+        label: this.$t('common.operateType.type4')
+      },{
+        value: '5',
+        label: this.$t('common.operateType.type5')
+      },{
+        value: '6',
+        label: this.$t('common.operateType.type6')
+      },{
+        value: '7',
+        label: this.$t('common.operateType.type7')
+      },{
+        value: '8',
+        label: this.$t('common.operateType.type8')
+      },{
+        value: '9',
+        label: this.$t('common.operateType.type9')
+      },{
+        value: '10',
+        label: this.$t('common.operateType.type10')
+      },{
+        value: '11',
+        label: this.$t('common.operateType.type11')
+      },{
+        value: '12',
+        label: this.$t('common.operateType.type12')
+      },{
+        value: '13',
+        label: this.$t('common.operateType.type13')
+      },{
+        value: '14',
+        label: this.$t('common.operateType.type14')
+      },{
+        value: '15',
+        label: this.$t('common.operateType.type15')
+      },{
+        value: '16',
+        label: this.$t('common.operateType.type16')
+      },{
+        value: '17',
+        label: this.$t('common.operateType.type17')
+      },],
       options_operateStatus: [{
         value: '存续',
         label: this.$t('business.agent.agentRegister.operateStatusOption.continued')
@@ -425,6 +470,15 @@ export default {
         legalPerson: [
           {required: true, message: this.$t('business.agent.agentRegister.rule.legalPersonRequired'), trigger: "blur"}
         ],
+        operateType: [
+          {required: true, message: this.$t('business.merchant.indexBus.operateTypeRequired'), trigger: "change"}
+        ],
+        email: [
+          { required: true, pattern: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+\.[a-zA-Z]{2,}(?:\.[a-zA-Z]{2,})?$/, message: this.$t('business.userManager.userInfo.emailRequired'), trigger: "blur" }
+        ],
+        detail: [
+          {required: true, message: this.$t('business.merchant.indexBus.contactAddressRequired'), trigger: "blur"}
+        ],
         operateStatus: [
           {
             required: true,
@@ -469,9 +523,6 @@ export default {
             trigger: "blur"
           }
         ],
-        merchantName: [
-          {required: true, message: this.$t('business.agent.agentRegister.rule.merchantNameRequired'), trigger: "blur"}
-        ],
       },
       options_userType: [{
         value: '2',
@@ -491,11 +542,18 @@ export default {
   },
   created() {
     this.getList();
+    this.getAddress();
   },
   methods: {
     /** 查询用户注册列表 */
     getList() {
       this.loading = true;
+      const languageMap = {
+        'zh': 1,
+        'en': 2,
+        'la': 3
+      };
+      this.queryParams.language = languageMap[this.$i18n.locale] || null;
       listUserRegisterAgent(this.queryParams).then(response => {
         this.userRegisterList = response.rows;
         this.total = response.total;
@@ -602,6 +660,7 @@ export default {
     submitFormInfoAgent() {
       this.$refs["formInfoAgent"].validate(valid => {
         if (valid) {
+          this.formInfoAgent.contactAddress = this.formInfoAgent.contactAddress + "," + this.formInfoAgent.detail;
           addUserInfoAgen(this.formInfoAgent).then(response => {
             this.$modal.msgSuccess(this.$t('common.addSuccess'));
             this.openInfoAgent = false;
@@ -697,6 +756,17 @@ export default {
       }).finally(() => {
         this.loading = false;
       });
+    },
+    /** 获取地址列表 */
+    getAddress() {
+      this.loading = true;
+      getAddress(this.$i18n.locale).then(response => {
+        this.options_addr = response.data;
+      });
+    },
+    /** 地址联动事件 **/
+    handleChange(value) {
+      this.formInfo.addr = value;
     }
   }
 };
diff --git a/src/views/business/userRegister/indexBus.vue b/src/views/business/userRegister/indexBus.vue
index f828868..282c82d 100644
--- a/src/views/business/userRegister/indexBus.vue
+++ b/src/views/business/userRegister/indexBus.vue
@@ -667,20 +667,6 @@ export default {
         }
       });
     },
-    /** 用户信息-提交按钮-个人 */
-    submitFormInfo() {
-      this.$refs["formInfo"].validate(valid => {
-        if (valid) {
-          addUserInfo(this.formInfo).then(response => {
-            this.$modal.msgSuccess(this.$t('common.promptMsg.addSuccess'));
-            this.openInfo = false;
-            this.getList();
-          }).finally(() => {
-            this.buttonLoading = false;
-          });
-        }
-      });
-    },
     /** 用户信息-提交按钮-商企 */
     submitFormInfoBus() {
       this.$refs["formInfoBus"].validate(valid => {
diff --git a/src/views/business/userVerification/index.vue b/src/views/business/userVerification/index.vue
index 0f9cb61..59e0378 100644
--- a/src/views/business/userVerification/index.vue
+++ b/src/views/business/userVerification/index.vue
@@ -87,6 +87,9 @@
       <el-table-column :label="$t('business.userManager.userVerification.verificationTime')" align="center"
                        prop="authenticationDate" width="180">
       </el-table-column>
+      <el-table-column :label="$t('business.userManager.userVerification.contactAddress')" align="center"
+                       prop="commonContactAddressShow" width="180">
+      </el-table-column>
       <el-table-column :label="$t('business.userManager.userVerification.failureReason')" align="center"
                        prop="failureReason"/>
       <el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200"
@@ -159,8 +162,8 @@
             :options="options_addr"
             @change="handleChange"></el-cascader>
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userInfo.detailAddr')" prop="addrDetail">
-          <el-input v-model="form.addrDetail" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
+        <el-form-item :label="$t('business.userManager.userInfo.detailAddr')" prop="commonContactAddressDetail">
+          <el-input v-model="form.commonContactAddressDetail" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
         </el-form-item>
         <el-form-item :label="$t('business.userManager.userVerification.verifiedType')" prop="gender">
           <el-radio-group v-model="form.licenseType">
@@ -168,7 +171,7 @@
             <el-radio :label="0">{{ $t('business.userManager.userVerification.license') }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-show="form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardFront')" prop="idCardFrontImagePath">
+        <el-form-item v-if="form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardFront')" prop="idCardFrontImagePath">
           <el-upload
             class="upload-demo"
             :action="uploadUrl"
@@ -181,7 +184,7 @@
             <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
           </el-upload>
         </el-form-item>
-        <el-form-item v-show="form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardBack')" prop="idCardBackImagePath">
+        <el-form-item v-if="form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardBack')" prop="idCardBackImagePath">
           <el-upload
             class="upload-demo"
             :action="uploadUrl"
@@ -194,7 +197,7 @@
             <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
           </el-upload>
         </el-form-item>
-        <el-form-item v-show="form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardHolding')" prop="userWithIdCardImagePath">
+        <el-form-item v-if="form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardHolding')" prop="userWithIdCardImagePath">
           <el-upload
             class="upload-demo"
             :action="uploadUrl"
@@ -207,7 +210,7 @@
             <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
           </el-upload>
         </el-form-item>
-        <el-form-item v-show="form.licenseType == '0'" :label="$t('business.userManager.userVerification.license')" prop="passportImagePath">
+        <el-form-item v-if="form.licenseType == '0'" :label="$t('business.userManager.userVerification.license')" prop="passportImagePath">
           <el-upload
             class="upload-demo"
             :action="uploadUrl"
@@ -246,7 +249,7 @@
           {{ auditForm.expirationTime }}
         </el-form-item>
         <el-form-item :label="$t('business.userManager.userVerification.contactAddress')">
-          {{ auditForm.commonContactAddress }}
+          {{ auditForm.commonContactAddressShow }}
         </el-form-item>
         <el-form-item v-if="auditForm.licenseType ==1" :label="$t('business.userManager.userVerification.idCardFront')">
           <el-image style="width: 90px; height: 30px" :src="auditForm.idCardFrontImagePath"
@@ -295,7 +298,7 @@
           {{ form.expirationTime }}
         </el-form-item>
         <el-form-item :label="$t('business.userManager.userVerification.contactAddress')">
-          {{ form.commonContactAddress }}
+          {{ form.commonContactAddressShow }}
         </el-form-item>
         <el-form-item v-if="form.licenseType == 1" :label="$t('business.userManager.userVerification.idCardFront')">
           <el-image style="width: 90px; height: 30px" :src="form.idCardFrontImagePath"
@@ -423,7 +426,7 @@ export default {
             trigger: "blur"
           }
         ],
-        addrDetail: [
+        commonContactAddressDetail: [
           {
             required: true,
             message: this.$t('business.userManager.userInfo.addrRequired'),
@@ -544,9 +547,30 @@ export default {
       this.reset();
       if (row.id != null) {
         this.form = row;
-        this.form.idCardFrontImagePath = null;
-        this.form.idCardBackImagePath = null;
-        this.form.userWithIdCardImagePath = null;
+        // 处理地址回显
+        const addrValue = this.form.commonContactAddress	;
+        if (addrValue) {
+          const addrArray = addrValue.split(',');
+          const provinceValue = addrArray[0];
+          const cityValue = addrArray[1];
+
+          const province = this.options_addr.find(item => item.value === provinceValue);
+          if (province) {
+            if (cityValue) {
+              const city = province.children.find(item => item.value === cityValue);
+              if (city) {
+                this.form.commonContactAddress	 = [provinceValue, cityValue];
+                console.log(this.form);
+              }
+            } else {
+              this.form.commonContactAddress	 = [provinceValue];
+            }
+          }
+        }
+        this.form.idCardFrontImagePath = undefined;
+        this.form.idCardBackImagePath = undefined;
+        this.form.userWithIdCardImagePath = undefined;
+        this.form.passportImagePath = undefined;
         this.open = true;
         this.title = this.$t("business.userManager.userVerification.verification");
       } else {
@@ -584,7 +608,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.commonContactAddress = this.form.commonContactAddress + "," + this.form.addrDetail;
+          this.form.commonContactAddress = this.form.commonContactAddress + "," + this.form.commonContactAddressDetail;
           this.buttonLoading = true;
           if (this.form.id != null) {
             updateUserVerification(this.form).then(response => {