diff --git a/src/api/login.js b/src/api/login.js
index 16357a56..2d697966 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,9 +1,7 @@
 import request from '@/utils/request.js';
-
-export function loginApi(data) {  // 登录接口
-  return request({
-    url: '/hxh/api-test/login',
-    method: 'post',
-    data: data
-  });
-}
\ No newline at end of file
+import axios from 'axios';
+export const loginApi = params => {
+    return axios.get('api/GetZhanghLogin', {
+        params
+    });
+};
diff --git a/src/api/myld.js b/src/api/myld.js
index 16b6dca4..4b0799c7 100644
--- a/src/api/myld.js
+++ b/src/api/myld.js
@@ -6,7 +6,6 @@ if (process.env.NODE_ENV === 'development') {
 }
 //获取用户信息
 export const getUserApi = params => {
-    return axios.get('api/GetZhanghDetails', {
-        params
-    });
+    return axios.get(`api/GetZhanghDetails?UserId=${params}`, {});
 };
+//修改密码
diff --git a/src/page/Login.vue b/src/page/Login.vue
index da71d031..695baaa2 100644
--- a/src/page/Login.vue
+++ b/src/page/Login.vue
@@ -5,13 +5,13 @@
             <div class="content">
                 <div class="welcome">欢迎登录</div>
                 <el-form :model="param" :rules="rules" ref="login" label-width="100px" label-position="top" class="ms-content">
-                    <el-form-item prop="username" label="用户名">
-                        <el-input v-model="param.username" placeholder="输入您的账号">
+                    <el-form-item prop="Account" label="用户名">
+                        <el-input v-model="param.Account" placeholder="输入您的账号">
                             <el-button slot="prepend" icon="el-icon-user"></el-button>
                         </el-input>
                     </el-form-item>
-                    <el-form-item prop="password" label="密码" style="margin-top: 15px">
-                        <el-input type="password" placeholder="请输入密码" v-model="param.password" @keyup.enter.native="submitForm()">
+                    <el-form-item prop="Password" label="密码" style="margin-top: 15px">
+                        <el-input type="password" placeholder="请输入密码" v-model="param.Password" @keyup.enter.native="submitForm()">
                             <el-button slot="prepend" icon="el-icon-lock"></el-button>
                         </el-input>
                     </el-form-item>
@@ -35,37 +35,37 @@ export default {
     data() {
         return {
             param: {
-                username: 'admin',
-                password: '123456'
+                Account: '',
+                Password: ''
             },
             checked: false,
             rules: {
-                username: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
-                password: [{ required: true, message: '密码不能为空', trigger: 'blur' }]
+                Account: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
+                Password: [{ required: true, message: '密码不能为空', trigger: 'blur' }]
             }
         };
     },
-    created() {
-        this.getType();
-    },
+    created() {},
     methods: {
         getType() {
-            let datas = {
-                telephone: '13088888888',
-                typeCode: 2
-            };
-            loginApi(datas).then(res => {
-                console.log('c', res);
+            loginApi(this.param).then(res => {
+                if (res.data.code == 200) {
+                    localStorage.setItem('user', JSON.stringify(res.data.data));
+                    localStorage.setItem('ms_username', this.param.Account);
+                    this.$router.push('/');
+                    this.$message.success('登录成功');
+                } else {
+                    this.$message.error(res.data.msg);
+                }
             });
         },
         submitForm() {
             this.$refs.login.validate(valid => {
                 if (valid) {
-                    this.$message.success('登录成功');
-                    localStorage.setItem('ms_username', this.param.username);
-                    this.$router.push('/');
+                    this.getType();
                 } else {
                     this.$message.error('请输入账号和密码');
+                    console.log('error submit!!');
                     return false;
                 }
             });
diff --git a/src/views/myId.vue b/src/views/myId.vue
index f2361a5b..ec1f698b 100644
--- a/src/views/myId.vue
+++ b/src/views/myId.vue
@@ -4,7 +4,7 @@
             <p class="title">我的账号</p>
             <el-form label-position="left" label-width="60px" :model="formLabelAlign">
                 <el-form-item label="名称：">
-                    {{ formLabelAlign.name }}
+                    {{ formLabelAlign.userName }}
                 </el-form-item>
                 <el-form-item label="账号：">
                     {{ formLabelAlign.account }}
@@ -13,26 +13,88 @@
                     {{ formLabelAlign.password }}
                 </el-form-item>
             </el-form>
+            <el-button @click="editPassword" slot="prepend" size="small" type="primary">修改密码</el-button>
         </div>
+        <el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%" @close="dialogClosed">
+            <el-input v-model="password"></el-input>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="savePassword">确定</el-button>
+                <el-button @click="dialogVisible = false">取消</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
 <script>
 import { getUserApi } from '@/api/myld.js';
-
+import serverUrl from '@/config/apiurl.js';
+import axios from 'axios';
 export default {
     data() {
         return {
+            password: '',
+            dialogVisible: false,
             formLabelAlign: {
-                name: 'admin',
-                account: 'admin',
-                password: '123456'
+                userName: '',
+                account: '',
+                password: ''
             }
         };
     },
     methods: {
+        dialogClosed() {
+            this.password = '';
+        },
+        //保存密码
+        savePassword() {
+            let formData = new FormData();
+            formData.append('userName', this.formLabelAlign.userName);
+            formData.append('account', this.formLabelAlign.account);
+            formData.append('roleId', this.formLabelAlign.roleId);
+            formData.append('IsEnable', 1);
+            formData.append('passWord', this.password);
+            formData.append('userId', this.formLabelAlign.userId);
+            axios({
+                method: 'post',
+                url: serverUrl.editRoleApi,
+                data: formData
+            }).then(res => {
+                if (res.data.code == 200) {
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                    this.dialogVisible = false;
+                    this.$router.push('/Login');
+                    this.getUser();
+                } else {
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'warning'
+                    });
+                }
+            });
+        },
+        editPassword() {
+            this.dialogVisible = true;
+        },
         getUser() {
-            console.log(window.localStorage.getItem(''));
+            if (window.localStorage.getItem('user')) {
+                let form = JSON.parse(window.localStorage.getItem('user'));
+                getUserApi(form.userId)
+                    .then(res => {
+                        if (res.data.code == 200) {
+                            this.formLabelAlign = res.data.data;
+                            this.formLabelAlign.password = '******';
+                            console.log(this.formLabelAlign);
+                        } else {
+                            this.$message.error(res.data.msg);
+                        }
+                    })
+                    .catch(err => {
+                        this.$message.error(err.data.msg);
+                    });
+            }
         }
     },
     mounted() {