Skip to content

C
campSite
Commit bdea4b12 authored by wuwangwolihui's avatar wuwangwolihui
Browse files
Options

营地2.0-整合修改

parent 5f3852f9
Hide whitespace changes
Inline Side-by-side
Showing with 365 additions and 374 deletions
src/components/Header.vue
View file @ bdea4b12
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
created() { created() {
this.isLogin = !!localStorage.getItem("index-token-all"); this.isLogin = !!localStorage.getItem("index-token-all");
this.phone = localStorage.getItem("index-phone-all") || ""; this.phone = localStorage.getItem("index-phone-all") || "";
console.log(this.type)
let code = this.$store.state.indexIdentity; let code = this.$store.state.indexIdentity;
this.system_logo = localStorage.getItem("system_logo" + code) || ""; this.system_logo = localStorage.getItem("system_logo" + code) || "";
}, },
...@@ -79,7 +78,7 @@ ...@@ -79,7 +78,7 @@
}, },
// 去个人中心 // 去个人中心
toCenter() { toCenter() {
this.$router.replace("/signUpList"); this.$router.replace("/myInfo");
}, },
// 去注册 // 去注册
toRegister() { toRegister() {
...@@ -92,11 +91,9 @@ ...@@ -92,11 +91,9 @@
}, },
// 去登录页 // 去登录页
toLogin() { toLogin() {
console.log(this.type)
if (this.type == 1) { if (this.type == 1) {
this.$router.push("/baseLogin"); this.$router.push("/baseLogin");
if (this.$route.fullPath != '/baseLogin') {
this.$store.commit('setFullPath', this.$route.fullPath);
}
} else if (this.type == 2) { } else if (this.type == 2) {
let code = this.$store.state.indexIdentity; let code = this.$store.state.indexIdentity;
this.$router.push("/login?code=" + code); this.$router.push("/login?code=" + code);
...@@ -118,7 +115,7 @@ ...@@ -118,7 +115,7 @@
window.localStorage.clear(); window.localStorage.clear();
this.isLogin = false; this.isLogin = false;
} else if (this.type == 2) { } else if (this.type == 2) {
this.reload() // this.reload()
let code = this.$store.state.indexIdentity; let code = this.$store.state.indexIdentity;
window.localStorage.removeItem("doubt_code" + code); window.localStorage.removeItem("doubt_code" + code);
window.localStorage.removeItem("doubt_info" + code); window.localStorage.removeItem("doubt_info" + code);
...@@ -141,10 +138,11 @@ ...@@ -141,10 +138,11 @@
window.localStorage.removeItem("bank_first" + code); window.localStorage.removeItem("bank_first" + code);
window.localStorage.removeItem("bank_idcard" + code); window.localStorage.removeItem("bank_idcard" + code);
window.localStorage.removeItem("bank_info" + window.localStorage.getItem("phone" + code) + code); window.localStorage.removeItem("bank_info" + window.localStorage.getItem("phone" + code) + code);
window.localStorage.removeItem("index-token-all"); window.localStorage.removeItem("index-token-all");
window.localStorage.removeItem("index-phone-all"); window.localStorage.removeItem("index-phone-all");
this.isLogin = false; this.isLogin = false;
this.reload() // this.reload()
if (this.$store.state.human == 1) { if (this.$store.state.human == 1) {
await this.$router.replace({ await this.$router.replace({
path: "/login", path: "/login",
...@@ -172,8 +170,11 @@ ...@@ -172,8 +170,11 @@
}, },
watch: { watch: {
typeFu(val) { typeFu(val) {
console.log(val)
this.type = val; this.type = val;
if (val == 2) {
let code = this.$store.state.indexIdentity;
this.system_logo = localStorage.getItem("system_logo" + code) || "";
}
} }
} }
}; };
......
src/config/server.js
View file @ bdea4b12
...@@ -12,11 +12,12 @@ ...@@ -12,11 +12,12 @@
// export const SERVER_WS_URL = 'wss://api1.testgate.cn' // websocket // export const SERVER_WS_URL = 'wss://api1.testgate.cn' // websocket
// 正式 // 正式
export const SERVER_URL = "https://apiy.thuers.com/"; // 正式环境 export const SERVER_URL = "https://apiy.thuers.com/modules-campsite"; // 正式环境
export const DEVELOPMENT_SERVER_URL = "http://192.168.1.193:8088"; //开发环境 export const DEVELOPMENT_SERVER_URL = "http://192.168.1.193:8088/modules-campsite"; //开发环境
export const SERVER_WS_URL = "wss://apiy.thuers.com"; // websocket export const SERVER_WS_URL = "wss://apiy.thuers.com"; // websocket
// 测试 // 测试
// export const SERVER_URL = "https://ying-test.campcenter.cn"; // 正式环境 // export const SERVER_URL = "https://ying-test.campcenter.cn"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "https://ying-test.campcenter.cn/"; //开发环境 // export const DEVELOPMENT_SERVER_URL = "https://ying-test.campcenter.cn/"; //开发环境
// export const SERVER_WS_URL = "wss://ying-test.campcenter.cn"; // websocket // export const SERVER_WS_URL = "wss://ying-test.campcenter.cn"; // websocket
src/request/base/active.js
View file @ bdea4b12
...@@ -5,7 +5,7 @@ import {request} from './network'; ...@@ -5,7 +5,7 @@ import {request} from './network';
export function LabelType(data) { export function LabelType(data) {
return request({ return request({
method: 'get', method: 'get',
url: '/modules-campsite/activity/labelType', url: '/activity/labelType',
params: data params: data
}) })
} }
...@@ -14,7 +14,7 @@ export function LabelType(data) { ...@@ -14,7 +14,7 @@ export function LabelType(data) {
export function HotList(data) { export function HotList(data) {
return request({ return request({
method: 'post', method: 'post',
url: '/modules-campsite/activityCenter/hotList', url: '/activityCenter/hotList',
data: data data: data
}) })
} }
...@@ -23,7 +23,7 @@ export function HotList(data) { ...@@ -23,7 +23,7 @@ export function HotList(data) {
export function GetActiveInfo(id) { export function GetActiveInfo(id) {
return request({ return request({
method: 'get', method: 'get',
url: '/modules-campsite/activityCenter/detail/' + id, url: '/activityCenter/detail/' + id,
data: {} params: {}
}) })
} }
src/request/base/login.js
View file @ bdea4b12
...@@ -5,7 +5,7 @@ import {request} from './network' ...@@ -5,7 +5,7 @@ import {request} from './network'
export function login(data) { export function login(data) {
return request({ return request({
method: 'post', method: 'post',
url: '/modules-campsite/web/auth/login', url: '/web/auth/login',
params: data params: data
}) })
} }
......
src/request/base/network.js
View file @ bdea4b12
...@@ -47,7 +47,7 @@ export function request(config) { ...@@ -47,7 +47,7 @@ export function request(config) {
}) })
instance.interceptors.request.use( instance.interceptors.request.use(
(config) => { (config) => {
// const hotList = '/modules-campsite/activityCenter/hotList'; // const hotList = '/activityCenter/hotList';
// //
// if (config.url.indexOf(hotList) != -1) { // if (config.url.indexOf(hotList) != -1) {
// return config // return config
...@@ -66,15 +66,15 @@ export function request(config) { ...@@ -66,15 +66,15 @@ export function request(config) {
// const error = new Error('请登录！') // const error = new Error('请登录！')
// return Promise.reject(error) // return Promise.reject(error)
// } // }
if (config.hasLoading) { // if (config.hasLoading) {
const loadingText = config.loadingText ? config.loadingText : '请求中' // const loadingText = config.loadingText ? config.loadingText : '请求中'
loadingInstance = Loading.service({ // loadingInstance = Loading.service({
lock: true, // lock: true,
fullscreen: true, // fullscreen: true,
text: loadingText, // text: loadingText,
background: 'rgba(0, 0, 0, 0.25)' // background: 'rgba(0, 0, 0, 0.25)'
}) // })
} // }
return config return config
}, },
(error) => { (error) => {
......
src/request/base/register.js
View file @ bdea4b12
...@@ -8,7 +8,7 @@ import { ...@@ -8,7 +8,7 @@ import {
export function registerEmailCode(data) { export function registerEmailCode(data) {
return request({ return request({
method: 'post', method: 'post',
url: 'web/code/registerEmailCode', url: '/web/code/registerEmailCode',
params: data params: data
}) })
} }
...@@ -16,7 +16,7 @@ export function registerEmailCode(data) { ...@@ -16,7 +16,7 @@ export function registerEmailCode(data) {
export function passwordEmailCode(data) { export function passwordEmailCode(data) {
return request({ return request({
method: 'post', method: 'post',
url: 'web/code/passwordEmailCode', url: '/web/code/passwordEmailCode',
params: data params: data
}) })
} }
......
src/request/index/homework.js
View file @ bdea4b12
...@@ -29,7 +29,7 @@ export function downloadTeacherWork(data) { ...@@ -29,7 +29,7 @@ export function downloadTeacherWork(data) {
data['identity'] = store.state.indexIdentity; data['identity'] = store.state.indexIdentity;
return request({ return request({
method: 'post', method: 'post',
url: 'web/download/downloadTeacherWork', url: '/web/download/downloadTeacherWork',
params: data params: data
}) })
} }
......
src/request/index/network.js
View file @ bdea4b12
...@@ -30,18 +30,15 @@ const instance = axios.create({ ...@@ -30,18 +30,15 @@ const instance = axios.create({
instance.interceptors.request.use( instance.interceptors.request.use(
(config) => { (config) => {
if (config.method === "post" && !config.notQs) { if (config.method === "post" && !config.notQs) {
console.log(config)
config.data = qs.stringify(config.data); config.data = qs.stringify(config.data);
// config.data = config.data;
} }
if (config.url.indexOf(SERVER_URL) === -1) { if (config.url.indexOf(SERVER_URL) === -1) {
// console.log("upload");
config.headers["Content-Type"] = "multipart/form-data"; config.headers["Content-Type"] = "multipart/form-data";
} else { } else {
config.headers["Content-Type"] = "application/x-www-form-urlencoded"; config.headers["Content-Type"] = "application/x-www-form-urlencoded";
} }
// 调用接口请求添加token认证信息 // 调用接口请求添加token认证信息
const token = localStorage.getItem('index-token' + store.state.indexIdentity) const token = localStorage.getItem('index-token-all');
config.headers.token = token config.headers.token = token
if (token) config.headers.authorization = token; if (token) config.headers.authorization = token;
return config; return config;
...@@ -108,8 +105,6 @@ export function request(config) { ...@@ -108,8 +105,6 @@ export function request(config) {
const changePassCode = '/web/auth/changePassCode'; const changePassCode = '/web/auth/changePassCode';
const loginOut = '/web/auth/loginOut'; const loginOut = '/web/auth/loginOut';
const setLog = '/web/auth/setLog'; const setLog = '/web/auth/setLog';
// console.log(config)
if ( if (
(config.url.indexOf(loginUrl) != -1 && config.url.indexOf(loginOut) == -1) || (config.url.indexOf(loginUrl) != -1 && config.url.indexOf(loginOut) == -1) ||
config.url.indexOf(setAccountInfo) != -1 || config.url.indexOf(setAccountInfo) != -1 ||
...@@ -127,12 +122,11 @@ export function request(config) { ...@@ -127,12 +122,11 @@ export function request(config) {
return config return config
} }
const token = localStorage.getItem('index-token' + store.state.indexIdentity) // const token = localStorage.getItem('index-token' + store.state.indexIdentity)
const token = localStorage.getItem('index-token-all');
if (token) { if (token) {
// console.log(token,'11') config.headers.token = token;
config.headers.token = token
} else { } else {
router.push({ router.push({
path: '/login', path: '/login',
...@@ -168,7 +162,6 @@ export function request(config) { ...@@ -168,7 +162,6 @@ export function request(config) {
lock: true, lock: true,
fullscreen: true, fullscreen: true,
text: loadingText, text: loadingText,
// spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.25)' background: 'rgba(0, 0, 0, 0.25)'
}) })
} }
...@@ -181,8 +174,6 @@ export function request(config) { ...@@ -181,8 +174,6 @@ export function request(config) {
instance.interceptors.response.use( instance.interceptors.response.use(
(res) => { (res) => {
// console.log(res, '11111')
// console.log(res.data.code, 'res.data.code')
if (res.data.code == 400034 || if (res.data.code == 400034 ||
res.data.code == 400035 || res.data.code == 400035 ||
// res.data.code == 400001 || // res.data.code == 400001 ||
...@@ -199,14 +190,11 @@ export function request(config) { ...@@ -199,14 +190,11 @@ export function request(config) {
} }
if (res.data.code == 400023) { if (res.data.code == 400023) {
console.log(res) console.log(res)
// console.log(store.state.indexIdentity, 'store.state.indexIdentity')
let code = store.state.indexIdentity; let code = store.state.indexIdentity;
let isLogout = res.config.url == '/web/auth/loginOut'; let isLogout = res.config.url == '/web/auth/loginOut';
window.localStorage.removeItem("doubt_code" + code); window.localStorage.removeItem("doubt_code" + code);
window.localStorage.removeItem("doubt_info" + code); window.localStorage.removeItem("doubt_info" + code);
window.localStorage.removeItem("doubt_check" + code); window.localStorage.removeItem("doubt_check" + code);
window.localStorage.removeItem("index-token" + code);
window.localStorage.removeItem("phone" + code);
window.localStorage.removeItem("camp_name" + code); window.localStorage.removeItem("camp_name" + code);
window.localStorage.removeItem("system_color" + code); window.localStorage.removeItem("system_color" + code);
window.localStorage.removeItem("system_logo" + code); window.localStorage.removeItem("system_logo" + code);
...@@ -217,11 +205,7 @@ export function request(config) { ...@@ -217,11 +205,7 @@ export function request(config) {
window.localStorage.removeItem("bk_pic" + code); window.localStorage.removeItem("bk_pic" + code);
window.localStorage.removeItem("examine_status" + code); window.localStorage.removeItem("examine_status" + code);
window.localStorage.removeItem("examine_reason" + code); window.localStorage.removeItem("examine_reason" + code);
window.localStorage.removeItem( window.localStorage.removeItem("sign_up_file_18355151517" + window.localStorage.getItem("phone" + code) + code);
"sign_up_file_18355151517" +
window.localStorage.getItem("phone" + code) +
code
);
window.localStorage.removeItem("schoolName" + code); window.localStorage.removeItem("schoolName" + code);
window.localStorage.removeItem("restet_code_time" + code); window.localStorage.removeItem("restet_code_time" + code);
window.localStorage.removeItem("camp_statement" + code) window.localStorage.removeItem("camp_statement" + code)
...@@ -229,9 +213,10 @@ export function request(config) { ...@@ -229,9 +213,10 @@ export function request(config) {
window.localStorage.removeItem("payee" + code); window.localStorage.removeItem("payee" + code);
window.localStorage.removeItem("bank_first" + code); window.localStorage.removeItem("bank_first" + code);
window.localStorage.removeItem("bank_idcard" + code); window.localStorage.removeItem("bank_idcard" + code);
window.localStorage.removeItem( window.localStorage.removeItem("bank_info" + window.localStorage.getItem("phone" + code) + code);
"bank_info" + window.localStorage.getItem("phone" + code) + code
); window.localStorage.removeItem("index-token-all");
window.localStorage.removeItem("index-phone-all");
router.push({ router.push({
path: '/' + store.state.indexIdentity, path: '/' + store.state.indexIdentity,
}) })
...@@ -248,8 +233,6 @@ export function request(config) { ...@@ -248,8 +233,6 @@ export function request(config) {
window.localStorage.removeItem("doubt_code" + code); window.localStorage.removeItem("doubt_code" + code);
window.localStorage.removeItem("doubt_info" + code); window.localStorage.removeItem("doubt_info" + code);
window.localStorage.removeItem("doubt_check" + code); window.localStorage.removeItem("doubt_check" + code);
window.localStorage.removeItem("index-token" + code);
window.localStorage.removeItem("phone" + code);
window.localStorage.removeItem("camp_name" + code); window.localStorage.removeItem("camp_name" + code);
window.localStorage.removeItem("system_color" + code); window.localStorage.removeItem("system_color" + code);
window.localStorage.removeItem("system_logo" + code); window.localStorage.removeItem("system_logo" + code);
...@@ -273,6 +256,8 @@ export function request(config) { ...@@ -273,6 +256,8 @@ export function request(config) {
window.localStorage.removeItem( window.localStorage.removeItem(
"bank_info" + window.localStorage.getItem("phone" + code) + code "bank_info" + window.localStorage.getItem("phone" + code) + code
); );
window.localStorage.removeItem("index-token-all");
window.localStorage.removeItem("index-phone-all");
router.push({ router.push({
path: '/login', path: '/login',
query: { query: {
...@@ -287,19 +272,14 @@ export function request(config) { ...@@ -287,19 +272,14 @@ export function request(config) {
return res return res
}, },
(error) => { (error) => {
// console.log(window.localStorage.getItem(), 'id')
console.log(error, 'err') console.log(error, 'err')
console.log(error == 'Error: 请登录！', 'err')
console.log(error.message == '请登录！', 'err')
// console.log(error.response.status, '5555')
Message.closeAll() Message.closeAll()
if (error.message == '请登录！') { if (error.message == '请登录！') {
// router.push({ router.push({
// path: "/login?code=" + store.state.indexIdentity, path: "/login?code=" + store.state.indexIdentity,
// }) })
} }
if(error.response.status == 404) if (error.response.status == 404) {
{
Notification({ Notification({
message: "营地报名已关闭", message: "营地报名已关闭",
duration: 3000, duration: 3000,
...@@ -310,7 +290,6 @@ export function request(config) { ...@@ -310,7 +290,6 @@ export function request(config) {
} else { } else {
// 增加延迟，相同请求不得在短时间内重复发送 // 增加延迟，相同请求不得在短时间内重复发送
setTimeout(() => { setTimeout(() => {
console.log(error.config)
console.log(error) console.log(error)
allowRequest(reqList, error.config.url) allowRequest(reqList, error.config.url)
}, 1000) }, 1000)
...@@ -319,8 +298,6 @@ export function request(config) { ...@@ -319,8 +298,6 @@ export function request(config) {
return Promise.reject(error) return Promise.reject(error)
} }
) )
return instance(config) return instance(config)
} }
...@@ -331,16 +308,12 @@ export function request(config) { ...@@ -331,16 +308,12 @@ export function request(config) {
* @returns {Promise} * @returns {Promise}
*/ */
export function upload(url, data = {}) { export function upload(url, data = {}) {
// console.log(11111)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
axios.post(url, data).then( axios.post(url, data).then(
(response) => { (response) => {
console.log(url)
// console.log(11111)
resolve(response); resolve(response);
}, },
(err) => { (err) => {
console.log(11111)
reject(err); reject(err);
} }
); );
...@@ -363,7 +336,6 @@ export function download(url, params, filename) { ...@@ -363,7 +336,6 @@ export function download(url, params, filename) {
}) })
.then(data => { .then(data => {
const content = data; const content = data;
console.log(content)
const blob = new Blob([content]); const blob = new Blob([content]);
if ("download" in document.createElement("a")) { if ("download" in document.createElement("a")) {
const elink = document.createElement("a"); const elink = document.createElement("a");
......
src/request/index/register.js
View file @ bdea4b12
...@@ -10,7 +10,7 @@ export function registerEmailCode(data) { ...@@ -10,7 +10,7 @@ export function registerEmailCode(data) {
data['identity'] = store.state.indexIdentity; data['identity'] = store.state.indexIdentity;
return request({ return request({
method: 'post', method: 'post',
url: 'web/code/registerEmailCode', url: '/web/code/registerEmailCode',
params: data params: data
}) })
} }
...@@ -19,7 +19,7 @@ export function passwordEmailCode(data) { ...@@ -19,7 +19,7 @@ export function passwordEmailCode(data) {
data['identity'] = store.state.indexIdentity; data['identity'] = store.state.indexIdentity;
return request({ return request({
method: 'post', method: 'post',
url: 'web/code/passwordEmailCode', url: '/web/code/passwordEmailCode',
params: data params: data
}) })
} }
......
src/router/index.js
View file @ bdea4b12
...@@ -137,7 +137,7 @@ router.onError((error) => { ...@@ -137,7 +137,7 @@ router.onError((error) => {
}) })
function checkCam(code, cb) { function checkCam(code, cb) {
store.state.indexIdentity = code; store.commit('setIndexIdentity', code)
if (!code) { if (!code) {
Message({ Message({
message: "请访问正确的营地链接地址", message: "请访问正确的营地链接地址",
...@@ -199,32 +199,36 @@ function checkCam(code, cb) { ...@@ -199,32 +199,36 @@ function checkCam(code, cb) {
} }
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
console.log(to)
if (from.fullPath != '/') {
store.commit('setFullPath', from.fullPath);
}
let toLogin = "/login", let toLogin = "/login",
toBaseLogin = "/baseLogin",
toRegister = "/register", toRegister = "/register",
toBaseRegister = "/baseRegister",
toReset = "/reset", toReset = "/reset",
toBaseLogin = "/baseLogin",
toBaseRegister = "/baseRegister",
toBaseReset = "/baseReset", toBaseReset = "/baseReset",
toHome = "/home", toHome = "/home",
toActive = "/active", toActive = "/active",
toInfo = "/myInfo"; toInfo = "/myInfo";
let code = false; let code = false;
document.title = to.meta.title; document.title = to.meta.title;
if (to.path == toLogin || to.path == toRegister || to.path == toReset) { if (to.path == toBaseLogin || to.path == toBaseRegister || to.path == toBaseReset || to.path == toInfo || to.path == toHome || to.path == toActive || to.path.indexOf(toActive) != -1) {
// code = to.params.code ? to.params.code : to.query.code;
// checkCam(code, (res) => {
// if (res) {
// let token = window.localStorage.getItem("index-token" + code);
// //检查登陆情况
// if (token) {
// next("/" + code);
// } else {
// return next();
// }
// }
// });
return next(); return next();
} else if (to.path == toBaseLogin || to.path == toBaseRegister || to.path == toBaseReset || to.path == '/myInfo' || to.path == toHome || to.path == toActive || to.path.indexOf(toActive) != -1) { } else if (to.path == toLogin || to.path == toRegister || to.path == toReset) {
code = to.params.code ? to.params.code : to.query.code;
checkCam(code, (res) => {
if (res) {
let token = window.localStorage.getItem("index-token-all");
//检查登陆情况
if (token) {
next("/" + code);
} else {
return next();
}
}
});
return next(); return next();
} else if (to.name == "recruit") { } else if (to.name == "recruit") {
code = to.params.code; code = to.params.code;
...@@ -235,7 +239,7 @@ router.beforeEach((to, from, next) => { ...@@ -235,7 +239,7 @@ router.beforeEach((to, from, next) => {
}); });
} else { } else {
code = to.params.code ? to.params.code : to.query.code; code = to.params.code ? to.params.code : to.query.code;
let token = window.localStorage.getItem("index-token" + code); let token = window.localStorage.getItem("index-token-all");
if (!token) { if (!token) {
checkCam(code, (res) => { checkCam(code, (res) => {
if (res) { if (res) {
......
src/store/index.js
View file @ bdea4b12
...@@ -13,16 +13,16 @@ let state = { ...@@ -13,16 +13,16 @@ let state = {
// 数据 // 数据
data: [], data: [],
token: '', token: '',
indexIdentity:"", indexIdentity: localStorage.getItem("index-identity") || "",
human:0,//清华人文学院 human: 0,//清华人文学院
baseSchool:0,//基地 baseSchool: 0,//基地
configJson: {}, //分营地填写资料字段 configJson: {}, //分营地填写资料字段
work_context:"", work_context: "",
enclosure_url:"", enclosure_url: "",
isDisplay_num:null,//是否开启报名人数显示 isDisplay_num: null,//是否开启报名人数显示
info:{}, info: {},
isCloseCamp:0,//是否关闭营地 isCloseCamp: 0,//是否关闭营地
signUpInfo:{}, signUpInfo: {},
isLogin: localStorage.getItem("isLogin") || "0", // 只有1为已登录 isLogin: localStorage.getItem("isLogin") || "0", // 只有1为已登录
activeIndex: window.localStorage.getItem('index-active-path') || "0", activeIndex: window.localStorage.getItem('index-active-path') || "0",
}; };
......
src/store/mutations.js
View file @ bdea4b12
...@@ -17,12 +17,17 @@ export default { ...@@ -17,12 +17,17 @@ export default {
localStorage.removeItem("token"); localStorage.removeItem("token");
localStorage.removeItem("isLogin"); localStorage.removeItem("isLogin");
}, },
setIndexIdentity(state, code) {
state.indexIdentity = code;
window.localStorage.setItem('index-identity', code);
},
setActiveIndex(state, path) { setActiveIndex(state, path) {
let key = path.split('/')[1] == 'active' ? '/' + path.split('/')[1] : path; let key = path.split('/')[1] == 'active' ? '/' + path.split('/')[1] : path;
state.activeIndex = key; state.activeIndex = key;
window.localStorage.setItem('index-active-path', key); window.localStorage.setItem('index-active-path', key);
}, },
setFullPath(state, path){ setFullPath(state, path){
console.log(state, path)
state.fullPath = path; state.fullPath = path;
window.localStorage.setItem('index-fullPath', path); window.localStorage.setItem('index-fullPath', path);
}, },
......
src/views/base/Index.vue
View file @ bdea4b12
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
} }
body { body {
background-color: #f5f5f5; background-color: #f8f8f8;
} }
.el-container { .el-container {
...@@ -93,8 +93,7 @@ ...@@ -93,8 +93,7 @@
width: 100%; width: 100%;
min-height: 100%; min-height: 100%;
min-width: 1150px; min-width: 1150px;
/*box-sizing: border-box;*/ background-color: #f8f8f8;
background-color: #f5f5f5;
.el-header { .el-header {
position: fixed; position: fixed;
...@@ -105,7 +104,6 @@ ...@@ -105,7 +104,6 @@
.el-container { .el-container {
width: 100%; width: 100%;
/*overflow: auto;*/
display: flex; display: flex;
flex-flow: column; flex-flow: column;
margin-top: 80px; margin-top: 80px;
......
src/views/base/active/ActiveInfo.vue
View file @ bdea4b12
...@@ -218,7 +218,8 @@ ...@@ -218,7 +218,8 @@
signUp() { signUp() {
let allToken = window.localStorage.getItem('index-token-all'); let allToken = window.localStorage.getItem('index-token-all');
if (allToken) { if (allToken) {
this.$router.push('/signUp/examInfo?code=' + this.activeInfo.code); this.$store.commit('setIndexIdentity',this.activeInfo.identity)
this.$router.push('/signUp/examInfo?code=' + this.activeInfo.identity);
} else { } else {
this.$router.push('/baseLogin'); this.$router.push('/baseLogin');
} }
...@@ -240,6 +241,7 @@ ...@@ -240,6 +241,7 @@
}, },
// 分离获取html中的锚点 // 分离获取html中的锚点
getAnchor(content) { getAnchor(content) {
if(!content) return [];
let attrAndValueArr = content.match(/<a id=\"(.*?)\"><\/a>/g); let attrAndValueArr = content.match(/<a id=\"(.*?)\"><\/a>/g);
let valueArr = [] // 放所有该属性的值 let valueArr = [] // 放所有该属性的值
let anchorList = []; let anchorList = [];
...@@ -364,7 +366,7 @@ ...@@ -364,7 +366,7 @@
margin-left: 70px; margin-left: 70px;
display: flex; display: flex;
flex-flow: column; flex-flow: column;
justify-content: space-between; justify-content: space-around;
.active-info-cont-header { .active-info-cont-header {
display: flex; display: flex;
...@@ -625,7 +627,7 @@ ...@@ -625,7 +627,7 @@
margin-left: 10px; margin-left: 10px;
display: flex; display: flex;
flex-flow: column; flex-flow: column;
justify-content: space-between; justify-content: space-around;
.back-area-item-cont-txt { .back-area-item-cont-txt {
font-size: 12px; font-size: 12px;
......
src/views/base/login/Index.vue
View file @ bdea4b12
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
} }
} }
.login-index { .login-index {
position: relative; position: relative;
min-width: 1150px; min-width: 1150px;
......
src/views/base/myInfo/index.vue
View file @ bdea4b12
<template> <template>
<div class="camp-index"> <el-container>
<el-header height="104px"> <el-header height="104px">
<Header :typeFu="1"></Header> <Header :typeFu="2"></Header>
<div class="bg-top"></div> <div class="bg-top"></div>
</el-header> </el-header>
<div class="com-container"> <el-container>
<div class="index-container"> <div class="com-container index-container">
<div class="camp_left" ref="leftBoxFu"> <div class="camp_left" ref="leftBoxFu">
<ul <ul
:class="{ :class="{
...@@ -26,15 +26,13 @@ ...@@ -26,15 +26,13 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="camp_right" ref="rightBox"> <div class="camp_right" ref="rightBox">
<signUpList v-if="this.campindex_type==0"></signUpList> <signUpList v-if="this.campindex_type==0"></signUpList>
<!-- <router-view></router-view>-->
</div> </div>
</div> </div>
</div> <Footer></Footer>
<Footer></Footer> </el-container>
</div> </el-container>
</template> </template>
<script> <script>
...@@ -148,8 +146,12 @@ ...@@ -148,8 +146,12 @@
font-family: "icomoon"; font-family: "icomoon";
} }
.camp-index { .el-container {
background: #f8f8f8; position: relative;
width: 100%;
min-height: 100%;
min-width: 1150px;
background-color: #f8f8f8;
.el-header { .el-header {
position: fixed; position: fixed;
...@@ -164,81 +166,83 @@ ...@@ -164,81 +166,83 @@
} }
} }
// .com-container { .el-container {
// height: calc(100% - 100px); width: 100%;
// }
.index-container {
padding: 104px 0 70px 0;
display: flex; display: flex;
flex-flow: row; flex-flow: column;
margin-top: 104px;
.camp_left {
// width: 100px; .index-container {
height: 100%; padding: 0 0 50px 0;
position: relative; display: flex;
width: 22%; flex-flow: row;
max-width: 280px; flex: 1;
min-width: 200px;
// width: calc(100% - 100px); .camp_left {
height: 300px; position: relative;
width: 22%;
background-color: #ffffff;
border-radius: 8px;
padding: 20px 0;
margin-right: 25px;
.camp_left_box {
padding-inline-start: 0 !important;
}
&.is-fixed {
position: fixed;
top: 104px;
/*width: 14.4%;*/
max-width: 280px; max-width: 280px;
min-width: 216px; min-width: 200px;
} height: 300px;
&.is-absolute { background-color: #ffffff;
position: absolute; border-radius: 8px;
bottom: 0; padding: 20px 0;
width: 100%; margin-right: 25px;
}
} .camp_left_box {
padding-inline-start: 0 !important;
}
&.is-fixed {
position: fixed;
top: 104px;
max-width: 280px;
min-width: 216px;
}
li { &.is-absolute {
position: relative; position: absolute;
padding: 0 23px 0 51px; bottom: 0;
height: 44px; width: 100%;
line-height: 44px; }
margin: 10px 0; }
font-size: 15px; .camp_right {
list-style: none; flex: 1;
border-radius: 8px;
img { background-color: #ffffff;
vertical-align: middle;
margin: -3px 8px 0 0;
width: 20px;
position: absolute;
left: -1000px;
filter: drop-shadow(var(--color) 1023px 13px) !important;
} }
&.active, li {
&:hover { position: relative;
cursor: pointer; padding: 0 23px 0 51px;
background-color: #f8f8f8; height: 44px;
line-height: 44px;
margin: 10px 0;
font-size: 15px;
list-style: none;
img {
vertical-align: middle;
margin: -3px 8px 0 0;
width: 20px;
position: absolute;
left: -1000px;
filter: drop-shadow(var(--color) 1023px 13px) !important;
}
&.active,
&:hover {
border-left: 4px solid var(--color);
cursor: pointer;
background-color: #f8f8f8;
}
} }
} }
}
.camp_right {
flex: 1;
// width: calc(100% - 100px);
// height: 100%;
// overflow: auto;
border-radius: 8px;
background-color: #ffffff;
} }
} }
</style> </style>
src/views/index/Info/Index.vue
View file @ bdea4b12
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<div class="camp-index"> <div class="camp-index">
<el-header height="104px"> <el-header height="104px">
<Header :typeFu="2"></Header> <Header :typeFu="2"></Header>
<!-- <div class="bg-top"></div> -->
<div class="bg-top"> <div class="bg-top">
<el-breadcrumb separator="/"> <el-breadcrumb separator="/">
<el-breadcrumb-item <el-breadcrumb-item
...@@ -38,9 +37,7 @@ ...@@ -38,9 +37,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="camp_right" ref="rightBox"> <div class="camp_right" ref="rightBox">
<!-- <router-view @getStatus="getStatus" /> -->
<personalInfo v-if="this.campindex_type == 0"> </personalInfo> <personalInfo v-if="this.campindex_type == 0"> </personalInfo>
<!-- <password v-if="this.campindex_type == 1"> </password> --> <!-- <password v-if="this.campindex_type == 1"> </password> -->
</div> </div>
...@@ -201,13 +198,10 @@ export default { ...@@ -201,13 +198,10 @@ export default {
flex-flow: row; flex-flow: row;
.camp_left { .camp_left {
// width: 100px;
height: 100%;
position: relative; position: relative;
width: 22%; width: 22%;
max-width: 280px; max-width: 280px;
min-width: 200px; min-width: 200px;
// width: calc(100% - 100px);
height: 300px; height: 300px;
background-color: #ffffff; background-color: #ffffff;
......
src/views/index/camp/Index.vue
View file @ bdea4b12
<template> <template>
<div class="camp-index"> <el-container>
<el-header height="104px"> <el-header height="104px">
<Header :typeFu="2"></Header> <Header :typeFu="2"></Header>
<div class="bg-top"></div> <div class="bg-top"></div>
</el-header> </el-header>
<div class="com-container"> <el-container>
<div class="index-container"> <div class="com-container index-container">
<div> <template>
<div <div class="camp_left" ref="leftBoxFu" v-if="$store.state.human == 1">
class="camp_left"
ref="leftBoxFu"
v-if="$store.state.human == 1"
>
<ul <ul
:class="{ :class="{
'is-fixed': isPosition == 1, 'is-fixed': isPosition == 1,
...@@ -51,10 +47,9 @@ ...@@ -51,10 +47,9 @@
</li> </li>
</ul> </ul>
</div> </div>
</div> </template>
<div class="camp_right" ref="rightBox"> <div class="camp_right" ref="rightBox">
<!-- <router-view @getStatus="getStatus" /> -->
<SignUp @getStatus="getStatus" v-if="this.campindex_type == 0"> <SignUp @getStatus="getStatus" v-if="this.campindex_type == 0">
</SignUp> </SignUp>
<Homework v-if="this.campindex_type == 1"></Homework> <Homework v-if="this.campindex_type == 1"></Homework>
...@@ -62,9 +57,9 @@ ...@@ -62,9 +57,9 @@
<!-- <homeRefer v-if="this.homework_val == 3"> </homeRefer> --> <!-- <homeRefer v-if="this.homework_val == 3"> </homeRefer> -->
</div> </div>
</div> </div>
</div> <Footer></Footer>
<Footer></Footer> </el-container>
</div> </el-container>
</template> </template>
<script> <script>
...@@ -238,8 +233,16 @@ ...@@ -238,8 +233,16 @@
font-family: "icomoon"; font-family: "icomoon";
} }
.camp-index { body {
background: #f8f8f8; background-color: #f8f8f8;
}
.el-container {
position: relative;
width: 100%;
min-height: 100%;
min-width: 1150px;
background-color: #f8f8f8;
.el-header { .el-header {
position: fixed; position: fixed;
...@@ -254,81 +257,83 @@ ...@@ -254,81 +257,83 @@
} }
} }
// .com-container { .el-container {
// height: calc(100% - 100px); width: 100%;
// }
.index-container {
padding: 104px 0 70px 0;
display: flex; display: flex;
flex-flow: row; flex-flow: column;
margin-top: 104px;
.index-container {
padding: 0 0 50px 0;
display: flex;
flex-flow: row;
flex: 1;
.camp_left { .camp_left {
// width: 100px; position: relative;
height: 100%; width: 22%;
position: relative; max-width: 280px;
width: 22%; min-width: 200px;
max-width: 280px; height: 300px;
min-width: 200px;
// width: calc(100% - 100px);
height: 300px;
background-color: #ffffff; background-color: #ffffff;
border-radius: 8px; border-radius: 8px;
padding: 20px 0; padding: 20px 0;
margin-right: 25px; margin-right: 25px;
.camp_left_box { .camp_left_box {
padding-inline-start: 0 !important; padding-inline-start: 0 !important;
} }
&.is-fixed { &.is-fixed {
position: fixed; position: fixed;
top: 104px; top: 104px;
/*width: 14.4%;*/ /*width: 14.4%;*/
max-width: 280px; max-width: 280px;
min-width: 216px; min-width: 216px;
}
&.is-absolute {
position: absolute;
bottom: 0;
width: 100%;
}
} }
&.is-absolute { .camp_right {
position: absolute; flex: 1;
bottom: 0; width: calc(100% - 100px);
width: 100%; border-radius: 8px;
background-color: #ffffff;
} }
}
li {
position: relative;
padding: 0 23px 0 51px;
height: 44px;
line-height: 44px;
margin: 10px 0;
font-size: 15px;
list-style: none;
img { li {
vertical-align: middle; position: relative;
margin: -3px 8px 0 0; padding: 0 23px 0 51px;
width: 20px; height: 44px;
position: absolute; line-height: 44px;
left: -1000px; margin: 10px 0;
filter: drop-shadow(var(--color) 1023px 13px) !important; font-size: 15px;
} list-style: none;
img {
vertical-align: middle;
margin: -3px 8px 0 0;
width: 20px;
position: absolute;
left: -1000px;
filter: drop-shadow(var(--color) 1023px 13px) !important;
}
&.active, &.active,
&:hover { &:hover {
cursor: pointer; border-left: 4px solid var(--color);
background-color: #f8f8f8; cursor: pointer;
background-color: #f8f8f8;
}
} }
} }
} }
.camp_right {
flex: 1;
width: calc(100% - 100px);
// height: 100%;
// overflow: auto;
border-radius: 8px;
background-color: #ffffff;
}
} }
</style> </style>
src/views/index/recruit/Index.vue
View file @ bdea4b12
<template> <template>
<div class="recruit"> <el-container>
<el-header height="104px"> <el-header height="104px">
<Header :typeFu="2"></Header> <Header :typeFu="2"></Header>
<div class="notify flex" v-if="$store.state.isDisplay_num == 1"> <div class="notify flex" v-if="$store.state.isDisplay_num == 1">
...@@ -10,46 +10,47 @@ ...@@ -10,46 +10,47 @@
</div> </div>
<div class="bg-top"></div> <div class="bg-top"></div>
</el-header> </el-header>
<el-container>
<div class="com-container content"> <div class="com-container index-container">
<div class="title">{{ info.name }}</div> <div class="title">{{ info.name }}</div>
<!-- <div class="time">发布时间：{{ info.update_time }}</div> --> <!-- <div class="time">发布时间：{{ info.update_time }}</div> -->
<div v-html="info.student_recruitment_brochure"></div> <div v-html="info.student_recruitment_brochure"></div>
<!-- <div class="part"> <!-- <div class="part">
<span>第一部分</span> <span>第一部分</span>
<p> <p>
南开大学是教育部直属重点综合性大学，是敬爱的周恩来总理的母校。新中国成立以来，学校发展始终得到党和国家的亲切关怀。毛泽东主席题写校名、亲临视察；周恩来总理三回母校指导；邓小平同志会见数学大师陈省身，批示成立南开数学研究所；江泽民同志、胡锦涛同志先后视察南开。特别是党的十八大以来，习近平总书记多次对南开的发展给予肯定，并对相关工作回信和勉励，更在百年校庆之际亲临南开视察。 南开大学是教育部直属重点综合性大学，是敬爱的周恩来总理的母校。新中国成立以来，学校发展始终得到党和国家的亲切关怀。毛泽东主席题写校名、亲临视察；周恩来总理三回母校指导；邓小平同志会见数学大师陈省身，批示成立南开数学研究所；江泽民同志、胡锦涛同志先后视察南开。特别是党的十八大以来，习近平总书记多次对南开的发展给予肯定，并对相关工作回信和勉励，更在百年校庆之际亲临南开视察。
</p> </p>
</div> </div>
<div class="part"> <div class="part">
<span>第二部分</span> <span>第二部分</span>
<p> <p>
南开大学由严修、张伯苓秉承教育救国理念创办，肇始于1904年，成立于1919年。1937年校园遭侵华日军炸毁，学校南迁。1938年与北京大学、清华大学合组西南联合大学，被誉为“学府北辰”。1946年回津复校并改为国立。 南开大学由严修、张伯苓秉承教育救国理念创办，肇始于1904年，成立于1919年。1937年校园遭侵华日军炸毁，学校南迁。1938年与北京大学、清华大学合组西南联合大学，被誉为“学府北辰”。1946年回津复校并改为国立。
</p> </p>
<p> <p>
新中国成立后，经历高等教育院系调整，成为文理并重的全国重点大学。改革开放以来，天津对外贸易学院、中国旅游管理干部学院相继并入，经教育部与天津市共建支持，学校发展成为国家“211工程”和“985工程”重点建设的综合性研究型大学。2015年9月，新校区建成启用后，初步形成了八里台校区、津南校区、泰达学院“一校三区”办学格局。2017年9月，入选国家42所世界一流大学建设高校，且为36所A类高校之一。 新中国成立后，经历高等教育院系调整，成为文理并重的全国重点大学。改革开放以来，天津对外贸易学院、中国旅游管理干部学院相继并入，经教育部与天津市共建支持，学校发展成为国家“211工程”和“985工程”重点建设的综合性研究型大学。2015年9月，新校区建成启用后，初步形成了八里台校区、津南校区、泰达学院“一校三区”办学格局。2017年9月，入选国家42所世界一流大学建设高校，且为36所A类高校之一。
</p> </p>
</div> </div>
<div class="paper"> <div class="paper">
<img src="../../../assets/img/recruit.png" alt="" /> <img src="../../../assets/img/recruit.png" alt="" />
</div> </div>
<div class="part"> <div class="part">
<span>第三部分</span> <span>第三部分</span>
<p> <p>
南开大学坚持“允公允能，日新月异”的校训，弘扬“爱国、敬业、创新、乐群”的传统和“文以治国、理以强国、商以富国”的理念，以“知中国，服务中国”为宗旨，以杰出校友周恩来为楷模，作育英才，繁荣学术，强国兴邦，传承文明，努力建设世界一流大学。 南开大学坚持“允公允能，日新月异”的校训，弘扬“爱国、敬业、创新、乐群”的传统和“文以治国、理以强国、商以富国”的理念，以“知中国，服务中国”为宗旨，以杰出校友周恩来为楷模，作育英才，繁荣学术，强国兴邦，传承文明，努力建设世界一流大学。
</p> </p>
<p> <p>
南开大学占地443.12万平方米，其中八里台校区占地121.60万平方米，津南校区占地245.89万平方米，泰达学院占地6.72万平方米。校舍建筑总面积195.19万平方米。按照“独立办学、紧密合作”的原则，与天津大学全面合作办学。 南开大学占地443.12万平方米，其中八里台校区占地121.60万平方米，津南校区占地245.89万平方米，泰达学院占地6.72万平方米。校舍建筑总面积195.19万平方米。按照“独立办学、紧密合作”的原则，与天津大学全面合作办学。
</p> </p>
</div> --> </div> -->
<div class="btn" v-if="info.name"> <div class="btn" v-if="info.name">
<el-button @click="toLogin()">立即报名</el-button> <el-button @click="toLogin()">立即报名</el-button>
</div>
</div> </div>
</div> <Footer></Footer>
<Footer></Footer> </el-container>
</div> </el-container>
</template> </template>
<script> <script>
/* eslint-disable */ /* eslint-disable */
...@@ -105,11 +106,12 @@ ...@@ -105,11 +106,12 @@
display: flex; display: flex;
} }
.recruit { .el-container {
position: relative;
width: 100%;
min-height: 100%; min-height: 100%;
display: flex; min-width: 1150px;
flex-flow: column; background-color: #f8f8f8;
font-family: PingFang SC;
.el-header { .el-header {
position: fixed; position: fixed;
...@@ -118,81 +120,85 @@ ...@@ -118,81 +120,85 @@
background-color: #ffffff; background-color: #ffffff;
z-index: 2000; z-index: 2000;
// .bg-top { .notify {
// // height: 24px; background-color: #fbf8fb;
// // background-color: #f8f8f8; height: 38px;
// } align-items: center;
} padding-left: 5%;
}
.notify {
background-color: #fbf8fb;
height: 38px;
align-items: center;
padding-left: 5%;
}
.notify_img { .notify_img {
width: 20px; width: 20px;
margin-right: 5px; margin-right: 5px;
}
} }
.content { .el-container {
flex: 1; width: 100%;
.title { display: flex;
padding: 170px 0 20px 0; flex-flow: column;
font-size: 34px; margin-top: 104px;
text-align: center;
}
.time { .index-container {
font-size: 12px; flex: 1;
font-weight: 500;
color: #828282;
text-align: center;
}
.paper { .title {
text-align: center; padding: 52px 0 20px 0;
margin: 8px 0 24px 0; font-size: 34px;
text-align: center;
}
img { .time {
width: 654px; font-size: 12px;
height: 368px; font-weight: 500;
color: #828282;
text-align: center;
} }
}
.part { .paper {
span { text-align: center;
font-size: 16px; margin: 8px 0 24px 0;
font-weight: 600;
color: #333333; img {
width: 654px;
height: 368px;
}
} }
p { .part {
font-size: 16px; span {
font-weight: 500; font-size: 16px;
color: #666666; font-weight: 600;
line-height: 32px; color: #333333;
}
p {
font-size: 16px;
font-weight: 500;
color: #666666;
line-height: 32px;
}
} }
}
.btn { .btn {
text-align: center;
padding-bottom: 104px;
.el-button {
width: 200px;
height: 50px;
background: var(--color);
border-radius: 4px;
opacity: 0.8;
line-height: 50px;
text-align: center; text-align: center;
color: #fff; padding-bottom: 50px;
font-size: 16px;
padding: 0; .el-button {
margin: 30px 0 0 0; width: 200px;
height: 50px;
background: var(--color);
border-radius: 4px;
opacity: 0.8;
line-height: 50px;
text-align: center;
color: #fff;
font-size: 16px;
padding: 0;
margin: 30px 0 0 0;
}
} }
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment