Merge remote-tracking branch 'origin/feature/v4.10.9' into feature/v4.10.9

src/jfw/modules/subscribepay/src/config.yaml

@@ -85,4 +85,4 @@ bidCreditReport:
     - "5d6378301c298a5aac7b5402"
   performanceTime: 2018-01-01 00:00:00
   performanceSize: 100
-  makeTime: 30
+  makeTime: 30分钟

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

@@ -14,6 +14,6 @@ type Config struct {
 
 func (c *Config) Config() {
 	c.ServeJson(api.Result{Data: api.M{
-		"bidCreditReport_makeTime": g.Config().MustGet(gctx.New(), "bidCreditReport.makeTime").Int(),
+		"bidCreditReport_makeTime": g.Config().MustGet(gctx.New(), "bidCreditReport.makeTime").String(),
 	}})
 }

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"://首页