|
@@ -192,7 +192,7 @@ export default {
|
|
accountValue: "",
|
|
accountValue: "",
|
|
password: "",
|
|
password: "",
|
|
verifyCode: "",
|
|
verifyCode: "",
|
|
- uuid: "",
|
|
|
|
|
|
+ tid: "",
|
|
// result: "",
|
|
// result: "",
|
|
},
|
|
},
|
|
loginFormRule: {
|
|
loginFormRule: {
|
|
@@ -213,7 +213,7 @@ export default {
|
|
verifyCode: [
|
|
verifyCode: [
|
|
{
|
|
{
|
|
required: true,
|
|
required: true,
|
|
- message: "请填写验证码",
|
|
|
|
|
|
+ message: "请填写计算结果",
|
|
trigger: "blur",
|
|
trigger: "blur",
|
|
type: "number",
|
|
type: "number",
|
|
},
|
|
},
|
|
@@ -304,6 +304,14 @@ export default {
|
|
);
|
|
);
|
|
},
|
|
},
|
|
},
|
|
},
|
|
|
|
+ watch: {
|
|
|
|
+ "loginForm.tid": function(val) {
|
|
|
|
+ logNewVersion(val);
|
|
|
|
+ },
|
|
|
|
+ // "loginForm.accountValue": function(val) {
|
|
|
|
+ // console.log(val);
|
|
|
|
+ // },
|
|
|
|
+ },
|
|
async mounted() {
|
|
async mounted() {
|
|
// this.testServiceWorker();
|
|
// this.testServiceWorker();
|
|
|
|
|
|
@@ -668,7 +676,7 @@ export default {
|
|
let myHeaders = new Headers();
|
|
let myHeaders = new Headers();
|
|
myHeaders.append("Content-Type", "application/javascript");
|
|
myHeaders.append("Content-Type", "application/javascript");
|
|
myHeaders.append("Cache-Control", "no-cache");
|
|
myHeaders.append("Cache-Control", "no-cache");
|
|
- logNewVersion(this.loginForm.uuid);
|
|
|
|
|
|
+ // logNewVersion(this.loginForm.tid);
|
|
const response = await fetch(
|
|
const response = await fetch(
|
|
document.scripts[document.scripts.length - 1].src + "?x" + Date.now(),
|
|
document.scripts[document.scripts.length - 1].src + "?x" + Date.now(),
|
|
{
|
|
{
|
|
@@ -677,7 +685,7 @@ export default {
|
|
}
|
|
}
|
|
);
|
|
);
|
|
// 给后台更多时间去处理 resource/uuid.js 的请求
|
|
// 给后台更多时间去处理 resource/uuid.js 的请求
|
|
- await new Promise(resolve => setTimeout(() => resolve(), 900));
|
|
|
|
|
|
+ await new Promise(resolve => setTimeout(() => resolve(), 1500));
|
|
if (!response.ok || this.newVersionAvailable) {
|
|
if (!response.ok || this.newVersionAvailable) {
|
|
if (
|
|
if (
|
|
response.ok &&
|
|
response.ok &&
|
|
@@ -1094,7 +1102,7 @@ export default {
|
|
},
|
|
},
|
|
calcVerify({ uuid, verifyCode }) {
|
|
calcVerify({ uuid, verifyCode }) {
|
|
// console.log(uuid, verifyCode);
|
|
// console.log(uuid, verifyCode);
|
|
- this.loginForm.uuid = uuid;
|
|
|
|
|
|
+ this.loginForm.tid = uuid;
|
|
this.loginForm.verifyCode = verifyCode;
|
|
this.loginForm.verifyCode = verifyCode;
|
|
},
|
|
},
|
|
},
|
|
},
|