xiugai

src/jfw/front/follow.go

@@ -871,19 +871,9 @@ func (m *Follow) AllNotice() error {
 }
 func (m *Follow) Notice(id, followId string) error {
 	defer util.Catch()
-	//userid := util.ObjToString(m.GetSession("userId"))
-	var query map[string]interface{}
-	if len(id) == 19 {
-		query = map[string]interface{}{
-			"l_date": util.Int64All(id) / 1000000000,
-			//"s_userid":   userid,
-			"s_followid": followId,
-		}
-	} else {
-		query = map[string]interface{}{
-			"_id": StringTOBsonId(id),
-			//"s_userid": userid,
-		}
+	query := map[string]interface{}{
+		"_id":      StringTOBsonId(id),
+		"s_userid": util.ObjToString(m.GetSession("userId")),
 	}
 	data, ok := public.MQFW.FindOneByField("jy_pushproject", query, `{"s_followid":-1,"s_title":1,"s_projectcode":1,"s_projectname":1,"a_relationinfo":1,"a_visited":1}`)
 	if ok && data != nil && len(*data) > 0 {
@@ -907,7 +897,7 @@ func (m *Follow) Notice(id, followId string) error {
 				go public.MQFW.UpdateById("jy_pushproject", id, map[string]interface{}{
 					"$addToSet": map[string]interface{}{"a_visited": firstMap["s_id"]},
 				})
-				return m.Redirect("/article/content/" + util.ObjToString(firstMap["s_id"]) + ".html")
+				return m.Redirect("/article/content/" + util.ObjToString(firstMap["s_id"]) + ".html?advertcode=" + m.GetString("advertcode"))
 			}
 			(*data)["a_relationinfo"] = relationinfo
 		}

src/jfw/front/shorturl.go

@@ -309,6 +309,7 @@ func (s *Short) Article(stype, id string) error {
 					}
 				}
 			}
+			s.T["advertcode"] = s.GetString("advertcode")
 			content, _ := s.Render4Cache("/weixin/wxinfocontent_rec.html", &s.T)
 			return s.SetBody(content)
 		}

src/web/templates/weixin/historypush.html

@@ -1948,19 +1948,21 @@
     <script>
         var ADList ={{Ad (or .T.advertcode "jy-wxpush-middle") -1}}
         var random = Math.floor(Math.random() * ADList.length);
-        var AD = ADList[random];
-        var ADHtml = "<span class=\"closeadv-bg\"></span>"
-            + "<img src=\"/images/close_heidi.png\" class=\"closeadv\" onclick=\"closeadv(this)\">";
-        if (AD.s_pic) {
-            if (AD.s_link) {
-                ADHtml += "<div onclick='adv_statistics(this)' adv_name='微信推送历史页-中部'><a datahref='" + AD.s_link + "'><img src='" + AD.s_pic + "'/></a></div>"
-            } else {
-                ADHtml += "<img src='" + AD.s_pic + "'/>"
-            }
-        } else {
-            ADHtml += AD.s_script
+        if(ADList.length > random){
+          var AD = ADList[random];
+          var ADHtml = "<span class=\"closeadv-bg\"></span>"
+              + "<img src=\"/images/close_heidi.png\" class=\"closeadv\" onclick=\"closeadv(this)\">";
+          if (AD.s_pic) {
+              if (AD.s_link) {
+                  ADHtml += "<div onclick='adv_statistics(this)' adv_name='微信推送历史页-中部'><a datahref='" + AD.s_link + "'><img src='" + AD.s_pic + "'/></a></div>"
+              } else {
+                  ADHtml += "<img src='" + AD.s_pic + "'/>"
+              }
+          } else {
+              ADHtml += AD.s_script
+          }
+          $("#advertscript").html(ADHtml);
         }
-        $("#advertscript").html(ADHtml);
         var mergedlist = []
         var merge_industry = ["国土","林业","环保","卫生","工商","质监","食药","安监","地震","公安","文化","旅游","银监","保监"]
         function checkmerge(state) {

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1025,22 +1025,23 @@ pre {
 			<img src="{{.T.advertImg}}"/>
 		</div>
 		<div  onclick="adv_statistics(this)" class="adv-wxcontent-bottom" adv_name="微信快照页-底部" id="C1">
-			{{$s:=(Ad "jy-wxcontent-bottom" -1)}}
 			<script>
-				var ADList={{$s}}
-				var random=Math.floor(Math.random()*ADList.length)
-				var AD=ADList[random]
-				var ADHtml="";
-				if(AD.s_pic){
-					if(AD.s_link){
-						ADHtml="<a dataHref='"+AD.s_link+"'><img id='wx-article-content-ft-advImg' src='"+AD.s_pic+"'/></a>"
-					}else{
-						ADHtml="<img id='wx-article-content-ft-advImg' src='"+AD.s_pic+"'/>"
-					}
-				}else{
-					ADHtml=AD.s_script
-				}
-				$("#C1").append(ADHtml);
+        var ADList ={{Ad (or .T.advertcode "jy-wxcontent-bottom") -1}}
+        var random=Math.floor(Math.random()*ADList.length)
+				if(ADList.length > random){
+  				var AD=ADList[random]
+  				var ADHtml="";
+  				if(AD.s_pic){
+  					if(AD.s_link){
+  						ADHtml="<a dataHref='"+AD.s_link+"'><img id='wx-article-content-ft-advImg' src='"+AD.s_pic+"'/></a>"
+  					}else{
+  						ADHtml="<img id='wx-article-content-ft-advImg' src='"+AD.s_pic+"'/>"
+  					}
+  				}else{
+  					ADHtml=AD.s_script
+  				}
+  				$("#C1").append(ADHtml);
+        }
 			</script>
 		</div>
 	</div>