Merge branch 'release' into dev4.6.1.5

src/active.json

@@ -12,6 +12,8 @@
 		"active_End":1605024000
 	},
 	"shortUrl":{
-		"introducePage":"https://www.jianyu360.cn/swordfish/SingleLogin?toHref=https%3A%2F%2Fwww.jianyu360.cn%2Fswordfish%2FSingleLogin%3FtoHref%3Dhttps%3A%2F%2Fwww.jianyu360.cn%2Ffront%2Fvipsubscribe%2FintroducePage&title=%E8%B6%85%E7%BA%A7%E8%AE%A2%E9%98%85"
+		"introducePage":"https://www.jianyu360.cn/swordfish/SingleLogin?toHref=https%3A%2F%2Fwww.jianyu360.cn%2Fswordfish%2FSingleLogin%3FtoHref%3Dhttps%3A%2F%2Fwww.jianyu360.cn%2Ffront%2Fvipsubscribe%2FintroducePage&title=%E8%B6%85%E7%BA%A7%E8%AE%A2%E9%98%85",
+		"vipsubscribe":"https://www.jianyu360.cn/swordfish/SingleLogin?toHref=https%3A%2F%2Fwww.jianyu360.cn%2Fswordfish%2FSingleLogin%3FtoHref%3Dhttps%3A%2F%2Fwww.jianyu360.cn%2Ffront%2Fvipsubscribe%2Fvipsubscribe_new?source=wx_double11%26title%3D%E8%B6%85%E7%BA%A7%E8%AE%A2%E9%98%85",
+		"dataPack":" https://www.jianyu360.cn/swordfish/SingleLogin?toHref=https%3A%2F%2Fwww.jianyu360.cn%2Fswordfish%2FSingleLogin%3FtoHref%3Dhttps%3A%2F%2Fwww.jianyu360.cn%2Fswordfish%2FdataPack%2FcreateOrder?source=wx_double11%26title%3D%E6%95%B0%E6%8D%AE%E6%B5%81%E9%87%8F%E5%8C%85"
 	}
 }

src/jfw/front/swordfish.go

@@ -663,16 +663,18 @@ func wxvisitD(sid, userId, openId string) (objdata map[string]interface{}) {
 				obj["fwtscode"] = ltfd
 			}
 			obj["_id"] = util.EncodeArticleId2ByCheck(sid)
-			obj["url"] = obj["href"]
+			// obj["url"] = obj["href"]
 			pt := obj["publishtime"]
 			obj["l_publishtime"] = pt
 			obj["publishtime"] = util.FormatDateWithObj(&pt, util.Date_Full_Layout)
 			//查询是否关注
 			obj["followFlag"] = false
 			obj["hasSession"] = false
-			var infoformat = obj["infoformat"]
-			if infoformat != nil && infoformat != "" {
-				obj["infoformat"] = util.IntAll(infoformat)
+			var infoformat = util.IntAllDef(obj["infoformat"], 1)
+			obj["infoformat"] = infoformat
+			//精准字段（竞争对手的地址） 或  拟建项目
+			if obj["competehref"] != nil || infoformat == 2 {
+				delete(obj, "href")
 			}
 			if userId != "" {
 				pcode, _ := obj["projectcode"].(string)
@@ -836,18 +838,12 @@ func pcVRT(sid, industry string) (po, bo, wo []map[string]interface{}, objdata m
 		}
 		//obj, ok := elastic.GetByIdField("bidding", "bidding", sid, ""), true
 		if ok && obj != nil && len(obj) > 0 {
-			//DealInfo(obj, coll)
-			//fwt := util.ObjToString(obj["fieldweights"])
-			//lwf := util.ObjToString(obj["lastwrongfield"])
-			//ltfd := getLowestField(fwt, lwf)
-			//if ltfd != "" {
-			//	obj["fwtsname"] = obj[ltfd]
-			//	obj["fwtscode"] = ltfd
-			//}
 			obj["_id"] = util.EncodeArticleId2ByCheck(sid)
-			var infoformat = obj["infoformat"]
-			if infoformat != nil && infoformat != "" {
-				obj["infoformat"] = util.IntAll(infoformat)
+			var infoformat = util.IntAllDef(obj["infoformat"], 1)
+			obj["infoformat"] = infoformat
+			//精准字段（竞争对手的地址） 或  拟建项目
+			if obj["competehref"] != nil || infoformat == 2 {
+				delete(obj, "href")
 			}
 			var purchasing = obj["purchasing"]
 			if purchasing != nil && purchasing != "" {

src/jfw/modules/app/src/app/front/swordfish.go

@@ -588,16 +588,18 @@ func wxvisitD(sid, userId string) (objdata map[string]interface{}) {
 		obj = *aobj
 		if ok && obj != nil && len(obj) >= 3 {
 			obj["_id"] = util.EncodeArticleId2ByCheck(sid)
-			obj["url"] = obj["href"]
+			// obj["url"] = obj["href"]
 			pt := obj["publishtime"]
 			obj["l_publishtime"] = pt
 			obj["publishtime"] = util.FormatDateWithObj(&pt, util.Date_Full_Layout)
 			//查询是否关注
 			obj["followFlag"] = false
 			obj["hasSession"] = false
-			var infoformat = obj["infoformat"]
-			if infoformat != nil && infoformat != "" {
-				obj["infoformat"] = util.IntAll(infoformat)
+			var infoformat = util.IntAllDef(obj["infoformat"], 1)
+			obj["infoformat"] = infoformat
+			//精准字段（竞争对手的地址） 或  拟建项目
+			if obj["competehref"] != nil || infoformat == 2 {
+				delete(obj, "href")
 			}
 			if userId != "" {
 				pcode, _ := obj["projectcode"].(string)

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -726,7 +726,7 @@
     var id = {{.T.obj._id}}; // 招标信息id
     var title = {{.T.obj.title}};
     var s_words = {{.T.keywords}};
-    var url = {{.T.obj.url}};
+    var url = {{.T.obj.href}};
     var type = {{.T.obj.type}};
     var bidopentime = {{.T.obj.bidopentime}};
     var comeintime = {{.T.obj.comeintime}};
@@ -1723,15 +1723,14 @@
       $(".filename").css("width",$(window).width()*0.68+"px");
       {{end}}
       {{if .T.obj.infoformat}}
-      {{if eq .T.obj.infoformat 2}}
-      $(".prebuilt").removeClass("hidden");
-      $("#h_content").css("font-size","16px");
-      {{else}}
-      $(".abs .original").removeClass("hidden");
-      {{end}}
-      {{else}}
-      $(".abs .original").removeClass("hidden");
-      {{end}}
+      	{{if eq .T.obj.infoformat 2}}
+          $(".prebuilt").removeClass("hidden");
+          $("#h_content").css("font-size","16px");
+      	{{end}}
+    	{{end}}
+    	{{if .T.obj.href}}
+        $(".abs .original").removeClass("hidden");
+    	{{end}}
       //
       $(".shareimg").css("top",$(".newuser").offset().top+18);
       //
@@ -2060,7 +2059,7 @@
           shareimgflag = false;
       })
       //window.location.href = '/jyapp/free/transfer?url='+encodeURIComponent($(this).attr("href"));
-      $(".original").attr("openurl",{{.T.obj.url}})
+      $(".original").attr("openurl",{{.T.obj.href}})
       {{if .T.isVip}}
       $(".original_name").attr("adv_name","app_article_viporiginaltext");
       {{else}}

src/web/templates/pc/biddetail_rec.html

@@ -2404,14 +2404,12 @@ $(function(){
 	}
 	//
 	{{if .T.obj.infoformat}}
-	{{if eq .T.obj.infoformat 2}}
-	$(".com-prebuilt").removeClass("hidden");
-	//
-	{{else}}
-	$(".com-original").removeClass("hidden");
+  	{{if eq .T.obj.infoformat 2}}
+  	  $(".com-prebuilt").removeClass("hidden");
+  	{{end}}
 	{{end}}
-	{{else}}
-	$(".com-original").removeClass("hidden");
+	{{if .T.obj.href}}
+	  $(".com-original").removeClass("hidden");
 	{{end}}
 	$(window).scroll(function(){
 		if($(this).scrollTop() > 0){

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1118,7 +1118,7 @@ var id = {{.T.obj._id}};
 var s_words = {{.T.keywords}};
 s_words=decodeURIComponent(getParameter("keywords"));
 //
-var url = {{.T.obj.url}};
+var url = {{.T.obj.href}};
 var type = {{.T.obj.type}};
 var bidopentime = {{.T.obj.bidopentime}};
 var comeintime = {{.T.obj.comeintime}};
@@ -2166,15 +2166,13 @@ $(function(){
 	$(".filename").css("width",$(window).width()*0.68+"px");
 	{{end}}
 	{{if .T.obj.infoformat}}
-	{{if eq .T.obj.infoformat 2}}
-	$(".prebuilt").removeClass("hidden");
-
-	$("#h_content").css("font-size","16px");
-	{{else}}
-	$(".abs .original").removeClass("hidden");
+  	{{if eq .T.obj.infoformat 2}}
+    	$(".prebuilt").removeClass("hidden");
+    	$("#h_content").css("font-size","16px");
+  	{{end}}
 	{{end}}
-	{{else}}
-	$(".abs .original").removeClass("hidden");
+	{{if .T.obj.href}}
+	  $(".abs .original").removeClass("hidden");
 	{{end}}
 	//
 	$(".shareimg").css("top",$(".newuser").offset().top+18);
@@ -2461,7 +2459,7 @@ $(function(){
 		$(".ups").addClass("hidden");
 		shareimgflag = false;
 	})
-    var original='/front/transfer?url='+encodeURIComponent({{.T.obj.url}});
+    var original='/front/transfer?url='+encodeURIComponent({{.T.obj.href}});
     var original_name;
     {{if .T.isVip}}
       original_name="wx_article_viporiginaltext";