Przeglądaj źródła

Merge branch 'dev3.6' of http://192.168.3.207:10080/qmx/jy into dev3.6

wangshan 4 lat temu
rodzic
commit
14f7a23894

+ 34 - 0
src/jfw/front/frontRouter.go

@@ -11,6 +11,9 @@ type CommonRouter struct {
 	*xweb.Action
 	wxCommonPage xweb.Mapper `xweb:"/weixin/frontPage/(.*)/(sess|free)/(.*)"`    //新的历时推送记录
 	pcCommonPage xweb.Mapper `xweb:"/swordfish/frontPage/(.*)/(sess|free)/(.*)"` //新的历时推送记录
+
+	integralPage xweb.Mapper `xweb:"/(swordfish|weixin)/integral/(.*)"` //积分页面路由
+	docsPage     xweb.Mapper `xweb:"/(swordfish|weixin)/docs/(.*)"`     //文库页面路由
 }
 
 func init() {
@@ -34,3 +37,34 @@ func (this *CommonRouter) PcCommonPage(folder, loginSign, htmlPage string) error
 	}
 	return this.Render(fmt.Sprintf("/frontRouter/pc/%s/%s/%s.html", folder, loginSign, htmlPage))
 }
+
+//积分
+func (this *CommonRouter) IntegralPage(client, htmlPage string) error {
+	userid, _ := this.GetSession("userId").(string)
+	switch client {
+	case "weixin":
+		if userid == "" {
+			return this.Redirect("/swordfish/about")
+		}
+		return this.Render(fmt.Sprintf("/frontRouter/wx/integral/sess/%s.html", htmlPage))
+	case "swordfish":
+		if userid == "" {
+			return this.Redirect("/swordfish/about")
+		}
+		return this.Render(fmt.Sprintf("/frontRouter/pc/integral/sess/%s.html", htmlPage))
+	default:
+		return this.Redirect("/swordfish/about")
+	}
+}
+
+//文库
+func (this *CommonRouter) DocsPage(client, htmlPage string) error {
+	switch client {
+	case "weixin":
+		return this.Render(fmt.Sprintf("/frontRouter/wx/docs/free/%s.html", htmlPage))
+	case "swordfish":
+		return this.Render(fmt.Sprintf("/frontRouter/pc/docs/free/%s.html", htmlPage))
+	default:
+		return this.Redirect("/swordfish/about")
+	}
+}

+ 17 - 0
src/jfw/modules/app/src/app/front/frontRouter.go

@@ -10,6 +10,9 @@ import (
 type CommonRouter struct {
 	*xweb.Action
 	appCommonPage xweb.Mapper `xweb:"/jyapp/frontPage/(.*)/(sess|free)/(.*)"` //新的历时推送记录
+
+	integralPage xweb.Mapper `xweb:"/jyapp/integral/(.*)"` //积分页面路由
+	docsPage     xweb.Mapper `xweb:"/jyapp/docs/(.*)"`     //文库页面路由
 }
 
 func init() {
@@ -24,3 +27,17 @@ func (this *CommonRouter) AppCommonPage(folder, loginSign, htmlPage string) erro
 	}
 	return this.Render(fmt.Sprintf("/frontRouter/%s/%s/%s.html", folder, loginSign, htmlPage))
 }
+
+//积分
+func (this *CommonRouter) IntegralPage(htmlPage string) error {
+	userid, _ := this.GetSession("userId").(string)
+	if userid == "" {
+		return this.Redirect("/jyapp/swordfish/about")
+	}
+	return this.Render(fmt.Sprintf("/frontRouter/integral/sess/%s.html", htmlPage))
+}
+
+//文库
+func (this *CommonRouter) DocsPage(htmlPage string) error {
+	return this.Render(fmt.Sprintf("/frontRouter/docs/free/%s.html", htmlPage))
+}

+ 7 - 4
src/web/templates/common/pchead.html

@@ -503,10 +503,7 @@
                 <li name="数据服务">
                     <a href="/front/dataService.html">数据服务</a>
 				</li>
-                <li style="position: relative" name="招标文件解读">
-                    <div class="badge-box badge--new">
-                        <div class="" data-text="NEW">NEW</div>
-                    </div>
+                <li  name="招标文件解读">
                     <a href="/bid/pc/page/bidfile_landpage">招标文件解读</a>
                 </li>
 				<li name="中标必听课">
@@ -521,6 +518,12 @@
                       </div>
 					</div>-->
 				</li>
+                <li style="position: relative" name="剑鱼文库">
+                    <div class="badge-box badge--new">
+                        <div class="" data-text="NEW">NEW</div>
+                    </div>
+                    <a href="/swordfish/frontPage/docs/sess/index">剑鱼文库</a>
+                </li>
 				<li class="slider"></li>
 			</ul>
 			<div class='useronline' id="login" style="float:left;"></div>

+ 98 - 0
src/web/templates/frontRouter/pc/docs/sess/index.html

@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>剑鱼文库_剑鱼标讯,全行业招标信息智能推送领导者</title>
+    <meta content="IE=edge,Chrome=1" http-equiv="X-UA-Compatible"/>
+    <meta content="招标订阅,招标项目,中标项目,招标信息,剑鱼标讯" name="Keywords"/>
+    <meta content="使用剑鱼标讯,可以精准匹配招标信息,只需要微信关注剑鱼标讯公众号,然后自行设定所关注的招标关键词和地区,满足订阅需求的招标信息就会在两个小时内自动推送。" name="Description"/>
+    <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"/>
+    <!-- S-注入  -->
+    <meta name="importmap-type" content="systemjs-importmap">
+    <script type="systemjs-importmap">
+      {
+        "imports": {
+          "app": "http://localhost:8080/js/app.js",
+          "single-spa": "https://cdnjs.cloudflare.com/ajax/libs/single-spa/4.3.7/system/single-spa.min.js",
+          "vue": "https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.js",
+          "vue-router": "https://cdn.jsdelivr.net/npm/vue-router@3.0.7/dist/vue-router.min.js"
+        }
+      }
+    </script>
+    <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/single-spa/4.3.7/system/single-spa.min.js" as="script" crossorigin="anonymous" />
+    <link rel="preload" href="https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.js" as="script" crossorigin="anonymous" />
+    <script src="https://unpkg.com/import-map-overrides@1.7.2/dist/import-map-overrides.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/6.1.1/system.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/6.1.1/extras/amd.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/6.1.1/extras/named-exports.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/6.1.1/extras/named-register.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/6.1.1/extras/use-default.min.js"></script>
+    <script>
+      (function() {
+        Promise.all([System.import('single-spa'), System.import('vue'), System.import('vue-router')]).then(function (modules) {
+          var singleSpa = modules[0];
+          var Vue = modules[1];
+          var VueRouter = modules[2];
+
+          Vue.use(VueRouter)
+
+          singleSpa.registerApplication(
+            'app',
+            () => System.import('app'),
+            location => location.pathname.startsWith('/')
+          )
+
+          singleSpa.start();
+        })
+      })()
+    </script>
+    <!-- E-注入  -->
+
+    <style>
+        #public-nav {
+            border-bottom: 1px solid #e0e0e0;
+        }
+        .page--docs--index .page-container {
+            min-height: calc(100vh - 364px);
+            padding-top: 77px;
+            box-sizing: border-box;
+            background: linear-gradient(180deg, #E9FCFF 0%, #E8F2FF 100%);
+        }
+        .page--docs--index .w-box .w1200 {
+            width: 1200px;
+            margin: 0 auto;
+            min-width: 1200px;
+        }
+    </style>
+</head>
+<body class="page--docs--index">
+{{include "/common/pchead.html"}}
+<!-- S-注入  -->
+<div class="w-box page-container">
+    <div class="w1200">
+        <div id="single-spa-app"></div>
+    </div>
+</div>
+<!-- See https://github.com/joeldenning/import-map-overrides#user-interface  -->
+<import-map-overrides-full show-when-local-storage="overrides-ui"></import-map-overrides-full>
+<!-- E-注入  -->
+
+<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>