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