Finish Hotfix-mo-4

src/views/merchant/merchant_list.vue

@@ -109,7 +109,7 @@
     <el-dialog
       title="详情"
       :visible.sync="detailDiaLog"
-      width="30%"
+      width="600px"
       :show-close="false"
       :close-on-click-modal="false"
       >
@@ -150,7 +150,7 @@
       
     
     <!-- 重置密码 -->
-    <el-dialog append-to-body title="重置密码" :visible.sync="resetFormVisible" :show-close="false" width="30%" :close-on-click-modal="false">
+    <el-dialog append-to-body title="重置密码" :visible.sync="resetFormVisible" :show-close="false" width="500px" :close-on-click-modal="false">
       <el-form ref="resetForm" :model="resetForm" :rules="resetFormRules" label-position="left" label-width="100px">
         <el-form-item label="输入新密码" prop="newPassword">
           <el-input v-model="resetForm.newPassword" ref="password1" autocomplete="off" class="formWidth" placeholder="请输入新密码" :type="passwordType1"></el-input>
@@ -172,8 +172,7 @@
     </el-dialog>
     </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="detailDiaLog = false" >取 消</el-button>
-        <el-button type="primary" @click="detailDiaLog = false">确 定</el-button>
+        <el-button @click="detailDiaLog = false" >关 闭</el-button>
       </span>
     </el-dialog>
   </div>
@@ -275,9 +274,6 @@ export default {
   },
   created() {
     this.getList();
-    const { id } = this.$route.query;
-    this.id = id;
-    this.getDetail();
   },
    computed: {
     sidebar() {
@@ -295,22 +291,6 @@ export default {
       this.$router.go(-1);
     },
 
-    // 获取详情
-    // getDetail() {
-      // console.log(id);
-      // getDetail({adminUserId: this.id}).then(res => {
-      //   this.mainForm.account = res.data.userName;
-      //   this.mainForm.nickName = res.data.nickName;
-      //   this.mainForm.chargePerson = res.data.linkName;
-      //   this.mainForm.phone = res.data.linkPhone;
-      //   this.mainForm.kingdeeId = res.data.useOrgNumber;
-      //   this.mainForm.kingdeeName = res.data.useOrgName;
-      //   this.mainForm.email = res.data.email;
-      //   this.mainForm.address = res.data.address;
-      //   this.mainForm.password = '************';
-      // })
-    // },
-
     // 重置密码
     handleReset(id) {
       this.resetId = id;
@@ -467,14 +447,6 @@ export default {
     },
 
     async toDetail(id) {
-      // this.$router.push({
-      //   path: '/merchant/merchant_detail',
-      //   query: {
-      //     id
-      //   }
-      // })
-      console.log(id);
-      this.detailDiaLog=true
       getDetail({adminUserId: id}).then(res => {
         this.mainForm.account = res.data.userName;
         this.mainForm.nickName = res.data.nickName;
@@ -485,9 +457,8 @@ export default {
         this.mainForm.email = res.data.email;
         this.mainForm.address = res.data.address;
         this.mainForm.password = '************';
+        this.detailDiaLog = true
       })
-   
-
     },
 
     // 操作 - 更改状态(type: 禁用0，启用1)