Merge branch 'feature/v4.8.0' of http://192.168.3.207:8080/qmx/jy into feature/v4.8.0

src/jfw/site/helpCenter/service.go

@@ -19,6 +19,9 @@ type HelpCenterService struct {
 	catalog      xweb.Mapper `xweb:"/helpCenter/catalog/(.*)"`     //帮助中心意见反馈
 	detail       xweb.Mapper `xweb:"/helpCenter/detail/(.*).html"` //帮助中心意见反馈
 
+	helpVideoIndex xweb.Mapper `xweb:"/helpVideo/"`
+	helpVideoPage  xweb.Mapper `xweb:"/helpVideo/(.*)"`
+
 	feedbackSubmit xweb.Mapper `xweb:"/helpCenter/feedback/submit"` //帮助中心意见反馈
 }
 
@@ -76,3 +79,14 @@ func (this *HelpCenterService) FeedbackSubmit() {
 	}()
 	this.ServeJson(NewResult(rData, errMsg))
 }
+
+// HelpVideoIndex 帮助中心视频
+func (this *HelpCenterService) HelpVideoIndex() error {
+	return this.doVideoPage()
+}
+func (this *HelpCenterService) HelpVideoPage(htmlPage string) error {
+	return this.doVideoPage()
+}
+func (this *HelpCenterService) doVideoPage() error {
+	return this.Render("/site/page/helpCenter/videoDetail.html")
+}

src/jfw/site/jyblog/entity.go

@@ -29,10 +29,8 @@ func GetBlogDetail(_id string) (data *map[string]interface{}) {
 			tmpdate2, _ := (*r)["releasetime"]
 			(*r)["releasetime"] = util.TimeDiff(time.Unix(util.Int64All(tmpdate2), 0))
 			content := util.ObjToString((*r)["s_content"])
-			columnCode, _ := config.Sysconfig["columnCode"].(map[string]interface{})
-			helpCode := util.InterfaceToStr(columnCode["帮助中心"])
 			//帮助中心单独处理 需要对内容图片加域名
-			if util.ObjToString((*r)["s_contenttype"]) == helpCode {
+			if strings.Contains(content, `<img src="/imgFile`) {
 				newImg := fmt.Sprintf(`<img src="%simgFile`, util.InterfaceToStr(config.Seoconfig["jyadd"]))
 				content = strings.ReplaceAll(content, `<img src="/imgFile`, newImg)
 			}

src/web/staticres/css/pc.css

@@ -1964,15 +1964,18 @@ form{
 	display: flex;
 }
 .jy_classify_l dl{
-	margin-right: 80px;
+	margin-right: 40px;
 	flex: 1;
 }
-.jy_classify_l dl dt{
+.jy_classify_l dl dt,
+.jy_classify_l dl dt > a{
 	font-size: 14px;
 	color: rgba(255,255,255,.8);
 	line-height: 22px;
 	margin-bottom: 8px;
+  white-space: nowrap;
 }
+
 .jy_classify_l dl dd{
 	position: relative;
 }

src/web/staticres/site/common/css/pc-help-center-head.css

@@ -891,7 +891,7 @@ right: -14px;
 }
 .useronline{
   height: 100%!important;
-  margin-top: 0;
+  margin-top: 0!important;
 }
 .useronline .user-avatar{
   margin-top: 14px!important;

src/web/staticres/site/page/helpCenter/css/summary.css

@@ -172,6 +172,7 @@ summary.active a{
   color: #2ABED1;
 }
 .detail-title{
+  margin-bottom: 32px;
   font-size: 24px;
   line-height: 36px;
   color: #1D1D1D;

src/web/templates/common/pcbottom.html

@@ -26,7 +26,7 @@
                         <dd><a href="/product/index?serviceType=2">招标代理机构服务</a></dd>
                         <!-- <dd><a href="">商机管理</a></dd> -->
                     </dl>
-                    <dl>
+                    <!-- <dl>
                       <dt>百宝箱</dt>
                       <dd><a href="javascript:;" data-type="work-bench" data-href="/swordfish/page_web_pc/issued/info">信息发布</a></dd>
                       <dd><a href="/jyxspc">中标必听课</a></dd>
@@ -39,21 +39,41 @@
                       <dd><a href="/big/page/sc">市场分析</a></dd>
                       <dd><a href="/big/page/cg">客户分析</a></dd>
                       <dd><a href="/jyblog/index.html">剑鱼博客</a></dd>
+                    </dl> -->
+                    <dl>
+                      <dt>服务</dt>
+                      <dd><a href="javascript:;" data-type="work-bench" data-href="/swordfish/page_web_pc/issued/info">信息发布</a></dd>
+                      <dd><a href="/front/advservices.html">广告服务</a></dd>
+                      <dd><a href="/swordfish/frontPage/bidedoc/free/index">标书制作</a></dd>
+                      <dd><a href="/swordfish/frontPage/enterpriseCertificatio/free/index">剑鱼认证服务</a></dd>
+                      <dd><a href="/active/transit/exhibitionPage">行业展会</a></dd>
                     </dl>
                     <dl>
-                        <dt>数据</dt>
+                        <dt>数据市场</dt>
                         <!-- <dd><a href="javascript:;">数据超市</a></dd> -->
                         <dd><a href="/front/dataExport/toSieve">自助导出</a></dd>
-                        <dd><a href="/front/structed/pc_index.html">定制服务</a></dd>
-                        <dd><a href="/front/dataPack/createOrder">数据流量包</a></dd>
-                        <!-- <dd><a href="javascript:;">数据定制导出</a></dd> -->
-                        <!-- <dd><a href="javascript:;">API接口</a></dd> -->
+                        <!-- <dd><a href="/front/structed/pc_index.html">定制服务</a></dd>
+                        <dd><a href="/front/dataPack/createOrder">数据流量包</a></dd> -->
+                        <dd><a href="/front/dataMarket/customExport">数据定制导出</a></dd>
+                        <dd><a href="/front/dataMarket/dataInterface">API接口</a></dd>
                     </dl>
                     <dl>
                         <dt>解决方案</dt>
                         <dd><a href="/swordfish/frontPage/solution/free/index">电信运营商</a></dd>
-                        <!-- <dd><a href="javascript:;">医疗器械</a></dd> -->
-                        <!-- <dd><a href="javascript:;">银行</a></dd> -->
+                        <dd><a href="http://clpages.cn/yxtgwyxy?from_wecom=1">医械通</a></dd>
+                        <dd><a href="/bank/pc/scheme">银行</a></dd>
+                    </dl>
+                    <dl>
+                      <dt><a href="/jySchool/index">剑鱼学堂</a></dt>
+                      <dd><a href="/swordfish/frontPage/solution/free/index">中标必听课</a></dd>
+                      <dd><a href="http://clpages.cn/yxtgwyxy?from_wecom=1">剑鱼文库</a></dd>
+                      <dd><a href="/bank/pc/scheme">招投标攻略</a></dd>
+                    </dl>
+                    <dl>
+                      <dt><a href="/industryInfo/index">行业资讯</a></dt>
+                    </dl>
+                    <dl>
+                      <dt><a href="/helpCenter/index">帮助中心</a></dt>
                     </dl>
 
                     <dl>

src/web/templates/site/page/helpCenter/videoDetail.html

@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>帮助中心</title>
+    <meta content="IE=edge,Chrome=1" http-equiv="X-UA-Compatible"/>
+    <meta content="帮助中心,热门操作指南,剑鱼标讯" name="Keywords"/>
+    <meta content="webkit" name="renderer">
+    <meta content="telephone=no" name="format-detection"/>
+    <meta content="帮助中心" theme="light" name="enable-header">
+    {{include "/common/pnc.html"}}
+    <link href='{{Msg "seo" "cdn"}}/css/reset.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css"/>
+    <link href='{{Msg "seo" "cdn"}}/pccss/reset_pc.css' rel="stylesheet" type="text/css"/>
+    <link href='{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}' rel="stylesheet"/>
+    <link href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css"/>
+    <!-- 高级语法兼容性处理  -->
+    <script>
+      if (String.prototype.startsWith === 'undefined') {
+        String.prototype.startsWith = function (str) {
+                if (str==null || str == "" || this.length == 0 || str.length > this.length) {
+                    return false
+                }
+                if (this.substr(0,str.length) == str) {
+                    return true
+                } else {
+                    return false
+        }
+      }
+        }
+        if (typeof Promise === 'undefined') {
+        document.write('<script src="https://cdn-common.jianyu360.com/cdn/lib/bluebird/3.7.2/js/browser/bluebird.core.min.js"><\/script>');
+        }
+        if (typeof fetch === 'undefined') {
+        document.write('<script src="//cdn-common.jianyu360.com/cdn/lib/whatwg-fetch/3.4.1/dist/fetch.umd.min.js"><\/script>');
+      }
+    </script>
+    <!-- 腾讯云视频点播 -->
+  	<script src="//imgcache.qq.com/open/qcloud/video/vcplayer/TcPlayer-2.3.2.js" charset="utf-8"></script>
+  	<!-- 获取ip -->
+  	<script src="https://pv.sohu.com/cityjson?ie=utf-8"></script>
+  	<script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266//build/pdf.min.js"></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266//web/pdf_viewer.js"></script>
+
+    <style>
+        #public-nav {
+            border-bottom: 1px solid #e0e0e0;
+            background: #fff;
+        }
+        .page--jyxspc--index .page-container {
+            min-height: calc(100vh - 364px);
+            padding-top: 64px;
+            box-sizing: border-box;
+        }
+        .page--jyxspc--index .w-box .w1200 {
+            width: 1200px;
+            margin: 0 auto;
+            min-width: 1200px;
+        }
+    </style>
+</head>
+<body class="page--jyxspc--index">
+{{include "/site/common/pc-help-center-head.html"}}
+<!-- S-注入  -->
+<div class="w-box page-container">
+    <div id="main-app"></div>
+</div>
+<!-- 主应用依赖 -->
+<script src=//cdn-common.jianyu360.com/cdn/lib/url-polyfill/1.1.12/url-polyfill.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/qiankun/2.7.0/index.umd.min.js></script>
+<script>
+  // 该页面是帮助中心热门操作指南视频详情-页面指向线上课程项目的详情路由
+  // 因该页面的顶部顶部导航栏、标题等与线上课程的顶部导航栏不一致，故建两个父应用页面，子应用挂载为同一个（线上课程子应用）
+  window.__QIANKUN_ROUTER_BASE = '/jyxspc'
+  qiankun.registerMicroApps(
+    [
+        {
+            name: 'courseSubApp',
+            entry: '/page_jyxspc/index.html',
+            container: '#main-app',
+            activeRule: '/',
+            props: {
+              className: window.parent !== window ? 'in-app' : 'in-web',
+              inject: function (options) {
+                options.Vue.prototype.$BRACE = window.$BRACE
+              }
+            }
+        }
+    ],
+    {
+        beforeLoad: function (app) {
+            console.log('before load', app)
+    },
+        beforeMount: [
+            function (app) {
+                console.log('before mount', app)
+            }
+        ]
+    }
+  )
+  qiankun.start({
+    sandbox: false
+  })
+</script>
+<script src='{{Msg "seo" "cdn"}}/js/jquery.cookie.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>
+<script src='{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>
+<script>
+    $(function () {
+      haslogin({{.T.logid}});
+    })
+</script>
+<!--S-百度统计-->
+{{include "/common/pcbottom.html"}}
+{{include "/common/baiducc.html"}}
+<!--E-百度统计-->
+</body>
+</html>

src/web/templates/site/page/industryInfo/class.html

@@ -57,7 +57,7 @@
           {{range $k,$v := .T.list}}
           <div class="art_list">
             <div class="art_l_left">
-              <div class="art_l_l_title" onclick="window.location.href='/jySite/{{$v._id}}.html'">
+              <div class="art_l_l_title ellipsis" onclick="window.location.href='/jySite/{{$v._id}}.html'">
                 {{$v.s_title}}
               </div>
               <div class="art_l_l_content">

src/web/templates/site/page/jySchool/class.html

@@ -68,7 +68,7 @@
                 </div>
                 {{if ne $v.s_pic ""}}
                 <div class="art_l_right">
-                  <img src="{{$v.s_pic}}" alt="">
+                  <img src="{{$v.s_pic1}}" alt="">
                 </div>
                 {{end}}
               </div>

src/web/templates/site/page/jySchool/index.html

@@ -68,25 +68,28 @@
               </p>
               <p class="c-m-cp">
                 <span class="hot-count">{{$v.i_clickRate}}</span>
-                {{if $v.isExpired}}
-                <span class="expired">已过期</span>
-                {{else}}
-                  {{if $v.isDiscount}}
-                    {{if eq $v.discountPrice 0.0}}
-                    <span class="hot-price">免费</span>
-                    {{else}}
-                    <span class="hot-price" style="font-size:18px;line-height: 28px;"><em style="font-size:12px;line-height: 18px;">￥</em>{{Division $v.discountPrice 100}}</span>
-                    <span class="coupon-tips">券后最低</span>
-                    {{end}}
-                    <span class="init-price"><em style="font-size:12px;line-height: 18px;">￥</em>{{Division $v.i_price 100}}</span>
+                <span>
+                  {{if $v.isExpired}}
+                  <span class="expired">已过期</span>
                   {{else}}
-                    {{if eq $v.i_price 0}}
-                    <span class="hot-price">免费</span>
+                    {{if $v.isDiscount}}
+                      {{if eq $v.discountPrice 0.0}}
+                      <span class="hot-price">免费</span>
+                      <span class="coupon-tips">券后最低</span>
+                      {{else}}
+                      <span class="hot-price" style="font-size:18px;line-height: 28px;"><em style="font-size:12px;line-height: 18px;">￥</em>{{Division $v.discountPrice 100}}</span>
+                      <span class="coupon-tips">券后最低</span>
+                      {{end}}
+                      <span class="init-price"><em style="font-size:12px;line-height: 18px;">￥</em>{{Division $v.i_price 100}}</span>
                     {{else}}
-                    <span class="hot-price" style="font-size:18px;line-height: 28px;"><em style="font-size:12px;line-height: 18px;">￥</em>{{Division $v.i_price 100}}</span>
+                      {{if eq $v.i_price 0}}
+                      <span class="hot-price">免费</span>
+                      {{else}}
+                      <span class="hot-price" style="font-size:18px;line-height: 28px;"><em style="font-size:12px;line-height: 18px;">￥</em>{{Division $v.i_price 100}}</span>
+                      {{end}}
                     {{end}}
                   {{end}}
-                {{end}}
+                </span>
               </p>
             </div>
           </div>

src/web/templates/site/page/jySchool/search.html

@@ -70,7 +70,7 @@
                 </div>
               </div>
               <div class="art_l_right">
-                <img src="{{$v.s_pic}}" alt="">
+                <img src="{{$v.s_pic1}}" alt="">
               </div>
             </div>
             {{end}}
@@ -126,7 +126,7 @@
               <div class="strate_content">
                 <div class="strate_c_list">
                   <div class="strate_l_left">
-                    <img src="{{$v.s_pic}}" alt="">
+                    <img src="{{$v.s_pic1}}" alt="">
                   </div>
                   <div class="strate_l_right">
                     <div class="strate_l_r_title" onclick="window.location.href='/jySite/{{$v._id}}.html'">{{$v.s_title}}</div>
@@ -151,7 +151,7 @@
               <div class="strate_content">
                 <div class="strate_c_list">
                   <div class="strate_l_left">
-                    <img src="{{$v.s_pic}}" alt="">
+                    <img src="{{$v.s_pic1}}" alt="">
                   </div>
                   <div class="strate_l_right">
                     <div class="strate_l_r_title" onclick="window.location.href='/jySite/{{$v._id}}.html'">{{$v.s_title}}</div>

src/web/templates/site/page/jyblogdetail.html

@@ -17,8 +17,11 @@
   <link href='{{Msg "seo" "cdn"}}/site/page/industryInfo/css/industry_content.css?v={{Msg "seo" "version"}}' rel="stylesheet">
 </head>
 <body>
-{{include "/site/common/pc-school-head.html"}}
-
+{{if eq .T.pCode "ztbgl"}}
+  {{include "/site/common/pc-school-head.html"}}
+{{else}}
+  {{include "/common/pchead.html"}}
+{{end}}
 <section class="page-industry-content">
   <div class="page-school-main w1200">
     <!--    导航-->
@@ -125,7 +128,7 @@
               <span>最新文章</span>
               <span onclick="window.location.href='/industryInfo/index'">MORE</span>
             {{else}}
-              <span>内容推荐</span>
+              <span>内容推荐{{.T.pCode}}</span>
               <span onclick="window.location.href='/jySchool/strategy'">MORE</span>
             {{end}}
           </div>