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
aeebc80f
Commit
aeebc80f
authored
Aug 31, 2022
by
杨梦雪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
6a0d2608
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
28 additions
and
14 deletions
+28
-14
src/config/server.js
src/config/server.js
+6
-6
src/main.js
src/main.js
+5
-0
src/router/index.js
src/router/index.js
+7
-1
src/views/index/camp/SignUp.vue
src/views/index/camp/SignUp.vue
+7
-5
src/views/index/camp/homework/refer.vue
src/views/index/camp/homework/refer.vue
+1
-0
src/views/index/login/Register.vue
src/views/index/login/Register.vue
+1
-1
src/views/index/login/Reset.vue
src/views/index/login/Reset.vue
+1
-1
No files found.
src/config/server.js
View file @
aeebc80f
...
@@ -12,11 +12,11 @@
...
@@ -12,11 +12,11 @@
// 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://api.campcenter.cn/
"
;
// 正式环境
//
export const SERVER_URL = "https://api.campcenter.cn/"; // 正式环境
export
const
DEVELOPMENT_SERVER_URL
=
"
https://api.campcenter.cn/
"
;
//开发环境
//
export const DEVELOPMENT_SERVER_URL = "https://api.campcenter.cn/"; //开发环境
export
const
SERVER_WS_URL
=
"
wss://api.campcenter.cn
"
;
// websocket
//
export const SERVER_WS_URL = "wss://api.campcenter.cn"; // 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/main.js
View file @
aeebc80f
...
@@ -26,6 +26,11 @@ Vue.prototype.upload = upload
...
@@ -26,6 +26,11 @@ Vue.prototype.upload = upload
import
preventReClick
from
'
./utils/preventRepeatClick.js
'
import
preventReClick
from
'
./utils/preventRepeatClick.js
'
Vue
.
use
(
preventReClick
);
Vue
.
use
(
preventReClick
);
// 禁止浏览器前进后退 另一部本在router的index.js中
window
.
addEventListener
(
'
popstate
'
,
function
()
{
history
.
pushState
(
null
,
null
,
document
.
URL
)
})
Vue
.
prototype
.
$errorScroll
=
function
errorScroll
(
callback
)
{
Vue
.
prototype
.
$errorScroll
=
function
errorScroll
(
callback
)
{
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
// this.loading = false;
// this.loading = false;
...
...
src/router/index.js
View file @
aeebc80f
...
@@ -77,10 +77,16 @@ const routes = [{
...
@@ -77,10 +77,16 @@ const routes = [{
const
router
=
new
VueRouter
({
const
router
=
new
VueRouter
({
mode
:
'
history
'
,
mode
:
'
history
'
,
// base: process.env.BASE_URL,
// base: process.env.BASE_URL,
routes
routes
,
// 禁止浏览器 前进和后退,另一部分在main.js中
scrollBehavior
:
()
=>
{
history
.
pushState
(
null
,
null
,
document
.
URL
)
}
})
})
const
originalPush
=
VueRouter
.
prototype
.
push
const
originalPush
=
VueRouter
.
prototype
.
push
VueRouter
.
prototype
.
push
=
function
push
(
location
)
{
VueRouter
.
prototype
.
push
=
function
push
(
location
)
{
return
originalPush
.
call
(
this
,
location
).
catch
(
err
=>
err
)
return
originalPush
.
call
(
this
,
location
).
catch
(
err
=>
err
)
...
...
src/views/index/camp/SignUp.vue
View file @
aeebc80f
...
@@ -96,10 +96,7 @@
...
@@ -96,10 +96,7 @@
</div>
</div>
</el-dialog>
-->
</el-dialog>
-->
<!-- 营地通知 详情内容 -->
<!-- 营地通知 详情内容 -->
<el-dialog
<el-dialog
v-if=
"!$store.state.human == 1"
v-if=
"!$store.state.human == 1"
style=
"font-size: 26px"
style=
"font-size: 26px"
...
@@ -214,6 +211,7 @@ export default {
...
@@ -214,6 +211,7 @@ export default {
}
}
this
.
statuss
();
this
.
statuss
();
this
.
signUpInit
();
this
.
signUpInit
();
},
},
watch
:
{
watch
:
{
...
@@ -232,6 +230,8 @@ export default {
...
@@ -232,6 +230,8 @@ export default {
},
},
},
},
methods
:
{
methods
:
{
// 营地通知 详情内容
// 营地通知 详情内容
// toMsgDetail() {
// toMsgDetail() {
// this.dialogVisibleList = false;
// this.dialogVisibleList = false;
...
@@ -409,6 +409,8 @@ export default {
...
@@ -409,6 +409,8 @@ export default {
});
});
},
},
},
},
};
};
</
script
>
</
script
>
...
@@ -421,7 +423,7 @@ export default {
...
@@ -421,7 +423,7 @@ export default {
margin-top
:
10px
;
margin-top
:
10px
;
margin-right
:
40px
;
margin-right
:
40px
;
}
}
.el-dialog__wrapper
{
.el-dialog__wrapper
{
transition-duration
:
0
.3s
;
transition-duration
:
0
.3s
;
}
}
.btn
{
.btn
{
...
...
src/views/index/camp/homework/refer.vue
View file @
aeebc80f
...
@@ -556,6 +556,7 @@ export default {
...
@@ -556,6 +556,7 @@ export default {
// console.log("已经准备好上传图片", params);
// console.log("已经准备好上传图片", params);
this
.
file
=
params
.
file
;
this
.
file
=
params
.
file
;
// console.log(this.file, "1111");
// console.log(this.file, "1111");
console
.
log
(
this
.
file
,
"
1111
"
);
let
raw
=
params
.
file
;
let
raw
=
params
.
file
;
let
image
=
{
let
image
=
{
name
:
raw
.
name
,
name
:
raw
.
name
,
...
...
src/views/index/login/Register.vue
View file @
aeebc80f
...
@@ -314,7 +314,7 @@ export default {
...
@@ -314,7 +314,7 @@ export default {
// 跳转到报名
// 跳转到报名
this
.
$router
.
push
(
"
/signUp/examInfo?code=
"
+
code
);
this
.
$router
.
replace
(
"
/signUp/examInfo?code=
"
+
code
);
});
});
});
});
},
},
...
...
src/views/index/login/Reset.vue
View file @
aeebc80f
...
@@ -297,7 +297,7 @@ export default {
...
@@ -297,7 +297,7 @@ export default {
"
restet_code_phone
"
+
code
,
"
restet_code_phone
"
+
code
,
this
.
resetForm
.
phone
this
.
resetForm
.
phone
);
);
this
.
$router
.
push
(
"
/login?code=
"
+
code
);
this
.
$router
.
replace
(
"
/login?code=
"
+
code
);
});
});
});
});
},
},
...
...
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