Merge branch 'dev/v1.0.13_yf' of jianyu/jyseo into feature/v1.0.13

resource/staticres/css/analysisReport-context.css

@@ -141,7 +141,7 @@
   border-radius: 4px;
 }
 .sub-section {
-  padding: 20px;
+  /* padding: 20px; */
 }
 .sub-section .sub-section-header {
   display: -webkit-box;
@@ -171,7 +171,7 @@ body {
   /*width: 21cm;*/
   /*height: 29.7cm;*/
   width: 950px;
-//height: 1345px;
+  /* height: 1345px; */
   display: block;
   margin: 0 auto;
   -webkit-box-shadow: 0 0 0.5cm rgba(0,0,0,0.5);
@@ -271,7 +271,7 @@ body {
 }
 .doc-container h1 {
   font-family: Helvetica;
-  font-size: 28px;
+  font-size: 25px;
   line-height: 28px;
   color: #000;
   font-weight: bold;
@@ -283,7 +283,7 @@ body {
 .doc-container h2, .doc-container h3 {
   color: #000;
   font-family: Helvetica;
-  font-size: 24px;
+  font-size: 22px;
   font-weight: bold;
   margin: 30px 0;
 }
@@ -293,7 +293,7 @@ body {
 .doc-container p {
   text-indent: 2em;
   font-family: Helvetica;
-  font-size: 22px;
+  font-size: 20px;
   color: #000;
   line-height: 40px;
   font-weight: 400;

resource/staticres/css/report.css

@@ -187,7 +187,6 @@
   height: 120px;
   border-radius: 8px;
   overflow: hidden;
-  object-fit: contain;
   border: 1px solid #ECECEC;
 }
 .report-column .column-left-double .double-item > a{
@@ -517,4 +516,17 @@
 }
 .report-detail-content .overview-item{
   text-align: center;
+}
+.report-detail-content .report-tips-h{
+  margin-top: 20px;
+  padding: 0 60px;
+  font-size: 20px;
+  line-height: 36px;
+  /* text-align: center; */
+  font-weight: bold;
+}
+.report-detail-content .report-tips-p{
+  padding: 20px 60px 40px;
+  font-size: 18px;
+  line-height: 32px;
 }

resource/staticres/mobile/css/hybg-module-common.css

@@ -392,14 +392,15 @@ a{
 
 .hybg-detail-container{
     min-height:calc(100vh - 6.1rem);
+    padding: .16rem .32rem .64rem;
+    background: #fff;
 }
 .hybg-detail-container .analysis-report{
-  padding: .16rem .32rem .64rem;
   font-size: .26rem;
   background: #fff;
 }
 .hybg-detail-container .analysis-report h1{
-  margin-bottom: .24rem;
+  margin-bottom: .32rem;
   font-size: .36rem;
   line-height: .54rem;
   text-align: center;
@@ -407,20 +408,21 @@ a{
   color: #000;
 }
 .hybg-detail-container .analysis-report h2{
-  margin-top: .24rem;
+  padding: .32rem 0;
   font-size: .34rem;
   line-height: .48rem;
   font-weight: bold;
   color: #111;
 }
 .hybg-detail-container .analysis-report h3{
-  margin-top: .24rem;
+  padding: .32rem 0;
   font-size: .32rem;
   line-height: .48rem;
   font-weight: bold;
   color: #111;
 }
 .hybg-detail-container .analysis-report p{
+  padding-bottom: .18rem;
   text-indent: 16px;
   font-size: .3rem;
   line-height: .48rem;
@@ -429,6 +431,7 @@ a{
 }
 .hybg-detail-container .analysis-report img{
   width: 100%;
+  margin: .3rem 0;
 }
 .hybg-detail-container .overview-list{
   display: flex;
@@ -441,6 +444,9 @@ a{
   flex-direction: column;
   margin-bottom: .12rem;
   white-space: nowrap;
+  border-right: 1px solid #ececec;
+  text-align: center;
+  padding: .24rem 0;
 }
 .hybg-detail-container .o-item-label{
   color: #686868;
@@ -449,3 +455,26 @@ a{
   margin-top: 0.08rem;
   color: #1d1d1d;
 }
+.hybg-detail-container #tab-1{
+  display: none;
+}
+.hybg-detail-container .overview-list .overview-item .o-item-percent.color-green{
+  color: #04B15E;
+}
+.hybg-detail-container .overview-list .overview-item .o-item-percent.color-red {
+  color: #FF3A20;
+}
+.hybg-detail-container .detail-tips-h{
+  padding: .32rem 0;
+  font-size: .32rem;
+  line-height: .48rem;
+  font-weight: bold;
+  color: #111;
+}
+.hybg-detail-container .detail-tips-p{
+  /* text-indent: 16px; */
+  font-size: .3rem;
+  line-height: .48rem;
+  color: #111;
+  text-align: justify;
+}

resource/template/mobile/hybg_detail.html

@@ -19,6 +19,8 @@
             <!-- 数据列表-->
             <section class="hybg-detail-container">
               {{$global.detail.Detail | ParseHtml}}
+              <h3 class="detail-tips-h">以上分析报表均来⾃【剑⻥标讯⼤会员】市场分析报告部分内容！</h3>
+              <p class="detail-tips-p">更多分析报告内容还包括：各类型采购单位及其重点合作中标单位；中标单位中标规模分布等数十项分析数据报表！还⽀持按条件筛选，包括：时间、分析内容、数据匹配⽅式项⽬地区、⾏业、 采购单位类型等。</p>
             </section>
             <section class="hybg-ad bg-white" style="background: #F5F6F7;">
               <img src="{{Cdn}}/jyseo/mobile/image/hybg-ad.jpg" alt="定制分析报告" />
@@ -57,17 +59,14 @@
 <script src='{{Cdn}}/common-module/public/js/wx-sdk-share.js?v={{Msg "version"}}'></script>
 <script>
   var title = {{.tdk.Title}}
-  var desc = {{.tdk.Description}}
-  if (utils.$envs.inWX) {
-    try {
-      shareFn.init({
-        title: title,
-        desc: desc,
-        link: location.href,
-        imgUrl: 'https://www.jianyu360.cn/common-module/public/image/logo_new.png'
-      })
-    } catch (error) {}
-  }
+  try {
+    shareFn.init({
+      title: title,
+      desc: '找商机、观大势、盯客户、看对手，剑鱼标讯行业分析简报，助您一臂之力！',
+      link: location.href,
+      imgUrl: 'https://www.jianyu360.cn/common-module/public/image/logo_new.png'
+    })
+  } catch (error) {}
 </script>
 <!-- 微信分享 end -->
 </body>

resource/template/pc/components/report-card-double.html

@@ -10,7 +10,7 @@
       {{$data:=index $global.data 0}}
       <div class="double-item">
         <img src="{{if gt (len $data.ExpandMap.images) 0}}{{index $data.ExpandMap.images 0}}{{end}}" error-src="/jyseo/image/default-graph.png" alt="">
-        <a href="{{$data.Url}}"  class="ellipsis-2">{{$data.Title}}</a>
+        <a href="{{$data.Url}}" title="{{$data.Title}}"  class="ellipsis-2">{{$data.Title}}</a>
       </div>
       {{end}}
       {{if gt $len 1}}

resource/template/pc/components/report-card-single.html

@@ -8,7 +8,7 @@
     {{$data:=index $global.data 0}}
     <div class="column-left-single">
       <img class="column-thumbnail" error-src="/jyseo/image/default-graph.png" src="{{if gt (len $data.ExpandMap.images) 2}}{{index $data.ExpandMap.images 2}}{{end}}" alt="">
-      <div class="column-gradient"><a class="ellipsis" style="display: inline-block;width: 100%;" href="{{$data.Url}}">{{$data.Title}}</a></div>
+      <div class="column-gradient"><a class="ellipsis" title="{{$data.Title}}" style="display: inline-block;width: 100%;" href="{{$data.Url}}">{{$data.Title}}</a></div>
     </div>
     {{end}}
     <div class="column-right">

resource/template/pc/hybg_detail.html

@@ -45,15 +45,17 @@
           </section>
           <section class="report--html">
             {{$global.detail.Detail | ParseHtml}}
+            <h3 class="report-tips-h">以上分析报表均来⾃【剑⻥标讯⼤会员】市场分析报告部分内容！</h3>
+            <p class="report-tips-p">更多分析报告内容还包括：各类型采购单位及其重点合作中标单位；中标单位中标规模分布等数十项分析数据报表！还⽀持按条件筛选，包括：时间、分析内容、数据匹配⽅式项⽬地区、⾏业、 采购单位类型等。</p>
           </section>
           <section class="report--bottom-ad">
-            <img data-leave-info src="/jyseo/image/report-detail-bottom.png" alt="详情页底部留资图" {{if not $global.hasLogin}} data-quick-login="login" {{end}}>
+            <img data-leave-info src="/jyseo/image/report-detail-bottom.png" alt="详情页底部留资图">
           </section>
         </section>
         <aside class="report-main--aside" style="margin-top: 50px;">
           <!-- 右侧广告位 -->
           <section class="report-aside-ad">
-            <img data-leave-info src="/jyseo/image/report-aside-ad.png" alt="详情页侧边栏留资图" {{if not $global.hasLogin}} data-quick-login="login" {{end}}>
+            <img data-leave-info src="/jyseo/image/report-aside-ad.png" alt="详情页侧边栏留资图">
           </section>
           <!-- 推荐分析报告 -->
           <section class="aside-card aside-month-analysis">
@@ -128,6 +130,8 @@
       $('img[data-leave-info]').click(function(){
         if (hasLogin) {
           vm.isNeedSubmit('pc_briefingdetails_dzhfxbg')
+        } else {
+          window.jyCoreSDK.$plugins.login.hooks.open()
         }
       })
     })

resource/template/pc/hybg_index.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+    {{$global:=.}}
     <meta charset="UTF-8">
     <title>{{.tdk.Title}}</title>
     <meta name="Keywords" content='{{.tdk.KeyWords}}'/>
@@ -18,7 +19,7 @@
     <link href='{{Cdn}}/common-module/pc-dialog/css/collect-user-info.css?v={{Msg "version"}}' rel="stylesheet">
     <link href='{{Cdn}}/jyseo/css/report.css?v={{Msg "version"}}' rel="stylesheet" />
     <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
-    <script src="/common-module/public/head.js"></script>
+    <script src='{{Cdn}}/common-module/public/head.js?v={{Msg "version"}}'></script>
 
 </head>
 <body>
@@ -70,8 +71,8 @@
         </section>
         <aside class="report-main--aside">
           <!-- 右侧广告位 -->
-          <section class="report-aside-ad" {{if not .hasLogin}} data-quick-login="login" {{end}}>
-            <img src="/jyseo/image/report-aside-ad.png" alt="首页侧边栏广告位">
+          <section class="report-aside-ad">
+            <img src="/jyseo/image/report-aside-ad.png" data-leave-info alt="首页侧边栏广告位">
           </section>
           <!-- 热门专题分析报告 -->
           <section class="aside-card aside-hot-special">
@@ -141,9 +142,14 @@
 <script src='{{Cdn}}/jyseo/js/common.js?v={{Msg "version"}}'></script>
 <script src='{{Cdn}}/common-module/pc-dialog/js/pc-collect-user-info.min.js?v={{Msg "version"}}'></script>
 <script>
+  var hasLogin = {{$global.hasLogin}}
   $(function () {
-    $('.report-aside-ad').click(function(){
-      vm.isNeedSubmit('pc_briefinghomepage_dzhfxbg')
+    $('img[data-leave-info]').click(function(){
+      if (hasLogin) {
+        vm.isNeedSubmit('pc_briefinghomepage_dzhfxbg')
+      } else {
+        window.jyCoreSDK.$plugins.login.hooks.open()
+      }
     })
     $('img[error-src]').each(function(e, item){
       var errorSrc = $(this).attr('error-src')

resource/template/pc/hybg_list.html

@@ -45,7 +45,7 @@
           </section>
           <h2 class="report--title"><span>/</span> {{if $global.areaNode}}{{$global.areaNode.Name}}{{end}}{{$global.hyNode.Name}}</h2>
           <section>
-            <summary>{{.tdk.KeyWords}}</summary>
+            <summary>{{.tdk.Description}}</summary>
             {{if gt (len $global.list) 0}}
             <ul class="report--list">
               {{range $v:=$global.list}}
@@ -73,7 +73,7 @@
         <aside class="report-main--aside" style="margin-top: 50px;">
           <!-- 右侧广告位 -->
           <section class="report-aside-ad" {{if not $global.hasLogin}} data-quick-login="login" {{end}}>
-            <img src="/jyseo/image/report-aside-ad.png" alt="列表页侧边栏广告位">
+            <img data-leave-info src="/jyseo/image/report-aside-ad.png" alt="列表页侧边栏广告位">
           </section>
           <!-- 大标分析 -->
           <section class="aside-card aside-big-bid">
@@ -128,9 +128,11 @@
 <script>
   var hasLogin = {{$global.hasLogin}}
   $(function () {
-    $('.report-aside-ad').click(function(){
+    $('img[data-leave-info]').click(function(){
       if (hasLogin) {
         vm.isNeedSubmit('pc_briefinglist_dzhfxbg')
+      } else {
+        window.jyCoreSDK.$plugins.login.hooks.open()
       }
     })
   })