Skip to content

H
h5_activity
Commit 37bf5502 by 胡畅
Options

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

parents ed7087b7 256bc967
Showing with 91 additions and 34 deletions
showPhotos/index.html
...@@ -42,37 +42,6 @@ ...@@ -42,37 +42,6 @@
</head> </head>
<!-- th:text="${page}" --> <!-- th:text="${page}" -->
<body> <body>
<section id="html-container-attention" style="">
<div>
<div class="c-modal-wrap">
<div class="mshe-mask"></div>
<div class="c-modal">
<div class="modal-dialog">
<div c_type="dialog" c_typename="dialog_playerVote1" class="modal-content" style="background: rgb(255, 255, 255);">
<div class="modal-header">
<img src="http://qnfile.icareyou.net/363a344aa7424d219a5fc86eff7265751561343712294.jpg" class="header-pic">
</div>
<div class="modal-body">
<div>
<img src="./images/qr-code-prod.jpg" alt="" style="width: 100%;">
</div>
<a href="javascript:;" class="goon-vote">
<img src="http://qnfile.icareyou.net/b495c42fc4f94a25a9c681f06b984e131561343752810.jpg">
</a>
<a href="javascript:;" class="goon-vote">
<img src="http://qnfile.icareyou.net/ac0cc587263c4656b535c1c8801a94be1561343770180.jpg">
</a>
</div>
<div class="modal-close">
<img src="http://qnfile.icareyou.net/ddae57885c424abdb13d37c78038c6a01561343787282.jpg">
</div>
</div>
</div>
</div>
</div>
</div>
</section>
</body> </body>
<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/page/common.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/page/common.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/page/index.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/page/index.js"></script>
......
showPhotos/js/page/common.js
...@@ -78,4 +78,55 @@ function loadHtmlJson() { ...@@ -78,4 +78,55 @@ function loadHtmlJson() {
$('body').prepend(json2html(JSON.parse(data[_page].htmlJson))); $('body').prepend(json2html(JSON.parse(data[_page].htmlJson)));
$('#html-template-'+_pageNumber).addClass('global-none') $('#html-template-'+_pageNumber).addClass('global-none')
} }
} }
\ No newline at end of file
// 关注弹出框
function appendAttentionDialog() {
// var orgId = getQueryString("orgId");
// var orgInfo = orgIdFn(orgId);
// var orgName = orgInfo !== null ? orgInfo.orgName : '';
var str = '<section id="html-container-attention" style="display: none;">'+
'<div>'+
'<div class="c-modal-wrap">'+
'<div class="mshe-mask"></div> '+
'<div class="c-modal">'+
'<div class="modal-dialog">'+
'<div c_type="dialog" c_typename="dialog_playerVote1" class="modal-content" style="background: rgb(255, 255, 255);">'+
'<div class="modal-header">'+
'<img src="http://qnfile.icareyou.net/363a344aa7424d219a5fc86eff7265751561343712294.jpg" class="header-pic">'+
'</div>'+
'<div class="modal-body">'+
'<p class="struct">长按关注后继续活动</p>'+
'<div>'+
'<img src="./images/qr-code-prod.jpg" alt="" style="width: 100%;">'+
'</div>'+
'</div>'+
'<div class="modal-close">'+
'<img src="http://qnfile.icareyou.net/ddae57885c424abdb13d37c78038c6a01561343787282.jpg">'+
'</div>'+
'</div>'+
'</div>'+
'</div>'+
'</div>'+
'</div>'+
'</section>';
$('body').prepend(str);
// 事件绑定
$("#html-container-attention .modal-close").off("click").on("click", function(){
$("#html-container-attention").fadeOut();
});
// 未关注过默认显示弹出框
if (!user.attention){
$("#html-container-attention").fadeIn();
}
}
// 显示强关弹出框
function showAttentionDialog() {
$("#html-container-attention").fadeIn();
}
appendAttentionDialog();
\ No newline at end of file
showPhotos/js/page/index.js
...@@ -133,7 +133,36 @@ function btnBindClick() { ...@@ -133,7 +133,36 @@ function btnBindClick() {
// 报名按钮 // 报名按钮
$("#act31527459124456").off("click").on("click",function(){ $("#act31527459124456").off("click").on("click",function(){
var _t = getToken(); var _t = getToken();
transPage('2',activityCode,_t); // 未关注
if(!user.attention){
// 强关弹出框
showAttentionDialog();
}else {
// 已报名
if(user.reviewStatus !== '') {
switch (user.reviewStatus) {
// 0-待审核
case 0:
alert('您的报名信息正在审核中...');
break;
// 1-审核通过
case 1:
alert('您当前已通过报名，请到个人主页去拉票！');
break;
// 2-审核未通过
case 2:
alert('审核未通过！');
transPage('2',activityCode,_t);
break;
default:
break;
}
} else {
// 未报名
transPage('2',activityCode,_t);
}
}
}); });
// 继续投票 // 继续投票
...@@ -348,6 +377,14 @@ function tabChange(){ ...@@ -348,6 +377,14 @@ function tabChange(){
// 投票按钮 // 投票按钮
function voteClickFn(){ function voteClickFn(){
// 未关注
if(!user.attention){
// 强关弹出框
showAttentionDialog();
return;
}
var id = $(this).attr('id'); var id = $(this).attr('id');
var _this = $(this) var _this = $(this)
var params = { var params = {
......
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