update @修复
This commit is contained in:
parent
1416849fe9
commit
871fa17952
|
@ -16,8 +16,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.dialog-text {
|
.dialog-text {
|
||||||
height: 55px;
|
min-height: 55px;
|
||||||
line-height: 55px;
|
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
color: rgb(82, 77, 77);
|
color: rgb(82, 77, 77);
|
||||||
|
@ -33,6 +32,6 @@
|
||||||
font-size: 19px;
|
font-size: 19px;
|
||||||
color: rgb(255, 255, 255);
|
color: rgb(255, 255, 255);
|
||||||
line-height: 45px;
|
line-height: 45px;
|
||||||
margin: auto;
|
margin: 10px auto;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -4,7 +4,7 @@
|
||||||
v-model:show="model"
|
v-model:show="model"
|
||||||
:width="width"
|
:width="width"
|
||||||
:height="height"
|
:height="height"
|
||||||
:style="{ height: height }"
|
:style="{ minHeight: height }"
|
||||||
:showConfirmButton="false"
|
:showConfirmButton="false"
|
||||||
v-bind:close="close"
|
v-bind:close="close"
|
||||||
>
|
>
|
||||||
|
|
|
@ -73,10 +73,7 @@ router.beforeEach(async (to, from, next) => {
|
||||||
const strP = str[str.length - 1];
|
const strP = str[str.length - 1];
|
||||||
localStorage.setItem("key", strP || "");
|
localStorage.setItem("key", strP || "");
|
||||||
next({
|
next({
|
||||||
path: "/home",
|
name: 'home', query: { key: strP }
|
||||||
query: {
|
|
||||||
key: strP || "",
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
next();
|
next();
|
||||||
|
|
|
@ -12,7 +12,7 @@ export default {
|
||||||
name: 'home',
|
name: 'home',
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
key: this.$route.query.key || localStorage.getItem("openid") || '',
|
key: this.$route.query.key || localStorage.getItem("key") || '',
|
||||||
loginBack: this.$route.query.loginBack,
|
loginBack: this.$route.query.loginBack,
|
||||||
// jumpPath: this.$route.query.jumpPath,
|
// jumpPath: this.$route.query.jumpPath,
|
||||||
openid: this.$route.query.openid || localStorage.getItem("openid") || '', // 微信授权id
|
openid: this.$route.query.openid || localStorage.getItem("openid") || '', // 微信授权id
|
||||||
|
@ -31,7 +31,7 @@ export default {
|
||||||
if (!this.loginBack) {
|
if (!this.loginBack) {
|
||||||
sessionStorage.clear();
|
sessionStorage.clear();
|
||||||
localStorage.clear();
|
localStorage.clear();
|
||||||
this.key && localStorage.setItem("token", this.key);
|
this.key && localStorage.setItem("key", this.key);
|
||||||
this.openid && localStorage.setItem("openid", this.openid);
|
this.openid && localStorage.setItem("openid", this.openid);
|
||||||
this.preLogic();
|
this.preLogic();
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue