1

html/annualMeeting/AnnuaLmeetingHome.html

@@ -404,14 +404,16 @@
         window.postMessage(JSON.stringify(data));
     })
     //键盘弹起遮挡内容的处理方法
-    window.addEventListener('resize', () => {
-        if (document.activeElement.tagName == 'INPUT') {
-            //延迟出现是因为有些 Android 手机键盘出现的比较慢
-            window.setTimeout(() => {
-                document.activeElement.scrollIntoViewIfNeeded();
-            }, 500);
-        }
-    });
+    if(/Android [4-6]/.test(navigator.appVersion)) {
+        window.addEventListener("resize", function() {
+            if(document.activeElement.tagName=="INPUT" ||
+                document.activeElement.tagName=="TEXTAREA") {
+                window.setTimeout(function() {
+                    document.activeElement.scrollIntoViewIfNeeded();
+                },500);
+            }
+        })
+    }
     //ios禁止被拖动
     var u = navigator.userAgent, app = navigator.appVersion;
     var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //android终端或者uc浏览器

html/annualMeeting/Money.html

@@ -25,7 +25,7 @@
 		</div>
 		<div class="score">分数：<span id="my_score">0</span> 分</div>
 		<div class="timer">
-			倒计时：<span id="time">0</span>
+			倒计时：<span id="time">30</span>
 			<img class="ico" src="img/money/timer.png"/>
 		</div>
         <div class="reg_bag" style='background-image: url("img/money/red_bag.png")'></div>
@@ -100,6 +100,8 @@
 	let status=0;
 	let clock=null;
 	let isWinning=false;
+    var activity = JSON.parse(localStorage.activity);
+    var EmployeeId = activity.EmployeeId + '_Money';
 	// clipboard.on('success', function(e) {
 	// 	console.log(e);
 	// });
@@ -107,7 +109,7 @@
 	// 	console.log(e);
 	// });
 	function getMyRank(){
-		proxy.invoke('GetUserRank','Money','1951_Money').done(r=>{
+		proxy.invoke('GetUserRank','Money',EmployeeId).done(r=>{
 			console.log(r);
 			if(r.r!=-1){
 				$('#myTop').html(r.r);
@@ -151,8 +153,7 @@
 			}
         });
 	}
-    var activity = JSON.parse(localStorage.activity);
-    var EmployeeId = activity.EmployeeId + '_Money';
+
     function initConnection(){
         var conn = $.hubConnection("http://192.168.2.65:7838/signalr", {
             qs: `i=${EmployeeId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}&e=${activity.e}`

html/annualMeeting/css/Amhome.css

@@ -45,7 +45,7 @@ p{
     width: 100%;
     height: 0.95rem;
     background: #C62825;
-    position: absolute;
+    position: fixed;
     left: 0;
     bottom: 0;
     display: flex;

html/annualMeeting/css/HitMouse.css

@@ -320,7 +320,7 @@ li{
 .rank_i{
     width: 80%;
     height: 70%;
-    overflow-y: hidden;
+    overflow-y: auto;
 }
 .rank_item{
     display: flex;