From a3f941474810410cce80f8284a873826020574d7 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Sat, 18 Sep 2021 16:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                  |  5 +++--
 src/router/index.js               |  6 ++++++
 src/store/modules/user.js         | 22 +++++++++++++++++++++-
 src/views/account/login.vue       |  9 ++++++---
 src/views/account/login/index.vue |  6 +++++-
 vue.config.js                     |  3 ++-
 6 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/.env.development b/.env.development
index 18533a6..5f1727a 100644
--- a/.env.development
+++ b/.env.development
@@ -1,9 +1,10 @@
 # 页面标题
 VUE_APP_TITLE = 问卷调查测试环境
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VUE_APP_API_ROOT = /tduck-api
+# VUE_APP_API_ROOT = /tduck-api
+VUE_APP_API_ROOT = http://192.168.1.140/api
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
-VUE_APP_DEBUG_TOOL =
+VUE_APP_DEBUG_TOOL = 
 # 高德地图key
 VUE_APP_MAP_KEY = f2200337d0d08538e78729572749882d
 # 微信功能开关 开启设置 ON，关闭设置 OFF
diff --git a/src/router/index.js b/src/router/index.js
index ad7e8e7..757ccd1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -50,6 +50,12 @@ router.beforeEach((to, from, next) => {
         if (store.getters['user/isLogin']) {
             next()
             NProgress.done()
+        } else if (to.query.token) {
+            console.log('ro.query', to.query)
+            store.dispatch('user/getUserInfo', to.query.token)
+            store.dispatch('user/setTokens', to.query.token)
+            next()
+            NProgress.done()
         } else {
             next({
                 path: '/login',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5983072..137d5a6 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-// import api from '@/api'
+import api from '@/api'
 
 const state = {
     token: localStorage.token,
@@ -37,6 +37,23 @@ const actions = {
     },
     logout(context) {
         context.commit('delData')
+    },
+    getUserInfo(context, token) {
+        
+        const url = '/epmetuser/operuser/queryOperUserDto'
+        api.get(url, {}).then(res => {
+            context.commit('setData', {
+                token: token,
+                userInfo: {
+                    ...res.data
+                }
+            })
+            console.log('useronfo', res.data)
+        })
+    },
+    setTokens(context, token) {
+        console.log('setToekns', token)
+        context.commit('setToken', token)
     }
 }
 
@@ -52,6 +69,9 @@ const mutations = {
         state.userInfo = null
         localStorage.removeItem('token')
         localStorage.removeItem('userInfo')
+    },
+    setToken(state, token) {
+        state.token = token
     }
 }
 
diff --git a/src/views/account/login.vue b/src/views/account/login.vue
index 420783a..6d4a245 100644
--- a/src/views/account/login.vue
+++ b/src/views/account/login.vue
@@ -281,6 +281,8 @@ export default {
                 ]
             },
             accountForm: {
+                app: 'gov',
+                client: 'web',
                 email: '',
                 phoneNumber: '',
                 password: ''
@@ -393,7 +395,7 @@ export default {
         phoneRegHandle() {
             this.$refs['phoneRegForm'].validate(valid => {
                 if (valid) {
-                    this.$api.post('/register/phone', this.accountForm).then(() => {
+                    this.$api.post('/tduck-api/register/phone', this.accountForm).then(() => {
                         this.registerSuccessHandle()
                     })
                 } else {
@@ -404,7 +406,7 @@ export default {
         emailRegHandle() {
             this.$refs['emailRegForm'].validate(valid => {
                 if (valid) {
-                    this.$api.post('/register/email', this.accountForm).then(() => {
+                    this.$api.post('/tduck-api/register/email', this.accountForm).then(() => {
                         this.registerSuccessHandle()
                     })
                 } else {
@@ -440,8 +442,9 @@ export default {
             })
         },
         loginHandle() {
+            
             this.$api.request({
-                url: '/login/account',
+                url: '/tduck-api/login/account',
                 method: 'post',
                 data: this.accountForm
             }).then(res => {
diff --git a/src/views/account/login/index.vue b/src/views/account/login/index.vue
index 552156a..f0f1ff3 100644
--- a/src/views/account/login/index.vue
+++ b/src/views/account/login/index.vue
@@ -112,6 +112,8 @@ export default {
                 ]
             },
             accountForm: {
+                app: 'gov',
+                client: 'web',
                 email: '',
                 phoneNumber: '',
                 password: ''
@@ -206,7 +208,9 @@ export default {
             this.$refs['accountLoginForm'].validate(valid => {
                 if (valid) {
                     this.$api.request({
-                        url: '/login/account',
+                        url: 'http://192.168.1.140/api/tduck-api/login/account',
+                        // url: '/login/account',
+
                         method: 'post',
                         data: this.accountForm
                     }).then(res => {
diff --git a/vue.config.js b/vue.config.js
index 703ed2c..173b23f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -19,7 +19,8 @@ module.exports = {
       '/tduck-api': {
         //target: 'http://localhost:8080/api/',
         //target: 'http://localhost:8116',
-        target: 'http://192.168.1.142:8116',
+        // target: 'http://192.168.1.142:8116',
+        target: 'http://192.168.1.140/api',
         //target: 'http://epmet-dev.elinkservice.cn:40002',
         changeOrigin: true
       }