commit

@@ -24,7 +24,7 @@
                     <Dropdown-item v-for="shop in userInfo.shops" :key="shop.shopsId" :name="shop.shopsId" :selected="userInfo.currentShop.shopsId === shop.shopsId">{{shop.shopName}}</Dropdown-item>
                 </Dropdown-menu>
             </Dropdown>
-            <a href="/user/password.html" class="update-pwd">[修改密码]</a>
+            <router-link to="/user/password.html" class="update-pwd">[修改密码]</router-link>
             <a class="logout" href="javascript:;" @click="logout">[退出]</a>
         </Col>
     </Row>

@@ -23,10 +23,10 @@ class UserController extends Context {
                 let sess = allResult[1];
                 let overdueInfo = '';
 
-                if (user.passwd_time > 0) {
-                    overdueInfo = `您的密码即将在${user.passwd_time}天后过期`;
-                } else if (user.passwd_time) {
-                    overdueInfo = user.passwd_time === 0 ? '您的密码已于今天过期' : `您的密码已过期${user.passwd_time}天`;
+                if (user.pwdExpirationDays > 0) {
+                    overdueInfo = `您的密码即将在${user.pwdExpirationDays}天后过期`;
+                } else if (user.pwdExpirationDays !== null) {
+                    overdueInfo = user.pwdExpirationDays === 0 ? '您的密码已于今天过期' : `您的密码已过期${user.pwdExpirationDays}天`;
                 }
 
                 this.userService.getShops(user.pid).then(result => {