Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
h5_activity
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
谭新宇
h5_activity
Commits
9052f2eb
Commit
9052f2eb
authored
Jul 11, 2019
by
胡畅
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
http://gitlab.icaremgt.com/tanxinyu/h5_activity
into develop
parents
be2d2ae6
84438024
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
50 additions
and
26 deletions
+50
-26
index.html
showPhotos/index.html
+2
-3
common.js
showPhotos/js/page/common.js
+1
-0
index.js
showPhotos/js/page/index.js
+11
-0
signup.js
showPhotos/js/page/signup.js
+14
-1
user.js
showPhotos/js/page/user.js
+10
-1
signup.html
showPhotos/signup.html
+10
-19
user.html
showPhotos/user.html
+2
-2
No files found.
showPhotos/index.html
View file @
9052f2eb
...
...
@@ -8,10 +8,9 @@
<meta
name=
"format-detection"
content=
"telephone=no"
>
<title>
宝贝,因“喂”爱你
</title>
<link
rel=
"stylesheet"
href=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/activity.css"
>
<link
rel=
"stylesheet"
href=
"css/dialog.css"
>
<link
rel=
"stylesheet"
href=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/dialog.css"
>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/jquery-3.4.1.min.js"
></script>
<script
type=
"text/javascript"
src=
"js/dialog.js"
></script>
<script
type=
"text/javascript"
src=
"
https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/
js/dialog.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/html2Json.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/pageJson.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/modalJson/shareModal.js"
></script>
...
...
showPhotos/js/page/common.js
View file @
9052f2eb
...
...
@@ -2,6 +2,7 @@
// 公共变量
var
activityCode
=
rules
.
acActivity
.
code
;
var
baseUrl
=
"https://space-api.check.icaremgt.com"
;
var
manageUrl
=
"http://api-admin-manage.check.icaremgt.com"
;
data
.
htmlJson
=
JSON
.
parse
(
data
.
htmlJson
);
...
...
showPhotos/js/page/index.js
View file @
9052f2eb
...
...
@@ -379,7 +379,18 @@ function voteClickFn(){
}
else
if
(
data
.
status
==
201
)
{
$
(
'#act51626389412499 span'
).
text
(
5
)
$
(
'#html-template-5'
).
fadeIn
()
}
else
if
(
data
.
status
>=
400
)
{
// 异常处理
$
.
dialog
({
contentHtml
:
'<p style="text-align:center;">'
+
data
.
message
+
'</p>'
});
}
},
error
:
function
(
data
){
// 异常处理
$
.
dialog
({
contentHtml
:
'<p style="text-align:center;">'
+
data
.
message
+
'</p>'
});
}
})
}
...
...
showPhotos/js/page/signup.js
View file @
9052f2eb
...
...
@@ -100,7 +100,7 @@ function btnBindClick() {
$
.
ajax
({
type
:
'POST'
,
url
:
manageUrl
+
'/system/components/upload'
,
headers
:
{
'x-token'
:
'admin.725.eb96823d6eba412fbec37f3a259801b2'
},
//
headers: { 'x-token': 'admin.725.eb96823d6eba412fbec37f3a259801b2' },
data
:
formData
,
contentType
:
false
,
processData
:
false
,
...
...
@@ -257,6 +257,7 @@ function btnBindClick() {
url
:
baseUrl
+
'/ACTIVITY/sz/sign-up/'
+
activityCode
,
data
:
JSON
.
stringify
(
params
),
success
:
function
(
data
)
{
if
(
data
.
status
>=
200
&&
data
.
status
<
300
){
$
.
dialog
({
showTitle
:
false
,
contentHtml
:
'您的资料已成功提交审核中,请耐心等待审核结果'
,
...
...
@@ -264,6 +265,18 @@ function btnBindClick() {
transPage
(
'1'
,
activityCode
,
_token
);
}
});
}
else
{
// 异常处理
$
.
dialog
({
contentHtml
:
'<p style="text-align:center;">'
+
data
.
message
+
'</p>'
});
}
},
error
:
function
(
data
){
// 异常处理
$
.
dialog
({
contentHtml
:
'<p style="text-align:center;">'
+
data
.
message
+
'</p>'
});
}
})
});
...
...
showPhotos/js/page/user.js
View file @
9052f2eb
...
...
@@ -209,10 +209,19 @@ function voteClickFn(){
}
else
{
$
(
'#html-template-7'
).
fadeIn
()
}
}
else
if
(
data
.
status
>=
400
)
{
// 异常处理
$
.
dialog
({
contentHtml
:
'<p style="text-align:center;">'
+
data
.
message
+
'</p>'
});
}
},
error
:
function
()
{
error
:
function
(
data
)
{
gb_vote_loaded
=
false
// 异常处理
$
.
dialog
({
contentHtml
:
'<p style="text-align:center;">'
+
data
.
message
+
'</p>'
});
}
})
}
...
...
showPhotos/signup.html
View file @
9052f2eb
...
...
@@ -6,25 +6,16 @@
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1,user-scalable=no"
>
<meta
name=
"format-detection"
content=
"telephone=no"
>
<title>
宝贝,因“喂”爱你
</title>
<link
rel=
"stylesheet"
href=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/activity.css"
>
<link
rel=
"stylesheet"
href=
"css/dialog.css"
>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/jquery-3.4.1.min.js"
></script>
<script
type=
"text/javascript"
src=
"js/dialog.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/exif.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/html2Json.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/pageJson/signupJson.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/modalJson/shareModal.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/removeAttr.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/autoFontsize.min.js"
></script>
<link
rel=
"stylesheet"
href=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/activity.css"
>
<link
rel=
"stylesheet"
href=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/dialog.css"
>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/jquery-3.4.1.min.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/dialog.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/exif.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/html2Json.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/pageJson/signupJson.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/modalJson/shareModal.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/removeAttr.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/autoFontsize.min.js"
></script>
<script
type=
"text/javascript"
src=
"http://res.wx.qq.com/open/js/jweixin-1.4.0.js"
></script>
<script
type=
"text/javascript"
src=
"signup_data.js"
></script>
<!-- <script type="text/javascript" th:inline="javascript">
...
...
showPhotos/user.html
View file @
9052f2eb
...
...
@@ -7,9 +7,9 @@
<meta
name=
"format-detection"
content=
"telephone=no"
>
<title>
宝贝,因“喂”爱你
</title>
<link
rel=
"stylesheet"
href=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/activity.css"
>
<link
rel=
"stylesheet"
href=
"css/dialog.css"
>
<link
rel=
"stylesheet"
href=
"
https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/
css/dialog.css"
>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/jquery-3.4.1.min.js"
></script>
<script
type=
"text/javascript"
src=
"js/dialog.js"
></script>
<script
type=
"text/javascript"
src=
"
https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/
js/dialog.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/html2Json.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/removeAttr.js"
></script>
<script
type=
"text/javascript"
src=
"https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/autoFontsize.min.js"
></script>
...
...
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