From 36ed184cd4475d205b2ed1f45458ab0226a48d61 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Wed, 20 Mar 2024 17:16:16 +0800
Subject: [PATCH] flat: 123

---
 App.vue                      | 32 ++++++++++++++++++++++++++++++--
 api/user.js                  |  7 +++++--
 pages/login/login.vue        |  1 -
 store/models/news.js         |  1 +
 store/models/news_recruit.js |  1 +
 store/models/user.js         |  3 ++-
 vue.config.js                |  3 ++-
 7 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/App.vue b/App.vue
index bc0c547..9ffc910 100644
--- a/App.vue
+++ b/App.vue
@@ -3,6 +3,7 @@
 	@import "@/uni_modules/uview-ui/index.scss";
 </style>
 <script>
+    import website from '@/config/website.js'
 	import {
 		mapGetters
 	} from 'vuex'
@@ -13,8 +14,35 @@
 	// #endif
 
 	export default {
-		onLaunch: function() {
-			if (this.$store.state.user.token) {
+		onLaunch: function(options) {
+            console.log(options.query)
+            if(options.query.token) {
+                const { token } = options
+                this.$store.dispatch("LoginByUsername", {
+                	username: 'admin',
+                	password: "admin",
+                	key: '',
+                	code: '1111',
+                	type: "account",
+                    token: options.query.token,
+                	tenantId: website.tenantId
+                }).then((resp) => {
+                	this.$store.dispatch('refreshAuthState').then(() => {
+                		that.loading = false
+                		var auth = this.auth
+                		if (!auth.bankCardState) {
+                			that.goSign(0)
+                		} else {
+                			uni.switchTab({
+                				url: '/pages/index/index'
+                			})
+                		}
+                	})
+                }).catch((err) => {
+                	this.loading = false
+                	// this.$refs.code.refushCode()
+                });
+            } else if (this.$store.state.user.token) {
 				this.$store.dispatch('startRefreshTokenTimer')
 				this.$store.dispatch('startRefreshNewsTimer')
 				this.$store.dispatch('refreshAuthState')
diff --git a/api/user.js b/api/user.js
index 81718ad..1d9807b 100644
--- a/api/user.js
+++ b/api/user.js
@@ -6,7 +6,7 @@ import {
 } from '@/untils/store.js'
 import website from "@/config/website";
 
-export const loginByUsername = (tenantId, username, password, type, key, code) => request({
+export const loginByUsername = (tenantId, username, password, type, key, code, token) => request({
 	url: '/api/jobslink-auth/oauth/token',
 	method: 'post',
 	headers: {
@@ -24,7 +24,10 @@ export const loginByUsername = (tenantId, username, password, type, key, code) =
 		grant_type: (website.captchaMode ? "captcha" : "password"),
 		scope: "all",
 		type
-	}
+	},
+    data: {
+        token
+    }
 });
 
 export const refreshToken = (refresh_token, tenantId) => request({
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c6ec6a0..bc565f1 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -79,7 +79,6 @@
 							icon:'none',
 						})
 					} else {
-						debugger
 						var that = this
 						this.loading = true
 						this.$store.dispatch("LoginByUsername", {
diff --git a/store/models/news.js b/store/models/news.js
index 3cae31b..2823c4e 100644
--- a/store/models/news.js
+++ b/store/models/news.js
@@ -301,6 +301,7 @@ const news = {
 			commit,
 			dispatch
 		}) {
+                    console.log('触发2')
 			dispatch('newsInit').then(() => {
 				startRefreshToken(dispatch);
 			})
diff --git a/store/models/news_recruit.js b/store/models/news_recruit.js
index c710d6e..19f514f 100644
--- a/store/models/news_recruit.js
+++ b/store/models/news_recruit.js
@@ -283,6 +283,7 @@ const news = {
       stopRefreshToken();
     },
     startRefreshNewsTimer({ state, commit, dispatch }) {
+        console.log('触发1')
       dispatch("newsInit").then(() => {
         startRefreshToken(dispatch);
       });
diff --git a/store/models/user.js b/store/models/user.js
index 2b6697d..d035caa 100644
--- a/store/models/user.js
+++ b/store/models/user.js
@@ -75,7 +75,7 @@ const user = {
 		}, userInfo) {
 			return new Promise((resolve, reject) => {
 				loginByUsername(userInfo.tenantId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key,
-					userInfo.code).then(res => {
+					userInfo.code, userInfo.token).then(res => {
 					const data = res.data;
 					if (data.error_description) {
 						uni.showToast({
@@ -88,6 +88,7 @@ const user = {
 						commit('SET_TENANT_ID', data.tenant_id);
 						commit('SET_USER_INFO', data);
 						dispatch('refreshAuthState')
+                        cons.log('开始1')
 						dispatch('startRefreshNewsTimer')
 						startRefreshToken();
 					}
diff --git a/vue.config.js b/vue.config.js
index 39a4367..02a90a9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,7 +4,8 @@ module.exports = {
         proxy: {
             '/api': {
                 // target: 'http://192.168.3.108:8000', // 本地服务接口地址
-                target: 'http://192.168.3.173:8000', // 本地服务接口地址
+                target: 'http://192.168.3.112:8000', // 本地服务接口地址
+                // target: 'http://10.165.0.173:8000', // 本地服务接口地址
                 ws: true,
                 pathRewrite: {
                     '^/api': '/'