diff --git a/showPhotos/index.html b/showPhotos/index.html index 2ff5baa..04f4b7a 100644 --- a/showPhotos/index.html +++ b/showPhotos/index.html @@ -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> diff --git a/showPhotos/js/page/common.js b/showPhotos/js/page/common.js index 1b139eb..bfbd4b8 100644 --- a/showPhotos/js/page/common.js +++ b/showPhotos/js/page/common.js @@ -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); diff --git a/showPhotos/js/page/index.js b/showPhotos/js/page/index.js index 8160ad7..0e67385 100644 --- a/showPhotos/js/page/index.js +++ b/showPhotos/js/page/index.js @@ -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>' + }); } }) } diff --git a/showPhotos/js/page/signup.js b/showPhotos/js/page/signup.js index e9fa338..614e6b3 100644 --- a/showPhotos/js/page/signup.js +++ b/showPhotos/js/page/signup.js @@ -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,12 +257,25 @@ 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 : '您的资料已成功提交审核中,请耐心等待审核结果', + onClickOk: function() { + transPage('1',activityCode,_token); + } + }); + }else { + // 异常处理 + $.dialog({ + contentHtml : '<p style="text-align:center;">'+ data.message +'</p>' + }); + } + }, + error: function(data){ + // 异常处理 $.dialog({ - showTitle : false, - contentHtml : '您的资料已成功提交审核中,请耐心等待审核结果', - onClickOk: function() { - transPage('1',activityCode,_token); - } + contentHtml : '<p style="text-align:center;">'+ data.message +'</p>' }); } }) diff --git a/showPhotos/js/page/user.js b/showPhotos/js/page/user.js index 07a156b..d742f58 100644 --- a/showPhotos/js/page/user.js +++ b/showPhotos/js/page/user.js @@ -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>' + }); } }) } diff --git a/showPhotos/signup.html b/showPhotos/signup.html index 5b88d7c..f45a1d8 100644 --- a/showPhotos/signup.html +++ b/showPhotos/signup.html @@ -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"> diff --git a/showPhotos/user.html b/showPhotos/user.html index 4ee17e7..6ef26bb 100644 --- a/showPhotos/user.html +++ b/showPhotos/user.html @@ -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>