Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
CS-Tao committed Sep 16, 2018
2 parents 3fdac58 + 7d4ca8a commit cf025aa
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@

>武汉大学图书馆抢座软件
## 使用说明

### 文档地址

[https://home.cs-tao.cc/whu-library-seat/](https://home.cs-tao.cc/whu-library-seat/)

### 软件演示

![软件演示](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/full.gif)

## 下载和安装

### 最新版本下载
Expand All @@ -17,15 +27,15 @@

- Windows
- 安装包: `whu-library-seat-setup-<version>.exe`
- 链接: [v1.2.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.0/whu-library-seat-setup-1.2.0.exe)
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-setup-1.2.1.exe)

- Mac OS
- 安装包: `whu-library-seat-<version>.dmg`
- 链接: [v1.2.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.0/whu-library-seat-1.2.0.dmg)
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-1.2.1.dmg)

- Linux
- 安装包: `whu-library-seat-<version>-x86_64.AppImage`
- 链接: [v1.2.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.0/whu-library-seat-1.2.0-x86_64.AppImage)
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-1.2.1-x86_64.AppImage)

### 安装软件

Expand All @@ -41,16 +51,6 @@

软件启动的时候会自动访问[GitHub Release](https://github.com/CS-Tao/whu-library-seat/releases/latest)检查更新,如果有更新,在软件的左下角会出现更新的按钮

## 使用说明

### 文档地址

[https://home.cs-tao.cc/whu-library-seat/](https://home.cs-tao.cc/whu-library-seat/)

### 软件演示

![软件演示](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/full.gif)

# 面向开发者

您可以通过以下步骤自行构建本软件,但请您务必注意,本仓库并未提供任何源码`许可证`,您没有权利将源码更改后继续传播,更没有权利将本软件或源码用于商业活动
Expand Down
6 changes: 3 additions & 3 deletions docs/specification/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

- Windows
- 安装包: `whu-library-seat-setup-<version>.exe`
- 链接: [v1.2.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.0/whu-library-seat-setup-1.2.0.exe)
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-setup-1.2.1.exe)

- Mac OS
- 安装包: `whu-library-seat-<version>.dmg`
- 链接: [v1.2.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.0/whu-library-seat-1.2.0.dmg)
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-1.2.1.dmg)

- Linux
- 安装包: `whu-library-seat-<version>-x86_64.AppImage`
- 链接: [v1.2.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.0/whu-library-seat-1.2.0-x86_64.AppImage)
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-1.2.1-x86_64.AppImage)

### 安装软件

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "whu-library-seat",
"version": "1.2.0",
"version": "1.2.1",
"author": "CS-Tao <[email protected]>",
"description": "武汉大学图书馆抢座软件",
"license": null,
Expand Down
1 change: 1 addition & 0 deletions src/renderer/components/Body/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ export default {
this.triedSeatIds = []
this.stopGrab = false
this.grabCount = 0
this.seatsSearched = null
libraryRestApi.Login(this.userAccount, this.userPasswd).then((response) => {
if (response.data.status === 'success') {
this.$store.dispatch('setToken', response.data.data.token)
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/Header/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ export default {
this.login()
return true
} else {
this.$store.dispatch('setToken', null)
this.showError('软件用户认证失败')
this.login()
return true
}
}).catch(() => {
this.login()
Expand Down

0 comments on commit cf025aa

Please sign in to comment.