diff --git a/src/api/login/index.js b/src/api/login/index.js index a82d8ed8..024e49dc 100644 --- a/src/api/login/index.js +++ b/src/api/login/index.js @@ -111,3 +111,27 @@ export function registerOn(mobile) { data: mobile }) } + +// 春耕app登录: 用户 +export function chungengUserLogin(code) { + return request({ + url: '/chungeng/userLogin', + method: 'post', + data: {code}, + headers: { + isToken: false + } + }) +} + +// 春耕app登录: 农户 +export function chungengFarmerLogin(code) { + return request({ + url: '/chungeng/farmerLogin', + method: 'post', + data: {code}, + headers: { + isToken: false + } + }) +} diff --git a/src/permission.js b/src/permission.js index 8d65b1db..0eccc7e4 100644 --- a/src/permission.js +++ b/src/permission.js @@ -19,6 +19,8 @@ const whiteList = [ '/notice/inviteTendersDetail', '/notice/winTheBiddingDetail', '/project/projectNeedsDetail', + '/chungeng/userSSOLogin', + '/chungeng/farmerSSOLogin', '/supply/index', '/interaction/index', diff --git a/src/router/index.js b/src/router/index.js index 968e5c01..bc8a247b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3335,6 +3335,24 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/zjdLogin'], resolve) }, + { + path: '/chungeng/userSSOLogin', + name: 'chungengUserSSOLogin', + meta: { + title: '春耕App用户登录入口', + hidden: true, + }, + component: (resolve) => require(['@/views/chungengUserSSOLogin'], resolve) + }, + { + path: '/chungeng/farmerSSOLogin', + name: 'chungengFarmerSSOLogin', + meta: { + title: '春耕App农户登录入口', + hidden: true, + }, + component: (resolve) => require(['@/views/chungengFarmerSSOLogin'], resolve) + }, { path: '/onlineHome/arbitrationList', name: 'arbitrationList', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c5c912ba..6006a5f0 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,4 +1,4 @@ -import { login, logout, getInfo, smsLogin } from '@/api/login'; +import {login, logout, getInfo, smsLogin, chungengUserLogin, chungengFarmerLogin} from '@/api/login'; import { registerOn } from "@/api/register"; import { getToken, setToken, removeToken } from '@/utils/auth' import { getSystemAttachmentUrl } from '@/api/system/config' @@ -171,6 +171,33 @@ const user = { // 更新用户信息 + // 春耕App用户登录 + ChungengLogin({ commit }, userInfo) { + const code = userInfo.code; + return new Promise((resolve, reject) => { + chungengUserLogin(code).then(res => { + setToken(res.token) + commit('SET_TOKEN', res.token) + Cookies.set("_Login_url", window.location.href); + resolve(res.data) + }).catch(error => { + reject(error) + }) + }) + }, + + // 春耕App用户登录 + ChungengFarmerLogin({ commit }, userInfo) { + const code = userInfo.code; + return new Promise((resolve, reject) => { + chungengFarmerLogin(code).then(res => { + Cookies.set("user", res.data, { expires: 30 }); + resolve(res.data) + }).catch(error => { + reject(error) + }) + }) + }, } } diff --git a/src/views/chungengFarmerSSOLogin.vue b/src/views/chungengFarmerSSOLogin.vue new file mode 100644 index 00000000..871a898a --- /dev/null +++ b/src/views/chungengFarmerSSOLogin.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/views/chungengUserSSOLogin.vue b/src/views/chungengUserSSOLogin.vue new file mode 100644 index 00000000..7c1bd545 --- /dev/null +++ b/src/views/chungengUserSSOLogin.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/views/sunVillage_info/index_code_rights.vue b/src/views/sunVillage_info/index_code_rights.vue index f4f7c099..68e58a15 100644 --- a/src/views/sunVillage_info/index_code_rights.vue +++ b/src/views/sunVillage_info/index_code_rights.vue @@ -75,12 +75,16 @@ created() { this.deptId = Cookies.get('deptId') this.bookId = Cookies.get('bookId') - bookInfo(this.bookId).then((res) => { - if (res.code == 200) { - this.deptName = res.data.deptName; - this.bookName = res.data.bookName; - } - }); + console.log(this.bookId); + if(this.bookId) + { + bookInfo(this.bookId).then((res) => { + if (res.code == 200) { + this.deptName = res.data.deptName; + this.bookName = res.data.bookName; + } + }); + } if(Cookies.get('user')){ this.userName = JSON.parse(Cookies.get('user')).memberName }