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

src/jfw/front/swordfish.go

@@ -1723,8 +1723,10 @@ func (m *Front) About() error {
 				if code == "" {
 					m.T["code"] = "wx01" //新用户微信访问，统计app下载量
 				}
+				//微信浏览器访问 基本不走此
 				return m.Render("/weixin/sharePage.html")
 			} else {
+				//非微信浏览器访问
 				return m.Redirect("/active/appExt/sh001")
 			}
 		} else {

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

@@ -9,6 +9,13 @@
     height: .88rem;
     width: .88rem;
 }
+.jy_sprite_home_icon_add {
+  background: url(/jyapp/images/sprite/home_area_add.png) no-repeat;
+  background-size: 1.76rem 0.88rem;
+  display: inline-block;
+  height: .88rem;
+  width: .88rem;
+}
 .tab_item .icon_1 {
     background-position: 0 0;
 }
@@ -33,6 +40,12 @@
 .tab_item .icon_8 {
     background-position: -6.72rem 0;
 }
+.tab_item .icon_9 {
+  background-position: 0 0;
+}
+.tab_item .icon_10 {
+  background-position: -0.88rem 0;
+}
 .jy_sprite_main {
     background-image: url(/jyapp/images/sprite/mainSearch.png?v=51430);
     background-size: 8.98rem 4.71rem;
@@ -3523,7 +3536,7 @@ body{
 }
 .p13 .home .home_tab .tab_container .tab_item span {
     color: #171826;
-    font-size: 0.24rem;
+    font-size: 0.22rem;
 }
 .p13 .home .top .home_banner .lunbo .swiper-slide a img {
     background: #EDEFF2;

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

@@ -251,8 +251,11 @@
 }
 .share1 .overlay .share-sheet .description {
   display: flex;
-  justify-content: center;
+  justify-content: flex-start;
   align-items: center;
+  padding: 0 .2rem;
+  margin-bottom: .4rem;
+  line-height: 0;
 }
 .share1 .overlay .share-sheet .description img {
   width: 24px;

src/jfw/modules/app/src/web/staticres/jyapp/me/css/mine-icons.css

@@ -91,3 +91,13 @@
 .icon-arrow-right {
     background-image: url(data:img/jpg;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADgSURBVHgB7ZbBDcIwDEXtSL0zAkNw4YKUDdigbAKbABPABoYCQoKirtA9Klp6CDfU2sXuKe8SOVL0n36kKACRiCJExQSEOFDifHutMXkXRPep5ByCApTlS3RwCGPZVJX3fl5yzqo04BezY1PX+zBOMUmI24RKA18oe+zQuTSMrCZUBYZIqAtIJUwEJBJmAlwJUwGOhLlAn8QoAl0Sak9xH21483MfRuB0zbftsgrjuFfQFW4u0BduKsAJNxPghpsISMLVBaThqgJDwtUE/vmSqTVAl+cGEVNJuDpDvuWRyAcdYr8vwX4HsQAAAABJRU5ErkJggg==);
 }
+
+/* /jyapp/me/images/my_points.png */
+.icon-points {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAATUSURBVHgB7VlLbxtVFD7njpMG6MKsKoUipkKsmaZEtdJFJ7+gyY5dHClF4aHG/AInO3axV6nURri/AHfJikEikQukNb+gA0KIHWZR8vLM4Rw/Us/Ydx72VO3C38aee+/ce+55nzMAU0wxxRuNjc2v7I3Nkq2bR3hDIYQDGmUCaO3vVVd163KQEaxCwVRtXEFDfUxANhLmmT15nnL5d/uocfAoyT7FzZJpIO3y3xUm3vUu4fWo9RNLYGFxqYgK1/ivHbGsdfTk4N2I+S7hQGVEKMpzh3jC5dr9ihv13tgSsD4p2IahvmUemHFrRQ10c8VSKZ8787eAqMSP+f76JMQLUl/Asu28Oj4vs+hKSdYTQctQtAM6wk+FcMwHZ3E9CfGCVBcQPc8dn3/HHLI0SxwC/7Hho3P+zqzbdJyRnP/sy3tr/ilVhglnEO7s36/UISES24AQb5D6QaMyNQ+9nWaj4cbtc/eLe1tEWNFMOw/3qsuQAokkIGpjHJ8NES+G5vu02vzlsJlkHzFUItrWLiD6F1JCJVrEOj/EeYJH/lsz15MSL8j53gr0DHUU2Jv9AykRK4GOmwwbLFH96OfDIqQEGeq26Kx4GYy4SBrESgAVlANEiH9+e3YdxoAQze/X2UWODE7k0++QEpESEO6HVcdHb7npHLRgDLTppXvc+HwLskCkBHoRdhC1JJ5Ghzjf7gNFzo+C9gLiNiGUHoirhAwgQQxGEmO4kBLaCyhP2aEhZxLuB3Ay2oDRg9Sqqb0AG++dwWeJsJARctA2R40/eFBJ7JL70NsAoRlY6BmpN9dvPVICDoyBKC9kDj60L+cyuwCSsoaSGKIfBx9vFG6tsVVXeF0rqp7QSyDEJV1iNhYQb4eH2qBqgQFJObo0mKy/utwpWSqRJSQfgpB3Y5WqDbtYNAcetFE7wgaCHkESOsgAM8q/Ex7zfAy4Z8saOksrfe0FCCn40osXJkyIDvcJQ4UQfj3E/bmTYL1B4Or21F8gZFRK5WyYEDOKpBgyuzRxQsepxcO9ypB+K8LgBVCfI2m9EBfX4nUuUgkEJaLXGlMUJPIaZ7TL5aXVI7zqzUFlv1IZqRq9sy7ANqKt0LQVWbcCM54PjnEqcS1tNC7eLVmG4YvacAqt6u05aNY0hI9zbmRJeePmLa7CAh6jxu2RsVLppOAzudPRba304PCZ2jIz0o2yIYeDR3FxccmCV4ReAlmEaBoCiC3qF24uPUdAc2DI9aSUzDKwwUXd/WzQ/0vx9PTJwbWo92IDmUIVVhnTOD7fhYxh/Hc23CRDik3fjbgFf/35hzt/9QNpCxYGhq35q+9bVz768Pu/XfcEJoBwfv7Ke3uI+GlwBqvM/W/i3k+USninuW2WZyiZwxWWxLOe3o4Fi+1J1AbDet9RUz4zAVI1thQ3tkL20EfixlZ/L3aV0iwohuc6vSapuxPulao7HXMJgUOe/5hr2yZcnmv2Db2TR3Eqoihnc/tdgpSteb/JjFhNE2tSt9cl0TIutbeZV9m0FV6SUhW1Sevdxv4+sFDglgtBOUIaiSAqoxDXf2385MAYmPwDB1+Ec5u4Dxyj4EiQeto4rMEEyOwbWcc+QNnoSzMATck6sVfVyTcC9umcC6G033+bRao3supwTDHFFFO8VvwP4bbiY1CQEZQAAAAASUVORK5CYII=);
+}
+
+/* /jyapp/me/images/my_docs.png */
+.icon-docs {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANfSURBVHgB7ZjNThNRFMfPmQ5DiZtiTfyKSX2DBlQa2AxvoEtXDAQTTDStT0B9Aoe4EIPR8gTAE9AFJrjQ1CegC6JYP5iNSEvnHu+UDum003Lnoy0k80uazsy9p/P/d86de+4FiIiIiBgmCB5ZXHqmIsayDCANIYEIBhKUTWJb71dfFzzFinbUcrmEXKUNfqhCfynWR/FRQdcNkc4SCDJSo23ov3gLtflHCSFkYGEppxGFlzICqAtLzzWRjrJIJwlpznEBoQQMX/DgMoSAaUKCZPoALeNKQsm6Z+G8WCED0JY6dcZzdFUvQ4jwMTbLU+ew5ZLQExceA62ELb7xm52DNiES58vARUI0hbqiPcmlZZleEUDKS1zj3X+C82tregkCENjAiEwblnjPMyIP4gPXejWPQwACpxAJ5mq/6GkgfS+jTk7NbPfqwwBfgl8IV3o183vvTdyf1nr1wR7BZzPvjZu3IJlMgqKMNtrevVlxxFllRvzY25M4joPR/uZZfJol69s061CpVODg+7dmC22aY8p8qVjsKC9cx8BEZnqZ54Zqn1s/9Of3L7iavNYw0k5TiFDt0gtb+M/KD35strTgQ+mo9pUf5NtjXJ/A5NT0Hm9KubUpigLVajXPJLZe2t0tQwikVTXBBWZlWc47hTswPn/62DHguxiYITifMhEVghixhSNgjis5NwW5gQ69QgYIqMxvkgJ3PBsREc6LRwPb2nwbMNG8K4OsMWJzQYyICpckXKnHZT327+QwFAN2YDqTSfkx4lW4/bbppsO3ARtRI/xT5IEGF6d5ES6qw8JXKdH8Z/PcSKGHEetcayjA7sLNMVn/4vJ+FyVQLSRoxEFYwm0CF3MWIkbCFm4TigGbMyOqqseOTJXAPF1V8S0TdkXZDFO4TagGbJqDcbP56SuXfkUWGRg2kYFhI2TAqmVgwKTTqv99Iat8bj2X/54sw4CR4rWs4wKB6/aL+zyAsM4DzkSTBLnJBzMaIYU+EbnenjDB7+94AoRs3a2vqwF2rOjSaM1ZDvBqkp8PJpXaij9eEJYZkuuk6JpCpVLRYMhm21NpGJyKN2e7LZJi3QIP9veN63dub0kkjTd23hDiMEBOl5T0lo0pj0s7Owfd+gnvCGb4IgYGyG5IOx4REREXnP/2G7L/stZoqgAAAABJRU5ErkJggg==);
+}

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -106,7 +106,14 @@ var mine = {
             var url = $(this).attr('data-href')
             autoLogin(url)
         })
-
+        // 我的文库
+        $('.my-docs').on('click', function (e) {
+          location.href = "/jyapp/docs/page/home";
+        })
+        // 我的剑鱼币
+        $('.my-points').on('click', function (e) {
+          location.href = "/jyapp/integral/page/home";
+        })
         // 合作伙伴
         $(".partner").on("click", function () {
             $.ajax({

src/jfw/modules/app/src/web/templates/me/mine.html

@@ -131,6 +131,30 @@
                         </div>
                     </div>
                 </div>
+                <div class="menu">
+                  <div class="menu_list my-docs" data-need-bind-phone>
+                      <div class="menu_list_left">
+                          <span class="j-icon base-icon icon-docs"></span>
+                          <span class="label">我的文库</span>
+                      </div>
+                      <div class="menu_list_right">
+                          <div class="partner_value"></div>
+                          <span class="j-icon base-icon icon-arrow-right"></span>
+                      </div>
+                  </div>
+                </div>
+                <div class="menu">
+                  <div class="menu_list my-points" data-need-bind-phone>
+                      <div class="menu_list_left">
+                          <span class="j-icon base-icon icon-points"></span>
+                          <span class="label">我的剑鱼币</span>
+                      </div>
+                      <div class="menu_list_right">
+                          <div class="partner_value"></div>
+                          <span class="j-icon base-icon icon-arrow-right"></span>
+                      </div>
+                  </div>
+                </div>
                 <div class="menu">
                     <div class="menu_list partner" data-need-bind-phone>
                         <div class="menu_list_left">

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -155,7 +155,7 @@
                         <span>投标决策</span>
                     </a>
                     <a class="tab_item" data-only-name="潜在项目预测" id="mainSearch-tab2">
-                        <div class="jy_sprite_home_icon icon_2"></div>
+                        <div class="jy_sprite_home_icon_add icon_9"></div>
                         <span>潜在项目预测</span>
                     </a>
                     <a class="tab_item" data-only-name="中标企业预测" id="mainSearch-tab3">
@@ -166,6 +166,10 @@
                         <div class="jy_sprite_home_icon icon_4"></div>
                         <span>企业监控</span>
                     </a>
+                    <a class="tab_item" data-only-name="剑鱼文库" id="">
+                      <div class="jy_sprite_home_icon icon_2"></div>
+                      <span>剑鱼文库</span>
+                  </a>
                 </div>
                 <div class="tab_container">
                     <a class="tab_item" data-only-name="数据导出" id="mainSearch-tab5">
@@ -184,6 +188,10 @@
                         <div class="jy_sprite_home_icon icon_8"></div>
                         <span>中标必听课</span>
                     </a>
+                    <a class="tab_item" data-only-name="签到" id="">
+                      <div class="jy_sprite_home_icon_add icon_10"></div>
+                      <span>签到</span>
+                  </a>
                 </div>
             </div>
             <!-- 最新标讯 -->
@@ -903,6 +911,24 @@
                     }
                     break
                 }
+                case '剑鱼文库': {
+                    if(userId==""){
+                        window.location.href='/jyapp/free/login?back=index';
+                    }else{
+                        window.location.href='/jyapp/docs/page/home';
+                    }
+                    break
+                }
+                case '签到': {
+                    if(userId==""){
+                        window.location.href='/jyapp/free/login?back=index';
+                    }else{
+                        try {
+                          JyObj.skipAppointTab('me')
+                        } catch (error) {}
+                    }
+                    break
+                }
             }
         })
         backThisPage();

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

@@ -27,7 +27,7 @@
         <span class="header-title">公告信息 </span>
         <span class="header-share" id="share" style="padding-top: 26px; visibility: hidden">
 		<img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/hongbao.png?v={{Msg "seo" "version"}}">
-		<p style="font-size: 10px; line-height: 12px">分享赚钱</p>
+		<p style="font-size: 10px; line-height: 12px">分享有礼</p>
         </span>
     </div>
     <div class="main share-pic-main">

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

@@ -51,12 +51,12 @@
         <span class="header-title">公告信息</span>
         <span class="header-share" id="share">
 		<img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/hongbao.png?v={{Msg "seo" "version"}}">
-		<p style="font-size: 10px; line-height: 12px">分享赚钱</p>
+		<p style="font-size: 10px; line-height: 12px">分享有礼</p>
             <!-- 分享 star -->
 {{/*    <div class="overlay">*/}}
             {{/*      <div class="share-sheet">*/}}
             {{/*        <div class="title">*/}}
-            {{/*          <h4>分享赚钱</h4>*/}}
+            {{/*          <h4>分享有礼</h4>*/}}
             {{/*          <img src="/jyapp/images/close.png" alt="" class="close">*/}}
             {{/*        </div>*/}}
             {{/*        <div class="description">*/}}
@@ -68,7 +68,7 @@
     <div class="overlay">
       <div class="share-sheet">
         <div class="title">
-          <h4>分享赚钱</h4>
+          <h4>分享有礼</h4>
           <img src="/jyapp/images/img/close.png" alt="" class="close">
         </div>
         <div class="description">
@@ -76,6 +76,11 @@
           <p>分享剑鱼标讯产品给好友，购买成功您得佣金</p>
           <a href="/page_partner/partner/partner.html?flag=1">了解详情</a>
         </div>
+        <div class="description">
+          <img src="/jyapp/images/jianyubi.png" alt="">
+          <p>分享招标信息及文档，好友访问立得剑鱼币</p>
+          <a href="/jyapp/integral/page/share">了解详情</a>
+        </div>
         <div class="sheet-option">
           <ul class="shareType">
             <li id="weixin " class="Software">

src/web/staticres/css/wx/home.css

@@ -136,9 +136,11 @@ width: 100%;
 }
 
 .home .home_tab .tab_container .tab_item .bg_img_4 {
-  background: url(/images/search/home_tab1.png) no-repeat;
-  background-size: .88rem 4.41rem;
-  background-position: 0 -1.76rem;
+  width: 0.88rem;
+  height: 0.88rem;
+  background: url(/images/search/home_tab2.png) no-repeat;
+  background-size: 7.6rem .88rem;
+  background-position: -0.96rem 0;
 }
 
 .home .home_tab .tab_container .tab_item .bg_img_5 {

src/web/staticres/js/login.js

@@ -359,10 +359,19 @@ var logic = function(data,num){
 					+"<span class='two'></span>"
 					+"<div class='usernameDiv'>"
 						+data.s_nickname
-					+"</div>"
-					 +"<div class=\"myorderDiv\" onclick=\"window.location.href='/front/swordfish/toMyOrder'\">"
-					 	+"<span>我的订单</span>"
-					 +"</div>"
+          +"</div>"
+          +"<div class=\"myorderDiv\" style=\"border-bottom:0;\" onclick=\"window.location.href='/swordfish/docs/index/mine'\">"
+            +"<span>我的文库</span>"
+          +"</div>"
+          +"<div class=\"myorderDiv\" onclick=\"window.location.href='/swordfish/docs/index/keep'\">"
+          +"<span>文库收藏</span>"
+          +"</div>"
+          +"<div class=\"myorderDiv\" onclick=\"window.location.href='/swordfish/integral/page/mine'\">"
+          +"<span>我的剑鱼币</span>"
+          +"</div>"
+          +"<div class=\"myorderDiv\" onclick=\"window.location.href='/front/swordfish/toMyOrder'\">"
+          +"<span>我的订单</span>"
+          +"</div>"
 					hhtml+= "<div class='exitDiv' onclick='signout()'>"
 						+"<img id='outImg' src='/images/userexit.png'/>"
 						+"<span>退出</span>"
@@ -594,14 +603,23 @@ var haslogin = function(num,kyorpn,url){
 						+"<span class='two'></span>"
 						+"<div class='usernameDiv'>"
 							+data.s_nickname
-						+"</div>"
-						 +"<div class=\"myorderDiv\" onclick=\"window.location.href='/front/swordfish/toMyOrder'\">"
-						 	+"<span>我的订单</span>"
-						 +"</div>"
-                         hhtml+= "<div class='exitDiv' onclick='signout()'>"
-                         	+"<img id='outImg' src='/images/userexit.png'/>"
-                         	+"<span>退出</span>"
-                         +"</div>"
+            +"</div>"
+            +"<div class=\"myorderDiv\" style=\"border-bottom:0;\" onclick=\"window.location.href='/swordfish/docs/index/mine'\">"
+              +"<span>我的文库</span>"
+            +"</div>"
+            +"<div class=\"myorderDiv\" onclick=\"window.location.href='/swordfish/docs/index/keep'\">"
+              +"<span>文库收藏</span>"
+            +"</div>"
+            +"<div class=\"myorderDiv\" onclick=\"window.location.href='/swordfish/integral/page/mine'\">"
+              +"<span>我的剑鱼币</span>"
+            +"</div>"
+            +"<div class=\"myorderDiv\" onclick=\"window.location.href='/front/swordfish/toMyOrder'\">"
+            +"<span>我的订单</span>"
+            +"</div>"
+            hhtml+= "<div class='exitDiv' onclick='signout()'>"
+            +"<img id='outImg' src='/images/userexit.png'/>"
+            +"<span>退出</span>"
+            +"</div>"
 					+"</div>"
 				+"</div>"
 			$("#login").html(hhtml);

src/web/staticres/me/css/mine-icons.css

@@ -120,4 +120,13 @@
 }
 .icon-bind-phone {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAwCAYAAAB0WahSAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAEOSURBVHgB7ZnRDYIwEIZ/jAPgBoygG8AGbCAbOIJsRJwANsANcAPd4DyEGjxRQxuKD/cllzY0XD/ovXAAA4go5Dhy1DQ/7R6Z2TsYSEQ8lBwR/HLhSIKFJZ4yq36SLijREhmRPRbGHA19WK8wDzGmiAQMZmBsvxX+BBWRqIhERSQqIlERiYpIVESiIhIVkaiIREUkKiJREcn62yJ/oubwxK9ugDe0RiRruFNxnPr5AS4tMLKnGMlVkAWuxbrjptJZiEQ8NJiIq8iGRW7yok0+12Ld4l0igy18c0N2NBzpIE9MlrlMgpzcuJL9wzwwNRLyUGPpFnhfcAm6Br13iX7vV/jtZOTnN0lJXUm0p4E7KCCQ/JgS4goAAAAASUVORK5CYII=);
+}
+/* /jyapp/me/images/my_points.png */
+.icon-points {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAATUSURBVHgB7VlLbxtVFD7njpMG6MKsKoUipkKsmaZEtdJFJ7+gyY5dHClF4aHG/AInO3axV6nURri/AHfJikEikQukNb+gA0KIHWZR8vLM4Rw/Us/Ydx72VO3C38aee+/ce+55nzMAU0wxxRuNjc2v7I3Nkq2bR3hDIYQDGmUCaO3vVVd163KQEaxCwVRtXEFDfUxANhLmmT15nnL5d/uocfAoyT7FzZJpIO3y3xUm3vUu4fWo9RNLYGFxqYgK1/ivHbGsdfTk4N2I+S7hQGVEKMpzh3jC5dr9ihv13tgSsD4p2IahvmUemHFrRQ10c8VSKZ8787eAqMSP+f76JMQLUl/Asu28Oj4vs+hKSdYTQctQtAM6wk+FcMwHZ3E9CfGCVBcQPc8dn3/HHLI0SxwC/7Hho3P+zqzbdJyRnP/sy3tr/ilVhglnEO7s36/UISES24AQb5D6QaMyNQ+9nWaj4cbtc/eLe1tEWNFMOw/3qsuQAokkIGpjHJ8NES+G5vu02vzlsJlkHzFUItrWLiD6F1JCJVrEOj/EeYJH/lsz15MSL8j53gr0DHUU2Jv9AykRK4GOmwwbLFH96OfDIqQEGeq26Kx4GYy4SBrESgAVlANEiH9+e3YdxoAQze/X2UWODE7k0++QEpESEO6HVcdHb7npHLRgDLTppXvc+HwLskCkBHoRdhC1JJ5Ghzjf7gNFzo+C9gLiNiGUHoirhAwgQQxGEmO4kBLaCyhP2aEhZxLuB3Ay2oDRg9Sqqb0AG++dwWeJsJARctA2R40/eFBJ7JL70NsAoRlY6BmpN9dvPVICDoyBKC9kDj60L+cyuwCSsoaSGKIfBx9vFG6tsVVXeF0rqp7QSyDEJV1iNhYQb4eH2qBqgQFJObo0mKy/utwpWSqRJSQfgpB3Y5WqDbtYNAcetFE7wgaCHkESOsgAM8q/Ex7zfAy4Z8saOksrfe0FCCn40osXJkyIDvcJQ4UQfj3E/bmTYL1B4Or21F8gZFRK5WyYEDOKpBgyuzRxQsepxcO9ypB+K8LgBVCfI2m9EBfX4nUuUgkEJaLXGlMUJPIaZ7TL5aXVI7zqzUFlv1IZqRq9sy7ANqKt0LQVWbcCM54PjnEqcS1tNC7eLVmG4YvacAqt6u05aNY0hI9zbmRJeePmLa7CAh6jxu2RsVLppOAzudPRba304PCZ2jIz0o2yIYeDR3FxccmCV4ReAlmEaBoCiC3qF24uPUdAc2DI9aSUzDKwwUXd/WzQ/0vx9PTJwbWo92IDmUIVVhnTOD7fhYxh/Hc23CRDik3fjbgFf/35hzt/9QNpCxYGhq35q+9bVz768Pu/XfcEJoBwfv7Ke3uI+GlwBqvM/W/i3k+USninuW2WZyiZwxWWxLOe3o4Fi+1J1AbDet9RUz4zAVI1thQ3tkL20EfixlZ/L3aV0iwohuc6vSapuxPulao7HXMJgUOe/5hr2yZcnmv2Db2TR3Eqoihnc/tdgpSteb/JjFhNE2tSt9cl0TIutbeZV9m0FV6SUhW1Sevdxv4+sFDglgtBOUIaiSAqoxDXf2385MAYmPwDB1+Ec5u4Dxyj4EiQeto4rMEEyOwbWcc+QNnoSzMATck6sVfVyTcC9umcC6G033+bRao3supwTDHFFFO8VvwP4bbiY1CQEZQAAAAASUVORK5CYII=);
+}
+
+/* /jyapp/me/images/my_docs.png */
+.icon-docs {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANfSURBVHgB7ZjNThNRFMfPmQ5DiZtiTfyKSX2DBlQa2AxvoEtXDAQTTDStT0B9Aoe4EIPR8gTAE9AFJrjQ1CegC6JYP5iNSEvnHu+UDum003Lnoy0k80uazsy9p/P/d86de+4FiIiIiBgmCB5ZXHqmIsayDCANIYEIBhKUTWJb71dfFzzFinbUcrmEXKUNfqhCfynWR/FRQdcNkc4SCDJSo23ov3gLtflHCSFkYGEppxGFlzICqAtLzzWRjrJIJwlpznEBoQQMX/DgMoSAaUKCZPoALeNKQsm6Z+G8WCED0JY6dcZzdFUvQ4jwMTbLU+ew5ZLQExceA62ELb7xm52DNiES58vARUI0hbqiPcmlZZleEUDKS1zj3X+C82tregkCENjAiEwblnjPMyIP4gPXejWPQwACpxAJ5mq/6GkgfS+jTk7NbPfqwwBfgl8IV3o183vvTdyf1nr1wR7BZzPvjZu3IJlMgqKMNtrevVlxxFllRvzY25M4joPR/uZZfJol69s061CpVODg+7dmC22aY8p8qVjsKC9cx8BEZnqZ54Zqn1s/9Of3L7iavNYw0k5TiFDt0gtb+M/KD35strTgQ+mo9pUf5NtjXJ/A5NT0Hm9KubUpigLVajXPJLZe2t0tQwikVTXBBWZlWc47hTswPn/62DHguxiYITifMhEVghixhSNgjis5NwW5gQ69QgYIqMxvkgJ3PBsREc6LRwPb2nwbMNG8K4OsMWJzQYyICpckXKnHZT327+QwFAN2YDqTSfkx4lW4/bbppsO3ARtRI/xT5IEGF6d5ES6qw8JXKdH8Z/PcSKGHEetcayjA7sLNMVn/4vJ+FyVQLSRoxEFYwm0CF3MWIkbCFm4TigGbMyOqqseOTJXAPF1V8S0TdkXZDFO4TagGbJqDcbP56SuXfkUWGRg2kYFhI2TAqmVgwKTTqv99Iat8bj2X/54sw4CR4rWs4wKB6/aL+zyAsM4DzkSTBLnJBzMaIYU+EbnenjDB7+94AoRs3a2vqwF2rOjSaM1ZDvBqkp8PJpXaij9eEJYZkuuk6JpCpVLRYMhm21NpGJyKN2e7LZJi3QIP9veN63dub0kkjTd23hDiMEBOl5T0lo0pj0s7Owfd+gnvCGb4IgYGyG5IOx4REREXnP/2G7L/stZoqgAAAABJRU5ErkJggg==);
 }

src/web/staticres/wxswordfish/share.js

@@ -8,6 +8,8 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 	activecode=activecode||""
 	if(typeof(openid) == "undefined" || openid == null || openid == ""){
 		openid = "-1";
+	}else{
+		openid = encodeURIComponent(openid)
 	}
 	if(typeof(signature) != "undefined" && signature != null && signature.length == 4){
 		wx.config({

src/web/templates/common/pnc.html

@@ -17,6 +17,6 @@
 <script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/jyWebScoket.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/jy.js?v={{Msg "seo" "version"}}"></script>
-<script src="{{Msg "seo" "cdn"}}/js/login.js?v={{Msg "seo" "version"}}111"></script>
+<script src="{{Msg "seo" "cdn"}}/js/login.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
 {{Html `<!--[if lt IE 9]><script src="{{Msg "seo" "cdn"}}/js/html5shiv.min.js"></script><script src="{{Msg "seo" "cdn"}}/js/respond.min.js"></script><![endif]-->`}}

src/web/templates/frontRouter/pc/docs/sess/index.html

@@ -15,10 +15,26 @@
     <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">
+    <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://unpkg.com/bluebird@3.7.2/js/browser/bluebird.core.min.js"><\/script>');
+      if (typeof fetch === 'undefined')
+        document.write('<script src="https://unpkg.com/whatwg-fetch@3.4.1/dist/fetch.umd.js"><\/script>');
+    </script>
+    <script type="systemjs-importmap" crossorigin="anonymous">
       {
         "imports": {
-          "app": "http://localhost:8080/js/app.js",
+          "app": "/page_docs/js/app.js?v=1000",
           "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"
@@ -28,11 +44,11 @@
     <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 src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/6.8.3/system.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/6.8.3/extras/amd.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/6.8.3/extras/named-exports.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/6.8.3/extras/named-register.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/6.8.3/extras/use-default.min.js"></script>
     <script>
       (function() {
         Promise.all([System.import('single-spa'), System.import('vue'), System.import('vue-router')]).then(function (modules) {
@@ -44,8 +60,12 @@
 
           singleSpa.registerApplication(
             'app',
-            () => System.import('app'),
-            location => location.pathname.startsWith('/')
+            function() {
+              return System.import('app')
+            },
+            function (location) {
+                return true
+            }
           )
 
           singleSpa.start();
@@ -62,7 +82,6 @@
             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;

src/web/templates/frontRouter/pc/integral/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": {
+          "points": "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(
+            'points',
+            () => System.import('points'),
+            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>

src/web/templates/weixin/my.html

@@ -116,6 +116,30 @@
                         </div>
                     </div>
                 </div>
+                <div class="menu-list">
+                  <div class="menu-list-item clickable" id="" data-href="/weixin/docs/page/home">
+                      <div class="m-l-i-left">
+                          <span class="j-icon base-icon icon-docs"></span>
+                          <span class="m-l-i-label">我的文库</span>
+                      </div>
+                      <div class="m-l-i-right">
+                          <i class="dot-red"></i>
+                          <span class="j-icon base-icon icon-arrow-right"></span>
+                      </div>
+                  </div>
+                </div>
+                <div class="menu-list">
+                  <div class="menu-list-item clickable" id="" data-href="/weixin/integral/page/home">
+                      <div class="m-l-i-left">
+                          <span class="j-icon base-icon icon-points"></span>
+                          <span class="m-l-i-label">我的剑鱼币</span>
+                      </div>
+                      <div class="m-l-i-right">
+                          <i class="dot-red"></i>
+                          <span class="j-icon base-icon icon-arrow-right"></span>
+                      </div>
+                  </div>
+                </div>
                 <div class="menu-list">
                     <a class="menu-list-item clickable" id="help" href="https://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect">
                         <div class="m-l-i-left">

src/web/templates/weixin/search/mainSearch.html

@@ -493,7 +493,7 @@
                 </a>
                 <a class="tab_item">
 					<div id="mainSearch-tab4" class="bg_img bg_img_4"></div>
-                    <span>结构化数据</span>
+                    <span>剑鱼文库</span>
                 </a>
                 <!-- 微信端展示APP下载 -->
                 <a class="tab_item">
@@ -1231,10 +1231,12 @@
 	    $(".tab_container a:eq(2)").on('click', function () {
 	 	    window.location.href='/jyxsapp/';
 	    });
-	//剑鱼标讯
+  //剑鱼标讯
+  // 由结构化数据  改成 剑鱼文库
 	$(".tab_container a:eq(3)").on('click', function () {
-		_hmt.push(['_trackEvent', '广告', 'click', "结构化数据wx首页导航4"]);
-		window.location.href='/front/structed/index';
+		// _hmt.push(['_trackEvent', '广告', 'click', "结构化数据wx首页导航4"]);
+    // window.location.href='/front/structed/index';
+    window.location.href = '/weixin/docs/page/home'
 	});
 	    //APP下载跳转到关于剑鱼标讯
 	    $(".tab_container a:eq(4)").on('click', function () {