From d368bf5b64ef14e9ce5be0d9d7a75ec76b62eaad Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Thu, 11 Jul 2019 14:27:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=9B=BA=E5=AE=9A=20Header=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js                             |  5 ++--
 src/layout/components/AppMain.vue           | 32 +++++++++------------
 src/styles/index.scss                       |  2 +-
 src/views/system/user/center/updatePass.vue |  2 +-
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index 220cc26..a928986 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -23,9 +23,10 @@ export function edit(data) {
   })
 }
 
-export function updatePass(password) {
+export function updatePass(user) {
   const data = {
-    password
+    oldPass: user.oldPass,
+    newPass: user.newPass
   }
   return request({
     url: 'api/users/updatePass/',
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index cdcae97..3cb04a1 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,26 +1,21 @@
 <template>
-  <div>
-    <section class="app-main">
-      <!--<CodeFund />-->
-      <transition name="fade-transform" mode="out-in">
-        <keep-alive :include="cachedViews">
-          <router-view :key="key"/>
-        </keep-alive>
-      </transition>
-    </section>
+  <section class="app-main">
+    <transition name="fade-transform" mode="out-in">
+      <keep-alive :include="cachedViews">
+        <router-view :key="key"/>
+      </keep-alive>
+    </transition>
     <div v-if="$store.state.settings.showFooter" id="el-main-footer">
       <span v-html="$store.state.settings.footerTxt"/>
       <span> ⋅ </span>
       <a href="http://www.beian.miit.gov.cn" target="_blank">{{ $store.state.settings.caseNumber }}</a>
     </div>
-  </div>
+  </section>
 </template>
 
 <script>
-// import CodeFund from '@/components/CodeFund'
 export default {
   name: 'AppMain',
-  // components: { CodeFund },
   computed: {
     cachedViews() {
       return this.$store.state.tagsView.cachedViews
@@ -39,7 +34,6 @@ export default {
     min-height: calc(100vh - 84px);
     width: 100%;
     position: relative;
-    padding-bottom: 18px;
     overflow: hidden;
   }
 
@@ -48,13 +42,13 @@ export default {
   }
 
   .hasTagsView {
-  .app-main {
-    min-height: calc(100vh - 84px);
-  }
+    .app-main {
+      min-height: calc(100vh - 84px);
+    }
 
-  .fixed-header+.app-main {
-    padding-top: 85px;
-  }
+    .fixed-header+.app-main {
+      padding-top: 85px;
+    }
   }
 </style>
 
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 1feb73a..82ee900 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -155,7 +155,7 @@ a:hover {
   overflow: hidden;
   padding: 10px 6px 0px 6px;
   height: 33px;
-  font-size: 0.5rem !important;
+  font-size: 0.7rem !important;
   color: #7a8b9a;
   letter-spacing: 0.8px;
   font-family: Arial, sans-serif !important;
diff --git a/src/views/system/user/center/updatePass.vue b/src/views/system/user/center/updatePass.vue
index 9f84dfd..d18693c 100644
--- a/src/views/system/user/center/updatePass.vue
+++ b/src/views/system/user/center/updatePass.vue
@@ -60,7 +60,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
-          updatePass(this.form.confirmPass).then(res => {
+          updatePass(this.form).then(res => {
             this.resetForm()
             this.$notify({
               title: '密码修改成功，请重新登录',