Skip to content

H
h5_activity
Commit 9052f2eb by 胡畅
Options

Merge branch 'develop' of http://gitlab.icaremgt.com/tanxinyu/h5_activity into develop

parents be2d2ae6 84438024
Showing with 55 additions and 31 deletions
showPhotos/index.html
...@@ -8,10 +8,9 @@ ...@@ -8,10 +8,9 @@
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<title>宝贝，因“喂”爱你</title> <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="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" <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">
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="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/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/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> <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
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// 公共变量 // 公共变量
var activityCode = rules.acActivity.code; var activityCode = rules.acActivity.code;
var baseUrl = "https://space-api.check.icaremgt.com"; var baseUrl = "https://space-api.check.icaremgt.com";
var manageUrl = "http://api-admin-manage.check.icaremgt.com";
data.htmlJson = JSON.parse(data.htmlJson); data.htmlJson = JSON.parse(data.htmlJson);
......
showPhotos/js/page/index.js
...@@ -379,7 +379,18 @@ function voteClickFn(){ ...@@ -379,7 +379,18 @@ function voteClickFn(){
}else if(data.status == 201) { }else if(data.status == 201) {
$('#act51626389412499 span').text(5) $('#act51626389412499 span').text(5)
$('#html-template-5').fadeIn() $('#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
...@@ -100,7 +100,7 @@ function btnBindClick() { ...@@ -100,7 +100,7 @@ function btnBindClick() {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: manageUrl + '/system/components/upload', url: manageUrl + '/system/components/upload',
headers: { 'x-token': 'admin.725.eb96823d6eba412fbec37f3a259801b2' }, // headers: { 'x-token': 'admin.725.eb96823d6eba412fbec37f3a259801b2' },
data: formData, data: formData,
contentType: false, contentType: false,
processData: false, processData: false,
...@@ -257,12 +257,25 @@ function btnBindClick() { ...@@ -257,12 +257,25 @@ function btnBindClick() {
url: baseUrl + '/ACTIVITY/sz/sign-up/' + activityCode, url: baseUrl + '/ACTIVITY/sz/sign-up/' + activityCode,
data: JSON.stringify(params), data: JSON.stringify(params),
success: function (data) { success: function (data) {
if(data.status >= 200 && data.status < 300){
$.dialog({
showTitle : false,
contentHtml : '您的资料已成功提交审核中，请耐心等待审核结果',
onClickOk: function() {
transPage('1',activityCode,_token);
}
});
}else {
// 异常处理
$.dialog({
contentHtml : '<p style="text-align:center;">'+ data.message +'</p>'
});
}
},
error: function(data){
// 异常处理
$.dialog({ $.dialog({
showTitle : false, contentHtml : '<p style="text-align:center;">'+ data.message +'</p>'
contentHtml : '您的资料已成功提交审核中，请耐心等待审核结果',
onClickOk: function() {
transPage('1',activityCode,_token);
}
}); });
} }
}) })
......
showPhotos/js/page/user.js
...@@ -209,10 +209,19 @@ function voteClickFn(){ ...@@ -209,10 +209,19 @@ function voteClickFn(){
}else { }else {
$('#html-template-7').fadeIn() $('#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 gb_vote_loaded = false
// 异常处理
$.dialog({
contentHtml : '<p style="text-align:center;">'+ data.message +'</p>'
});
} }
}) })
} }
......
showPhotos/signup.html
...@@ -6,25 +6,16 @@ ...@@ -6,25 +6,16 @@
<meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<title>宝贝，因“喂”爱你</title> <title>宝贝，因“喂”爱你</title>
<link rel="stylesheet" <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">
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">
<link rel="stylesheet" <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>
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/dialog.js"></script>
<script type="text/javascript" <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>
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/html2Json.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/pageJson/signupJson.js"></script>
<script type="text/javascript" <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>
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/removeAttr.js"></script>
<script type="text/javascript" <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>
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="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" src="signup_data.js"></script>
<!-- <script type="text/javascript" th:inline="javascript"> <!-- <script type="text/javascript" th:inline="javascript">
......
showPhotos/user.html
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<title>宝贝，因“喂”爱你</title> <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="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="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/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/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="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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment