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
bd9cb5aa
Commit
bd9cb5aa
authored
Nov 03, 2021
by
杨梦雪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
920d83d1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
53 additions
and
27 deletions
+53
-27
src/components/index/SignUp/confirm.vue
src/components/index/SignUp/confirm.vue
+1
-1
src/components/index/SignUp/pass.vue
src/components/index/SignUp/pass.vue
+15
-9
src/components/index/SignUp/referInfo.vue
src/components/index/SignUp/referInfo.vue
+14
-6
src/views/index/camp/SignUp.vue
src/views/index/camp/SignUp.vue
+20
-8
src/views/index/login/Login.vue
src/views/index/login/Login.vue
+1
-1
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/components/index/SignUp/confirm.vue
View file @
bd9cb5aa
...
...
@@ -63,7 +63,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);
this
.
info
=
res
.
data
;
});
},
...
...
src/components/index/SignUp/pass.vue
View file @
bd9cb5aa
...
...
@@ -8,8 +8,9 @@
<div>
请等待工作人员审核,审核结果将于1-3个工作日发布,请留意网站及短信
</div>
<div
class=
"btn"
v-show=
"this.getExamine == 1 || this.getExamine == 2"
>
<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"
>
<el-button
@
click=
"paying()"
>
下一步
</el-button>
</div>
</div>
...
...
@@ -21,16 +22,21 @@
export
default
{
name
:
"
Pass
"
,
props
:
{
getExamine
:
[
String
,
Number
],
// isNext:''
// getExamine: [String, Number],
},
created
()
{
// console.log(this.getExamine);
data
()
{
return
{
examine_status
:
window
.
localStorage
.
getItem
(
"
examine_status
"
),
examine_reason
:
window
.
localStorage
.
getItem
(
"
examine_reason
"
),
};
},
watch
:
{
// is_next(val){
// }
created
()
{
console
.
log
(
this
.
examine_reason
);
},
watch
:
{},
methods
:
{
paying
()
{
this
.
$emit
(
"
is_next
"
,
1
);
...
...
src/components/index/SignUp/referInfo.vue
View file @
bd9cb5aa
...
...
@@ -340,7 +340,7 @@
<
script
>
/* eslint-disable */
import
Cookie
from
"
js-cookie
"
import
Cookie
from
"
js-cookie
"
;
import
{
getAccount
,
getAchievementOss
,
...
...
@@ -528,10 +528,18 @@ export default {
let
signUpFile
=
window
.
localStorage
.
getItem
(
"
sign_up_file_
"
+
window
.
localStorage
.
getItem
(
"
phone
"
)
);
console
.
log
(
signUpFile
)
if
(
signUpFile
&&
JSON
.
parse
(
signUpFile
).
length
>
0
)
{
this
.
fileList
=
JSON
.
parse
(
signUpFile
);
}
//回显图片
// let aPath=window.localStorage.getItem("achievement_path")
// console.log(aPath)
// if (window.localStorage.getItem("achievement_path")!=null) {
// this.fileList = window.localStorage.getItem("achievement_path");
// }
// console.log(window.localStorage.getItem("achievement_path"))
console
.
log
(
this
.
fileList
);
this
.
getSchool
();
this
.
getProAndCity
();
this
.
getTenYear
();
...
...
@@ -786,7 +794,7 @@ export default {
},
handlePictureCardPreview
(
file
)
{
console
.
log
(
file
,
'
11111111
'
);
console
.
log
(
file
,
"
11111111
"
);
this
.
resultPicture
=
file
.
url
;
this
.
dialogVisible
=
true
;
},
...
...
@@ -862,7 +870,7 @@ export default {
// console.log(this.fileList, " this.fileList");
window
.
localStorage
.
setItem
(
"
sign_up_file_
"
+
window
.
localStorage
.
getItem
(
"
phone
"
),
"
sign_up_file_
"
+
+
window
.
localStorage
.
getItem
(
"
phone
"
),
JSON
.
stringify
(
this
.
fileList
)
);
})
...
...
@@ -965,8 +973,8 @@ export default {
// console.log(3333);
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
);
let
code
=
Cookie
.
get
(
"
index-identity
"
);
this
.
$router
.
push
(
"
/signUp/check?code=
"
+
code
);
this
.
referForm
=
res
.
data
.
data
;
});
});
...
...
src/views/index/camp/SignUp.vue
View file @
bd9cb5aa
...
...
@@ -12,11 +12,7 @@
@
getstatus=
"statuss"
></Invitation>
<ReferInfo
v-else-if=
"type == 'referInfo'"
@
getstatus=
"statuss"
></ReferInfo>
<Pass
v-else-if=
"type == 'check'"
@
is_next=
"is_nextevent"
:getExamine=
"getExamine"
></Pass>
<Pass
v-else-if=
"type == 'check'"
@
is_next=
"is_nextevent"
></Pass>
<Paying
v-else-if=
"type == 'pay'"
@
getstatus=
"statuss"
></Paying>
<Success
v-else-if=
"type == 'success'"
@
getstatus=
"statuss"
></Success>
</div>
...
...
@@ -88,7 +84,6 @@ export default {
statuss
(
val
)
{
// console.log(val, "statuss");
this
.
status_val
=
val
;
this
.
signUpInit
(
this
.
status_val
);
},
// status=4,跳到审核页面;status=3时,根据doubt_check做判断
...
...
@@ -169,14 +164,31 @@ export default {
this
.
type
=
"
success
"
;
}
this
.
$emit
(
"
getStatus
"
,
this
.
type
);
this
.
getExamine
=
res
.
data
.
examine_status
;
//
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
);
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
)
);
//上传的图片
}
});
},
},
...
...
src/views/index/login/Login.vue
View file @
bd9cb5aa
...
...
@@ -160,7 +160,7 @@ export default {
if
(
res
.
data
.
code
!=
200
)
{
return
this
.
$message
.
error
(
res
.
data
.
message
);
}
this
.
$message
.
success
(
"
登录成功
"
);
//
this.$message.success("登录成功");
// token存储
window
.
localStorage
.
setItem
(
"
index-token
"
,
res
.
data
.
token
);
window
.
localStorage
.
setItem
(
"
phone
"
,
this
.
loginForm
.
phone
);
...
...
src/views/index/login/Register.vue
View file @
bd9cb5aa
...
...
@@ -257,7 +257,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);
// token存储
window
.
localStorage
.
setItem
(
"
index-token
"
,
res
.
data
.
token
);
...
...
src/views/index/login/Reset.vue
View file @
bd9cb5aa
...
...
@@ -258,7 +258,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);
// token存储
window
.
localStorage
.
setItem
(
"
index-token
"
,
res
.
token
);
let
code
=
Cookie
.
get
(
"
index-identity
"
);
...
...
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