初始化

src/views/setting/account.vue

@@ -47,14 +47,14 @@
                   <el-button slot="reference" type="text">恢复</el-button>
                 </el-popconfirm>
               </template>
-              
+
               <el-button type="text" @click="addOrEdit('edit', scope.row.adminUserId)" v-if="checkBtnRole('edit')">编辑</el-button>
               <el-button type="text" @click="handleReset(scope.row.adminUserId)" v-if="checkBtnRole('reset')">重置密码</el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
-      
+
       <div class="pagination clearfix">
         <div class="fr">
           <el-pagination
@@ -118,7 +118,7 @@
         </el-form-item>
         <el-form-item label="商户" prop="merchant" v-show="accountType === 1 || accountType === 2">
           <el-select v-model="addForm.merchant" placeholder="请选择商户" style="width: 100%;">
-            <el-option :label="item.companyName" :value="item.companyWechatId" v-for="(item, index) in merchantList" :key="index"></el-option>
+            <el-option :label="item.adminCompanyName" :value="item.adminCompanyId" v-for="(item, index) in merchantList" :key="index"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="密码" prop="newPassword">
@@ -294,7 +294,7 @@ export default {
       // return index >= 0 ? true : false;
       return true;
     },
-    
+
     getList() {
       this.listLoading = true;
 
@@ -351,6 +351,7 @@ export default {
           pageNum: 1,
           pageSize: 1000
         }).then(res => {
+          console.log('--------------',res.data.records)
           resolve(res.data.records);
         }).catch(res => {
           resolve([]);
@@ -479,8 +480,8 @@ export default {
           if(this.accountType === 0) {
             params.adminWebsitIds = this.$refs.tree.getCheckedKeys();
           }else {
-            let index = findElem(this.merchantList, 'companyWechatId', this.addForm.merchant);
-            params.companyWechatId = this.addForm.merchant;
+            let index = findElem(this.merchantList, 'adminCompanyId', this.addForm.merchant);
+            params.adminCompanyId = this.addForm.merchant;
             params.linkName = this.merchantList[index].linkName || '';
             params.linkPhone = this.merchantList[index].linkPhone || '';
             params.email = this.merchantList[index].email || '';
@@ -517,4 +518,4 @@ export default {
     cursor: pointer;
     user-select: none;
   }
-</style>
+</style>