Merge branch 'feature/v4.8.83' into dev/v4.8.83_rjj

src/index.yaml

@@ -74,14 +74,14 @@ topMenu:
       - name: 企业认证
         href: /swordfish/frontPage/enterpriseCertificatio/free/index
       - name: 展会报名
-        href: /exhibition/list/pc/index.htmlSDq1d
+        href: /exhibition/list/pc/index.html
       - name: 商务合作
-        href:
+        href: /swordfish/frontPage/cooperation/free/index
         class: red
       - name: 合作招募
-        href:
+        href: /swordfish/frontPage/recruitment/free/index
       - name: 发布供需信息
-        href:
+        href:  /swordfish/frontPage/InformationDistribution/free/index
         class: red
   - title: 企业服务
     child:

src/jfw/front/index.go

@@ -47,7 +47,7 @@ func init() {
 	entServerTransferMap = map[string]map[bool]string{
 		"yxgl": map[bool]string{ //【营销管理】根据code判断是否有权限 bi_yx
 			true:  fmt.Sprintf("/page_workDesktop/work-bench/page?link=%s/succbi/crm_system/app/crm.app/sales_clues.spg", config.Sysconfig["webdomain"].(string)),
-			false: "/helpCenter/index",
+			false: "/swordfish/frontPage/digitalMarketing/free/index",
 		},
 		"yxt": map[bool]string{ //【医械通】根据code判断是否有权限  lyh_yl_yldy
 			true:  "/page_workDesktop/work-bench/app/big/medical/Credentials",
@@ -55,15 +55,15 @@ func init() {
 		},
 		"khgl": map[bool]string{ //【客户管理】根据code判断是否有权限 bi_yx
 			true:  fmt.Sprintf("/page_workDesktop/work-bench/page?link=%s/succbi/crm_system/app/crm.app/sales_clues.spg", config.Sysconfig["webdomain"].(string)),
-			false: "/helpCenter/index",
+			false: "/swordfish/frontPage/customanage/free/index",
 		},
 		"tbxmgl": map[bool]string{ //【投标项目管理】根据code判断是否有权限 cb_zy_code
 			true:  "/big/attend_bidding/mine",
-			false: "/helpCenter/index",
+			false: "/swordfish/frontPage/biddingProject/free/index",
 		},
 		"nzbg": map[bool]string{ //【年终报告】根据code判断是否有权限
 			true:  fmt.Sprintf("/page_workDesktop/work-bench/page?link=%s/succbi/nzbg/app/nzbg.app/nzbg_entrance_pc.spg", config.Sysconfig["webdomain"].(string)),
-			false: "/helpCenter/index",
+			false: "/swordfish/frontPage/AnnualReport/free/index",
 		},
 	}
 }

src/jfw/front/shorturl.go

@@ -1243,9 +1243,9 @@ func (s *Short) NologinCommon(userId, stype, id, sid string) error {
 		po, bo, wo, obj := pcVRT(sid, industry, stype, false, false)
 		if obj != nil && len(obj) > 0 {
 			// p397 未登录不能查看拟建项目
-			if !ipTrue && (obj["subtype"] == "采购意向" || obj["subtype"] == "拟建") { //未登录不能访问采购意向
-				return s.Redirect(fmt.Sprintf("/notin/page?backTo=%s", s.Request.URL), 302)
-			}
+			//if !ipTrue && (obj["subtype"] == "采购意向" || obj["subtype"] == "拟建") { //未登录不能访问采购意向
+			//	return s.Redirect(fmt.Sprintf("/notin/page?backTo=%s", s.Request.URL), 302)
+			//}
 			if len(po) > 0 {
 				s.T["projectOther"] = po
 			}

src/web/templates/common/pc-header-nav-mini.html

@@ -31,19 +31,11 @@
                 <li class="menu-item">
                     <a class="menu-vip-button" href="/product/index?serviceType=0"><i class="j-icon base-icon icon-img-vip-v-deep"></i>服务列表</a>
                 </li>
-                <li class="menu-item hover-underline" name="付费指导">
-                    <a href="">付费指导</a>
-                </li>
-                <li class="menu-item hover-underline download-app" name="APP下载">
-                    <a href="/front/appDownload">APP下载</a>
-                    <!-- <a href="javascript:void(0);">APP下载</a> -->
-                </li>
-                <li class="menu-item hover-underline" name="帮助中心">
-                    <a href="/helpCenter/index">帮助中心</a>
-                </li>
-                <li class="menu-item hover-underline" name="关于剑鱼">
-                    <a href="/brand/index">关于剑鱼</a>
+                {{range $menu :=(Ad "jy-pc-new-top-btns" -1 .Host )}}
+                <li class="menu-item hover-underline" name="{{$menu.S_remark}}">
+                  <a href="{{$menu.S_link}}">{{$menu.S_remark}}</a>
                 </li>
+                {{end}}
                 <li class="menu-item message-menu login-show" id="noticed" style="display: none;">
                     <a class="message-menu-link" href="/swordfish/frontPage/messageCenter/sess/index">
                         <div class="icon-img-message">