瀏覽代碼

Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

xuzhiheng 5 年之前
父節點
當前提交
cbb484b97f

File diff suppressed because it is too large
+ 0 - 0
src/jfw/modules/pushsubscribe/src/push/config.json


+ 3 - 0
src/web/templates/weixin/email/bind_email.html

@@ -201,6 +201,9 @@
 								$(".code_input").prop("readonly","true");
 								$(".email_input").prop("readonly",true);
 								$("#bindBtn").removeAttr("disabled");
+								$(".code_input").attr("unselectable","on");
+								$(".code_input").attr("onfocus","this.blur()");
+								$(".code_input").css("-webkit-user-select","none");
 							}else{
 								$(".code_true").hide();
 								$("#bindBtn").attr("disabled","disabled");

+ 13 - 0
src/web/templates/weixin/my.html

@@ -96,6 +96,19 @@
     </div>
     <script src="/js/jquery-3.2.1.min.js"></script>
     <script>
+		//苹果刷新js
+		$(function () {    
+			var isPageHide = false;   
+			window.addEventListener('pageshow', function () {      
+			    if (isPageHide) {
+	                location.reload();
+			    }    
+			});    
+			window.addEventListener('pagehide', function () {
+			    isPageHide = true;
+			});  
+		});
+		
         $(function () { 
 			var nowTimestamp= (new Date()).valueOf();
 			$(".vip").on("click",function(){

Some files were not shown because too many files changed in this diff