Skip to content

H
h5_activity
Commit 154f8a31 by txy
Options

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

parents ea12ead9 1cae9c82
Showing with 80 additions and 51 deletions
showPhotos/css/activity.css
......@@ -669,8 +669,11 @@ input {
}
.global-none {
display: none;
display: none!important;
}
.global-block {
display: block;
display: block!important;
}
.add-input-btn {
height: 0;
}
\ No newline at end of file
showPhotos/index.html
......@@ -32,5 +32,6 @@
</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/share.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> -->
<script type="text/javascript" src="js/page/index.js"></script>
</html>
showPhotos/js/page/index.js
......@@ -146,26 +146,22 @@ function btnBindClick() {
// 检索参数选手列表
function getAjaxListSearch(type,page,callback) {
if(type == 'player') {
if(gb_player_loaded) {
return
}
gb_player_loaded = true
var descs = 'createTime'
var searchVal = ''
var pageSize = $('#act41530417882468').text()
}else if(type == 'rank') {
if(gb_rank_loaded) {
if(gb_player_loaded) {
return
}
gb_rank_loaded = true
gb_player_loaded = true
}else if(type == 'rank') {
var descs = 'voteNum'
var searchVal = ''
var pageSize = $('#act4153123735791').text()
}else if(type == 'search') {
if(gb_player_loaded) {
if(gb_rank_loaded) {
return
}
gb_player_loaded = true
gb_rank_loaded = true
}else if(type == 'search') {
var searchVal = $('.search-input.c-read-only').val()
var descs = 'createTime'
if(searchVal == '') {
......@@ -176,6 +172,10 @@ function getAjaxListSearch(type,page,callback) {
});
return false
}
if(gb_player_loaded) {
return
}
gb_player_loaded = true
}
var params = {
reviewStatus:1, // 审核状态
......
showPhotos/js/page/signup.js
......@@ -41,6 +41,14 @@ function btnBindClick() {
$("#act41613113951133").off("click").on("click", function () {
$('#html-template-8').removeClass('global-none')
});
// 客服二维码弹框
$(document).on('click', '#html-template-9 .modal-close', function () {
var _t = getToken();
$('#html-template-9').addClass('global-none')
transPage('1',activityCode,_t);
});
// 分享弹框关闭
$(document).on('click', '#html-template-8 .modal-close', function () {
$('#html-template-8').addClass('global-none')
......@@ -63,6 +71,7 @@ function btnBindClick() {
var data = typeof data == 'string' ? JSON.parse(data) : data
if(data.code == 200){
uploadFile = data.records.fileUrl
$("#uploadImage").parent().addClass('global-none')
$("#act31419345204861").removeClass('global-none')
}
},
......@@ -76,6 +85,12 @@ function btnBindClick() {
})
})
$('#act31419345204861').on('click',function() {
if($(this).attr('src') != '') {
$("#uploadImage").click();
}
})
// 确认提交
$("#act21359468086634").off("click").on("click", function () {
var userName = $('#act11738585285947')
......@@ -213,13 +228,14 @@ function btnBindClick() {
data: JSON.stringify(params),
success: function (data) {
if(data.status >= 200 && data.status < 300){
$.dialog({
showTitle : false,
contentHtml : '您的资料已成功提交审核中，请耐心等待审核结果',
onClickOk: function() {
transPage('1',activityCode,_token);
}
});
$('#html-template-9').removeClass('global-none')
// $.dialog({
// showTitle : false,
// contentHtml : '您的资料已成功提交审核中，请耐心等待审核结果',
// onClickOk: function() {
// transPage('1',activityCode,_token);
// }
// });
}else {
// 异常处理
$.dialog({
......
showPhotos/js/page/user.js
......@@ -127,31 +127,37 @@ function btnBindClick() {
}
// 倒计时
function userCountDown(times,ids){
var timer=null;
var self = this
var times = times
  timer=setInterval(function(){
    var day=0,
      hour=0,
      minute=0,
      second=0;//时间默认值
    if(times > 0){
      day = Math.floor(times / (60 * 60 * 24));
      hour = Math.floor(times / (60 * 60)) - (day * 24);
      minute = Math.floor(times / 60) - (day * 24 * 60) - (hour * 60);
      second = Math.floor(times) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60);
    }
    if (day <= 9) day = '0' + day;
    if (hour <= 9) hour = '0' + hour;
    if (minute <= 9) minute = '0' + minute;
    if (second <= 9) second = '0' + second;
ids.html((day != 00 ? day + "天" : '')+hour+"时"+minute+"分"+second+"秒")
    times--;
if(times<0){
    clearInterval(timer);
ids.parent().addClass('global-none')
  }
  },1000);
var $countDown = $('#act31142119991744')
if($countDown.attr('c_counttime') == 'yes') {
$countDown.removeClass('global-none')
var timer=null;
var self = this
var times = times
  timer=setInterval(function(){
    var day=0,
      hour=0,
      minute=0,
      second=0;//时间默认值
    if(times > 0){
      day = Math.floor(times / (60 * 60 * 24));
      hour = Math.floor(times / (60 * 60)) - (day * 24);
      minute = Math.floor(times / 60) - (day * 24 * 60) - (hour * 60);
      second = Math.floor(times) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60);
    }
    if (day <= 9) day = '0' + day;
    if (hour <= 9) hour = '0' + hour;
    if (minute <= 9) minute = '0' + minute;
    if (second <= 9) second = '0' + second;
ids.html((day != 00 ? day + "天" : '')+hour+"时"+minute+"分"+second+"秒")
    times--;
if(times<0){
    clearInterval(timer);
ids.parent().addClass('global-none')
  }
  },1000);
}else {
$countDown.addClass('global-none')
}
}
// 个人信息展示
......
showPhotos/signup.html
......@@ -6,7 +6,8 @@
<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/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="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>
......@@ -30,9 +31,9 @@
<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/share.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/signup.js"></script>
<!-- <script type="text/javascript" src="js/page/common.js"></script>
<script type="text/javascript" src="js/page/signup.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/signup.js"></script> -->
<script type="text/javascript" src="js/page/common.js"></script>
<script type="text/javascript" src="js/page/signup.js"></script>
</html>
showPhotos/user.html
......@@ -27,7 +27,8 @@
</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/share.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/share.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/user.js"></script>
<!-- <script type="text/javascript" src="js/page/user.js"></script> -->
</html>
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