Explorar el Código

Merge branch 'dev2.10.2.1' of ssh://192.168.3.207:10022/qmx/jy into dev2.10.2.1

wangchuanjin hace 5 años
padre
commit
5805805504

+ 25 - 15
src/jfw/front/shorturl.go

@@ -21,8 +21,9 @@ import (
 
 type Short struct {
 	*xweb.Action
-	article xweb.Mapper `xweb:"/article/(\\w+)/(.*).html"` //([pm])
-	qr      xweb.Mapper `xweb:"/biddetail/(\\w+)/qr/(.+)"`
+	article     xweb.Mapper `xweb:"/article/(\\w+)/(.*).html"` //([pm])
+	qr          xweb.Mapper `xweb:"/biddetail/(\\w+)/qr/(.+)"`
+	replication xweb.Mapper `xweb:"/front/shorturl/replication"` //用户复制操作记录入库
 }
 
 var mobileReg = regexp.MustCompile("(?i)(Android|Mobile|Phone)")
@@ -182,15 +183,15 @@ func (s *Short) Article(stype, id string) error {
 				obj["ucbsId"] = util.EncodeArticleId2ByCheck("ucbs#" + ssOpenid.(string) + "#" + id)
 			}
 			s.T["obj"] = obj
-			var rec = ""
-			if ssOpenid != nil && ssOpenid != "" {
-				if redis.Get("recovery", "rec-"+ssOpenid.(string)) != nil {
-					rec = "_rec"
-				}
-			}
+			var rec = "_rec"
+			// if ssOpenid != nil && ssOpenid != "" {
+			// 	if redis.Get("recovery", "rec-"+ssOpenid.(string)) != nil {
+			// 		rec = "_rec"
+			// 	}
+			// }
 			s.T["forceShareFlag"] = public.CheckUserNeedForceShare(userId, public.ShareType_detail) //是否强制分享
 			content, _ := s.Render4Cache("/weixin/wxinfocontent"+rec+".html", &s.T)
-			//	redis.Put("other", "jywxdetail_"+sid+kds, string(content), 60*60*2)
+			// 	redis.Put("other", "jywxdetail_"+sid+kds, string(content), 60*60*2)
 			return s.SetBody(content)
 			//}
 		}
@@ -207,18 +208,18 @@ func (s *Short) Article(stype, id string) error {
 		isForceShare := false
 		sid := sids[0]
 		//log.Println("sid", sid)
-		var rec = ""
+		var rec = "_rec"
 		//log.Println(redis.Get("recovery", "rec-"+ssOpenid.(string)), "ssOpenid:", ssOpenid)
 		if ssOpenid != nil && ssOpenid != "" && userId != "" {
 			if stype == "content" {
 				//判断是否需要强制分享
 				isForceShare = public.CheckUserNeedForceShare(userId, public.ShareType_detail)
 			}
-			if !isForceShare {
-				if redis.Get("recovery", "rec-"+ssOpenid.(string)) != nil {
-					rec = "_rec"
-				}
-			}
+			// if !isForceShare {
+			// 	if redis.Get("recovery", "rec-"+ssOpenid.(string)) != nil {
+			// 		rec = "_rec"
+			// 	}
+			// }
 		}
 		var res interface{}
 		if !isForceShare {
@@ -311,3 +312,12 @@ func (s *Short) Qr(t, id string) error {
 	_, err := w.Write(pngdat)
 	return err
 }
+
+func (s *Short) Replication() {
+	mongodb.Save("copyaction", map[string]interface{}{
+		"userid":     s.GetSession("userId").(string),
+		"createtime": time.Now().Unix(),
+		"url":        s.Request.Referer(),
+		"client":     s.Header("User-Agent"),
+	})
+}

+ 4 - 4
src/jfw/front/swordfish.go

@@ -1277,7 +1277,7 @@ func pcVRT(sid, industry string) (po, bo, wo []map[string]interface{}, objdata m
 				var arrTags = util.ObjArrToStringArr(config.Sysconfig["detail_element"].([]interface{}))
 				var _detail = util.ObjToString(obj["detail"])
 				for _, v := range arrTags {
-					var intOpen = strings.Count(_detail, "<"+v+">")
+					var intOpen = strings.Count(_detail, "<"+v)
 					var intClose = strings.Count(_detail, "</"+v+">")
 					if intOpen >= intClose {
 						for di := 0; di < (intOpen - intClose); di++ {
@@ -1288,9 +1288,9 @@ func pcVRT(sid, industry string) (po, bo, wo []map[string]interface{}, objdata m
 							_detail = "<" + v + ">" + _detail
 						}
 					}
-					log.Println(intOpen, "--", intClose)
+					// log.Println(intOpen, "--", intClose)
 				}
-				log.Println("_detail:", _detail)
+				// log.Println("_detail:", _detail)
 				obj["detail"] = _detail
 			}
 			obj["stypeadd"], obj["areaadd"], obj["indadd"] = classify(finalType, area, industry)
@@ -2432,7 +2432,7 @@ func (f *Front) HasPushHistory() {
 			var twoRemind = int64(2 * 24 * 60 * 60)
 			var oneRemind = int64(1 * 24 * 60 * 60)
 			var o_vipjy map[string]interface{}
-			if (*user)["isread"]!=nil{
+			if (*user)["isread"] != nil {
 				isread = (*user)["isread"].(bool)
 			}
 			o_vipjy, _ = (*user)["o_vipjy"].(map[string]interface{})

+ 2 - 0
src/jfw/modules/app/src/web/templates/me/mine.html

@@ -522,6 +522,8 @@ color:#1d1d1d;
       return false
     }
     </script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

+ 1 - 0
src/web/staticres/css/pc.css

@@ -3863,6 +3863,7 @@ h6 {
 	font-size: 14px;
     color: #2cb7ca;
     cursor: pointer;
+    display: none;
 }
 #tab2 #candidate{
 	border-right: 0px !important;

+ 325 - 324
src/web/staticres/css/wxcontentinfo.css

@@ -1,325 +1,326 @@
-
-/**div2.1**/
-.fatNav{
-	height:45px;
-}
-.childNav{
-	height: 45px;
-    line-height: 45px;
-    border-bottom: 1px solid #EBEBEB;
-    border-top: 1px solid #EBEBEB;
-	top:0px;
-	width: 100%;
-	background-color: #fff;
-	z-index: 999;
-}
-.childNav div{
-	width: 50%;
-    text-align: center;
-    float:left;
-	height: 43px;
-    
-}
-.childNav .active{
-	color:#2cb7ca;
-	border-bottom: 2px solid #2cb7ca;
-}
-.tabfix{
-	position:fixed
-}
-#tab1{
-	margin-left: -10px;
-	margin-right: -10px;
-	background-color: #f4f4f9;
-/*    padding-bottom: 10px;*/
-/*	border-bottom: 1px solid #EBEBEB;*/
-	margin-top:-5px;
-}
-#tab1 ul{
-	margin-bottom:0px;
-}
-#tab1 .publicTitle {
-	height: .85rem;
-	line-height: .85rem;
-	padding-left: .3rem;
-	background-color: #f4f4f9;
-/*	border-top: 1px solid #EBEBEB;*/
-	border-bottom: 1px solid #EBEBEB;
-	font-size: .28rem;
-	color: #686868;
-	display: flex;
-	align-items: center;
-}
-
-#tab1 .publicTitle>.line {
-	display: inline-block;
-	width: .07rem;
-	height: .28rem;
-	background-color: #2cb7ca;
-	margin-right: .15rem;
-}
-#tab1 .itemInfo{
-	background-color: #fff;
-}
-#tab1 .itemInfo>ul {
-	padding-left: .3rem;
-}
-
-#tab1 .itemInfo>ul>li {
-	padding-top: .3rem;
-	padding-bottom: .3rem;
-	border-bottom: 1px solid #EBEBEB;
-	font-size: .3rem;
-	color: #1d1d1d;
-	text-align: left;
-	display: flex;
-	align-items: center;
-	position: relative;
-}
-
-#tab1 .itemInfo>ul>li p.name {
-	width: 1.8rem;
-	margin-right: .15rem;
-}
-
-#tab1 .itemInfo>ul>li p.textcontent {
-	width: 4.2rem;
-}
-
-#tab1 .itemInfo>ul>li p.textcontent.long {
-	
-	line-height: .4rem;
-	overflow: hidden;
-	background: #fff url(/images/down.png) right bottom no-repeat;
-	background-size: .25rem .16rem;
-	
-}
-
-#tab1 .itemInfo>ul>li p.textcontent.long.up {
-	background: #fff url(/images/up.png) right bottom no-repeat;
-	background-size: .25rem .16rem;
-	
-}
-
-#tab1 .itemInfo>ul>li>a {
-	position: absolute;
-	right: .3rem;
-	color: #2cb7ca;
-	font-size: .26rem;
-}
-#tab1 .itemInfo>ul>li p{
-	margin-bottom:0px !important;
-}
-.tab-ct{
-	margin-bottom:20px;
-}
-#tab2{
-	margin-top: 25px;
-	margin-bottom: 30px;
-}
-.recoveryerror{
-	position: fixed;
-    bottom: 10px;
-    height: 65px;
-    border-radius: 5px;
-    margin: auto;
-    right: 10px;
-    left: 10px;
-	background: #fff;
-	box-shadow: 0 0 20px rgba(0,0,0, .5);
-}
-.recoveryerror .rhclose{
-	position:absolute;
-	box-shadow: 0 0 20px rgba(0,0,0, .25);
-	right: -5px;
-    top: -14px;
-    width: 23px;
-	border-radius: 100%;
-}
-.recoveryerror .rh-content{
-	padding: 13px;
-	width: 7.12rem;
-}
-.recoveryerror .rhtext{
-	float: left;
-    width: 3.8rem;
-	font-size: .28rem;
-	color: #1d1d1d;
-}
-.recoveryerror .rhright img{
-	width: 0.35rem;
-}
-.recoveryerror .rhwrong img{
-	width: 0.3rem;
-}
-.recoveryerror .rhright,.recoveryerror .rhwrong{
-	display: inline-block;
-    border: 1px solid #e0e0e0;
-    background: #f2f2f7;
-    width: 1.2rem;
-    height: 35px;
-	text-align: center;
-	padding: 8px;
-	float:right;
-	border-radius:2px;
-}
-.recoveryerror .rhright{
-	margin-right: 10px;
-}
-.fphl{
-	background-color:#e2e2e2;
-}
-.recoveryerror .rh-recovery{
-	padding: 13px 10px;
-	width: 7.12rem;
-}
-.recoveryerror .rhrinput{
-	width:100%;
-	position: relative;
-}
-.recoveryerror .rhrinput input{
-	border: 1px solid #cecece;
-    border-bottom-left-radius: 4px;
-    border-top-left-radius: 4px;
-    height: 40px;
-    color: #1d1d1d;
-	width: 100%;
-	padding-right: 1.5rem;
-	font-size: .28rem;
-    padding-left: 6px;
-}
-.recoveryerror .rhrsub{
-	height: 40px;
-/*    border: 1px solid #2cb7ca;*/
-    color: #fff;
-    background: #2cb7ca;
-    border-bottom-right-radius: 3px;
-    border-top-right-radius: 3px;
-    line-height: 40px;
-    text-align: center;
-	width: 1.4rem;
-	position: absolute;
-    right: 0px;
-    top: 0px;
-}
-#tab1 .ulfg{
-	height: 13px;
-    background: #f4f4f9;
-    padding-left: 0px !important;
-    border-bottom: 1px solid #EBEBEB;
-    border-top: 1px solid #EBEBEB;
-}
-#tab1 .bbm0{
-	border-bottom:0px !important;
-}
-#tab1  #baseInfo,#tab1  #bidInfo,#tab1  #bagInfo,#tab1  #candidateInfo{
-	border-bottom: 1px solid #EBEBEB;
-}
-.rec-null{
-	position: fixed;
-    border-radius: 5px;
-    margin: auto;
-    background: #fff;
-    box-shadow: 0 0 20px rgba(0,0,0, .5);
-    width: 5.6rem;
-    height: 2.6rem;
-    left: 50%;
-    margin-left: -2.8rem;
-    top: 50%;
-    margin-top: -1.3rem;
-}
-.null-head{
-	border-bottom: 1px solid #ebebeb;
-    padding: 5px 15px;
-}
-.null-cont{
-	height: 50px;
-    line-height: 50px;
-    text-align: center;
-    border-bottom: 1px solid #ebebeb;
-	font-size: .3rem;
-}
-.null-feet{
-	text-align: right;
-    margin-top: 12px;
-}
-.null-yes{
-	display: inline-block;
-    border: 1px solid #2cbacf;
-    background: #2cb7ca;
-    color: #fff;
-    padding: 0px 15px;
-    margin-right: 20px;
-    border-radius: 2px;
-}
-.null-no{
-	display: inline-block;
-    border: 1px solid #ccc;
-    background: #ccc;
-    color: #fff;
-    padding: 0px 15px;
-    margin-right: 10px;
-    border-radius: 2px;
-}
-.explain{
-	font-size: .25rem;
-    color: #888;
-    background-color: #f4f4f9;    
-	height: 60px;
-    line-height: 40px;
-    padding-left: 10px;
-    margin: 0px -10px 0px -10px;
-    border-bottom: 1px solid #ebebeb;
-/*    border-top: 1px solid #ebebeb;*/
-}
-/* *** */
-.share, .iknow {
-    text-align: right;
-    padding-right: .9rem;
-}
-.share img {
-    width: 5.13rem;
-    height: 4.37rem;
-    margin-top: 30px;
-}
-.iknow img {
-    width: 1.99rem;
-    height: 0.92rem;
-    margin-top: 50px;
-}
-.smask{
-	position: fixed;
-    top: 0px;
-    background-color: #000;
-    background: rgba(0, 0, 0, 0.8);
-    width: 100%;
-    height: 100%;
-    z-index: 9999;
-}
-/* forceShare start */
-.sharel {
-	text-align: right;
-	padding-right: .9rem;
-}
-.sharel img {
-	width: 5.13rem;
-	height: 4.37rem;
-	margin-top: 17px;
-}
-.smaskl{
-	position: fixed;
-	top: 0px;
-	background-color: #000;
-	background: rgba(0, 0, 0, 0.8);
-	width: 100%;
-	height: 100%;
-	z-index: 9999;
-}
-.infoFilter{
-	-webkit-filter: blur(5px); /* Chrome, Opera */
-	-moz-filter: blur(5px);
-	-ms-filter: blur(5px);
-	filter: blur(5px);
-	filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius=10, MakeShadow=false);
-}
+
+/**div2.1**/
+.fatNav{
+	height:45px;
+}
+.childNav{
+	height: 45px;
+    line-height: 45px;
+    border-bottom: 1px solid #EBEBEB;
+    border-top: 1px solid #EBEBEB;
+	top:0px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 999;
+}
+.childNav div{
+	width: 50%;
+    text-align: center;
+    float:left;
+	height: 43px;
+    
+}
+.childNav .active{
+	color:#2cb7ca;
+	border-bottom: 2px solid #2cb7ca;
+}
+.tabfix{
+	position:fixed
+}
+#tab1{
+	margin-left: -10px;
+	margin-right: -10px;
+	background-color: #f4f4f9;
+/*    padding-bottom: 10px;*/
+/*	border-bottom: 1px solid #EBEBEB;*/
+	margin-top:-5px;
+}
+#tab1 ul{
+	margin-bottom:0px;
+}
+#tab1 .publicTitle {
+	height: .85rem;
+	line-height: .85rem;
+	padding-left: .3rem;
+	background-color: #f4f4f9;
+/*	border-top: 1px solid #EBEBEB;*/
+	border-bottom: 1px solid #EBEBEB;
+	font-size: .28rem;
+	color: #686868;
+	display: flex;
+	align-items: center;
+}
+
+#tab1 .publicTitle>.line {
+	display: inline-block;
+	width: .07rem;
+	height: .28rem;
+	background-color: #2cb7ca;
+	margin-right: .15rem;
+}
+#tab1 .itemInfo{
+	background-color: #fff;
+}
+#tab1 .itemInfo>ul {
+	padding-left: .3rem;
+}
+
+#tab1 .itemInfo>ul>li {
+	padding-top: .3rem;
+	padding-bottom: .3rem;
+	border-bottom: 1px solid #EBEBEB;
+	font-size: .3rem;
+	color: #1d1d1d;
+	text-align: left;
+	display: flex;
+	align-items: center;
+	position: relative;
+}
+
+#tab1 .itemInfo>ul>li p.name {
+	width: 1.8rem;
+	margin-right: .15rem;
+}
+
+#tab1 .itemInfo>ul>li p.textcontent {
+	width: 4.2rem;
+}
+
+#tab1 .itemInfo>ul>li p.textcontent.long {
+	
+	line-height: .4rem;
+	overflow: hidden;
+	background: #fff url(/images/down.png) right bottom no-repeat;
+	background-size: .25rem .16rem;
+	
+}
+
+#tab1 .itemInfo>ul>li p.textcontent.long.up {
+	background: #fff url(/images/up.png) right bottom no-repeat;
+	background-size: .25rem .16rem;
+	
+}
+
+#tab1 .itemInfo>ul>li>a {
+	position: absolute;
+	right: .3rem;
+	color: #2cb7ca;
+	font-size: .26rem;
+	display: none;
+}
+#tab1 .itemInfo>ul>li p{
+	margin-bottom:0px !important;
+}
+.tab-ct{
+	margin-bottom:20px;
+}
+#tab2{
+	margin-top: 25px;
+	margin-bottom: 30px;
+}
+.recoveryerror{
+	position: fixed;
+    bottom: 10px;
+    height: 65px;
+    border-radius: 5px;
+    margin: auto;
+    right: 10px;
+    left: 10px;
+	background: #fff;
+	box-shadow: 0 0 20px rgba(0,0,0, .5);
+}
+.recoveryerror .rhclose{
+	position:absolute;
+	box-shadow: 0 0 20px rgba(0,0,0, .25);
+	right: -5px;
+    top: -14px;
+    width: 23px;
+	border-radius: 100%;
+}
+.recoveryerror .rh-content{
+	padding: 13px;
+	width: 7.12rem;
+}
+.recoveryerror .rhtext{
+	float: left;
+    width: 3.8rem;
+	font-size: .28rem;
+	color: #1d1d1d;
+}
+.recoveryerror .rhright img{
+	width: 0.35rem;
+}
+.recoveryerror .rhwrong img{
+	width: 0.3rem;
+}
+.recoveryerror .rhright,.recoveryerror .rhwrong{
+	display: inline-block;
+    border: 1px solid #e0e0e0;
+    background: #f2f2f7;
+    width: 1.2rem;
+    height: 35px;
+	text-align: center;
+	padding: 8px;
+	float:right;
+	border-radius:2px;
+}
+.recoveryerror .rhright{
+	margin-right: 10px;
+}
+.fphl{
+	background-color:#fff;
+}
+.recoveryerror .rh-recovery{
+	padding: 13px 10px;
+	width: 7.12rem;
+}
+.recoveryerror .rhrinput{
+	width:100%;
+	position: relative;
+}
+.recoveryerror .rhrinput input{
+	border: 1px solid #cecece;
+    border-bottom-left-radius: 4px;
+    border-top-left-radius: 4px;
+    height: 40px;
+    color: #1d1d1d;
+	width: 100%;
+	padding-right: 1.5rem;
+	font-size: .28rem;
+    padding-left: 6px;
+}
+.recoveryerror .rhrsub{
+	height: 40px;
+/*    border: 1px solid #2cb7ca;*/
+    color: #fff;
+    background: #2cb7ca;
+    border-bottom-right-radius: 3px;
+    border-top-right-radius: 3px;
+    line-height: 40px;
+    text-align: center;
+	width: 1.4rem;
+	position: absolute;
+    right: 0px;
+    top: 0px;
+}
+#tab1 .ulfg{
+	height: 13px;
+    background: #f4f4f9;
+    padding-left: 0px !important;
+    border-bottom: 1px solid #EBEBEB;
+    border-top: 1px solid #EBEBEB;
+}
+#tab1 .bbm0{
+	border-bottom:0px !important;
+}
+#tab1  #baseInfo,#tab1  #bidInfo,#tab1  #bagInfo,#tab1  #candidateInfo{
+	border-bottom: 1px solid #EBEBEB;
+}
+.rec-null{
+	position: fixed;
+    border-radius: 5px;
+    margin: auto;
+    background: #fff;
+    box-shadow: 0 0 20px rgba(0,0,0, .5);
+    width: 5.6rem;
+    height: 2.6rem;
+    left: 50%;
+    margin-left: -2.8rem;
+    top: 50%;
+    margin-top: -1.3rem;
+}
+.null-head{
+	border-bottom: 1px solid #ebebeb;
+    padding: 5px 15px;
+}
+.null-cont{
+	height: 50px;
+    line-height: 50px;
+    text-align: center;
+    border-bottom: 1px solid #ebebeb;
+	font-size: .3rem;
+}
+.null-feet{
+	text-align: right;
+    margin-top: 12px;
+}
+.null-yes{
+	display: inline-block;
+    border: 1px solid #2cbacf;
+    background: #2cb7ca;
+    color: #fff;
+    padding: 0px 15px;
+    margin-right: 20px;
+    border-radius: 2px;
+}
+.null-no{
+	display: inline-block;
+    border: 1px solid #ccc;
+    background: #ccc;
+    color: #fff;
+    padding: 0px 15px;
+    margin-right: 10px;
+    border-radius: 2px;
+}
+.explain{
+	font-size: .25rem;
+    color: #888;
+    background-color: #f4f4f9;    
+	height: 80px;
+    line-height: 40px;
+    padding-left: 10px;
+    margin: 0px -10px 0px -10px;
+    border-bottom: 1px solid #ebebeb;
+/*    border-top: 1px solid #ebebeb;*/
+}
+/* *** */
+.share, .iknow {
+    text-align: right;
+    padding-right: .9rem;
+}
+.share img {
+    width: 5.13rem;
+    height: 4.37rem;
+    margin-top: 30px;
+}
+.iknow img {
+    width: 1.99rem;
+    height: 0.92rem;
+    margin-top: 50px;
+}
+.smask{
+	position: fixed;
+    top: 0px;
+    background-color: #000;
+    background: rgba(0, 0, 0, 0.8);
+    width: 100%;
+    height: 100%;
+    z-index: 9999;
+}
+/* forceShare start */
+.sharel {
+	text-align: right;
+	padding-right: .9rem;
+}
+.sharel img {
+	width: 5.13rem;
+	height: 4.37rem;
+	margin-top: 17px;
+}
+.smaskl{
+	position: fixed;
+	top: 0px;
+	background-color: #000;
+	background: rgba(0, 0, 0, 0.8);
+	width: 100%;
+	height: 100%;
+	z-index: 9999;
+}
+.infoFilter{
+	-webkit-filter: blur(5px); /* Chrome, Opera */
+	-moz-filter: blur(5px);
+	-ms-filter: blur(5px);
+	filter: blur(5px);
+	filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius=10, MakeShadow=false);
+}
 /* forceShare end */

+ 38 - 6
src/web/staticres/wx_dataExport/css/dataExport.css

@@ -8,11 +8,6 @@ html .page {
   overflow: hidden;
   font-size: .24rem;
 }
-html .page .main{
-  flex: 1;
-  overflow-y: scroll;
-margin-bottom:40px;
-}
 html .page .progress {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -24,7 +19,7 @@ html .page .progress {
   justify-content: space-around;
   padding: .28rem 0;
   background: #fff;
-  border-bottom: 1px solid #e0e0e0;
+  height: 70px;
 }
 html .page .progress .p-item {
   -webkit-box-flex: 1;
@@ -266,4 +261,41 @@ html .match_way .box .box_bd img {
 
 html .match_way .box .box_bd .weui-check:checked + .weui-icon-checked:before {
   color: #2CB7CA;
+}
+
+.cion_img{
+	position: relative;
+	border: 1px solid #E8E8E8;
+	margin: 0 auto;
+	border-radius: 10px;
+}
+
+.cion_img:before,
+.cion_img:after {
+	content: '';
+	position: absolute;
+	top: 50%;
+	width: 3rem;
+	height: 1px;
+	background-color: #E8E8E8;
+}
+
+.cion_img:before {
+	left: 0.38rem;
+}
+
+.cion_img:after {
+	left: -3rem;
+}
+
+
+.j-icon {
+	display: inline-block;
+	width: 20px;
+	height: 20px;
+}
+
+.icon-arrow-top {
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABHNCSVQICAgIfAhkiAAAAN9JREFUSEvt0rENwjAQBdB/RWoyChugTAAp4hbYADZgA9iAtLkUYQNgg6yQDehTBAURCaHYvpNQaOz628/+Z8LEiyb2EMCfNx4q/X+lVVXFbdseAdyNMbn2RuoZMvMFwPINbbWoCiyKIiei9derVKgYtGC9/QCQGGNqSb0ikJk3AM6OA8WoFxRgwz1EqBNUYANaR1GUpGna46PLCjLzHMAVQCyZzUfGibrAG4CFEnvFiWifZdlpbK8VLMty13XdAcBMiTYAVrZf6/00SswbD6C3Im0gVKptzJsPlXor0gaecJo+HVRwOokAAAAASUVORK5CYII=) no-repeat;
+	background-size: contain;
 }

BIN
src/web/staticres/wx_dataExport/images/jt.png


+ 139 - 11
src/web/templates/pc/biddetail_rec.html

@@ -200,6 +200,22 @@ a{
 .com-buyerclass > a{
     color: #fff;
 }
+.join{
+  color:#fff;
+  background-color:#35B2C8;
+  margin-left: 15px;
+  border:none;
+  border-radius: 5px;
+  font-size:14px;
+  width:75px;
+  height:25px;
+  line-height: 25px;
+  display: inline-block;
+  text-align: center;
+}
+.adv_tosieve{
+  display: inline-block;
+}
 </style>
 </head>
 <body>
@@ -333,7 +349,8 @@ function isWechat() {
 				</table>
 			</div>
 		</div>
-		{{if .T.obj.detail}}
+    <div class="lead-btn-nj" style="color:#2cb7ca;margin:15px 0;display:none;"><div class="adv_tosieve"></div><div class="join" onclick="adv_statistics(this)" adv_name="PC三级页引导按钮"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
+    {{if .T.obj.detail}}
 		<div class="recoveryfat" style="display:none;">
 			<div class="recoveryhead">
 				<div class="tab2 active" onclick="jumpTab('2')">公告摘要</div>
@@ -431,14 +448,13 @@ function isWechat() {
 					</table>
 				</div>
 			</div>
-			<div class="explain" style="display:none;">*以上摘要信息由剑鱼标讯智能提取,如有错漏,欢迎纠错!</div>
-		
+			<div class="explain" style="display:none;">*以上摘要信息由剑鱼标讯智能提取</div>
+      <div class="lead-btn" style="color:#2cb7ca;margin:15px 0;display:none;"><div class="adv_tosieve"></div><div class="join" onclick="adv_statistics(this)" adv_name="PC三级页引导按钮"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
 			<div id="tab1">
 				<div class="com-detail">
 					{{Html (Regexp (Regexp (Regexp (Regexp (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>") "<td>\\s*$" "") "<tr>\\s*$" "") "<tbody>\\s*$" "") "<table>\\s*$" "")}}
 				</div>
 			</div>
-
 		</div>
 		{{end}}
 		{{if .T.obj.projectinfo.attachments}}
@@ -658,6 +674,60 @@ var projectname = {{.T.obj.projectname}}//统计标识
 var reg ="";
 var titleCopy ="";
 var tyflag = false;//纠错是否是金额
+var area_ = {{.T.obj.area}};
+var city_ = {{.T.obj.city}};
+var agency_ = {{.T.obj.agency}};
+var projectname_ = {{.T.obj.projectname}};
+var buyer_ = {{.T.obj.buyer}};
+var buyerperson_ = {{.T.obj.buyerperson}};
+var buyertel_ = {{.T.obj.buyertel}};
+var isbid =false; //是否是中标,需要显示所有
+//拟建项目广告
+var nj_adv=["批量导出拟建项目"]
+//招标公告广告
+var zb_adv=[ 
+  "更多项目联系人、电话批量导出",
+  "采购单位招标数据批量导出",
+  "全面展示行业项目的数据字段"
+]
+//中标公告
+var win_adv=[
+  "中标项目信息字段全面展示",
+  "更多中标项目、业主、联系人数据批量导出",
+  "中标企业数据字段定制化导出"
+]
+//任意类型  --更多数据字段定制化导出,立即查看! 其他都是立即体验
+var any_adv=[
+  "更多数据字段定制化导出",
+  "导出数据,分析市场",
+  "导出数据,分析竞争对手",
+  "导出数据,分析合作伙伴",
+  "导出数据,分析客户"
+]
+
+var count=0;
+if (area_!=""&&area_!=null){
+  count++
+}
+if (city_!=""&&city_!=null){
+  count++
+}
+if (agency_!=""&&agency_!=null){
+  count++
+}
+if (projectname_!=""&&projectname_!=null){
+  count++
+}
+if (buyer_!=""&&buyer_!=null){
+  count++
+}
+if (buyerperson_!=""&&buyerperson_!=null){
+  count++
+}
+if (buyertel_!=""&&buyertel_!=null){
+  count++
+}
+
 //
 function isWechat() {
     var ua = navigator.userAgent.toLowerCase();
@@ -742,13 +812,62 @@ function clearup(rp){
 	$(".com-detail").html(dtcontent);
 	$("#com-title").html(dttitlecopy);
 }
+
 //
 if({{.T.obj.subtype}}=="中标"||{{.T.obj.subtype}}=="成交"||{{.T.obj.subtype}}=="合同"){
+  isbid=true
+  var winner_ ={{.T.obj.winner}}
 	var bidmt = {{.T.obj.bidamount}}
-	$("#bidamount").text(bidmt)
-	$("#bidInfoTitle").show();
-	$("#bidInfoCont").show();
+  if(winner_!=""&&winner_!=null){
+    count++
+  }
+  if(bidmt!=""&&bidmt!=null){
+    count++
+  }
+  if(count>=5){
+   	$("#bidamount").text(bidmt)
+	  $("#bidInfoTitle").show();
+	  $("#bidInfoCont").show();
+  }
+}
+var subtype={{.T.obj.subtype}};
+var adv_from=getinfotype(subtype);
+var adv=any_adv;
+if(adv_from=="中标公告"){
+  adv=adv.concat(win_adv);
+}else if(adv_from=="招标公告"){
+  adv=adv.concat(zb_adv);
+}else if(adv_from=="拟建项目"){
+  adv=adv.concat(nj_adv);
+}
+var x = Math.floor(Math.random()*adv.length)
+$(".adv_tosieve").text(adv[x])
+var btn_text="立即体验"
+if (adv[x]==any_adv[0]){
+  btn_text="立即查看";
+}
+$(".adv_tosieve-btn").text(btn_text)
+$(".join > a").attr("dataHref","/front/dataExport/toSieve?adv_from="+getinfotype(subtype));
+
+function getinfotype(subtype){
+  var infotype=""
+  switch (subtype){
+		case "拟建":
+      infotype="拟建项目"
+			break;
+    case "招标": case "邀标": case "询价": case "竞谈": case "变更": case "竞价": case "单一": case "其他":
+      infotype="招标公告"
+			break;
+		case "中标": case "成交": case "废标": case "流标":
+      infotype="中标公告"
+			break;
+		default:
+    infotype="其他"
+			break;
+	}
+  return infotype
 }
+
 //
 $(window).scroll(function(event){
 	if(cHeight <= 0){
@@ -902,6 +1021,9 @@ $(function(){
 		}else{
 			$(".pop-botton").css({"background":"#2cbfca"})
 		}
+      var pathname_url=window.location.pathname+window.location.search;
+     $.get("/front/shorturl/replication");
+
     });
 	//纠错输入框
 	$("#pop-textarea").on("input propertychange",function(){
@@ -1164,6 +1286,9 @@ $(function(){
 		}
 		
 	}
+  if({{.T.obj.subtype}}=="拟建"){
+      $(".lead-btn-nj").show();
+  }
 	var attaflag = false;
 	{{if .T.obj.projectinfo.attachments}}
 	var attachments = {{.T.obj.projectinfo.attachments}}
@@ -1201,15 +1326,18 @@ $(function(){
 			$(".pdf-div").removeClass("hidden");
 		}
 	}else{
-		$(".recoveryfat").show();
-		$("#tab2").show();
-		$(".explain").show();
+    if((count>=4 && !isbid)||(count>=5&&isbid)){
+    		$(".recoveryfat").show();
+    		$("#tab2").show();
+    		$(".explain").show();
+        $(".lead-btn").show();
+    }
 	}
 	//
 	{{if .T.obj.infoformat}}
 	{{if eq .T.obj.infoformat 2}}
 	$(".com-prebuilt").removeClass("hidden");
-	
+	//
 	{{else}}
 	$(".com-original").removeClass("hidden");
 	{{end}}

+ 26 - 0
src/web/templates/pc/dataExport_sieve.html

@@ -422,6 +422,24 @@
         	border-color: #2CB7CA;
     		color: #2CB7CA;
         }
+        .sieve-tit{
+          font-size: 14px;
+          font-weight: 600;
+          color: #2CB7CA;
+        }
+        .sieve-cont{
+          font-size: 12px;
+          color:#8E8E8E;
+        }
+        .mt5{
+          margin-top:5px;
+        }
+        .mt10{
+          margin-top:10px;
+        }
+        .mar-bot10{
+          margin-bottom:30px;
+        }
     </style>
 </head>
 <body>
@@ -495,6 +513,14 @@
     </div>
     <!--选择区域-->
     <div class="inner">
+      <div style="margin-left: 50px;">
+      <div class="sieve-tit">数据自助导出</div>
+      <div class="sieve-cont mt5">剑鱼标讯提供全国招投标数据的自助导出功能,企业可指定关键词、发布时间、地区或行业等筛选条件,剑鱼标讯以EXCEL表格形式提供数据。</div>
+      <div class="sieve-tit mt10">通过分析招标数据,可以帮助你</div>
+      <div class="sieve-cont mt5">1、全面获取市场信息,紧跟市场趋势,提前布局;</div>
+      <div class="sieve-cont ">2、准确掌握行业客户、竞争对手、合作伙伴的招投标活动;</div>
+      <div class="sieve-cont mar-bot10">3、轻松挖掘潜在客户、合作伙伴、拓展市场空间。</div>
+      </div>
         <!--日期-->
         <div class="line-box float-box">
             <div class="left">筛选日期</div>

+ 123 - 45
src/web/templates/weixin/dataExport/dataExport.html

@@ -9,7 +9,7 @@
     <title>数据导出</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}13">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}5">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
@@ -21,10 +21,26 @@
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
 </head>
 <style>
+  .j-container {
+  	display: flex;
+  	flex-direction: column;
+  	justify-content: space-between;
+  	height: 100%;
+  }
+  .j-main {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow-y: scroll;
+    overflow-x: hidden;
+  }
+  .j-footer {
+    box-shadow: 0px -2Px 8Px rgba(54, 147, 179, 0.051);
+  }
+
 	.confirm{
 		height: 0.94rem;
-		position: fixed;
-    	bottom: 0px;
     	width: 100%;
 	}
     .mbsc-ios .dwbc{
@@ -133,10 +149,45 @@
 		flex: 1;
 		text-align: right;
 	}
+  .tit{
+    text-align: center;
+    background-color: #fff;
+    padding-bottom: 15px;
+    
+  }
+  .cont{
+    background-color: #fff
+  }
+  .sieve-tit{
+    font-size: 14px;
+    font-weight: bolder;
+    color: #2CB7CA;
+  }
+  .sieve-cont{
+    font-size: 12px;
+    color:#8E8E8E;
+  }
+  .mt5{
+    margin-top:5px;
+  }
+  .mt10{
+    margin-top:10px;
+  }
+  .mar-bot10{
+    margin-bottom:30px;
+  }
+  .helpwhat{
+    border: 1px solid #E8E8E8;
+    width: 175px;
+    margin: 0 auto;
+    border-radius: 10px;
+    padding-left: 7px;
+  }
 </style>
 <body>
-    <div class="page">
-        <div class="main">
+    <div class="page j-container">
+      <div class="main j-main">
+       <div>
         <div class="progress">
         	<div class="p-item">
         		<p class="p-item-icon" style="background: #2cb7ca;">
@@ -161,6 +212,23 @@
         		<span>数据导出</span>
         	</div>
         </div>
+            <div class="tit">
+              <div class="helpwhat">数据导出可以帮助您做什么<img style="width: 15px; margin-top: -2px; margin-left: 2px;transform: rotate(180deg);" src="/wx_dataExport/images/jt.png"/></div>
+              <div class="btn_img" style="display:none;" >
+                <span class="j-icon icon-arrow-top cion_img"></span>
+              </div>
+            </div>
+             <div class="cont" style="display:none">
+                <div style="padding-left: 20px; padding-right: 20px; padding-bottom: 1px;text-align: left;">
+                <div class="sieve-tit">数据自助导出</div>
+                <div class="sieve-cont mt5">剑鱼标讯提供全国招投标数据的自助导出功能,企业可指定关键词、发布时间、地区或行业等筛选条件,剑鱼标讯以EXCEL表格形式提供数据。</div>
+                <div class="sieve-tit mt10">通过分析招标数据,可以帮助你</div>
+                <div class="sieve-cont mt5">1、全面获取市场信息,紧跟市场趋势,提前布局;</div>
+                <div class="sieve-cont ">2、准确掌握行业客户、竞争对手、合作伙伴的招投标活动;</div>
+                <div class="sieve-cont mar-bot10">3、轻松挖掘潜在客户、合作伙伴、拓展市场空间。</div>
+              </div>
+          </div>
+         <div>
         <!-- dateChooseStart -->
         <div class="chooseTime">
             <ul>
@@ -239,50 +307,48 @@
            </div>
         </div>
         <!-- elseChooseEnd -->
-
-        <!-- btn -->
-        <div class="confirm">
-            <button class="saveData">确认</button>
-        </div>
-        <div class="resetOne">
-            <button class="reset">重置</button>
-            <button class="saveData">确认</button>
-        </div>
-        <div class="js_dialog match_way" id="match_way" style="display: none;">
-            <div class="weui-mask"></div>
-            <div class="box">
-                <div class="box_hd">
-                    <!-- <span></span> -->
-                    <h3>关键词匹配方式</h3>
-                    <span class="cancel">取消</span>
-                </div>
-                <div class="box_bd">
-                    <div class="weui-cells weui-cells_checkbox choose-form">
-                        <label class="weui-cell weui-check__label cont_label" for="cont_way">
-                            <div class="weui-cell__bd read">
-                                <p>按全文匹配</p>
-                            </div>
-                            <div class="weui-cell__hd">
-                                <input type="radio" class="weui-check" name="way" value="按全文匹配" id="cont_way" checked />
-                                <i class="weui-icon-checked"></i>
-                            </div>
-                        </label>
-                        <label class="weui-cell weui-check__label title_label" for="title_way">
-                            <div class="weui-cell__bd read">
-                                <p>按标题匹配</p>
-                            </div>
-                            <div class="weui-cell__hd">
-                                <input type="radio" class="weui-check" name="way" value="按标题匹配" id="title_way" />
-                                <i class="weui-icon-checked"></i>
-                            </div>
-                        </label>
-                    </div>
+    </div>
+   </div>
+    <!-- btn -->
+    <div class="confirm j-footer">
+        <button class="saveData">确认</button>
+    </div>
+    <div class="resetOne j-footer">
+        <button class="reset">重置</button>
+        <button class="saveData">确认</button>
+    </div>
+    <div class="js_dialog match_way" id="match_way" style="display: none;">
+        <div class="weui-mask"></div>
+        <div class="box">
+            <div class="box_hd">
+                <!-- <span></span> -->
+                <h3>关键词匹配方式</h3>
+                <span class="cancel">取消</span>
+            </div>
+            <div class="box_bd">
+                <div class="weui-cells weui-cells_checkbox choose-form">
+                    <label class="weui-cell weui-check__label cont_label" for="cont_way">
+                        <div class="weui-cell__bd read">
+                            <p>按全文匹配</p>
+                        </div>
+                        <div class="weui-cell__hd">
+                            <input type="radio" class="weui-check" name="way" value="按全文匹配" id="cont_way" checked />
+                            <i class="weui-icon-checked"></i>
+                        </div>
+                    </label>
+                    <label class="weui-cell weui-check__label title_label" for="title_way">
+                        <div class="weui-cell__bd read">
+                            <p>按标题匹配</p>
+                        </div>
+                        <div class="weui-cell__hd">
+                            <input type="radio" class="weui-check" name="way" value="按标题匹配" id="title_way" />
+                            <i class="weui-icon-checked"></i>
+                        </div>
+                    </label>
                 </div>
             </div>
         </div>
-
     </div>
-
 <script>
     initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
     $(function(){		
@@ -309,6 +375,18 @@
                 }
             });
         });
+        
+        $(".helpwhat").on("click",function(){
+          $(".btn_img").show();
+          $(".helpwhat").hide();
+          $(".cont").show();
+        })
+        
+        $(".btn_img").on("click",function(){
+          $(".btn_img").hide();
+          $(".helpwhat").show();
+          $(".cont").hide();
+        })
         /* 选择匹配方式*/
         $('input:radio[name="way"]').click(function() {
         	var checkValue = $('input:radio[name="way"]:checked').val();

+ 151 - 25
src/web/templates/weixin/wxinfocontent_rec.html

@@ -3,7 +3,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 <title>公告信息</title>
 <link href="{{Msg "seo" "cdn"}}/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="{{Msg "seo" "cdn"}}/css/wxcontentinfo.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/css/wxcontentinfo.css?v={{Msg "seo" "version"}}1" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/wxswordfish/style.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 {{include "/common/weixin.html"}}
@@ -475,7 +475,22 @@ pre {
     line-height: 0.40rem;
 	display: inline-block;
 }
-
+.join{
+  color:#fff;
+  background-color:#35B2C8;
+  margin-left:0.1rem;
+  border:none;
+  border-radius: 5px;
+  font-size: .25rem;
+  width: 1.35rem;
+  height: 0.5rem;
+  line-height: 0.5rem;
+  display: inline-block;
+  text-align: center;
+}
+.adv_tosieve{
+  display: inline-block;
+}
 </style>
 </head>
 <body>
@@ -669,7 +684,8 @@ pre {
 				{{end}}
 			</ul>
 		</div>
-		<div class="tab-ct">
+    <div class="lead-btn-nj" style="color:#2cb7ca;margin:15px 0;display:none;margin-top:20px;"><div class="adv_tosieve" style="font-size:.25rem;"></div><div class="join" onclick="adv_statistics(this)" adv_name="微信三级页引导按钮"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
+    <div class="tab-ct">
 			<div id="tab1" style="display:none;">
 				<div class="publicTitle">
 					基本信息
@@ -686,8 +702,9 @@ pre {
 					</ul>
 				</div>
 			</div>
-			<div class="explain" style="display:none;">*以上摘要信息由剑鱼标讯智能提取,如有错漏,欢迎纠错!</div>
-			<div id="tab2">
+			  <div class="explain" style="display:none;">*以上摘要信息由剑鱼标讯智能提取。</div>
+        <div class="lead-btn" style="color:#2cb7ca;margin:15px 0;display:none;margin-top: -40px;"><div class="adv_tosieve" style="font-size:.25rem;"></div><div class="join" onclick="adv_statistics(this)" adv_name="微信三级页引导按钮"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
+	    <div id="tab2">
 				<pre id="h_content">{{Html (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>")}}</pre>
 			</div>
 		</div>
@@ -854,10 +871,111 @@ var reccont = "";
 var forceShareFlag = {{.T.forceShareFlag}};
 var scan_source = getParameter("scan_source");
 var ispcforceshare = getParameter("ispcforceshare");
+
+var city_ = {{.T.obj.city}};
+var agency_ = {{.T.obj.agency}};
+var buyer_ = {{.T.obj.buyer}};
+var buyerperson_ = {{.T.obj.buyerperson}};
+var buyertel_ = {{.T.obj.buyertel}};
+var isbid =false; //是否是中标,需要显示所有
+//拟建项目广告
+var nj_adv=["批量导出拟建项目"]
+//招标公告广告
+var zb_adv=[ 
+  "更多项目联系人、电话批量导出",
+  "采购单位招标数据批量导出",
+  "全面展示行业项目的数据字段"
+]
+//中标公告广告
+var win_adv=[
+  "中标项目信息字段全面展示",
+  "更多中标项目、业主、联系人数据批量导出",
+  "中标企业数据字段定制化导出"
+]
+//任意类型广告
+var any_adv=[
+  "更多数据字段定制化导出",
+  "导出数据,分析市场",
+  "导出数据,分析竞争对手",
+  "导出数据,分析合作伙伴",
+  "导出数据,分析客户"
+]
+var count=0;
+if (area!=""&&area!=null){
+  count++
+}
+if (city_!=""&&city_!=null){
+  count++
+}
+if (agency_!=""&&agency_!=null){
+  count++
+}
+if (projectname!=""&&projectname!=null){
+  count++
+}
+if (buyer_!=""&&buyer_!=null){
+  count++
+}
+if (buyerperson_!=""&&buyerperson_!=null){
+  count++
+}
+if (buyertel_!=""&&buyertel_!=null){
+  count++
+}
+var adv_from=getinfotype(subtype);
+var adv=any_adv;
+if(adv_from=="中标公告"){
+  adv=adv.concat(win_adv);
+}else if(adv_from=="招标公告"){
+  adv=adv.concat(zb_adv);
+}else if(adv_from=="拟建项目"){
+  adv=adv.concat(nj_adv);
+}
+var x = Math.floor(Math.random()*adv.length)
+$(".adv_tosieve").text(adv[x])
+var btn_text="立即体验"
+if (adv[x]==any_adv[0]){
+  btn_text="立即查看";
+}
+$(".adv_tosieve-btn").text(btn_text)
+$(".join > a").attr("dataHref","/front/wx_dataExport/toSieve?adv_from="+getinfotype(subtype));
+
+function getinfotype(subtype){
+  var infotype=""
+  switch (subtype){
+		case "拟建":
+      infotype="拟建项目"
+			break;
+    case "招标": case "邀标": case "询价": case "竞谈": case "变更": case "竞价": case "单一": case "其他":
+      infotype="招标公告"
+			break;
+		case "中标": case "成交": case "废标": case "流标":
+      infotype="中标公告"
+			break;
+		default:
+    infotype="其他"
+			break;
+	}
+  return infotype
+}
+if({{.T.obj.subtype}}=="中标"||{{.T.obj.subtype}}=="成交"||{{.T.obj.subtype}}=="合同"){
+    var winner_ = {{.T.obj.winner}};
+    var bidamount_ = {{.T.obj.bidamount}};
+    if(winner_!=""&&winner_!=null){
+      count++
+    }
+    if(bidamount_!=""&&bidamount_!=null){
+      count++
+    }
+  isbid=true;
+}
 if({{.T.obj.subtype}}!="拟建"&&{{.T.obj.toptype}}!="拟建"&&{{.T.obj.subtype}}!="违规"){
-	$(".fatNav").show();
-	$("#tab1").show();
-	$(".explain").show();
+  if((count>=4 && !isbid)||(count>=5&&isbid)){
+  	$(".fatNav").show();
+  	$("#tab1").show();
+  	$(".explain").show();
+    $(".lead-btn").show();
+  }
 }
 //根据是否打开推送显示警告条
 var i_applystatus = {{.T.i_applystatus}};
@@ -886,7 +1004,7 @@ function recoveryAction(e){
 	var dtcontent = originalCon;
 	$("#fphl").removeClass("fphl");
 	//$(".rhtext").html('剑鱼标讯分析并<span class="fphl">高亮</span>了'+dataName+',是否正确?');
-	$("#ryhd").show().removeClass("recovery-head");
+	$("#ryhd").removeClass("recovery-head");
 	$(".rh-content").hide().siblings().show();
 	$(".rhrinput input").attr("placeholder","输入或选择正确的"+dataName+"并按“复制”");
 	$(".tab2").addClass("active").siblings().removeClass("active");
@@ -1018,7 +1136,7 @@ function rhwrong(){
 function tabCh(n){
 	$(".tab"+n).addClass("active").siblings().removeClass("active");
 	if(n=="1"){
-		$(window).scrollTop(0);
+		$(window).scrollTop($("#tab"+n).offset().top-inithgt);
 	}else{
 		$(window).scrollTop($("#tab"+n).offset().top-inithgt);
 	}
@@ -1046,13 +1164,14 @@ $(window).scroll(function(event){
 	if($("#h_content .fphl").length>0){
 		heightLight = $("#h_content .fphl").offset().top;
 	}
-	if(localStorage.getItem("ere-"+{{.T.obj._id}})==null){
+	/*if(localStorage.getItem("ere-"+{{.T.obj._id}})==null){
 		if(heightLight!=0&&heightLight>(scrollTop+inithgt)&&heightLight<(scrollTop+cHeight-80)){
 			$(".recovery-head").fadeIn();
 		}else{
 			$(".recovery-head").fadeOut();
 		}
 	}
+  */
 	if(scrollFlag){
 		m3 = document.documentElement.scrollTop || document.body.scrollTop;
 		scrollFlag = false;
@@ -1077,12 +1196,12 @@ $(window).scroll(function(event){
 function pscp(){
 	m2 = document.documentElement.scrollTop || document.body.scrollTop;
    	if(m2 == m1){
-		scrollFlag = true;
-		if($(".explain").offset().top<=(m2+cHeight-inithgt*2)){
-			$(".tab2").addClass("active").siblings().removeClass("active");
-		}else if($(".explain").offset().top>(m2+inithgt)){
-			$(".tab1").addClass("active").siblings().removeClass("active");
-		}
+  		scrollFlag = true;
+  		if($("#tab2").offset().top<=(m2+inithgt*2-30)){
+  			$(".tab2").addClass("active").siblings().removeClass("active");
+  		}else if($("#tab2").offset().top>(m2+inithgt-30)){
+  			$(".tab1").addClass("active").siblings().removeClass("active");
+  		}
   	}
 }
 if(!industry){
@@ -1212,7 +1331,7 @@ $(function(){
 		}
 		outhtml +='<li><p class="name">招标代理机构</p><p class="textcontent">'+reragency+'</p><a dataName="招标代理机构" dataCont="'+reragency+'" dataCode="agency" onClick="recoveryAction(this)">纠错</a></li>'
 		var rerprojectname = {{.T.obj.projectname}};
-		if(rerprojectname!=undefined||rerprojectname==null){
+		if(rerprojectname==undefined||rerprojectname==null){
 			rerprojectname=""
 		}
 		outhtml +='<li><p class="name">项目名称</p><p class="textcontent">'+rerprojectname+'</p><a dataName="项目名称" dataCont="'+rerprojectname+'" dataCode="projectname" onClick="recoveryAction(this)">纠错</a></li>'
@@ -1247,8 +1366,7 @@ $(function(){
 		}
 	$("#baseInfo ul").html(outhtml)
 	//中标信息
-	if({{.T.obj.subtype}}=="中标"||{{.T.obj.subtype}}=="成交"||{{.T.obj.subtype}}=="合同"){
-		$("#bidInfoTitle").show();
+	if(isbid){
 		var rerwinner = {{.T.obj.winner}};
       if(rerwinner==null){
         rerwinner=""
@@ -1257,9 +1375,12 @@ $(function(){
       if(rerbidamount==null){
         rerbidamount=""
       }
-		var bidInfohtml ='<li><p class="name">中标单位</p><p class="textcontent">'+rerwinner+'</p><a dataName="中标单位" dataCont="'+rerwinner+'" dataCode="winner" onClick="recoveryAction(this)">纠错</a></li>'
-		bidInfohtml +='<li class="bbm0"><p class="name">中标金额(元)</p><p class="textcontent">'+rerbidamount+'</p><a dataName="中标金额(元)" dataCont="'+rerbidamount+'" dataCode="bidamount" onClick="recoveryAction(this)">纠错</a></li>'
-		$("#bidInfo ul").html(bidInfohtml)
+    if(count>=5){
+		$("#bidInfoTitle").show();
+  		var bidInfohtml ='<li><p class="name">中标单位</p><p class="textcontent">'+rerwinner+'</p><a dataName="中标单位" dataCont="'+rerwinner+'" dataCode="winner" onClick="recoveryAction(this)">纠错</a></li>'
+  		bidInfohtml +='<li class="bbm0"><p class="name">中标金额(元)</p><p class="textcontent">'+rerbidamount+'</p><a dataName="中标金额(元)" dataCont="'+rerbidamount+'" dataCode="bidamount" onClick="recoveryAction(this)">纠错</a></li>'
+  		$("#bidInfo ul").html(bidInfohtml)
+    }
 	}
 	var rerwinnerorder = {{.T.obj.winnerorder}}//中标候选人
 	//分包信息
@@ -1377,6 +1498,7 @@ $(function(){
 		}else{
 			$(".rhrsub").css("opacity","");
 		}
+    $.get("/front/shorturl/replication");
     });
 	
 	//纠错输入框
@@ -1496,6 +1618,9 @@ $(function(){
 		sessionStorage.removeItem("rewardStatus");
 	}
 	
+  if({{.T.obj.subtype}}=="拟建"){
+      $(".lead-btn-nj").show();
+  }
 	{{if .T.obj.projectinfo.attachments}}
 	var attachments = {{.T.obj.projectinfo.attachments}}
 	var j = 0;
@@ -1531,6 +1656,7 @@ $(function(){
 	{{if .T.obj.infoformat}}
 	{{if eq .T.obj.infoformat 2}}
 	$(".prebuilt").removeClass("hidden");
+
 	$("#h_content").css("font-size","16px");
 	{{else}}
 	$(".abs>.original").removeClass("hidden");
@@ -1698,13 +1824,13 @@ $(function(){
 			if($("#h_content .fphl").length>0){
 				heightLight = $("#h_content .fphl").offset().top;
 			}
-			if(localStorage.getItem("ere-"+{{.T.obj._id}})==null){
+			/*if(localStorage.getItem("ere-"+{{.T.obj._id}})==null){
 				if(heightLight>m1&&heightLight<(m1+cHeight-80)&&fwtsname!=""){
 					$(".recovery-head").fadeIn();
 				}else{
 					$(".recovery-head").fadeOut();
 				}
-			}
+			}*/
 		},300)
 	}
 	//