首页 发现 帮助
登录
qmx
/
jy
14
0
派生 0
文件 工单管理 2 合并请求 0 Wiki
浏览代码

Merge branch 'release' into dev4.6.6

lianbingjie 3 年之前
父节点
dce733a522 15b0993a22
当前提交
df4ed5d3db
共有 20 个文件被更改，包括 513 次插入 和 57 次删除
分列视图 显示文件统计
  1. 2 2
      src/jfw/front/front.go
  2. 1 1
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_introduce.css
  3. 2 1
      src/jfw/modules/app/src/web/templates/big-member/page_landingPage.html
  4. 114 3
      src/jfw/modules/app/src/web/templates/dataExport/dataExport.html
  5. 5 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_paySuccess.html
  6. 23 3
      src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce.html
  7. 20 4
      src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
  8. 100 9
      src/jfw/modules/bigmember/src/service/analysis/forecastproject.go
  9. 3 3
      src/jfw/modules/common/src/qfw/util/jy/userInfo.go
  10. 5 1
      src/jfw/modules/weixin/src/wx/wx.go
  11. 6 0
      src/web/staticres/public-pc/js/article-content.js
  12. 1 1
      src/web/staticres/vipsubscribe/css/vip_introduce.css
  13. 2 1
      src/web/templates/big-member/wx/page_landingPage.html
  14. 20 2
      src/web/templates/common/pcbottom.html
  15. 1 1
      src/web/templates/pc/biddetail_rec.html
  16. 43 9
      src/web/templates/pc/subscribe_new.html
  17. 112 2
      src/web/templates/weixin/dataExport/dataExport.html
  18. 5 1
      src/web/templates/weixin/dataExport/dataExport_paySuccess.html
  19. 21 5
      src/web/templates/weixin/search/mainSearch.html
  20. 27 7
      src/web/templates/weixin/vipsubscribe/vip_introduce.html

+ 2 - 2
src/jfw/front/front.go
查看文件 

@@ -613,8 +613,8 @@ func (f *Front) HasSign() error {
 
 		}
 
 		m := map[string]interface{}{
 
 			"result":      "ok",
 
-			"s_nickname":  util.If(nickname != "", nickname, jyname),
 
-			"s_headimage": f.GetSession("s_headimageurl"),
 
+			"s_nickname":  util.If(nickname != "", nickname, jyname), //昵称：dev4.6.4
 
+			"s_headimage": f.GetSession("s_avatar"),                  //详细见：jyutil.go - GetSessionVal()
 
 			"encryptId":   se.EncodeString(userId),
 
 		}
 
 		//是否需要重新登录，企业基础架构给虚拟账号重置密码后，需要重新登录

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_introduce.css
查看文件 

@@ -498,7 +498,7 @@ body .j-container {
 
   z-index: 0;
 
   width: 2.4rem;
 
   position: absolute;
 
-  top: -0.8rem;
 
+  /*top: -0.8rem;*/
 
   left: 50%;
 
   transform: translateX(-50%);
 
   text-align: center;

+ 2 - 1
src/jfw/modules/app/src/web/templates/big-member/page_landingPage.html
查看文件 

@@ -315,7 +315,8 @@
 
                     success:function(res) {
 
                         if (res && res.data) {
 
                             if (res.data.memberStatus > 0){
 
-                                _this.onlyBuy = false
 
+                                window.location.replace('/jyapp/big/page/main_root')
 
+                                //_this.onlyBuy = false
 
                             } else {
 
                                 if (res.data.is_member_trial) {
 
                                     _this.onlyBuy = false

+ 114 - 3
src/jfw/modules/app/src/web/templates/dataExport/dataExport.html
查看文件 

@@ -19,7 +19,8 @@
 
     <link rel="stylesheet" type="text/css"
 
           href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/appbutton.css?v={{Msg "seo" "version"}}"/>
 
     <link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/p13.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 
-
 
+  <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/swiper.min.css">
 
+  <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/swiper.min.js"></script>
 
     <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
 
     {{include "/common/js.html"}}
 
@@ -175,6 +176,46 @@
 
         flex: 1;
 
         margin-right: .12rem;
 
     }
 
+    .home_banner {
 
+      /*margin-top: .36rem;*/
 
+      /*padding: .2rem .3rem;*/
 
+      padding: 0.1rem 0.2rem;
 
+    }
 
+
 
+    .home_banner .lunbo {
 
+      width: 100%;
 
+      height: 2.4rem;
 
+      border-radius:8px;
 
+    }
 
+
 
+    .home_banner .lunbo .swiper-slide a {
 
+      display: block;
 
+      width: 100%;
 
+    }
 
+
 
+    .home_banner .lunbo .swiper-slide a img {
 
+      display: block;
 
+      margin: 0 auto;
 
+    }
 
+
 
+    .home_banner .lunbo .custorm_dot {
 
+      bottom: 0;
 
+    }
 
+
 
+    .home_banner .lunbo .custorm_dot .swiper-pagination-bullet {
 
+      width: 0.08rem;
 
+      height: 0.08rem;
 
+      background: #fff;
 
+      opacity: 0.6;
 
+    }
 
+
 
+    .home_banner .lunbo .custorm_dot .swiper-pagination-bullet-active {
 
+      background: #fff;
 
+      opacity: 1;
 
+    }
 
+    .swiper-container-horizontal>.swiper-pagination-bullets, .swiper-pagination-custom, .swiper-pagination-fraction{
 
+      top: 80%;
 
+    }
 
 
 </style>
 
 <body class="p13">
 
@@ -185,8 +226,75 @@
 
 </div>
 
 <div class="app-layout-content-b">
 
     <div class="page">
 
-        <div class='main'>
 
-            <div class="progress">
 
+        <div class='main' style="">
 
+          <div class="top-ad" style="=height: auto;">
 
+            <div class="home_banner">
 
+              <div class="swiper-container lunbo" id="swiper1">
 
+                <div class="swiper-wrapper" data-cl-event="c_wx_brand_linkclick">
 
+                  <!--轮播广告-->
 
+                  <div class="placeholder-div"></div>
 
+                </div>
 
+                <div class="swiper-pagination custorm_dot"></div>
 
+              </div>
 
+            </div>
 
+          </div>
 
+<!--                  {{$s_top:=(Ad "jy-wxsearch-home-top" -1)}}-->
 
+          <script>
 
+          {{$sd:=(Ad "jy-app-dataexport-screen-top" -1)}}
 
+            var ADTopList={{$sd}}
 
+            // var ADTopList=[]
 
+            if(ADTopList.length>0){
 
+              if(ADTopList[0].s_pic == ""){
 
+                $(function (){
 
+                  $(".top-ad").hide()
 
+                })
 
+              }
 
+            }else {
 
+              $(function (){
 
+                $(".top-ad").hide()
 
+              })
 
+            }
 
+            if (ADTopList!=null){
 
+              var adhtml = '';
 
+              for(var i=0;i<ADTopList.length;i++){
 
+                var num = i+1;
 
+                var imgHTML = '<img id="app-dataexport-swiper'+ num +'" src="'+ADTopList[i]["s_pic"]+'" alt="">'
 
+                if (i === 0 || i === ADTopList.length -1) {
 
+                  imgHTML = '<img src="'+ADTopList[i]["s_pic"]+'" alt="" style="width: 100%">'
 
+                }
 
+                adhtml+='<div class="swiper-slide" onclick="adv_statistics(this)"  adv_name="app端数据导出筛选页面顶部'+ num +'">'
 
+                  +'<a href="'+ADTopList[i]["s_link"]+'">'
 
+                  + imgHTML
 
+                  +'</a></div>'
 
+              }
 
+              if(ADTopList.length==1){
 
+                $(".swiper-pagination").hide();
 
+              }
 
+              if(adhtml!=""){
 
+                $(".home_banner .swiper-wrapper").html(adhtml);
 
+              }
 
+            }
 
+            //dev2.9.7.2
 
+            if(ADTopList.length >1){
 
+              window.swiper1 = new Swiper('#swiper1',{
 
+                slidesPerView: 1,
 
+                spaceBetween: 20,
 
+                centeredSlides: true,
 
+                speed:800,
 
+                autoplay: {
 
+                  delay: 4000,
 
+                  disableOnInteraction: false,
 
+                },
 
+                pagination: {
 
+                  el: '.swiper-pagination',
 
+                },
 
+                paginationClickable: true,
 
+                loop: true,
 
+              });
 
+              swiper1.init();
 
+            }
 
+          </script>
 
+            <div class="progress" style="margin-top: -4px">
 
                 <div class="p-item">
 
                     <p class="p-item-icon" style="background: #2cb7ca;">
 
                         <i class="icon iconfont">&#xe606;</i>
 
@@ -348,6 +456,9 @@
 
     }
 
 </script>
 
 <script>
 
+    // $(function (){
 
+    //   $(".top-ad").hide()
 
+    // })
 
     $(function () {
 
         //清除我已阅读缓存
 
         sessionStorage.removeItem("readClause");

+ 5 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_paySuccess.html
查看文件 

@@ -33,6 +33,9 @@
 
 					window.location.href="/jyapp/front/dataExport/toOrderDetail?orderCode={{.T.orderCode}}"
 
 				})
 
 			})
 
+      $(function (){
 
+        $(".top-ad").hide()
 
+      })
 
 		</script>
 
 		<style>
 
 			.j-footer{
 
@@ -59,7 +62,8 @@
 
 		</div>
 
 		<div class="app-layout-content-b">
 
 			<div id="pay_success">
 
-			<main class="main">
 
+			<main class="main" style="overflow: hidden;">
 
+        <div class="top-ad" style="width: 686px;height: 128px;"></div>
 
 				<div class="progress">
 
 					<div class="p-item">
 
 						<p class="p-item-icon">

+ 23 - 3
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce.html
查看文件 

@@ -90,9 +90,11 @@
 
         </div>
 
     </div>
 
         <div class="j-footer j-button-group popup-bottom-group">
 
-            <div class="pop-tip-group tip-box">
 
-                <div>每天一块钱，立刻拥有全网商机！</div>
 
-        </div>
 
+            <div class="adbottom" style="width:375px;height: 40px;text-align: center;" id="bottomad">
 
+<!--              <div class="pop-tip-group tip-box">-->
 
+<!--                <div>每天一块钱，立刻拥有全网商机！</div>-->
 
+<!--              </div>-->
 
+            </div>
 
         <div class="pop-tip-group active" style="display: none">
 
                 <div>买1年送1年</div>
 
         </div>
 
@@ -107,6 +109,24 @@
 
 <!--<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
 
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}'></script>
 
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/utils.js?v={{Msg "seo" "mod_version"}}'></script>
 
+{{$s:=(Ad "jy-app-vip-buypage-tips" -1)}}
 
+<script>
 
+  var ADList={{$s}}
 
+  var ADHtml="";
 
+  var AD = ADList[0]
 
+  if(AD.s_pic){
 
+    if(AD.s_link){
 
+      ADHtml="<a href='"+AD.s_link+"'><img src='"+AD.s_pic+"' style='height: 100%;width: 100%;'/></a>"
 
+    }else{
 
+      ADHtml="<img src='"+AD.s_pic+"' style='height: 100%;width: 100%;'/>"
 
+    }
 
+  }else{
 
+    ADHtml="<div class=\"pop-tip-group tip-box\">\n" +
 
+      "                <div>每天一块钱，立刻拥有全网商机！</div>\n" +
 
+      "              </div>"
 
+  }
 
+  $("#bottomad").append(ADHtml);
 
+</script>
 
 <script>
 
     // 双12活动
 
     var initPageTime = new Date().getTime()

+ 20 - 4
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
查看文件 

@@ -576,10 +576,10 @@
 
         </div>
 
     </div>
 
 </section>
 
-<div id="sideIcon" style="display: none">
 
-    <a href="/jyapp/frontPage/share/sess/index">
 
-        <img  src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/share/img/gift.png' alt="" style="width: 1.36rem;">
 
-    </a>
 
+<div id="sideIcon" style="margin-right: -0.3rem;display: none">
 
+<!--    <a href="/jyapp/frontPage/share/sess/index">-->
 
+<!--        <img  src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/share/img/gift.png' alt="" style="width: 1.83rem;">-->
 
+<!--    </a>-->
 
 </div>
 
 <!--{{include "/common/footer.html"}}-->
 
 <div class="hidden" id="advertscript"></div>
 
@@ -646,6 +646,22 @@
 
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/searchindex.js?v={{Msg "seo" "version"}}'></script>
 
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/dateFunc.js?v={{Msg "seo" "version"}}'></script>
 
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/message-index.js?v={{Msg "seo" "version"}}'></script>
 
+<script>
 
+  {{$s:=(Ad "jy-app-sharepolitely-float" -1)}}
 
+  var ADList={{$s}}
 
+  var ADHtml="";
 
+  if(ADList.length>0){
 
+    var AD = ADList[0]
 
+    if(AD.s_pic){
 
+      if(AD.s_link){
 
+        ADHtml="<a href='"+AD.s_link+"'><img src='"+AD.s_pic+"' style='width: 88px'/></a>"
 
+      }else{
 
+        ADHtml="<img src='"+AD.s_pic+"' style='width: 88px'/>"
 
+      }
 
+    }
 
+  }
 
+  $("#sideIcon").append(ADHtml);
 
+</script>
 
 <script>
 
   // 获取是否是商机管理
 
   function getNewEntNiche () {

+ 100 - 9
src/jfw/modules/bigmember/src/service/analysis/forecastproject.go
查看文件 

@@ -21,14 +21,106 @@ import (
 
 )
 
 
 const (
 
-	INDEX          = "forecast"
 
-	TYPE           = "forecast"
 
-	bidSearch_sort = `{"yucetime":-1}`
 
-	findfields     = `"title"`
 
-
 
+	INDEX           = "forecast"
 
+	TYPE            = "forecast"
 
+	bidSearch_sort  = `{"yucetime":-1}`
 
+	findfields      = `"title"`
 
 	bidSearch_field = ``
 
+
 
+	forecastQuery            = `{"query":{"filtered":{"filter":{"bool":{"must":[%s]}},"query":{"bool":{"should":[%s],"minimum_should_match":1}}}}}`
 
+	filter_must_time         = `{"bool":{"should":[{"bool":{"must":[{"missing":{"field":"yuceendtime"}},{"range":{"yucetime":{"gte":%d}}}]}},{"bool":{"must":[{"exists":{"field":"yuceendtime"}},{"range":{"yuceendtime":{"gte":%d}}}]}}]}}`
 
+	filter_must_area_city    = `{"bool":{"should":[%s]}}`
 
+	query_should_keys        = `{"bool":{"must":[%s],"must_not":[%s]}}`
 
+	query_should_multi_match = `{"multi_match":{"query":"%s","type":"phrase","fields":["results.purchasing.mypurchasing"]}}`
 
 )
 
 
+/**
 
+@author:王山
 
+@descript:中标项目预测
 
+@date:2022-03-08
 
+@demand：
 
+	有yuceendtime字段，按照yuceendtime大于当前时间||无yuceendtime字段，按照yucetime字段最近三个月查询数据；
 
+	另有省份、城市、采购单位类型等；from 赵龙玥
 
+**/
 
+func getForecastProjectSql(scd *util.ViewCondition) string {
 
+	musts := []string{}
 
+	bools := []string{}
 
+	musts = append(musts, fmt.Sprintf(filter_must_time, time.Now().AddDate(0, -3, 0).Unix(), time.Now().Unix()))
 
+	//省份
 
+	areaCity := []string{}
 
+	if len(scd.Area) > 0 {
 
+		areaquery := `{"terms":{"area":[`
 
+		for k, v := range scd.Area {
 
+			if k > 0 {
 
+				areaquery += `,`
 
+			}
 
+			areaquery += `"` + v + `"`
 
+		}
 
+		areaquery += `]}}`
 
+		areaCity = append(areaCity, areaquery)
 
+	}
 
+
 
+	//城市
 
+	if len(scd.City) > 0 {
 
+		areaquery := `{"terms":{"city":[`
 
+		for k, v := range scd.City {
 
+			if k > 0 {
 
+				areaquery += `,`
 
+			}
 
+			areaquery += `"` + v + `"`
 
+		}
 
+		areaquery += `]}}`
 
+		areaCity = append(areaCity, areaquery)
 
+	}
 
+	if len(areaCity) > 0 {
 
+		musts = append(musts, fmt.Sprintf(filter_must_area_city, strings.Join(areaCity, ",")))
 
+	}
 
+
 
+	//采购单位类型
 
+	if len(scd.Buyerclass) > 0 {
 
+		Buyerclass := `{"terms":{"buyerclass":[`
 
+		for k, v := range scd.Buyerclass {
 
+			if k > 0 {
 
+				Buyerclass += `,`
 
+			}
 
+			Buyerclass += `"` + v + `"`
 
+		}
 
+		Buyerclass += `]}}`
 
+		musts = append(musts, Buyerclass)
 
+	}
 
+
 
+	//should
 
+	if len(scd.Keyword) > 0 {
 
+		multi_match := query_should_multi_match
 
+		for _, v := range scd.Keyword {
 
+			bool_must := []string{}
 
+			bool_must_not := []string{}
 
+			//附加词
 
+			for _, vv := range v.Keyword {
 
+				bool_must = append(bool_must, fmt.Sprintf(multi_match, vv))
 
+			}
 
+
 
+			for _, vv := range v.Appended {
 
+				bool_must = append(bool_must, fmt.Sprintf(multi_match, vv))
 
+			}
 
+
 
+			//排除词
 
+			for _, vv := range v.Exclude {
 
+				bool_must_not = append(bool_must_not, fmt.Sprintf(multi_match, vv))
 
+			}
 
+
 
+			//添加
 
+			if len(bool_must) > 0 {
 
+				bools = append(bools, fmt.Sprintf(query_should_keys, strings.Join(bool_must, ","), strings.Join(bool_must_not, ",")))
 
+			}
 
+		}
 
+	}
 
+
 
+	qstr := fmt.Sprintf(forecastQuery, strings.Join(musts, ","), strings.Join(bools, ","))
 
+	log.Println("qstr:", qstr)
 
+	return qstr
 
+}
 
+
 
 // ForPContent 预测详情页
 
 func (this *Analysis) ForPContent() {
 
 	defer qutil.Catch()
 
@@ -263,7 +355,8 @@ func getNewForecast(userId string, pageNum int, o_member_jy map[string]interface
 
 	if len(keys) == 0 {
 
 		return
 
 	}
 
-	qstr := GetMemberForecastSql(sql)
 
+	// qstr := GetMemberForecastSql(sql)
 
+	qstr := getForecastProjectSql(sql)
 
 	count = elastic.Count(INDEX, TYPE, qstr)
 
 	list = *elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, (pageNum-1)*FP_Limit, FP_Limit, 0, false)
 
 	if list != nil {
 
@@ -294,7 +387,7 @@ func getNewForecast(userId string, pageNum int, o_member_jy map[string]interface
 
 	return
 
 }
 
 
-//获取大会员forecast 检索库查询语句
 
+//获取大会员forecast 检索库查询语句 - 查询逻辑有调整 dev4.6.8 -ws 新方法：getForecastProjectSql()
 
 func GetMemberForecastSql(scd *util.ViewCondition) string {
 
 	query := `{"query":{"bool":{"must":[%s],"should":[%s],"minimum_should_match": %d}}}`
 
 	query_bool_should := `{"bool":{"should":[%s],"minimum_should_match": 1}}`
 
@@ -394,8 +487,6 @@ func GetMemberForecastSql(scd *util.ViewCondition) string {
 
 	return qstr
 
 }
 
 
-//
 
-
 
 //member_jy
 
 func getSqlObjFromId(o_member_jy map[string]interface{}) *util.ViewCondition {
 
 	if o_member_jy["a_items"] == nil {

+ 3 - 3
src/jfw/modules/common/src/qfw/util/jy/userInfo.go
查看文件 

@@ -57,11 +57,11 @@ func getMonth() string {
 
 	case time.September:
 
 		return "9"
 
 	case time.October:
 
-		return "a"
 
+		return "A"
 
 	case time.November:
 
-		return "b"
 
+		return "B"
 
 	case time.December:
 
-		return "c"
 
+		return "C"
 
 	}
 
 	return "*"
 
 }

+ 5 - 1
src/jfw/modules/weixin/src/wx/wx.go
查看文件 

@@ -411,7 +411,11 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 
 				set["l_registedate"] = u.SubscribeTime
 
 			}
 
 			if util.ObjToString(tuser["s_nickname"]) == "" {
 
-				set["s_nickname"] = jy.GetUserName("newother", config.Sysconfig["namePrefix"].(string))
 
+				set["s_nickname"] = u.Nickname
 
+			}
 
+			//剑鱼昵称
 
+			if util.ObjToString(tuser["s_jyname"]) == "" {
 
+				set["s_jyname"] = jy.GetUserName("newother", config.Sysconfig["namePrefix"].(string))
 
 			}
 
 			if util.ObjToString(tuser["a_m_openid"]) != "" { //app用户
 
 				if tuser["a_mergeorder"] == nil {

+ 6 - 0
src/web/staticres/public-pc/js/article-content.js
查看文件 

@@ -231,6 +231,9 @@ var bidNode = {
 
           buyer: goTemplateData.params.obj.buyer
 
     },
 
       success: function(res) {
 
+    	if (res.error_code < 0) {
 
+          return
 
+        }
 
         if (res.data) {
 
           if (!res.data.province && !res.data.city) {
 
             res.data.province = '--'
 
@@ -282,6 +285,9 @@ var bidNode = {
 
           entId: goTemplateData.params.obj.entId
 
     },
 
       success: function(res) {
 
+    	if (res.error_code < 0) {
 
+          return
 
+        }
 
         if (res.data) {
 
           if (!res.data.biddingCount) {
 
             res.data.biddingCount = '--'

+ 1 - 1
src/web/staticres/vipsubscribe/css/vip_introduce.css
查看文件 

@@ -492,7 +492,7 @@ body {
 
   z-index: 0;
 
   width: 2.4rem;
 
   position: absolute;
 
-  top: -0.8rem;
 
+  /*top: -0.8rem;*/
 
   text-align: center;
 
   font-size: 0.26rem;
 
   font-family: PingFang SC-Bold, PingFang SC;

+ 2 - 1
src/web/templates/big-member/wx/page_landingPage.html
查看文件 

@@ -283,7 +283,8 @@
 
                     success:function(res) {
 
                         if (res && res.data) {
 
                             if (res.data.memberStatus > 0){
 
-                                _this.onlyBuy = false
 
+                                window.location.replace('/big/wx/page/landingPage')
 
+                                //_this.onlyBuy = false
 
                             } else {
 
                                 if (res.data.is_member_trial) {
 
                                     _this.onlyBuy = false

+ 20 - 2
src/web/templates/common/pcbottom.html
查看文件 

@@ -145,8 +145,9 @@
 
 
 <!--S-侧边栏-->
 
 <div class="right-side-box" data-backside>
 
-    <div id="sideIcon" class="">
 
-        <a href="/swordfish/frontPage/share/sess/index"><img src="{{Msg "seo" "cdn"}}/share/img/active-icon.png"  alt="" style="width: 68px;"></a>
 
+<!--      <div id="shareslider" style="width: 88px"></div>-->
 
+    <div id="sideIcon" class="" style="right: -15px;width: 88px;height: 88px;">
 
+<!--        <a href="/swordfish/frontPage/share/sess/index"><img src="{{Msg "seo" "cdn"}}/share/img/active-icon.png"  alt="" style="width: 88px;"></a>-->
 
     </div>
 
     <div class="right-side-item" id="go-customer-4">
 
         <div class="hover-open-box" style="padding: 0;">
 
@@ -186,6 +187,23 @@
 
 </div>
 
 <!--E-侧边栏-->
 
 
+<script>
 
+{{$s:=(Ad "jy-pc-sharepolitely-float" -1)}}
 
+  var ADList={{$s}}
 
+  var ADHtml="";
 
+if(ADList.length>0){
 
+  var AD = ADList[0]
 
+  if(AD.s_pic){
 
+    if(AD.s_link){
 
+      ADHtml="<a href='"+AD.s_link+"'><img src='"+AD.s_pic+"' style='width: 88px'/></a>"
 
+    }else{
 
+      ADHtml="<img src='"+AD.s_pic+"' style='width: 88px'/>"
 
+    }
 
+  }
 
+}
 
+  $("#sideIcon").append(ADHtml);
 
+</script>
 
+
 
 <script>
 
   /*--S-友情链接--*/
 
   var link_str = ''

+ 1 - 1
src/web/templates/pc/biddetail_rec.html
查看文件 

@@ -1346,7 +1346,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 
 		};
 
 	</script>
 
 	<script type="text/javascript">
 
-		var canRead = {{.T.canRead}}
 
+		var canRead = location.href.indexOf('mailprivate') > -1 || {{.T.canRead}}
 
     // 免费用户每日查看三次
 
     if(!(goTemplateData.params.obj.subtype == '采购意向' || goTemplateData.params.obj.subtype == '拟建') && !canRead) {
 
       $('#tip-title').text('免费查看更多公告')

+ 43 - 9
src/web/templates/pc/subscribe_new.html
查看文件 

@@ -49,8 +49,12 @@
 
           bottom: 0;
 
           left: 0;
 
           width: 100%;
 
-          height: 68px;
 
-          background: linear-gradient(91deg, #072551 6%, #5D118B 58%, #05035F 100%);
 
+        overflow: hidden;
 
+        margin-bottom: -3px;
 
+        display: flex;
 
+        justify-content: center;
 
+          /*height: 96px;*/
 
+          /*background: linear-gradient(91deg, #072551 6%, #5D118B 58%, #05035F 100%);*/
 
       }
 
 
       .footer-banner[data-sticky] {
 
@@ -62,9 +66,11 @@
 
       }
 
 
       .footer-banner .w1200 img {
 
-          width: 956px;
 
+          width: 1920px;
 
           margin: 0 auto;
 
-          margin-top: -19px;
 
+        /*margin-left:240px;*/
 
+        /*  margin-top: -19px;*/
 
+        height: 98px;
 
       }
 
       .footer-banner .w1200 {
 
           height: 100%;
 
@@ -92,7 +98,7 @@
 
           position: absolute;
 
           padding: 10px;
 
           right: 40px;
 
-          top: 17px;
 
+          top: 42%;
 
           cursor: pointer;
 
       }
 
 
@@ -367,9 +373,10 @@
 
     </div>
 
 </div>
 
 <!--S-底部横幅-->
 
-<div class="w-box footer-banner" data-sticky-change>
 
+<div class="w-box footer-banner" id="bot-hf" data-sticky-change>
 
     <div class="w1200">
 
-        <img src="{{Msg "seo" "cdn"}}/images/subscribe/new-sub-bottom-bg.png?v={{Msg "seo" "version"}}" usemap="#image_map1">
 
+<!--        <img src="{{Msg "seo" "cdn"}}/images/subscribe/new-sub-bottom-bg.png?v={{Msg "seo" "version"}}" usemap="#image_map1">-->
 
+<!--      <div id="bottomad"></div>-->
 
         <map name="image_map1" style="cursor: pointer">
 
             <area data-go-buy-subscribe coords="776,48.5,927,90" shape="rect">
 
         </map>
 
@@ -378,9 +385,9 @@
 
         <i class="icon-close"></i>
 
     </div>
 
 </div>
 
-<div class="w-box footer-banner" data-sticky>
 
+<div class="w-box footer-banner" id="bot-hf2" data-sticky>
 
     <div class="w1200">
 
-        <img src="{{Msg "seo" "cdn"}}/images/subscribe/new-sub-bottom-bg.png?v={{Msg "seo" "version"}}" usemap="#image_map2">
 
+<!--        <img src="{{Msg "seo" "cdn"}}/images/subscribe/new-sub-bottom-bg.png?v={{Msg "seo" "version"}}" usemap="#image_map2">-->
 
         <map name="image_map2" style="cursor: pointer">
 
             <area data-go-buy-subscribe coords="776,48.5,927,90" shape="rect">
 
         </map>
 
@@ -405,6 +412,33 @@
 
         </div>
 
     </div>
 
 </div>
 
+<script>
 
+  {{$s_bot:=(Ad "jy-pc-subscribe-bottom-float" -1)}}
 
+  var ADList={{$s_bot}}
 
+  // var ADList=[{"s_pic":"https://web2-jytest.jydev.jianyu360.com/share/img/active-icon.png"}]
 
+  var ADHtml="";
 
+  if (ADList.length >0){
 
+    var AD = ADList[0]
 
+    if(AD.s_pic == ""){
 
+      $("#bot-hf").hide()
 
+      $("#bot-hf2").hide()
 
+    }
 
+    if(AD.s_pic){
 
+      if(AD.s_link){
 
+        ADHtml="<a href='"+AD.s_link+"'><img src='"+AD.s_pic+"'/></a>"
 
+      }else{
 
+        ADHtml="<img src='"+AD.s_pic+"'/>"
 
+      }
 
+    }else{
 
+      ADHtml=""
 
+    }
 
+  }else {
 
+    $("#bot-hf").hide()
 
+    $("#bot-hf2").hide()
 
+  }
 
+
 
+  $(".w1200").append(ADHtml);
 
+</script>
 
 
 <button class="btn hidden" id="cb-01" data-toggle="modal" data-target="#myModal-01"></button>
 
 <!--百度统计start-->

+ 112 - 2
src/web/templates/weixin/dataExport/dataExport.html
查看文件 

@@ -15,7 +15,10 @@
 
     <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>
 
   <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 
-    {{include "/common/weixin.html"}}
 
+  <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/swiper/swiper.min.css?v={{Msg "seo" "version"}}">
 
+  <script src="{{Msg "seo" "cdn"}}/swiper/swiper.min.js?v={{Msg "seo" "version"}}"></script>
 
+
 
+  {{include "/common/weixin.html"}}
 
 <!--    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css?v={{Msg "seo" "version"}}">-->
 
 <!--    <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js?v={{Msg "seo" "version"}}"></script>-->
 
     <script src="https://cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js"></script>
 
@@ -180,10 +183,114 @@
 
     border-radius: 10px;
 
     padding-left: 7px;
 
   }
 
+  .home_banner {
 
+    /*margin-top: .36rem;*/
 
+    padding: .1rem .2rem;
 
+  }
 
+
 
+  .home_banner .lunbo {
 
+    width: 100%;
 
+    height: 2.4rem;
 
+    border-radius: 8px;
 
+  }
 
+
 
+  .home_banner .lunbo .swiper-slide a {
 
+    display: block;
 
+    width: 100%;
 
+  }
 
+
 
+  .home_banner .lunbo .swiper-slide a img {
 
+    display: block;
 
+    margin: 0 auto;
 
+  }
 
+
 
+  .home_banner .lunbo .custorm_dot {
 
+    bottom: 0;
 
+  }
 
+
 
+  .home_banner .lunbo .custorm_dot .swiper-pagination-bullet {
 
+    width: 0.08rem;
 
+    height: 0.08rem;
 
+    background: #fff;
 
+    opacity: 0.6;
 
+  }
 
+
 
+  .home_banner .lunbo .custorm_dot .swiper-pagination-bullet-active {
 
+    background: #fff;
 
+    opacity: 1;
 
+  }
 
+  .swiper-container-horizontal>.swiper-pagination-bullets, .swiper-pagination-custom, .swiper-pagination-fraction{
 
+    top: 80%;
 
+  }
 
 </style>
 
 <body class="p13">
 
     <div class="page j-container">
 
-      <div class="main j-main">
 
+      <div class="main j-main" style="">
 
+        <div class="top-ad" id="ad-top" style="height: auto">
 
+          <div class="home_banner">
 
+            <div class="swiper-container lunbo" id="swiper1">
 
+              <div class="swiper-wrapper" data-cl-event="c_wx_brand_linkclick">
 
+                <!--轮播广告-->
 
+                <div class="placeholder-div"></div>
 
+              </div>
 
+              <div class="swiper-pagination custorm_dot"></div>
 
+            </div>
 
+          </div>
 
+        </div>
 
+        {{$s_top:=(Ad "jy-wx-dataexport-screen-top" -1)}}
 
+        <script>
 
+          var ADTopList={{$s_top}}
 
+          if(ADTopList.length>0){
 
+            if(ADTopList[0].s_pic == ""){
 
+              $(function (){
 
+                $(".top-ad").hide()
 
+              })
 
+            }
 
+          }else {
 
+            $(function (){
 
+              $(".top-ad").hide()
 
+            })
 
+          }
 
+          if (ADTopList!=null){
 
+            var adhtml = '';
 
+            for(var i=0;i<ADTopList.length;i++){
 
+              var num = i+1;
 
+              var imgHTML = '<img id="wx-dataexport-swiper'+ num +'" src="'+ADTopList[i]["s_pic"]+'" alt="">'
 
+              if (i === 0 || i === ADTopList.length -1) {
 
+                imgHTML = '<img src="'+ADTopList[i]["s_pic"]+'" alt="" style="width: 100%">'
 
+              }
 
+              adhtml+='<div class="swiper-slide" onclick="adv_statistics(this)"  adv_name="微信端数据导出筛选页面顶部'+ num +'">'
 
+                +'<a dataHref="'+ADTopList[i]["s_link"]+'">'
 
+                + imgHTML
 
+                +'</a></div>'
 
+            }
 
+            if(ADTopList.length==1){
 
+              $(".swiper-pagination").hide();
 
+            }
 
+            if(adhtml!=""){
 
+              $(".home_banner .swiper-wrapper").html(adhtml);
 
+            }
 
+          }
 
+          //dev2.9.7.2
 
+          if(ADTopList.length >1){
 
+          window.swiper1 = new Swiper('#swiper1',{
 
+            slidesPerView: 1,
 
+            spaceBetween: 20,
 
+            centeredSlides: true,
 
+            speed:800,
 
+            autoplay: {
 
+              delay: 4000,
 
+              disableOnInteraction: false,
 
+            },
 
+            pagination: {
 
+              el: '.swiper-pagination',
 
+            },
 
+            paginationClickable: true,
 
+            loop: true,
 
+          });
 
+          swiper1.init();
 
+          }
 
+        </script>
 
        <div>
 
         <div class="progress">
 
         	<div class="p-item">
 
@@ -371,6 +478,9 @@
 
 </script>
 
 <script>
 
     initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
 
+    // $(function (){
 
+    //   $(".top-ad").hide()
 
+    // })
 
     $(function(){
 
     	//清除我已阅读缓存
 
 		sessionStorage.removeItem("readClause");

+ 5 - 1
src/web/templates/weixin/dataExport/dataExport_paySuccess.html
查看文件 

@@ -58,11 +58,15 @@
 
         function detail() {
 
             window.location.href = "/front/wx_dataExport/wxToOrderDetail?orderCode={{.T.orderCode}}"
 
         }
 
+        $(function (){
 
+          $(".top-ad").hide()
 
+        })
 
     </script>
 
 </head>
 
 <body>
 
 <div id="pay_success">
 
-    <main class="main">
 
+    <main class="main" style="overflow: hidden;">
 
+      <div class="top-ad" style="width: 686px;height: 128px;"></div>
 
         <div class="progress">
 
             <div class="p-item">
 
                 <p class="p-item-icon">

+ 21 - 5
src/web/templates/weixin/search/mainSearch.html
查看文件 

@@ -77,7 +77,7 @@
 
 	var searchWord = {{.T.searchWord}};
 
 	//initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}},"",{{.T.i_applystatus}});
 
   PageShareInit(2,"jy_extend","")
 
-	
+
 
     // 动画隐藏tab栏
 
     function hideTab() {
 
         $('.newdialog .tab-box .sub-search-title').slideUp('fast');
 
@@ -960,10 +960,10 @@
 
 	$("#advertscript").html(ADHtml);
 
 </script>
 
 </div>
 
-<div id="sideIcon" style="display: none">
 
-	<a href="/weixin/frontPage/share/sess/index">
 
-		<img src='{{Msg "seo" "cdn"}}/share/img/gift.png' alt="" style="width:68px">
 
-	</a>
 
+<div id="sideIcon" style="margin-right: -0.2rem;display: none">
 
+<!--	<a href="/weixin/frontPage/share/sess/index">-->
 
+<!--		<img src='{{Msg "seo" "cdn"}}/share/img/gift.png' alt="" style="width:88px">-->
 
+<!--	</a>-->
 
 </div>
 
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 
@@ -978,6 +978,22 @@
 
 <script src='{{Msg "seo" "cdn"}}/common-module/ent-search/ent-search-template.js?v={{Msg "seo" "version"}}'></script>
 
 <script src='{{Msg "seo" "cdn"}}/common-module/messageCenter/js/message-template-index.js?v={{Msg "seo" "version"}}'></script>
 
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
 
+<script>
 
+  {{$s:=(Ad "jy-wx-sharepolitely-float" -1)}}
 
+  var ADList={{$s}}
 
+  var ADHtml="";
 
+    if(ADList.length>0){
 
+      var AD = ADList[0]
 
+      if(AD.s_pic){
 
+        if(AD.s_link){
 
+          ADHtml="<a href='"+AD.s_link+"'><img src='"+AD.s_pic+"' style='width: 88px'/></a>"
 
+        }else{
 
+          ADHtml="<img src='"+AD.s_pic+"' style='width: 88px'/>"
 
+        }
 
+      }
 
+    }
 
+  $("#sideIcon").append(ADHtml);
 
+</script>
 
 <script>
 
 	function scrollSideIconHide(el) {
 
 		var sNode = $('#sideIcon')

+ 27 - 7
src/web/templates/weixin/vipsubscribe/vip_introduce.html
查看文件 

@@ -20,13 +20,13 @@
 
         .pop-tip-group.tip-box > div,
 
         .pop-tip-group.active > div{
 
             width: 100%;
 
-            background: linear-gradient(173deg, #FFA573 0%, #F01212 100%);
 
+            /*background: linear-gradient(173deg, #FFA573 0%, #F01212 100%);*/
 
             border-radius: 0.10rem;
 
         }
 
         .pop-tip-group.tip-box,
 
         .pop-tip-group.active {
 
             width: 4.7rem;
 
-            background: linear-gradient(173deg, #FFA573 0%, #F01212 100%);
 
+            /*background: linear-gradient(173deg, #FFA573 0%, #F01212 100%);*/
 
             border-radius: 0.10rem;
 
         }
 
         .pop-tip-group.active {
 
@@ -43,9 +43,9 @@
 
             z-index: -1;
 
             width: 2.4rem;
 
             height: 0.7rem;
 
-            background-image: url("/common-module/vipsubscribe/image/info/tagBottom.png");
 
-            background-size: cover;
 
-            background-repeat: no-repeat;
 
+            /*background-image: url("/common-module/vipsubscribe/image/info/tagBottom.png");*/
 
+            /*background-size: cover;*/
 
+            /*background-repeat: no-repeat;*/
 
         }
 
         .pop-tip-group.active::before {
 
             content: '';
 
@@ -86,8 +86,10 @@
 
             </div>
 
         </div>
 
         <div class="j-footer j-button-group popup-bottom-group">
 
-            <div class="pop-tip-group tip-box">
 
-                <div>每天一块钱，立刻拥有全网商机！</div>
 
+          <div class="adbottom pop-tip-group tip-box" style="width:375px;height: 40px;top: -35px;text-align: center;" id="bottomad">
 
+<!--              <div class="pop-tip-group tip-box">-->
 
+<!--                <div>每天一块钱，立刻拥有全网商机！</div>-->
 
+<!--              </div>-->
 
             </div>
 
             <div class="pop-tip-group active" style="display: none">
 
                 <div>买1年送1年</div>
 
@@ -103,6 +105,24 @@
 
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 
     <script src='{{Msg "seo" "cdn"}}/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}'></script>
 
     <script src='{{Msg "seo" "cdn"}}/big-member/js/utils.js?v={{Msg "seo" "version"}}'></script>
 
+    {{$s:=(Ad "jy-wx-vip-buypage-tips" -1)}}
 
+    <script>
 
+      var ADList={{$s}}
 
+      var ADHtml="";
 
+      var AD = ADList[0]
 
+      if(AD.s_pic){
 
+        if(AD.s_link){
 
+          ADHtml="<a href='"+AD.s_link+"'><img src='"+AD.s_pic+"' style='height: 100%;width: 100%;'/></a>"
 
+        }else{
 
+          ADHtml="<img src='"+AD.s_pic+"' style='height: 100%;width: 100%;'/>"
 
+        }
 
+      }else{
 
+        ADHtml="<div class=\"pop-tip-group tip-box\">\n" +
 
+          "                <div>每天一块钱，立刻拥有全网商机！</div>\n" +
 
+          "              </div>"
 
+      }
 
+      $("#bottomad").append(ADHtml);
 
+    </script>
 
     <script>
 
         // 双12活动
 
         var initPageTime = new Date().getTime()