mirror of
https://github.com/kuaifan/dootask.git
synced 2026-03-07 01:47:05 +00:00
no message
This commit is contained in:
parent
49082bc200
commit
34e4d9f68c
@ -8,5 +8,9 @@
|
||||
<true/>
|
||||
<key>com.apple.security.cs.disable-library-validation</key>
|
||||
<true/>
|
||||
<key>com.apple.security.device.audio-input</key>
|
||||
<true/>
|
||||
<key>com.apple.security.device.camera</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "DooTask",
|
||||
"version": "0.15.83",
|
||||
"version": "0.15.90",
|
||||
"description": "DooTask is task management system.",
|
||||
"scripts": {
|
||||
"start": "./cmd dev",
|
||||
|
||||
@ -102,15 +102,14 @@ export default {
|
||||
axios.get($A.apiUrl('../version')).then(({status, data}) => {
|
||||
if (status === 200) {
|
||||
this.apiVersion = data.version || ''
|
||||
if (this.$isEEUiApp) {
|
||||
// App 检查接口版本
|
||||
if (this.compareVersion(this.apiVersion, '0.14.94') === -1) {
|
||||
$A.eeuiAppAlert({
|
||||
title: '温馨提示',
|
||||
message: '服务器接口版本过低,有可能无法正常使用系统功能。',
|
||||
});
|
||||
}
|
||||
} else if (this.$Electron) {
|
||||
// 检查接口版本
|
||||
if (this.compareVersion(this.apiVersion, '0.14.94') === -1) {
|
||||
$A.modalWarning({
|
||||
title: '温馨提示',
|
||||
message: '服务器接口版本过低,部分功能可能无法正常使用。',
|
||||
});
|
||||
}
|
||||
if (this.$Electron) {
|
||||
// 客户端提示更新
|
||||
this.$Electron.sendMessage('updateCheckAndDownload', {
|
||||
apiVersion: this.apiVersion
|
||||
|
||||
@ -436,9 +436,9 @@ export default {
|
||||
this.codeNeed = false;
|
||||
$A.setStorage("cacheLoginEmail", this.email)
|
||||
this.$store.dispatch("handleClearCache", data).then(() => {
|
||||
this.goNext1();
|
||||
this.goNext();
|
||||
}).catch(_ => {
|
||||
this.goNext1();
|
||||
this.goNext();
|
||||
});
|
||||
}).catch(({data, msg}) => {
|
||||
if (data.code === 'email') {
|
||||
@ -457,35 +457,15 @@ export default {
|
||||
})
|
||||
},
|
||||
|
||||
goNext1() {
|
||||
goNext() {
|
||||
this.loginJump = true;
|
||||
if (this.loginType == 'login') {
|
||||
this.goNext2();
|
||||
} else {
|
||||
// 新注册自动创建项目
|
||||
this.$store.dispatch("call", {
|
||||
url: 'project/add',
|
||||
data: {
|
||||
name: this.$L('个人项目'),
|
||||
desc: this.$L('注册时系统自动创建项目,你可以自由删除。'),
|
||||
personal: 1,
|
||||
},
|
||||
}).then(() => {
|
||||
this.goNext2();
|
||||
}).catch(_ => {
|
||||
this.goNext2();
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
goNext2() {
|
||||
let fromUrl = decodeURIComponent($A.getObject(this.$route.query, 'from'));
|
||||
const fromUrl = decodeURIComponent($A.getObject(this.$route.query, 'from'));
|
||||
if (fromUrl) {
|
||||
window.location.replace(fromUrl);
|
||||
} else {
|
||||
this.goForward({name: 'manage-dashboard'}, true);
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -20,11 +20,11 @@
|
||||
<script>
|
||||
export default {
|
||||
mounted() {
|
||||
this.goNext();
|
||||
this.goNext1();
|
||||
},
|
||||
|
||||
methods: {
|
||||
goNext() {
|
||||
goNext1() {
|
||||
const params = $A.urlParameterAll();
|
||||
if (params.token) {
|
||||
this.$store.dispatch("call", {
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit e96d5f09dfff6d8694916c2e897ad7b054243153
|
||||
Subproject commit 257202dcafd9993c1a69a7b0d24d1e2c3160e37e
|
||||
Loading…
x
Reference in New Issue
Block a user