diff --git a/src/api/server.js b/src/api/server.js
index 1d2a6a7..7a8d859 100644
--- a/src/api/server.js
+++ b/src/api/server.js
@@ -45,7 +45,7 @@ export const Train = new (class {
//实训案例管理列表
getCaseList(params) {
return axios
- .post(this.getCaseListApi, qs.stringify(params), {headers: {requestType: "noToken"}})
+ .post(this.getCaseListApi, qs.stringify(params)/*, {headers: {requestType: "noToken"}}*/)
.then(res => res.data);
}
//添加
@@ -309,6 +309,7 @@ export const Login = new (class {
this.loginPublicKey = loginApi + "/login/getPublicKey"; //获取公钥
this.sendLoginCodeApi = loginApi + "/login/sendLoginCode"; //获取验证码
this.exitLogin = loginApi + "/login/exit"; //系统用户退出登录
+ this.yyyfLoginBack = loginApi + "/yyyfLogin/login";//以渔有方用户登录
}
sendLoginCode(params) {
@@ -344,6 +345,16 @@ export const Login = new (class {
.then(res => res.data);
}
+ yyyfLogin(params) {
+ return axios.get(this.yyyfLoginBack, {
+ params: params,
+ headers: {
+ requestType: "noToken"
+ }
+ })
+ .then(res => res.data);
+ }
+
logout() {
return axios.get(this.exitLogin, {
headers: {
diff --git a/src/common/js/utils.js b/src/common/js/utils.js
index 98d36a7..b65cbd3 100644
--- a/src/common/js/utils.js
+++ b/src/common/js/utils.js
@@ -330,6 +330,36 @@ class Utils {
}, false);
reader.readAsDataURL(file);
}
+
+ /**
+ * 解析请求路径返回路径参数
+ * @returns {{}}
+ */
+ parseUrl() {
+ let params = {};//定义数组
+ let url = decodeURIComponent(location.href);
+ let paramsIndex = url.indexOf("?")
+ if (paramsIndex != -1) {
+ paramsIndex = paramsIndex + 1;
+ let paramsStr = url.substring(paramsIndex);
+ let paramsAttr = paramsStr.split("&");
+ for (let x in paramsAttr) {
+ let y = paramsAttr[x].split("=");
+ if (y[0] == undefined || y[0] == "") {
+ continue;
+ }
+ if (y[1] != undefined) {
+ let value = "";
+ let len = y.length;
+ for (let j = 1; j < len; j++) {
+ value += y[j] == '' && paramsAttr[x].charAt(value.length + y[0].length + 1) != '' ? '=' : y[j];
+ }
+ params[y[0]] = value;
+ }
+ }
+ }
+ return params;
+ }
}
export default new Utils();
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 683a5c0..b470bc7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -48,10 +48,12 @@ router.beforeEach((to, from, next) => {
//NProgress.start();
let user = JSON.parse(sessionStorage.getItem('user'));
if (!user && to.path != '/login') {
- if(/train/.test(to.path)){//暂时这么写,user是需要有值的,这里先方便页面
+ if (/yyyfLoginBack/.test(to.path)) {
next()
- }else{
- next({ path: '/login' })
+ // } else if (/train/.test(to.path)) {//暂时这么写,user是需要有值的,这里先方便页面
+ // next()
+ } else {
+ next({path: '/login'})
}
}else if(user && to.path =='/login'){
next({name:'Index'})
diff --git a/src/router/index.js b/src/router/index.js
index 167acb1..a37214a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,5 +1,6 @@
import curRoutes from '@/common/js/testR.js'; //用户当前路由 测试
import Utils from '@/common/js/utils.js';
+import YyyfLogin from "../views/YyyfLogin";
// 实训案例管理主页
const TrainHome = resolve => require(['@/views/TrainHome.vue'], resolve)
@@ -104,6 +105,12 @@ let routes = [
name: 'Login',
hidden: true
},
+ {
+ path: '/yyyfLoginBack',
+ component: YyyfLogin,
+ name: 'YyyfLogin',
+ hidden: true
+ },
{
path: '/train',
component: TrainHome,
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 912651b..bb8f4ff 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -14,7 +14,7 @@
用户: {{account}}
- 修改个人信息
+
退出登录
@@ -145,7 +145,7 @@
}
.userinfo {
// text-align: right;
- padding-right: 35px;
+ //padding-right: 35px;
float: right;
.userinfo-inner {
cursor: pointer;
diff --git a/src/views/YyyfLogin.vue b/src/views/YyyfLogin.vue
new file mode 100644
index 0000000..530290f
--- /dev/null
+++ b/src/views/YyyfLogin.vue
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
\ No newline at end of file