Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
campSite
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨梦雪
campSite
Commits
bdea4b12
Commit
bdea4b12
authored
Sep 15, 2023
by
wuwangwolihui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
营地2.0-整合修改
parent
5f3852f9
Changes
19
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
365 additions
and
374 deletions
+365
-374
src/components/Header.vue
src/components/Header.vue
+9
-8
src/config/server.js
src/config/server.js
+3
-2
src/request/base/active.js
src/request/base/active.js
+4
-4
src/request/base/login.js
src/request/base/login.js
+1
-1
src/request/base/network.js
src/request/base/network.js
+10
-10
src/request/base/register.js
src/request/base/register.js
+2
-2
src/request/index/homework.js
src/request/index/homework.js
+1
-1
src/request/index/network.js
src/request/index/network.js
+15
-43
src/request/index/register.js
src/request/index/register.js
+2
-2
src/router/index.js
src/router/index.js
+22
-18
src/store/index.js
src/store/index.js
+9
-9
src/store/mutations.js
src/store/mutations.js
+5
-0
src/views/base/Index.vue
src/views/base/Index.vue
+2
-4
src/views/base/active/ActiveInfo.vue
src/views/base/active/ActiveInfo.vue
+5
-3
src/views/base/login/Index.vue
src/views/base/login/Index.vue
+0
-1
src/views/base/myInfo/index.vue
src/views/base/myInfo/index.vue
+81
-77
src/views/index/Info/Index.vue
src/views/index/Info/Index.vue
+0
-6
src/views/index/camp/Index.vue
src/views/index/camp/Index.vue
+83
-78
src/views/index/recruit/Index.vue
src/views/index/recruit/Index.vue
+111
-105
No files found.
src/components/Header.vue
View file @
bdea4b12
...
...
@@ -59,7 +59,6 @@
created
()
{
this
.
isLogin
=
!!
localStorage
.
getItem
(
"
index-token-all
"
);
this
.
phone
=
localStorage
.
getItem
(
"
index-phone-all
"
)
||
""
;
console
.
log
(
this
.
type
)
let
code
=
this
.
$store
.
state
.
indexIdentity
;
this
.
system_logo
=
localStorage
.
getItem
(
"
system_logo
"
+
code
)
||
""
;
},
...
...
@@ -79,7 +78,7 @@
},
// 去个人中心
toCenter
()
{
this
.
$router
.
replace
(
"
/
signUpList
"
);
this
.
$router
.
replace
(
"
/
myInfo
"
);
},
// 去注册
toRegister
()
{
...
...
@@ -92,11 +91,9 @@
},
// 去登录页
toLogin
()
{
console
.
log
(
this
.
type
)
if
(
this
.
type
==
1
)
{
this
.
$router
.
push
(
"
/baseLogin
"
);
if
(
this
.
$route
.
fullPath
!=
'
/baseLogin
'
)
{
this
.
$store
.
commit
(
'
setFullPath
'
,
this
.
$route
.
fullPath
);
}
}
else
if
(
this
.
type
==
2
)
{
let
code
=
this
.
$store
.
state
.
indexIdentity
;
this
.
$router
.
push
(
"
/login?code=
"
+
code
);
...
...
@@ -118,7 +115,7 @@
window
.
localStorage
.
clear
();
this
.
isLogin
=
false
;
}
else
if
(
this
.
type
==
2
)
{
this
.
reload
()
//
this.reload()
let
code
=
this
.
$store
.
state
.
indexIdentity
;
window
.
localStorage
.
removeItem
(
"
doubt_code
"
+
code
);
window
.
localStorage
.
removeItem
(
"
doubt_info
"
+
code
);
...
...
@@ -141,10 +138,11 @@
window
.
localStorage
.
removeItem
(
"
bank_first
"
+
code
);
window
.
localStorage
.
removeItem
(
"
bank_idcard
"
+
code
);
window
.
localStorage
.
removeItem
(
"
bank_info
"
+
window
.
localStorage
.
getItem
(
"
phone
"
+
code
)
+
code
);
window
.
localStorage
.
removeItem
(
"
index-token-all
"
);
window
.
localStorage
.
removeItem
(
"
index-phone-all
"
);
this
.
isLogin
=
false
;
this
.
reload
()
//
this.reload()
if
(
this
.
$store
.
state
.
human
==
1
)
{
await
this
.
$router
.
replace
({
path
:
"
/login
"
,
...
...
@@ -172,8 +170,11 @@
},
watch
:
{
typeFu
(
val
)
{
console
.
log
(
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 @@
// export const SERVER_WS_URL = 'wss://api1.testgate.cn' // websocket
// 正式
export
const
SERVER_URL
=
"
https://apiy.thuers.com/
"
;
// 正式环境
export
const
DEVELOPMENT_SERVER_URL
=
"
http://192.168.1.193:8088
"
;
//开发环境
export
const
SERVER_URL
=
"
https://apiy.thuers.com/
modules-campsite
"
;
// 正式环境
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_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
src/request/base/active.js
View file @
bdea4b12
...
...
@@ -5,7 +5,7 @@ import {request} from './network';
export
function
LabelType
(
data
)
{
return
request
({
method
:
'
get
'
,
url
:
'
/
modules-campsite/
activity/labelType
'
,
url
:
'
/activity/labelType
'
,
params
:
data
})
}
...
...
@@ -14,7 +14,7 @@ export function LabelType(data) {
export
function
HotList
(
data
)
{
return
request
({
method
:
'
post
'
,
url
:
'
/
modules-campsite/
activityCenter/hotList
'
,
url
:
'
/activityCenter/hotList
'
,
data
:
data
})
}
...
...
@@ -23,7 +23,7 @@ export function HotList(data) {
export
function
GetActiveInfo
(
id
)
{
return
request
({
method
:
'
get
'
,
url
:
'
/
modules-campsite/
activityCenter/detail/
'
+
id
,
data
:
{}
url
:
'
/activityCenter/detail/
'
+
id
,
params
:
{}
})
}
src/request/base/login.js
View file @
bdea4b12
...
...
@@ -5,7 +5,7 @@ import {request} from './network'
export
function
login
(
data
)
{
return
request
({
method
:
'
post
'
,
url
:
'
/
modules-campsite/
web/auth/login
'
,
url
:
'
/web/auth/login
'
,
params
:
data
})
}
...
...
src/request/base/network.js
View file @
bdea4b12
...
...
@@ -47,7 +47,7 @@ export function request(config) {
})
instance
.
interceptors
.
request
.
use
(
(
config
)
=>
{
// const hotList = '/
modules-campsite/
activityCenter/hotList';
// const hotList = '/activityCenter/hotList';
//
// if (config.url.indexOf(hotList) != -1) {
// return config
...
...
@@ -66,15 +66,15 @@ export function request(config) {
// const error = new Error('请登录!')
// return Promise.reject(error)
// }
if
(
config
.
hasLoading
)
{
const
loadingText
=
config
.
loadingText
?
config
.
loadingText
:
'
请求中
'
loadingInstance
=
Loading
.
service
({
lock
:
true
,
fullscreen
:
true
,
text
:
loadingText
,
background
:
'
rgba(0, 0, 0, 0.25)
'
})
}
//
if (config.hasLoading) {
//
const loadingText = config.loadingText ? config.loadingText : '请求中'
//
loadingInstance = Loading.service({
//
lock: true,
//
fullscreen: true,
//
text: loadingText,
//
background: 'rgba(0, 0, 0, 0.25)'
//
})
//
}
return
config
},
(
error
)
=>
{
...
...
src/request/base/register.js
View file @
bdea4b12
...
...
@@ -8,7 +8,7 @@ import {
export
function
registerEmailCode
(
data
)
{
return
request
({
method
:
'
post
'
,
url
:
'
web/code/registerEmailCode
'
,
url
:
'
/
web/code/registerEmailCode
'
,
params
:
data
})
}
...
...
@@ -16,7 +16,7 @@ export function registerEmailCode(data) {
export
function
passwordEmailCode
(
data
)
{
return
request
({
method
:
'
post
'
,
url
:
'
web/code/passwordEmailCode
'
,
url
:
'
/
web/code/passwordEmailCode
'
,
params
:
data
})
}
...
...
src/request/index/homework.js
View file @
bdea4b12
...
...
@@ -29,7 +29,7 @@ export function downloadTeacherWork(data) {
data
[
'
identity
'
]
=
store
.
state
.
indexIdentity
;
return
request
({
method
:
'
post
'
,
url
:
'
web/download/downloadTeacherWork
'
,
url
:
'
/
web/download/downloadTeacherWork
'
,
params
:
data
})
}
...
...
src/request/index/network.js
View file @
bdea4b12
...
...
@@ -30,18 +30,15 @@ const instance = axios.create({
instance
.
interceptors
.
request
.
use
(
(
config
)
=>
{
if
(
config
.
method
===
"
post
"
&&
!
config
.
notQs
)
{
console
.
log
(
config
)
config
.
data
=
qs
.
stringify
(
config
.
data
);
// config.data = config.data;
}
if
(
config
.
url
.
indexOf
(
SERVER_URL
)
===
-
1
)
{
// console.log("upload");
config
.
headers
[
"
Content-Type
"
]
=
"
multipart/form-data
"
;
}
else
{
config
.
headers
[
"
Content-Type
"
]
=
"
application/x-www-form-urlencoded
"
;
}
// 调用接口请求添加token认证信息
const
token
=
localStorage
.
getItem
(
'
index-token
'
+
store
.
state
.
indexIdentity
)
const
token
=
localStorage
.
getItem
(
'
index-token
-all
'
);
config
.
headers
.
token
=
token
if
(
token
)
config
.
headers
.
authorization
=
token
;
return
config
;
...
...
@@ -108,8 +105,6 @@ export function request(config) {
const
changePassCode
=
'
/web/auth/changePassCode
'
;
const
loginOut
=
'
/web/auth/loginOut
'
;
const
setLog
=
'
/web/auth/setLog
'
;
// console.log(config)
if
(
(
config
.
url
.
indexOf
(
loginUrl
)
!=
-
1
&&
config
.
url
.
indexOf
(
loginOut
)
==
-
1
)
||
config
.
url
.
indexOf
(
setAccountInfo
)
!=
-
1
||
...
...
@@ -127,12 +122,11 @@ export function request(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
)
{
// console.log(token,'11')
config
.
headers
.
token
=
token
config
.
headers
.
token
=
token
;
}
else
{
router
.
push
({
path
:
'
/login
'
,
...
...
@@ -168,7 +162,6 @@ export function request(config) {
lock
:
true
,
fullscreen
:
true
,
text
:
loadingText
,
// spinner: 'el-icon-loading',
background
:
'
rgba(0, 0, 0, 0.25)
'
})
}
...
...
@@ -181,8 +174,6 @@ export function request(config) {
instance
.
interceptors
.
response
.
use
(
(
res
)
=>
{
// console.log(res, '11111')
// console.log(res.data.code, 'res.data.code')
if
(
res
.
data
.
code
==
400034
||
res
.
data
.
code
==
400035
||
// res.data.code == 400001 ||
...
...
@@ -199,14 +190,11 @@ export function request(config) {
}
if
(
res
.
data
.
code
==
400023
)
{
console
.
log
(
res
)
// console.log(store.state.indexIdentity, 'store.state.indexIdentity')
let
code
=
store
.
state
.
indexIdentity
;
let
isLogout
=
res
.
config
.
url
==
'
/web/auth/loginOut
'
;
window
.
localStorage
.
removeItem
(
"
doubt_code
"
+
code
);
window
.
localStorage
.
removeItem
(
"
doubt_info
"
+
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
(
"
system_color
"
+
code
);
window
.
localStorage
.
removeItem
(
"
system_logo
"
+
code
);
...
...
@@ -217,11 +205,7 @@ export function request(config) {
window
.
localStorage
.
removeItem
(
"
bk_pic
"
+
code
);
window
.
localStorage
.
removeItem
(
"
examine_status
"
+
code
);
window
.
localStorage
.
removeItem
(
"
examine_reason
"
+
code
);
window
.
localStorage
.
removeItem
(
"
sign_up_file_18355151517
"
+
window
.
localStorage
.
getItem
(
"
phone
"
+
code
)
+
code
);
window
.
localStorage
.
removeItem
(
"
sign_up_file_18355151517
"
+
window
.
localStorage
.
getItem
(
"
phone
"
+
code
)
+
code
);
window
.
localStorage
.
removeItem
(
"
schoolName
"
+
code
);
window
.
localStorage
.
removeItem
(
"
restet_code_time
"
+
code
);
window
.
localStorage
.
removeItem
(
"
camp_statement
"
+
code
)
...
...
@@ -229,9 +213,10 @@ export function request(config) {
window
.
localStorage
.
removeItem
(
"
payee
"
+
code
);
window
.
localStorage
.
removeItem
(
"
bank_first
"
+
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-phone-all
"
);
router
.
push
({
path
:
'
/
'
+
store
.
state
.
indexIdentity
,
})
...
...
@@ -248,8 +233,6 @@ export function request(config) {
window
.
localStorage
.
removeItem
(
"
doubt_code
"
+
code
);
window
.
localStorage
.
removeItem
(
"
doubt_info
"
+
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
(
"
system_color
"
+
code
);
window
.
localStorage
.
removeItem
(
"
system_logo
"
+
code
);
...
...
@@ -273,6 +256,8 @@ export function request(config) {
window
.
localStorage
.
removeItem
(
"
bank_info
"
+
window
.
localStorage
.
getItem
(
"
phone
"
+
code
)
+
code
);
window
.
localStorage
.
removeItem
(
"
index-token-all
"
);
window
.
localStorage
.
removeItem
(
"
index-phone-all
"
);
router
.
push
({
path
:
'
/login
'
,
query
:
{
...
...
@@ -287,19 +272,14 @@ export function request(config) {
return
res
},
(
error
)
=>
{
// console.log(window.localStorage.getItem(), 'id')
console
.
log
(
error
,
'
err
'
)
console
.
log
(
error
==
'
Error: 请登录!
'
,
'
err
'
)
console
.
log
(
error
.
message
==
'
请登录!
'
,
'
err
'
)
// console.log(error.response.status, '5555')
Message
.
closeAll
()
if
(
error
.
message
==
'
请登录!
'
)
{
//
router.push({
//
path: "/login?code=" + store.state.indexIdentity,
//
})
router
.
push
({
path
:
"
/login?code=
"
+
store
.
state
.
indexIdentity
,
})
}
if
(
error
.
response
.
status
==
404
)
{
if
(
error
.
response
.
status
==
404
)
{
Notification
({
message
:
"
营地报名已关闭
"
,
duration
:
3000
,
...
...
@@ -310,7 +290,6 @@ export function request(config) {
}
else
{
// 增加延迟,相同请求不得在短时间内重复发送
setTimeout
(()
=>
{
console
.
log
(
error
.
config
)
console
.
log
(
error
)
allowRequest
(
reqList
,
error
.
config
.
url
)
},
1000
)
...
...
@@ -319,8 +298,6 @@ export function request(config) {
return
Promise
.
reject
(
error
)
}
)
return
instance
(
config
)
}
...
...
@@ -331,16 +308,12 @@ export function request(config) {
* @returns {Promise}
*/
export
function
upload
(
url
,
data
=
{})
{
// console.log(11111)
return
new
Promise
((
resolve
,
reject
)
=>
{
axios
.
post
(
url
,
data
).
then
(
(
response
)
=>
{
console
.
log
(
url
)
// console.log(11111)
resolve
(
response
);
},
(
err
)
=>
{
console
.
log
(
11111
)
reject
(
err
);
}
);
...
...
@@ -363,7 +336,6 @@ export function download(url, params, filename) {
})
.
then
(
data
=>
{
const
content
=
data
;
console
.
log
(
content
)
const
blob
=
new
Blob
([
content
]);
if
(
"
download
"
in
document
.
createElement
(
"
a
"
))
{
const
elink
=
document
.
createElement
(
"
a
"
);
...
...
src/request/index/register.js
View file @
bdea4b12
...
...
@@ -10,7 +10,7 @@ export function registerEmailCode(data) {
data
[
'
identity
'
]
=
store
.
state
.
indexIdentity
;
return
request
({
method
:
'
post
'
,
url
:
'
web/code/registerEmailCode
'
,
url
:
'
/
web/code/registerEmailCode
'
,
params
:
data
})
}
...
...
@@ -19,7 +19,7 @@ export function passwordEmailCode(data) {
data
[
'
identity
'
]
=
store
.
state
.
indexIdentity
;
return
request
({
method
:
'
post
'
,
url
:
'
web/code/passwordEmailCode
'
,
url
:
'
/
web/code/passwordEmailCode
'
,
params
:
data
})
}
...
...
src/router/index.js
View file @
bdea4b12
...
...
@@ -137,7 +137,7 @@ router.onError((error) => {
})
function
checkCam
(
code
,
cb
)
{
store
.
state
.
indexIdentity
=
code
;
store
.
commit
(
'
setIndexIdentity
'
,
code
)
if
(
!
code
)
{
Message
({
message
:
"
请访问正确的营地链接地址
"
,
...
...
@@ -199,32 +199,36 @@ function checkCam(code, cb) {
}
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
console
.
log
(
to
)
if
(
from
.
fullPath
!=
'
/
'
)
{
store
.
commit
(
'
setFullPath
'
,
from
.
fullPath
);
}
let
toLogin
=
"
/login
"
,
toBaseLogin
=
"
/baseLogin
"
,
toRegister
=
"
/register
"
,
toBaseRegister
=
"
/baseRegister
"
,
toReset
=
"
/reset
"
,
toBaseLogin
=
"
/baseLogin
"
,
toBaseRegister
=
"
/baseRegister
"
,
toBaseReset
=
"
/baseReset
"
,
toHome
=
"
/home
"
,
toActive
=
"
/active
"
,
toInfo
=
"
/myInfo
"
;
let
code
=
false
;
document
.
title
=
to
.
meta
.
title
;
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" + code);
// //检查登陆情况
// if (token) {
// next("/" + code);
// } else {
// return next();
// }
// }
// });
if
(
to
.
path
==
toBaseLogin
||
to
.
path
==
toBaseRegister
||
to
.
path
==
toBaseReset
||
to
.
path
==
toInfo
||
to
.
path
==
toHome
||
to
.
path
==
toActive
||
to
.
path
.
indexOf
(
toActive
)
!=
-
1
)
{
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
();
}
else
if
(
to
.
name
==
"
recruit
"
)
{
code
=
to
.
params
.
code
;
...
...
@@ -235,7 +239,7 @@ router.beforeEach((to, from, next) => {
});
}
else
{
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
)
{
checkCam
(
code
,
(
res
)
=>
{
if
(
res
)
{
...
...
src/store/index.js
View file @
bdea4b12
...
...
@@ -13,16 +13,16 @@ let state = {
// 数据
data
:
[],
token
:
''
,
indexIdentity
:
""
,
human
:
0
,
//清华人文学院
baseSchool
:
0
,
//基地
indexIdentity
:
localStorage
.
getItem
(
"
index-identity
"
)
||
""
,
human
:
0
,
//清华人文学院
baseSchool
:
0
,
//基地
configJson
:
{},
//分营地填写资料字段
work_context
:
""
,
enclosure_url
:
""
,
isDisplay_num
:
null
,
//是否开启报名人数显示
info
:{},
isCloseCamp
:
0
,
//是否关闭营地
signUpInfo
:{},
work_context
:
""
,
enclosure_url
:
""
,
isDisplay_num
:
null
,
//是否开启报名人数显示
info
:
{},
isCloseCamp
:
0
,
//是否关闭营地
signUpInfo
:
{},
isLogin
:
localStorage
.
getItem
(
"
isLogin
"
)
||
"
0
"
,
// 只有1为已登录
activeIndex
:
window
.
localStorage
.
getItem
(
'
index-active-path
'
)
||
"
0
"
,
};
...
...
src/store/mutations.js
View file @
bdea4b12
...
...
@@ -17,12 +17,17 @@ export default {
localStorage
.
removeItem
(
"
token
"
);
localStorage
.
removeItem
(
"
isLogin
"
);
},
setIndexIdentity
(
state
,
code
)
{
state
.
indexIdentity
=
code
;
window
.
localStorage
.
setItem
(
'
index-identity
'
,
code
);
},
setActiveIndex
(
state
,
path
)
{
let
key
=
path
.
split
(
'
/
'
)[
1
]
==
'
active
'
?
'
/
'
+
path
.
split
(
'
/
'
)[
1
]
:
path
;
state
.
activeIndex
=
key
;
window
.
localStorage
.
setItem
(
'
index-active-path
'
,
key
);
},
setFullPath
(
state
,
path
){
console
.
log
(
state
,
path
)
state
.
fullPath
=
path
;
window
.
localStorage
.
setItem
(
'
index-fullPath
'
,
path
);
},
...
...
src/views/base/Index.vue
View file @
bdea4b12
...
...
@@ -85,7 +85,7 @@
}
body
{
background-color
:
#f
5f5f5
;
background-color
:
#f
8f8f8
;
}
.el-container
{
...
...
@@ -93,8 +93,7 @@
width
:
100%
;
min-height
:
100%
;
min-width
:
1150px
;
/*box-sizing: border-box;*/
background-color
:
#f5f5f5
;
background-color
:
#f8f8f8
;
.el-header
{
position
:
fixed
;
...
...
@@ -105,7 +104,6 @@
.el-container
{
width
:
100%
;
/*overflow: auto;*/
display
:
flex
;
flex-flow
:
column
;
margin-top
:
80px
;
...
...
src/views/base/active/ActiveInfo.vue
View file @
bdea4b12
...
...
@@ -218,7 +218,8 @@
signUp
()
{
let
allToken
=
window
.
localStorage
.
getItem
(
'
index-token-all
'
);
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
{
this
.
$router
.
push
(
'
/baseLogin
'
);
}
...
...
@@ -240,6 +241,7 @@
},
// 分离获取html中的锚点
getAnchor
(
content
)
{
if
(
!
content
)
return
[];
let
attrAndValueArr
=
content
.
match
(
/<a id=
\"(
.*
?)\"
><
\/
a>/g
);
let
valueArr
=
[]
// 放所有该属性的值
let
anchorList
=
[];
...
...
@@ -364,7 +366,7 @@
margin-left
:
70px
;
display
:
flex
;
flex-flow
:
column
;
justify-content
:
space-
between
;
justify-content
:
space-
around
;
.active-info-cont-header
{
display
:
flex
;
...
...
@@ -625,7 +627,7 @@
margin-left
:
10px
;
display
:
flex
;
flex-flow
:
column
;
justify-content
:
space-
between
;
justify-content
:
space-
around
;
.back-area-item-cont-txt
{
font-size
:
12px
;
...
...
src/views/base/login/Index.vue
View file @
bdea4b12
...
...
@@ -34,7 +34,6 @@
}
}
.login-index
{
position
:
relative
;
min-width
:
1150px
;
...
...
src/views/base/myInfo/index.vue
View file @
bdea4b12
<
template
>
<
div
class=
"camp-index"
>
<
el-container
>
<el-header
height=
"104px"
>
<Header
:typeFu=
"
1
"
></Header>
<Header
:typeFu=
"
2
"
></Header>
<div
class=
"bg-top"
></div>
</el-header>
<
div
class=
"com-container"
>
<div
class=
"index-container"
>
<
el-container
>
<div
class=
"
com-container
index-container"
>
<div
class=
"camp_left"
ref=
"leftBoxFu"
>
<ul
:class=
"
{
...
...
@@ -26,15 +26,13 @@
</li>
</ul>
</div>
<div
class=
"camp_right"
ref=
"rightBox"
>
<signUpList
v-if=
"this.campindex_type==0"
></signUpList>
<!--
<router-view></router-view>
-->
</div>
</div>
</div>
<Footer></Footer>
</div>
</el-container>
</el-container>
</
template
>
<
script
>
...
...
@@ -148,8 +146,12 @@
font-family
:
"icomoon"
;
}
.camp-index
{
background
:
#f8f8f8
;
.el-container
{
position
:
relative
;
width
:
100%
;
min-height
:
100%
;
min-width
:
1150px
;
background-color
:
#f8f8f8
;
.el-header
{
position
:
fixed
;
...
...
@@ -164,22 +166,23 @@
}
}
// .com-container {
// height: calc(100% - 100px);
// }
.el-container
{
width
:
100%
;
display
:
flex
;
flex-flow
:
column
;
margin-top
:
104px
;
.index-container
{
padding
:
104px
0
7
0px
0
;
padding
:
0
0
5
0px
0
;
display
:
flex
;
flex-flow
:
row
;
flex
:
1
;
.camp_left
{
// width: 100px;
height
:
100%
;
position
:
relative
;
width
:
22%
;
max-width
:
280px
;
min-width
:
200px
;
// width: calc(100% - 100px);
height
:
300px
;
background-color
:
#ffffff
;
...
...
@@ -194,7 +197,6 @@
&
.is-fixed
{
position
:
fixed
;
top
:
104px
;
/*width: 14.4%;*/
max-width
:
280px
;
min-width
:
216px
;
}
...
...
@@ -205,6 +207,11 @@
width
:
100%
;
}
}
.camp_right
{
flex
:
1
;
border-radius
:
8px
;
background-color
:
#ffffff
;
}
li
{
position
:
relative
;
...
...
@@ -226,19 +233,16 @@
&
.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
>
src/views/index/Info/Index.vue
View file @
bdea4b12
...
...
@@ -2,7 +2,6 @@
<div
class=
"camp-index"
>
<el-header
height=
"104px"
>
<Header
:typeFu=
"2"
></Header>
<!--
<div
class=
"bg-top"
></div>
-->
<div
class=
"bg-top"
>
<el-breadcrumb
separator=
"/"
>
<el-breadcrumb-item
...
...
@@ -38,9 +37,7 @@
</li>
</ul>
</div>
<div
class=
"camp_right"
ref=
"rightBox"
>
<!--
<router-view
@
getStatus=
"getStatus"
/>
-->
<personalInfo
v-if=
"this.campindex_type == 0"
>
</personalInfo>
<!--
<password
v-if=
"this.campindex_type == 1"
>
</password>
-->
</div>
...
...
@@ -201,13 +198,10 @@ export default {
flex-flow
:
row
;
.camp_left
{
// width: 100px;
height
:
100%
;
position
:
relative
;
width
:
22%
;
max-width
:
280px
;
min-width
:
200px
;
// width: calc(100% - 100px);
height
:
300px
;
background-color
:
#ffffff
;
...
...
src/views/index/camp/Index.vue
View file @
bdea4b12
<
template
>
<
div
class=
"camp-index"
>
<
el-container
>
<el-header
height=
"104px"
>
<Header
:typeFu=
"2"
></Header>
<div
class=
"bg-top"
></div>
</el-header>
<div
class=
"com-container"
>
<div
class=
"index-container"
>
<div>
<div
class=
"camp_left"
ref=
"leftBoxFu"
v-if=
"$store.state.human == 1"
>
<el-container>
<div
class=
"com-container index-container"
>
<template>
<div
class=
"camp_left"
ref=
"leftBoxFu"
v-if=
"$store.state.human == 1"
>
<ul
:class=
"
{
'is-fixed': isPosition == 1,
...
...
@@ -51,10 +47,9 @@
</li>
</ul>
</div>
</
div
>
</
template
>
<div
class=
"camp_right"
ref=
"rightBox"
>
<!--
<router-view
@
getStatus=
"getStatus"
/>
-->
<SignUp
@
getStatus=
"getStatus"
v-if=
"this.campindex_type == 0"
>
</SignUp>
<Homework
v-if=
"this.campindex_type == 1"
></Homework>
...
...
@@ -62,9 +57,9 @@
<!-- <homeRefer v-if="this.homework_val == 3"> </homeRefer> -->
</div>
</div>
</div>
<Footer></Footer>
</div>
</el-container>
</el-container>
</template>
<
script
>
...
...
@@ -238,8 +233,16 @@
font-family
:
"icomoon"
;
}
.camp-index
{
background
:
#f8f8f8
;
body
{
background-color
:
#f8f8f8
;
}
.el-container
{
position
:
relative
;
width
:
100%
;
min-height
:
100%
;
min-width
:
1150px
;
background-color
:
#f8f8f8
;
.el-header
{
position
:
fixed
;
...
...
@@ -254,22 +257,23 @@
}
}
// .com-container {
// height: calc(100% - 100px);
// }
.el-container
{
width
:
100%
;
display
:
flex
;
flex-flow
:
column
;
margin-top
:
104px
;
.index-container
{
padding
:
104px
0
7
0px
0
;
padding
:
0
0
5
0px
0
;
display
:
flex
;
flex-flow
:
row
;
flex
:
1
;
.camp_left
{
// width: 100px;
height
:
100%
;
position
:
relative
;
width
:
22%
;
max-width
:
280px
;
min-width
:
200px
;
// width: calc(100% - 100px);
height
:
300px
;
background-color
:
#ffffff
;
...
...
@@ -296,6 +300,14 @@
}
}
.camp_right
{
flex
:
1
;
width
:
calc
(
100%
-
100px
);
border-radius
:
8px
;
background-color
:
#ffffff
;
}
li
{
position
:
relative
;
padding
:
0
23px
0
51px
;
...
...
@@ -316,19 +328,12 @@
&
.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
>
src/views/index/recruit/Index.vue
View file @
bdea4b12
<
template
>
<
div
class=
"recruit"
>
<
el-container
>
<el-header
height=
"104px"
>
<Header
:typeFu=
"2"
></Header>
<div
class=
"notify flex"
v-if=
"$store.state.isDisplay_num == 1"
>
...
...
@@ -10,8 +10,8 @@
</div>
<div
class=
"bg-top"
></div>
</el-header>
<div
class=
"com-container content
"
>
<el-container>
<div
class=
"com-container index-container
"
>
<div
class=
"title"
>
{{
info
.
name
}}
</div>
<!--
<div
class=
"time"
>
发布时间:
{{
info
.
update_time
}}
</div>
-->
<div
v-html=
"info.student_recruitment_brochure"
></div>
...
...
@@ -49,7 +49,8 @@
</div>
</div>
<Footer></Footer>
</div>
</el-container>
</el-container>
</
template
>
<
script
>
/* eslint-disable */
...
...
@@ -105,11 +106,12 @@
display
:
flex
;
}
.recruit
{
.el-container
{
position
:
relative
;
width
:
100%
;
min-height
:
100%
;
display
:
flex
;
flex-flow
:
column
;
font-family
:
PingFang
SC
;
min-width
:
1150px
;
background-color
:
#f8f8f8
;
.el-header
{
position
:
fixed
;
...
...
@@ -118,12 +120,6 @@
background-color
:
#ffffff
;
z-index
:
2000
;
// .bg-top {
// // height: 24px;
// // background-color: #f8f8f8;
// }
}
.notify
{
background-color
:
#fbf8fb
;
height
:
38px
;
...
...
@@ -135,11 +131,19 @@
width
:
20px
;
margin-right
:
5px
;
}
}
.content
{
.el-container
{
width
:
100%
;
display
:
flex
;
flex-flow
:
column
;
margin-top
:
104px
;
.index-container
{
flex
:
1
;
.title
{
padding
:
170
px
0
20px
0
;
padding
:
52
px
0
20px
0
;
font-size
:
34px
;
text-align
:
center
;
}
...
...
@@ -178,7 +182,7 @@
.btn
{
text-align
:
center
;
padding-bottom
:
104
px
;
padding-bottom
:
50
px
;
.el-button
{
width
:
200px
;
...
...
@@ -194,6 +198,8 @@
margin
:
30px
0
0
0
;
}
}
}
}
}
</
style
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment