.env.development

@@ -7,8 +7,7 @@ ENV = 'development'
 # 若依管理系统/开发环境
 # TODO: 请修改为您的服务器地址
 # VUE_APP_BASE_API = 'http://8.137.52.68:8081'
-# VUE_APP_BASE_API = 'http://127.0.0.1:8081'
-VUE_APP_BASE_API = 'http://43.252.245.60:90'
+VUE_APP_BASE_API = 'http://127.0.0.1:8081'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'

.env.production

@@ -6,8 +6,8 @@ ENV = 'production'
 
 # 若依管理系统/生产环境
 # TODO: 请修改为您的服务器地址
-VUE_APP_BASE_API = 'http://8.137.52.68:8081'
-# VUE_APP_BASE_API = 'http://127.0.0.1:8081'
+# VUE_APP_BASE_API = 'http://8.137.52.68:8081'
+VUE_APP_BASE_API = 'http://api.lfpaylaos.com'
 # VUE_APP_BASE_API = '/prod-api'
 
 # 应用访问路径 例如使用前缀 /admin/

src/api/business/administrativeDivisions.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询行政区划列表
+export function listAdministrativeDivisions(query) {
+  return request({
+    url: '/business/administrativeDivisions/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询行政区划详细
+export function getAdministrativeDivisions(id) {
+  return request({
+    url: '/business/administrativeDivisions/' + id,
+    method: 'get'
+  })
+}
+
+// 新增行政区划
+export function addAdministrativeDivisions(data) {
+  return request({
+    url: '/business/administrativeDivisions',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改行政区划
+export function updateAdministrativeDivisions(data) {
+  return request({
+    url: '/business/administrativeDivisions',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除行政区划
+export function delAdministrativeDivisions(id) {
+  return request({
+    url: '/business/administrativeDivisions/' + id,
+    method: 'delete'
+  })
+}

src/api/business/userInfo.js

@@ -42,3 +42,17 @@ export function delUserInfo(id) {
     method: 'delete'
   })
 }
+
+// 获取地址选择
+export function getAddress(language) {
+  const languageMap = {
+    'zh': 1,
+    'en': 2,
+    'la': 3
+  };
+  language = languageMap[language] || null;
+  return request({
+    url: '/business/administrativeDivisions/getAddress/' + language,
+    method: 'get'
+  })
+}

src/api/business/userRegister.js

@@ -104,3 +104,17 @@ export function accountLock(date) {
     data: date
   })
 }
+
+// 获取地址选择
+export function getAddress(language) {
+  const languageMap = {
+    'zh': 1,
+    'en': 2,
+    'la': 3
+  };
+  language = languageMap[language] || null;
+  return request({
+    url: '/business/administrativeDivisions/getAddress/' + language,
+    method: 'get'
+  })
+}

src/api/business/userVerification.js

@@ -51,3 +51,17 @@ export function userVerificationAudit(data) {
     data:data
   })
 }
+
+// 获取地址选择
+export function getAddress(language) {
+  const languageMap = {
+    'zh': 1,
+    'en': 2,
+    'la': 3
+  };
+  language = languageMap[language] || null;
+  return request({
+    url: '/business/administrativeDivisions/getAddress/' + language,
+    method: 'get'
+  })
+}

src/languages/en.js

@@ -58,6 +58,26 @@ export default {
       yes: 'Yes',
       no: 'No',
     },
+    operateType: {
+      type0: 'General Retail',
+      type1: 'Food, Beverage and Tobacco Retail',
+      type2: 'Textile, Apparel and Daily Necessities Retail',
+      type3: 'Cultural, Sports Supplies and Equipment Retail',
+      type4: 'Pharmaceutical and Medical Equipment Retail',
+      type5: 'Automotive, Motorcycle, Fuel and Parts Retail',
+      type6: 'Home Appliances and Electronics Retail',
+      type7: 'Accommodation',
+      type8: 'Catering',
+      type9: 'Leisure and Entertainment',
+      type10: 'Real Estate',
+      type11: 'Finance',
+      type12: 'Residential Services',
+      type13: 'Commercial Services',
+      type14: 'Education',
+      type15: 'Healthcare',
+      type16: 'Social Welfare',
+      type17: 'Government Agencies and Public Services',
+    },
   },
   menus: {
     '首页': 'Homepage',
@@ -138,6 +158,7 @@ export default {
     '代理商认证': 'Agent Certification',
     '限额配置': 'Limit the allocation',
     '钱包限额': 'Wallet limits',
+    "行政区划": "Administrative division",
   },
   system: {
     common: {},
@@ -177,7 +198,39 @@ export default {
         createTime: 'Creation Time',
         remark: 'Remark',
         status: 'Status',
+        inputRemark: 'Please enter the remark',
+        addPost: 'Add Position',
+        editPost: 'Edit Position',
       },
+      user: {
+        userId: 'User ID',
+        userName: 'User Name',
+        nickName: 'Nickname',
+        dept: 'Department',
+        deptName: 'Department Name',
+        phonenumber: 'Phone Number',
+        status: 'Status',
+        email: 'Email',
+        sex: 'Gender',
+        post: 'Post',
+        role: 'Role',
+        remark: 'Remark',
+        password: 'Password',
+        resetPwd: 'Reset Password',
+        assignRole: 'Assign Role',
+        inputDeptName: 'Please enter department name',
+        inputUserName: 'Please enter user name',
+        inputNickName: 'Please enter nickname',
+        inputPhonenumber: 'Please enter phone number',
+        inputEmail: 'Please enter email',
+        inputPassword: 'Please enter password',
+        inputRemark: 'Please enter remark',
+        userStatus: 'Please select user status',
+        selectDept: 'Please select department',
+        selectSex: 'Please select gender',
+        selectPost: 'Please select post',
+        selectRole: 'Please select role'
+      }
     },
     systemMonitor: {}
   },
@@ -260,10 +313,12 @@ export default {
           processingStatus1: 'Successfully processed callback',
           processingStatus0: 'Processing callback',
           processingStatus2: 'Failed processing callback',
-          transactionStatus1: 'Payment successful',
-          transactionStatus2: 'Payment processing',
-          transactionStatus3: 'Payment failed',
-          transactionStatus4: 'Refund successful',
+          transactionStatusOption: {
+            paidSuccess: 'Payment successful',
+            processing: 'Payment processing',
+            failed: 'Payment failed',
+            refunded: 'Refunded',
+          },
           userIdRequired: 'The user number cannot be empty',
           userIdNumeric: 'The user number must be a number',
           orderIdRequired: 'The order number cannot be empty',
@@ -685,6 +740,8 @@ export default {
         agePlaceholder: 'Please enter the age',
         addr: 'Address',
         addrPlaceholder: 'Please enter the address',
+        email: 'E-mail',
+        emailPlaceholder: 'Please enter the E-mail address',
         status: 'Status',
         statusNormal: 'Normal',
         statusDisabled: 'Disabled',
@@ -701,6 +758,7 @@ export default {
         phoneRequired: 'The contact phone can only be a number',
         ageRequired: 'The age can only be a number',
         addrRequired: 'The address cannot be empty',
+        emailRequired: 'The e-mail address cannot be empty',
         addTitle: 'Add User Information',
         editTitle: 'Edit User Information'
       },
@@ -718,12 +776,19 @@ export default {
         biometrics: 'Biometric Identification',
         biometricsUnverified: 'Unverified',
         biometricsVerified: 'Verified',
+        verifiedType: 'Certification type',
         idCardVerification: 'ID Card Authentication',
+        passPortdVerification: 'Passport authentication',
+        certificateStartDate: 'Certificate start date',
+        certificateEndDate: 'Certificate end date',
+        contactAddress: 'Contact Address',
+        status: 'Authentication Status',
         statusUnverified: 'Unverified',
         statusVerified: 'Verified',
         statusFailed: 'Authentication Failed',
         statusPending: 'Pending Review',
         verificationTime: 'Authentication Time',
+        certificateExpirationDate: 'Certificate expiration date',
         failureReason: 'Failure Reason',
         failureReasonPlaceholder: 'Please enter the failure reason',
         verify: 'Authenticate',
@@ -755,7 +820,8 @@ export default {
         idCardFrontRequired: 'Please upload the front - side photo of the ID card',
         idCardBackRequired: 'Please upload the back - side photo of the ID card',
         idCardHoldingRequired: 'Please upload the photo of holding the ID card',
-        failureReasonRequired: 'Please enter the failure reason'
+        failureReasonRequired: 'Please enter the failure reason',
+        license: "license"
       }
     },
     merchant: {
@@ -800,6 +866,7 @@ export default {
         userLevelRequired: 'The user level cannot be empty',
         legalPersonRequired: 'The legal person cannot be empty',
         operateStatusRequired: 'The business status cannot be empty',
+        operateTypeRequired: 'The business type cannot be empty',
         operateStatusExist: 'Active',
         operateStatusCancel: 'Cancelled',
         operateAddrRequired: 'The business address cannot be empty',
@@ -830,7 +897,9 @@ export default {
         legalPersonLabel: 'Legal Person',
         legalPersonPlaceholder: 'Please enter the legal person',
         operateStatusLabel: 'Business Status',
+        operateTypeLabel: 'Business Type',
         operateStatusPlaceholder: 'Please select the business status',
+        operateTypePlaceholder: 'Please select the business type',
         operateAddrLabel: 'Business Address',
         operateAddrPlaceholder: 'Please enter the business address'
       },
@@ -869,15 +938,22 @@ export default {
         businessLicenseNumber: 'Business License Number',
         legalPersonInfoName: 'Registered Legal Person Name',
         legalPersonName: 'Legal Person Name',
+        legalPersonPhone: 'Legal Person Phone',
+        legalPersonEmail: 'Legal Person Email',
         status: 'Authentication Status',
         authenticationDate: 'Authentication Date',
+        certificateExpirationDate: 'Certificate expiration date',
         failureReason: 'Failure Reason',
         registeredMerchantName: 'Registered Merchant Name',
         authenticatedMerchantName: 'Authenticated Merchant Name',
         registeredLegalPersonName: 'Registered Legal Person Name',
         authenticatedLegalPersonName: 'Authenticated Legal Person Name',
         legalPersonIdCardNumber: 'Legal Person ID Card Number',
+        shopKeeperIdCardNumber: 'Shop Keeper ID Card Number',
         businessLicense: 'Business License',
+        doorPhoto: 'Door Photo',
+        yes: 'Yes',
+        no: 'No',
         authenticationFailureReason: 'Authentication Failure Reason',
         authenticate: 'Authenticate',
         audit: 'Review',
@@ -892,8 +968,14 @@ export default {
         accountPlaceholder: 'Please enter the account',
         merchantNamePlaceholder: 'Please enter the merchant name',
         legalPersonIdCardPlaceholder: 'Please enter the legal person ID card number',
+        shopKeeperIdCardPlaceholder: 'Please enter the shop keeper ID card number',
         businessLicenseNumberPlaceholder: 'Please enter the business license number',
+        legalPersonPhonePlaceholder: 'Please enter the business license phone',
+        legalPersonEmailPlaceholder: 'Please enter the business license E-mail',
         legalPersonNamePlaceholder: 'Please enter the legal person name',
+        shopKeeperNamePlaceholder: 'Please enter the shop keeper name',
+        shopKeeperPhonePlaceholder: 'Please enter the shop keeper phone',
+        shopKeeperEmailPlaceholder: 'Please enter the shop keeper E-mail',
         authenticationFailureReasonPlaceholder: 'Please enter the authentication failure reason',
         authenticateTitle: 'Merchant Authentication',
         detailTitle: 'Merchant Authentication Details',
@@ -1612,6 +1694,33 @@ export default {
         receipt: 'Receipt',
         withdrawal: 'Withdrawal',
       },
+      administrative: {
+        nameCn: "Chinese Name",
+        nameEn: "English Name",
+        nameLao: "Lao Name",
+        parentId: "Parent ID",
+        divisionLevel: "Administrative Level",
+        inputNameCn: "Please enter Chinese name",
+        inputNameEn: "Please enter English name",
+        inputNameLao: "Please enter Lao name",
+        inputParentId: "Please enter parent ID",
+        selectDivisionLevel: "Please select administrative level",
+        province: "Provincial",
+        city: "District",
+        required: "Cannot be empty",
+        parentIdRequired: "Parent ID cannot be empty",
+        nameCnRequired: "Chinese name cannot be empty",
+        nameEnRequired: "English name cannot be empty",
+        nameLaoRequired: "Lao name cannot be empty",
+        divisionLevelRequired: "Administrative level cannot be empty",
+        addTitle: "Add Administrative Division",
+        editTitle: "Edit Administrative Division",
+        detailTitle: "Administrative Division Details",
+        addSuccess: "Added successfully",
+        updateSuccess: "Updated successfully",
+        deleteConfirm: 'Are you sure to delete this administrative division item?',
+        deleteSuccess: "Deleted successfully"
+      },
     },
     agent: {
       agentRegister: {
@@ -1743,6 +1852,7 @@ export default {
         legalPersonName: 'Legal Person Name',
         status: 'Verification Status',
         authenticationDate: 'Authentication Date',
+        certificateExpirationDate: 'Certificate expiration date',
         failureReason: 'Failure Reason',
         electronicContract: 'Electronic Contract',
         earnestMoney: 'Earnest Money',

src/languages/zh.js

@@ -58,6 +58,26 @@ export default {
       yes: '是',
       no: '否',
     },
+    operateType: {
+      type0: '综合零售',
+      type1: '食品、饮料及烟草制品专门零售',
+      type2: '纺织、服装及日用品专门零售店',
+      type3: '文化、体育用品及器材专门零售',
+      type4: '医药和医疗器材专门零售',
+      type5: '汽车、摩托车、燃料及配件专门零售',
+      type6: '家用电器及电子产品专门零售',
+      type7: '住宿业',
+      type8: '餐饮业',
+      type9: '休闲娱乐业',
+      type10: '房地产业',
+      type11: '金融业',
+      type12: '居民服务业',
+      type13: '商业服务业',
+      type14: '教育',
+      type15: '卫生',
+      type16: '社会保障与福利',
+      type17: '政府机关及其他公共服务',
+    },
   },
   menus: {
     '首页': '首页',
@@ -138,6 +158,7 @@ export default {
     '代理商认证': '代理商认证',
     '限额配置': '限额配置',
     '钱包限额': '钱包限额',
+    "行政区划": "行政区划"
   },
   system: {
     common: {},
@@ -177,7 +198,39 @@ export default {
         createTime: '创建时间',
         remark: '备注',
         status: '状态',
+        inputRemark: '请输入备注',
+        addPost: '添加岗位',
+        editPost: '修改岗位',
       },
+      user: {
+        userId: '用户编号',
+        userName: '用户名称',
+        nickName: '用户昵称',
+        dept: '部门',
+        deptName: '部门名称',
+        phonenumber: '手机号码',
+        status: '状态',
+        email: '邮箱',
+        sex: '性别',
+        post: '岗位',
+        role: '角色',
+        remark: '备注',
+        password: '密码',
+        resetPwd: '重置密码',
+        assignRole: '分配角色',
+        inputDeptName: '请输入部门名称',
+        inputUserName: '请输入用户名称',
+        inputNickName: '请输入用户昵称',
+        inputPhonenumber: '请输入手机号码',
+        inputEmail: '请输入邮箱',
+        inputPassword: '请输入密码',
+        inputRemark: '请输入备注',
+        userStatus: '请选择用户状态',
+        selectDept: '请选择部门',
+        selectSex: '请选择性别',
+        selectPost: '请选择岗位',
+        selectRole: '请选择角色'
+      }
     },
     systemMonitor: {}
   },
@@ -260,10 +313,12 @@ export default {
           processingStatus1: '成功处理的回调',
           processingStatus0: '处理中的回调',
           processingStatus2: '处理失败的回调',
-          transactionStatus1: '支付成功',
-          transactionStatus2: '支付处理中',
-          transactionStatus3: '支付失败',
-          transactionStatus4: '退款成功',
+          transactionStatusOption: {
+            paidSuccess: '支付成功',
+            processing: '支付处理中',
+            failed: '支付失败',
+            refunded: '退款成功',
+          },
           userIdRequired: '用户编号不能为空',
           userIdNumeric: '用户编号必须为数字',
           orderIdRequired: '订单编号不能为空',
@@ -616,7 +671,7 @@ export default {
         normalUser: '普通用户',
         businessUser: '商户用户',
         vipUser: 'VIP用户',
-        address: '地址信息',
+        address: '户籍地址',
         contactAddress: '联系地址',
         contactAddressPlaceholder: '请输入联系地址',
         supplement: '补充信息',
@@ -683,8 +738,10 @@ export default {
         gender: '性别',
         age: '年龄',
         agePlaceholder: '请输入年龄',
-        addr: '地址',
+        addr: '户籍地址',
         addrPlaceholder: '请输入地址',
+        email: '电子邮箱',
+        emailPlaceholder: '请输入邮箱地址',
         status: '状态',
         statusNormal: '正常',
         statusDisabled: '禁用',
@@ -694,13 +751,14 @@ export default {
         detailIdCard: '身份证号',
         detailPhone: '联系电话',
         detailAge: '年龄',
-        detailAddr: '地址',
+        detailAddr: '详细地址',
         nameRequired: '姓名不能为空',
         genderRequired: '性别不能为空',
         idCardRequired: '身份证号只能为数字',
         phoneRequired: '联系电话只能为数字',
         ageRequired: '年龄只能为数字',
         addrRequired: '地址不能为空',
+        emailRequired: '邮箱地址不能为空',
         addTitle: '添加用户信息',
         editTitle: '修改用户信息'
       },
@@ -718,12 +776,19 @@ export default {
         biometrics: '生物识别',
         biometricsUnverified: '未验证',
         biometricsVerified: '已验证',
+        verifiedType: '认证类型',
         idCardVerification: '身份证认证',
+        passPortdVerification: '护照认证',
+        certificateStartDate: '证件签发日期',
+        certificateEndDate: '证件失效日期',
+        contactAddress: '联系地址',
+        status: '认证状态',
         statusUnverified: '未认证',
         statusVerified: '已认证',
         statusFailed: '认证失败',
         statusPending: '审核中',
         verificationTime: '认证时间',
+        certificateExpirationDate: '证件有效期',
         failureReason: '失败原因',
         failureReasonPlaceholder: '请输入失败原因',
         verify: '认证',
@@ -751,11 +816,15 @@ export default {
         idCardDigitOnly: '身份证号只能包含数字',
         nameRequired: '请输入姓名',
         birthDateRequired: '请选择出生日期',
+        dateOfIssueRequired: '请选择证件签发日期',
+        expirationTimeRequired: '请选择证件失效日期',
         nationalityRequired: '请输入国籍',
         idCardFrontRequired: '请上传身份证正面照片',
         idCardBackRequired: '请上传身份证背面照片',
         idCardHoldingRequired: '请上传手持身份证照片',
-        failureReasonRequired: '请输入失败原因'
+        passportRequired: '请上传护照照片',
+        failureReasonRequired: '请输入失败原因',
+        license: "护照"
       }
     },
     merchant: {
@@ -784,10 +853,10 @@ export default {
         contactAddress: '联系地址',
         contactAddressPlaceholder: '请输入联系地址',
         contactAddressRequired: '联系地址不能为空',
-        addTitle: '添加用户注册',
-        editTitle: '编辑用户注册',
-        detailTitle: '用户注册详情',
-        deleteConfirmAccount: '确定要删除用户账户吗？',
+        addTitle: '商户信息注册',
+        editTitle: '商户信息编辑',
+        detailTitle: '商户信息详情',
+        deleteConfirmAccount: '确定要删除商户用户吗？',
         deleteConfirmBatch: '确定要删除选中的用户吗？',
         passwordResetConfirm: '确定要重置密码吗？',
         passwordResetSuccess: '密码重置成功',
@@ -800,6 +869,7 @@ export default {
         userLevelRequired: '用户等级不能为空',
         legalPersonRequired: '法人不能为空',
         operateStatusRequired: '经营状态不能为空',
+        operateTypeRequired: '经营类别不能为空',
         operateStatusExist: '存续',
         operateStatusCancel: '注销',
         operateAddrRequired: '经营地址不能为空',
@@ -817,7 +887,7 @@ export default {
         age: '年龄',
         agePlaceholder: '请输入年龄',
         ageNumberOnly: '年龄只能为数字',
-        addr: '地址',
+        addr: '联系地址',
         addrPlaceholder: '请输入地址',
         addrRequired: '地址不能为空',
         merchantNameLabel: '商户名称',
@@ -830,7 +900,9 @@ export default {
         legalPersonLabel: '法人',
         legalPersonPlaceholder: '请输入法人',
         operateStatusLabel: '经营状态',
+        operateTypeLabel: '经营类别',
         operateStatusPlaceholder: '请选择经营状态',
+        operateTypePlaceholder: '请选择经营类别',
         operateAddrLabel: '经营地址',
         operateAddrPlaceholder: '请输入经营地址'
       },
@@ -867,17 +939,27 @@ export default {
         userAccount: '用户账号',
         merchantInfoName: '注册商户名称',
         businessLicenseNumber: '营业执照号',
-        legalPersonInfoName: '注册法人姓名',
+        legalPersonInfoName: '认证人姓名',
         legalPersonName: '法人姓名',
+        legalPersonPhone: '法人电话',
+        legalPersonEmail: '法人邮箱',
+        shopKeeperName: '店主姓名',
+        shopKeeperPhone: '店主电话',
+        shopKeeperEmail: '店主邮箱',
         status: '认证状态',
         authenticationDate: '认证日期',
+        certificateExpirationDate: '证件有效期',
         failureReason: '失败原因',
         registeredMerchantName: '注册商户名称',
         authenticatedMerchantName: '认证商户名称',
         registeredLegalPersonName: '注册法人姓名',
         authenticatedLegalPersonName: '认证法人姓名',
         legalPersonIdCardNumber: '法人身份证号码',
+        shopKeeperIdCardNumber: '店主身份证号码',
         businessLicense: '营业执照',
+        doorPhoto: '门头照片',
+        yes: '有',
+        no: '无',
         authenticationFailureReason: '认证失败原因',
         authenticate: '认证',
         audit: '审核',
@@ -892,8 +974,16 @@ export default {
         accountPlaceholder: '请输入账号',
         merchantNamePlaceholder: '请输入商户名称',
         legalPersonIdCardPlaceholder: '请输入法人身份证号',
+        shopKeeperIdCardPlaceholder: '请输入法人身份证号',
         businessLicenseNumberPlaceholder: '请输入营业执照号',
+        businessLicensePhotoPlaceholder: '请上传营业执照',
+        doorPhotoPlaceholder: '请上传门头执照',
         legalPersonNamePlaceholder: '请输入法人姓名',
+        legalPersonPhonePlaceholder: '请输入法人电话',
+        legalPersonEmailPlaceholder: '请输入法人邮箱',
+        shopKeeperNamePlaceholder: '请输入店主姓名',
+        shopKeeperPhonePlaceholder: '请输入店主电话',
+        shopKeeperEmailPlaceholder: '请输入店主邮箱',
         authenticationFailureReasonPlaceholder: '请输入认证失败原因',
         authenticateTitle: '商户认证',
         detailTitle: '商户认证详情',
@@ -1612,6 +1702,33 @@ export default {
         receipt: '收款',
         withdrawal: '提现',
       },
+      administrative: {
+        nameCn: "中文名称",
+        nameEn: "英文名称",
+        nameLao: "老挝语名称",
+        parentId: "父级ID",
+        divisionLevel: "行政级别",
+        inputNameCn: "请输入中文名称",
+        inputNameEn: "请输入英文名称",
+        inputNameLao: "请输入老挝语名称",
+        inputParentId: "请输入父级ID",
+        selectDivisionLevel: "请选择行政级别",
+        province: "省级",
+        city: "市级",
+        required: "不能为空",
+        parentIdRequired: "父级ID不能为空",
+        nameCnRequired: "中文名称不能为空",
+        nameEnRequired: "英文名称不能为空",
+        nameLaoRequired: "老挝语名称不能为空",
+        divisionLevelRequired: "行政级别不能为空",
+        addTitle: "添加行政区划",
+        editTitle: "修改行政区划",
+        detailTitle: "行政区划详情",
+        addSuccess: "新增成功",
+        updateSuccess: "修改成功",
+        deleteConfirm: '是否确认删除该行政区划的数据项？',
+        deleteSuccess: "删除成功"
+      }
     },
     agent: {
       agentRegister: {
@@ -1742,9 +1859,10 @@ export default {
         legalPersonName: '法人姓名',
         status: '认证状态',
         authenticationDate: '认证日期',
+        certificateExpirationDate: '证件有效期',
         failureReason: '失败原因',
         electronicContract: '电子合同',
-        earnestMoney: '保证金',
+        earnestMoney: '保证金缴纳证明',
         registeredAgentName: '注册代理名称',
         authenticatedAgentName: '认证代理名称',
         registeredLegalPersonName: '注册法人姓名',

src/views/business/administrativeDivisions/index.vue

@@ -0,0 +1,403 @@
+<template>
+  <div class="app-container">
+<!--    :label="$t('business.public.administrative.')-->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item :label="$t('business.public.administrative.nameCn')" prop="nameCn" label-width="auto">
+        <el-input
+          v-model="queryParams.nameCn"
+          :placeholder="$t('business.public.administrative.inputNameCn')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('business.public.administrative.nameEn')" prop="nameEn" label-width="auto">
+        <el-input
+          v-model="queryParams.nameEn"
+          :placeholder="$t('business.public.administrative.inputNameEn')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('business.public.administrative.nameLao')" prop="nameLa" label-width="auto">
+        <el-input
+          v-model="queryParams.nameLa"
+          :placeholder="$t('business.public.administrative.inputNameLao')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('business.public.administrative.divisionLevel')" prop="level" label-width="auto">
+        <!-- 下拉框 1 省级 2 市级 -->
+        <el-select v-model="queryParams.level" :placeholder="$t('business.public.administrative.selectDivisionLevel')" clearable @change="handleQuery">
+          <el-option
+            v-for="dict in levelOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:administrativeDivisions:add']"
+        >{{ $t('common.button.add') }}
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:administrativeDivisions:edit']"
+        >{{ $t('common.button.edit') }}
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:administrativeDivisions:remove']"
+        >{{ $t('common.button.delete')}}
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:administrativeDivisions:export']"
+        >{{ $t('common.button.export')}}
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="administrativeDivisionsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column :label="$t('business.public.administrative.parentId')" align="center" prop="parentId"/>
+      <el-table-column :label="$t('business.public.administrative.nameCn')" align="center" prop="nameCn"/>
+      <el-table-column :label="$t('business.public.administrative.nameEn')" align="center" prop="nameEn"/>
+      <el-table-column :label="$t('business.public.administrative.nameLao')" align="center" prop="nameLa"/>
+      <el-table-column :label="$t('business.public.administrative.divisionLevel')" align="center" prop="level">
+        <template slot-scope="scope">
+          {{ scope.row.level == 1 ? $t('business.public.administrative.province') : $t('business.public.administrative.city') }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetail(scope.row)"
+          >{{ $t('common.button.detail') }}
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:administrativeDivisions:edit']"
+          >{{ $t('common.button.edit') }}
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:administrativeDivisions:remove']"
+          >{{ $t('common.button.delete') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改行政区划对话框 -->
+    <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.public.administrative.parentId')" prop="parentId">
+          <el-input v-model="form.parentId" :placeholder="$t('business.public.administrative.inputParentId')"/>
+        </el-form-item>
+        <el-form-item :label="$t('business.public.administrative.nameCn')" prop="nameCn">
+          <el-input v-model="form.nameCn" :placeholder="$t('business.public.administrative.inputNameCn')"/>
+        </el-form-item>
+        <el-form-item :label="$t('business.public.administrative.nameEn')" prop="nameEn">
+          <el-input v-model="form.nameEn" :placeholder="$t('business.public.administrative.inputNameEn')"/>
+        </el-form-item>
+        <el-form-item :label="$t('business.public.administrative.nameLao')" prop="nameLa">
+          <el-input v-model="form.nameLa" :placeholder="$t('business.public.administrative.inputNameLao')"/>
+        </el-form-item>
+        <el-form-item :label="$t('business.public.administrative.divisionLevel')" prop="level">
+          <!-- 下拉框 1 省级 2 市级 -->
+          <el-select v-model="form.level" :placeholder="$t('business.public.administrative.selectDivisionLevel')" clearable>
+            <el-option
+              v-for="dict in levelOptions"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </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 @click="cancel">{{ $t('common.button.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 行政区划详情 -->
+    <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+      <el-form ref="form" :model="form" label-width="auto">
+        <el-form-item :label="$t('business.public.administrative.parentId') + '：'">
+          {{ form.parentId }}
+        </el-form-item>
+        <el-form-item :label="$t('business.public.administrative.nameCn') + '：'">
+          {{ form.nameCn }}
+        </el-form-item>
+        <el-form-item :label="$t('business.public.administrative.nameEn') + '：'">
+          {{ form.nameEn }}
+        </el-form-item>
+        <el-form-item :label="$t('business.public.administrative.nameLao') + '：'">
+          {{ form.nameLa }}
+        </el-form-item>
+        <el-form-item :label="$t('business.public.administrative.divisionLevel') + '：'">
+          {{ form.level === 1 ? $t('business.public.administrative.province') : $t('business.public.administrative.city') }}
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">{{ $t('common.button.close') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listAdministrativeDivisions,
+  getAdministrativeDivisions,
+  delAdministrativeDivisions,
+  addAdministrativeDivisions,
+  updateAdministrativeDivisions
+} from "@/api/business/administrativeDivisions";
+
+export default {
+  name: "AdministrativeDivisions",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 行政区划表格数据
+      administrativeDivisionsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详情弹出层
+      detailOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        parentId: undefined,
+        nameCn: undefined,
+        nameEn: undefined,
+        nameLa: undefined,
+        level: undefined
+      },
+      // 表单参数
+      form: {},
+      levelOptions: [
+        {
+          value: 1,
+          label: this.$t('business.public.administrative.province')
+        },
+        {
+          value: 2,
+          label: this.$t('business.public.administrative.city')
+        },
+      ],
+      // 表单校验
+      rules: {
+        id: [
+          {required: true, message: this.$t('business.public.administrative.required'), trigger: "blur"}
+        ],
+        parentId: [
+          {required: true, message: this.$t('business.public.administrative.parentIdRequired'), trigger: "blur"}
+        ],
+        nameCn: [
+          {required: true, message: this.$t('business.public.administrative.nameCnRequired'), trigger: "blur"}
+        ],
+        nameEn: [
+          {required: true, message: this.$t('business.public.administrative.nameEnRequired'), trigger: "blur"}
+        ],
+        nameLa: [
+          {required: true, message: this.$t('business.public.administrative.nameLaoRequired'), trigger: "blur"}
+        ],
+        level: [
+          {required: true, message: this.$t('business.public.administrative.divisionLevelRequired'), trigger: "blur"}
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询行政区划列表 */
+    getList() {
+      this.loading = true;
+      listAdministrativeDivisions(this.queryParams).then(response => {
+        this.administrativeDivisionsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        parentId: undefined,
+        nameCn: undefined,
+        nameEn: undefined,
+        nameLa: undefined,
+        level: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = this.$t('business.public.administrative.addTitle');
+    },
+    /** 详情按钮操作 */
+    handleDetail(row) {
+      this.reset();
+      this.form = row;
+      this.detailOpen = true;
+      this.title = this.$t('business.public.administrative.detailTitle');
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getAdministrativeDivisions(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = this.$t('business.public.administrative.editTitle');
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateAdministrativeDivisions(this.form).then(response => {
+              this.$modal.msgSuccess(this.$t('business.public.administrative.updateSuccess'));
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addAdministrativeDivisions(this.form).then(response => {
+              this.$modal.msgSuccess(this.$t('business.public.administrative.addSuccess'));
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm(this.$t('business.public.administrative.deleteConfirm', { ids })).then(() => {
+        this.loading = true;
+        return delAdministrativeDivisions(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess(this.$t('business.public.administrative.deleteSuccess'));
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/administrativeDivisions/export', {
+        ...this.queryParams
+      }, `administrativeDivisions_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/agentVerification/index.vue

@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.agent.agentVerification.agentName')" prop="agentName">
+      <el-form-item :label="$t('business.agent.agentVerification.agentName')" prop="agentName" label-width="auto">
         <el-input
           v-model="queryParams.agentName"
           :placeholder="$t('business.agent.agentVerification.placeholder.agentNamePlaceholder')"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCard')" prop="legalPersonIdCard">
+      <el-form-item :label="$t('business.agent.agentVerification.legalPersonIdCard')" prop="legalPersonIdCard" label-width="auto">
         <el-input
           v-model="queryParams.legalPersonIdCard"
           :placeholder="$t('business.agent.agentVerification.placeholder.legalPersonIdCardPlaceholder')"
@@ -49,10 +49,8 @@
     <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.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>
@@ -61,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)"
@@ -98,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.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.businessLicenseNumberPlaceholder')"/>
-        </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.legalPersonNamePlaceholder')"/>
-        </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.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 :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-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>
-        <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">
+        <!--  有营业执照的认证方式：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 :label="$t('business.agent.agentVerification.electronicContract')" prop="electronicContract">
-          <el-input v-model="form.electronicContract" :placeholder="$t('business.agent.agentVerification.electronicContractPlaceholder')"/>
+        <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 :label="$t('business.agent.agentVerification.earnestMoney')" prop="earnestMoney">
-          <el-input v-model="form.earnestMoney" :placeholder="$t('business.agent.agentVerification.earnestMoneyPlaceholder')"/>
+        <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>
+        <!-------------------------------------------------------------有无营业执照分割线------------------------------------------------------------------->
+        <!--  无营业执照的认证方式：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 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 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 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>
@@ -165,35 +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 :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.legalPersonEmail') + '：'">
+          {{auditForm.contactPersonEmail}}
         </el-form-item>
-        <el-form-item :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.merchant.merchantVerification.legalPersonIdCard') + '：'">
+          {{auditForm.legalPersonIdCard}}
         </el-form-item>
-        <el-form-item :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.certificateStartDate') + '：'">
+          {{auditForm.legalPersonDateOfIssue}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.businessLicense') + '：'">
-          {{auditForm.businessLicenseNumber}}
+        <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.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]" />
+        </el-form-item>
+        <!--    无营业执照的店主审核信息    -->
+        <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 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 :label="$t('business.agent.agentVerification.authenticationFailureReason') + '：'" prop="failureReason">
-          <el-input v-model="auditForm.failureReason" :placeholder="$t('business.agent.agentVerification.authenticationFailureReasonPlaceholder')" />
+        <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">
@@ -209,36 +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') + '：'">
+        <el-form-item v-if="form.hasLicense ==1" :label="$t('business.merchant.merchantVerification.businessLicenseNumber') + '：'">
           {{form.businessLicenseNumber}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.legalPersonName') + '：'">
+        <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 :label="$t('business.agent.agentVerification.legalPersonIdCard') + '：'">
+        <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.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.userManager.userVerification.certificateStartDate') + '：'">
+          {{form.legalPersonDateOfIssue}}
         </el-form-item>
-        <el-form-item :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.hasLicense == '1'" :label="$t('business.userManager.userVerification.certificateEndDate') + '：'">
+          {{form.legalPersonExpirationTime}}
         </el-form-item>
-        <el-form-item :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.hasLicense == '1'" :label="$t('business.merchant.userInfoBus.operatingAddress') + '：'">
+          {{form.operateAddressShow}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.electronicContract') + '：'">
-          {{ form.electronicContract }}
+        <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 :label="$t('business.agent.agentVerification.earnestMoney') + '：'">
-          {{ form.earnestMoney }}
+        <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 ==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]" />
+        </el-form-item>
+        <!--    无营业执照的店主信息详情    -->
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperName') + '：'">
+          {{form.shopkeeperName}}
+        </el-form-item>
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperPhone') + '：'">
+          {{form.contactPersonPhone}}
         </el-form-item>
-        <el-form-item :label="$t('business.agent.agentVerification.authenticationDate') + '：'" prop="authenticationDate">
-          {{ form.authenticationDate }}
+        <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 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>
@@ -282,6 +569,8 @@ export default {
       detailOpen: false,
       // 是否显示详情弹出层
       auditOpen: false,
+      //地址选择列表
+      options_addr:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -315,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" }
         ],
@@ -324,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" }
         ],
@@ -333,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
@@ -355,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;
@@ -390,7 +773,9 @@ export default {
         updateTime: undefined,
         createBy: undefined,
         updateBy: undefined,
-        delFlag: undefined
+        delFlag: undefined,
+        hasLicense: 1,
+        licenseType: 1
       };
       this.resetForm("form");
     },
@@ -413,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 {
@@ -457,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'));
@@ -534,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;
     }
   }
 };

src/views/business/appVersion/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.public.appVersion.versionCode')" prop="versionCode">
+      <el-form-item :label="$t('business.public.appVersion.versionCode')" prop="versionCode" label-width="auto">
         <el-input
           v-model="queryParams.versionCode"
           :placeholder="$t('business.public.appVersion.versionCodePlaceholder')"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.public.appVersion.versionName')" prop="versionName">
+      <el-form-item :label="$t('business.public.appVersion.versionName')" prop="versionName" label-width="auto">
         <el-input
           v-model="queryParams.versionName"
           :placeholder="$t('business.public.appVersion.versionNamePlaceholder')"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.public.appVersion.releaseDate')" prop="releaseDate">
+      <el-form-item :label="$t('business.public.appVersion.releaseDate')" prop="releaseDate" label-width="auto">
         <el-date-picker clearable
                         v-model="queryParams.releaseDate"
                         type="date"
@@ -25,7 +25,7 @@
                         :placeholder="$t('business.public.appVersion.releaseDatePlaceholder')">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('business.public.appVersion.downloadUrl')" prop="downloadUrl">
+      <el-form-item :label="$t('business.public.appVersion.downloadUrl')" prop="downloadUrl" label-width="auto">
         <el-input
           v-model="queryParams.downloadUrl"
           :placeholder="$t('business.public.appVersion.downloadUrlPlaceholder')"

src/views/business/behaviorModelInfo/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.behavior.behaviorModelInfo.name')" prop="name">
+      <el-form-item :label="$t('business.behavior.behaviorModelInfo.name')" prop="name" label-width="auto">
         <el-input v-model="queryParams.name" :placeholder="$t('business.behavior.behaviorModelInfo.placeholder.name')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.behavior.behaviorModelInfo.description')" prop="description">
+      <el-form-item :label="$t('business.behavior.behaviorModelInfo.description')" prop="description" label-width="auto">
         <el-input v-model="queryParams.description"
           :placeholder="$t('business.behavior.behaviorModelInfo.placeholder.description')" clearable
           @keyup.enter.native="handleQuery" />

src/views/business/commonFeedback/index.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.customerSupport.commonFeedback.userId')" prop="userId">
+      <el-form-item :label="$t('business.customerSupport.commonFeedback.userId')" prop="userId" label-width="auto">
         <el-input v-model="queryParams.userId" :placeholder="$t('business.customerSupport.commonFeedback.userIdPlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.customerSupport.commonFeedback.star')" prop="star">
+      <el-form-item :label="$t('business.customerSupport.commonFeedback.star')" prop="star" label-width="auto">
         <el-input v-model="queryParams.star" :placeholder="$t('business.customerSupport.commonFeedback.starPlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.customerSupport.commonFeedback.isGood')" prop="isGood">
+      <el-form-item :label="$t('business.customerSupport.commonFeedback.isGood')" prop="isGood" label-width="auto">
         <el-input v-model="queryParams.isGood" :placeholder="$t('business.customerSupport.commonFeedback.isGoodPlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.customerSupport.commonFeedback.createTime')">
+      <el-form-item :label="$t('business.customerSupport.commonFeedback.createTime')" label-width="auto">
         <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" :range-separator="$t('business.customerSupport.commonFeedback.rangeSeparator')"
           :start-placeholder="$t('business.customerSupport.commonFeedback.startDate')"

src/views/business/commonInfo/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.public.commonInfo.version')" prop="version">
+      <el-form-item :label="$t('business.public.commonInfo.version')" prop="version" label-width="auto">
         <el-input v-model="queryParams.version" :placeholder="$t('business.public.commonInfo.versionPlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.public.commonInfo.releaseDate')">
+      <el-form-item :label="$t('business.public.commonInfo.releaseDate')" label-width="auto">
         <el-date-picker v-model="daterangeReleaseDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" :start-placeholder="$t('common.tableMsg.startDate')" :end-placeholder="$t('common.tableMsg.endDate')"
           :default-time="['00:00:00', '23:59:59']"></el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('business.public.commonInfo.techDesc')" prop="techDesc">
+      <el-form-item :label="$t('business.public.commonInfo.techDesc')" prop="techDesc" label-width="auto">
         <el-input v-model="queryParams.techDesc" :placeholder="$t('business.public.commonInfo.techDescPlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('common.tableMsg.createTime')">
+      <el-form-item :label="$t('common.tableMsg.createTime')" label-width="auto">
         <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange" range-separator="-" :start-placeholder="$t('common.tableMsg.startDate')" :end-placeholder="$t('common.tableMsg.endDate')"
           :default-time="['00:00:00', '23:59:59']"></el-date-picker>

src/views/business/commonLimitSetting/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="适用群组" prop="limitGroup">
+      <el-form-item label="适用群组" prop="limitGroup" label-width="auto">
         <el-input v-model="queryParams.limitGroup" placeholder="请输入适用群组" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="对应等级" prop="limitLevel">

src/views/business/commonNotify/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.public.commonNotify.messageScene')" prop="messageScene">
+      <el-form-item :label="$t('business.public.commonNotify.messageScene')" prop="messageScene" label-width="auto">
         <!-- 下拉框 -->
         <el-select v-model="queryParams.messageScene"
                    :placeholder="$t('business.public.commonNotify.selectMessageScene')"
@@ -11,16 +11,16 @@
                      :value="dict.dictValue"/>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.public.commonNotify.sender')" prop="sender">
+      <el-form-item :label="$t('business.public.commonNotify.sender')" prop="sender" label-width="auto">
         <el-input v-model="queryParams.sender" :placeholder="$t('business.public.commonNotify.inputSender')" clearable
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item :label="$t('business.public.commonNotify.receiver')" prop="receiver">
+      <el-form-item :label="$t('business.public.commonNotify.receiver')" prop="receiver" label-width="auto">
         <el-input v-model="queryParams.receiver" :placeholder="$t('business.public.commonNotify.inputReceiver')"
                   clearable
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item :label="$t('business.public.commonNotify.title')" prop="title">
+      <el-form-item :label="$t('business.public.commonNotify.title')" prop="title" label-width="auto">
         <el-input v-model="queryParams.title" :placeholder="$t('business.public.commonNotify.inputTitle')" clearable
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>

src/views/business/creditRule/index.vue

@@ -1,25 +1,25 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('business.credit.creditRule.ruleName')" prop="ruleName">
+      <el-form-item :label="$t('business.credit.creditRule.ruleName')" prop="ruleName" label-width="auto">
         <el-input v-model="queryParams.ruleName" :placeholder="$t('business.credit.creditRule.placeholder.ruleName')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.credit.creditRule.effectiveDate')" prop="effectiveDate">
+      <el-form-item :label="$t('business.credit.creditRule.effectiveDate')" prop="effectiveDate" label-width="auto">
         <el-date-picker clearable v-model="queryParams.effectiveDate" type="date" value-format="yyyy-MM-dd"
           :placeholder="$t('business.credit.creditRule.placeholder.effectiveDate')">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('business.credit.creditRule.expirationDate')" prop="expirationDate">
+      <el-form-item :label="$t('business.credit.creditRule.expirationDate')" prop="expirationDate" label-width="auto">
         <el-date-picker clearable v-model="queryParams.expirationDate" type="date" value-format="yyyy-MM-dd"
           :placeholder="$t('business.credit.creditRule.placeholder.expirationDate')">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('business.credit.creditRule.priority')" prop="priority">
+      <el-form-item :label="$t('business.credit.creditRule.priority')" prop="priority" label-width="auto">
         <el-input v-model="queryParams.priority" :placeholder="$t('business.credit.creditRule.placeholder.priority')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.credit.creditRule.applicableUserType')" prop="applicableUserType">
+      <el-form-item :label="$t('business.credit.creditRule.applicableUserType')" prop="applicableUserType" label-width="auto">
         <el-input v-model="queryParams.applicableUserType"
           :placeholder="$t('business.credit.creditRule.placeholder.applicableUserType')" clearable
           @keyup.enter.native="handleQuery" />
@@ -28,14 +28,14 @@
         <el-input v-model="queryParams.scene" :placeholder="$t('business.credit.creditRule.placeholder.scene')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
-      <el-form-item :label="$t('business.credit.creditRule.isEnabled')" prop="isEnabled">
+      <el-form-item :label="$t('business.credit.creditRule.isEnabled')" prop="isEnabled" label-width="auto">
         <el-select v-model="queryParams.isEnabled" :placeholder="$t('business.credit.creditRule.placeholder.isEnabled')"
           clearable>
           <el-option :label="$t('common.dict.yes')" value="1" />
           <el-option :label="$t('common.dict.no')" value="0" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.credit.creditRule.feedbackDirection')" prop="feedbackDirection">
+      <el-form-item :label="$t('business.credit.creditRule.feedbackDirection')" prop="feedbackDirection" label-width="auto">
         <el-select v-model="queryParams.feedbackDirection"
           :placeholder="$t('business.credit.creditRule.placeholder.feedbackDirection')" clearable>
           <el-option :label="$t('business.credit.creditRule.placeholder.positive')" value="1" />

src/views/business/dealPayment/index.vue

@@ -1,30 +1,30 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('business.order.dealPayment.payerId')" prop="payerId">
+      <el-form-item :label="$t('business.order.dealPayment.payerId')" prop="payerId" label-width="auto">
         <el-input v-model="queryParams.payerId" :placeholder="$t('business.order.dealPayment.placeholder.payerId')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealPayment.payerAccountName')" prop="payerAccountName">
+      <el-form-item :label="$t('business.order.dealPayment.payerAccountName')" prop="payerAccountName" label-width="auto">
         <el-input v-model="queryParams.payerAccountName"
           :placeholder="$t('business.order.dealPayment.placeholder.payerAccountName')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealPayment.payeeId')" prop="payeeId">
+      <el-form-item :label="$t('business.order.dealPayment.payeeId')" prop="payeeId" label-width="auto">
         <el-input v-model="queryParams.payeeId" :placeholder="$t('business.order.dealPayment.placeholder.payeeId')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealPayment.payeeAccountName')" prop="payeeAccountName">
+      <el-form-item :label="$t('business.order.dealPayment.payeeAccountName')" prop="payeeAccountName" label-width="auto">
         <el-input v-model="queryParams.payeeAccountName"
           :placeholder="$t('business.order.dealPayment.placeholder.payeeAccountName')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealPayment.paymentMethod')" prop="paymentMethod">
+      <el-form-item :label="$t('business.order.dealPayment.paymentMethod')" prop="paymentMethod" label-width="auto">
         <el-input v-model="queryParams.paymentMethod"
           :placeholder="$t('business.order.dealPayment.placeholder.paymentMethod')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealPayment.billCode')" prop="billCode">
+      <el-form-item :label="$t('business.order.dealPayment.billCode')" prop="billCode" label-width="auto">
         <el-input v-model="queryParams.billCode" :placeholder="$t('business.order.dealPayment.placeholder.billCode')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>

src/views/business/dealProxy/index.vue

@@ -1,22 +1,22 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('business.order.dealProxy.proxyPayerId')" prop="proxyPayerId">
+      <el-form-item :label="$t('business.order.dealProxy.proxyPayerId')" prop="proxyPayerId" label-width="auto">
         <el-input v-model="queryParams.proxyPayerId"
           :placeholder="$t('business.order.dealProxy.proxyPayerIdPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealProxy.proxyPayerAccountName')" prop="proxyPayerAccountName">
+      <el-form-item :label="$t('business.order.dealProxy.proxyPayerAccountName')" prop="proxyPayerAccountName" label-width="auto">
         <el-input v-model="queryParams.proxyPayerAccountName"
           :placeholder="$t('business.order.dealProxy.proxyPayerAccountNamePlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealProxy.proxyServiceAccount')" prop="proxyServiceAccount">
+      <el-form-item :label="$t('business.order.dealProxy.proxyServiceAccount')" prop="proxyServiceAccount" label-width="auto">
         <el-input v-model="queryParams.proxyServiceAccount"
           :placeholder="$t('business.order.dealProxy.proxyServiceAccountPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealProxy.paymentChannel')" prop="paymentChannel">
+      <el-form-item :label="$t('business.order.dealProxy.paymentChannel')" prop="paymentChannel" label-width="auto">
         <el-input v-model="queryParams.paymentChannel"
           :placeholder="$t('business.order.dealProxy.paymentChannelPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />

src/views/business/dealReceipt/index.vue

@@ -1,30 +1,30 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('business.order.dealReceipt.payerId')" prop="payerId">
+      <el-form-item :label="$t('business.order.dealReceipt.payerId')" prop="payerId" label-width="auto">
         <el-input v-model="queryParams.payerId" :placeholder="$t('business.order.dealReceipt.payerIdPlaceholder')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealReceipt.payerAccountName')" prop="payerAccountName">
+      <el-form-item :label="$t('business.order.dealReceipt.payerAccountName')" prop="payerAccountName" label-width="auto">
         <el-input v-model="queryParams.payerAccountName"
           :placeholder="$t('business.order.dealReceipt.payerAccountNamePlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealReceipt.payeeId')" prop="payeeId">
+      <el-form-item :label="$t('business.order.dealReceipt.payeeId')" prop="payeeId" label-width="auto">
         <el-input v-model="queryParams.payeeId" :placeholder="$t('business.order.dealReceipt.payeeIdPlaceholder')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealReceipt.payeeAccountName')" prop="payeeAccountName">
+      <el-form-item :label="$t('business.order.dealReceipt.payeeAccountName')" prop="payeeAccountName" label-width="auto">
         <el-input v-model="queryParams.payeeAccountName"
           :placeholder="$t('business.order.dealReceipt.payeeAccountNamePlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealReceipt.paymentMethod')" prop="paymentMethod">
+      <el-form-item :label="$t('business.order.dealReceipt.paymentMethod')" prop="paymentMethod" label-width="auto">
         <el-input v-model="queryParams.paymentMethod"
           :placeholder="$t('business.order.dealReceipt.paymentMethodPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealReceipt.billCode')" prop="billCode">
+      <el-form-item :label="$t('business.order.dealReceipt.billCode')" prop="billCode" label-width="auto">
         <el-input v-model="queryParams.billCode" :placeholder="$t('business.order.dealReceipt.billCodePlaceholder')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>

src/views/business/dealRecharge/index.vue

@@ -1,27 +1,27 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('business.order.dealRecharge.rechargeId')" prop="rechargeUserId">
+      <el-form-item :label="$t('business.order.dealRecharge.rechargeId')" prop="rechargeUserId" label-width="auto">
         <el-input v-model="queryParams.rechargeUserId"
           :placeholder="$t('business.order.dealRecharge.enterRechargeUserId')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealRecharge.rechargeAccount')" prop="rechargeAccountName">
+      <el-form-item :label="$t('business.order.dealRecharge.rechargeAccount')" prop="rechargeAccountName" label-width="auto">
         <el-input v-model="queryParams.rechargeAccountName"
           :placeholder="$t('business.order.dealRecharge.enterRechargeAccount')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealRecharge.paymentMethod')" prop="paymentMethod">
+      <el-form-item :label="$t('business.order.dealRecharge.paymentMethod')" prop="paymentMethod" label-width="auto">
         <el-input v-model="queryParams.paymentMethod"
           :placeholder="$t('business.order.dealRecharge.enterPaymentMethod')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealRecharge.rechargeMethod')" prop="rechargeMethod">
+      <el-form-item :label="$t('business.order.dealRecharge.rechargeMethod')" prop="rechargeMethod" label-width="auto">
         <el-input v-model="queryParams.rechargeMethod"
           :placeholder="$t('business.order.dealRecharge.enterRechargeMethod')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealRecharge.billCode')" prop="billCode">
+      <el-form-item :label="$t('business.order.dealRecharge.billCode')" prop="billCode" label-width="auto">
         <el-input v-model="queryParams.billCode" :placeholder="$t('business.order.dealRecharge.enterBillCode')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>

src/views/business/dealTransfer/index.vue

@@ -1,30 +1,30 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.order.dealTransfer.senderId')" prop="senderId">
+      <el-form-item :label="$t('business.order.dealTransfer.senderId')" prop="senderId" label-width="auto">
         <el-input v-model="queryParams.senderId" :placeholder="$t('business.order.dealTransfer.enterSenderId')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealTransfer.senderAccountName')" prop="senderAccountName">
+      <el-form-item :label="$t('business.order.dealTransfer.senderAccountName')" prop="senderAccountName" label-width="auto">
         <el-input v-model="queryParams.senderAccountName"
           :placeholder="$t('business.order.dealTransfer.enterSenderAccount')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealTransfer.receiverId')" prop="receiverId">
+      <el-form-item :label="$t('business.order.dealTransfer.receiverId')" prop="receiverId" label-width="auto">
         <el-input v-model="queryParams.receiverId" :placeholder="$t('business.order.dealTransfer.enterReceiverId')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealTransfer.receiverAccountName')" prop="receiverAccountName">
+      <el-form-item :label="$t('business.order.dealTransfer.receiverAccountName')" prop="receiverAccountName" label-width="auto">
         <el-input v-model="queryParams.receiverAccountName"
           :placeholder="$t('business.order.dealTransfer.enterReceiverAccount')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealTransfer.paymentMethod')" prop="paymentMethod">
+      <el-form-item :label="$t('business.order.dealTransfer.paymentMethod')" prop="paymentMethod" label-width="auto">
         <el-input v-model="queryParams.paymentMethod"
           :placeholder="$t('business.order.dealTransfer.enterPaymentMethod')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealTransfer.billCode')" prop="billCode">
+      <el-form-item :label="$t('business.order.dealTransfer.billCode')" prop="billCode" label-width="auto">
         <el-input v-model="queryParams.billCode" :placeholder="$t('business.order.dealTransfer.enterBillCode')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>

src/views/business/dealWithdrawal/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('business.order.dealWithdrawal.withdrawalUserIdLabel')" prop="withdrawalUserId">
+      <el-form-item :label="$t('business.order.dealWithdrawal.withdrawalUserIdLabel')" prop="withdrawalUserId" label-width="auto">
         <el-input v-model="queryParams.withdrawalUserId"
           :placeholder="$t('business.order.dealWithdrawal.withdrawalUserIdPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('business.order.dealWithdrawal.withdrawalAccountNameLabel')"
-        prop="withdrawalAccountName">
+        prop="withdrawalAccountName" label-width="auto">
         <el-input v-model="queryParams.withdrawalAccountName"
           :placeholder="$t('business.order.dealWithdrawal.withdrawalAccountNamePlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.order.dealWithdrawal.billCodeLabel')" prop="billCode">
+      <el-form-item :label="$t('business.order.dealWithdrawal.billCodeLabel')" prop="billCode" label-width="auto">
         <el-input v-model="queryParams.billCode" :placeholder="$t('business.order.dealWithdrawal.billCodePlaceholder')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>

src/views/business/faq/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.customerSupport.faq.questionDesc')" prop="question">
+      <el-form-item :label="$t('business.customerSupport.faq.questionDesc')" prop="question" label-width="auto">
         <el-input
           v-model="queryParams.question"
           :placeholder="$t('business.customerSupport.faq.enterQuestionDesc')"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.customerSupport.faq.answerContent')" prop="answer">
+      <el-form-item :label="$t('business.customerSupport.faq.answerContent')" prop="answer" label-width="auto">
         <el-input
           v-model="queryParams.answer"
           :placeholder="$t('business.customerSupport.faq.enterAnswerContent')"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.customerSupport.faq.category')" prop="category">
+      <el-form-item :label="$t('business.customerSupport.faq.category')" prop="category" label-width="auto">
         <!--        下拉框-->
         <el-select v-model="queryParams.category" :placeholder="$t('business.customerSupport.faq.selectCategory')" clearable>
           <el-option
@@ -28,7 +28,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.customerSupport.faq.status')" prop="status">
+      <el-form-item :label="$t('business.customerSupport.faq.status')" prop="status" label-width="auto">
         <!-- 下拉框 -->
         <el-select v-model="queryParams.status" :placeholder="$t('business.customerSupport.faq.selectStatus')" clearable>
           <el-option

src/views/business/feeRecord/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
-      <el-form-item :label="$t('business.deal.feeRecord.userId')" prop="userId">
+      <el-form-item :label="$t('business.deal.feeRecord.userId')" prop="userId" label-width="auto">
         <el-input v-model="queryParams.userId" :placeholder="$t('business.deal.feeRecord.userIdPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.deal.feeRecord.relatedOrderId')" prop="relatedOrderId">
+      <el-form-item :label="$t('business.deal.feeRecord.relatedOrderId')" prop="relatedOrderId" label-width="auto">
         <el-input v-model="queryParams.relatedOrderId"
           :placeholder="$t('business.deal.feeRecord.relatedOrderIdPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
@@ -15,7 +15,7 @@
           :placeholder="$t('business.deal.feeRecord.feeStandardIdPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
-      <el-form-item :label="$t('business.deal.feeRecord.businessType')" prop="businessType">
+      <el-form-item :label="$t('business.deal.feeRecord.businessType')" prop="businessType" label-width="auto">
         <el-select v-model="queryParams.businessType"
           :placeholder="$t('business.deal.feeRecord.businessTypePlaceholder')" clearable>
           <el-option v-for="dict in dict.businessTypeOptions" :key="dict.value" :label="dict.label"
@@ -23,14 +23,14 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('business.deal.feeRecord.status')" prop="status">
+      <el-form-item :label="$t('business.deal.feeRecord.status')" prop="status" label-width="auto">
         <el-select v-model="queryParams.status" :placeholder="$t('business.deal.feeRecord.statusPlaceholder')"
           clearable>
           <el-option :label="$t('common.dict.enabled')" value="1" />
           <el-option :label="$t('common.dict.disabled')" value="0" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.deal.feeRecord.feeCollectionTime')" prop="feeCollectionTime">
+      <el-form-item :label="$t('business.deal.feeRecord.feeCollectionTime')" prop="feeCollectionTime" label-width="auto">
         <el-date-picker clearable v-model="queryParams.feeCollectionTime" type="date" value-format="yyyy-MM-dd"
           :placeholder="$t('business.deal.feeRecord.feeCollectionTimePlaceholder')">
         </el-date-picker>

src/views/business/feeStandard/index.vue

@@ -1,20 +1,20 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.deal.feeConfig.feeStandard.businessType')" prop="businessType">
+      <el-form-item :label="$t('business.deal.feeConfig.feeStandard.businessType')" prop="businessType" label-width="auto">
         <el-select v-model="queryParams.businessType"
           :placeholder="$t('business.deal.feeConfig.feeStandard.placeholder.businessType')" clearable>
           <el-option v-for="item in dict.businessTypeOptions" :key="item.value" :label="item.label"
             :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.deal.feeConfig.feeStandard.userLevel')" prop="userLevel">
+      <el-form-item :label="$t('business.deal.feeConfig.feeStandard.userLevel')" prop="userLevel" label-width="auto">
         <el-select v-model="queryParams.userLevel"
           :placeholder="$t('business.deal.feeConfig.feeStandard.placeholder.userLevel')" clearable>
           <el-option v-for="item in dict.userLevelOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.deal.feeConfig.feeStandard.feeType')" prop="feeType">
+      <el-form-item :label="$t('business.deal.feeConfig.feeStandard.feeType')" prop="feeType" label-width="auto">
         <el-select v-model="queryParams.feeType"
           :placeholder="$t('business.deal.feeConfig.feeStandard.placeholder.feeType')" clearable>
           <el-option v-for="item in dict.feeTypeOptions" :key="item.value" :label="item.label" :value="item.value" />

src/views/business/financialRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.financial.financialRecord.userIdLabel')" prop="userId">
+      <el-form-item :label="$t('business.financial.financialRecord.userIdLabel')" prop="userId" label-width="auto">
         <el-input
           v-model="queryParams.userId"
           :placeholder="$t('business.financial.financialRecord.inputUserId')"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.financialRecord.orderIdLabel')" prop="orderId">
+      <el-form-item :label="$t('business.financial.financialRecord.orderIdLabel')" prop="orderId" label-width="auto">
         <el-input
           v-model="queryParams.orderId"
           :placeholder="$t('business.financial.financialRecord.inputOrderId')"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.financialRecord.amountLabel')" prop="amount">
+      <el-form-item :label="$t('business.financial.financialRecord.amountLabel')" prop="amount" label-width="auto">
         <el-input
           v-model="queryParams.amount"
           :placeholder="$t('business.financial.financialRecord.inputAmount')"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.financialRecord.currencyLabel')" prop="currency">
+      <el-form-item :label="$t('business.financial.financialRecord.currencyLabel')" prop="currency" label-width="auto">
         <el-input
           v-model="queryParams.currency"
           :placeholder="$t('business.financial.financialRecord.inputCurrency')"
@@ -33,7 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.financialRecord.descriptionLabel')" prop="description">
+      <el-form-item :label="$t('business.financial.financialRecord.descriptionLabel')" prop="description" label-width="auto">
         <el-input
           v-model="queryParams.description"
           :placeholder="$t('business.financial.financialRecord.inputDescription')"
@@ -41,7 +41,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item  :label="$t('business.financial.financialRecord.transactionDate')" prop="transactionDate">
+      <el-form-item  :label="$t('business.financial.financialRecord.transactionDate')" prop="transactionDate" label-width="auto">
         <el-date-picker clearable
           v-model="queryParams.transactionDate"
           type="date"

src/views/business/merchantVerification/index.vue

@@ -1,157 +1,288 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="68px">
       <el-form-item :label="$t('business.merchant.merchantVerification.account')" prop="account">
-        <el-input
-          v-model="queryParams.account"
-          :placeholder="$t('business.merchant.merchantVerification.accountPlaceholder')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('business.merchant.merchantVerification.merchantName')" prop="merchantName">
-        <el-input
-          v-model="queryParams.merchantName"
-          :placeholder="$t('business.merchant.merchantVerification.merchantNamePlaceholder')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('business.merchant.merchantVerification.legalPersonIdCard')" prop="legalPersonIdCard">
-        <el-input
-          v-model="queryParams.legalPersonIdCard"
-          :placeholder="$t('business.merchant.merchantVerification.legalPersonIdCardPlaceholder')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.account"
+          :placeholder="$t('business.merchant.merchantVerification.accountPlaceholder')" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item :label="$t('business.merchant.merchantVerification.merchantName')" prop="merchantName"
+        label-width="auto">
+        <el-input v-model="queryParams.merchantName"
+          :placeholder="$t('business.merchant.merchantVerification.merchantNamePlaceholder')" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item :label="$t('business.merchant.merchantVerification.legalPersonIdCard')" prop="legalPersonIdCard"
+        label-width="auto">
+        <el-input v-model="queryParams.legalPersonIdCard"
+          :placeholder="$t('business.merchant.merchantVerification.legalPersonIdCardPlaceholder')" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini"
+          @click="handleQuery">{{ $t('common.button.search') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['business:merchantVerification:export']"
-        >{{ $t('common.button.export') }}</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['business:merchantVerification:export']">{{ $t('common.button.export') }}</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </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.merchant.merchantVerification.userAccount')" align="center" prop="userAccount"/>
-      <el-table-column :label="$t('business.merchant.merchantVerification.merchantInfoName')" align="center" prop="merchantInfoName"/>
-      <el-table-column :label="$t('business.merchant.merchantVerification.businessLicenseNumber')" align="center" prop="businessLicenseNumber"/>
-      <el-table-column :label="$t('business.merchant.merchantVerification.legalPersonInfoName')" align="center" prop="legalPersonInfoName"/>
-      <el-table-column :label="$t('business.merchant.merchantVerification.legalPersonIdCard')" align="center" prop="legalPersonIdCard"/>
+      <el-table-column :label="$t('business.merchant.merchantVerification.userAccount')" align="center"
+        prop="userAccount" />
+      <el-table-column :label="$t('business.merchant.merchantVerification.merchantName')" align="center"
+        prop="merchantInfoName" />
+      <el-table-column :label="$t('business.merchant.merchantVerification.certificateExpirationDate')" align="center"
+        prop="legalPersonExpirationTime" />
       <el-table-column :label="$t('business.merchant.merchantVerification.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.merchant.merchantVerification.statusOption.unverified') }}</el-tag>
-          <el-tag type="warning" v-if="scope.row.status == '1'">{{ $t('business.merchant.merchantVerification.statusOption.pendingReview') }}</el-tag>
-          <el-tag type="success" v-if="scope.row.status == '2'">{{ $t('business.merchant.merchantVerification.statusOption.verified') }}</el-tag>
-          <el-tag type="danger" v-if="scope.row.status == '3'">{{ $t('business.merchant.merchantVerification.statusOption.verificationFailed') }}</el-tag>
+          <el-tag type="primary"
+            v-if="scope.row.status == '0'  || scope.row.status == null">{{ $t('business.merchant.merchantVerification.statusOption.unverified') }}</el-tag>
+          <el-tag type="warning"
+            v-if="scope.row.status == '1'">{{ $t('business.merchant.merchantVerification.statusOption.pendingReview') }}</el-tag>
+          <el-tag type="success"
+            v-if="scope.row.status == '2'">{{ $t('business.merchant.merchantVerification.statusOption.verified') }}</el-tag>
+          <el-tag type="danger"
+            v-if="scope.row.status == '3'">{{ $t('business.merchant.merchantVerification.statusOption.verificationFailed') }}</el-tag>
         </template>
       </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.merchantVerification.failureReason')" align="center" prop="failureReason"/>
-      <el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200" class-name="small-padding fixed-width">
+      <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"
+        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)"
-                     size="mini"
-                     type="text"
-                     icon="el-icon-document-add"
-                     @click="handleAdd(scope.row)"
-          >{{ $t('business.merchant.merchantVerification.authenticate') }}</el-button>
-          <el-button v-if="(scope.row.status == 2)"
-                     size="mini"
-                     type="text"
-                     icon="el-icon-view"
-                     @click="handleDetail(scope.row)"
-          >{{ $t('common.button.detail') }}</el-button>
-          <el-button v-if="(scope.row.status == 1)"
-                     size="mini"
-                     type="text"
-                     icon="el-icon-view"
-                     @click="handleAudit(scope.row)"
-          >{{ $t('business.merchant.merchantVerification.audit') }}</el-button>
+          <el-button v-if="(scope.row.status == null || scope.row.status == 0 || scope.row.status == 3)" size="mini"
+            type="text" icon="el-icon-document-add"
+            @click="handleAdd(scope.row)">{{ $t('business.merchant.merchantVerification.authenticate') }}</el-button>
+          <el-button v-if="(scope.row.status == 2)" size="mini" type="text" icon="el-icon-view"
+            @click="handleDetail(scope.row)">{{ $t('common.button.detail') }}</el-button>
+          <el-button v-if="(scope.row.status == 1)" size="mini" type="text" icon="el-icon-view"
+            @click="handleAudit(scope.row)">{{ $t('business.merchant.merchantVerification.audit') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-if="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改商户认证信息对话框 -->
     <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.merchant.merchantVerification.merchantName')" prop="merchantName">
-          <el-input v-model="form.merchantName" :placeholder="$t('business.merchant.merchantVerification.merchantNamePlaceholder')"/>
-        </el-form-item>
-        <el-form-item :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 :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 :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 :label="$t('business.userManager.userVerification.idCardFront')" prop="legalPersonIdCardFrontImagePath">
-          <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="legalPersonIdCardFrontImagePath">
+        <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="legalPersonIdCardBackImagePath">
+          <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="legalPersonUserWithIdCardImagePath">
+          <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>
+        <!-------------------------------------------------------------有无营业执照分割线------------------------------------------------------------------->
+        <!--  无营业执照的认证方式：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.idCardBack')" prop="legalPersonIdCardBackImagePath">
-          <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-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.userManager.userVerification.idCardHolding')" prop="legalPersonUserWithIdCardImagePath">
-          <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.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 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>
       <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>
@@ -159,40 +290,107 @@
     <!--  认证审核  -->
     <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.merchant.merchantVerification.registeredMerchantName') + '：'">
-          {{auditForm.merchantInfoName}}
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.merchantVerification.authenticatedMerchantName') + '：'">
+        <el-form-item :label="$t('business.merchant.merchantVerification.merchantName') + '：'">
           {{auditForm.merchantName}}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.merchantVerification.registeredLegalPersonName') + '：'">
-          {{auditForm.legalPersonInfoName}}
+        <el-form-item v-if="auditForm.hasLicense ==1" :label="$t('business.merchant.merchantVerification.businessLicense') + '：'">
+          {{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 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 :label="$t('business.merchant.merchantVerification.authenticatedLegalPersonName') + '：'">
+    <!--    有营业执照的法人审核信息    -->
+        <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.merchant.merchantVerification.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 :label="$t('business.merchant.merchantVerification.businessLicense') + '：'">
-          {{auditForm.businessLicenseNumber}}
+        <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.hasLicense == '1'" :label="$t('business.merchant.merchantVerification.legalPersonIdCard') + '：'">
+          {{auditForm.legalPersonIdCard}}
+        </el-form-item>
+        <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.hasLicense == '1'" :label="$t('business.userManager.userVerification.certificateEndDate') + '：'">
+          {{auditForm.legalPersonExpirationTime}}
+        </el-form-item>
+        <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 :label="$t('business.userManager.userVerification.idCardFront')">
-          <el-image style="width: 90px; height: 30px" :src="auditForm.legalPersonIdCardFrontImagePath" :preview-src-list="[auditForm.legalPersonIdCardFrontImagePath]"/>
+        <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 :label="$t('business.userManager.userVerification.idCardBack')">
-          <el-image style="width: 90px; height: 30px" :src="auditForm.legalPersonIdCardBackImagePath" :preview-src-list="[auditForm.legalPersonIdCardBackImagePath]"/>
+        <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]" />
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.idCardHolding')">
-          <el-image style="width: 90px; height: 30px" :src="auditForm.legalPersonUserWithIdCardImagePath" :preview-src-list="[auditForm.legalPersonUserWithIdCardImagePath]"/>
+    <!--    无营业执照的店主审核信息    -->
+        <el-form-item v-if="auditForm.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperName') + '：'">
+          {{auditForm.shopkeeperName}}
         </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 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 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.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">
-        <el-button :loading="buttonLoading" type="success" @click="submitPass">{{ $t('business.merchant.merchantVerification.pass') }}</el-button>
-        <el-button :loading="buttonLoading" type="danger" @click="submitRefuse">{{ $t('business.merchant.merchantVerification.reject') }}</el-button>
+        <el-button :loading="buttonLoading" type="success"
+          @click="submitPass">{{ $t('business.merchant.merchantVerification.pass') }}</el-button>
+        <el-button :loading="buttonLoading" type="danger"
+          @click="submitRefuse">{{ $t('business.merchant.merchantVerification.reject') }}</el-button>
         <el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button>
       </div>
     </el-dialog>
@@ -203,25 +401,95 @@
         <el-form-item :label="$t('business.merchant.merchantVerification.merchantName') + '：'">
           {{form.merchantName}}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.merchantVerification.businessLicenseNumber') + '：'">
+        <el-form-item v-if="form.hasLicense ==1" :label="$t('business.merchant.merchantVerification.businessLicense') + '：'">
           {{form.businessLicenseNumber}}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.merchantVerification.legalPersonName') + '：'">
+        <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 :label="$t('business.merchant.merchantVerification.legalPersonIdCard') + '：'">
+        <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.userManager.userVerification.idCardFront') + '：'">
-          <el-image style="width: 90px; height: 30px" :src="form.legalPersonIdCardFrontImagePath" :preview-src-list="[form.legalPersonIdCardFrontImagePath]"/>
+        <el-form-item v-if="form.hasLicense == '1'" :label="$t('business.userManager.userVerification.certificateStartDate') + '：'">
+          {{form.legalPersonDateOfIssue}}
+        </el-form-item>
+        <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.hasLicense == '1'" :label="$t('business.merchant.userInfoBus.operatingAddress') + '：'">
+          {{form.operateAddressShow}}
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.idCardBack') + '：'">
-          <el-image style="width: 90px; height: 30px" :src="form.legalPersonIdCardBackImagePath" :preview-src-list="[form.legalPersonIdCardBackImagePath]"/>
+        <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 :label="$t('business.userManager.userVerification.idCardHolding') + '：'">
-          <el-image style="width: 90px; height: 30px" :src="form.legalPersonUserWithIdCardImagePath" :preview-src-list="[form.legalPersonUserWithIdCardImagePath]"/>
+        <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 :label="$t('business.merchant.merchantVerification.authenticationDate') + '：'" prop="authenticationDate">
+        <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]" />
+        </el-form-item>
+        <!--    无营业执照的店主审核信息详情    -->
+        <el-form-item v-if="form.hasLicense == '0'" :label="$t('business.merchant.merchantVerification.shopKeeperName') + '：'">
+          {{form.shopkeeperName}}
+        </el-form-item>
+        <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 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.merchant.merchantVerification.authenticationDate') + '：'"
+                      prop="authenticationDate">
           {{ form.authenticationDate }}
         </el-form-item>
       </el-form>
@@ -241,6 +509,7 @@ import {
     updateMerchantVerification,
     merchantAudit
   } from "@/api/business/merchantVerification";
+  import {getAddress} from "@/api/business/userVerification";
 
   export default {
     name: "MerchantVerification",
@@ -291,38 +560,138 @@ export default {
         },
         // 表单参数
         form: {},
+        //地址选择列表
+        options_addr:[],
         //审核参数
         auditForm: {},
         // 上传文件列表
         fileList: [],
         // 表单校验
         rules: {
-        merchantName: [
-          { required: true, message: this.$t('business.merchant.merchantVerification.merchantNameRequired'), trigger: "blur" }
-        ],
-        legalPersonName: [
-          { required: true, message: this.$t('business.merchant.merchantVerification.legalPersonNameRequired'), trigger: "blur" }
-        ],
-        legalPersonIdCardFrontImagePath: [
-          { required: true, message: this.$t('business.userManager.userVerification.idCardFrontRequired'), trigger: "blur" }
-        ],
-        legalPersonIdCardBackImagePath: [
-          { required: true, message: this.$t('business.userManager.userVerification.idCardBackRequired'), trigger: "blur" }
-        ],
-        legalPersonUserWithIdCardImagePath: [
-          { required: true, message: this.$t('business.userManager.userVerification.idCardHoldingRequired'), trigger: "blur" }
-        ],
-        legalPersonIdCard: [
-          { required: true,pattern: /^\d+$/, message: this.$t('business.merchant.merchantVerification.legalPersonIdCardPattern'), trigger: "blur" }
-        ],
-        failureReason: [
-          {  }
-        ],
+          legalPersonName: [{
+            required: true,
+            message: this.$t('business.merchant.merchantVerification.legalPersonNameRequired'),
+            trigger: "blur"
+          }],
+          legalPersonIdCardFrontImagePath: [{
+            required: true,
+            message: this.$t('business.userManager.userVerification.idCardFrontRequired'),
+            trigger: "blur"
+          }],
+          legalPersonIdCardBackImagePath: [{
+            required: true,
+            message: this.$t('business.userManager.userVerification.idCardBackRequired'),
+            trigger: "blur"
+          }],
+          legalPersonUserWithIdCardImagePath: [{
+            required: true,
+            message: this.$t('business.userManager.userVerification.idCardHoldingRequired'),
+            trigger: "blur"
+          }],
+          passportImagePath: [{
+            required: true,
+            message: this.$t('business.userManager.userVerification.passportRequired'),
+            trigger: "blur"
+          }],
+          legalPersonIdCard: [{
+            required: true,
+            pattern: /^\d+$/,
+            message: this.$t('business.merchant.merchantVerification.legalPersonIdCardPattern'),
+            trigger: "blur"
+          }],
+          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"
+          }],
+          shopkeeperName: [{
+            required: true,
+            message: this.$t('business.merchant.merchantVerification.shopKeeperNamePlaceholder'),
+            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"
+          }],
+          shopkeeperIdCard: [{
+            required: true,
+            pattern: /^\d+$/,
+            message: this.$t('business.merchant.merchantVerification.shopKeeperIdCardPlaceholder'),
+            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
@@ -337,6 +706,12 @@ export default {
       /** 查询商户认证信息列表 */
       getList() {
         this.loading = true;
+        const languageMap = {
+          'zh': 1,
+          'en': 2,
+          'la': 3
+        };
+        this.queryParams.language = languageMap[this.$i18n.locale] || null;
         listMerchantVerification(this.queryParams).then(response => {
           this.merchantVerificationList = response.rows;
           this.total = response.total;
@@ -374,7 +749,9 @@ export default {
           updateTime: undefined,
           createBy: undefined,
           updateBy: undefined,
-        delFlag: undefined
+          delFlag: undefined,
+          hasLicense: 1,
+          licenseType: 1
         };
         this.resetForm("form");
       },
@@ -399,13 +776,42 @@ export default {
         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 {
           this.form.userId = row.userId;
+          this.form.merchantName = row.merchantInfoName;
           this.open = true;
           this.title = this.$t('business.merchant.merchantVerification.authenticateTitle');
         }
@@ -440,6 +846,7 @@ export default {
       submitForm() {
         this.$refs["form"].validate(valid => {
           if (valid) {
+            this.form.operateAddress = this.form.operateAddress + "," + this.form.operateAddressDetail;
             this.buttonLoading = true;
             if (this.form.id != null) {
               updateMerchantVerification(this.form).then(response => {
@@ -464,15 +871,16 @@ export default {
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-      this.$modal.confirm(this.$t('business.merchant.merchantVerification.deleteConfirm', { ids: ids })).then(() => {
+        this.$modal.confirm(this.$t('business.merchant.merchantVerification.deleteConfirm', {
+          ids: ids
+        })).then(() => {
           this.loading = true;
           return delMerchantVerification(ids);
         }).then(() => {
           this.loading = false;
           this.getList();
           this.$modal.msgSuccess(this.$t('business.merchant.merchantVerification.deleteSuccess'));
-      }).catch(() => {
-      }).finally(() => {
+        }).catch(() => {}).finally(() => {
           this.loading = false;
         });
       },
@@ -484,12 +892,16 @@ export default {
       },
       /** 审核拒绝*/
       submitRefuse() {
-      this.rules.failureReason = [
-              { required: true, message: this.$t('business.merchant.merchantVerification.failureReasonRequired'), trigger: 'blur' }
-            ];
+        this.rules.failureReason = [{
+          required: true,
+          message: this.$t('business.merchant.merchantVerification.failureReasonRequired'),
+          trigger: 'blur'
+        }];
         this.$refs["auditForm"].validate(valid => {
           if (valid) {
-          this.$modal.confirm(this.$t('business.merchant.merchantVerification.rejectConfirm', { merchantName: this.auditForm.merchantName })).then(() => {
+            this.$modal.confirm(this.$t('business.merchant.merchantVerification.rejectConfirm', {
+              merchantName: this.auditForm.merchantName
+            })).then(() => {
               this.buttonLoading = true;
               this.auditForm.status = "3";
               merchantAudit(this.auditForm).then(response => {
@@ -508,7 +920,9 @@ export default {
         this.buttonLoading = true;
         this.auditForm.status = "2";
         this.$refs["auditForm"].clearValidate("failureReason");
-      this.$modal.confirm(this.$t('business.merchant.merchantVerification.passConfirm', { merchantName: this.auditForm.merchantName })).then(() => {
+        this.$modal.confirm(this.$t('business.merchant.merchantVerification.passConfirm', {
+          merchantName: this.auditForm.merchantName
+        })).then(() => {
           merchantAudit(this.auditForm).then(response => {
             this.$modal.msgSuccess(this.$t('business.merchant.merchantVerification.auditResultPass'));
             this.auditOpen = false;
@@ -518,24 +932,76 @@ export default {
           });
         })
       },
-    //身份证正面上传成功
+      //身份证正面上传成功-法人
       handleSuccess_idCardFrontImagePath(response) {
         if (response.code === 200) {
           this.form.legalPersonIdCardFrontImagePath = this.getImgUrl + response.data; // 保存 URL 到表单
         }
       },
-    //身份证反面上传成功
+      //身份证反面上传成功-法人
       handleSuccess_idCardBackImagePath(response) {
         if (response.code === 200) {
           this.form.legalPersonIdCardBackImagePath = this.getImgUrl + response.data; // 保存 URL 到表单
         }
       },
-    //身份证手持上传成功
+      //身份证手持上传成功-法人
       handleSuccess_userWithIdCardImagePath(response) {
         if (response.code === 200) {
           this.form.legalPersonUserWithIdCardImagePath = 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 到表单
+        }
+      },
+      /** 获取地址列表 */
+      getAddress() {
+        this.loading = true;
+        getAddress(this.$i18n.locale).then(response => {
+          this.options_addr = response.data;
+        });
+      },
+      /** 地址联动事件 **/
+      handleChange(value) {
+        this.form.operateAddress = value;
+      },
     }
   };
 </script>

src/views/business/recordPayCallback/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.userId')" prop="userId">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.userId')" prop="userId" label-width="auto">
         <el-input
           v-model="queryParams.userId"
           :placeholder="$t('business.financial.transactionFlow.recordPayCallback.inputUserId')"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.orderNumber')" prop="relatedOrderId">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.orderNumber')" prop="relatedOrderId" label-width="auto">
         <el-input
           v-model="queryParams.relatedOrderId"
           :placeholder="$t('business.financial.transactionFlow.recordPayCallback.inputOrderId')"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.platformName')" prop="thirdPartyPlatform">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.platformName')" prop="thirdPartyPlatform" label-width="auto">
         <el-input
           v-model="queryParams.thirdPartyPlatform"
           :placeholder="$t('business.financial.transactionFlow.recordPayCallback.inputPlatformName')"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.processingStatus')" prop="processingStatus">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.processingStatus')" prop="processingStatus" label-width="auto">
         <el-select v-model="queryParams.processingStatus" :placeholder="$t('business.financial.transactionFlow.recordPayCallback.selectProcessingStatus')" clearable>
           <el-option
             v-for="dict in processingStatusOptions"
@@ -35,7 +35,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.transactionStatus')" prop="transactionStatus">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.transactionStatus')" prop="transactionStatus" label-width="auto">
         <el-select v-model="queryParams.transactionStatus" :placeholder="$t('business.financial.transactionFlow.recordPayCallback.selectTransactionStatus')" clearable>
           <el-option
             v-for="dict in transactionStatusOptions"
@@ -45,7 +45,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.channelNumber')" prop="paymentChannelNo">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.channelNumber')" prop="paymentChannelNo" label-width="auto">
         <el-input
           v-model="queryParams.paymentChannelNo"
           :placeholder="$t('business.financial.transactionFlow.recordPayCallback.inputPaymentChannelNo')"
@@ -53,7 +53,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.receiptTime')" prop="receiptTime">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordPayCallback.receiptTime')" prop="receiptTime" label-width="auto">
         <el-date-picker clearable
                         v-model="queryParams.receiptTime"
                         type="date"
@@ -62,9 +62,8 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{
-            $t('common.button.search')
-          }}
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">
+          {{ $t('common.button.search') }}
         </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button>
       </el-form-item>
@@ -147,7 +146,7 @@
           <span>{{ parseTime(scope.row.receiptTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('business.financial.transactionFlow.recordPayCallback.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">
           <el-button
             size="mini"
@@ -538,13 +537,13 @@ export default {
     formatTransactionStatus(status) {
       switch (Number(status)) {
         case 1:
-          return this.$t('business.financial.transactionFlow.recordPayCallback.transactionStatus.paidSuccess')
+          return this.$t('business.financial.transactionFlow.recordPayCallback.transactionStatusOption.paidSuccess')
         case 2:
-          return this.$t('business.financial.transactionFlow.recordPayCallback.transactionStatus.processing')
+          return this.$t('business.financial.transactionFlow.recordPayCallback.transactionStatusOption.processing')
         case 3:
-          return this.$t('business.financial.transactionFlow.recordPayCallback.transactionStatus.failed')
+          return this.$t('business.financial.transactionFlow.recordPayCallback.transactionStatusOption.failed')
         case 4:
-          return this.$t('business.financial.transactionFlow.recordPayCallback.transactionStatus.refunded')
+          return this.$t('business.financial.transactionFlow.recordPayCallback.transactionStatusOption.refunded')
         default:
           return status
       }

src/views/business/recordTransaction/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.financial.transactionFlow.recordTransaction.senderId')" prop="senderId">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordTransaction.senderId')" prop="senderId" label-width="auto">
         <el-input
           v-model="queryParams.senderId"
           :placeholder="$t('business.financial.transactionFlow.recordTransaction.inputSenderId')"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.transactionFlow.recordTransaction.senderAccount')" prop="senderAccount">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordTransaction.senderAccount')" prop="senderAccount" label-width="auto">
         <el-input
           v-model="queryParams.senderAccount"
           :placeholder="$t('business.financial.transactionFlow.recordTransaction.inputSenderAccount')"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.transactionFlow.recordTransaction.billCode')" prop="billCode">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordTransaction.billCode')" prop="billCode" label-width="auto">
         <el-input
           v-model="queryParams.billCode"
           :placeholder="$t('business.financial.transactionFlow.recordTransaction.inputBillCode')"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.transactionFlow.recordTransaction.receiverId')" prop="receiverId">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordTransaction.receiverId')" prop="receiverId" label-width="auto">
         <el-input
           v-model="queryParams.receiverId"
           :placeholder="$t('business.financial.transactionFlow.recordTransaction.inputReceiverId')"
@@ -33,7 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.financial.transactionFlow.recordTransaction.receiverAccount')" prop="receiverAccount">
+      <el-form-item :label="$t('business.financial.transactionFlow.recordTransaction.receiverAccount')" prop="receiverAccount" label-width="auto">
         <el-input
           v-model="queryParams.receiverAccount"
           :placeholder="$t('business.financial.transactionFlow.recordTransaction.inputReceiverAccount')"

src/views/business/tradingChannel/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.deal.channelConfig.tradingChannel.channelCode')" prop="channelCode">
+      <el-form-item :label="$t('business.deal.channelConfig.tradingChannel.channelCode')" prop="channelCode" label-width="auto">
         <el-input v-model="queryParams.channelCode"
           :placeholder="$t('business.deal.channelConfig.tradingChannel.placeholder.channelCode')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.deal.channelConfig.tradingChannel.channelStatus')" prop="channelStatus">
+      <el-form-item :label="$t('business.deal.channelConfig.tradingChannel.channelStatus')" prop="channelStatus" label-width="auto">
         <el-select v-model="queryParams.channelStatus"
           :placeholder="$t('business.deal.channelConfig.tradingChannel.placeholder.channelStatus')" clearable>
           <el-option v-for="item in channelStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.deal.channelConfig.tradingChannel.channelVersion')" prop="channelVersion">
+      <el-form-item :label="$t('business.deal.channelConfig.tradingChannel.channelVersion')" prop="channelVersion" label-width="auto">
         <el-input v-model="queryParams.channelVersion"
           :placeholder="$t('business.deal.channelConfig.tradingChannel.placeholder.channelVersion')" clearable
           @keyup.enter.native="handleQuery" />

src/views/business/tradingChannelRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.deal.tradingChannelRecord.userId')" prop="userId">
+      <el-form-item :label="$t('business.deal.tradingChannelRecord.userId')" prop="userId" label-width="auto">
         <el-input v-model="queryParams.userId"
           :placeholder="$t('business.deal.tradingChannelRecord.placeholder.userId')" clearable
           @keyup.enter.native="handleQuery" />
@@ -11,17 +11,17 @@
           :placeholder="$t('business.deal.tradingChannelRecord.placeholder.channelId')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
-      <el-form-item :label="$t('business.deal.tradingChannelRecord.currency')" prop="currency">
+      <el-form-item :label="$t('business.deal.tradingChannelRecord.currency')" prop="currency" label-width="auto">
         <el-input v-model="queryParams.currency"
           :placeholder="$t('business.deal.tradingChannelRecord.placeholder.currency')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.deal.tradingChannelRecord.paymentMethod')" prop="paymentMethod">
+      <el-form-item :label="$t('business.deal.tradingChannelRecord.paymentMethod')" prop="paymentMethod" label-width="auto">
         <el-input v-model="queryParams.paymentMethod"
           :placeholder="$t('business.deal.tradingChannelRecord.placeholder.paymentMethod')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.deal.tradingChannelRecord.transactionDate')" prop="transactionDate">
+      <el-form-item :label="$t('business.deal.tradingChannelRecord.transactionDate')" prop="transactionDate" label-width="auto">
         <el-date-picker clearable v-model="queryParams.transactionDate" type="date" value-format="yyyy-MM-dd"
           :placeholder="$t('business.deal.tradingChannelRecord.placeholder.transactionDate')">
         </el-date-picker>

src/views/business/userAccount/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.supplementaryInfo.userAccount.accountCode')" prop="accountCode">
+      <el-form-item :label="$t('business.supplementaryInfo.userAccount.accountCode')" prop="accountCode" label-width="auto">
         <el-input v-model="queryParams.accountCode" :placeholder="$t('business.supplementaryInfo.userAccount.inputAccountCode')"
                   clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item :label="$t('business.supplementaryInfo.userAccount.accountType')" prop="accountType">
+      <el-form-item :label="$t('business.supplementaryInfo.userAccount.accountType')" prop="accountType" label-width="auto">
         <el-select v-model="queryParams.accountType" size="medium" :placeholder="$t('business.supplementaryInfo.userAccount.selectAccountType')">
           <el-option
             v-for="item in options_accountType"
@@ -15,7 +15,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.supplementaryInfo.userAccount.accountStatus')" prop="status">
+      <el-form-item :label="$t('business.supplementaryInfo.userAccount.accountStatus')" prop="status" label-width="auto">
         <el-select v-model="queryParams.status" size="medium" :placeholder="$t('business.supplementaryInfo.userAccount.selectAccountStatus')">
           <el-option
             v-for="item in options_accountStatus"
@@ -333,7 +333,7 @@ export default {
           this.buttonLoading = true;
           if (this.form.id != null) {
             updateUserAccount(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.button.updateSuccess'));
+              this.$modal.msgSuccess(this.$t('common.promptMsg.editSuccess'));
               this.open = false;
               this.getList();
             }).finally(() => {
@@ -341,7 +341,7 @@ export default {
             });
           } else {
             addUserAccount(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.button.addSuccess'));
+              this.$modal.msgSuccess(this.$t('common.promptMsg.addSuccess'));
               this.open = false;
               this.getList();
             }).finally(() => {

src/views/business/userBehaviorLog/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.behavior.userBehaviorLog.userIdLabel')" prop="userId">
+      <el-form-item :label="$t('business.behavior.userBehaviorLog.userIdLabel')" prop="userId" label-width="auto">
         <el-input v-model="queryParams.userId" :placeholder="$t('business.behavior.userBehaviorLog.userIdPlaceholder')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -9,21 +9,21 @@
         <el-input v-model="queryParams.ip" :placeholder="$t('business.behavior.userBehaviorLog.ipPlaceholder')"
           clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
-      <el-form-item :label="$t('business.behavior.userBehaviorLog.behaviorTypeLabel')" prop="behaviorType">
+      <el-form-item :label="$t('business.behavior.userBehaviorLog.behaviorTypeLabel')" prop="behaviorType" label-width="auto">
         <el-select v-model="queryParams.behaviorType"
           :placeholder="$t('business.behavior.userBehaviorLog.behaviorTypePlaceholder')" clearable>
           <el-option v-for="dict in behaviorTypeOptions" :key="dict.dictValue" :label="dict.dictLabel"
             :value="dict.dictValue" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.behavior.userBehaviorLog.deviceTypeLabel')" prop="deviceType">
+      <el-form-item :label="$t('business.behavior.userBehaviorLog.deviceTypeLabel')" prop="deviceType" label-width="auto">
         <el-select v-model="queryParams.deviceType"
           :placeholder="$t('business.behavior.userBehaviorLog.deviceTypePlaceholder')" clearable>
           <el-option v-for="dict in deviceTypeOptions" :key="dict.dictValue" :label="dict.dictLabel"
             :value="dict.dictValue" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.behavior.userBehaviorLog.platformLabel')" prop="platform">
+      <el-form-item :label="$t('business.behavior.userBehaviorLog.platformLabel')" prop="platform" label-width="auto">
         <el-select v-model="queryParams.platform"
           :placeholder="$t('business.behavior.userBehaviorLog.platformPlaceholder')" clearable>
           <el-option v-for="dict in platformOptions" :key="dict.dictValue" :label="dict.dictLabel"

src/views/business/userBehaviorRuleAction/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleAction.riskRuleId')" prop="riskRuleId">
+      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleAction.riskRuleId')" prop="riskRuleId" label-width="auto">
         <el-input v-model="queryParams.riskRuleId"
           :placeholder="$t('business.behavior.rule.userBehaviorRuleAction.riskRuleIdPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleAction.actionType')" prop="actionType">
+      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleAction.actionType')" prop="actionType" label-width="auto">
         <el-select v-model="queryParams.actionType"
           :placeholder="$t('business.behavior.rule.userBehaviorRuleAction.actionTypePlaceholder')" clearable>
           <el-option :label="$t('business.behavior.rule.userBehaviorRuleAction.notifyUser')" value="1" />
@@ -14,7 +14,7 @@
           <el-option :label="$t('business.behavior.rule.userBehaviorRuleAction.enhanceAuth')" value="3" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleAction.description')" prop="description">
+      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleAction.description')" prop="description" label-width="auto">
         <el-input v-model="queryParams.description"
           :placeholder="$t('business.behavior.rule.userBehaviorRuleAction.descriptionPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />

src/views/business/userBehaviorRuleRisk/index.vue

@@ -1,22 +1,22 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleRisk.ruleName')" prop="ruleName">
+      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleRisk.ruleName')" prop="ruleName" label-width="auto">
         <el-input v-model="queryParams.ruleName"
           :placeholder="$t('business.behavior.rule.userBehaviorRuleRisk.ruleNamePlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleRisk.priority')" prop="priority">
+      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleRisk.priority')" prop="priority" label-width="auto">
         <el-input v-model="queryParams.priority"
           :placeholder="$t('business.behavior.rule.userBehaviorRuleRisk.priorityPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleRisk.description')" prop="description">
+      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleRisk.description')" prop="description" label-width="auto">
         <el-input v-model="queryParams.description"
           :placeholder="$t('business.behavior.rule.userBehaviorRuleRisk.descriptionPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleRisk.isEnabled')" prop="isEnabled">
+      <el-form-item :label="$t('business.behavior.rule.userBehaviorRuleRisk.isEnabled')" prop="isEnabled" label-width="auto">
         <el-select v-model="queryParams.isEnabled"
           :placeholder="$t('business.behavior.rule.userBehaviorRuleRisk.isEnabledPlaceholder')">
           <el-option :label="$t('business.behavior.rule.userBehaviorRuleRisk.enabledYes')" value="1" />

src/views/business/userBehaviorStats/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('business.behavior.userBehaviorStats.statDateLabel')" prop="statDate">
+      <el-form-item :label="$t('business.behavior.userBehaviorStats.statDateLabel')" prop="statDate" label-width="auto">
         <el-date-picker clearable v-model="queryParams.statDate" type="date" value-format="yyyy-MM-dd"
           :placeholder="$t('business.behavior.userBehaviorStats.statDatePlaceholder')">
         </el-date-picker>
@@ -31,12 +31,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item :label="$t('business.behavior.userBehaviorStats.avgDurationLabel')" prop="avgDuration">
+      <el-form-item :label="$t('business.behavior.userBehaviorStats.avgDurationLabel')" prop="avgDuration" label-width="auto">
         <el-input v-model="queryParams.avgDuration"
           :placeholder="$t('business.behavior.userBehaviorStats.avgDurationPlaceholder')" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.behavior.userBehaviorStats.behaviorTypeLabel')" prop="behaviorType">
+      <el-form-item :label="$t('business.behavior.userBehaviorStats.behaviorTypeLabel')" prop="behaviorType" label-width="auto">
         <el-select v-model="queryParams.behaviorType"
           :placeholder="$t('business.behavior.userBehaviorStats.behaviorTypePlaceholder')" clearable>
           <el-option v-for="dict in behaviorTypeOptions" :key="dict.dictValue" :label="dict.dictLabel"

src/views/business/userCard/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="银行卡号" prop="cardNum">
+      <el-form-item label="银行卡号" prop="cardNum" label-width="auto">
         <el-input
           v-model="queryParams.cardNum"
           placeholder="请输入银行卡号"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="登录账号" prop="userAccount">
+      <el-form-item label="登录账号" prop="userAccount" label-width="auto">
         <el-input
           v-model="queryParams.userAccount"
           placeholder="请输入登录账号"

src/views/business/userCredit/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.credit.userCredit.userId')" prop="userId">
+      <el-form-item :label="$t('business.credit.userCredit.userId')" prop="userId" label-width="auto">
         <el-input
           v-model="queryParams.userId"
           :placeholder="$t('business.credit.userCredit.pleaseInputUserId')"
@@ -10,7 +10,7 @@
         />
       </el-form-item>
 
-      <el-form-item :label="$t('business.credit.userCredit.creditScore')" prop="score">
+      <el-form-item :label="$t('business.credit.userCredit.creditScore')" prop="score" label-width="auto">
         <el-input
           v-model="queryParams.score"
           :placeholder="$t('business.credit.userCredit.pleaseInputCreditScore')"
@@ -18,7 +18,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.credit.userCredit.violationCount')" prop="violationNum">
+      <el-form-item :label="$t('business.credit.userCredit.violationCount')" prop="violationNum" label-width="auto">
         <el-input
           v-model="queryParams.violationNum"
           :placeholder="$t('business.credit.userCredit.pleaseInputViolationCount')"
@@ -26,7 +26,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.credit.userCredit.violationRatio')" prop="violationPro">
+      <el-form-item :label="$t('business.credit.userCredit.violationRatio')" prop="violationPro" label-width="auto">
         <el-input
           v-model="queryParams.violationPro"
           :placeholder="$t('business.credit.userCredit.pleaseInputViolationRatio')"

src/views/business/userCreditRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.credit.userCreditRecord.userId')" prop="userId">
+      <el-form-item :label="$t('business.credit.userCreditRecord.userId')" prop="userId" label-width="auto">
         <el-input
           v-model="queryParams.userId"
           :placeholder="$t('business.credit.userCreditRecord.placeholder.violationBus')"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.credit.userCreditRecord.violationBus')" prop="violationBus">
+      <el-form-item :label="$t('business.credit.userCreditRecord.violationBus')" prop="violationBus" label-width="auto">
         <el-input
           v-model="queryParams.violationBus"
           :placeholder="$t('business.credit.userCreditRecord.placeholder.violationBus')"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.credit.userCreditRecord.violationOrd')" prop="violationOrd">
+      <el-form-item :label="$t('business.credit.userCreditRecord.violationOrd')" prop="violationOrd" label-width="auto">
         <el-input
           v-model="queryParams.violationOrd"
           :placeholder="$t('business.credit.userCreditRecord.placeholder.violationOrd')"

src/views/business/userFriend/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.userRelation.userFriend.userId')" prop="userId">
+      <el-form-item :label="$t('business.userRelation.userFriend.userId')" prop="userId" label-width="auto">
         <el-input
           v-model="queryParams.userId"
           :placeholder="$t('business.userRelation.userFriend.userIdPlaceholder')"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.userRelation.userFriend.friendId')" prop="friendId">
+      <el-form-item :label="$t('business.userRelation.userFriend.friendId')" prop="friendId" label-width="auto">
         <el-input
           v-model="queryParams.friendId"
           :placeholder="$t('business.userRelation.userFriend.friendIdPlaceholder')"

src/views/business/userInfo/index.vue

@@ -2,16 +2,22 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item :label="$t('business.userManager.userInfo.account')" prop="account" label-width="120">
-        <el-input v-model="queryParams.account" :placeholder="$t('business.userManager.userInfo.accountPlaceholder')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.account" :placeholder="$t('business.userManager.userInfo.accountPlaceholder')"
+                  clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item :label="$t('business.userManager.userInfo.idCard')" prop="idCard">
-        <el-input v-model="queryParams.idCard" :placeholder="$t('business.userManager.userInfo.idCardPlaceholder')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('business.userManager.userInfo.idCard')" prop="idCard" label-width="auto">
+        <el-input v-model="queryParams.idCard" :placeholder="$t('business.userManager.userInfo.idCardPlaceholder')"
+                  clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item :label="$t('business.userManager.userInfo.phone')" prop="phone">
-        <el-input v-model="queryParams.phone" :placeholder="$t('business.userManager.userInfo.phonePlaceholder')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('business.userManager.userInfo.phone')" prop="phone" label-width="auto">
+        <el-input v-model="queryParams.phone" :placeholder="$t('business.userManager.userInfo.phonePlaceholder')"
+                  clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{
+            $t('common.button.search')
+          }}
+        </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button>
       </el-form-item>
     </el-form>
@@ -19,11 +25,13 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['business:userInfo:edit']">{{ $t('common.button.edit') }}</el-button>
+                   v-hasPermi="['business:userInfo:edit']">{{ $t('common.button.edit') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['business:userInfo:export']">{{ $t('common.button.export') }}</el-button>
+                   v-hasPermi="['business:userInfo:export']">{{ $t('common.button.export') }}
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -40,19 +48,25 @@
       </el-table-column>
       <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.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.userRegister.contactAddress')" align="center"
+                       prop="contactAddress"/>
+      <el-table-column :label="$t('business.userManager.userInfo.email')" align="center" prop="email"/>
       <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">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status == '0'">{{ $t('business.userManager.userInfo.statusNormal') }}</el-tag>
-          <el-tag type="danger" v-if="scope.row.status == '1'">{{ $t('business.userManager.userInfo.statusDisabled') }}</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">{{
+              $t('business.userManager.userInfo.statusDisabled')
+            }}
+          </el-tag>
         </template>
       </el-table-column>
-      <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">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:userInfo:edit']">{{ $t('common.button.edit') }}</el-button>
+                     v-hasPermi="['business:userInfo:edit']">{{ $t('common.button.edit') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -63,13 +77,16 @@
     <!-- 添加或修改用户信息对话框 -->
     <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.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.userManager.userInfo.name')" prop="name">
           <el-input v-model="form.name" :placeholder="$t('business.userManager.userInfo.namePlaceholder')"/>
         </el-form-item>
         <el-form-item :label="$t('business.userManager.userInfo.gender')" prop="gender">
           <el-radio-group v-model="form.gender">
-            <el-radio :label="1">{{ $t('common.dict.male') }}</el-radio>
-            <el-radio :label="0">{{ $t('common.dict.female') }}</el-radio>
+            <el-radio label="1">{{ $t('common.dict.male') }}</el-radio>
+            <el-radio label="0">{{ $t('common.dict.female') }}</el-radio>
           </el-radio-group>
           <!--          <el-input v-model="form.gender" :placeholder="$t('business.userManager.userInfo.genderPlaceholder')" />-->
         </el-form-item>
@@ -79,18 +96,22 @@
         <el-form-item :label="$t('business.userManager.userInfo.phone')" prop="phone">
           <el-input v-model="form.phone" :placeholder="$t('business.userManager.userInfo.phonePlaceholder')"/>
         </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.userManager.userInfo.age')" prop="age">
-          <el-input v-model="form.age" :placeholder="$t('business.userManager.userInfo.agePlaceholder')" />
-        </el-form-item>
         <el-form-item :label="$t('business.userManager.userInfo.addr')" prop="addr">
-          <el-input v-model="form.addr" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
+          <el-cascader
+            v-model="form.addr"
+            :options="options_addr"
+            @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')"/>
         </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>
@@ -136,7 +157,8 @@
   getUserInfo,
   delUserInfo,
   addUserInfo,
-    updateUserInfo
+  updateUserInfo,
+  getAddress
 } from "@/api/business/userInfo";
 
 export default {
@@ -159,6 +181,8 @@
       total: 0,
       // 用户信息表格数据
       userInfoList: [],
+      //地址选择列表
+      options_addr: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -183,6 +207,7 @@
         status: undefined,
         delFlag: undefined,
         createTime: undefined,
+        language: undefined,
       },
       // 表单参数
       form: {},
@@ -195,25 +220,48 @@
           {required: true, message: this.$t('business.userManager.userInfo.genderRequired'), trigger: "blur"}
         ],
         idCard: [
-            { required: true,pattern: /^\d+$/, message: this.$t('business.userManager.userInfo.idCardRequired'), trigger: "blur" }
+          {
+            required: true,
+            pattern: /^\d+$/,
+            message: this.$t('business.userManager.userInfo.idCardRequired'),
+            trigger: "blur"
+          }
         ],
         phone: [
-            { required: true,pattern: /^\d+$/, message: this.$t('business.userManager.userInfo.phoneRequired') , trigger: "blur" }
+          {
+            required: true,
+            pattern: /^\d+$/,
+            message: this.$t('business.userManager.userInfo.phoneRequired'),
+            trigger: "blur"
+          }
         ],
-          age: [
-            { required: true,pattern: /^\d+$/, message: this.$t('business.userManager.userInfo.ageRequired') , trigger: "blur" }
+        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"
+          }
         ],
         addr: [
           {required: true, message: this.$t('business.userManager.userInfo.addrRequired'), trigger: "change"}
         ],
+        addrDetail: [
+          {required: true, message: this.$t('business.userManager.userInfo.addrRequired'), trigger: "change"}
+        ],
         contactAddress: [
-            { required: true, message: this.$t('business.agent.userInfoAgent.rule.contactAddressRequired'), trigger: "change" }
+          {
+            required: true,
+            message: this.$t('business.agent.userInfoAgent.rule.contactAddressRequired'),
+            trigger: "change"
+          }
         ]
       }
     };
   },
   created() {
     this.getList();
+    this.getAddress();
   },
   methods: {
     /** 查询用户信息列表 */
@@ -224,6 +272,12 @@
         this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
         this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
       }
+      const languageMap = {
+        'zh': 1,
+        'en': 2,
+        'la': 3
+      };
+      this.queryParams.language = languageMap[this.$i18n.locale] || null;
       listUserInfo(this.queryParams).then(response => {
         this.userInfoList = response.rows;
         this.total = response.total;
@@ -248,6 +302,14 @@
         phone: undefined,
         age: undefined,
         addr: undefined,
+        // addr: [{
+        //   value: 'zhinan',
+        //   label: '指南',
+        //   children: [{
+        //     value: 'shejiyuanze',
+        //     label: '设计原则',
+        //   }],
+        // }],
         status: undefined,
         delFlag: undefined,
         createBy: undefined,
@@ -284,10 +346,31 @@
     handleUpdate(row) {
       this.loading = true;
       this.reset();
-        const id = row.id || this.ids
+      const id = row.id || this.ids;
       getUserInfo(id).then(response => {
         this.loading = false;
         this.form = response.data;
+
+        // 处理地址回显
+        const addrValue = this.form.addr;
+        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.addr = [provinceValue, cityValue];
+                console.log(this.form);
+              }
+            } else {
+              this.form.addr = [provinceValue];
+            }
+          }
+        }
         this.open = true;
         this.title = this.$t('business.userManager.userInfo.editTitle');
       });
@@ -296,10 +379,11 @@
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.addr = this.form.addr + "," + this.form.addrDetail;
           this.buttonLoading = true;
           if (this.form.id != null) {
             updateUserInfo(this.form).then(response => {
-                this.$modal.msgSuccess(this.$t('common.button.editSuccess'));
+              this.$modal.msgSuccess(this.$t('common.promptMsg.editSuccess'));
               this.open = false;
               this.getList();
             }).finally(() => {
@@ -307,7 +391,7 @@
             });
           } else {
             addUserInfo(this.form).then(response => {
-                this.$modal.msgSuccess(this.$t('common.button.addSuccess'));
+              this.$modal.msgSuccess(this.$t('common.promptMsg.addSuccess'));
               this.open = false;
               this.getList();
             }).finally(() => {
@@ -327,7 +411,8 @@
         this.loading = false;
         this.getList();
         this.$modal.msgSuccess(this.$t('common.button.deleteSuccess'));
-        }).catch(() => {}).finally(() => {
+      }).catch(() => {
+      }).finally(() => {
         this.loading = false;
       });
     },
@@ -336,6 +421,26 @@
       this.download('business/userInfo/export', {
         ...this.queryParams
       }, `userInfo_${new Date().getTime()}.xlsx`)
+    },
+    /** 获取地址列表 */
+    getAddress() {
+      this.loading = true;
+      getAddress(this.$i18n.locale).then(response => {
+        this.options_addr = response.data;
+        console.log("页面展示", this.options_addr);
+      });
+    },
+    /** 地址联动事件 **/
+    handleChange(value) {
+      this.form.addr = value;
+      console.log("地址联动事件" + value);
+    },
+    /**
+     * 地址转换函数
+     */
+    listToString(list, separator) {
+      list = list || []; // 非空判断
+
     }
   }
 };

src/views/business/userInfoAgent/index.vue

@@ -1,38 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.agent.userInfoAgent.agentName')" prop="agentName">
-        <el-input
-          v-model="queryParams.agentName"
-          :placeholder="$t('business.agent.userInfoAgent.placeholder.agentName')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item :label="$t('business.agent.userInfoAgent.agentName')" prop="agentName" label-width="auto">
+        <el-input v-model="queryParams.agentName"
+          :placeholder="$t('business.agent.userInfoAgent.placeholder.agentName')" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('business.agent.userInfoAgent.account')" prop="account">
-        <el-input
-          v-model="queryParams.account"
-          :placeholder="$t('business.agent.userInfoAgent.placeholder.account')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.account" :placeholder="$t('business.agent.userInfoAgent.placeholder.account')"
+          clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini"
+          @click="handleQuery">{{ $t('common.button.search') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['business:userInfoAgent:export']"
-        >{{ $t('common.button.export') }}</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['business:userInfoAgent:export']">{{ $t('common.button.export') }}</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -41,57 +29,59 @@
       <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.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('business.agent.userInfoAgent.operateAddr')" align="center" prop="operateAddr" />
-      <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">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:userInfoAgent:edit']"
-          >{{ $t('common.button.edit') }}</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:userInfoAgent:edit']">{{ $t('common.button.edit') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改代理商信息对话框 -->
     <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>
-        <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.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.licenseOther')" prop="licenseOther">
-          <el-input v-model="form.licenseOther" :placeholder="$t('business.agent.userInfoAgent.placeholder.licenseOther')" />
+        <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.legalPerson')" prop="legalPerson">
-          <el-input v-model="form.legalPerson" :placeholder="$t('business.agent.userInfoAgent.placeholder.legalPerson')" />
+        <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.contactAddress')" prop="contactAddress">
-          <el-input v-model="form.contactAddress" :placeholder="$t('business.agent.userInfoAgent.placeholder.contactAddress')" />
+        <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.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">
-        <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>
@@ -100,7 +90,14 @@
 </template>
 
 <script>
-import { listUserInfoAgent, getUserInfoAgent, delUserInfoAgent, addUserInfoAgent, updateUserInfoAgent } from "@/api/business/userInfoAgent";
+  import {
+    listUserInfoAgent,
+    getUserInfoAgent,
+    delUserInfoAgent,
+    addUserInfoAgent,
+    updateUserInfoAgent
+  } from "@/api/business/userInfoAgent";
+  import {getAddress} from "@/api/business/userRegister";
 
   export default {
     name: "UserInfoAgent",
@@ -141,45 +138,132 @@ export default {
         },
         // 表单参数
         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: [
-          { required: true, message: this.$t('business.agent.userInfoAgent.rule.idRequired'), trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: this.$t('business.agent.userInfoAgent.rule.userIdRequired'), trigger: "blur" }
-        ],
-        agentName: [
-          { required: true, message: this.$t('business.agent.userInfoAgent.rule.agentNameRequired'), trigger: "blur" }
-        ],
-        license: [
-          { required: true, message: this.$t('business.agent.userInfoAgent.rule.licenseRequired'), trigger: "blur" }
+          id: [{
+            required: true,
+            message: this.$t('business.agent.userInfoAgent.rule.idRequired'),
+            trigger: "blur"
+          }],
+          operateType: [
+            {required: true, message: this.$t('business.merchant.indexBus.operateTypeRequired'), trigger: "change"}
           ],
-        licenseOther: [
-          { required: true, message: this.$t('business.agent.userInfoAgent.rule.licenseOtherRequired'), trigger: "blur" }
+          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" }
           ],
-        legalPerson: [
-          { required: true, message: this.$t('business.agent.userInfoAgent.rule.legalPersonRequired'), trigger: "blur" }
-        ],
-        operateStatus: [
-          { required: true, message: this.$t('business.agent.userInfoAgent.rule.operateStatusRequired'), trigger: "change" }
-        ],
-        contactAddress: [
-          { required: true, message: this.$t('business.agent.userInfoAgent.rule.contactAddressRequired'), trigger: "blur" }
-        ],
-        operateAddr: [
-          { required: true, message: this.$t('business.agent.userInfoAgent.rule.operateAddrRequired'), 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'),
+            trigger: "blur"
+          }],
+          license: [{
+            required: true,
+            message: this.$t('business.agent.userInfoAgent.rule.licenseRequired'),
+            trigger: "blur"
+          }],
+          licenseOther: [{
+            required: true,
+            message: this.$t('business.agent.userInfoAgent.rule.licenseOtherRequired'),
+            trigger: "blur"
+          }],
+          legalPerson: [{
+            required: true,
+            message: this.$t('business.agent.userInfoAgent.rule.legalPersonRequired'),
+            trigger: "blur"
+          }],
+          /* operateStatus: [{
+            required: true,
+            message: this.$t('business.agent.userInfoAgent.rule.operateStatusRequired'),
+            trigger: "change"
+          }], */
+          contactAddress: [{
+            required: true,
+            message: this.$t('business.agent.userInfoAgent.rule.contactAddressRequired'),
+            trigger: "blur"
+          }],
+          operateAddr: [{
+            required: true,
+            message: this.$t('business.agent.userInfoAgent.rule.operateAddrRequired'),
+            trigger: "blur"
+          }],
         }
       };
     },
     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;
@@ -241,6 +325,27 @@ export default {
         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');
         });
@@ -249,6 +354,7 @@ export default {
       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 => {
@@ -273,15 +379,16 @@ export default {
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-      this.$modal.confirm(this.$t('business.agent.userInfoAgent.deleteConfirm', { ids: ids })).then(() => {
+        this.$modal.confirm(this.$t('business.agent.userInfoAgent.deleteConfirm', {
+          ids: ids
+        })).then(() => {
           this.loading = true;
           return delUserInfoAgent(ids);
         }).then(() => {
           this.loading = false;
           this.getList();
           this.$modal.msgSuccess(this.$t('business.agent.userInfoAgent.deleteSuccess'));
-      }).catch(() => {
-      }).finally(() => {
+        }).catch(() => {}).finally(() => {
           this.loading = false;
         });
       },
@@ -290,6 +397,40 @@ export default {
         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;
       }
     }
   };

src/views/business/userInfoBus/index.vue

@@ -1,21 +1,21 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.merchant.userInfoBus.loginAccount')" prop="account" label-width="120">
+      <el-form-item :label="$t('business.merchant.userInfoBus.loginAccount')" prop="account" label-width="auto">
         <el-input
           v-model="queryParams.account"
           :placeholder="$t('business.merchant.userInfoBus.inputLoginAccount')"
           clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.merchant.userInfoBus.merchantName')" prop="merchantName" label-width="120">
+      <el-form-item :label="$t('business.merchant.userInfoBus.merchantName')" prop="merchantName" label-width="auto">
         <el-input
           v-model="queryParams.merchantName"
           :placeholder="$t('business.merchant.userInfoBus.inputMerchantName')"
           clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.merchant.userInfoBus.businessLicense')" prop="license">
+      <el-form-item :label="$t('business.merchant.userInfoBus.businessLicense')" prop="license" label-width="auto">
         <el-input
           v-model="queryParams.license"
           :placeholder="$t('business.merchant.userInfoBus.inputBusinessLicense')"
@@ -23,7 +23,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.merchant.userInfoBus.operatingAddress')" prop="operateAddr">
+      <el-form-item :label="$t('business.merchant.userInfoBus.operatingAddress')" prop="operateAddr" label-width="auto">
         <el-input
           v-model="queryParams.operateAddr"
           :placeholder="$t('business.merchant.userInfoBus.inputOperatingAddress')"
@@ -66,11 +66,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('business.merchant.userInfoBus.loginAccount')" align="center" prop="account" />
       <el-table-column :label="$t('business.merchant.userInfoBus.merchantName')" align="center" prop="merchantName" />
-      <el-table-column :label="$t('business.merchant.userInfoBus.businessLicense')" align="center" prop="license" />
-      <el-table-column :label="$t('business.merchant.userInfoBus.otherLicenseInfo')" align="center" prop="licenseOther" />
-      <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.operatingAddress')" 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.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">
         <template slot-scope="scope">
@@ -99,30 +100,29 @@
         <el-form-item :label="$t('business.merchant.userInfoBus.merchantName')" prop="merchantName">
           <el-input v-model="form.merchantName" :placeholder="$t('business.merchant.userInfoBus.inputMerchantName')" />
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.businessLicense')" prop="license">
-          <el-input v-model="form.license" :placeholder="$t('business.merchant.userInfoBus.inputBusinessLicense')" />
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.otherLicenseInfo')" prop="licenseOther">
-          <el-input v-model="form.licenseOther" :placeholder="$t('business.merchant.userInfoBus.inputOtherLicenseInfo')" />
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.legalPersonName')" prop="legalPerson">
-          <el-input v-model="form.legalPerson" :placeholder="$t('business.merchant.userInfoBus.inputLegalPersonName')" />
+        <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.merchant.userInfoBus.operatingStatus')" prop="operateStatus">
-          <el-select v-model="form.operateStatus" :placeholder="$t('business.merchant.userInfoBus.selectOperatingStatus')" >
+        <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_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.merchant.userInfoBus.operatingAddress')" prop="operateAddr">
-          <el-input v-model="form.operateAddr" :placeholder="$t('business.merchant.userInfoBus.inputOperatingAddress')" />
+        <el-form-item :label="$t('business.merchant.indexBus.addr')" prop="contactAddress">
+          <el-cascader
+            v-model="form.contactAddress"
+            :options="options_addr"
+            @change="handleChange"
+            clearable></el-cascader>
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.contactAddress')" prop="contactAddress">
-          <el-input v-model="form.contactAddress" :placeholder="$t('business.merchant.userInfoBus.inputOperatingAddress')" />
+        <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">
@@ -162,6 +162,7 @@
 
 <script>
 import { listUserInfoBus, getUserInfoBus, delUserInfoBus, addUserInfoBus, updateUserInfoBus } from "@/api/business/userInfoBus";
+import {getAddress} from "@/api/business/userRegister";
 
 export default {
   name: "UserInfoBus",
@@ -201,29 +202,85 @@ export default {
         operateAddr: undefined,
         merchantName: undefined,
       },
-      options_operateStatus: [{
-        value: '存续',
-        label: this.$t('business.merchant.userInfoBus.operateStatusExist')
+      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: '注销',
-        label: this.$t('business.merchant.userInfoBus.operateStatusCancel')
-      }],
+        value: '15',
+        label: this.$t('common.operateType.type15')
+      },{
+        value: '16',
+        label: this.$t('common.operateType.type16')
+      },{
+        value: '17',
+        label: this.$t('common.operateType.type17')
+      },],
       // 表单参数
       form: {},
+      //地址选择列表
+      options_addr:[],
       // 表单校验
       rules: {
         merchantName: [
           { required: true, message: this.$t('business.merchant.userInfoBus.merchantNameRequired'), trigger: "blur" }
         ],
+        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" }
+        ],
         legalPerson: [
           { required: true, message: this.$t('business.merchant.userInfoBus.legalPersonRequired'), trigger: "blur" }
         ],
-        operateStatus: [
-          { required: true, message: this.$t('business.merchant.userInfoBus.operateStatusRequired'), trigger: "change" }
+        operateType: [
+          {required: true, message: this.$t('business.merchant.indexBus.operateTypeRequired'), trigger: "change"}
         ],
         operateAddr: [
           { required: true, message: this.$t('business.merchant.userInfoBus.operateAddrRequired'), trigger: "blur" }
         ],
+        addrDetail: [
+          {required: true, message: this.$t('business.merchant.indexBus.contactAddressRequired'), trigger: "blur"}
+        ],
         contactAddress: [
           { required: true, message: this.$t('business.merchant.userInfoBus.operateAddrRequired'), trigger: "blur" }
         ],
@@ -232,11 +289,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;
       listUserInfoBus(this.queryParams).then(response => {
         this.userInfoBusList = response.rows;
         this.total = response.total;
@@ -305,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');
       });
@@ -313,6 +398,7 @@ export default {
     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) {
             updateUserInfoBus(this.form).then(response => {
@@ -349,11 +435,46 @@ export default {
         this.loading = false;
       });
     },
+    /** 获取地址列表 */
+    getAddress() {
+      this.loading = true;
+      getAddress(this.$i18n.locale).then(response => {
+        this.options_addr = response.data;
+      });
+    },
+    /** 地址联动事件 **/
+    handleChange(value) {
+      this.form.contactAddress = value;
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('business/userInfoBus/export', {
         ...this.queryParams
       }, `${this.$t('business.merchant.userInfoBus.userInfoBus')}_${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;
     }
   }
 };

src/views/business/userRegister/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.userManager.userRegister.account')" prop="account">
+      <el-form-item :label="$t('business.userManager.userRegister.account')" prop="account" label-width="auto">
         <el-input
           v-model="queryParams.account"
           :placeholder="$t('business.userManager.userRegister.accountPlaceholder')"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.userManager.userRegister.phone')" prop="phone">
+      <el-form-item :label="$t('business.userManager.userRegister.phone')" prop="phone" label-width="auto">
         <el-input
           v-model="queryParams.phone"
           :placeholder="$t('business.userManager.userRegister.phonePlaceholder')"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.userManager.userRegister.userLevel')" prop="userLevel">
+      <el-form-item :label="$t('business.userManager.userRegister.userLevel')" prop="userLevel" label-width="auto">
         <el-select v-model="queryParams.userLevel" size="medium" :placeholder="$t('business.userManager.userRegister.userLevelPlaceholder')">
           <el-option
             v-for="item in options_userLevel"
@@ -114,14 +114,14 @@
       <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">
         <template slot-scope="scope">
-          <el-button v-if="(scope.row.addressInfo == '')"
+          <el-button v-if="(scope.row.addressInfo == '' || scope.row.addressInfo == null)"
                      size="mini"
                      type="text"
                      icon="el-icon-document-add"
                      @click="handleAddInfo(scope.row)"
           >{{ $t('business.userManager.userRegister.supplement') }}
           </el-button>
-          <el-button v-if="(scope.row.addressInfo != '')"
+          <el-button v-if="(scope.row.addressInfo != '' && scope.row.addressInfo != null)"
                      size="mini"
                      type="text"
                      icon="el-icon-view"
@@ -236,30 +236,33 @@
     <!--添加用户注册信息弹窗-->
     <el-dialog :title="title" :visible.sync="openInfo" width="700px" append-to-body>
       <el-form ref="formInfo" :model="formInfo" :rules="rules" label-width="auto">
-        <el-form-item :label="$t('business.userManager.userRegister.name')" prop="name">
-          <el-input v-model="formInfo.name" :placeholder="$t('business.userManager.userRegister.namePlaceholder')"/>
+        <el-form-item :label="$t('business.userManager.userInfo.email')" prop="email">
+          <el-input v-model="formInfo.email" :placeholder="$t('business.userManager.userInfo.emailPlaceholder')"/>
+        </el-form-item>
+        <el-form-item :label="$t('business.userManager.userInfo.name')" prop="name">
+          <el-input v-model="formInfo.name" :placeholder="$t('business.userManager.userInfo.namePlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userRegister.gender')" prop="gender">
+        <el-form-item :label="$t('business.userManager.userInfo.gender')" prop="gender">
           <el-radio-group v-model="formInfo.gender">
             <el-radio :label="1">{{ $t('business.userManager.userRegister.male') }}</el-radio>
             <el-radio :label="0">{{ $t('business.userManager.userRegister.female') }}</el-radio>
           </el-radio-group>
           <!--          <el-input v-model="form.gender" :placeholder="$t('business.userManager.userRegister.genderPlaceholder')" />-->
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userRegister.idCard')" prop="idCard">
-          <el-input v-model="formInfo.idCard" :placeholder="$t('business.userManager.userRegister.idCardPlaceholder')"/>
+        <el-form-item :label="$t('business.userManager.userInfo.idCard')" prop="idCard">
+          <el-input v-model="formInfo.idCard" :placeholder="$t('business.userManager.userInfo.idCardPlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userRegister.phone')" prop="phone">
-          <el-input v-model="formInfo.phone" :placeholder="$t('business.userManager.userRegister.phonePlaceholder')"/>
-        </el-form-item>
-        <el-form-item :label="$t('business.userManager.userRegister.contactAddress')" prop="contactAddress">
-          <el-input v-model="formInfo.contactAddress" :placeholder="$t('business.userManager.userRegister.contactAddressPlaceholder')" />
+        <el-form-item :label="$t('business.userManager.userInfo.phone')" prop="phone">
+          <el-input v-model="formInfo.phone" :placeholder="$t('business.userManager.userInfo.phonePlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userRegister.age')" prop="age">
-          <el-input v-model="formInfo.age" :placeholder="$t('business.userManager.userRegister.agePlaceholder')"/>
+        <el-form-item :label="$t('business.userManager.userInfo.addr')" prop="addr">
+          <el-cascader
+            v-model="formInfo.addr"
+            :options="options_addr"
+            @change="handleChange"></el-cascader>
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userRegister.addr')" prop="addr">
-          <el-input v-model="formInfo.addr" :placeholder="$t('business.userManager.userRegister.addrPlaceholder')"/>
+        <el-form-item :label="$t('business.userManager.userInfo.detailAddr')" prop="contactAddress">
+          <el-input v-model="formInfo.contactAddress" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -284,18 +287,18 @@
           <span v-if="formDetail.userInfoVo.gender == '1'">{{ $t('business.userManager.userRegister.male') }}</span>
           <span v-if="formDetail.userInfoVo.gender == '0'">{{ $t('business.userManager.userRegister.female') }}</span>
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userRegister.userAge')">
-          {{ formDetail.userInfoVo.age }}
-        </el-form-item>
         <el-form-item :label="$t('business.userManager.userRegister.idCard')">
           {{ formDetail.userInfoVo.idCard }}
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userRegister.userAddress')">
+        <el-form-item :label="$t('business.userManager.userRegister.address')">
           {{ formDetail.userInfoVo.addr }}
         </el-form-item>
         <el-form-item :label="$t('business.userManager.userRegister.contactPhone')">
           {{ formDetail.userInfoVo.phone }}
         </el-form-item>
+        <el-form-item :label="$t('business.userManager.userInfo.email')">
+          {{ formDetail.userInfoVo.email }}
+        </el-form-item>
         <el-form-item :label="$t('business.userManager.userRegister.contactAddress')">
           {{ formDetail.userInfoVo.contactAddress }}
         </el-form-item>
@@ -329,9 +332,9 @@ import {
   addUserRegister,
   updateUserRegister,
   addUserInfo,
-  addUserInfoBus,
   resetUserPassword,
-  accountLock
+  accountLock,
+  getAddress
 } from "@/api/business/userRegister";
 
 export default {
@@ -366,6 +369,8 @@ export default {
       openInfo: false,
       // 是否展示用户信息弹窗层-商企
       openInfoBus: false,
+      //地址选择列表
+      options_addr:[],
       options_operateStatus: [{
         value: '存续',
         label: this.$t('business.userManager.userRegister.operateStatusOptions.active')
@@ -384,6 +389,7 @@ export default {
         status: undefined,
         userType: undefined,
         userLevel: undefined,
+        language: undefined,
       },
       // 表单参数
       form: {
@@ -434,8 +440,8 @@ export default {
         phone: [
           { required: true, pattern: /^\d+$/, message: this.$t('business.userManager.userRegister.phoneNumberDigitOnly'), trigger: "blur"}
         ],
-        age: [
-          { required: true, pattern: /^\d+$/, message: this.$t('business.userManager.userRegister.ageNumberOnly'), trigger: "blur" }
+        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" }
         ],
         contactAddress: [
           {required: true, message: this.$t('business.userManager.userRegister.contactAddressRequired'), trigger: "blur"}
@@ -462,11 +468,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;
       listUserRegister(this.queryParams).then(response => {
         this.userRegisterList = response.rows;
         this.total = response.total;
@@ -581,6 +594,8 @@ export default {
     submitFormInfo() {
       this.$refs["formInfo"].validate(valid => {
         if (valid) {
+          this.formInfo.addr = this.formInfo.addr + "," + this.formInfo.contactAddress;
+          this.formInfo.contactAddress = null;
           addUserInfo(this.formInfo).then(response => {
             this.$modal.msgSuccess(this.$t('common.promptMsg.addSuccess'));
             this.openInfo = false;
@@ -591,20 +606,6 @@ export default {
         }
       });
     },
-    /** 用户信息-提交按钮-商企 */
-    submitFormInfoBus() {
-      this.$refs["formInfoBus"].validate(valid => {
-        if (valid) {
-          addUserInfoBus(this.formInfoBus).then(response => {
-            this.$modal.msgSuccess(this.$t('common.promptMsg.addSuccess'));
-            this.openInfoBus = false;
-            this.getList();
-          }).finally(() => {
-            this.buttonLoading = false;
-          });
-        }
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const account = row.account;
@@ -634,14 +635,8 @@ export default {
     },
     handleAddInfo(row) {
       this.reset();
-      if (row.userType == "0") {
       this.formInfo = row;
       this.openInfo = true;
-      }
-      if (row.userType == "1") {
-        this.formInfoBus = row;
-        this.openInfoBus = true;
-      }
       this.title = this.$t('business.userManager.userRegister.addTitle');
     },
 
@@ -696,6 +691,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;
     }
   }
 };

src/views/business/userRegister/indexAgent.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.agent.agentRegister.account')" prop="account">
+      <el-form-item :label="$t('business.agent.agentRegister.account')" prop="account" label-width="auto">
         <el-input
           v-model="queryParams.account"
           :placeholder="$t('business.agent.agentRegister.placeholder.account')"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.agent.agentRegister.phone')" prop="phone">
+      <el-form-item :label="$t('business.agent.agentRegister.phone')" prop="phone" label-width="auto">
         <el-input
           v-model="queryParams.phone"
           :placeholder="$t('business.agent.agentRegister.placeholder.phone')"
@@ -17,8 +17,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.agent.agentRegister.userLevel')" prop="userLevel">
-        <el-select v-model="queryParams.userLevel" size="medium" :placeholder="$t('business.agent.agentRegister.placeholder.userLevel')" >
+      <el-form-item :label="$t('business.agent.agentRegister.userLevel')" prop="userLevel" label-width="auto">
+        <el-select v-model="queryParams.userLevel" size="medium"
+                   :placeholder="$t('business.agent.agentRegister.placeholder.userLevel')">
           <el-option
             v-for="item in options_userLevel"
             :key="item.value"
@@ -28,7 +29,10 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{
+            $t('common.button.search')
+          }}
+        </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button>
       </el-form-item>
     </el-form>
@@ -42,7 +46,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['business:userRegister:add']"
-        >{{ $t('common.button.add') }}</el-button>
+        >{{ $t('common.button.add') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -53,7 +58,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['business:userRegister:edit']"
-        >{{ $t('common.button.edit') }}</el-button>
+        >{{ $t('common.button.edit') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -64,7 +70,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['business:userRegister:remove']"
-        >{{ $t('common.button.delete') }}</el-button>
+        >{{ $t('common.button.delete') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -74,7 +81,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['business:userRegister:export']"
-        >{{ $t('common.button.export') }}</el-button>
+        >{{ $t('common.button.export') }}
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -85,49 +93,70 @@
       <el-table-column :label="$t('business.agent.agentRegister.agentName')" align="center" prop="agentName"/>
       <el-table-column :label="$t('business.agent.agentRegister.status')" align="center" prop="status">
         <template slot-scope="scope">
-          <el-tag type="primary" v-if="scope.row.status == '0'">{{ $t('business.agent.agentRegister.statusOption.initiated') }}</el-tag>
-          <el-tag type="warning" v-if="scope.row.status == '1'">{{ $t('business.agent.agentRegister.statusOption.rejected') }}</el-tag>
-          <el-tag type="success" v-if="scope.row.status == '2'">{{ $t('business.agent.agentRegister.statusOption.passed') }}</el-tag>
-          <el-tag type="danger" v-if="scope.row.status == '3'">{{ $t('business.agent.agentRegister.statusOption.frozen') }}</el-tag>
+          <el-tag type="primary" v-if="scope.row.status == '0'">
+            {{ $t('business.agent.agentRegister.statusOption.initiated') }}
+          </el-tag>
+          <el-tag type="warning" v-if="scope.row.status == '1'">
+            {{ $t('business.agent.agentRegister.statusOption.rejected') }}
+          </el-tag>
+          <el-tag type="success" v-if="scope.row.status == '2'">
+            {{ $t('business.agent.agentRegister.statusOption.passed') }}
+          </el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '3'">{{
+              $t('business.agent.agentRegister.statusOption.frozen')
+            }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('business.agent.agentRegister.userType')" align="center" prop="userType">
         <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.userType == '0'">{{ $t('business.agent.agentRegister.userTypeOption.normal') }}</el-tag>
-          <el-tag type="warning" v-if="scope.row.userType == '1'">{{ $t('business.agent.agentRegister.userTypeOption.business') }}</el-tag>
-          <el-tag type="warning" v-if="scope.row.userType == '2'">{{ $t('business.agent.agentRegister.userTypeOption.agent') }}</el-tag>
+          <el-tag type="success" v-if="scope.row.userType == '0'">
+            {{ $t('business.agent.agentRegister.userTypeOption.normal') }}
+          </el-tag>
+          <el-tag type="warning" v-if="scope.row.userType == '1'">
+            {{ $t('business.agent.agentRegister.userTypeOption.business') }}
+          </el-tag>
+          <el-tag type="warning" v-if="scope.row.userType == '2'">
+            {{ $t('business.agent.agentRegister.userTypeOption.agent') }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('business.agent.agentRegister.userLevel')" align="center" prop="userLevel">
         <template slot-scope="scope">
           <span v-if="scope.row.userLevel == '0'">{{ $t('business.agent.agentRegister.userLevelOption.normal') }}</span>
           <span v-if="scope.row.userLevel == '1'">{{ $t('business.agent.agentRegister.userLevelOption.vip') }}</span>
-          <span v-if="scope.row.userLevel == '2'">{{ $t('business.agent.agentRegister.userLevelOption.business') }}</span>
+          <span v-if="scope.row.userLevel == '2'">{{
+              $t('business.agent.agentRegister.userLevelOption.business')
+            }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('business.agent.agentRegister.phone')" align="center" prop="phone"/>
       <el-table-column :label="$t('business.agent.agentRegister.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">
-          <el-button v-if="(scope.row.agentName == null)"
+          <el-button v-if="(scope.row.agentName == '' || scope.row.agentName == null)"
                      size="mini"
                      type="text"
                      icon="el-icon-document-add"
                      @click="handleAddInfo(scope.row)"
-          >{{ $t('business.agent.agentRegister.button.supplement') }}</el-button>
-          <el-button v-if="(scope.row.agentName != null)"
+          >{{ $t('business.agent.agentRegister.button.supplement') }}
+          </el-button>
+          <el-button v-if="(scope.row.agentName != '' && scope.row.agentName != null)"
                      size="mini"
                      type="text"
                      icon="el-icon-view"
                      @click="handleDetail(scope.row)"
-             >{{ $t('common.button.detail') }}</el-button>
+          >{{ $t('common.button.detail') }}
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:userRegister:edit']"
-          >{{ $t('common.button.edit') }}</el-button>
+          >{{ $t('common.button.edit') }}
+          </el-button>
           <el-dropdown>
             <span class="el-dropdown-link">
               {{ $t('common.button.more') }}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -140,7 +169,8 @@
                   icon="el-icon-refresh"
                   @click="passwordReset(scope.row)"
                   v-hasPermi="['business:userRegister:edit']"
-                >{{ $t('business.agent.agentRegister.button.passwordReset') }}</el-button>
+                >{{ $t('business.agent.agentRegister.button.passwordReset') }}
+                </el-button>
               </el-dropdown-item>
               <el-dropdown-item>
                 <el-button v-if="(scope.row.status != '3')"
@@ -149,14 +179,16 @@
                            icon="el-icon-lock"
                            @click="accountLock(scope.row)"
                            v-hasPermi="['business:userRegister:edit']"
-              >{{ $t('business.agent.agentRegister.button.accountLock') }}</el-button>
+                >{{ $t('business.agent.agentRegister.button.accountLock') }}
+                </el-button>
                 <el-button v-if="(scope.row.status == '3')"
                            size="mini"
                            type="text"
                            icon="el-icon-unlock"
                            @click="accountUnlock(scope.row)"
                            v-hasPermi="['business:userRegister:edit']"
-              >{{ $t('business.agent.agentRegister.button.accountUnlock') }}</el-button>
+                >{{ $t('business.agent.agentRegister.button.accountUnlock') }}
+                </el-button>
               </el-dropdown-item>
               <el-dropdown-item>
                 <el-button
@@ -165,7 +197,8 @@
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['business:userRegister:remove']"
-                >{{ $t('common.button.delete') }}</el-button>
+                >{{ $t('common.button.delete') }}
+                </el-button>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -201,7 +234,8 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('business.agent.agentRegister.userLevel')" prop="userLevel">
-          <el-select v-model="form.userLevel" size="medium" :placeholder="$t('business.agent.agentRegister.placeholder.userLevel')" >
+          <el-select v-model="form.userLevel" size="medium"
+                     :placeholder="$t('business.agent.agentRegister.placeholder.userLevel')">
             <el-option
               v-for="item in options_userLevel"
               :key="item.value"
@@ -212,45 +246,50 @@
         </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>
 
-    <!-- 添加或修改用户信息-商户扩展对话框 -->
+    <!-- 添加或修改代理商信息 -->
     <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-input v-model="formInfoAgent.agentName"
+                    :placeholder="$t('business.agent.agentRegister.placeholder.agentName')"/>
         </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 :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.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">
-        <el-button :loading="buttonLoading" type="primary" @click="submitFormInfoAgent">{{ $t('common.button.confirm') }}</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="submitFormInfoAgent">{{
+            $t('common.button.confirm')
+          }}
+        </el-button>
         <el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button>
       </div>
     </el-dialog>
@@ -258,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>
-        <el-form-item :label="$t('business.agent.agentRegister.legalPerson') + '：'">
-          {{formDetailAgent.userInfoAgentVo.legalPerson}}
+        <el-form-item :label="$t('business.userManager.userInfo.email')">
+          {{ formDetailAgent.userInfoAgentVo.email}}
         </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>
@@ -296,12 +333,9 @@ import {
   delUserRegister,
   addUserRegister,
   updateUserRegister,
-  addUserInfo,
-  addUserInfoBus,
   resetUserPassword,
   accountLock,
-  listUserRegisterBus,
-  listUserRegisterAgent, addUserInfoAgen
+  listUserRegisterAgent, addUserInfoAgen, getAddress
 } from "@/api/business/userRegister";
 
 export default {
@@ -334,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')
@@ -378,8 +470,21 @@ 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, message: this.$t('business.agent.agentRegister.rule.operateStatusRequired'), trigger: "change" }
+          {
+            required: true,
+            message: this.$t('business.agent.agentRegister.rule.operateStatusRequired'),
+            trigger: "change"
+          }
         ],
         operateAddr: [
           {required: true, message: this.$t('business.agent.agentRegister.rule.operateAddrRequired'), trigger: "blur"}
@@ -388,19 +493,35 @@ export default {
           {required: true, message: this.$t('business.agent.agentRegister.rule.agentNameRequired'), trigger: "blur"}
         ],
         idCard: [
-          { required: true,pattern: /^\d+$/, message: this.$t('business.agent.agentRegister.rule.idCardInvalid'), trigger: "blur" }
+          {
+            required: true,
+            pattern: /^\d+$/,
+            message: this.$t('business.agent.agentRegister.rule.idCardInvalid'),
+            trigger: "blur"
+          }
         ],
         phone: [
-          { required: true,pattern: /^\d+$/, message: this.$t('business.agent.agentRegister.rule.phoneInvalid'), trigger: "blur"}
+          {
+            required: true,
+            pattern: /^\d+$/,
+            message: this.$t('business.agent.agentRegister.rule.phoneInvalid'),
+            trigger: "blur"
+          }
         ],
         age: [
-          { required: true,pattern: /^\d+$/, message: this.$t('business.agent.agentRegister.rule.ageInvalid'), trigger: "blur"}
+          {
+            required: true,
+            pattern: /^\d+$/,
+            message: this.$t('business.agent.agentRegister.rule.ageInvalid'),
+            trigger: "blur"
+          }
         ],
         contactAddress: [
-          { required: true, message: this.$t('business.agent.agentRegister.rule.contactAddressRequired'), trigger: "blur" }
-        ],
-        merchantName: [
-          { required: true, message: this.$t('business.agent.agentRegister.rule.merchantNameRequired'), trigger: "blur" }
+          {
+            required: true,
+            message: this.$t('business.agent.agentRegister.rule.contactAddressRequired'),
+            trigger: "blur"
+          }
         ],
       },
       options_userType: [{
@@ -421,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;
@@ -532,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;
@@ -627,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;
     }
   }
 };
@@ -637,6 +777,7 @@ export default {
   cursor: pointer;
   color: #409EFF;
 }
+
 .el-icon-arrow-down {
   font-size: 12px;
 }

src/views/business/userRegister/indexBus.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.merchant.indexBus.account')" prop="account">
+      <el-form-item :label="$t('business.merchant.indexBus.account')" prop="account" label-width="auto">
         <el-input
           v-model="queryParams.account"
           :placeholder="$t('business.merchant.indexBus.accountPlaceholder')"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.merchant.indexBus.phone')" prop="phone">
+      <el-form-item :label="$t('business.merchant.indexBus.phone')" prop="phone" label-width="auto">
         <el-input
           v-model="queryParams.phone"
           :placeholder="$t('business.merchant.indexBus.phonePlaceholder')"
@@ -17,8 +17,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.merchant.indexBus.userLevel')" prop="userLevel">
-        <el-select v-model="queryParams.userLevel" size="medium" :placeholder="$t('business.merchant.indexBus.userLevelPlaceholder')" >
+      <el-form-item :label="$t('business.merchant.indexBus.userLevel')" prop="userLevel" label-width="auto">
+        <el-select v-model="queryParams.userLevel" size="medium"
+                   :placeholder="$t('business.merchant.indexBus.userLevelPlaceholder')">
           <el-option
             v-for="item in options_userLevel"
             :key="item.value"
@@ -28,7 +29,10 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{
+            $t('common.button.search')
+          }}
+        </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button>
       </el-form-item>
     </el-form>
@@ -42,7 +46,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['business:userRegister:add']"
-        >{{ $t('common.button.add') }}</el-button>
+        >{{ $t('common.button.add') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -53,7 +58,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['business:userRegister:edit']"
-        >{{ $t('common.button.edit') }}</el-button>
+        >{{ $t('common.button.edit') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -64,7 +70,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['business:userRegister:remove']"
-        >{{ $t('common.button.delete') }}</el-button>
+        >{{ $t('common.button.delete') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -74,7 +81,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['business:userRegister:export']"
-        >{{ $t('common.button.export') }}</el-button>
+        >{{ $t('common.button.export') }}
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -85,16 +93,34 @@
       <el-table-column :label="$t('business.merchant.indexBus.merchantName')" align="center" prop="merchantName"/>
       <el-table-column :label="$t('business.merchant.indexBus.status')" align="center" prop="status">
         <template slot-scope="scope">
-          <el-tag type="primary" v-if="scope.row.status == '0'">{{ $t('business.merchant.indexBus.statusInitiated') }}</el-tag>
-          <el-tag type="warning" v-if="scope.row.status == '1'">{{ $t('business.merchant.indexBus.statusRejected') }}</el-tag>
-          <el-tag type="success" v-if="scope.row.status == '2'">{{ $t('business.merchant.indexBus.statusApproved') }}</el-tag>
-          <el-tag type="danger" v-if="scope.row.status == '3'">{{ $t('business.merchant.indexBus.statusFrozen') }}</el-tag>
+          <el-tag type="primary" v-if="scope.row.status == '0'">{{
+              $t('business.merchant.indexBus.statusInitiated')
+            }}
+          </el-tag>
+          <el-tag type="warning" v-if="scope.row.status == '1'">{{
+              $t('business.merchant.indexBus.statusRejected')
+            }}
+          </el-tag>
+          <el-tag type="success" v-if="scope.row.status == '2'">{{
+              $t('business.merchant.indexBus.statusApproved')
+            }}
+          </el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '3'">{{
+              $t('business.merchant.indexBus.statusFrozen')
+            }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('business.merchant.indexBus.userType')" align="center" prop="userType">
         <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.userType == '0'">{{ $t('business.merchant.indexBus.userTypeNormal') }}</el-tag>
-          <el-tag type="warning" v-if="scope.row.userType == '1'">{{ $t('business.merchant.indexBus.userTypeEnterprise') }}</el-tag>
+          <el-tag type="success" v-if="scope.row.userType == '0'">{{
+              $t('business.merchant.indexBus.userTypeNormal')
+            }}
+          </el-tag>
+          <el-tag type="warning" v-if="scope.row.userType == '1'">{{
+              $t('business.merchant.indexBus.userTypeEnterprise')
+            }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('business.merchant.indexBus.userLevel')" align="center" prop="userLevel">
@@ -106,28 +132,35 @@
       </el-table-column>
       <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.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('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">
         <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.merchantName == '' || scope.row.merchantName == null)"
             size="mini"
             type="text"
             icon="el-icon-document-add"
             @click="handleAddInfo(scope.row)"
-          >{{ $t('business.userManager.userRegister.supplement') }}</el-button>
-          <el-button v-if="(scope.row.addressInfo != '' && scope.row.userType == '0') || (scope.row.address != '' && scope.row.userType == '1')"
+          >{{ $t('business.userManager.userRegister.supplement') }}
+          </el-button>
+          <el-button
+            v-if="(scope.row.merchantName != '' && scope.row.merchantName != null)"
             size="mini"
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row)"
-          >{{ $t('common.button.detail') }}</el-button>
+          >{{ $t('common.button.detail') }}
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:userRegister:edit']"
-          >{{ $t('common.button.edit') }}</el-button>
+          >{{ $t('common.button.edit') }}
+          </el-button>
           <el-dropdown>
             <span class="el-dropdown-link">
               {{ $t('common.button.more') }}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -140,7 +173,8 @@
                   icon="el-icon-refresh"
                   @click="passwordReset(scope.row)"
                   v-hasPermi="['business:userRegister:edit']"
-                >{{ $t('business.common.passwordReset') }}</el-button>
+                >{{ $t('business.common.passwordReset') }}
+                </el-button>
               </el-dropdown-item>
               <el-dropdown-item>
                 <el-button v-if="(scope.row.status != '3')"
@@ -149,14 +183,16 @@
                            icon="el-icon-lock"
                            @click="accountLock(scope.row)"
                            v-hasPermi="['business:userRegister:edit']"
-                >{{ $t('business.common.accountFreezing') }}</el-button>
+                >{{ $t('business.common.accountFreezing') }}
+                </el-button>
                 <el-button v-if="(scope.row.status == '3')"
                            size="mini"
                            type="text"
                            icon="el-icon-unlock"
                            @click="accountUnlock(scope.row)"
                            v-hasPermi="['business:userRegister:edit']"
-                >{{ $t('business.common.accountUnfreezing') }}</el-button>
+                >{{ $t('business.common.accountUnfreezing') }}
+                </el-button>
               </el-dropdown-item>
               <el-dropdown-item>
                 <el-button
@@ -165,7 +201,8 @@
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['business:userRegister:remove']"
-                >{{ $t('common.button.delete') }}</el-button>
+                >{{ $t('common.button.delete') }}
+                </el-button>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -201,7 +238,8 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('business.merchant.indexBus.userLevel')" prop="userLevel">
-          <el-select v-model="form.userLevel" size="medium" :placeholder="$t('business.merchant.indexBus.userLevelPlaceholder')" >
+          <el-select v-model="form.userLevel" size="medium"
+                     :placeholder="$t('business.merchant.indexBus.userLevelPlaceholder')">
             <el-option
               v-for="item in options_userLevel"
               :key="item.value"
@@ -212,77 +250,51 @@
         </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>
 
-    <!--添加商户注册信息弹窗-->
-    <el-dialog :title="title" :visible.sync="openInfo" width="700px" append-to-body>
-      <el-form ref="formInfo" :model="formInfo" :rules="rules" label-width="auto">
-        <el-form-item :label="$t('business.merchant.indexBus.name')" prop="name">
-          <el-input v-model="formInfo.name" :placeholder="$t('business.merchant.indexBus.namePlaceholder')" />
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.gender')" prop="gender">
-          <el-select v-model="formInfo.gender" :placeholder="$t('business.merchant.indexBus.genderPlaceholder')">
-            <el-option :label="$t('business.merchant.indexBus.genderMale')" value="1"></el-option>
-            <el-option :label="$t('business.merchant.indexBus.genderFemale')" value="0"></el-option>
-          </el-select>
-          <!--          <el-input v-model="form.gender" :placeholder="$t('business.merchant.indexBus.genderPlaceholder')" />-->
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.idCard')" prop="idCard">
-          <el-input v-model="formInfo.idCard" :placeholder="$t('business.merchant.indexBus.idCardPlaceholder')" />
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.phone')" prop="phone">
-          <el-input v-model="formInfo.phone" :placeholder="$t('business.merchant.indexBus.phonePlaceholder')" />
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.age')" prop="age">
-          <el-input v-model="formInfo.age" :placeholder="$t('business.merchant.indexBus.agePlaceholder')" />
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.addr')" prop="addr">
-          <el-input v-model="formInfo.addr" :placeholder="$t('business.merchant.indexBus.addrPlaceholder')" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitFormInfo">{{ $t('common.button.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button>
-      </div>
-    </el-dialog>
 
     <!-- 添加或修改用户信息-商户扩展对话框 -->
     <el-dialog :title="title" :visible.sync="openInfoBus" width="700px" append-to-body>
       <el-form ref="formInfoBus" :model="formInfoBus" :rules="rules" label-width="auto">
         <el-form-item :label="$t('business.merchant.indexBus.merchantNameLabel')" prop="merchantName">
-          <el-input v-model="formInfoBus.merchantName" :placeholder="$t('business.merchant.indexBus.merchantNamePlaceholder')" />
+          <el-input v-model="formInfoBus.merchantName"
+                    :placeholder="$t('business.merchant.indexBus.merchantNamePlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.licenseLabel')" prop="license">
-          <el-input v-model="formInfoBus.license" :placeholder="$t('business.merchant.indexBus.licensePlaceholder')" />
+        <el-form-item :label="$t('business.userManager.userInfo.email')" prop="email">
+          <el-input v-model="formInfoBus.email" :placeholder="$t('business.userManager.userInfo.emailPlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.licenseOtherLabel')" prop="licenseOther">
-          <el-input v-model="formInfoBus.licenseOther" :placeholder="$t('business.merchant.indexBus.licenseOtherPlaceholder')" />
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.legalPersonLabel')" prop="legalPerson">
-          <el-input v-model="formInfoBus.legalPerson" :placeholder="$t('business.merchant.indexBus.legalPersonPlaceholder')" />
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.operateStatusLabel')" prop="operateStatus">
-          <el-select v-model="formInfoBus.operateStatus" :placeholder="$t('business.merchant.indexBus.operateStatusPlaceholder')" >
+        <el-form-item :label="$t('business.merchant.indexBus.operateTypeLabel')" prop="operateType">
+          <el-select v-model="formInfoBus.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.merchant.indexBus.operateAddrLabel')" prop="operateAddr">
-          <el-input v-model="formInfoBus.operateAddr" :placeholder="$t('business.merchant.indexBus.operateAddrPlaceholder')" />
+        <el-form-item :label="$t('business.merchant.indexBus.addr')" prop="contactAddress">
+          <el-cascader
+            v-model="formInfoBus.contactAddress"
+            :options="options_addr"
+            @change="handleChange"></el-cascader>
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.contactAddress')" prop="contactAddress">
-          <el-input v-model="formInfoBus.contactAddress" :placeholder="$t('business.userManager.userRegister.contactAddressPlaceholder')" />
+        <el-form-item :label="$t('business.userManager.userInfo.detailAddr')" prop="detail">
+          <el-input v-model="formInfoBus.detail" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitFormInfoBus">{{ $t('common.button.confirm') }}</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="submitFormInfoBus">{{
+            $t('common.button.confirm')
+          }}
+        </el-button>
         <el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button>
       </div>
     </el-dialog>
@@ -296,20 +308,18 @@
         <el-form-item :label="$t('business.merchant.indexBus.merchantNameLabel')">
           {{ formDetailBus.userInfoBusVo.merchantName }}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.licenseLabel')">
-          {{formDetailBus.userInfoBusVo.license}}
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.licenseOtherLabel')">
-          {{formDetailBus.userInfoBusVo.licenseOther}}
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.legalPersonLabel')">
-          {{formDetailBus.userInfoBusVo.legalPerson}}
-        </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.operateStatusLabel')">
-          {{formDetailBus.userInfoBusVo.operateStatus}}
+        <el-form-item :label="$t('business.userManager.userInfo.email')">
+          {{ formDetailBus.userInfoBusVo.email}}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.indexBus.operateAddrLabel')">
-          {{formDetailBus.userInfoBusVo.operateAddr}}
+        <el-form-item :label="$t('business.merchant.indexBus.operateTypeLabel')">
+          <el-select v-model="formDetailBus.userInfoBusVo.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.merchant.indexBus.contactAddress')">
           {{ formDetailBus.userInfoBusVo.contactAddress }}
@@ -332,7 +342,8 @@ import {
   addUserInfoBus,
   resetUserPassword,
   accountLock,
-  listUserRegisterBus
+  listUserRegisterBus,
+  getAddress
 } from "@/api/business/userRegister";
 
 export default {
@@ -355,6 +366,8 @@ export default {
       total: 0,
       // 用户注册表格数据
       userRegisterList: [],
+      //地址选择列表
+      options_addr:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -367,13 +380,61 @@ export default {
       openInfo: false,
       // 是否展示用户信息弹窗层-商企
       openInfoBus: false,
-      options_operateStatus: [{
-        value: '存续',
-        label: this.$t('business.merchant.indexBus.operateStatusExist')
+      options_operateType: [{
+        value: '0',
+        label: this.$t('common.operateType.type0')
       }, {
-        value: '注销',
-        label: this.$t('business.merchant.indexBus.operateStatusCancel')
-      }],
+        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')
+      },],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -414,11 +475,11 @@ export default {
         userLevel: [
           {required: true, message: this.$t('business.merchant.indexBus.userLevelRequired'), trigger: "change"}
         ],
-        legalPerson: [
-          { required: true, message: this.$t('business.merchant.indexBus.legalPersonRequired'), trigger: "blur" }
+        operateType: [
+          {required: true, message: this.$t('business.merchant.indexBus.operateTypeRequired'), trigger: "change"}
         ],
-        operateStatus: [
-          { required: true, message: this.$t('business.merchant.indexBus.operateStatusRequired'), 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" }
         ],
         operateAddr: [
           {required: true, message: this.$t('business.merchant.indexBus.operateAddrRequired'), trigger: "blur"}
@@ -430,13 +491,28 @@ export default {
           {required: true, message: this.$t('business.merchant.indexBus.genderRequired'), trigger: "blur"}
         ],
         idCard: [
-          { required: true,pattern: /^\d+$/, message: this.$t('business.merchant.indexBus.idCardNumberOnly'), trigger: "blur" }
+          {
+            required: true,
+            pattern: /^\d+$/,
+            message: this.$t('business.merchant.indexBus.idCardNumberOnly'),
+            trigger: "blur"
+          }
         ],
         phone: [
-          { required: true,pattern: /^\d+$/, message: this.$t('business.merchant.indexBus.phoneNumberOnly'), trigger: "blur"}
+          {
+            required: true,
+            pattern: /^\d+$/,
+            message: this.$t('business.merchant.indexBus.phoneNumberOnly'),
+            trigger: "blur"
+          }
         ],
         age: [
-          { required: true,pattern: /^\d+$/, message: this.$t('business.merchant.indexBus.ageNumberOnly'), trigger: "blur"}
+          {
+            required: true,
+            pattern: /^\d+$/,
+            message: this.$t('business.merchant.indexBus.ageNumberOnly'),
+            trigger: "blur"
+          }
         ],
         addr: [
           {required: true, message: this.$t('business.merchant.indexBus.addrRequired'), trigger: "blur"}
@@ -444,6 +520,9 @@ export default {
         contactAddress: [
           {required: true, message: this.$t('business.merchant.indexBus.contactAddressRequired'), trigger: "blur"}
         ],
+        detail: [
+          {required: true, message: this.$t('business.merchant.indexBus.contactAddressRequired'), trigger: "blur"}
+        ],
         merchantName: [
           {required: true, message: this.$t('business.merchant.indexBus.merchantNameRequired'), trigger: "blur"}
         ],
@@ -466,11 +545,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;
       listUserRegisterBus(this.queryParams).then(response => {
         this.userRegisterList = response.rows;
         this.total = response.total;
@@ -581,24 +667,11 @@ 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 => {
         if (valid) {
+          this.formInfoBus.contactAddress = this.formInfoBus.contactAddress + "," + this.formInfoBus.detail;
           addUserInfoBus(this.formInfoBus).then(response => {
             this.$modal.msgSuccess(this.$t('common.promptMsg.addSuccess'));
             this.openInfoBus = false;
@@ -700,6 +773,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;
     }
   }
 };
@@ -710,6 +794,7 @@ export default {
   cursor: pointer;
   color: #409EFF;
 }
+
 .el-icon-arrow-down {
   font-size: 12px;
 }

src/views/business/userVerification/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.userManager.userVerification.account')" prop="account">
+      <el-form-item :label="$t('business.userManager.userVerification.account')" prop="account" label-width="auto">
         <el-input
           v-model="queryParams.account"
           :placeholder="$t('business.userManager.userVerification.accountPlaceholder')"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('business.userManager.userVerification.idCard')" prop="idCardNumber">
+      <el-form-item :label="$t('business.userManager.userVerification.idCard')" prop="idCardNumber" label-width="auto">
         <el-input
           v-model="queryParams.idCardNumber"
           :placeholder="$t('business.userManager.userVerification.idCardPlaceholder')"
@@ -54,8 +54,6 @@
       <el-table-column :label="$t('business.userManager.userVerification.account')" align="center" prop="userAccount"/>
       <el-table-column :label="$t('business.userManager.userVerification.name')" align="center" prop="userInfoName"/>
       <el-table-column :label="$t('business.userManager.userVerification.idCard')" align="center" prop="idCard"/>
-      <el-table-column :label="$t('business.userManager.userVerification.nationality')" align="center"
-                       prop="nationality"/>
       <el-table-column :label="$t('business.userManager.userVerification.biometrics')" align="center" prop="status">
         <template slot-scope="scope">
           <el-tag type="danger" v-if="scope.row.biometrics == '0'">
@@ -66,26 +64,32 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('business.userManager.userVerification.idCardVerification')" align="center"
+      <el-table-column :label="$t('business.userManager.userVerification.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.userManager.userVerification.statusUnverified') }}
           </el-tag>
-          <el-tag type="success" v-if="scope.row.status == '1'">
+          <el-tag type="warning" v-if="scope.row.status == '1'">
             {{ $t('business.userManager.userVerification.statusPending') }}
           </el-tag>
-          <el-tag type="danger" v-if="scope.row.status == '2'">
+          <el-tag type="success" v-if="scope.row.status == '2'">
             {{ $t('business.userManager.userVerification.statusVerified') }}
           </el-tag>
-          <el-tag type="warning" v-if="scope.row.status == '3'">
+          <el-tag type="danger" v-if="scope.row.status == '3'">
             {{ $t('business.userManager.userVerification.statusFailed') }}
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('business.userManager.userVerification.certificateExpirationDate')" align="center"
+                       prop="expirationTime" width="180">
+      </el-table-column>
       <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"
@@ -134,20 +138,40 @@
           <el-input v-model="form.idCardNumber"
                     :placeholder="$t('business.userManager.userVerification.idCardPlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.nationality')" prop="nationality">
-          <el-input v-model="form.nationality"
-                    :placeholder="$t('business.userManager.userVerification.nationalityPlaceholder')"/>
+        <el-form-item :label="$t('business.userManager.userVerification.certificateStartDate')" prop="dateOfIssue">
+          <el-date-picker clearable
+                          v-model="form.dateOfIssue"
+                          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 :label="$t('business.userManager.userVerification.birthDate')" prop="birthDate">
+        <el-form-item :label="$t('business.userManager.userVerification.certificateEndDate')" prop="expirationTime">
           <el-date-picker clearable
-                          v-model="form.birthDate"
+                          v-model="form.expirationTime"
                           type="date"
                           format="dd/MM/yyyy"
                           value-format="dd/MM/yyyy"
-                          :placeholder="$t('business.userManager.userVerification.birthDatePlaceholder')">
+                          :placeholder="$t('business.userManager.userVerification.expirationTimeRequired')">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.idCardFront')" prop="idCardFrontImagePath">
+        <el-form-item :label="$t('business.userManager.userVerification.contactAddress')" prop="commonContactAddress">
+          <el-cascader
+            v-model="form.commonContactAddress"
+            :options="options_addr"
+            @change="handleChange"></el-cascader>
+        </el-form-item>
+        <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">
+            <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.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardFront')" prop="idCardFrontImagePath">
           <el-upload
             class="upload-demo"
             :action="uploadUrl"
@@ -160,7 +184,7 @@
             <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-form-item v-if="form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardBack')" prop="idCardBackImagePath">
           <el-upload
             class="upload-demo"
             :action="uploadUrl"
@@ -173,7 +197,7 @@
             <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-form-item v-if="form.licenseType == '1'" :label="$t('business.userManager.userVerification.idCardHolding')" prop="userWithIdCardImagePath">
           <el-upload
             class="upload-demo"
             :action="uploadUrl"
@@ -186,6 +210,19 @@
             <div slot="tip" class="el-upload__tip">只能上传JPG/PNG文件，且不超过5M</div>
           </el-upload>
         </el-form-item>
+        <el-form-item v-if="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>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">{{
@@ -199,32 +236,36 @@
     <!--  实名审核  -->
     <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.userManager.userVerification.registerName')">
-          {{ auditForm.userInfoName }}
-        </el-form-item>
         <el-form-item :label="$t('business.userManager.userVerification.verifyName')">
           {{ auditForm.fullName }}
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.registerIdCard')">
-          {{ auditForm.idCardShow }}
-        </el-form-item>
         <el-form-item :label="$t('business.userManager.userVerification.verifyIdCard')">
           {{ auditForm.idCardNumber }}
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.nationality')">
-          {{ auditForm.nationality }}
+        <el-form-item :label="$t('business.userManager.userVerification.certificateStartDate')">
+          {{ auditForm.dateOfIssue }}
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.birthDate')">
-          {{ auditForm.birthDate }}
+        <el-form-item :label="$t('business.userManager.userVerification.certificateEndDate')">
+          {{ auditForm.expirationTime }}
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.idCardFront')">
-            <el-image style="width: 90px; height: 30px" :src="auditForm.idCardFrontImagePath" :preview-src-list="[auditForm.idCardFrontImagePath]"/>
+        <el-form-item :label="$t('business.userManager.userVerification.contactAddress')">
+          {{ auditForm.commonContactAddressShow }}
         </el-form-item>
-        <el-form-item :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.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>
-        <el-form-item :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.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>
+        <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>
+        <el-form-item v-if="auditForm.licenseType == 0" :label="$t('business.userManager.userVerification.license')">
+          <el-image style="width: 90px; height: 30px" :src="auditForm.passportImagePath"
+            :preview-src-list="[auditForm.passportImagePath]" />
         </el-form-item>
         <el-form-item :label="$t('business.userManager.userVerification.failureReason')" prop="failureReason">
           <el-input v-model="auditForm.failureReason"
@@ -250,20 +291,30 @@
         <el-form-item :label="$t('business.userManager.userVerification.idCard')">
           {{ form.idCard }}
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.nationality')">
-          {{ form.nationality }}
+        <el-form-item :label="$t('business.userManager.userVerification.certificateStartDate')">
+          {{ form.dateOfIssue }}
+        </el-form-item>
+        <el-form-item :label="$t('business.userManager.userVerification.certificateEndDate')">
+          {{ form.expirationTime }}
         </el-form-item>
-        <el-form-item :label="$t('business.userManager.userVerification.birthDate')">
-          {{ form.birthDate }}
+        <el-form-item :label="$t('business.userManager.userVerification.contactAddress')">
+          {{ form.commonContactAddressShow }}
         </el-form-item>
-        <el-form-item :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.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>
-        <el-form-item :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" :label="$t('business.userManager.userVerification.idCardBack')">
+          <el-image style="width: 90px; height: 30px" :src="form.idCardBackImagePath"
+            :preview-src-list="[form.idCardBackImagePath]" />
         </el-form-item>
-        <el-form-item :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" :label="$t('business.userManager.userVerification.idCardHolding')">
+          <el-image style="width: 90px; height: 30px" :src="form.userWithIdCardImagePath"
+            :preview-src-list="[form.userWithIdCardImagePath]" />
+        </el-form-item>
+        <el-form-item v-if="form.licenseType == 0" :label="$t('business.userManager.userVerification.license')">
+          <el-image style="width: 90px; height: 30px" :src="form.passportImagePath"
+            :preview-src-list="[form.passportImagePath]" />
         </el-form-item>
         <el-form-item :label="$t('business.userManager.userVerification.biometrics')">
           <el-tag type="danger" v-if="form.biometrics == '0'">
@@ -291,9 +342,9 @@ import {
   delUserVerification,
   addUserVerification,
   updateUserVerification,
-  userVerificationAudit
+  userVerificationAudit,
+  getAddress
 } from "@/api/business/userVerification";
-import {merchantAudit} from "@/api/business/merchantVerification";
 
 export default {
   name: "UserVerification",
@@ -305,6 +356,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      //地址选择列表
+      options_addr:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -360,13 +413,23 @@ export default {
         fullName: [
           {required: true, message: this.$t('business.userManager.userVerification.nameRequired'), trigger: "blur"}
         ],
-        birthDate: [
-          {required: true, message: this.$t('business.userManager.userVerification.birthDateRequired'), trigger: "blur"}
+        expirationTime: [
+          {required: true, message: this.$t('business.userManager.userVerification.expirationTimeRequired'), trigger: "blur"}
+        ],
+        dateOfIssue: [
+          {required: true, message: this.$t('business.userManager.userVerification.dateOfIssueRequired'), trigger: "blur"}
+        ],
+        commonContactAddress: [
+          {
+            required: true,
+            message: this.$t('business.userManager.userInfo.addrRequired'),
+            trigger: "blur"
+          }
         ],
-        nationality: [
+        commonContactAddressDetail: [
           {
             required: true,
-            message: this.$t('business.userManager.userVerification.nationalityRequired'),
+            message: this.$t('business.userManager.userInfo.addrRequired'),
             trigger: "blur"
           }
         ],
@@ -403,6 +466,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getAddress();
   },
   computed: {
     // 计算属性：动态生成上传URL
@@ -417,6 +481,12 @@ export default {
     /** 查询实名认证列表 */
     getList() {
       this.loading = true;
+      const languageMap = {
+        'zh': 1,
+        'en': 2,
+        'la': 3
+      };
+      this.queryParams.language = languageMap[this.$i18n.locale] || null;
       listUserVerification(this.queryParams).then(response => {
         this.userVerificationList = response.rows;
         this.total = response.total;
@@ -451,7 +521,8 @@ export default {
         updateTime: undefined,
         createBy: undefined,
         updateBy: undefined,
-        delFlag: undefined
+        delFlag: undefined,
+        licenseType: 1
       };
       this.resetForm("form");
     },
@@ -476,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 {
@@ -516,6 +608,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.commonContactAddress = this.form.commonContactAddress + "," + this.form.commonContactAddressDetail;
           this.buttonLoading = true;
           if (this.form.id != null) {
             updateUserVerification(this.form).then(response => {
@@ -615,6 +708,23 @@ export default {
       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 到表单
+      }
+    },
+    /** 获取地址列表 */
+    getAddress() {
+      this.loading = true;
+      getAddress(this.$i18n.locale).then(response => {
+        this.options_addr = response.data;
+      });
+    },
+    /** 地址联动事件 **/
+    handleChange(value) {
+      this.form.addr = value;
     }
   }
 };

src/views/business/walletLimitConfig/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 搜索列 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.deal.limit.wallet.userType')" prop="userType" label-width="100px">
+      <el-form-item :label="$t('business.deal.limit.wallet.userType')" prop="userType" label-width="auto">
         <el-select v-model="queryParams.userType" :placeholder="$t('business.deal.limit.wallet.selectUserType')"
                    clearable filterable>
           <el-option
@@ -13,7 +13,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('business.deal.limit.wallet.isActive')" prop="isActive" label-width="150px">
+      <el-form-item :label="$t('business.deal.limit.wallet.isActive')" prop="isActive" label-width="auto">
         <el-select v-model="queryParams.isActive" :placeholder="$t('business.deal.limit.wallet.selectIsActive')"
                    clearable filterable>
           <el-option

src/views/system/dept/index.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item :label="$t('system.dept.deptName')" prop="deptName">
+      <el-form-item :label="$t('system.systemManager.dept.deptName')" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
-          :placeholder="$t('system.dept.inputDeptName')"
+          :placeholder="$t('system.systemManager.dept.inputDeptName')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('system.dept.status')" prop="status">
-        <el-select v-model="queryParams.status" :placeholder="$t('system.dept.deptStatus')" clearable>
+      <el-form-item :label="$t('system.systemManager.dept.status')" prop="status">
+        <el-select v-model="queryParams.status" :placeholder="$t('system.systemManager.dept.deptStatus')" clearable>
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -45,7 +45,7 @@
           icon="el-icon-sort"
           size="mini"
           @click="toggleExpandAll"
-        >{{ $t('system.dept.expandCollapse') }}
+        >{{ $t('system.systemManager.dept.expandCollapse') }}
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -59,9 +59,9 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column prop="deptName" :label="$t('system.dept.deptName')" width="260"></el-table-column>
-      <el-table-column prop="orderNum" :label="$t('system.dept.orderNum')" width="200"></el-table-column>
-      <el-table-column prop="status" :label="$t('system.dept.status')" width="100">
+      <el-table-column prop="deptName" :label="$t('system.systemManager.dept.deptName')" width="260"></el-table-column>
+      <el-table-column prop="orderNum" :label="$t('system.systemManager.dept.orderNum')" width="200"></el-table-column>
+      <el-table-column prop="status" :label="$t('system.systemManager.dept.status')" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>
@@ -107,44 +107,44 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
-            <el-form-item :label="$t('system.dept.parentDept')" prop="parentId">
+            <el-form-item :label="$t('system.systemManager.dept.parentDept')" prop="parentId">
               <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer"
-                          :placeholder="$t('system.dept.selectParentDept')"/>
+                          :placeholder="$t('system.systemManager.dept.selectParentDept')"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('system.dept.deptName')" prop="deptName">
-              <el-input v-model="form.deptName" :placeholder="$t('system.dept.inputDeptName')"/>
+            <el-form-item :label="$t('system.systemManager.dept.deptName')" prop="deptName">
+              <el-input v-model="form.deptName" :placeholder="$t('system.systemManager.dept.inputDeptName')"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('system.dept.orderNum')" prop="orderNum">
+            <el-form-item :label="$t('system.systemManager.dept.orderNum')" prop="orderNum">
               <el-input-number v-model="form.orderNum" controls-position="right" :min="0"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('system.dept.leader')" prop="leader">
-              <el-input v-model="form.leader" :placeholder="$t('system.dept.inputLeader')" maxlength="20"/>
+            <el-form-item :label="$t('system.systemManager.dept.leader')" prop="leader">
+              <el-input v-model="form.leader" :placeholder="$t('system.systemManager.dept.inputLeader')" maxlength="20"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('system.dept.phone')" prop="phone">
-              <el-input v-model="form.phone" :placeholder="$t('system.dept.inputPhone')" maxlength="11"/>
+            <el-form-item :label="$t('system.systemManager.dept.phone')" prop="phone">
+              <el-input v-model="form.phone" :placeholder="$t('system.systemManager.dept.inputPhone')" maxlength="11"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('system.dept.email')" prop="email">
-              <el-input v-model="form.email" :placeholder="$t('system.dept.inputEmail')" maxlength="50"/>
+            <el-form-item :label="$t('system.systemManager.dept.email')" prop="email">
+              <el-input v-model="form.email" :placeholder="$t('system.systemManager.dept.inputEmail')" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('system.dept.status')">
+            <el-form-item :label="$t('system.systemManager.dept.status')">
               <el-radio-group v-model="form.status">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
@@ -202,25 +202,25 @@ export default {
       // 表单校验
       rules: {
         parentId: [
-          {required: true, message: this.$t('system.dept.parentDeptRequired'), trigger: "blur"}
+          {required: true, message: this.$t('system.systemManager.dept.parentDeptRequired'), trigger: "blur"}
         ],
         deptName: [
-          {required: true, message: this.$t('system.dept.deptNameRequired'), trigger: "blur"}
+          {required: true, message: this.$t('system.systemManager.dept.deptNameRequired'), trigger: "blur"}
         ],
         orderNum: [
-          {required: true, message: this.$t('system.dept.orderNumRequired'), trigger: "blur"}
+          {required: true, message: this.$t('system.systemManager.dept.orderNumRequired'), trigger: "blur"}
         ],
         email: [
           {
             type: "email",
-            message: this.$t('system.dept.emailFormatError'),
+            message: this.$t('system.systemManager.dept.emailFormatError'),
             trigger: ["blur", "change"]
           }
         ],
         phone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: this.$t('system.dept.phoneFormatError'),
+            message: this.$t('system.systemManager.dept.phoneFormatError'),
             trigger: "blur"
           }
         ]
@@ -285,7 +285,7 @@ export default {
         this.form.parentId = row.deptId;
       }
       this.open = true;
-      this.title = this.$t('system.dept.addDept');
+      this.title = this.$t('system.systemManager.dept.addDept');
       listDept().then(response => {
         this.deptOptions = this.handleTree(response.data, "deptId");
       });
@@ -304,7 +304,7 @@ export default {
       getDept(row.deptId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = this.$t('system.dept.editDept');
+        this.title = this.$t('system.systemManager.dept.editDept');
         listDeptExcludeChild(row.deptId).then(response => {
           this.deptOptions = this.handleTree(response.data, "deptId");
           if (this.deptOptions.length == 0) {
@@ -320,13 +320,13 @@ export default {
         if (valid) {
           if (this.form.deptId != undefined) {
             updateDept(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('system.dept.updateSuccess'));
+              this.$modal.msgSuccess(this.$t('system.systemManager.dept.updateSuccess'));
               this.open = false;
               this.getList();
             });
           } else {
             addDept(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('system.dept.addSuccess'));
+              this.$modal.msgSuccess(this.$t('system.systemManager.dept.addSuccess'));
               this.open = false;
               this.getList();
             });

src/views/system/post/index.vue

@@ -1,24 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('system.post.postCode')" prop="postCode">
+      <el-form-item :label="$t('system.systemManager.post.postCode')" prop="postCode">
         <el-input
           v-model="queryParams.postCode"
-          :placeholder="$t('system.post.inputPostCode')"
+          :placeholder="$t('system.systemManager.post.inputPostCode')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('system.post.postName')" prop="postName">
+      <el-form-item :label="$t('system.systemManager.post.postName')" prop="postName">
         <el-input
           v-model="queryParams.postName"
-          :placeholder="$t('system.post.inputPostName')"
+          :placeholder="$t('system.systemManager.post.inputPostName')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('system.post.status')" prop="status">
-        <el-select v-model="queryParams.status" :placeholder="$t('system.post.postStatus')" clearable>
+      <el-form-item :label="$t('system.systemManager.post.status')" prop="status">
+        <el-select v-model="queryParams.status" :placeholder="$t('system.systemManager.post.postStatus')" clearable>
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -86,11 +86,11 @@
 
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column :label="$t('system.post.postId')" align="center" prop="postId"/>
-      <el-table-column :label="$t('system.post.postCode')" align="center" prop="postCode"/>
-      <el-table-column :label="$t('system.post.postName')" align="center" prop="postName"/>
-      <el-table-column :label="$t('system.post.postSort')" align="center" prop="postSort"/>
-      <el-table-column :label="$t('system.post.status')" align="center" prop="status">
+      <el-table-column :label="$t('system.systemManager.post.postId')" align="center" prop="postId"/>
+      <el-table-column :label="$t('system.systemManager.post.postCode')" align="center" prop="postCode"/>
+      <el-table-column :label="$t('system.systemManager.post.postName')" align="center" prop="postName"/>
+      <el-table-column :label="$t('system.systemManager.post.postSort')" align="center" prop="postSort"/>
+      <el-table-column :label="$t('system.systemManager.post.status')" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>
@@ -133,16 +133,16 @@
     <!-- 添加或修改岗位对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item :label="$t('system.post.postName')" prop="postName">
-          <el-input v-model="form.postName" :placeholder="$t('system.post.inputPostName')"/>
+        <el-form-item :label="$t('system.systemManager.post.postName')" prop="postName">
+          <el-input v-model="form.postName" :placeholder="$t('system.systemManager.post.inputPostName')"/>
         </el-form-item>
-        <el-form-item :label="$t('system.post.postCode')" prop="postCode">
-          <el-input v-model="form.postCode" :placeholder="$t('system.post.inputPostCode')"/>
+        <el-form-item :label="$t('system.systemManager.post.postCode')" prop="postCode">
+          <el-input v-model="form.postCode" :placeholder="$t('system.systemManager.post.inputPostCode')"/>
         </el-form-item>
-        <el-form-item :label="$t('system.post.postSort')" prop="postSort">
+        <el-form-item :label="$t('system.systemManager.post.postSort')" prop="postSort">
           <el-input-number v-model="form.postSort" controls-position="right" :min="0"/>
         </el-form-item>
-        <el-form-item :label="$t('system.post.status')" prop="status">
+        <el-form-item :label="$t('system.systemManager.post.status')" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio
               v-for="dict in dict.type.sys_normal_disable"
@@ -152,8 +152,8 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item :label="$t('system.post.remark')" prop="remark">
-          <el-input v-model="form.remark" type="textarea" :placeholder="$t('system.post.inputRemark')"/>
+        <el-form-item :label="$t('system.systemManager.post.remark')" prop="remark">
+          <el-input v-model="form.remark" type="textarea" :placeholder="$t('system.systemManager.post.inputRemark')"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -203,13 +203,13 @@ export default {
       // 表单校验
       rules: {
         postName: [
-          {required: true, message: this.$t('system.post.postNameRequired'), trigger: "blur"}
+          {required: true, message: this.$t('system.systemManager.post.postNameRequired'), trigger: "blur"}
         ],
         postCode: [
-          {required: true, message: this.$t('system.post.postCodeRequired'), trigger: "blur"}
+          {required: true, message: this.$t('system.systemManager.post.postCodeRequired'), trigger: "blur"}
         ],
         postSort: [
-          {required: true, message: this.$t('system.post.postSortRequired'), trigger: "blur"}
+          {required: true, message: this.$t('system.systemManager.post.postSortRequired'), trigger: "blur"}
         ]
       }
     };
@@ -264,7 +264,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = this.$t('system.post.addPost');
+      this.title = this.$t('system.systemManager.post.addPost');
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -273,7 +273,7 @@ export default {
       getPost(postId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = this.$t('system.post.editPost');
+        this.title = this.$t('system.systemManager.post.editPost');
       });
     },
     /** 提交按钮 */
@@ -282,13 +282,13 @@ export default {
         if (valid) {
           if (this.form.postId != undefined) {
             updatePost(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('system.post.editSuccess'));
+              this.$modal.msgSuccess(this.$t('system.systemManager.post.editSuccess'));
               this.open = false;
               this.getList();
             });
           } else {
             addPost(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('system.post.addSuccess'));
+              this.$modal.msgSuccess(this.$t('system.systemManager.post.addSuccess'));
               this.open = false;
               this.getList();
             });

src/views/system/user/index.vue

@@ -6,7 +6,7 @@
         <div class="head-container">
           <el-input
             v-model="deptName"
-            :placeholder="$t('system.user.inputDeptName')"
+            :placeholder="$t('system.systemManager.user.inputDeptName')"
             clearable
             size="small"
             prefix-icon="el-icon-search"
@@ -30,28 +30,28 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item :label="$t('system.user.userName')" prop="userName">
+          <el-form-item :label="$t('system.systemManager.user.userName')" prop="userName">
             <el-input
               v-model="queryParams.userName"
-              :placeholder="$t('system.user.inputUserName')"
+              :placeholder="$t('system.systemManager.user.inputUserName')"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item :label="$t('system.user.phonenumber')" prop="phonenumber">
+          <el-form-item :label="$t('system.systemManager.user.phonenumber')" prop="phonenumber">
             <el-input
               v-model="queryParams.phonenumber"
-              :placeholder="$t('system.user.inputPhonenumber')"
+              :placeholder="$t('system.systemManager.user.inputPhonenumber')"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item :label="$t('system.user.status')" prop="status">
+          <el-form-item :label="$t('system.systemManager.user.status')" prop="status">
             <el-select
               v-model="queryParams.status"
-              :placeholder="$t('system.user.userStatus')"
+              :placeholder="$t('system.systemManager.user.userStatus')"
               clearable
               style="width: 240px"
             >
@@ -63,21 +63,21 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('common.createTime')">
+          <el-form-item :label="$t('common.tableMsg.createTime')">
             <el-date-picker
               v-model="dateRange"
               style="width: 240px"
               value-format="yyyy-MM-dd HH:mm:ss"
               type="daterange"
               range-separator="-"
-              :start-placeholder="$t('common.startDate')"
-              :end-placeholder="$t('common.endDate')"
+              :start-placeholder="$t('common.tableMsg.startDate')"
+              :end-placeholder="$t('common.tableMsg.endDate')"
               :default-time="['00:00:00', '23:59:59']"
             ></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('common.search')}}</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('common.reset')}}</el-button>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('common.button.search')}}</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('common.button.reset')}}</el-button>
           </el-form-item>
         </el-form>
 
@@ -90,7 +90,7 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
-            >{{$t('common.add')}}</el-button>
+            >{{$t('common.button.add')}}</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -101,7 +101,7 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['system:user:edit']"
-            >{{$t('common.edit')}}</el-button>
+            >{{$t('common.button.edit')}}</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -112,7 +112,7 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
-            >{{$t('common.delete')}}</el-button>
+            >{{$t('common.button.delete')}}</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -122,7 +122,7 @@
               size="mini"
               @click="handleImport"
               v-hasPermi="['system:user:import']"
-            >{{$t('common.import')}}</el-button>
+            >{{$t('common.button.import')}}</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -132,19 +132,19 @@
               size="mini"
               @click="handleExport"
               v-hasPermi="['system:user:export']"
-            >{{$t('common.export')}}</el-button>
+            >{{$t('common.button.export')}}</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column :label="$t('system.user.userId')" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column :label="$t('system.user.userName')" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('system.user.nickName')" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('system.user.dept')" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('system.user.phonenumber')" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column :label="$t('system.user.status')" align="center" key="status" v-if="columns[5].visible">
+          <el-table-column :label="$t('system.systemManager.user.userId')" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column :label="$t('system.systemManager.user.userName')" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('system.systemManager.user.nickName')" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('system.systemManager.user.dept')" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('system.systemManager.user.phonenumber')" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column :label="$t('system.systemManager.user.status')" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -154,13 +154,13 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('common.createTime')" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column :label="$t('common.tableMsg.createTime')" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            :label="$t('common.operation')"
+            :label="$t('common.tableMsg.operation')"
             align="center"
             width="160"
             class-name="small-padding fixed-width"
@@ -172,21 +172,21 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
-              >{{$t('common.edit')}}</el-button>
+              >{{$t('common.button.edit')}}</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
-              >{{$t('common.delete')}}</el-button>
+              >{{$t('common.button.delete')}}</el-button>
               <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">{{$t('common.more')}}</el-button>
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">{{$t('common.button.more')}}</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                    v-hasPermi="['system:user:resetPwd']">{{$t('system.user.resetPwd')}}</el-dropdown-item>
+                    v-hasPermi="['system:user:resetPwd']">{{$t('system.systemManager.user.resetPwd')}}</el-dropdown-item>
                   <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                    v-hasPermi="['system:user:edit']">{{$t('system.user.assignRole')}}</el-dropdown-item>
+                    v-hasPermi="['system:user:edit']">{{$t('system.systemManager.user.assignRole')}}</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -208,44 +208,44 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('system.user.nickName')" prop="nickName">
-              <el-input v-model="form.nickName" :placeholder="$t('system.user.inputNickName')" maxlength="30" />
+            <el-form-item :label="$t('system.systemManager.user.nickName')" prop="nickName">
+              <el-input v-model="form.nickName" :placeholder="$t('system.systemManager.user.inputNickName')" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('system.user.deptName')" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('system.user.selectDept')" />
+            <el-form-item :label="$t('system.systemManager.user.deptName')" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('system.systemManager.user.selectDept')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('system.user.phonenumber')" prop="phonenumber">
-              <el-input v-model="form.phonenumber" :placeholder="$t('system.user.inputPhonenumber')" maxlength="11" />
+            <el-form-item :label="$t('system.systemManager.user.phonenumber')" prop="phonenumber">
+              <el-input v-model="form.phonenumber" :placeholder="$t('system.systemManager.user.inputPhonenumber')" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('system.user.email')" prop="email">
-              <el-input v-model="form.email" :placeholder="$t('system.user.inputEmail')" maxlength="50" />
+            <el-form-item :label="$t('system.systemManager.user.email')" prop="email">
+              <el-input v-model="form.email" :placeholder="$t('system.systemManager.user.inputEmail')" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" :label="$t('system.user.userName')" prop="userName">
-              <el-input v-model="form.userName" :placeholder="$t('system.user.inputUserName')" maxlength="30" />
+            <el-form-item v-if="form.userId == undefined" :label="$t('system.systemManager.user.userName')" prop="userName">
+              <el-input v-model="form.userName" :placeholder="$t('system.systemManager.user.inputUserName')" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" :label="$t('system.user.password')" prop="password">
-              <el-input v-model="form.password" :placeholder="$t('system.user.inputPassword')" type="password" maxlength="20" show-password/>
+            <el-form-item v-if="form.userId == undefined" :label="$t('system.systemManager.user.password')" prop="password">
+              <el-input v-model="form.password" :placeholder="$t('system.systemManager.user.inputPassword')" type="password" maxlength="20" show-password/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('system.user.sex')">
-              <el-select v-model="form.sex" :placeholder="$t('system.user.selectSex')">
+            <el-form-item :label="$t('system.systemManager.user.sex')">
+              <el-select v-model="form.sex" :placeholder="$t('system.systemManager.user.selectSex')">
                 <el-option
                   v-for="dict in dict.type.sys_user_sex"
                   :key="dict.value"
@@ -256,7 +256,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('system.user.status')">
+            <el-form-item :label="$t('system.systemManager.user.status')">
               <el-radio-group v-model="form.status">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
@@ -269,8 +269,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('system.user.post')">
-              <el-select v-model="form.postIds" multiple :placeholder="$t('system.user.selectPost')">
+            <el-form-item :label="$t('system.systemManager.user.post')">
+              <el-select v-model="form.postIds" multiple :placeholder="$t('system.systemManager.user.selectPost')">
                 <el-option
                   v-for="item in postOptions"
                   :key="item.postId"
@@ -282,8 +282,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('system.user.role')">
-              <el-select v-model="form.roleIds" multiple :placeholder="$t('system.user.selectRole')">
+            <el-form-item :label="$t('system.systemManager.user.role')">
+              <el-select v-model="form.roleIds" multiple :placeholder="$t('system.systemManager.user.selectRole')">
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -297,15 +297,15 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('system.user.remark')">
-              <el-input v-model="form.remark" type="textarea" :placeholder="$t('system.user.inputRemark')"></el-input>
+            <el-form-item :label="$t('system.systemManager.user.remark')">
+              <el-input v-model="form.remark" type="textarea" :placeholder="$t('system.systemManager.user.inputRemark')"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">{{$t('common.confirm')}}</el-button>
-        <el-button @click="cancel">{{$t('common.cancel')}}</el-button>
+        <el-button type="primary" @click="submitForm">{{$t('common.button.confirm')}}</el-button>
+        <el-button @click="cancel">{{$t('common.button.cancel')}}</el-button>
       </div>
     </el-dialog>
 
@@ -334,8 +334,8 @@
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">{{$t('common.confirm')}}</el-button>
-        <el-button @click="upload.open = false">{{$t('common.cancel')}}</el-button>
+        <el-button type="primary" @click="submitFileForm">{{$t('common.button.confirm')}}</el-button>
+        <el-button @click="upload.open = false">{{$t('common.button.cancel')}}</el-button>
       </div>
     </el-dialog>
   </div>

vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://8.137.52.68:8081`,
-        target: `http://43.252.245.60:90`,
+        target: process.env.VUE_APP_BASE_API,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''