Merge branch 'feature/v4.10.9' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.10.9

src/jfw/modules/subscribepay/src/service/userAccountInfo.go

@@ -346,7 +346,7 @@ func (this *UserAccount) GetAccountInfo() {
 			reportMail = qutil.ObjToString((*orders1)[0]["user_mail"])
 		}
 		if reportMail == "" {
-			reportMail = qutil.ObjToString((*userMsg)["s_my_email"])
+			reportMail = qutil.ObjToString((*userMsg)["s_myemail"])
 		}
 		return map[string]interface{}{
 			"userId":        encrypt.EncodeArticleId(userId),

src/web/staticres/js/login.js

@@ -235,6 +235,13 @@ var SendMsg = function(){
 }
 //生成页面二维码，不同页面处理逻辑
 var getNewShareId = function(num,isFirst){
+  var source = getParam("source")
+  var addCodeImgSource = ''
+  if (source && source !== 'undefined' && source!== 'null') {
+    addCodeImgSource = '?source=' + source
+  } else {
+    addCodeImgSource = ''
+  }
 	mynum = num;
 	pageType = "T"
 	var rref = document.referrer;
@@ -265,7 +272,7 @@ var getNewShareId = function(num,isFirst){
 			$(".jyhead_qr img").attr("src","/front/share/"+pageshareid);
 			$("#bottomimg").attr("src","/front/share/"+pageshareid);
 			$("*[data-share-img]").attr("src","/front/share/"+pageshareid);
-			$("#layerImg-login").attr("src","/front/share/"+pageshareid);
+			$("#layerImg-login").attr("src","/front/share/"+pageshareid + addCodeImgSource);
 			$("#layerImg-zbsq").attr("src","/front/share/"+pageshareid);
 			switch(num){
 				case "10"://首页