Ver Fonte

fenzhihebing

lianbingjie há 1 ano atrás
pai
commit
8a8192295c

+ 5 - 1
src/jfw/front/supsearch.go

@@ -715,7 +715,11 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 			"listLength":      util.If(list != nil, len(list), 0),
 		}
 	}
-	return p.Render("/pc/supsearch.html", &p.T)
+	//老版搜索页面
+	if strings.Contains(p.Request.URL.String(), "useOld") {
+		return p.Render("/pc/supsearch.html", &p.T)
+	}
+	return p.Render("/pc/search/index.html", &p.T)
 }
 
 // Newbids  最新招标信息 --已失效

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 1
src/jfw/modules/bigmember/src/config.json


+ 1 - 0
src/jfw/modules/bigmember/src/config/config.go

@@ -98,6 +98,7 @@ type config struct {
 	RestrictionSwitch     bool
 	RestrictionDoPool     int
 	RestrictionWaitPool   int
+	BidSearchOldUserLimit int64 // p480  原/publicapply/bidcoll/power 接口返回值的isOld添加到isAdd接口
 }
 
 type CustomerInfo struct {

+ 8 - 0
src/jfw/modules/bigmember/src/service/use/use.go

@@ -722,6 +722,7 @@ type UserInfo struct {
 	VipPowerType    int64                 `json:"vipPowerType"`    ////超级订阅权益类型 0无 1个人 2企业
 	VipBefore202209 bool                  `json:"vipBefore202209"` //超级订阅:超前项目权限
 	EntSubscribe    int64                 `json:"entSubscribe"`    // 是否有企业订阅权限;0:否 1:是
+<<<<<<< HEAD
 	DocsInfo        Docs                  `json:"docsInfo"`        //文库会员信息
 }
 
@@ -731,6 +732,9 @@ type Docs struct {
 	StartDate    int64 `json:"startDate"`    //会员开始时间
 	EndDate      int64 `json:"endDate"`      //会员结束时间
 	FreeDownload int64 `json:"freeDownload"` // 免费下载次数
+=======
+	IsOld           bool                  `json:"isOld"`           // 是否是老用户  注册时间在
+>>>>>>> master
 }
 
 // 是否使用过首次使用
@@ -767,12 +771,16 @@ func (u *Use) IsAdd() {
 			FreeHasKey:      bigPower.FreeHasKey,
 			VipBefore202209: bigPower.VipStatus > 0 && bigPower.VipStartDate < config.Config.ContextOldVipLimit, //超级订阅 超前项目权限
 			EntSubscribe:    bigPower.EntSubscribe,
+<<<<<<< HEAD
 			DocsInfo: Docs{
 				DocStatus:    bigPower.Data.Docs.Status,
 				StartDate:    bigPower.Data.Docs.StartDate,
 				EndDate:      bigPower.Data.Docs.EndDate,
 				FreeDownload: bigPower.Data.Docs.FreeDownload,
 			},
+=======
+			IsOld:           bigPower.Data.Free.Registedate != 0 && bigPower.Data.Free.Registedate < config.Config.BidSearchOldUserLimit, //p480  原/publicapply/bidcoll/power 接口返回值的isOld添加到isAdd接口
+>>>>>>> master
 		}
 		var (
 			//Name string

+ 6 - 0
src/jfw/modules/bigmember/src/test/p480_test.http

@@ -0,0 +1,6 @@
+POST {{addr}}/bigmember/use/isAdd
+Cookie: SESSIONID={{session}};
+Content-Type: application/x-www-form-urlencoded
+
+
+###

+ 1 - 1
src/web/templates/frontRouter/pc/page_big_pc/sess/index.html

@@ -14,7 +14,7 @@
     <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 src='{{Msg "seo" "cdn"}}/antiRes/js/mainHook.js?v={{Msg "seo" "version"}}'></script>
-  <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/24.2.21/iconfont.css">
+  <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/24.5.6/iconfont.css">
     <!-- 高级语法兼容性处理  -->
     <script>
         if (String.prototype.startsWith === 'undefined') {

+ 1 - 1
src/web/templates/pc/detail/biddetail_login.html

@@ -15,7 +15,7 @@
   <link href="{{Msg "seo" "cdn"}}/pccss/pc-detail.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 src='{{Msg "seo" "cdn"}}/antiRes/js/mainHook.js?v={{Msg "seo" "version"}}'></script>
-  <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/24.2.21/iconfont.css">
+  <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/24.5.6/iconfont.css">
   <!-- 高级语法兼容性处理  -->
   <script>
     if (String.prototype.startsWith === 'undefined') {

+ 2 - 0
src/web/templates/pc/orderDetail.html

@@ -302,6 +302,8 @@
             var regionHtml = "";
             if (!area && !city && !district && !region) {
               regionHtml += "<span>全国</span>";
+            } else if(area && city && district && region &&  area.length === 0 && city.length === 0 && district.length === 0 && region.length === 0) {
+              regionHtml += "<span>全国</span>";
             } else {
               if (area && area.length > 0) {
                 for (var i = 0; i < area.length; i++) {

+ 109 - 0
src/web/templates/pc/search/index.html

@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<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"/>
+    <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/24.5.6/iconfont.css">
+    <script src='{{Msg "seo" "cdn"}}/antiRes/js/mainHook.js?v={{Msg "seo" "version"}}'></script>
+    <!-- 高级语法兼容性处理  -->
+    <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>
+    <style>
+        #public-nav {
+            border-bottom: 1px solid #e0e0e0;
+            background: #fff;
+        }
+        .in-iframe.page--search--index .page-container {
+          padding-top: 0;
+        }
+        .page--search--index .page-container {
+            min-height: calc(100vh - 364px);
+            box-sizing: border-box;
+        }
+    </style>
+</head>
+<body class="page--search--index">
+{{include "/common/pchead.html"}}
+<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 src='{{Msg "seo" "cdn"}}/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
+<script>
+    window.__QIANKUN_ROUTER_BASE = '/swordfish/page_big_pc'
+    qiankun.registerMicroApps(
+      [
+        {
+          name: 'bigMemberSubApp',
+          entry: '/page_big_pc/index.html',
+          container: '#main-app',
+          activeRule: '/',
+          props: {
+            className: window.parent !== window ? 'in-app' : 'in-web',
+            inject: function (options) {
+              options.Vue.prototype.$BRACE = window.$BRACE
+              if (options.router) {
+                addNotFindPage(options.router)
+              }
+            }
+          }
+        }
+      ],
+      {
+        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>

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff