Merge branch 'master' into feature/v4.8.90

src/jfw/modules/bigmember/src/config.json

@@ -184,5 +184,6 @@
   "portraitDynamicTime": 7,
   "portraitCount": 30,
   "nsq": "192.168.3.240:4260",
-  "nsq_topic": "jy_event"
+  "nsq_topic": "jy_event",
+  "attachmentResPower": ["bi_sj_sjqk","bi_sf_sjqd","bi_sj_yyszs"]
 }

src/jfw/modules/bigmember/src/config/config.go

@@ -65,15 +65,16 @@ type config struct {
 		Details  string `json:"details"`
 		ListPage string `json:"listPage"`
 	} `json:"claim"`
-	ContextOldVipLimit  int64  `json:"contextOldVipLimit"` //超级订阅部分用户：--- 超前项目权限
-	PotentialCount      int    `json:"potentialCount"`     //潜在客户 潜在竞争对手数据量
-	NewDataTime         int64  `json:"newDataTime"`        // 用于周边月报区分是否为新数据 、配置为p350发版的时间
-	ProjectCount        int    `json:"projectCount"`       //画像和报告项目明细最大数量
-	PortraitStartTime   int    `json:"portraitStartTime"`
-	PortraitDynamicTime int    `json:"portraitDynamicTime"`
-	PortraitCount       int    `json:"portraitCount"`
-	Nsq                 string `json:"nsq"`
-	Nsq_topic           string `json:"nsq_topic"`
+	ContextOldVipLimit  int64    `json:"contextOldVipLimit"` //超级订阅部分用户：--- 超前项目权限
+	PotentialCount      int      `json:"potentialCount"`     //潜在客户 潜在竞争对手数据量
+	NewDataTime         int64    `json:"newDataTime"`        // 用于周边月报区分是否为新数据 、配置为p350发版的时间
+	ProjectCount        int      `json:"projectCount"`       //画像和报告项目明细最大数量
+	PortraitStartTime   int      `json:"portraitStartTime"`
+	PortraitDynamicTime int      `json:"portraitDynamicTime"`
+	PortraitCount       int      `json:"portraitCount"`
+	Nsq                 string   `json:"nsq"`
+	Nsq_topic           string   `json:"nsq_topic"`
+	AttachmentResPower  []string `json:"attachmentResPower"`
 }
 
 type CustomerInfo struct {

src/jfw/modules/bigmember/src/service/use/use.go

@@ -3,7 +3,6 @@ package use
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/util/gconv"
 	"jy/src/jfw/modules/bigmember/src/config"
 	"jy/src/jfw/modules/bigmember/src/db"
 	"jy/src/jfw/modules/bigmember/src/entity"
@@ -13,6 +12,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gogf/gf/v2/util/gconv"
+
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 	esV7 "github.com/olivere/elastic/v7"
 
@@ -484,8 +485,12 @@ func (u *Use) Attachment() {
 		if u.GetString("source") == "bi" {
 			resResp := config.Middleground.ResourceCenter.Haspowers(qu.Int64All(u.GetSession("accountId")), qu.Int64All(u.GetSession("entAccountId")), qu.Int64All(u.GetSession("entId")), qu.Int64All(u.GetSession("entUserId")))
 			if resResp != nil {
+				attachmentResPower := map[string]bool{}
+				for _, v := range config.Config.AttachmentResPower {
+					attachmentResPower[v] = true
+				}
 				for _, v := range resResp.Powers {
-					if v == "bi_sj_sjqk" || v == "bi_sf_sjqd" {
+					if attachmentResPower[v] {
 						resHasPower = true
 						break
 					}

src/web/staticres/common-module/vipsubscribe/js/area-three-sidebar-template.js

@@ -11,7 +11,7 @@ function getParam (name) {
   r = null;
   return context == null || context == '' || context == 'undefined' ? '' : context;
 }
- // 需要结合area-three-sidebar-template.js使用
+// 需要结合area-three-sidebar-template.js使用
 function getRandomString (len) {
   let randomString = ''
   if (len) {
@@ -290,8 +290,8 @@ var areaThreeSidebarComponent = {
               }
             } else if (cities.ProRemark === '直辖市') {
               // 直辖市，将区县放置到第二级
-              if(cities.city && Array.isArray(cities?.city)) {
-                var orgDistrict = cities?.city[0].area || []
+              if(cities.city && Array.isArray(cities.city)) {
+                var orgDistrict = cities.city[0].area || []
                 // 将区县数据取出，处理成新数组，放入城市
                 let districtChildren = orgDistrict.map(dItem => {
                   return {
@@ -302,7 +302,7 @@ var areaThreeSidebarComponent = {
                   }
                 })
                 provinceExp.children.push({
-                  city: provinceExp.name?.indexOf('市') > -1 ? provinceExp.name : provinceExp.name + '市',
+                  city: (provinceExp.name && provinceExp.name.indexOf('市') > -1) ? provinceExp.name : provinceExp.name + '市',
                   selected: false,
                   canSelected: true,
                   id: `ac-${getRandomString(8).toLowerCase()}`,
@@ -445,7 +445,7 @@ var areaThreeSidebarComponent = {
       // 所有二级市区遍历
       for(let refKey in this.secondRefNameObj) {
         var refName = this.secondRefNameObj[refKey]
-        var renderList = this.$refs[refName]?.renderList || []
+        var renderList = (this.$refs[refName] && this.$refs[refName].renderList) || []
 
         for (let i = 0; i < renderList.length; i++) {
           var parent = renderList[i]
@@ -530,7 +530,7 @@ var areaThreeSidebarComponent = {
       this.resetSelect()
       if (typeof state === 'object' && Object.keys(state).length > 0) {
         this.setSidebarState(state)
-        this.$refs[this.allCountryRefName]?.setParentLevel0State(false)
+        this.$refs[this.allCountryRefName] && this.$refs[this.allCountryRefName].setParentLevel0State(false)
       }
       // 重新计算parent数据统计
       firstSidebar.refreshAllChildrenState()
@@ -631,9 +631,10 @@ var areaThreeSidebarComponent = {
       }
       // 将全国选择重置掉
       if(this.allCountryRefName) {
-        this.$refs[this.allCountryRefName]?.setParentLevel0State(false)
+        this.$refs[this.allCountryRefName] && this.$refs[this.allCountryRefName].setParentLevel0State(false)
       }
-      var selectedNum = renderList?.filter(temp => temp._children_selectedCount > 0)?.length || 0
+      var tempList = renderList || []
+      var selectedNum = tempList.filter(temp => temp._children_selectedCount > 0).length || 0
       var result = {
         _children_selectedCount: selectedNum,
         _children_count: renderList.length - 1

src/web/staticres/js/superSearch.js

@@ -343,7 +343,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 		if (!onlyUpdateTable){ //是否仅更新table
 			listHtml += '<li>'
         listHtml +='<div class="liLuceneList" style="border-bottom: 1px solid #EBEBEB;">'
-          listHtml += '<input class="custom-checkbox title-text-checkbox" name="bid-list" type="checkbox" dataid="'+datas[i]._id+'" data-area="'+ datas[i].area+'"/>'
+          listHtml += '<input autocomplete="off" value="" class="custom-checkbox title-text-checkbox" name="bid-list" type="checkbox" dataid="'+datas[i]._id+'" data-area="'+ datas[i].area+'"/>'
           listHtml +='<div class="list-container">'
             // 标题、推送时间
             listHtml += '<div class="bid-list-title">'

src/web/templates/pc/supsearch.html

@@ -1542,7 +1542,7 @@
       <!--招标tab切换-->
       <div class="filter-table-container" :class="tableFixedTop? 'fixed' : ''">
         <div class="tabTitle clearfix" :class="tableFixedTop? 'table-fixed-top' : ''">
-          <input class="custom-checkbox check-all" type="checkbox" />
+          <input autocomplete="off" value="" class="custom-checkbox check-all" type="checkbox" />
           <span class="tab-bid-count" id="serchNum-bid">搜索到<em style="color: #2cb7ca;">${ bidTotalCount() }</em>条信息</span>
           <span class="tab-bid-count" id="checkNum-bid-box" style="display: none;">已选<em style="color: #2cb7ca;" id="checkNum-bid"></em>条信息</span>
           <ul id="newsclass" style="display:none;">
@@ -3248,7 +3248,7 @@ function checkTagDisabled () {
             window.location.href = '/'
           }
         }
-      
+
         var referer = document.referer
         if(referer) {
           var inJianyuWebSite = referer.indexOf('jianyu360.cn') > 0