|
|
|
@ -86,6 +86,8 @@ import { session } from '@/store/modules/session';
|
|
|
|
import { BasePage } from '@/components/base/page';
|
|
|
|
import { BasePage } from '@/components/base/page';
|
|
|
|
import { VForm } from 'vue/types/form';
|
|
|
|
import { VForm } from 'vue/types/form';
|
|
|
|
import { Lang } from '@/i18n';
|
|
|
|
import { Lang } from '@/i18n';
|
|
|
|
|
|
|
|
import vm from '@/main';
|
|
|
|
|
|
|
|
import checkAppUpdate from '@/plugins/app-update';
|
|
|
|
// mixin 引入示例目前用于弹窗自定义
|
|
|
|
// mixin 引入示例目前用于弹窗自定义
|
|
|
|
// import { any } from 'lodash/fp';
|
|
|
|
// import { any } from 'lodash/fp';
|
|
|
|
|
|
|
|
|
|
|
|
@ -147,12 +149,12 @@ export default class LoginPage extends BasePage {
|
|
|
|
this.$form.setRules(this.rules);
|
|
|
|
this.$form.setRules(this.rules);
|
|
|
|
//this.update();
|
|
|
|
//this.update();
|
|
|
|
console.log('image', this.image);
|
|
|
|
console.log('image', this.image);
|
|
|
|
console.log("Version////",this.Version);
|
|
|
|
console.log('Version////', this.Version);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Version = '1.0.0';
|
|
|
|
Version = '1.0.0';
|
|
|
|
async update() {
|
|
|
|
async update() {
|
|
|
|
await session.QueryVersion();
|
|
|
|
await session.QueryVersion();
|
|
|
|
if (this.Version != session.Version) {
|
|
|
|
if (this.Version == session.Version) {
|
|
|
|
// 版本更新提示
|
|
|
|
// 版本更新提示
|
|
|
|
uni.showModal({
|
|
|
|
uni.showModal({
|
|
|
|
content: this.$t('message.Tip1') as string,
|
|
|
|
content: this.$t('message.Tip1') as string,
|
|
|
|
@ -162,69 +164,33 @@ export default class LoginPage extends BasePage {
|
|
|
|
if (res.confirm) {
|
|
|
|
if (res.confirm) {
|
|
|
|
//确定执行下载
|
|
|
|
//确定执行下载
|
|
|
|
let downloadApkUrl = session.url;
|
|
|
|
let downloadApkUrl = session.url;
|
|
|
|
|
|
|
|
uni.showLoading({
|
|
|
|
|
|
|
|
title: vm.$t('message.uploading') as string,
|
|
|
|
|
|
|
|
//title: '正在下载中..........',
|
|
|
|
|
|
|
|
});
|
|
|
|
////////////////uni下载方法,
|
|
|
|
////////////////uni下载方法,
|
|
|
|
uni.downloadFile({
|
|
|
|
uni.downloadFile({
|
|
|
|
url: downloadApkUrl,
|
|
|
|
url: downloadApkUrl,
|
|
|
|
success: (downloadResult) => {
|
|
|
|
success: (downloadResult) => {
|
|
|
|
//uni.hideLoading();
|
|
|
|
uni.hideLoading();
|
|
|
|
if (downloadResult.statusCode == 200) {
|
|
|
|
if (downloadResult.statusCode == 200) {
|
|
|
|
//安装更新
|
|
|
|
//安装更新
|
|
|
|
plus.runtime.install(downloadResult.tempFilePath as any, { force: true }, function () {
|
|
|
|
plus.runtime.install(downloadResult.tempFilePath as any, { force: true }, function () {
|
|
|
|
//uni.showToast('更新成功，重启');
|
|
|
|
//uni.showToast('更新成功，重启');
|
|
|
|
plus.runtime.restart();
|
|
|
|
plus.runtime.restart();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
// uni.showModal({
|
|
|
|
|
|
|
|
// //content: '更新更新',
|
|
|
|
|
|
|
|
// content: this.$t('message.Tip2') as string,
|
|
|
|
|
|
|
|
// confirmText: this.$t('message.restart') as string,
|
|
|
|
|
|
|
|
// cancelText: this.$t('message.Cancel') as string,
|
|
|
|
|
|
|
|
// success: function (res) {
|
|
|
|
|
|
|
|
// if (res.confirm == true) {
|
|
|
|
|
|
|
|
// plus.runtime.install(downloadResult.tempFilePath, { force: true }, function (res) {
|
|
|
|
|
|
|
|
// //uni.showToast('更新成功，重启');
|
|
|
|
|
|
|
|
// plus.runtime.restart();
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
});
|
|
|
|
});
|
|
|
|
///////////////////// plus方法
|
|
|
|
} else {
|
|
|
|
// plus.downloader
|
|
|
|
//return;
|
|
|
|
// .createDownload(downloadApkUrl, {}, function (d, status) {
|
|
|
|
console.log("1111111");
|
|
|
|
// uni.showModal({
|
|
|
|
|
|
|
|
// content: status,
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
// if (status == 200) {
|
|
|
|
|
|
|
|
// uni.showModal({
|
|
|
|
|
|
|
|
// title: '',
|
|
|
|
|
|
|
|
// content: this.$t('message.Tip2') as string,
|
|
|
|
|
|
|
|
// confirmText: this.$t('message.restart') as string,
|
|
|
|
|
|
|
|
// cancelText: this.$t('message.Cancel') as string,
|
|
|
|
|
|
|
|
// success: function (res) {
|
|
|
|
|
|
|
|
// if (res.confirm == true) {
|
|
|
|
|
|
|
|
// plus.runtime.install(plus.io.convertLocalFileSystemURL(d.filename), { force: true }, function (res) {
|
|
|
|
|
|
|
|
// //uni.showToast('更新成功，重启');
|
|
|
|
|
|
|
|
// plus.runtime.restart();
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
|
|
// console.log('Download failed: ' + status);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// })
|
|
|
|
|
|
|
|
// .start();
|
|
|
|
|
|
|
|
// dtask.start();
|
|
|
|
|
|
|
|
/////////////////plus 方法
|
|
|
|
|
|
|
|
} else if (res.cancel) {
|
|
|
|
|
|
|
|
//console.log('用户点击取消');
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//return;
|
|
|
|
this.go();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/////////////////无用代码无用代码
|
|
|
|
/////////////////无用代码无用代码
|
|
|
|
// 更新应用资源
|
|
|
|
// 更新应用资源
|
|
|
|
@ -260,6 +226,33 @@ export default class LoginPage extends BasePage {
|
|
|
|
}, 1500);
|
|
|
|
}, 1500);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
////////////////////////////
|
|
|
|
////////////////////////////
|
|
|
|
|
|
|
|
async go() {
|
|
|
|
|
|
|
|
const { username, password } = this.form;
|
|
|
|
|
|
|
|
const loginResult = await session.login({
|
|
|
|
|
|
|
|
username,
|
|
|
|
|
|
|
|
password,
|
|
|
|
|
|
|
|
lang: this.$i18n.locale as Lang,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
const { code, factoryCode, list, loginName, msg, userId, userName } = loginResult;
|
|
|
|
|
|
|
|
session.setUser({
|
|
|
|
|
|
|
|
code,
|
|
|
|
|
|
|
|
factoryCode,
|
|
|
|
|
|
|
|
loginName,
|
|
|
|
|
|
|
|
list,
|
|
|
|
|
|
|
|
msg,
|
|
|
|
|
|
|
|
userId,
|
|
|
|
|
|
|
|
userName,
|
|
|
|
|
|
|
|
lang: this.$i18n.locale as Lang,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
uni.showToast({
|
|
|
|
|
|
|
|
icon: 'success',
|
|
|
|
|
|
|
|
title: this.$t('message.LoginSuccessful') as string,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
uni.navigateTo({
|
|
|
|
|
|
|
|
url: page.login.area,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
login(): void {
|
|
|
|
login(): void {
|
|
|
|
this.$form.validate(async (valid: boolean) => {
|
|
|
|
this.$form.validate(async (valid: boolean) => {
|
|
|
|
if (valid) {
|
|
|
|
if (valid) {
|
|
|
|
@ -272,32 +265,34 @@ export default class LoginPage extends BasePage {
|
|
|
|
uni.navigateTo({ url: page.login.server });
|
|
|
|
uni.navigateTo({ url: page.login.server });
|
|
|
|
}, 2000);
|
|
|
|
}, 2000);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
const { username, password } = this.form;
|
|
|
|
//checkAppUpdate();
|
|
|
|
const loginResult = await session.login({
|
|
|
|
this.update();
|
|
|
|
username,
|
|
|
|
//const { username, password } = this.form;
|
|
|
|
password,
|
|
|
|
// const loginResult = await session.login({
|
|
|
|
lang: this.$i18n.locale as Lang,
|
|
|
|
// username,
|
|
|
|
});
|
|
|
|
// password,
|
|
|
|
const { code, factoryCode, list, loginName, msg, userId, userName } = loginResult;
|
|
|
|
// lang: this.$i18n.locale as Lang,
|
|
|
|
session.setUser({
|
|
|
|
// });
|
|
|
|
code,
|
|
|
|
// const { code, factoryCode, list, loginName, msg, userId, userName } = loginResult;
|
|
|
|
factoryCode,
|
|
|
|
// session.setUser({
|
|
|
|
loginName,
|
|
|
|
// code,
|
|
|
|
list,
|
|
|
|
// factoryCode,
|
|
|
|
msg,
|
|
|
|
// loginName,
|
|
|
|
userId,
|
|
|
|
// list,
|
|
|
|
userName,
|
|
|
|
// msg,
|
|
|
|
lang: this.$i18n.locale as Lang,
|
|
|
|
// userId,
|
|
|
|
});
|
|
|
|
// userName,
|
|
|
|
uni.showToast({
|
|
|
|
// lang: this.$i18n.locale as Lang,
|
|
|
|
icon: 'success',
|
|
|
|
// });
|
|
|
|
title: this.$t('message.LoginSuccessful') as string,
|
|
|
|
// uni.showToast({
|
|
|
|
});
|
|
|
|
// icon: 'success',
|
|
|
|
//debugger;
|
|
|
|
// title: this.$t('message.LoginSuccessful') as string,
|
|
|
|
// this.update();
|
|
|
|
// });
|
|
|
|
uni.navigateTo({
|
|
|
|
// //debugger;
|
|
|
|
url: page.login.area,
|
|
|
|
// // this.update();
|
|
|
|
});
|
|
|
|
// uni.navigateTo({
|
|
|
|
|
|
|
|
// url: page.login.area,
|
|
|
|
|
|
|
|
// });
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
guoshuang
3 years ago