Merge remote-tracking branch 'origin/main'

src/api/business/userRegister.js

@@ -73,7 +73,7 @@ export function addUserInfo(data) {
 // 新增用户信息-商户扩展
 export function addUserInfoBus(data) {
   return request({
-    url: '/business/userInfoAgent',
+    url: '/business/userInfoBus',
     method: 'post',
     data: data
   })
@@ -81,7 +81,7 @@ export function addUserInfoBus(data) {
 // 新增用户信息-代理商扩展
 export function addUserInfoAgen(data) {
   return request({
-    url: '/business/userInfoBus',
+    url: '/business/userInfoAgent',
     method: 'post',
     data: data
   })

src/views/business/userInfo/index.vue

@@ -40,6 +40,7 @@
       </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="联系地址" align="center" prop="contactAddress" />
       <el-table-column :label="$t('business.userManager.userInfo.age')" align="center" prop="age" />
       <el-table-column :label="$t('business.userManager.userInfo.addr')" align="center" prop="addr" />
       <el-table-column :label="$t('business.userManager.userInfo.status')" align="center" prop="status">
@@ -78,6 +79,9 @@
         <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="联系地址" prop="contactAddress">
+          <el-input v-model="form.contactAddress" placeholder="请输入联系地址" />
+        </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>
@@ -109,6 +113,9 @@
         <el-form-item :label="$t('business.userManager.userInfo.detailPhone')">
           {{form.phone}}
         </el-form-item>
+        <el-form-item label="联系地址">
+          {{form.contactAddress}}
+        </el-form-item>
         <el-form-item :label="$t('business.userManager.userInfo.detailAge')">
           {{form.age}}
         </el-form-item>
@@ -198,6 +205,9 @@
           ],
           addr: [
             { required: true, message: this.$t('business.userManager.userInfo.addrRequired'), trigger: "change" }
+          ],
+          contactAddress: [
+            { required: true, message: "联系地址不能为空", trigger: "change" }
           ]
         }
       };

src/views/business/userInfoBus/index.vue

@@ -71,6 +71,7 @@
       <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="联系地址" 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">
           <el-button
@@ -120,6 +121,9 @@
         <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>
+        <el-form-item label="联系地址" prop="contactAddress">
+          <el-input v-model="form.contactAddress" :placeholder="$t('business.merchant.userInfoBus.inputOperatingAddress')" />
+        </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>
@@ -220,6 +224,9 @@ export default {
         operateAddr: [
           { required: true, message: this.$t('business.merchant.userInfoBus.operateAddrRequired'), trigger: "blur" }
         ],
+        contactAddress: [
+          { required: true, message: this.$t('business.merchant.userInfoBus.operateAddrRequired'), trigger: "blur" }
+        ],
       }
     };
   },

src/views/business/userRegister/index.vue

@@ -110,6 +110,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('business.userManager.userRegister.phone')" align="center" prop="phone"/>
+      <el-table-column label="联系地址" align="center" prop="contactAddress"/>
       <el-table-column :label="$t('business.userManager.userRegister.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">
@@ -251,6 +252,9 @@
         <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="联系地址" prop="contactAddress">
+          <el-input v-model="formInfo.contactAddress" placeholder="请输入联系地址" />
+        </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>
@@ -292,6 +296,9 @@
         <el-form-item :label="$t('business.userManager.userRegister.contactPhone')">
           {{ formDetail.userInfoVo.phone }}
         </el-form-item>
+        <el-form-item label="联系地址">
+          {{ formDetail.userInfoVo.contactAddress }}
+        </el-form-item>
         <el-form-item :label="$t('business.userManager.userRegister.userType')">
           <template slot-scope="scope">
             <span v-if="formDetail.userType == '0'">{{ $t('business.userManager.userRegister.normalUser') }}</span>
@@ -430,6 +437,9 @@ export default {
         age: [
           { required: true, pattern: /^\d+$/, message: this.$t('business.userManager.userRegister.ageNumberOnly'), trigger: "blur" }
         ],
+        contactAddress: [
+          {required: true, message: "联系地址不能为空", trigger: "blur"}
+        ],
         addr: [
           {required: true, message: this.$t('business.userManager.userRegister.addrRequired'), trigger: "blur"}
         ],

src/views/business/userRegister/indexAgent.vue

@@ -301,7 +301,7 @@ import {
   resetUserPassword,
   accountLock,
   listUserRegisterBus,
-  listUserRegisterAgent
+  listUserRegisterAgent, addUserInfoAgen
 } from "@/api/business/userRegister";
 
 export default {
@@ -523,7 +523,7 @@ export default {
     submitFormInfoAgent() {
       this.$refs["formInfoAgent"].validate(valid => {
         if (valid) {
-          addUserInfoBus(this.formInfoAgent).then(response => {
+          addUserInfoAgen(this.formInfoAgent).then(response => {
             this.$modal.msgSuccess(this.$t('common.addSuccess'));
             this.openInfoAgent = false;
             this.getList();

src/views/business/userRegister/indexBus.vue

@@ -106,6 +106,7 @@
       </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="联系地址" 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')"
@@ -113,7 +114,7 @@
                      type="text"
                      icon="el-icon-document-add"
                      @click="handleAddInfo(scope.row)"
-          >{{ $t('common.button.supplement') }}</el-button>
+          >{{ $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')"
                      size="mini"
                      type="text"
@@ -276,6 +277,9 @@
         <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>
+        <el-form-item label="联系地址" prop="contactAddress">
+          <el-input v-model="formInfoBus.contactAddress" placeholder="请输入联系地址" />
+        </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>
@@ -290,7 +294,7 @@
           {{formDetailBus.account}}
         </el-form-item>
         <el-form-item :label="$t('business.merchant.indexBus.merchantNameLabel')">
-          {{formDetailBus.merchantName}}
+          {{formDetailBus.userInfoBusVo.merchantName}}
         </el-form-item>
         <el-form-item :label="$t('business.merchant.indexBus.licenseLabel')">
           {{formDetailBus.userInfoBusVo.license}}
@@ -307,6 +311,9 @@
         <el-form-item :label="$t('business.merchant.indexBus.operateAddrLabel')">
           {{formDetailBus.userInfoBusVo.operateAddr}}
         </el-form-item>
+        <el-form-item label="联系地址">
+          {{formDetailBus.userInfoBusVo.contactAddress}}
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">{{ $t('common.button.close') }}</el-button>
@@ -434,6 +441,9 @@ export default {
         addr: [
           { required: true, message: this.$t('business.merchant.indexBus.addrRequired'), trigger: "blur" }
         ],
+        contactAddress: [
+          { required: true, message: "联系地址不能为空", trigger: "blur" }
+        ],
         merchantName: [
           { required: true, message: this.$t('business.merchant.indexBus.merchantNameRequired'), trigger: "blur" }
         ],