fe / yoho-shop-manage · Commits

Go to a project

Authored by 陈峰
Commit 62707e07c781f9e04a552ed254ef9625d1b7f888 1 parent 2dc6f111

commit

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <Dropdown-item v-for="shop in userInfo.shops" :key="shop.shopsId" :name="shop.shopsId" :selected="userInfo.currentShop.shopsId === shop.shopsId">{{shop.shopName}}</Dropdown-item> 24 <Dropdown-item v-for="shop in userInfo.shops" :key="shop.shopsId" :name="shop.shopsId" :selected="userInfo.currentShop.shopsId === shop.shopsId">{{shop.shopName}}</Dropdown-item>
25 </Dropdown-menu> 25 </Dropdown-menu>
26 </Dropdown> 26 </Dropdown>
27 - <a href="/user/password.html" class="update-pwd">[修改密码]</a> 27 + <router-link to="/user/password.html" class="update-pwd">[修改密码]</router-link>
28 <a class="logout" href="javascript:;" @click="logout">[退出]</a> 28 <a class="logout" href="javascript:;" @click="logout">[退出]</a>
29 </Col> 29 </Col>
30 </Row> 30 </Row>
@@ -23,10 +23,10 @@ class UserController extends Context { @@ -23,10 +23,10 @@ class UserController extends Context {
23 let sess = allResult[1]; 23 let sess = allResult[1];
24 let overdueInfo = ''; 24 let overdueInfo = '';
25 25
26 - if (user.passwd_time > 0) {  
27 - overdueInfo = `您的密码即将在${user.passwd_time}天后过期`;  
28 - } else if (user.passwd_time) {  
29 - overdueInfo = user.passwd_time === 0 ? '您的密码已于今天过期' : `您的密码已过期${user.passwd_time}天`; 26 + if (user.pwdExpirationDays > 0) {
  27 + overdueInfo = `您的密码即将在${user.pwdExpirationDays}天后过期`;
  28 + } else if (user.pwdExpirationDays !== null) {
  29 + overdueInfo = user.pwdExpirationDays === 0 ? '您的密码已于今天过期' : `您的密码已过期${user.pwdExpirationDays}天`;
30 } 30 }
31 31
32 this.userService.getShops(user.pid).then(result => { 32 this.userService.getShops(user.pid).then(result => {