diff --git a/package.json b/package.json
index 5f7cbd0..f8f4083 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build && sh ./build/deploy.sh",
- "build:pro": "vue-cli-service build && sh ./build/deploy_prod.sh",
+ "build:pro": "sh ./build/deploy_prod.sh",
"lint": "vue-cli-service lint"
},
"dependencies": {
diff --git a/setTokenAndRedirect.html b/setTokenAndRedirect.html
new file mode 100644
index 0000000..4bba23a
--- /dev/null
+++ b/setTokenAndRedirect.html
@@ -0,0 +1,34 @@
+
+
+
+
+
+ Document
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 9eb0e2e..831d777 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -189,21 +189,13 @@ router.beforeEach(async (to, from, next) => {
return next();
}
if (to.query.refreshToken) {
- location.replace(
- `${to.query.redirect}${
- to.query.redirect.includes("?") ? "&" : "?"
- }redirectToken=${to.query.token}&redirectRefreshToken=${
- to.query.refreshToken
- }`
- );
- } else if (to.query.redirectRefreshToken) {
let ret = await store.dispatch("Login", {
- token: to.query.redirectToken,
- refreshToken: to.query.redirectRefreshToken,
+ token: to.query.token,
+ refreshToken: to.query.refreshToken,
});
if (ret && ret.code === 0) {
- delete to.query.redirectToken;
- delete to.query.redirectRefreshToken;
+ delete to.query.token;
+ delete to.query.refreshToken;
return next({ path: to.path, query: to.query, replace: true });
} else {
userLogin();
diff --git a/src/utils/login.js b/src/utils/login.js
index 0ee45b8..4693079 100644
--- a/src/utils/login.js
+++ b/src/utils/login.js
@@ -13,7 +13,7 @@ export async function userLogin() {
const isWeixin = ua.indexOf("micromessenger") !== -1;
console.log(isWeixin, terminalType);
// console.log("router", router);
- location.href = `${window.config.loginUrl}?needWx=${
- isWeixin ? true : false
- }&redirect=${encodeURIComponent(location.href)}`;
+ location.href = `${
+ window.config.loginUrl
+ }?needWx=false&redirect=${encodeURIComponent(location.href)}`;
}
diff --git a/src/views/ColumnDetail/index.vue b/src/views/ColumnDetail/index.vue
index 3b92701..ec50b23 100644
--- a/src/views/ColumnDetail/index.vue
+++ b/src/views/ColumnDetail/index.vue
@@ -55,6 +55,7 @@ import { queryColumnDetail } from "@/api/column";
import { liveColumn } from "@/api/column";
import { showConfirmDialog } from "vant";
import { showToast } from "vant";
+import { userLogin } from "@/utils/login";
const route = useRoute();
const router = useRouter();
@@ -77,7 +78,7 @@ getColumnDetail();
const sendLiveColumn = async () => {
if (!store.state.token) {
- return router.push(`/login?redirect=${route.fullPath}`);
+ return userLogin();
}
if (columnDetail.value.isSub === 1) {
showConfirmDialog({
diff --git a/src/views/VideoPlay/components/VideoFooter.vue b/src/views/VideoPlay/components/VideoFooter.vue
index 9c4747a..3868d58 100644
--- a/src/views/VideoPlay/components/VideoFooter.vue
+++ b/src/views/VideoPlay/components/VideoFooter.vue
@@ -62,7 +62,6 @@