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
e06d3428
Commit
e06d3428
authored
Nov 04, 2021
by
杨梦雪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
2002039d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
156 additions
and
37 deletions
+156
-37
src/components/index/SignUp/invitation.vue
src/components/index/SignUp/invitation.vue
+1
-3
src/components/index/SignUp/pass.vue
src/components/index/SignUp/pass.vue
+122
-7
src/components/index/SignUp/referInfo.vue
src/components/index/SignUp/referInfo.vue
+21
-13
src/components/index/SignUp/success.vue
src/components/index/SignUp/success.vue
+1
-1
src/request/index/network.js
src/request/index/network.js
+1
-1
src/views/index/camp/Index.vue
src/views/index/camp/Index.vue
+8
-10
src/views/index/camp/SignUp.vue
src/views/index/camp/SignUp.vue
+2
-2
No files found.
src/components/index/SignUp/invitation.vue
View file @
e06d3428
...
...
@@ -213,9 +213,7 @@ export default {
// this.status=res.data.status
this
.
$emit
(
"
getstatus
"
,
res
.
data
.
status
);
// console.log( res.data.status)
this
.
$message
.
success
(
res
.
data
.
message
);
// this.$router.push("/signUp/referInfo");
// this.$message.success(res.data.message);
});
},
},
...
...
src/components/index/SignUp/pass.vue
View file @
e06d3428
...
...
@@ -10,7 +10,10 @@
</div>
<div
v-if=
"this.examine_status == 1"
>
审核已通过
</div>
<div
v-if=
"this.examine_status == 2"
>
提示:
{{
this
.
examine_reason
}}
</div>
<div
class=
"btn"
v-show=
"this.examine_status == 1 || this.examine_status == 2"
>
<div
class=
"btn"
v-show=
"this.examine_status == 1 || this.examine_status == 2"
>
<el-button
@
click=
"paying()"
>
下一步
</el-button>
</div>
</div>
...
...
@@ -19,11 +22,10 @@
<
script
>
/* eslint-disable */
import
Cookie
from
"
js-cookie
"
;
import
{
signUpInit
}
from
"
r/index/signUp
"
;
export
default
{
name
:
"
Pass
"
,
props
:
{
// getExamine: [String, Number],
},
data
()
{
return
{
examine_status
:
window
.
localStorage
.
getItem
(
"
examine_status
"
),
...
...
@@ -31,17 +33,130 @@ export default {
};
},
created
()
{
console
.
log
(
this
.
examine_reason
);
// let url = location.href; //把当前页面的地址赋给变量 url
// console.log(url)
// var times = url.split("?"); //分切变量 url 分隔符号为 "?"
// let code = Cookie.get("index-identity");
// if (times[1] != "code=" + code) {
// //如果?后的值不等于1表示没有刷新
// url += "?1"; //把变量 url 的值加入 ?1
// self.location.replace(url); //刷新页面
// }
this
.
signUpInit
()
},
watch
:
{},
methods
:
{
paying
()
{
this
.
$emit
(
"
is_next
"
,
1
);
// console.log(is_next);
},
signUpInit
(
status_val
)
{
// console.log(status_val, "11111");
// console.log(isNexts, "2222");
signUpInit
({}).
then
((
res
)
=>
{
// console.log(res, "signUpInit");
if
(
res
.
data
.
code
!=
200
)
{
if
(
res
.
data
.
code
==
400001
)
{
this
.
status
=
6
;
this
.
type
=
"
success
"
;
}
return
this
.
$message
.
error
(
res
.
data
.
message
);
}
this
.
status
=
res
.
data
.
status
;
// console.log(this.status, "11111");
// 点击下一步传值给status,更新
if
(
status_val
!=
null
)
{
this
.
status
=
status_val
;
}
else
{
this
.
status
=
res
.
data
.
status
;
// console.log(this.status, "11111");
}
// doubt_code,doubt_info,doubt_check。0为不填写,1为填写
if
(
this
.
status
==
0
)
{
this
.
type
=
"
examInfo
"
;
}
else
if
(
this
.
status
==
1
)
{
// 是否填写邀请码
if
(
this
.
doubt_code
==
0
)
{
this
.
type
=
"
referInfo
"
;
this
.
status
=
2
;
}
else
{
this
.
type
=
"
invitation
"
;
this
.
status
=
1
;
}
}
else
if
(
this
.
status
==
2
)
{
// console.log(this.doubt_info, "doubt_info");
// 是否填写个人资料
if
(
this
.
doubt_info
==
0
)
{
this
.
type
=
"
check
"
;
this
.
status
=
3
;
}
else
{
this
.
type
=
"
referInfo
"
;
// this.status = 2;
}
}
else
if
(
this
.
status
==
3
)
{
// 是否审核个人资料
if
(
this
.
doubt_check
==
0
)
{
this
.
type
=
"
pay
"
;
this
.
status
=
4
;
}
else
{
this
.
type
=
"
check
"
;
this
.
status
=
3
;
}
}
else
if
(
this
.
status
==
4
)
{
this
.
type
=
"
check
"
;
this
.
status
=
3
;
// console.log(this.status, "this.status ");
// console.log(this.isNexts ,'this.isNexts ')
if
(
this
.
isNexts
==
1
)
{
// console.log(11111);
if
(
res
.
data
.
examine_status
==
1
)
{
console
.
log
(
333
);
this
.
type
=
"
pay
"
;
this
.
status
=
4
;
}
else
if
(
res
.
data
.
examine_status
==
2
)
{
this
.
type
=
"
referInfo
"
;
this
.
status
=
2
;
// return this.$message.error(res.data.examine_reason);
}
}
}
else
if
(
this
.
status
==
5
)
{
this
.
type
=
"
pay
"
;
}
else
if
(
this
.
status
==
6
)
{
this
.
type
=
"
success
"
;
}
this
.
$emit
(
"
getStatus
"
,
this
.
type
);
// this.getExamine = res.data.examine_status;
// console.log(res.data.examine_status, "res.data.examine_status");
//订单支付金额
window
.
localStorage
.
setItem
(
"
has_amount
"
,
res
.
data
.
has_amount
);
window
.
localStorage
.
setItem
(
"
campsite_id
"
,
res
.
data
.
campsite_id
);
window
.
localStorage
.
setItem
(
"
order_no
"
,
res
.
data
.
order_no
);
this
.
examine_status
=
res
.
data
.
examine_status
;
window
.
localStorage
.
setItem
(
"
examine_status
"
,
res
.
data
.
examine_status
);
//返回错误原因
window
.
localStorage
.
setItem
(
"
examine_reason
"
,
res
.
data
.
examine_reason
);
//资料审核状态
// window.localStorage.setItem("achievement_path", res.data.achievement_path); //上传的图片
const
aPath
=
res
.
data
.
achievement_path
;
if
(
aPath
)
{
let
arr
=
aPath
.
split
(
"
,
"
);
let
fileList
=
[];
fileList
=
arr
.
map
((
item
)
=>
{
let
obj
=
{
url
:
item
};
return
obj
});
window
.
localStorage
.
setItem
(
"
sign_up_file_
"
+
window
.
localStorage
.
getItem
(
"
phone
"
),
JSON
.
stringify
(
fileList
)
);
//上传的图片
}
});
},
},
};
</
script
>
...
...
src/components/index/SignUp/referInfo.vue
View file @
e06d3428
...
...
@@ -142,7 +142,7 @@
<el-select
ref=
"start_school_date"
v-model=
"referForm.start_school_date"
placeholder=
"
填写入学年份(高中)
"
placeholder=
"
年份
"
clearable
>
<el-option
...
...
@@ -392,14 +392,12 @@ export default {
phone
:
""
,
schoolName
:
{},
referInfoRules
:
{
name
:
[
{
required
:
true
,
message
:
"
真实姓名不能为空!
"
,
trigger
:
"
blur
"
},
],
name
:
[{
required
:
true
,
message
:
"
姓名不能为空!
"
,
trigger
:
"
blur
"
}],
gender
:
[
{
required
:
true
,
message
:
"
性别不能为空!
"
,
trigger
:
"
change
"
},
],
id_card
:
[
{
required
:
true
,
message
:
"
身份证号
码
不能为空!
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
身份证号不能为空!
"
,
trigger
:
"
blur
"
},
{
validator
:
validator
.
validateid_card
,
trigger
:
"
blur
"
},
],
birthday
:
[
...
...
@@ -418,7 +416,7 @@ export default {
start_school_date
:
[
{
required
:
true
,
message
:
"
高中
入学年份不能为空!
"
,
message
:
"
入学年份不能为空!
"
,
trigger
:
"
change
"
,
},
],
...
...
@@ -426,7 +424,7 @@ export default {
{
required
:
true
,
message
:
"
政治面貌不能为空!
"
,
trigger
:
"
blur
"
},
],
email
:
[
{
required
:
true
,
message
:
"
邮箱不能为空!
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
电子
邮箱不能为空!
"
,
trigger
:
"
blur
"
},
{
validator
:
validator
.
validateEmail
,
trigger
:
"
blur
"
},
],
school_province
:
[
...
...
@@ -447,10 +445,14 @@ export default {
{
required
:
true
,
message
:
"
请选择所在学校!
"
,
trigger
:
"
change
"
},
],
school_contacts
:
[
{
required
:
true
,
message
:
"
请填写
学校
联系人!
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请填写
中学
联系人!
"
,
trigger
:
"
blur
"
},
],
school_phone
:
[
{
required
:
true
,
message
:
"
手机号不能为空!
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
中学联系电话不能为空!
"
,
trigger
:
"
blur
"
,
},
{
validator
:
validator
.
validatePhone
,
trigger
:
"
blur
"
},
],
},
...
...
@@ -539,7 +541,8 @@ export default {
// this.fileList = window.localStorage.getItem("achievement_path");
// }
// console.log(window.localStorage.getItem("achievement_path"))
console
.
log
(
this
.
fileList
);
// console.log(this.fileList);
console
.
log
(
this
.
$parent
.
event
,
"
this.$parent
"
);
this
.
getSchool
();
this
.
getProAndCity
();
this
.
getTenYear
();
...
...
@@ -966,23 +969,28 @@ export default {
// console.log(this.referForm.birthday);
this
.
$refs
[
"
referRef
"
].
validate
((
valid
,
object
)
=>
{
// console.log(valid, "valid");
if
(
!
valid
)
{
this
.
scrollView
(
object
);
return
false
;
}
setAccount
(
this
.
referForm
).
then
((
res
)
=>
{
// console.log(2222);
// console.log(res, "setAccount");
if
(
res
.
data
.
code
!=
200
)
{
if
(
res
.
data
.
code
==
400068
)
{
// let code = Cookie.get("index-identity");
// this.$router.push("/signUp/check?code=" + code);
this
.
$parent
.
statuss
();
return
this
.
$message
.
error
(
res
.
data
.
message
);
}
return
this
.
$message
.
error
(
res
.
data
.
message
);
}
// console.log(3333);
this
.
$emit
(
"
getstatus
"
,
res
.
data
.
status
);
// this.$emit("getstatus", res.data.status);
this
.
$message
.
success
(
res
.
data
.
message
);
let
code
=
Cookie
.
get
(
"
index-identity
"
);
this
.
$router
.
push
(
"
/signUp/check?code=
"
+
code
);
// this.$parent.is_nextevent();
this
.
referForm
=
res
.
data
.
data
;
});
});
...
...
src/components/index/SignUp/success.vue
View file @
e06d3428
...
...
@@ -38,7 +38,7 @@ export default {
if
(
res
.
data
.
code
!=
200
)
{
return
this
.
$message
.
error
(
res
.
data
.
message
);
}
this
.
$message
.
success
(
res
.
data
.
message
);
//
this.$message.success(res.data.message);
window
.
location
.
href
=
res
.
data
.
pdf_address
;
});
},
...
...
src/request/index/network.js
View file @
e06d3428
...
...
@@ -190,7 +190,7 @@ export function request(config) {
res
.
data
.
code
==
400801
||
res
.
data
.
code
==
400910
||
res
.
data
.
code
==
4002132
||
res
.
data
.
code
==
400
410
||
res
.
data
.
code
==
400
68
||
res
.
data
.
code
==
401001
)
{
store
.
state
.
showDialog
=
true
...
...
src/views/index/camp/Index.vue
View file @
e06d3428
...
...
@@ -38,7 +38,7 @@
<
script
>
/* eslint-disable */
import
Cookie
from
"
js-cookie
"
import
Cookie
from
"
js-cookie
"
;
import
Header
from
"
@/components/index/SignUp/Header.vue
"
;
import
Footer
from
"
@/components/index/Footer.vue
"
;
...
...
@@ -50,7 +50,7 @@ export default {
},
data
()
{
return
{
index
:
0
,
isPosition
:
0
,
// 左侧box是否浮动
pageYOffset
:
0
,
// 左侧box浮动时,滚动的高度
scorllHeight
:
0
,
// 最大滚动高度
...
...
@@ -72,7 +72,7 @@ export default {
},
],
campindex_type
:
""
,
campindex_type
:
0
,
index_status
:
""
,
};
},
...
...
@@ -83,11 +83,8 @@ export default {
// },
},
created
()
{
window
.
localStorage
.
setItem
(
"
campindex_type
"
,
0
);
this
.
campindex_type
=
window
.
localStorage
.
getItem
(
"
campindex_type
"
);
this
.
campindex_type
=
0
;
this
.
getStatus
();
this
.
ToSignUp
();
this
.
ToSignUp
(
this
.
index
);
},
mounted
()
{
window
.
addEventListener
(
"
scroll
"
,
this
.
handleScrollX
,
true
);
...
...
@@ -104,14 +101,15 @@ export default {
this
.
ToSignUp
();
},
ToSignUp
(
index
)
{
// console.log(index,'index')
let
code
=
Cookie
.
get
(
"
index-identity
"
);
this
.
campindex_type
=
index
;
if
(
this
.
campindex_type
==
0
)
{
this
.
$router
.
push
(
"
/signUp/
"
+
this
.
index_status
+
"
?code=
"
+
code
);
this
.
$router
.
push
(
"
/signUp/
"
+
this
.
index_status
+
"
?code=
"
+
code
);
}
else
if
(
this
.
campindex_type
==
1
)
{
this
.
$router
.
push
(
"
/homework?code=
"
+
code
);
this
.
$router
.
push
(
"
/homework?code=
"
+
code
);
}
else
if
(
this
.
campindex_type
==
2
)
{
this
.
$router
.
push
(
"
/certificate?code=
"
+
code
);
this
.
$router
.
push
(
"
/certificate?code=
"
+
code
);
}
},
onResize
()
{
...
...
src/views/index/camp/SignUp.vue
View file @
e06d3428
...
...
@@ -143,7 +143,7 @@ export default {
}
else
if
(
this
.
status
==
4
)
{
this
.
type
=
"
check
"
;
this
.
status
=
3
;
console
.
log
(
this
.
status
,
"
this.status
"
);
//
console.log(this.status, "this.status ");
// console.log(this.isNexts ,'this.isNexts ')
if
(
this
.
isNexts
==
1
)
{
...
...
@@ -155,7 +155,7 @@ export default {
}
else
if
(
res
.
data
.
examine_status
==
2
)
{
this
.
type
=
"
referInfo
"
;
this
.
status
=
2
;
return
this
.
$message
.
error
(
res
.
data
.
examine_reason
);
//
return this.$message.error(res.data.examine_reason);
}
}
}
else
if
(
this
.
status
==
5
)
{
...
...
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