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

src/jfw/front/dataMarket.go

@@ -24,6 +24,7 @@ func init() {
 func (this *DataMarket) Index() {
 	data := config.Middleground.Publicservice.List("", "", 1, 8)
 	this.T["list"] = data["list"]
+	this.T["includedInfo"] = GetIncludedInfo()
 	this.Render("/dataMarket/index.html")
 }
 

src/jfw/front/pcIndex.go

@@ -292,7 +292,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 	if at == "stype" && name == "NJ" {
 		return f.Redirect("/jylab/supsearch/proposedProject.html")
 	}
-	//userId := util.ObjToString(f.GetSession("userId"))
+	userId := util.ObjToString(f.GetSession("userId"))
 	var no = 5
 	var area = ""
 	var stype = ""
@@ -419,10 +419,10 @@ func (f *PcIndex) SearchResult(at, name string) error {
 		query1 += `],"should": [],"minimum_should_match": 0}}}`
 		//p353包含采购意向与拟建
 		//获取到昨天数据
-		//if stype == "" && userId == "" {
-		//	// stype = "招标预告,招标公告,招标结果,招标信用信息"
-		//	stype = "拟建,采购意向,招标,询价,竞谈,变更,单一,竞价,邀标,成交,中标,废标,流标,结果变更,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果"
-		//}
+		if stype == "" && userId == "" {
+			// stype = "招标预告,招标公告,招标结果,招标信用信息"
+			stype = "拟建,招标,询价,竞谈,变更,单一,竞价,邀标,成交,中标,废标,流标,结果变更,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果"
+		}
 
 		var datas *[]map[string]interface{}
 		if list == nil || len(list.([]interface{})) == 0 {
@@ -505,7 +505,7 @@ func getstypeMap() []map[string][]map[string]interface{} {
 		}
 	}
 	m2 := []map[string][]map[string]interface{}{} //结构整理 返给前端
-	stype_1reg := []string{"招标公告", "招标结果", "招标信用信息", "招标预告", "拟建项目", "采购意向"}
+	stype_1reg := []string{"招标公告", "招标结果", "招标信用信息", "招标预告", "拟建项目"}
 	hotlabstypSort := config.Seoconfig["hotlabstypSort"].([]interface{})
 	notice := util.ObjArrToStringArr(hotlabstypSort[0].([]interface{}))
 	result := util.ObjArrToStringArr(hotlabstypSort[1].([]interface{}))

src/jfw/front/shorturl.go

@@ -388,7 +388,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 			s.T["canRead"] = canRead
 		}
 		if len(obj) > 0 {
-			if canRead || (util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向") {
+			if canRead || util.ObjToString(obj["subtype"]) == "拟建" {
 				FieldProcessing(obj, ssOpenid, industry, id, from_userid, userId, stype, true)
 				//免费用户正文手机号替换
 				if obj["site"] == "剑鱼信息发布平台" && !isMember {
@@ -432,7 +432,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 					}
 				}
 				if !canRead { //登录拟建&采购不展示遮罩 只打码
-					canRead = true
+					//canRead = true
 					//打码显示引导
 					otherFilter(obj, userId != "")
 				}
@@ -520,7 +520,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 				}
 				s.T["canRead"] = canRead
 			}
-			if node || (util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向") {
+			if node || util.ObjToString(obj["subtype"]) == "拟建" {
 				if len(po) > 0 {
 					s.T["projectOther"] = po
 				}
@@ -585,7 +585,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 				}
 				if !node {
 					//打码遮罩
-					s.T["canRead"] = true
+					//s.T["canRead"] = true
 					otherFilter(obj, userId != "")
 				}
 			} else {
@@ -1184,7 +1184,7 @@ func (s *Short) NologinCommon(userId, stype, id, sid string) error {
 			obj["projectnameTitle"] = obj["projectname"]
 			obj["projectcodeTitle"] = obj["projectcode"]
 			log.Println(time.Now().UnixNano())
-			if obj["subtype"] == "拟建" || obj["subtype"] == "采购意向" {
+			if obj["subtype"] == "拟建" {
 				otherFilter(obj, false)
 			} else {
 				obj = Filter(obj)

src/jfw/front/supsearch.go

@@ -344,14 +344,14 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 	userId, _ := p.GetSession("userId").(string)
 	phone, _ := p.GetSession("phone").(string)
 	//p353包含采购意向与拟建
-	//noLoginBl := false
-	//if userId == "" {
-	//	//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
-	//	if subtype == "" {
-	//		subtype = "招标预告,招标公告,招标结果,招标信用信息"
-	//		noLoginBl = true
-	//	}
-	//}
+	noLoginBl := false
+	if userId == "" {
+		//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
+		if subtype == "" {
+			subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
+			noLoginBl = true
+		}
+	}
 	//高级筛选 仅vip用户可查询
 	var (
 		hasBuyerTel, hasWinnerTel = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
@@ -468,9 +468,9 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 			list, count, total = so.GetBidSearchListByCache()
 		}
 	}
-	//if noLoginBl {
-	//	subtype = ""
-	//}
+	if noLoginBl {
+		subtype = ""
+	}
 	log.Println("userId:+++", userId)
 	if userId == "" {
 		for _, v := range list {
@@ -596,7 +596,7 @@ func Newbids(p, userId string) []map[string]interface{} {
 			}
 			//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
 			if subtype == "" {
-				subtype = "招标预告,招标公告,招标结果,招标信用信息"
+				subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
 			}
 		}
 		//查询置顶信息

src/jfw/front/swordfish.go

@@ -278,7 +278,7 @@ func (m *Front) PcAjaxReq_Bak() {
 	if userId == "" {
 		//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
 		if subtype == "" {
-			subtype = "招标预告,招标公告,招标结果,招标信用信息"
+			subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
 		}
 	}
 	m.SetSession("selectType", selectType)

src/jfw/front/tags.go

@@ -435,7 +435,7 @@ func (this *Tags) GetNewBidInfo() (list []map[string]interface{}) {
 	if l, ok := redis.Get("other", rediskey).([]interface{}); ok && l != nil && len(l) > 0 {
 		list = qu.ObjArrToMapArr(l)
 	} else {
-		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", "", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 50, "")
+		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", "拟建,招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 50, "")
 		if lists != nil && len(*lists) > 10 {
 			*lists = (*lists)[0:10]
 			for _, v := range *lists {
@@ -466,11 +466,12 @@ func (this *Tags) GetStype(href string) (list []map[string]interface{}) {
 	} else {
 		m := []map[string]interface{}{}
 		var data []map[string]interface{}
-		newData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name = "拟建项目" or name = "采购意向" order by id`)
-		if newData != nil && len(*newData) > 0 {
-			data = append(data, *newData...)
-		}
-		oldData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where  name != "拟建项目" and name != "采购意向" order by id`)
+		//newData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name = "拟建项目" or name = "采购意向" order by id`)
+		//if newData != nil && len(*newData) > 0 {
+		//	data = append(data, *newData...)
+		//}
+		//oldData := public.BaseMysql.SelectBySql(`-- select id,name,pid from seo_words.seo_stype where  name != "拟建项目" and name != "采购意向" order by id`)
+		oldData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype order by id`)
 		if oldData != nil && len(*oldData) > 0 {
 			data = append(data, *oldData...)
 		}
@@ -737,8 +738,8 @@ func (this *Tags) GetInsturyKeywords(idstr string) (name, class_1, class_2 strin
 // p353包含采购意向与拟建
 func (this *Tags) GetInfoType(idstr string) (string, string) {
 	if idstr == "all" {
-		//return "招标,邀标,询价,竞谈,单一,竞价,变更,中标,成交,废标,流标,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果", ""
-		return "", ""
+		return "拟建,招标,邀标,询价,竞谈,单一,竞价,变更,中标,成交,废标,流标,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果", ""
+		//return "", ""
 	}
 	id, _ := strconv.Atoi(idstr)
 	data := public.BaseMysql.SelectBySql(`select id,name from seo_words.seo_stype where id =?`, id)

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

@@ -188,7 +188,7 @@ func (s *Short) Article(stype, id string) error {
 			}
 			s.T["canRead"] = canRead
 		}
-		if canRead || userId == "" || (util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向") {
+		if canRead || userId == "" || util.ObjToString(obj["subtype"]) == "拟建" {
 			if belongUserId != "" && belongUserId != userId && util.ObjToString(obj["subtype"]) != "拟建" && userId != "" { //分享开打的
 				article_id := encrypt.CommonDecodeArticle(stype, id)[0]
 				key := fmt.Sprintf("integral_article_%s_%s_%s", article_id, belongUserId, userId)
@@ -265,9 +265,9 @@ func (s *Short) Article(stype, id string) error {
 					obj["detail"] = strings.ReplaceAll(strings.ReplaceAll(detail3, `<span class="freeView">点击查看</span><span class="freeView">点击查看</span>`, `<span class="freeView">点击查看</span>`), "*********", code)
 				}
 			}
-			if !canRead && (util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向") { //登录拟建&采购不展示遮罩 只打码
+			if !canRead && util.ObjToString(obj["subtype"]) == "拟建" { //登录拟建&采购不展示遮罩 只打码
 				otherFilter(obj, userId != "")
-				s.T["canRead"] = true
+				//s.T["canRead"] = true
 			} else if userId == "" {
 				obj = Filter(obj)
 				obj["description"] = fmt.Sprintf("%s，%s。", obj["title"], baseInfo(obj))

src/jfw/modules/app/src/go.mod

@@ -3,9 +3,9 @@ module jy/src/jfw/modules/app/src
 go 1.18
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20230717034208-cbc04d86e255
+	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230717054133-628d34c45f63
+	app.yhyue.com/moapp/jypkg v0.0.0-20230718012332-cd68eb58e825
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.3.1

src/jfw/modules/app/src/go.sum

@@ -5,12 +5,12 @@ app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547/go.mod h1:J
 app.yhyue.com/moapp/jyPoints v1.1.1/go.mod h1:SvP8p5L3jGrejHiH2LXfgCg/NPlFiKBC5Yd0gsI12FU=
 app.yhyue.com/moapp/jybase v0.0.0-20220427020729-974c1a148186/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jybase v0.0.0-20230717034208-cbc04d86e255 h1:Rpmx9yegBP4Fadn5nt5f4vKO6qm1QVEHFFffwYC5WDk=
-app.yhyue.com/moapp/jybase v0.0.0-20230717034208-cbc04d86e255/go.mod h1:D40Ae0rQilH8Hc5o2Vtt04Tjh/DNEFpcS3/WkJMPJb8=
+app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b h1:Wtytm2QqQWtBV+see7t8ZTxnsCJaz5PGRqJXzwR6f7s=
+app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b/go.mod h1:D40Ae0rQilH8Hc5o2Vtt04Tjh/DNEFpcS3/WkJMPJb8=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v0.0.0-20230717054133-628d34c45f63 h1:5yUOGdOqlPhXhmL/6cc2iVLge3jS4QTHsS2ZPQumo+Q=
-app.yhyue.com/moapp/jypkg v0.0.0-20230717054133-628d34c45f63/go.mod h1:IhLQNbNHvSqEm8ZbkFHog5df3Dyng98mvYgT2lvLqqI=
+app.yhyue.com/moapp/jypkg v0.0.0-20230718012332-cd68eb58e825 h1:C5sychvx6GFOlEx/KcOOqkD1FLDa/FDhMlRwIYTFBNE=
+app.yhyue.com/moapp/jypkg v0.0.0-20230718012332-cd68eb58e825/go.mod h1:xEZ6Ghkt9KcU7zBBqt6t03AkZjiQz1acyFL2WEIFGJs=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=

src/jfw/modules/app/src/web/staticres/jyapp/css/wxinfocontent.css

@@ -297,6 +297,7 @@ body .loading_ p span {
 .toolbar .tool_bottom {
     display: flex;
     margin-top: 13px;
+    margin-bottom:16px;
     align-items: center;
     justify-content: space-between;
 }

src/jfw/modules/app/src/web/templates/big-member/page_client_follow_detail.html

@@ -20,6 +20,8 @@
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_pro_follow_detail.css?v={{Msg "seo" "version"}}'/>
     <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/forward-share/css/forward.css?v={{Msg "seo" "version"}}'/>
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/bidstatus-update/css/bid-status-update.css?v={{Msg "seo" "version"}}'></link>
     <!--E-当前页面的css资源-->
 </head>
 <body>
@@ -370,6 +372,9 @@
                 <van-button class="c-btns" @click="sendMail">确认</van-button>
             </div>
         </van-dialog>
+        <van-popup class="j-container" :style="popupHeight" v-model="showBidStatus" round position="bottom">
+          <bid-status-node @cancel-update="cancelUpdate" @save-success="saveSuccess" :project-cell-info="projectCellInfo" @set-height="setHeight"></bid-status-node>
+        </van-popup>
     </div>
     <!--S-Vue-->
 </div>
@@ -389,6 +394,7 @@
     var localEmail =  {{.T.email}} || sessionStorage.getItem('reportEmail') || ''
 </script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/forward-share/js/forward.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/bidstatus-update/js/bid-status-update.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/big-member/js/page_client_follow_detail.js?v={{Msg "seo" "version"}}'></script>
 
 </body>

src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_detail.html

@@ -20,6 +20,8 @@
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_pro_follow_detail.css?v={{Msg "seo" "version"}}'/>
     <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/forward-share/css/forward.css?v={{Msg "seo" "version"}}'/>
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/bidstatus-update/css/bid-status-update.css?v={{Msg "seo" "version"}}'></link>
     <!--E-当前页面的css资源-->
 </head>
 <body>
@@ -369,6 +371,9 @@
                 <van-button class="c-btns" @click="sendMail">确认</van-button>
             </div>
         </van-dialog>
+        <van-popup class="j-container" :style="popupHeight" v-model="showBidStatus" round position="bottom">
+          <bid-status-node @cancel-update="cancelUpdate" @save-success="saveSuccess" :project-cell-info="projectCellInfo" @set-height="setHeight"></bid-status-node>
+        </van-popup>
     </div>
     <!--S-Vue-->
 </div>
@@ -384,6 +389,7 @@
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/forward-share/js/forward.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/bidstatus-update/js/bid-status-update.js?v={{Msg "seo" "version"}}'></script>
 <!-- <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
 <script> new VConsole(); </script> -->
 <script>
@@ -466,7 +472,8 @@
         delimiters: ['${', '}'],
         el: '#v-pro',
         components: {
-          forwardshare: vmForward
+          forwardshare: vmForward,
+          bidStatusNode: bidStatusNode
         },
         data: {
             powerInfo: {
@@ -552,7 +559,10 @@
               status: 0
             },
             rownum: 1,
-            proParams: {}
+            proParams: {},
+            showBidStatus: false,
+            popupHeight: 'height: 8.8rem',
+            projectCellInfo: {}
         },
         created() {
             this.isOpening()
@@ -637,6 +647,23 @@
             // params.channelPerson = legal_person || ''
           },
 
+          setHeight: function (data) {
+            if(data === 2) {
+              this.popupHeight = 'height: 10.92rem'
+            } else {
+              this.popupHeight = 'height: 8.8rem'
+            }
+          },
+          // 更新投标状态成功
+          saveSuccess: function () {
+            this.showBidStatus = false
+            this.getBidContent()
+          },
+          // 取消更新投标状态
+          cancelUpdate: function () {
+            this.showBidStatus = false
+          },
+
           /**
            * 获取模糊渠道名称列表
            * @param str
@@ -963,6 +990,7 @@
               }
             }
             const _this = this
+            _this.projectCellInfo.sid = this.sid
             const type = weicanbiao ? 'in' : 'out';
             const url = '/jyapi/jybx/core/participate/'+ type + '/info'
             const params = {
@@ -983,7 +1011,8 @@
                     _this.getCanBiaoInfo()
                     if (type === 'in') {
                       _this.getHaveActionHistory()
-                      _this.$toast('已参标，请前往我的参标项目列表查看')
+                      _this.showBidStatus = true
+                      // _this.$toast('已参标，请前往我的参标项目列表查看')
                     }
                     // 更新收藏列表
                     const updateCBStatus = {

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

@@ -463,10 +463,10 @@
                             // }
 
                             // 金额标签处理
-                            if(typeof(moneyTag.budget) != "undefined" && moneyTag.budget != null && moneyTag.budget != "" && userId){
+                            if(typeof(moneyTag.budget) != "undefined" && moneyTag.budget != null && moneyTag.budget != "" && userId && isNaN(moneyTag.budget) == false){
                                 moneyTag.content = MoneyUnit.test(moneyTag.budget);
                             }
-                            if(typeof(moneyTag.bidamount) != "undefined" && moneyTag.bidamount != null && moneyTag.bidamount != ""  && userId){
+                            if(typeof(moneyTag.bidamount) != "undefined" && moneyTag.bidamount != null && moneyTag.bidamount != ""  && userId &&  isNaN(moneyTag.bidamount) == false){
                                 moneyTag.content = MoneyUnit.test(moneyTag.bidamount);
                             }
                             if(moneyTag.content){
@@ -569,10 +569,10 @@
                                 budget: {{.T.obj.budget}}
                             }
                             // 金额标签处理
-                            if(typeof(moneyTag.budget) != "undefined" && moneyTag.budget != null && moneyTag.budget != "" && userId){
+                            if(typeof(moneyTag.budget) != "undefined" && moneyTag.budget != null && moneyTag.budget != "" && userId  && isNaN(moneyTag.budget) == false){
                                 moneyTag.content = MoneyUnit.test(moneyTag.budget);
                             }
-                            if(typeof(moneyTag.bidamount) != "undefined" && moneyTag.bidamount != null && moneyTag.bidamount != "" && userId){
+                            if(typeof(moneyTag.bidamount) != "undefined" && moneyTag.bidamount != null && moneyTag.bidamount != "" && userId  && isNaN(moneyTag.bidamount) == false){
                                 moneyTag.content = MoneyUnit.test(moneyTag.bidamount);
                             }
                             if(moneyTag.content){
@@ -1445,13 +1445,9 @@
     }
   // 是否展示详情上方的广告位
   function showTopAd () {
-    if(window.isFree || !userId) {
+    if((!canRead || !userId) && subtype == '拟建') {
       $('.big-ad-img').show()
-      if (subtype == '采购意向') {
-        $('.cgyx-ad').show()
-      } else if(subtype == '拟建') {
-        $('.nj-ad').show()
-      }
+      $('.nj-ad').show()
     }
   }
     function appAutoLogin(){

src/web/staticres/common-module/bidstatus-update/js/bid-status-update.js

@@ -2,8 +2,8 @@ var bidTemp = `
   <div class='bid_component j-container'>
     <div class="popupTime-header j-header">
         <div class="header-title">
-          <span>已参标，请更新投标状态</span>
-          <span class="label-tip">可前往“我的参标项目”查看已参标项目</span>
+          <span style="line-height: .56rem">已参标，请更新投标状态</span>
+          <span style="line-height: .36rem;margin-top: .04rem" class="label-tip">可前往“我的参标项目”查看已参标项目</span>
         </div>
         <div class="header-close" @click="$emit('cancel-update')">
             <span class="j-icon base-icon icon-delete-gray"></span>
@@ -346,7 +346,7 @@ var bidStatusNode = {
       if (utils.$envs.inApp || utils.$envs.inH5) {
         location.href = '/jyapp/big/page/analysis_result'
       } else {
-        location.href = '/big/wx/page/analysis_search'
+        location.href = '/big/wx/page/analysis_search?source=wx_analysis_ProjectDetails'
       }
     },
     doQueryAccEntName (str) {
@@ -384,6 +384,7 @@ var bidStatusNode = {
         winner: '',
         sid: ''
       }
+      this.showChannel = false
     },
     saveStatus: function (str) {
       switch (str) {

src/web/staticres/common-module/big-member/js/client_portrayal.js

@@ -1364,6 +1364,7 @@ var vNode = {
           var normal =['行业','采购规模占比','采购规模', '采购项目数量','平均节支率'];
           var newArr = that.arrTrans(5,arr);
           newArr.unshift(normal)
+          chartOptions.deformPieChart.roseType = false;
           chartOptions.deformPieChart.dataset.source = newArr;
           chartOptions.deformPieChart.tooltip.formatter = function(params){
               var tip = '';

src/web/staticres/common-module/big-member/js/page_client_follow_detail.js

@@ -78,7 +78,8 @@ var vNode = {
     delimiters: ['${', '}'],
     el: '#v-pro',
     components: {
-      forwardshare: vmForward
+      forwardshare: vmForward,
+      bidStatusNode: bidStatusNode
     },
     data: {
         from: '',
@@ -165,7 +166,10 @@ var vNode = {
           status: 0
         },
         rownum: 1,
-        proParams: {}
+        proParams: {},
+        showBidStatus: false,
+        popupHeight: 'height: 8.8rem',
+        projectCellInfo: {}
     },
     computed: {
         bmdetail: function () {
@@ -247,6 +251,24 @@ var vNode = {
             // params.channelPhone = company_phone || ''
             // params.channelPerson = legal_person || ''
           },
+
+          setHeight: function (data) {
+            if(data === 2) {
+              this.popupHeight = 'height: 10.92rem'
+            } else {
+              this.popupHeight = 'height: 8.8rem'
+            }
+          },
+          // 更新投标状态成功
+          saveSuccess: function () {
+            this.showBidStatus = false
+            this.getBidContent()
+          },
+          // 取消更新投标状态
+          cancelUpdate: function () {
+            this.showBidStatus = false
+          },
+
           /**
            * 获取模糊渠道名称列表
            * @param str
@@ -583,6 +605,7 @@ var vNode = {
           }
         }
         const _this = this
+        _this.projectCellInfo.sid = this.sid
         const type = weicanbiao ? 'in' : 'out';
         const url = '/jyapi/jybx/core/participate/'+ type + '/info'
         const params = {
@@ -603,7 +626,8 @@ var vNode = {
                 _this.getCanBiaoInfo()
                 if (type === 'in') {
                   _this.getHaveActionHistory()
-                  _this.$toast('已参标，请前往我的参标项目列表查看')
+                  _this.showBidStatus = true
+                  // _this.$toast('已参标，请前往我的参标项目列表查看')
                 }
                 // 更新收藏列表
                 const updateCBStatus = {

src/web/staticres/dataSmt/css/index.css

@@ -237,7 +237,7 @@ a:focus{
   font-size: 16px;
   line-height: 24px;
   overflow: hidden;
-  max-width: 210px;
+  max-width: 290px;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
@@ -276,13 +276,14 @@ a:focus{
 
 .data-export .export-case{
   width: 100%;
-  height: 480px;
+  padding: 42px 0 58px;
+  /* height: 480px; */
   background: #fff;
   border-radius: 16px;
   box-shadow: 0 4px 24px 0px rgba(2, 52, 128, 0.1); 
 }
 .data-export .export-case .case-title{
-  padding: 28px 0 32px;
+  padding: 0 0 32px;
   color: #1D1D1D;
   font-size: 20px;
   line-height: 32px;
@@ -292,25 +293,30 @@ a:focus{
   display: flex;
   flex-wrap: wrap;
   align-items: center;
+  padding-left: 14px;
 }
 .data-export .case-container .case-item{
-  flex: 1;
-  display: flex;
-  padding: 32px 32px 28px;
-  flex-direction: column;
-  align-items: center;
-  border-right: 1px solid #ECECEC;
-  border-bottom: 1px solid #ECECEC;
+  flex-shrink: 0;
+  width: 130px;
+  height: 100px;
+  margin-right: 14px;
+  overflow: hidden;
 }
-.data-export .case-container .case-item:nth-child(n+5) {
+.data-export .case-container .case-item:hover{
+  background: #FFFFFF;
+  box-shadow: 0px 0px 24px rgba(0, 0, 0, 0.16);
+  border-radius: 8px;
+  z-index: 2;
+}
+/* .data-export .case-container .case-item:nth-child(n+5) {
   border-bottom: 0;
 }
 .data-export .case-container .case-item:nth-child(4n) {
   border-right: 0;
-}
+} */
 .data-export .case-item > img{
-  width: 180px;
-  height: 50px;
+  width: 100%;
+  height: 100%;
 }
 .data-export .case-item > p{
   margin-top: 8px;
@@ -318,10 +324,24 @@ a:focus{
   line-height: 24px;
   color: #1D1D1D;
 }
+.data-export .case-detail-btn{
+  display: block;
+  width: 240px;
+  height: 46px;
+  margin: 48px auto 0;
+  background: linear-gradient(to right,#2ABED1, #3687FF);
+  border-radius: 6px;
+  font-size: 16px;
+  color: #ffffff;
+  cursor: pointer;
+  line-height: 46px;
+  text-align: center;
+}
 
 .page--datamarket-index .data-scene{
   width: 100%;
   height: 554px;
+  margin-top: 58px;
   background: url(/dataSmt/images/data-application-bg.png) no-repeat center center;
   background-size: cover;
 }

src/web/templates/big-member/wx/page_client_follow_detail.html

@@ -12,6 +12,8 @@
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/common-module/forward-share/css/forward.css?v={{Msg "seo" "version"}}'/>
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/big-member/css/page_pro_follow_detail.css?v={{Msg "seo" "version"}}'/>
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/bidstatus-update/css/bid-status-update.css?v={{Msg "seo" "version"}}'></link>
 </head>
 <body>
 <div class="j-container">
@@ -362,6 +364,9 @@
                 <van-button class="c-btns" @click="sendMail">确认</van-button>
             </div>
         </van-dialog>
+        <van-popup class="j-container" :style="popupHeight" v-model="showBidStatus" round position="bottom">
+          <bid-status-node @cancel-update="cancelUpdate" @save-success="saveSuccess" :project-cell-info="projectCellInfo" @set-height="setHeight"></bid-status-node>
+        </van-popup>
     </div>
 </div>
 
@@ -375,6 +380,7 @@
     var localEmail =  {{.T.email}} || sessionStorage.getItem('reportEmail') || ''
 </script>
 <script src='{{Msg "seo" "cdn"}}/common-module/forward-share/js/forward.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/bidstatus-update/js/bid-status-update.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/big-member/js/page_client_follow_detail.js?v={{Msg "seo" "version"}}'></script>
 </body>
 </html>

src/web/templates/big-member/wx/page_pro_follow_detail.html

@@ -17,8 +17,9 @@
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/common-module/forward-share/css/forward.css?v={{Msg "seo" "version"}}'/>
-    <link rel="stylesheet"
-          href='{{Msg "seo" "cdn"}}/big-member/css/page_pro_follow_detail.css?v={{Msg "seo" "version"}}'/>
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/big-member/css/page_pro_follow_detail.css?v={{Msg "seo" "version"}}'/>
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/bidstatus-update/css/bid-status-update.css?v={{Msg "seo" "version"}}'></link>
     <!--E-当前页面的css资源-->
 </head>
 <body>
@@ -367,6 +368,9 @@
                 <van-button class="c-btns" @click="sendMail">确认</van-button>
             </div>
         </van-dialog>
+        <van-popup class="j-container" :style="popupHeight" v-model="showBidStatus" round position="bottom">
+          <bid-status-node @cancel-update="cancelUpdate" @save-success="saveSuccess" :project-cell-info="projectCellInfo" @set-height="setHeight"></bid-status-node>
+        </van-popup>
     </div>
     <!--S-Vue-->
 </div>
@@ -382,6 +386,7 @@
 <script src='{{Msg "seo" "cdn"}}/common-module/forward-share/js/forward.js?v={{Msg "seo" "version"}}'></script>
 <script src='/common-module/keep-tags/keep-ent-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/bidstatus-update/js/bid-status-update.js?v={{Msg "seo" "version"}}'></script>
 
 <script>
     var MoneyUnit = {
@@ -463,7 +468,8 @@
         delimiters: ['${', '}'],
         el: '#v-pro',
         components: {
-          forwardshare: vmForward
+          forwardshare: vmForward,
+          bidStatusNode: bidStatusNode
         },
         data: {
             powerInfo: {
@@ -549,7 +555,10 @@
               status: 0
             },
             rownum: 1,
-            proParams: {}
+            proParams: {},
+            showBidStatus: false,
+            popupHeight: 'height: 8.8rem',
+            projectCellInfo: {}
         },
         created() {
             this.isOpening()
@@ -648,6 +657,23 @@
             // params.channelPerson = legal_person || ''
           },
 
+          setHeight: function (data) {
+            if(data === 2) {
+              this.popupHeight = 'height: 10.92rem'
+            } else {
+              this.popupHeight = 'height: 8.8rem'
+            }
+          },
+          // 更新投标状态成功
+          saveSuccess: function () {
+            this.showBidStatus = false
+            this.getBidContent()
+          },
+          // 取消更新投标状态
+          cancelUpdate: function () {
+            this.showBidStatus = false
+          },
+
           /**
            * 获取模糊渠道名称列表
            * @param str
@@ -980,6 +1006,7 @@
               }
             }
             const _this = this
+            _this.projectCellInfo.sid = this.sid
             const type = weicanbiao ? 'in' : 'out';
             const url = '/jyapi/jybx/core/participate/'+ type + '/info'
             const params = {
@@ -1000,7 +1027,8 @@
                     _this.getCanBiaoInfo()
                     if (type === 'in') {
                       _this.getHaveActionHistory()
-                      _this.$toast('已参标，请前往我的参标项目列表查看')
+                      _this.showBidStatus = true
+                      // _this.$toast('已参标，请前往我的参标项目列表查看')
                     }
                     // 更新收藏列表
                     const updateCBStatus = {

src/web/templates/dataMarket/index.html

@@ -84,7 +84,7 @@
       </ul>
       <ul class="download-info-container">
         <li class="item-info">
-          <h3><strong>1.5亿+</strong> 招标数据</h3>
+          <h3><strong>{{.T.includedInfo.bid}}{{.T.includedInfo.bidUnit}}+</strong> 招标数据</h3>
           <p>寻找可跟进项目</p>
         </li>
         <li class="item-info">
@@ -184,9 +184,26 @@
         </p>
       </div>
       <div class="export-case CfadeInUp">
-        <div class="case-title">500+企业数据定制案例</div>
+        <div class="case-title">剑鱼标讯，已服务多家行业领军企业</div>
         <ul class="case-container">
-          <li class="case-item">
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/197-2.png' alt="华为"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/205.png' alt="科大讯飞"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/212.png' alt="中通服"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/203-2.png' alt="深信服"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/dataSmt/images/dell.png' alt="戴尔"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/dataSmt/images/lianxiang.png' alt="联想"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/202-1.png' alt="移动"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/dataSmt/images/liantong.png' alt="联通"></li>
+
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/204-2.png' alt="电信"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/dataSmt/images/zgdz.png' alt="中国电子"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/197.png' alt="海康威视"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/204.png' alt="瀚和软件"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/202.png' alt="浙大新宇"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/200-2.png' alt="光大银行"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/202-2.png' alt="民生银行"></li>
+          <li class="case-item boundary"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/212-1.png' alt=""></li>
+          <!-- <li class="case-item">
             <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-langchao.png' alt="浪潮软件科技">
             <p>浪潮软件科技</p>
             <div id="consult-lc" class="btn-light" onClick="needSubmitHandle('pc_data_custom_data', '浪潮软件科技')">立即咨询
@@ -231,8 +248,9 @@
             <p>中国联通</p>
             <div id="consult-zglt" class="btn-light" onClick="needSubmitHandle('pc_data_custom_data', '中国联通')">立即咨询
             </div>
-          </li>
+          </li> -->
         </ul>
+        <div id="case-detail-btn" class="btn-light case-detail-btn" onClick="needSubmitHandle('pc_data_custom_data')">了解详情</div>
       </div>
     </div>
   </div>

src/web/templates/pc/biddetail_rec.html

@@ -1611,18 +1611,13 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
       var pathname = location.pathname
       var entService = pathname.indexOf('entservice') !== -1
       var advancedProject = goTemplateData.params.obj.subtype == '采购意向' || goTemplateData.params.obj.subtype == '拟建'
+      // 是否展示真实内容(不打码，无遮罩)
       var canRead = location.href.indexOf('mailprivate') > -1 || {{.T.canRead}} || entService
       // 免费用户每日查看三次
       checkunPreBuildCanRead()
       // 非拟建采购意向 是否展示遮罩
       function checkunPreBuildCanRead () {
         var subType = goTemplateData.params.obj.subtype
-        if (subType == '采购意向') {
-          $('.caigouyixiang-guide').removeClass('hidden')
-        }
-        if(subType == "拟建") {
-          $('.nijian-guide').removeClass('hidden')
-        }
         if(!advancedProject && !canRead) {
           $('#tip-title').text('免费查看更多公告')
           $(".tip-box .tip-text").eq(0).text('请完善个人信息，获取更多免费查看公告权限')
@@ -1657,25 +1652,28 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
           $(".tip-box .tip-text").eq(0).text('提前1-3个月获取项目信息，及早介入准备更充分')
           $(".tip-box .tip-text").eq(1).text('')
           $(".detail-nj-btn").text("点击进入")
-          $('.caigouyixiang-guide').removeClass('hidden')
+          // $('.caigouyixiang-guide').removeClass('hidden')
         }
         if(subType == "拟建") {
           $('#tip-title').text('超前项目抢先知，中标更容易')
           $(".tip-box .tip-text").eq(0).text('提前3-12个月获取审批中的新项目，超前项目抢先介入，商机提前掌控。')
           $(".tip-box .tip-text").eq(1).text('')
           $(".detail-nj-btn").text("点击进入")
-          $('.nijian-guide').removeClass('hidden')
         }
 
         checkunPreBuildCanRead()
         if (!canRead && !privatedata){
-          $(".com-prebuilt").removeClass("hidden");
-          $(".com-prebuilt").css('height', '408px')
-          $('.original-text').hide()
-          $(".mask-zz").removeClass("hidden");
-          $(".tabfat").remove()
-          $(".recoveryfat").remove()
-          $("#attach-list").remove()
+          if (subType === '拟建') {
+            $('.nijian-guide').removeClass('hidden')
+          } else {
+            $(".com-prebuilt").removeClass("hidden");
+            $(".com-prebuilt").css('height', '408px')
+            $('.original-text').hide()
+            $(".mask-zz").removeClass("hidden");
+            $(".tabfat").remove()
+            $(".recoveryfat").remove()
+            $("#attach-list").remove()
+          }
         } else {
           getFileData()
           $(".com-prebuilt").css('height', 'unset')

src/web/templates/pc/classifylist.html

@@ -643,10 +643,10 @@ function priceCss(){
 					<font class="parent-node infoFist">拟建项目</font>
 					<font data-value="拟建" class="hidden">拟建</font>
 					<a id="whole"><img class="q-mark" id="q-mark"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
-					<i class="diver"></i>
-					<font class="parent-node">采购意向</font>
+					<i class="diver nologin-hide"></i>
+					<font class="parent-node nologin-hide">采购意向</font>
 					<font data-value="采购意向" class="hidden">采购意向</font>
-					<a id="whole"><img class="q-mark-buyer" id="q-mark-buyer"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
+					<a id="whole"><img class="q-mark-buyer nologin-hide" id="q-mark-buyer"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
 					<i class="diver"></i>
 					<font class="parent-node">招标预告</font>
 					<font data-value="预告">预告</font>

src/web/templates/pc/supsearch.html

@@ -1050,10 +1050,10 @@
               <font v-show="showCQ" class="parent-node">拟建项目</font>
               <font v-show="showCQ" data-value="拟建" class="hidden">拟建</font>
               <a v-show="showCQ" id="whole"><img class="q-mark" id="q-mark"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
-              <i v-show="showCQ" class="diver"></i>
-              <font v-show="showCQ" class="parent-node">采购意向</font>
+              <i v-show="showCQ" class="diver nologin-hide"></i>
+              <font v-show="showCQ" class="parent-node nologin-hide">采购意向</font>
               <font v-show="showCQ" data-value="采购意向" class="hidden">采购意向</font>
-              <a v-show="showCQ" id="whole"><img class="q-mark-buyer" id="q-mark-buyer"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
+              <a v-show="showCQ" id="whole"><img class="q-mark-buyer nologin-hide" id="q-mark-buyer"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
               <i v-show="hideCQ" class="diver"></i>
               <font v-show="hideCQ" class="parent-node">招标预告</font>
               <font v-show="hideCQ" data-value="预告">预告</font>
@@ -1682,7 +1682,6 @@
         var goHref_ = location.origin + '/jylab/supsearch/index.html'
         window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref_ + '?' + formNode_.serialize()))
       }
-
     }
     // 排除词
     $(".not-key-group input").on('focus', function () {

src/web/templates/weixin/wxinfocontent_rec.html

@@ -25,6 +25,7 @@
 <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/forward-share/js/forward.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}'></script>
 <style type="text/css">
 html > body {
   background: #fff;
@@ -1000,10 +1001,10 @@ body .loading_ p span {
 					budget: {{.T.obj.budget}}
 				}
 				// 金额标签处理
-				if(typeof(moneyTag.budget) != "undefined" && moneyTag.budget != null && moneyTag.budget != ""){
+				if(typeof(moneyTag.budget) != "undefined" && moneyTag.budget != null && moneyTag.budget != ""  && isNaN(moneyTag.budget) == false){
 					moneyTag.content = MoneyUnit.test(moneyTag.budget);
 				}
-				if(typeof(moneyTag.bidamount) != "undefined" && moneyTag.bidamount != null && moneyTag.bidamount != ""){
+				if(typeof(moneyTag.bidamount) != "undefined" && moneyTag.bidamount != null && moneyTag.bidamount != ""  && isNaN(moneyTag.bidamount) == false){
 					moneyTag.content = MoneyUnit.test(moneyTag.bidamount);
 				}
 				if(moneyTag.content){
@@ -1863,13 +1864,9 @@ function checkShowDialog () {
 }
 // 是否展示详情上方的广告位
 function showTopAd () {
-  if(window.isFree) {
+  if(!canRead && subtype == '拟建') {
     $('.big-ad-img').show()
-    if (subtype == '采购意向') {
-      $('.cgyx-ad').show()
-    } else if(subtype == '拟建') {
-      $('.nj-ad').show()
-    }
+    $('.nj-ad').show()
   }
 }