Merge branch 'develop'

showPhotos/js/page/user.js

+// 公共变量
+var pageNumber = "1";
+var baseUrl = "https://space-api.check.icaremgt.com";
+
+var gb_vote_loaded = false
+
+$(function(){
+    loadHtmlJson();
+    btnBindClick();// 绑定点击事件
+    var showTime = new Date(rules.acActivity.endTime).getTime() - new Date(currentTime)
+    userCountDown(showTime/1000,$('#act31142119991744 span'));  //倒计时
+    userTabInfo();
+    wxpermission();
+});
+
+// 加载HTML结构
+function loadHtmlJson() {
+    $('body').prepend(json2html(data.htmlJson));
+    var _relationship = data.relationship;
+    for(var i=0;i<_relationship.childs.length;i++) {
+        var _page = _relationship.childs[i].page
+        var _pageNumber = _relationship.childs[i].pageNumber
+        $('body').prepend(json2html(JSON.parse(data[_page].htmlJson)));
+        $('#html-template-'+_pageNumber).addClass('global-none')
+    }
+}
+
+// 微信鉴权
+function wxpermission() {
+    wx.ready(function(){
+        var shareData = {
+            title: "",
+            imgUrl: "",
+            desc: "",
+            link: ""
+        }
+        /**
+         *分享给朋友
+        */
+        wx.onMenuShareAppMessage({
+            title: shareData.title, // 分享标题
+            desc: shareData.desc, // 分享描述
+            link: shareData.link, // 分享链接
+            imgUrl: shareData.imgUrl, // 分享图标
+            type: 'link', // 分享类型,music、video或link，不填默认为link
+            dataUrl: '', // 如果type是music或video，则要提供数据链接，默认为空
+            success: function () {
+                // 用户确认分享后执行的回调函数
+            },
+            cancel: function () {
+                // 用户取消分享后执行的回调函数
+            }
+        });
+        /**
+         *分享到朋友圈
+        */
+        wx.onMenuShareTimeline({
+            title: shareData.title, // 分享标题
+            desc: shareData.desc, // 分享描述
+            link: shareData.link, // 分享链接
+            imgUrl: shareData.imgUrl, // 分享图标
+            success: function () {
+            },
+            cancel: function () {
+                // 用户取消分享后执行的回调函数
+            }
+        });
+    });
+}
+
+// 元素点击事件绑定
+function btnBindClick() {
+    // 返回首页
+    $("#act3110143885264").off("click").on("click",function(){
+        window.location.href = '/index.html'
+    });
+    // 拉票
+    $('#act31119351441050').off("click").on("click",function(){
+        $('#html-template-8').fadeIn()
+    });
+    // 分享弹框关闭
+    $(document).on('click','#html-template-8 .modal-close',function(){
+        $('#html-template-8').fadeOut()
+    });
+    // 投票
+    $('#act31119414834381').off("click").on("click",function(){
+        voteClickFn()
+    });
+    // 我要拉票
+    $('#act2172989331265').off("click").on("click",function(){
+        $('#html-template-8').fadeIn()
+    });
+    // 继续投票
+    $('#act21728433893489').off("click").on("click",function(){
+        voteClickFn()
+    });
+    // 投票弹框关闭
+    $(document).on('click','#html-template-4 .modal-close',function(){
+        $('#html-template-4').fadeOut()
+    });
+
+    // 排行榜
+    $("#act41612547506702").off('click').on("click", function(){
+        window.location.href = '/index.html'
+    });
+
+    // 选手主页    
+    $("#act4161336684689").off("click").on("click", function(){
+        window.location.href = '/user.html'
+    });
+
+    // 活动秘籍    
+    $("#act41613113951133").off("click").on("click", function(){
+        $('#html-template-8').fadeIn()
+    });
+}
+// 倒计时
+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);
+}
+
+// 个人信息展示
+function userTabInfo() {
+    var activityCode = rules.acActivity.code
+    var id = getQueryString('UserId')?getQueryString('UserId'):user.id;
+    var params = {
+        id: id,
+        reviewStatus:1  // 审核状态
+    }
+    $.ajax({
+        type: 'GET',
+        url: baseUrl + '/ACTIVITY/sz/search/' + activityCode,
+        data: params,
+        success: function(data) {
+            if(data.status == 200) {
+                var userInfoObj = data.result && data.result.records && data.result.records[0]
+                $('#act3932189955 .user-info .inner-pic').attr('src',userInfoObj.wechatAvatarUrl);
+                var innerInfo = $('#act3932189955 .user-info .inner-info')
+                innerInfo.find('.userName span').text(userInfoObj.name)
+                innerInfo.find('.userNo span').text(userInfoObj.userNumber)
+                innerInfo.find('.userRank span').text(userInfoObj.userRank)   // 排名
+                innerInfo.find('.userVoteNum span').text(userInfoObj.voteNum)
+                $('#act3932189955 .userState').val(userInfoObj.declaration)
+                $('#act3932189955 .userState').attr('readOnly','readOnly')
+                $('#act3932189955 .show-pic').attr('src',userInfoObj.imageUrl);
+            }
+        },
+        error: function() {
+            showMessage('请求超时,请尝试刷新页面！',3000,true);
+        }
+    })
+}  
+
+// 投票按钮
+function voteClickFn(){
+  var id = getQueryString('UserId')?getQueryString('UserId'):user.id;
+  var _this = $(this)
+  var params = {
+    userId: id
+  }
+  var activityCode = rules.acActivity.code;
+  if(gb_vote_loaded) {
+    return
+  }
+  gb_vote_loaded = true
+  $.ajax({
+    type: 'PUT',
+    url: baseUrl + '/ACTIVITY/sz/vote/' + activityCode,
+    data: params,
+    success: function(data) {
+        gb_vote_loaded = false
+        if(data.status == 200) {
+            $('#act1185354268270 span').text(data.result.voteNumDay)
+            $('#act3932189955 .user-info .inner-info').find('.userVoteNum span').text(data.result.voteNum)
+            if(user.status) {
+                $('#html-template-4').fadeIn()
+            }else {
+                $('#html-template-6').fadeIn()
+            }
+        }else if(data.status == 201) {
+            $('#act51626389412499 span').text(rules.szRule.voteNumDay)    // 模板参数中获取
+            if(user.status) {
+                $('#html-template-5').fadeIn()
+            }else {
+                $('#html-template-7').fadeIn()
+            }
+        }
+    },
+    error: function() {
+        gb_vote_loaded = false
+    }
+  })
+}
+
+// 获取URL中指定参数
+function getQueryString(name) {
+    var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+    var r = window.location.search.substr(1).match(reg);
+    if (r != null) {
+        return unescape(r[2]);
+    }
+    return null;
+}
+
+// 页面跳转
+function transPage(_pageNumber,_activityCode, _token, _urlParam){
+    var url = ''
+    if(typeof _urlParam !=='undefined' && _urlParam !== ''){
+        url = baseUrl + "/ACTIVITY/view/"+ _activityCode +"/" + _pageNumber + '?' + _urlParam;
+    }else {
+        url = baseUrl + "/ACTIVITY/view/"+ _activityCode +"/" + _pageNumber;
+    }
+
+    var _form = document.createElement('form');
+    _form.action = url;
+    _form.method = "post";
+    _form.style.display = "none";
+    
+    var inputToken = document.createElement('input');
+    inputToken.value = _token;
+    inputToken.name = 'x-token';
+    _form.appendChild(inputToken);
+    document.body.appendChild(_form);
+    _form.submit();
+}      
\ No newline at end of file

showPhotos/js/pageJson/signupJson.js

@@ -355,6 +355,8 @@ var signupObj = {
                  "tag": "input",
                  "attr": {
                   "type": "file",
+                  "id": "uploadImage",
+                  "accept": "image/*",
                   "name": "photo",
                   "class": "c-read-only",
                   "style": [
@@ -399,8 +401,20 @@ var signupObj = {
                "tag": "div",
                "attr": {
                 "id": "act31419345204861",
-                "class": "upload-pic"
-               }
+                "class": [
+                 "upload-pic",
+                 "global-none"
+                ]
+               },
+               "child": [
+                {
+                 "node": "element",
+                 "tag": "img",
+                 "attr": {
+                  "src": ""
+                 }
+                }
+               ]
               }
              ]
             },

showPhotos/js/toast.js

 'use strict';
 (function($,window){ 
-	//动态加载animate
-	var loadStyles = function(url) {
-		var hasSameStyle = false;
-		var links = $('link');
-		for(var i = 0;i<links.length;i++){
-			if(links.eq(i).attr('href') == url){
-				hasSameStyle = true;
-				return
-			}
-		}
-
-		if(!hasSameStyle){
-			var link = document.createElement("link");
-			link.type = "text/css";
-			link.rel = "stylesheet";
-			link.href = url;
-			document.getElementsByTagName("head")[0].appendChild(link);
-		}
-    }
-
-    loadStyles('css/animate.css');
-
 	//显示提示信息    toast
 	$.fn.toast = function(options){
 		var $this = $(this);