Browse Source

Merge remote-tracking branch 'origin/main'

main
GhubCy 1 month ago
parent
commit
d51c5e3ebb
  1. 1856
      src/languages/en.js
  2. 10
      src/languages/zh.js
  3. 92
      src/views/business/agentVerification/index.vue
  4. 17
      src/views/business/merchantVerification/index.vue
  5. 46
      src/views/business/userAccount/index.vue
  6. 10
      src/views/business/userInfo/index.vue
  7. 4
      src/views/business/userInfoBus/index.vue
  8. 10
      src/views/business/userRegister/index.vue
  9. 14
      src/views/business/userRegister/indexBus.vue
  10. 8
      src/views/business/userVerification/index.vue

1856
src/languages/en.js

File diff suppressed because it is too large

10
src/languages/zh.js

@ -615,6 +615,8 @@ export default {
businessUser: '商户用户', businessUser: '商户用户',
vipUser: 'VIP用户', vipUser: 'VIP用户',
address: '地址信息', address: '地址信息',
contactAddress: '联系地址',
contactAddressPlaceholder: '请输入联系地址',
supplement: '补充信息', supplement: '补充信息',
name: '姓名', name: '姓名',
namePlaceholder: '请输入姓名', namePlaceholder: '请输入姓名',
@ -656,6 +658,7 @@ export default {
phoneNumberDigitOnly: '联系电话只能为数字', phoneNumberDigitOnly: '联系电话只能为数字',
ageNumberOnly: '年龄只能为数字', ageNumberOnly: '年龄只能为数字',
addrRequired: '地址不能为空', addrRequired: '地址不能为空',
contactAddressRequired: '联系地址不能为空',
addTitle: '添加用户注册', addTitle: '添加用户注册',
detailTitle: '用户详情', detailTitle: '用户详情',
editRegisterTitle: '修改用户注册', editRegisterTitle: '修改用户注册',
@ -776,6 +779,9 @@ export default {
userTypeNormal: '普通用户', userTypeNormal: '普通用户',
userTypeEnterprise: '企业用户', userTypeEnterprise: '企业用户',
address: '地址', address: '地址',
contactAddress: '联系地址',
contactAddressPlaceholder: '请输入联系地址',
contactAddressRequired: '联系地址不能为空',
addTitle: '添加用户注册', addTitle: '添加用户注册',
editTitle: '编辑用户注册', editTitle: '编辑用户注册',
detailTitle: '用户注册详情', detailTitle: '用户注册详情',
@ -792,6 +798,8 @@ export default {
userLevelRequired: '用户等级不能为空', userLevelRequired: '用户等级不能为空',
legalPersonRequired: '法人不能为空', legalPersonRequired: '法人不能为空',
operateStatusRequired: '经营状态不能为空', operateStatusRequired: '经营状态不能为空',
operateStatusExist: '存续',
operateStatusCancel: '注销',
operateAddrRequired: '经营地址不能为空', operateAddrRequired: '经营地址不能为空',
name: '姓名', name: '姓名',
namePlaceholder: '请输入姓名', namePlaceholder: '请输入姓名',
@ -915,12 +923,14 @@ export default {
accountAmount: '账户金额', accountAmount: '账户金额',
accountTypeNormal: '普通账户', accountTypeNormal: '普通账户',
accountTypeEnterprise: '企业账户', accountTypeEnterprise: '企业账户',
accountTypeAgent: '代理账户',
accountLevel: '账户级别', accountLevel: '账户级别',
accountLevelPrimary: '主账户', accountLevelPrimary: '主账户',
accountLevelSub: '子账户', accountLevelSub: '子账户',
status: '状态', status: '状态',
statusNormal: '正常', statusNormal: '正常',
statusFrozen: '冻结', statusFrozen: '冻结',
statusUnFrozen: '解冻',
addOrEditDialogTitle: '添加或修改用户账户', addOrEditDialogTitle: '添加或修改用户账户',
detailDialogTitle: '用户账户详情', detailDialogTitle: '用户账户详情',
addTitle: '添加用户账户', addTitle: '添加用户账户',

92
src/views/business/agentVerification/index.vue

@ -110,6 +110,45 @@
<el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCard')" prop="legalPersonIdCard"> <el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCard')" prop="legalPersonIdCard">
<el-input v-model="form.legalPersonIdCard" :placeholder="$t('business.agent.agentVerification.legalPersonIdCardPlaceholder')"/> <el-input v-model="form.legalPersonIdCard" :placeholder="$t('business.agent.agentVerification.legalPersonIdCardPlaceholder')"/>
</el-form-item> </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">
<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">
<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-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-form-item :label="$t('business.agent.agentVerification.electronicContract')" prop="electronicContract">
<el-input v-model="form.electronicContract" :placeholder="$t('business.agent.agentVerification.electronicContractPlaceholder')"/> <el-input v-model="form.electronicContract" :placeholder="$t('business.agent.agentVerification.electronicContractPlaceholder')"/>
</el-form-item> </el-form-item>
@ -141,6 +180,15 @@
<el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCardNumber') + ':'"> <el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCardNumber') + ':'">
{{auditForm.legalPersonIdCardShow}} {{auditForm.legalPersonIdCardShow}}
</el-form-item> </el-form-item>
<el-form-item :label="$t('business.userManager.userVerification.idCardFront') + ':'">
{{auditForm.idCardFrontImagePath}}
</el-form-item>
<el-form-item :label="$t('business.userManager.userVerification.idCardBack') + ':'">
{{auditForm.idCardBackImagePath}}
</el-form-item>
<el-form-item :label="$t('business.userManager.userVerification.idCardHolding') + ':'">
{{auditForm.userWithIdCardImagePath}}
</el-form-item>
<el-form-item :label="$t('business.agent.agentVerification.businessLicense') + ':'"> <el-form-item :label="$t('business.agent.agentVerification.businessLicense') + ':'">
{{auditForm.businessLicenseNumber}} {{auditForm.businessLicenseNumber}}
</el-form-item> </el-form-item>
@ -170,6 +218,15 @@
<el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCard') + ':'"> <el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCard') + ':'">
{{ form.legalPersonIdCard }} {{ form.legalPersonIdCard }}
</el-form-item> </el-form-item>
<el-form-item :label="$t('business.userManager.userVerification.idCardFront') + ':'">
{{form.idCardFrontImagePath}}
</el-form-item>
<el-form-item :label="$t('business.userManager.userVerification.idCardBack') + ':'">
{{form.idCardBackImagePath}}
</el-form-item>
<el-form-item :label="$t('business.userManager.userVerification.idCardHolding') + ':'">
{{form.userWithIdCardImagePath}}
</el-form-item>
<el-form-item :label="$t('business.agent.agentVerification.electronicContract') + ':'"> <el-form-item :label="$t('business.agent.agentVerification.electronicContract') + ':'">
{{ form.electronicContract }} {{ form.electronicContract }}
</el-form-item> </el-form-item>
@ -248,6 +305,8 @@ export default {
form: {}, form: {},
// //
auditForm: {}, auditForm: {},
//
fileList: [],
// //
rules: { rules: {
agentName: [ agentName: [
@ -256,6 +315,15 @@ export default {
legalPersonName: [ legalPersonName: [
{ required: true, message: this.$t('business.agent.agentVerification.legalPersonNameRequired'), trigger: "blur" } { required: true, message: this.$t('business.agent.agentVerification.legalPersonNameRequired'), trigger: "blur" }
], ],
idCardFrontImagePath: [
{ required: true, message: this.$t('business.userManager.userVerification.idCardFrontRequired'), trigger: "blur" }
],
idCardBackImagePath: [
{ required: true, message: this.$t('business.userManager.userVerification.idCardBackRequired'), trigger: "blur" }
],
userWithIdCardImagePath: [
{ required: true, message: this.$t('business.userManager.userVerification.idCardHoldingRequired'), trigger: "blur" }
],
electronicContract: [ electronicContract: [
{ required: true, message: this.$t('business.agent.agentVerification.electronicContractRequired'), trigger: "blur" } { required: true, message: this.$t('business.agent.agentVerification.electronicContractRequired'), trigger: "blur" }
], ],
@ -274,6 +342,12 @@ export default {
created() { created() {
this.getList(); this.getList();
}, },
computed: {
// URL
uploadUrl() {
return `${process.env.VUE_APP_BASE_API}/file/upload`;
}
},
methods: { methods: {
/** 查询商户认证信息列表 */ /** 查询商户认证信息列表 */
getList() { getList() {
@ -452,6 +526,24 @@ export default {
this.buttonLoading = false; this.buttonLoading = false;
}); });
}) })
},
//
handleSuccess_idCardFrontImagePath(response) {
if (response.code === 200) {
this.form.idCardFrontImagePath = response.data; // URL
}
},
//
handleSuccess_idCardBackImagePath(response) {
if (response.code === 200) {
this.form.idCardBackImagePath = response.data; // URL
}
},
//
handleSuccess_userWithIdCardImagePath(response) {
if (response.code === 200) {
this.form.userWithIdCardImagePath = response.data; // URL
}
} }
} }
}; };

17
src/views/business/merchantVerification/index.vue

@ -212,6 +212,15 @@
<el-form-item :label="$t('business.merchant.merchantVerification.legalPersonIdCard') + ':'"> <el-form-item :label="$t('business.merchant.merchantVerification.legalPersonIdCard') + ':'">
{{ form.legalPersonIdCard }} {{ form.legalPersonIdCard }}
</el-form-item> </el-form-item>
<el-form-item :label="$t('business.userManager.userVerification.idCardFront') + ':'">
{{form.idCardFrontImagePath}}
</el-form-item>
<el-form-item :label="$t('business.userManager.userVerification.idCardBack') + ':'">
{{form.idCardBackImagePath}}
</el-form-item>
<el-form-item :label="$t('business.userManager.userVerification.idCardHolding') + ':'">
{{form.userWithIdCardImagePath}}
</el-form-item>
<el-form-item :label="$t('business.merchant.merchantVerification.authenticationDate') + ':'" prop="authenticationDate"> <el-form-item :label="$t('business.merchant.merchantVerification.authenticationDate') + ':'" prop="authenticationDate">
{{ form.authenticationDate }} {{ form.authenticationDate }}
</el-form-item> </el-form-item>
@ -284,6 +293,7 @@ export default {
form: {}, form: {},
// //
auditForm: {}, auditForm: {},
//
fileList: [], fileList: [],
// //
rules: { rules: {
@ -349,7 +359,9 @@ export default {
contactPersonPhone: undefined, contactPersonPhone: undefined,
contactPersonEmail: undefined, contactPersonEmail: undefined,
businessLicenseImage: undefined, businessLicenseImage: undefined,
legalPersonIdCardImage: undefined, idCardFrontImagePath: undefined,
idCardBackImagePath: undefined,
userWithIdCardImagePath: undefined,
bankAccountNumber: undefined, bankAccountNumber: undefined,
bankName: undefined, bankName: undefined,
status: undefined, status: undefined,
@ -499,16 +511,19 @@ export default {
}); });
}) })
}, },
//
handleSuccess_idCardFrontImagePath(response) { handleSuccess_idCardFrontImagePath(response) {
if (response.code === 200) { if (response.code === 200) {
this.form.idCardFrontImagePath = response.data; // URL this.form.idCardFrontImagePath = response.data; // URL
} }
}, },
//
handleSuccess_idCardBackImagePath(response) { handleSuccess_idCardBackImagePath(response) {
if (response.code === 200) { if (response.code === 200) {
this.form.idCardBackImagePath = response.data; // URL this.form.idCardBackImagePath = response.data; // URL
} }
}, },
//
handleSuccess_userWithIdCardImagePath(response) { handleSuccess_userWithIdCardImagePath(response) {
if (response.code === 200) { if (response.code === 200) {
this.form.userWithIdCardImagePath = response.data; // URL this.form.userWithIdCardImagePath = response.data; // URL

46
src/views/business/userAccount/index.vue

@ -5,8 +5,8 @@
<el-input v-model="queryParams.accountCode" :placeholder="$t('business.supplementaryInfo.userAccount.inputAccountCode')" <el-input v-model="queryParams.accountCode" :placeholder="$t('business.supplementaryInfo.userAccount.inputAccountCode')"
clearable @keyup.enter.native="handleQuery"/> clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="账户类型" prop="accountType"> <el-form-item :label="$t('business.supplementaryInfo.userAccount.accountType')" prop="accountType">
<el-select v-model="queryParams.accountType" size="medium" placeholder="请选择账户类型"> <el-select v-model="queryParams.accountType" size="medium" :placeholder="$t('business.supplementaryInfo.userAccount.selectAccountType')">
<el-option <el-option
v-for="item in options_accountType" v-for="item in options_accountType"
:key="item.value" :key="item.value"
@ -15,8 +15,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status"> <el-form-item :label="$t('business.supplementaryInfo.userAccount.accountStatus')" prop="status">
<el-select v-model="queryParams.status" size="medium" placeholder="请选择账户状态"> <el-select v-model="queryParams.status" size="medium" :placeholder="$t('business.supplementaryInfo.userAccount.selectAccountStatus')">
<el-option <el-option
v-for="item in options_accountStatus" v-for="item in options_accountStatus"
:key="item.value" :key="item.value"
@ -50,7 +50,7 @@
<el-table v-loading="loading" :data="userAccountList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="userAccountList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="用户名称" align="center"> <el-table-column :label="$t('business.supplementaryInfo.userAccount.userName')" align="center">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.userType == 0">{{ scope.row.userInfoName }}</span> <span v-if="scope.row.userType == 0">{{ scope.row.userInfoName }}</span>
<span v-if="scope.row.userType == 1">{{ scope.row.merchantName }}</span> <span v-if="scope.row.userType == 1">{{ scope.row.merchantName }}</span>
@ -64,17 +64,17 @@
prop="accountAmount" prop="accountAmount"
:formatter="formatCurrency"> :formatter="formatCurrency">
</el-table-column> </el-table-column>
<el-table-column label="账户类型" align="center" prop="accountType"> <el-table-column :label="$t('business.supplementaryInfo.userAccount.accountType')" align="center" prop="accountType">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.accountType == 0">普通账户</el-tag> <el-tag v-if="scope.row.accountType == 0"> {{$t('business.supplementaryInfo.userAccount.accountTypeNormal')}} </el-tag>
<el-tag type="warning" v-if="scope.row.accountType == 1">商企账户</el-tag> <el-tag type="warning" v-if="scope.row.accountType == 1">{{$t('business.supplementaryInfo.userAccount.accountTypeEnterprise')}}</el-tag>
<el-tag type="success" v-if="scope.row.accountType == 2">代理账户</el-tag> <el-tag type="success" v-if="scope.row.accountType == 2">{{$t('business.supplementaryInfo.userAccount.accountTypeAgent')}}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="账户级别" align="center" prop="isPrimary"> <el-table-column :label="$t('business.supplementaryInfo.userAccount.accountLevel')" align="center" prop="isPrimary">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="warning" v-if="scope.row.isPrimary == 0">主账户</el-tag> <el-tag type="warning" v-if="scope.row.isPrimary == 0">{{$t('business.supplementaryInfo.userAccount.accountLevelPrimary')}}</el-tag>
<el-tag v-if="scope.row.isPrimary == 1">子账户</el-tag> <el-tag v-if="scope.row.isPrimary == 1">{{$t('business.supplementaryInfo.userAccount.accountLevelSub')}}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('business.supplementaryInfo.userAccount.status')" align="center" prop="status"> <el-table-column :label="$t('business.supplementaryInfo.userAccount.status')" align="center" prop="status">
@ -88,7 +88,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
v-if="(scope.row.id == null)" v-if="(scope.row.id == null)"
v-hasPermi="['business:userAccount:edit']">创建 v-hasPermi="['business:userAccount:edit']">{{ $t('common.button.add') }}
</el-button> </el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-if="(scope.row.id != null)" v-if="(scope.row.id != null)"
@ -96,11 +96,11 @@
</el-button> </el-button>
<el-button size="mini" type="text" icon="el-icon-lock" @click="accountLock(scope.row)" <el-button size="mini" type="text" icon="el-icon-lock" @click="accountLock(scope.row)"
v-if="(scope.row.id != null && scope.row.status == 0)" v-if="(scope.row.id != null && scope.row.status == 0)"
v-hasPermi="['business:userAccount:remove']">冻结 v-hasPermi="['business:userAccount:remove']">{{ $t('business.supplementaryInfo.userAccount.statusFrozen') }}
</el-button> </el-button>
<el-button size="mini" type="text" icon="el-icon-lock" @click="accountUnlock(scope.row)" <el-button size="mini" type="text" icon="el-icon-lock" @click="accountUnlock(scope.row)"
v-if="(scope.row.id != null && scope.row.status == 1)" v-if="(scope.row.id != null && scope.row.status == 1)"
v-hasPermi="['business:userAccount:remove']">解冻 v-hasPermi="['business:userAccount:remove']">{{ $t('business.supplementaryInfo.userAccount.statusUnFrozen') }}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -115,8 +115,8 @@
<el-form-item :label="$t('business.supplementaryInfo.userAccount.detailAccountName')" prop="accountName"> <el-form-item :label="$t('business.supplementaryInfo.userAccount.detailAccountName')" prop="accountName">
<el-input v-model="form.accountName" :placeholder="$t('business.supplementaryInfo.userAccount.inputAccountName')"/> <el-input v-model="form.accountName" :placeholder="$t('business.supplementaryInfo.userAccount.inputAccountName')"/>
</el-form-item> </el-form-item>
<el-form-item label="账户级别" prop="isPrimary"> <el-form-item :label="$t('business.supplementaryInfo.userAccount.accountLevel')" prop="isPrimary">
<el-select v-model="form.isPrimary" placeholder="请选择账户级别"> <el-select v-model="form.isPrimary" :placeholder="$t('business.supplementaryInfo.userAccount.selectAccountLevel')">
<el-option <el-option
v-for="item in options_accountLevel" v-for="item in options_accountLevel"
:key="item.value" :key="item.value"
@ -214,24 +214,24 @@ export default {
rules: {}, rules: {},
options_accountLevel: [{ options_accountLevel: [{
value: "0", value: "0",
label: '主账户' label: this.$t('business.supplementaryInfo.userAccount.accountLevelPrimary')
}, { }, {
value: "1", value: "1",
label: '子账户' label: this.$t('business.supplementaryInfo.userAccount.accountLevelSub')
}], }],
options_accountType: [{ options_accountType: [{
value: 0, value: 0,
label: '普通账户' label: this.$t('business.supplementaryInfo.userAccount.accountTypeNormal')
}, { }, {
value: 1, value: 1,
label: '企业账户' label: this.$t('business.supplementaryInfo.userAccount.accountTypeEnterprise')
}], }],
options_accountStatus: [{ options_accountStatus: [{
value: 0, value: 0,
label: '正常' label: this.$t('business.supplementaryInfo.userAccount.statusNormal')
}, { }, {
value: 1, value: 1,
label: '冻结' label: this.$t('business.supplementaryInfo.userAccount.statusFrozen')
}], }],
}; };
}, },

10
src/views/business/userInfo/index.vue

@ -40,7 +40,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('business.userManager.userInfo.idCard')" align="center" prop="idCard" /> <el-table-column :label="$t('business.userManager.userInfo.idCard')" align="center" prop="idCard" />
<el-table-column :label="$t('business.userManager.userInfo.phone')" align="center" prop="phone" /> <el-table-column :label="$t('business.userManager.userInfo.phone')" align="center" prop="phone" />
<el-table-column label="联系地址" align="center" prop="contactAddress" /> <el-table-column :label="$t('business.agent.userInfoAgent.contactAddress')" align="center" prop="contactAddress" />
<el-table-column :label="$t('business.userManager.userInfo.age')" align="center" prop="age" /> <el-table-column :label="$t('business.userManager.userInfo.age')" align="center" prop="age" />
<el-table-column :label="$t('business.userManager.userInfo.addr')" align="center" prop="addr" /> <el-table-column :label="$t('business.userManager.userInfo.addr')" align="center" prop="addr" />
<el-table-column :label="$t('business.userManager.userInfo.status')" align="center" prop="status"> <el-table-column :label="$t('business.userManager.userInfo.status')" align="center" prop="status">
@ -79,8 +79,8 @@
<el-form-item :label="$t('business.userManager.userInfo.phone')" prop="phone"> <el-form-item :label="$t('business.userManager.userInfo.phone')" prop="phone">
<el-input v-model="form.phone" :placeholder="$t('business.userManager.userInfo.phonePlaceholder')" /> <el-input v-model="form.phone" :placeholder="$t('business.userManager.userInfo.phonePlaceholder')" />
</el-form-item> </el-form-item>
<el-form-item label="联系地址" prop="contactAddress"> <el-form-item :label="$t('business.agent.userInfoAgent.contactAddress')" prop="contactAddress">
<el-input v-model="form.contactAddress" placeholder="请输入联系地址" /> <el-input v-model="form.contactAddress" :placeholder="$t('business.agent.userInfoAgent.placeholder.contactAddress')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('business.userManager.userInfo.age')" prop="age"> <el-form-item :label="$t('business.userManager.userInfo.age')" prop="age">
<el-input v-model="form.age" :placeholder="$t('business.userManager.userInfo.agePlaceholder')" /> <el-input v-model="form.age" :placeholder="$t('business.userManager.userInfo.agePlaceholder')" />
@ -113,7 +113,7 @@
<el-form-item :label="$t('business.userManager.userInfo.detailPhone')"> <el-form-item :label="$t('business.userManager.userInfo.detailPhone')">
{{form.phone}} {{form.phone}}
</el-form-item> </el-form-item>
<el-form-item label="联系地址"> <el-form-item :label="$t('business.agent.userInfoAgent.contactAddress')">
{{form.contactAddress}} {{form.contactAddress}}
</el-form-item> </el-form-item>
<el-form-item :label="$t('business.userManager.userInfo.detailAge')"> <el-form-item :label="$t('business.userManager.userInfo.detailAge')">
@ -207,7 +207,7 @@
{ required: true, message: this.$t('business.userManager.userInfo.addrRequired'), trigger: "change" } { required: true, message: this.$t('business.userManager.userInfo.addrRequired'), trigger: "change" }
], ],
contactAddress: [ contactAddress: [
{ required: true, message: "联系地址不能为空", trigger: "change" } { required: true, message: this.$t('business.agent.userInfoAgent.rule.contactAddressRequired'), trigger: "change" }
] ]
} }
}; };

4
src/views/business/userInfoBus/index.vue

@ -71,7 +71,7 @@
<el-table-column :label="$t('business.merchant.userInfoBus.legalPersonName')" align="center" prop="legalPerson" /> <el-table-column :label="$t('business.merchant.userInfoBus.legalPersonName')" align="center" prop="legalPerson" />
<el-table-column :label="$t('business.merchant.userInfoBus.operatingStatus')" align="center" prop="operateStatus" /> <el-table-column :label="$t('business.merchant.userInfoBus.operatingStatus')" align="center" prop="operateStatus" />
<el-table-column :label="$t('business.merchant.userInfoBus.operatingAddress')" align="center" prop="operateAddr" /> <el-table-column :label="$t('business.merchant.userInfoBus.operatingAddress')" align="center" prop="operateAddr" />
<el-table-column label="联系地址" align="center" prop="contactAddress" /> <el-table-column :label="$t('business.merchant.indexBus.contactAddress')" align="center" prop="contactAddress" />
<el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200" class-name="small-padding fixed-width"> <el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -121,7 +121,7 @@
<el-form-item :label="$t('business.merchant.userInfoBus.operatingAddress')" prop="operateAddr"> <el-form-item :label="$t('business.merchant.userInfoBus.operatingAddress')" prop="operateAddr">
<el-input v-model="form.operateAddr" :placeholder="$t('business.merchant.userInfoBus.inputOperatingAddress')" /> <el-input v-model="form.operateAddr" :placeholder="$t('business.merchant.userInfoBus.inputOperatingAddress')" />
</el-form-item> </el-form-item>
<el-form-item label="联系地址" prop="contactAddress"> <el-form-item :label="$t('business.merchant.indexBus.contactAddress')" prop="contactAddress">
<el-input v-model="form.contactAddress" :placeholder="$t('business.merchant.userInfoBus.inputOperatingAddress')" /> <el-input v-model="form.contactAddress" :placeholder="$t('business.merchant.userInfoBus.inputOperatingAddress')" />
</el-form-item> </el-form-item>
</el-form> </el-form>

10
src/views/business/userRegister/index.vue

@ -110,7 +110,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('business.userManager.userRegister.phone')" align="center" prop="phone"/> <el-table-column :label="$t('business.userManager.userRegister.phone')" align="center" prop="phone"/>
<el-table-column label="联系地址" align="center" prop="contactAddress"/> <el-table-column :label="$t('business.userManager.userRegister.contactAddress')" align="center" prop="contactAddress"/>
<el-table-column :label="$t('business.userManager.userRegister.address')" align="center" prop="addressInfo"/> <el-table-column :label="$t('business.userManager.userRegister.address')" align="center" prop="addressInfo"/>
<el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200" class-name="small-padding fixed-width"> <el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
@ -252,8 +252,8 @@
<el-form-item :label="$t('business.userManager.userRegister.phone')" prop="phone"> <el-form-item :label="$t('business.userManager.userRegister.phone')" prop="phone">
<el-input v-model="formInfo.phone" :placeholder="$t('business.userManager.userRegister.phonePlaceholder')"/> <el-input v-model="formInfo.phone" :placeholder="$t('business.userManager.userRegister.phonePlaceholder')"/>
</el-form-item> </el-form-item>
<el-form-item label="联系地址" prop="contactAddress"> <el-form-item :label="$t('business.userManager.userRegister.contactAddress')" prop="contactAddress">
<el-input v-model="formInfo.contactAddress" placeholder="请输入联系地址" /> <el-input v-model="formInfo.contactAddress" :placeholder="$t('business.userManager.userRegister.contactAddressPlaceholder')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('business.userManager.userRegister.age')" prop="age"> <el-form-item :label="$t('business.userManager.userRegister.age')" prop="age">
<el-input v-model="formInfo.age" :placeholder="$t('business.userManager.userRegister.agePlaceholder')"/> <el-input v-model="formInfo.age" :placeholder="$t('business.userManager.userRegister.agePlaceholder')"/>
@ -296,7 +296,7 @@
<el-form-item :label="$t('business.userManager.userRegister.contactPhone')"> <el-form-item :label="$t('business.userManager.userRegister.contactPhone')">
{{ formDetail.userInfoVo.phone }} {{ formDetail.userInfoVo.phone }}
</el-form-item> </el-form-item>
<el-form-item label="联系地址"> <el-form-item :label="$t('business.userManager.userRegister.contactAddress')">
{{ formDetail.userInfoVo.contactAddress }} {{ formDetail.userInfoVo.contactAddress }}
</el-form-item> </el-form-item>
<el-form-item :label="$t('business.userManager.userRegister.userType')"> <el-form-item :label="$t('business.userManager.userRegister.userType')">
@ -438,7 +438,7 @@ export default {
{ required: true, pattern: /^\d+$/, message: this.$t('business.userManager.userRegister.ageNumberOnly'), trigger: "blur" } { required: true, pattern: /^\d+$/, message: this.$t('business.userManager.userRegister.ageNumberOnly'), trigger: "blur" }
], ],
contactAddress: [ contactAddress: [
{required: true, message: "联系地址不能为空", trigger: "blur"} {required: true, message: this.$t('business.userManager.userRegister.contactAddressRequired'), trigger: "blur"}
], ],
addr: [ addr: [
{required: true, message: this.$t('business.userManager.userRegister.addrRequired'), trigger: "blur"} {required: true, message: this.$t('business.userManager.userRegister.addrRequired'), trigger: "blur"}

14
src/views/business/userRegister/indexBus.vue

@ -106,7 +106,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('business.merchant.indexBus.phone')" align="center" prop="phone" /> <el-table-column :label="$t('business.merchant.indexBus.phone')" align="center" prop="phone" />
<el-table-column :label="$t('business.merchant.indexBus.address')" align="center" prop="address" /> <el-table-column :label="$t('business.merchant.indexBus.address')" align="center" prop="address" />
<el-table-column label="联系地址" align="center" prop="contactAddressBus"/> <el-table-column :label="$t('business.merchant.indexBus.contactAddress')" align="center" prop="contactAddressBus"/>
<el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200" class-name="small-padding fixed-width"> <el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="(scope.row.addressInfo == '' && scope.row.userType == '0') || (scope.row.address == '' && scope.row.userType == '1')" <el-button v-if="(scope.row.addressInfo == '' && scope.row.userType == '0') || (scope.row.address == '' && scope.row.userType == '1')"
@ -277,8 +277,8 @@
<el-form-item :label="$t('business.merchant.indexBus.operateAddrLabel')" prop="operateAddr"> <el-form-item :label="$t('business.merchant.indexBus.operateAddrLabel')" prop="operateAddr">
<el-input v-model="formInfoBus.operateAddr" :placeholder="$t('business.merchant.indexBus.operateAddrPlaceholder')" /> <el-input v-model="formInfoBus.operateAddr" :placeholder="$t('business.merchant.indexBus.operateAddrPlaceholder')" />
</el-form-item> </el-form-item>
<el-form-item label="联系地址" prop="contactAddress"> <el-form-item :label="$t('business.merchant.indexBus.contactAddress')" prop="contactAddress">
<el-input v-model="formInfoBus.contactAddress" placeholder="请输入联系地址" /> <el-input v-model="formInfoBus.contactAddress" :placeholder="$t('business.userManager.userRegister.contactAddressPlaceholder')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -311,7 +311,7 @@
<el-form-item :label="$t('business.merchant.indexBus.operateAddrLabel')"> <el-form-item :label="$t('business.merchant.indexBus.operateAddrLabel')">
{{formDetailBus.userInfoBusVo.operateAddr}} {{formDetailBus.userInfoBusVo.operateAddr}}
</el-form-item> </el-form-item>
<el-form-item label="联系地址"> <el-form-item :label="$t('business.merchant.indexBus.contactAddress')">
{{formDetailBus.userInfoBusVo.contactAddress}} {{formDetailBus.userInfoBusVo.contactAddress}}
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -369,10 +369,10 @@ export default {
openInfoBus: false, openInfoBus: false,
options_operateStatus: [{ options_operateStatus: [{
value: '存续', value: '存续',
label: '存续' label: this.$t('business.merchant.indexBus.operateStatusExist')
}, { }, {
value: '注销', value: '注销',
label: '注销' label: this.$t('business.merchant.indexBus.operateStatusCancel')
}], }],
// //
queryParams: { queryParams: {
@ -442,7 +442,7 @@ export default {
{ required: true, message: this.$t('business.merchant.indexBus.addrRequired'), trigger: "blur" } { required: true, message: this.$t('business.merchant.indexBus.addrRequired'), trigger: "blur" }
], ],
contactAddress: [ contactAddress: [
{ required: true, message: "联系地址不能为空", trigger: "blur" } { required: true, message: this.$t('business.merchant.indexBus.contactAddressRequired'), trigger: "blur" }
], ],
merchantName: [ merchantName: [
{ required: true, message: this.$t('business.merchant.indexBus.merchantNameRequired'), trigger: "blur" } { required: true, message: this.$t('business.merchant.indexBus.merchantNameRequired'), trigger: "blur" }

8
src/views/business/userVerification/index.vue

@ -150,8 +150,6 @@
<el-upload <el-upload
class="upload-demo" class="upload-demo"
:action="uploadUrl" :action="uploadUrl"
:on-preview="handlePreview"
:on-remove="handleRemove"
:on-success="handleSuccess_idCardFrontImagePath" :on-success="handleSuccess_idCardFrontImagePath"
:limit="1" :limit="1"
:accept="'image/jpg,image/png'" :accept="'image/jpg,image/png'"
@ -178,8 +176,6 @@
<el-upload <el-upload
class="upload-demo" class="upload-demo"
:action="uploadUrl" :action="uploadUrl"
:on-preview="handlePreview"
:on-remove="handleRemove"
:on-success="handleSuccess_userWithIdCardImagePath" :on-success="handleSuccess_userWithIdCardImagePath"
:limit="1" :limit="1"
:accept="'image/jpg,image/png'" :accept="'image/jpg,image/png'"
@ -348,6 +344,7 @@ export default {
form: {}, form: {},
// //
auditForm: {}, auditForm: {},
//
fileList: [], fileList: [],
// //
rules: { rules: {
@ -595,16 +592,19 @@ export default {
}); });
}) })
}, },
//
handleSuccess_idCardFrontImagePath(response) { handleSuccess_idCardFrontImagePath(response) {
if (response.code === 200) { if (response.code === 200) {
this.form.idCardFrontImagePath = response.data; // URL this.form.idCardFrontImagePath = response.data; // URL
} }
}, },
//
handleSuccess_idCardBackImagePath(response) { handleSuccess_idCardBackImagePath(response) {
if (response.code === 200) { if (response.code === 200) {
this.form.idCardBackImagePath = response.data; // URL this.form.idCardBackImagePath = response.data; // URL
} }
}, },
//
handleSuccess_userWithIdCardImagePath(response) { handleSuccess_userWithIdCardImagePath(response) {
if (response.code === 200) { if (response.code === 200) {
this.form.userWithIdCardImagePath = response.data; // URL this.form.userWithIdCardImagePath = response.data; // URL

Loading…
Cancel
Save