Merge branch 'dev4.6.3' of http://192.168.3.207:8080/qmx/jy into dev4.6.3

src/entnichePc.json

@@ -1,5 +1,4 @@
 {
 	"entnichePcUser": [14595,442,1686,1685,1711,674],
-	"hideEntnicheMenu": [1711,442],
-	"privateDataPhone": "18530014520,13525530909,13938299083"
+	"hideEntnicheMenu": [1711,442]
 }

src/jfw/front/dataExport.go

@@ -851,7 +851,7 @@ func (this *DataExport) GetPcEntAuth() {
 	}
 	isNew := false
 	if phone != "" {
-		ent := public.Mysql.SelectBySql("select id,phone,createtime from entniche_info where phone=? and status=1 ", phone)
+		ent := public.Mysql.SelectBySql("select id,isNew,phone,createtime from entniche_info where phone=? and status=1 ", phone)
 		if ent != nil && len(*ent) != 0 {
 			for _, val := range *ent {
 				if pcUsers[util.IntAll(val["id"])] {
@@ -859,11 +859,10 @@ func (this *DataExport) GetPcEntAuth() {
 					if hideUsers[util.IntAll(val["id"])] {
 						entnicheMenu = false
 					} else {
-						//loc, _ := time.LoadLocation("Local")
-						//t2, _ := time.ParseInLocation("2006-01-02 15:04:05", util.ObjToString(val["createtimes"]), loc)
-						//if t2.Unix() > int64(1642227707) {
+						/*if  util.IntAll(val["isNew"])==1{
 							isNew = true
-						//}
+						}*/
+						isNew = true
 						entnicheMenu = true
 					}
 					break
@@ -875,7 +874,7 @@ func (this *DataExport) GetPcEntAuth() {
 			if user != nil && len(*user) > 0 {
 				for _, v := range *user {
 					if pcUsers[util.IntAll(v["ent_id"])] {
-						ents := public.Mysql.SelectBySql("select status,id,createtime from entniche_info where id=? ", util.IntAll(v["ent_id"]))
+						ents := public.Mysql.SelectBySql("select status,id,createtime,isNew from entniche_info where id=? ", util.IntAll(v["ent_id"]))
 						if ents != nil && len(*ents) != 0 {
 							for _, vv := range *ents {
 								if util.IntAll(vv["status"]) == 1 {
@@ -885,11 +884,9 @@ func (this *DataExport) GetPcEntAuth() {
 									if hideUsers[util.IntAll(vv["id"])] {
 										entnicheMenu = false
 									} else {
-										//loc, _ := time.LoadLocation("Local")
-										//t2, _ := time.ParseInLocation("2006-01-02 15:04:05", util.ObjToString(vv["createtime"]), loc)
-										//if t2.Unix() > int64(1642227707) {
+										if  util.IntAll(vv["isNew"])==1{
 											isNew = true
-										//}
+										}
 										entnicheMenu = true
 									}
 								}
@@ -900,7 +897,8 @@ func (this *DataExport) GetPcEntAuth() {
 				}
 			}
 		}
-		if strings.Contains(config.EntnichePcConf.PrivateDataPhone, phone) {
+		userCount := public.Mysql.CountBySql("select count(1) from privatedata where phone=?", phone)
+		if userCount > 0 {
 			privatedata = true
 		}
 	}

src/jfw/modules/app/src/app/front/me.go

@@ -375,12 +375,14 @@ func (l *Me) MyInfo() {
 		if phone != "" {
 			//已购买企业未过期
 			log.Println("SELECT status FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1",phone)
-			if entInfo := public.Mysql.SelectBySql(`SELECT status FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len((*entInfo)) > 0 {
+			if entInfo := public.Mysql.SelectBySql(`SELECT status,isNew FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len((*entInfo)) > 0 {
 				for _, v := range (*entInfo) {
-					if qutil.IntAll(v["status"]) == 1 {
+					//&& qutil.IntAll(v["isNew"]
+					if qutil.IntAll(v["status"]) == 1  {
 						isEnt = true
 						break
 					}
+
 				}
 			}
 		}

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/client_portrayal.js

@@ -1582,7 +1582,7 @@ var vNode = {
         },
         goHighSet: function() {
           sessionStorage.setItem('is-click-set', 1)
-          location.href = './free_high_set?header=采购单位高级分析设置&entName=' + decodeURIComponent(utils.getParam('entName'))
+          location.href = './client_high_set?header=采购单位高级分析设置&entName=' + decodeURIComponent(utils.getParam('entName'))
         },
         //免费赠送采购单位全景分析体验 去解锁
         goGiveAnalysis: function(){

src/jfw/modules/app/src/web/templates/big-member/page_client_follow_list.html

@@ -120,7 +120,7 @@
         <div class="j-container" v-if="!foShow">
             <div class="pro-care-many">
               <div class="pro-care-center">
-                可关注${followMax}个项目，已关注${list.length}个
+                可关注${followMax}个项目，已关注${listnum}个
               </div>
             </div>
             <van-search v-model="carePro" @input="onSearch" class="clientsearch" placeholder="搜索关注的项目"></van-search>
@@ -129,7 +129,7 @@
                 <van-dropdown-menu active-color="#2ABED1">
                   <van-dropdown-item :title="claimTitle" v-model="value1" @change="getChangeSelect" :options="option1"></van-dropdown-item>
                   <van-dropdown-item :title="proarea" ref="areaDown">
-                    <area-component :multiple="true" :initarealist="initArea" ref="areaRadioComponent" @cancel="onCancelArea" @confirm="onConfirmArea"></area-component>
+                    <area-component :multiple="true" model="entnicheNew" :initarealist="initArea" ref="areaRadioComponent" @cancel="onCancelArea" @confirm="onConfirmArea"></area-component>
                   </van-dropdown-item>
                 </van-dropdown-menu>
               </div>
@@ -217,7 +217,8 @@
             ],
             initArea: [],
             carePro: '',
-            followMax: 0
+            followMax: 0,
+            listnum: 0
         },
         created () {
             var recover = this.recover()
@@ -308,7 +309,7 @@
                 client: false,
                 val: false
               }
-              if(area.length != 0) {
+              if(Object.keys(area).length != 0) {
                 obj.area = true
               }
               if(client !== 0) {
@@ -471,6 +472,7 @@
                             _this.followMax = res.data.followMax
                             if(res.data && res.data.List && $.isArray(res.data.List) && res.data.List !=0){
                                 _this.foShow = false
+                                _this.listnum = res.data.total
 			                          var timestamp = parseInt(new Date().getTime()/ 1000);
                                 for (let i = 0; i < res.data.List.length; i++) {
                                     var lastpushtime = res.data.List[i].l_createtime

src/jfw/modules/app/src/web/templates/big-member/page_client_high_set.html

@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+  <!--引入公共资源头部-->
+  {{include "/big-member/meta.html"}}
+  <title></title>
+  <!--S-当前页必定需要预加载的资源-->
+  <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+  <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+  <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
+  <!--S-当前页面的css资源-->
+  <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+  <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+  <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
+  <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
+  <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/big-member/css/high_set.css?v={{Msg "seo" "version"}}' />
+  <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/big-member/css/pop_group.css?v={{Msg "seo" "version"}}' />
+  <!--E-当前页面的css资源-->
+  <style>
+    /* 修复微信ios滚动不到最底部的问题，可在微信开发者工具ios下复现 */
+    .fix-ios-scroll {
+      height: unset;
+    }
+    .fix-ios-scroll > .j-main {
+      display: flex;
+      flex-direction: column;
+    }
+    .fix-ios-scroll > .j-main .area-list,
+    .fix-ios-scroll > .j-main .unitTab {
+      height: unset;
+      flex: 1;
+      overflow: auto;
+    }
+  </style>
+</head>
+
+<body>
+  <div class="j-container">
+    {{include "/big-member/header.html"}}
+    <div class="j-main" id="high-set" v-cloak>
+      <div class="j-container">
+        <div class="j-main">
+          <div class="key-container">
+            <p class="key-title">关键词</p>
+            <van-field
+              v-model="conf.keywords"
+              rows="2"
+              autosize
+              type="textarea"
+              maxlength="50"
+              placeholder="多个关键词，用空格隔开"
+              @input="onKeywords"
+              show-word-limit
+            ></van-field>
+            <div class="match-container" v-show="hasSpace">
+              <p class="match-title">分析方式</p>
+              <div class="match-content">
+                <div class="match-item" :class="conf.match == 0 ? 'active' : ''" @click="checkMatch(0)">
+                  <div class="match-value">模糊分析</div>
+                  <div class="match-label">包含其中1个关键词即可</div>
+                </div>
+                <div class="match-item" :class="conf.match == 1 ? 'active' : ''" @click="checkMatch(1)">
+                  <div class="match-value">精准分析</div>
+                  <div class="match-label">同时包含所有关键词</div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="data-container">
+            <van-cell title="项目搜索范围" is-link :value="conf.scope" @click="popClick('scope')"></van-cell>
+            <van-cell class="area-class" title="项目地区" is-link :value="conf.area" @click="popClick('area')"></van-cell>
+            <van-cell title="行业" is-link :value="conf.industry" @click="popClick('industry')"></van-cell>
+          </div>
+          <div class="years-container">
+            <span class="year-label">分析年份</span>
+            <van-field class="year-input" :class="conf.start ? 'border-active' : ''" v-model="conf.start" readonly @click="popClick('start')"></van-field>
+            <em style="color: #ccc;">—</em>
+            <van-field class="year-input"  :class="conf.end ? 'border-active' : ''" v-model="conf.end" readonly @click="popClick('end')"></van-field>
+          </div>
+        </div>
+        <div class="j-footer">
+          <div class="j-button-group">
+            <button class="j-button-cancel" @click="onReset">重置</button>
+            <button class="j-button-confirm" :disabled="disabledConfirm" @click="startStatistic">开始分析</button>
+          </div>
+        </div>
+        <van-popup 
+          class="j-popup collection"
+          v-model="popInfo.show" 
+          round position="bottom" 
+          closeable
+          close-icon="clear"
+          get-container="body"
+        >
+          <div class="j-container">
+            <div class="popup-header header-title">${popInfo.title}</div>
+            <div v-show="popInfo.type == 'scope'">
+              <popup-select-component class="j-main fix-ios-scroll" :data-list="matchTypeList" multiple ref="matchTypeSelector" @reset="onCancel" @confirm="onConfirm"></popup-select-component>
+            </div>
+            <div v-show="popInfo.type == 'area'">
+              <area-component class="j-main fix-ios-scroll" :class="{'hide-all': filterInitData.areaArr.length == 2}" ref="projectAreaSelector" :selectarealist="selectAreaList" @cancel="onCancel" @confirm="onConfirm"></area-component>
+            </div>
+            <div v-show="popInfo.type == 'industry'">
+              <industry-component class="j-main fix-ios-scroll" ref="industryCom" :selectindustrylist="selectIndustryList" onlyshowsome= "true" @cancel="onCancel" @confirm="onConfirm"></industry-component>
+            </div>
+            <div v-show="popInfo.type == 'start'">
+              <years-component ref="yearsItem" type="start" :cur-year="conf.start" :years="startRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
+            </div>
+            <div v-show="popInfo.type == 'end'">
+              <years-component ref="yearsItem" type="end" :cur-year="conf.end" :years="endRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
+            </div>
+          </div>
+        </van-popup>
+      </div>
+    </div>
+  </div>
+
+  <!--S-必定需要预加载的资源-->
+  <link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+  <link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+  <link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
+  <!--E-必定需要预加载的资源-->
+
+  <!--S-有可能需要提前预加载的资源-->
+  <!--E-有可能需要提前预加载的资源-->
+
+  <!--S-当前页面的资源-->
+  <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script> 
+  <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+  <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
+  <!--E-当前页面的资源-->
+  {{include "/big-member/commonjs.html"}}
+  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/popup-select-mobile.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/date-mobile.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/area-mobile.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/industry-mobile.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/years-picker-mobile.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/big-member/js/client_high_set.js?v={{Msg "seo" "version"}}'></script>
+</body>
+
+</html>

src/jfw/modules/app/src/web/templates/big-member/page_client_list.html

@@ -41,7 +41,7 @@
         <div class="j-container" v-if="!foShow">
             <div class="pro-care-many">
               <div class="pro-care-center">
-                可关注${countMax}个客户，已关注${list.length}个
+                可关注${countMax}个客户，已关注${listnum}个
               </div>
             </div>
             <div class="search">
@@ -263,7 +263,8 @@
             active: 0,
             havaClaimList: [], // 已认领列表
             noClaimList: [], // 未认领列表
-            countMax: 0
+            countMax: 0,
+            listnum: 0
         },
         created () {
             var recover = this.recover()
@@ -469,6 +470,7 @@
                             _this.countMax = res.data.countMax
                             if(res.data && res.data.list && $.isArray(res.data.list) && res.data.list !=0){
                                 _this.foShow = false
+                                _this.listnum = res.data.count
                                 let nameArr = []
                                 for (let i = 0; i < res.data.list.length; i++) {
                                     res.data.list[i].budget = utils.moneyUnit(res.data.list[i].budget)

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

@@ -581,6 +581,12 @@
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/historypush.js?v={{Msg "seo" "version"}}'></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
+<script>
+// 初始化
+var vConsole = new VConsole();
+console.log('Hello world');
+</script>
    <script>
         // 双11活动文案修改
         $.get('/jyactive/doubleEleven/isActiving?t=' + new Date().getTime(), function (r) {
@@ -964,7 +970,6 @@
                 async: false,
                 dataType: 'json',
                 success: function (data) {
-                  data.data = null
                   if(!data.data) {
                     data.data = []
                   }

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

@@ -637,6 +637,12 @@
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/industry-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/ent-search/ent-search-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/searchindex.js?v={{Msg "seo" "version"}}'></script>
+<script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
+<script>
+// 初始化
+var vConsole = new VConsole();
+console.log('Hello world');
+</script>
 <script>
     /*********************处理安卓3.0.3版本更新问题 start*******************************/
    if(!mySysIsIos() && (localStorage.checkUpdate==undefined || Date.parse(new Date())/1000-parseInt(localStorage.checkUpdate)>604800) && compareVersion(JyObj.getVersion(),"3.0.4")) {

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

@@ -844,6 +844,12 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src='/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
+<script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
+<script>
+// 初始化
+var vConsole = new VConsole();
+console.log('Hello world');
+</script>
 <script>
     var	shareimgflag = true;
     var area = {{.T.obj.area}}

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -49,7 +49,7 @@ func CreateSubVipPortraitManager(userid string, pageFlag, searchValue string, is
 		return nil, -1, errors.New("未知请求")
 	}
 	if pageFlag != "entDetail" { //需要权限校验的接口
-		bigMsg := jy.GetBigVipUserBaseMsg(userid, Mysql, Mgo)
+		bigMsg := jy.GetBigVipUserBaseMsg(userid,db.Mysql, db.Mgo)
 		if bigMsg.VipStatus <= 0 || bigMsg.Vip_BuySet.Upgrade != 1 { //免费用户留资体验
 			if searchValue != "" && jy.Portraitexperience(userid, searchValue, isWinner) {
 				return &Portrait{userid}, 3, nil

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

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"entity"
 	"fmt"
-	"jfw/modules/bigmember/src/util"
 	"log"
 	"mongodb"
 	qu "qfw/util"

src/jfw/modules/common/src/qfw/util/jy/bigVipPower.go

@@ -105,7 +105,7 @@ func GetBigVipUserBaseMsg(userId string, mysql *mysql.Mysql, mg MongodbSim) *Big
 		}
 	}
 	//大会员状态
-	data, ok := mg.FindById("user", userId, `{"i_member_status":1,"i_member_give":1,"s_member_mainid":1,"i_member_sub_status":1,"i_member_trial":1,"i_vip_status":1,"o_vipjy":1,"o_jy":1,"l_registedate":1}`)
+	data, ok := mg.FindById("user", userId, `{"s_phone":1,"i_member_status":1,"i_member_give":1,"s_member_mainid":1,"i_member_sub_status":1,"i_member_trial":1,"i_vip_status":1,"o_vipjy":1,"o_jy":1,"l_registedate":1}`)
 	if ok && *data != nil && len(*data) > 0 {
 		userPower.Registedate = qutil.Int64All((*data)["l_registedate"])
 		userPower.Status = qutil.IntAllDef((*data)["i_member_status"], 0)
@@ -142,22 +142,20 @@ func GetBigVipUserBaseMsg(userId string, mysql *mysql.Mysql, mg MongodbSim) *Big
 		}
 	}
 	entniche:=0
-/*	res := mysql.SelectBySql(`SELECT i.name,i.phone,i.status,i.auth_status,u.power FROM entniche_user u LEFT JOIN entniche_info i
+	res := mysql.SelectBySql(`SELECT i.name,i.phone,i.status,i.auth_status,u.power FROM entniche_user u LEFT JOIN entniche_info i
 			ON u.ent_id=i.id
-			ORDER BY  i.status DESC,i.auth_status DESC, CASE WHEN u.id=? THEN 0  ELSE 1 END  ASC`, entUserId)
+			ORDER BY  i.status DESC,i.auth_status DESC, CASE WHEN u.phone=? THEN 0  ELSE 1 END  ASC`, (*data)["s_phone"])
 	if res != nil && len(*res) > 0 {
-		entname := qutil.ObjToString((*res)[0]["name"])
-		d["entname"] = entname
+		//entname := qutil.ObjToString((*res)[0]["name"])
+		/*d["entname"] = entname*/
 		//已购买企业未过期-商机管理用户
 		for _, v := range *res {
 			if qutil.IntAll(v["status"]) == 1 && qutil.IntAll(v["power"]) == 1 {
-				d["isFree"] = false
-				d["entniche"] = true
 				entniche =1
 				break
 			}
 		}
-	}*/
+	}
 	//子账号查询父节点权限
 	queryId := qutil.If(userPower.Pid == "", userId, userPower.Pid).(string)
 	//用户购买的服务

src/jfw/modules/common/src/qfw/util/jy/subscribepush.go

@@ -208,7 +208,7 @@ func (s *subscribePush) InfoFormat(p *PushCa, info *map[string]interface{}) *Sub
 }
 
 func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total int64, result []*SubPushList) {
-	// log.Println(spqp.UserId, s.ModuleFlag, "subscribePush query param：", "SelectTime", spqp.SelectTime, "Area", spqp.Area, "City", spqp.City, "Subtype", spqp.Subtype, "Subscopeclass", spqp.Subscopeclass, "Buyerclass", spqp.Buyerclass, "Key", spqp.Key, "PageNum", spqp.PageNum)
+	 log.Println(spqp.UserId, s.ModuleFlag, "subscribePush query param：", "SelectTime", spqp.SelectTime, "Area", spqp.Area, "City", spqp.City, "Subtype", spqp.Subtype, "Subscopeclass", spqp.Subscopeclass, "Buyerclass", spqp.Buyerclass, "Key", spqp.Key, "PageNum", spqp.PageNum)
 	if spqp.UserId == "" {
 		return
 	}
@@ -227,6 +227,7 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
 	starttime, endtime := int64(0), int64(0)
 	st, et := "", ""
 	now := time.Now()
+	log.Println(4444)
 	if spqp.SelectTime == "today" { //今天
 		starttime = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).Unix()
 	} else if spqp.SelectTime == "yesterday" { //昨天
@@ -249,11 +250,14 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
 			endtime = time.Date(etTime.Year(), etTime.Month(), etTime.Day(), 23, 59, 59, 0, time.Local).Unix()
 		}
 	}
+	log.Println(2222)
 	nowFormat := NowFormat(Date_Short_Layout)
 	start := (spqp.PageNum - 1) * spqp.PageSize
 	end := start + spqp.PageSize
 	//时间是今天，没有别的过滤条件
 	if nowFormat == FormatDateByInt64(&starttime, Date_Short_Layout) && spqp.Area == "" && spqp.City == "" && spqp.Buyerclass == "" && spqp.Subscopeclass == "" && spqp.Subtype == "" && spqp.Key == "" {
+
+		log.Println("a1")
 		subPush, err := s.GetTodayCache(spqp.UserId)
 		if err != nil {
 			log.Println(spqp.UserId, "GetTodayCache Error", err)
@@ -276,12 +280,15 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
 		}
 		total = int64(length)
 	} else if spqp.IsEmpty() && (spqp.PageNum-1)*spqp.PageSize <= 250 { //全部，没有过滤条件 之前缓存5页*50条=250
-		allCache, err := s.GetAllCache(spqp.UserId)
+		log.Println("a2")
+	allCache, err := s.GetAllCache(spqp.UserId)
 		if err != nil {
 			log.Println(spqp.UserId, "GetAllCache Error", err)
 		}
 		if err != nil || allCache == nil || allCache.Date != nowFormat || len(allCache.Datas) == 0 {
+			log.Println("a3")
 			spqp.PageNum = 1
+			log.Println(1111)
 			list, countSearch := s.getDatasFromMysql(spqp, starttime, endtime, AllSubPushCacheSize, true)
 			allCache = &SubPush{
 				Date:  nowFormat,
@@ -299,6 +306,7 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
 		}
 		total = allCache.Count
 	} else {
+		log.Println("a4")
 		result, total = s.getDatasFromMysql(spqp, starttime, endtime, spqp.PageSize, true)
 	}
 	if result == nil {

src/jfw/modules/common/src/qfw/util/jy/switchService.go

@@ -59,13 +59,13 @@ func (s *switchService) GetEntniche(session *httpsession.Session, m MongodbSim,s
 	v, _ := session.Get(s.SessionKey).(string)
 	u, ok := m.FindById("user", userId, `{"i_member_status":1,"i_vip_status":1}`)
 	entniche:=false
-	res := sql.SelectBySql(`SELECT i.name,i.phone,i.status,i.auth_status,u.power FROM entniche_user u LEFT JOIN entniche_info i
+	res := sql.SelectBySql(`SELECT i.isNew,i.name,i.phone,i.status,i.auth_status,u.power FROM entniche_user u LEFT JOIN z i
 			ON u.ent_id=i.id
 			ORDER BY  i.status DESC,i.auth_status DESC, CASE WHEN u.id=? THEN 0  ELSE 1 END  ASC`, entUserId)
 	if res != nil && len(*res) > 0 {
 		//已购买企业未过期-商机管理用户
 		for _, v := range *res {
-			if util.IntAll(v["status"]) == 1 && util.IntAll(v["power"]) == 1 {
+			if util.IntAll(v["status"]) == 1 && util.IntAll(v["power"]) == 1 && util.IntAll(v["isNew"]) == 1 {
 				//d["isFree"] = false
 				//d["entniche"] = true
 				entniche=true

src/jfw/modules/publicapply/src/bidcollection/entity/entity.go

@@ -429,7 +429,7 @@ func GetCollList(c *util.CollList, userid string) map[string]interface{} {
 
 //是否是付费用户 -bool: true:是 fasle:不是
 func Power(userid string) (bool, map[string]interface{}) {
-	isVip, isMember, isEnt := false, false, false
+	isVip, isMember, isEnt, privatedata := false, false, false, false
 	vipstatus := 0
 	phone := ""
 	var registedate int64
@@ -457,17 +457,24 @@ func Power(userid string) (bool, map[string]interface{}) {
 		}
 		if phone != "" {
 			//已购买企业未过期
-			if entInfo := *db.Mysql.SelectBySql(`SELECT status FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len(entInfo) > 0 {
+			if entInfo := *db.Mysql.SelectBySql(`SELECT status,isNew FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len(entInfo) > 0 {
 				for _, v := range entInfo {
-					if qu.IntAll(v["status"]) == 1 {
+					//&& qu.IntAll(v["isNew"]) == 1
+					if qu.IntAll(v["status"]) == 1 && qu.IntAll(v["isNew"]) == 1{
 						isEnt = true
 						break
 					}
+
 				}
 			}
 			// if db.Mysql.CountBySql(`select count(1) from entniche_user where phone = ? and power =1`, phone) > 0 {
 			// 	isEnt = true
 			// }
+			//广州移动判断
+			privatedataCount := db.Mysql.CountBySql(`select count(1) from privatedata where phone = ?`, phone)
+			if privatedataCount > 0 {
+				privatedata = true
+			}
 		}
 		registedate, _ = (*data)["l_registedate"].(int64)
 	}
@@ -475,6 +482,7 @@ func Power(userid string) (bool, map[string]interface{}) {
 		"vip":         vipstatus,
 		"member":      isMember,
 		"entniche":    isEnt,
+		"privatedata": privatedata,
 		"registedate": registedate,
 	}
 }
@@ -534,6 +542,7 @@ func GetInfoById(Mgo_bidding mg.MongodbSim, bidding, bidding_back string, idlist
 		}
 	}
 	//mongodb bidding
+	log.Println(1)
 	mgo_ids := []primitive.ObjectID{}
 	for _, v := range es_ids {
 		if infos[v] == nil {
@@ -552,6 +561,7 @@ func GetInfoById(Mgo_bidding mg.MongodbSim, bidding, bidding_back string, idlist
 		}
 	}
 	//mongodb bidding_back
+	log.Println(2)
 	mgo_back_ids := []primitive.ObjectID{}
 	for _, v := range mgo_ids {
 		if infos[mg.BsonIdToSId(v)] == nil {

src/jfw/modules/publicapply/src/dataexport/entity/collection.go

@@ -24,9 +24,9 @@ func IsPay(userid string) bool {
 		}
 		if phone != "" {
 			//已购买企业未过期
-			if entInfo := *db.Mysql.SelectBySql(`SELECT status FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len(entInfo) > 0 {
+			if entInfo := *db.Mysql.SelectBySql(`SELECT status,isNew FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len(entInfo) > 0 {
 				for _, v := range entInfo {
-					if util.IntAll(v["status"]) == 1 {
+					if util.IntAll(v["status"]) == 1 && util.IntAll(v["isNew"]) == 1 {
 						isEnt = true
 						break
 					}

src/jfw/modules/publicapply/src/me/me.go

@@ -61,9 +61,9 @@ func (m *Me) MyInfo() {
 		isEnt := false
 		if phone != "" {
 			//已购买企业未过期
-			if entInfo := public.Mysql.SelectBySql(`SELECT status FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len((*entInfo)) > 0 {
+			if entInfo := public.Mysql.SelectBySql(`SELECT status,isNew FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len((*entInfo)) > 0 {
 				for _, v := range (*entInfo) {
-					if util.IntAll(v["status"]) == 1 {
+					if util.IntAll(v["status"]) == 1 && util.IntAll(v["isNew"]) == 1{
 						isEnt = true
 						break
 					}

src/jfw/modules/publicapply/src/subscribePush/service/pushList.go

@@ -204,6 +204,7 @@ func (sp *SubscribePush) HistoryPaging() {
 	if vipType == "" { //默认取已切换的企业
 		vipType = jy.SwitchService.Get(sp.Session(), db.Mgo)
 	}
+	log.Println("ssss", util.ObjToString(sp.GetSession("entUserId")))
 	if vipType==jy.SwitchService.Entniche{
 		userId = util.ObjToString(sp.GetSession("entUserId"))
 	}
@@ -234,6 +235,7 @@ func (sp *SubscribePush) HistoryPaging() {
 	} else {
 		spqp.PushMysql = db.MysqlPush
 	}
+	log.Println(3333)
 	hasNextPage, total, list := jy.NewSubscribePush(vipType).Datas(spqp)
 	//查询是否收藏
 	jy.NewSubscribePush().MakeCollection(userId, db.Mysql, list)

src/web/staticres/common-module/big-member/js/client_high_set.js

@@ -0,0 +1,512 @@
+var winnerMatchTypeList = [
+  {
+    label: '项目名称/标的物',
+    value: 'purchasing'
+  },
+  {
+    label: '采购单位',
+    value: 'buyer'
+  },
+  {
+    label: '招标代理机构',
+    value: 'agency'
+  }
+]
+var buyerMatchTypeList = [
+  {
+    label: '项目名称/标的物',
+    value: 'purchasing'
+  },
+  {
+    label: '中标企业',
+    value: 'winner'
+  },
+  {
+    label: '招标代理机构',
+    value: 'agency'
+  }
+]
+var matchTypeList = []
+if (utils.getParam('entName')) {
+  matchTypeList = buyerMatchTypeList
+} else {
+  matchTypeList = winnerMatchTypeList
+}
+var highSet = new Vue({
+  delimiters: ['${', '}'],
+  el: '#high-set',
+  components: {
+    popupSelectComponent: popupSelectComponent,
+    areaComponent: areaComponent,
+    industryComponent: industryComponent,
+    dateComponent: dateComponent,
+    yearsComponent: yearsComponent
+  },
+  data () {
+    return {
+      conf: {
+        keywords: '',
+        scope: '项目名称/标的物',
+        area: '全国',
+        industry: '全部',
+        start: new Date().getFullYear() - 2,
+        end: new Date().getFullYear(),
+        match: 0
+      },
+      popInfo: {
+        title: '',
+        show: false,
+        type: ''
+      },
+      entInfo: {
+        eid: '',
+        entName: ''
+      },
+      reqSign: 'bigmember',
+      filterInitData: {
+        areaArr: [],
+        industry: []
+      },
+      selectAreaList: ['全国'],
+      selectIndustryList: [],
+      selectScopeList: ['purchasing'],
+      matchTypeList: matchTypeList,
+      startRange: [],
+      endRange: [],
+      bigStatus: 0,
+      power:[]
+    }
+  },
+  watch: {
+    // 监听初始时间 如果结束时间小于初始时间 则两个调换位置
+    'conf.start': function(newVal) {
+      // console.log(this.conf.end, newVal)
+      if (this.conf.end < newVal) {
+        this.conf.start = this.conf.end
+        this.conf.end = newVal
+      }
+    },
+    'conf.area': function (newVal) {
+      console.log(newVal)
+      if (newVal == '全国') {
+        $('.area-class .van-cell__value span').html('全部')
+      } else {
+        $('.area-class .van-cell__value span').html(newVal)
+      }
+    }
+  },
+  computed: {
+    disabledConfirm: function () {
+      var key = this.conf.keywords
+      var scope = this.conf.scope
+      var area = this.conf.area
+      var industry = this.conf.industry
+      var start = this.conf.start
+      var end = this.conf.end
+      return !(key || scope || area || industry || start || end)
+    },
+    hasSpace () {
+      var key = this.conf.keywords
+      return key && key.replace(/^\s\s*/,'').indexOf(' ') > -1
+    },
+    filterInfoUrl: function () {
+      var path = ''
+      if (this.entInfo.eid) {
+        path = 'winner/selects'
+      } else if (this.entInfo.entName) {
+        path = 'buyer/selects'
+      }
+      var urlMap = {
+          bigmember: '/bigmember/portrait/' + path, // 大会员
+          svip: '/bigmember/subVipPortrait/' + path // 超级订阅
+      }
+      console.log(this.bigStatus, this.power)
+      var isMember = this.bigStatus > 0 && this.power.indexOf(5) > -1
+      var url = '/entnicheNew/portrait/buyer/selects'
+      // if (urlMap[this.reqSign]) {
+      //     url = urlMap[this.reqSign]
+      // }
+      return url
+    }
+  },
+  created () {
+    var eid = utils.getParam('eid')
+    var reqSign = utils.getParam('reqSign')
+    var entName = decodeURIComponent(utils.getParam('entName'))
+    var winnerStorage = JSON.parse(sessionStorage.getItem('winner_high_set'))
+    var buyerStorage = JSON.parse(sessionStorage.getItem('buyer_high_set'))
+    if (eid) {
+      this.entInfo.eid = decodeURIComponent(eid)
+      if (winnerStorage) {
+        this.formatterStorage(winnerStorage)
+      }
+    }
+    if (entName) {
+      this.entInfo.entName = entName
+      if (buyerStorage) {
+        this.formatterStorage(buyerStorage)
+      }
+    }
+    if (reqSign) {
+      this.reqSign = reqSign
+    }
+    this.getUserInfo()
+  },
+  mounted () {
+    var header = decodeURIComponent(utils.getParam('header'))
+    this.setHeaderTitle(header)
+    
+    if (this.conf.area == '全国') {
+      $('.area-class .van-cell__value span').html('全部')
+    } else {
+      $('.area-class .van-cell__value span').html(this.conf.area)
+    }
+  },
+  methods: {
+    // 设置title
+    setHeaderTitle: function setHeaderTitle (header) {
+      document.title = header || document.title
+    },
+    getUserInfo: function() {
+      var _this = this
+      $.ajax({
+        type: 'POST',
+        url: '/bigmember/use/isAdd?t=' + Date.now(),
+        success: function (res) {
+          if (res.error_code == 0 && res.data) {
+            _this.bigStatus = res.data.memberStatus
+            _this.power = res.data.power
+            _this.getFilterApi()
+          } else {
+            _this.showToast(res.error_msg)
+          }
+        },
+        error: function (error) {
+          console.log(error)
+        }
+    })
+    },
+    // 将缓存中的项目搜索范围英文字段转换为中文用于在输入框展示
+    formatterLabel: function(data) {
+      var arr = []
+      var list = this.matchTypeList
+      var sArr = data.split(',')
+      list.forEach(function(item){
+        sArr.forEach(function(v){
+          if(item.value == v) {
+            arr.push(item.label)
+          }
+        })
+      })
+      return arr.join(',')
+    },
+    // 回显缓存中的数据
+    formatterStorage: function (data) {
+      var timeRange = data.timeRange.split('_')
+      this.conf.keywords = data.match
+      this.conf.area = data.area ? data.area : '全国'
+      this.conf.scope = this.formatterLabel(data.matchRange)
+      this.conf.industry = data.scopeClass ? data.scopeClass : '全部'
+      this.conf.start = timeRange[0]
+      this.conf.end = timeRange[1]
+      this.conf.match = data.exactMatch
+      this.selectAreaList = data.area ? data.area.split(',') : ['全国']
+      this.selectScopeList = data.matchRange.split(',')
+      this.selectIndustryList = data.scopeClass.split(',')
+    },
+    // 取近四年的年份
+    getCurFourYears: function () {
+      var endYear = new Date().getFullYear()
+      var startYear = endYear - 4
+      var years = []
+      for(var i = startYear ; i <= endYear; i ++) {
+        years.push(i + '年')
+      }
+      return years
+    },
+    // 处理截止日期
+    getEndRangeYears: function () {
+      var endArr = []
+      var years = this.getCurFourYears()
+      var start = this.conf.start
+      if (start) {
+        endArr = years.filter(function (v) {
+          return v.replace('年', '') >= start.replace('年', '')
+        })
+      } else {
+        endArr =years
+      }
+      return endArr
+    },
+    showToast: function (message) {
+      this.$toast({
+          duration: 1500,
+          forbidClick: true,
+          message: message,
+      })
+    },
+    showLoading: function () {
+      var loading = this.$toast.loading({
+        duration: 0,
+        forbidClick: true,
+        message: 'loading...',
+      })
+      return loading
+    },
+    // 获取筛选条件
+    getFilterApi () {
+      var _this = this
+      var loading = this.showLoading()
+      var data = {
+        buyer: _this.entInfo.entName
+      }
+      $.ajax({
+          type: 'POST',
+          url: '/entnicheNew/portrait/buyer/selects',
+          data: data,
+          success: function (res) {
+            if (res.error_code == 0) {
+              loading.clear()
+              _this.filterInitData.areaArr = res.data.areaArr || []
+              _this.filterInitData.scopeArr = res.data.scopeArr || []
+              // _this.initSelector(res.data)
+            } else {
+              _this.showToast(res.error_msg)
+            }
+          },
+          error: function (error) {
+            loading.clear()
+            console.log(error)
+          }
+      })
+    },
+    // 选择器
+    popClick: function (type) {
+      this.popInfo.type = type
+      switch (type) {
+        case 'scope':
+          this.popInfo.show = true
+          this.initSelector()
+          this.popInfo.title = '请选择项目搜索范围'
+          break;
+        case 'area':
+          this.popInfo.show = true
+          this.initSelector(this.filterInitData)
+          this.popInfo.title = '请选择项目地区'
+          break;
+        case 'industry':
+          this.popInfo.show = true
+          this.initSelector(this.filterInitData)
+          this.popInfo.title = '请选择行业'
+          break;
+        case 'start':
+          this.popInfo.show = true
+          this.initSelector()
+          this.popInfo.title = '请选择开始年份'
+          break;
+        case 'end':
+          this.popInfo.show = true
+          this.initSelector()
+          this.popInfo.title = '请选择结束年份'
+          break;
+      }
+    },
+    initSelector: function (data) {
+      var _this = this
+      this.$nextTick(function() {
+        switch (_this.popInfo.type) {
+          case 'scope':
+            _this.initMatchTypeSelector()
+            break;
+          case 'area':
+            _this.filterInitData.areaArr = data.areaArr
+            _this.initProjectAreaSelector(data.areaArr)
+            break;
+          case 'industry':
+            _this.filterInitData.industry = data.scopeArr
+            _this.initProjectIndustrySelector(data.scopeArr)
+            break;
+          case 'start':
+            _this.startRange = _this.getCurFourYears()
+            break;
+          case 'end':
+            _this.endRange = _this.getEndRangeYears()
+            break;
+        }
+      })
+    },
+    // 项目搜索范围
+    initMatchTypeSelector: function () {
+      this.$refs.matchTypeSelector.setState(this.selectScopeList)
+    },
+    // 过滤地区
+    initProjectAreaSelector: function (areaArr) {
+      if (!Array.isArray(areaArr)) return
+      if (areaArr.indexOf('全国') === -1) {
+        areaArr.unshift('全国')
+      }
+      var areaMap = this.$refs.projectAreaSelector.provinceListMap
+      var map = {}
+      for (var key in areaMap) {
+        var arr = []
+        areaMap[key].forEach(function (item) {
+          if (areaArr.indexOf(item) !== -1) {
+            arr.push(item)
+          }
+        })
+        if (arr.length) {
+          map[key] = arr
+        }
+      }
+      this.$refs.projectAreaSelector.arrangeListMap(map)
+      this.$refs.projectAreaSelector.setState(this.selectAreaList)
+      $('.area-card-item').each(function(){
+        if($(this).html() == '全国') {
+          $(this).html('全部')
+        }
+      })
+    },
+    // 过滤行业数据
+    initProjectIndustrySelector: function (data) {
+      var arr = []
+      data.forEach(function(s) {
+        var key = s.substring(0, s.indexOf('_'))
+        var value = s.substring(s.indexOf('_') + 1)
+        arr.push({
+          name: key,
+          value: value
+        })
+      })
+      var newArr = []
+      arr.forEach(function(item, index) {
+        let newItem = newArr.find(function(i) {
+          return i.name == item.name
+        })
+        if (!newItem) {
+          newArr.push({
+            name: item.name,
+            value: [item.value]
+          })
+        } else {
+          newItem.value.push(item.value)
+        }
+      })
+      var resArr = []
+      newArr.forEach(function(s) {
+        var obj = {}
+        obj[s.name] = s.value
+        resArr.push(obj)
+      })
+      // console.log(resArr, '过滤好的行业数据')
+      this.$refs.industryCom.formatIndustryData(resArr)
+      this.$refs.industryCom.canClick = false
+      // this.$refs.industryCom.setState(this.selectIndustryList)
+    },
+    // 分析方式
+    checkMatch: function (item) {
+      this.conf.match = item
+    },
+    onKeywords: function (val) {
+      // 过滤首个空格
+      this.conf.keywords = val.replace(/^\s\s*/,'').replace(/(\r\n)|(\n)/g, '')
+    },
+    onCancel: function (data) {
+      if (!data) {
+        this.selectScopeList = ['purchasing']
+        this.$refs.matchTypeSelector.setState(this.selectScopeList)
+      } else if (data.name == 'areaItem') {
+        this.$refs.projectAreaSelector.setState(this.selectAreaList)
+      } else if (data.name == 'industryItem') {
+        this.$refs.industryCom.setState([])
+        this.$refs.industryCom.canClick = false
+      } else if (data.name == 'dateItem') {
+        
+      }
+    },
+    onConfirm: function (data) {
+      // console.log(data, 'data')
+      if (data.name === 'areaItem') {
+        if (data.data.length === 0) {
+          this.conf.area = '全国'
+          this.selectAreaList = ['全国']
+        } else {
+          this.conf.area = data.data.join(',')
+          this.selectAreaList = data.data
+        }
+      } else if (data.name === 'scopeItem') {
+        if (data.data.length === 0) {
+          this.conf.scope = ''
+        } else {
+          this.conf.scope = data.checkedList.map(function(v) {
+            return v.label
+          }).join(',')
+          this.selectScopeList = data.data
+        }
+      } else if (data.name === 'industryItem') {
+        if (data.data.length === 0) {
+          this.conf.industry = '全部'
+          this.selectIndustryList = data.data
+        } else {
+          this.conf.industry = data.data.join(',')
+          this.selectIndustryList = data.data
+        }
+      } else if (data.name === 'yearsItem') {
+        if (data.type === 'start') {
+          this.conf.start = data.data
+        } else if (data.type === 'end') {
+          this.conf.end = data.data
+        }
+      } else {
+        return console.log('暂无数据')
+      }
+      this.setToggle()
+    },
+    setToggle: function() {
+      this.popInfo.show = false
+    },
+    // 开始分析
+    startStatistic: function() {
+      var conf = this.conf
+      var list = this.matchTypeList
+      var arr = []
+      var sArr = conf.scope.split(',')
+      list.forEach(function(item){
+        sArr.forEach(function(v){
+          if(item.label == v) {
+            arr.push(item.value)
+          }
+        })
+      })
+      var obj = {
+        match: conf.keywords,
+        exactMatch: conf.match,
+        matchRange: arr.join(','),
+        area: conf.area.indexOf('全国') > -1 ? '' : conf.area,
+        scopeClass: conf.industry.indexOf('全部') > -1 ? '' : conf.industry,
+        timeRange: conf.start.replace('年', '') + '_' + conf.end.replace('年', '')
+      }
+      if (this.entInfo.entName) {
+        window.sessionStorage.setItem('buyer_high_set', JSON.stringify(obj))
+        window.sessionStorage.setItem('buyer_high_name', encodeURIComponent(this.entInfo.entName))
+      } else if (this.entInfo.eid) {
+        window.sessionStorage.setItem('winner_high_set', JSON.stringify(obj))
+        window.sessionStorage.setItem('winner_high_eid', this.entInfo.eid)
+      }
+      window.history.back()
+    },
+    // 重置
+    onReset: function () {
+      this.conf.keywords = ''
+      this.conf.scope = '项目名称/标的物'
+      this.conf.area = '全国'
+      this.conf.industry = '全部'
+      this.conf.start = new Date().getFullYear() - 2
+      this.conf.end = new Date().getFullYear()
+      this.conf.match = 0
+      this.filterInitData.area = []
+      this.selectAreaList = ['全国']
+      this.selectIndustryList = []
+      this.selectScopeList = ['purchasing']
+    }
+  }
+})

src/web/staticres/common-module/collection/js/area-mobile.js

@@ -41,6 +41,10 @@ var areaComponent = {
       default: function () {
         return {}
       }
+    },
+    model: {
+      type: String,
+      default: ''
     }
   },
   data:function () {
@@ -218,7 +222,9 @@ var areaComponent = {
     resetAll:function () {
       if (this.multiple) {
         this.setAllDisSelected(false)
-        this.indexListMap['#'][0].selected = true
+        if(this.model != 'entnicheNew') {
+          this.indexListMap['#'][0].selected = true
+        }
       } else {
         this.setAllDisSelected(false)
       }

src/web/staticres/common-module/collection/js/industry-mobile.js

@@ -97,20 +97,113 @@ var industryComponent = {
   methods: {
     // 获取行业数据
     getIndustryData: function(datas){
-      const _this = this
-      $.ajax({
-        url: '/publicapply/free/getindustrys',
-        type:'POST',
-        success: function(res){
-          if (res.error_code == 0) {
-            _this.industryData = res.data
-            _this.formatIndustryData(datas)
-          }
+      this.industryData = [
+        {
+          "建筑工程": [
+            "勘察设计",
+            "工程施工",
+            "监理咨询",
+            "材料设备",
+            "机电安装"
+          ]
+        },
+        {
+          "水利水电": [
+            "水利工程",
+            "发电工程",
+            "航运工程",
+            "其他工程"
+          ]
+        },
+        {
+          "能源化工": [
+            "原材料",
+            "仪器仪表",
+            "新能源",
+            "设备物资",
+            "化工产品",
+            "设备"
+          ]
+        },
+        {
+          "弱电安防": [
+            "综合布线",
+            "智能系统",
+            "智能家居"
+          ]
+        },
+        {
+          "信息技术": [
+            "系统集成及安全",
+            "软件开发",
+            "运维服务",
+            "其他"
+          ]
+        },
+        {
+          "行政办公": [
+            "办公家具",
+            "通用办公设备",
+            "专业设备",
+            "办公用品",
+            "生活用品"
+          ]
         },
-        error: function(err){
-          console.log(err)
+        {
+          "机械设备": [
+            "矿山机械",
+            "工程机械",
+            "机械零部件",
+            "机床相关",
+            "车辆",
+            "其他机械设备"
+          ]
+        },
+        {
+          "交通工程": [
+            "道路",
+            "轨道",
+            "桥梁",
+            "隧道",
+            "其他"
+          ]
+        },
+        {
+          "医疗卫生": [
+            "设备",
+            "耗材",
+            "药品"
+          ]
+        },
+        {
+          "市政设施": [
+            "道路",
+            "绿化",
+            "线路管网",
+            "综合项目"
+          ]
+        },
+        {
+          "服务采购": [
+            "法律咨询",
+            "会计",
+            "物业",
+            "审计",
+            "安保",
+            "仓储物流",
+            "广告宣传印刷",
+            "其他"
+          ]
+        },
+        {
+          "农林牧渔": [
+            "生产物资",
+            "生产设备",
+            "相关服务"
+          ]
         }
-      })
+      ]
+      this.formatIndustryData(datas)
     },
     formatIndustryData: function(datas) {
       if (!this.onlyshowsome && !datas) {

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -993,7 +993,6 @@ window.vBuyerSearchComponent = new Vue({
         ]
       },
       conditionStrMap: {
-        matchType: 'A',
         industry: [],
         area: [],
         buyerclass: [],
@@ -1357,7 +1356,7 @@ window.vBuyerSearchComponent = new Vue({
     },
     getSearchParams () {
       var tempParams = {
-        match: this.listInfo.value,
+        entName: this.listInfo.value,
         pageSize: this.listInfo.pageSize,
         pageNum: this.listInfo.pageNum
       }

src/web/staticres/js/ent-search-index-pc.js

@@ -286,7 +286,7 @@ var vm = new Vue({
         industryTab() {
             $.ajax({
                 type:'POST',
-                url:'/entnichenew/buy/whetherbuy',
+                url:'/entnicheNew/buy/whetherbuy',
                 success:function (res) {
                   if (res.data.isNew) {
                     this.industryShow = true

src/web/staticres/js/login.js

@@ -862,7 +862,7 @@ $(function(){
                   break
                 }
                 case 'forge': {
-                    $.post("/phone/forgetPwd",{
+                    $.post("/phone",{
                         reqType:"sendIdentCode",
                         phone:$(".forgetpwd_page .login-dig-input-box [name='forge_phone']").val(),
                         code:$(".forgetpwd_page .login-dig-input-box [name='forge_code']").val()

src/web/staticres/js/pur-search-index-pc.js

@@ -437,6 +437,9 @@ var vm = new Vue({
                         })
                         if (arrs.length == 0) {
                             this.listState.list = []
+                            if (res.error_msg) {
+                                toastFn(res.error_msg, 2000)
+                            }
                         } else {
                             _this.attentionCheck(arrs, String(arr1))
                         }
@@ -455,11 +458,7 @@ var vm = new Vue({
             this.getList(p)
         },
         goTitle(name) {
-            // const urls = this.$router.resolve({path:'/swordfish/page_big_pc/ent-bus_portrayal/' + name})
-            // window.open(urls.href, '_blank')
-            // const reff = this.$router.resolve({path:'/swordfish/page_big_pc/ent-bus_portrayal/' + name});
-            // window.open(reff.href,'_blank');
-            location.href = '/swordfish/page_big_pc/client_portrayal/' + name
+            location.href = '/unit_portrayal/' + name
         },
         // 全选
         allChange() {

src/web/templates/pc/biddetail_rec.html

@@ -1249,6 +1249,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 			bidmember = res.data.member
 			entniche = res.data.entniche
 			vip = res.data.vip
+      privatedata = res.data.privatedata
 			var subType = {{.T.obj.subtype}}
 			// if(subType == '采购意向' && !bidmember && !entniche && vip <=0){
 			// 	$(".com-prebuilt").removeClass("hidden");
@@ -1258,7 +1259,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 				$(".tip-box .tip-text").eq(0).text('采购意向项目全公开,抢先获知采购项目需求,')
 				$(".tip-box .tip-text").eq(1).text('提前主动介入,中标几率更高!')
 			}
-			if ((subType == '拟建' || subType == '采购意向') && !bidmember && !entniche && vip <=0){
+			if ((subType == '拟建' || subType == '采购意向') && !bidmember && !entniche && vip <=0 && !privatedata){
 				$(".com-prebuilt").removeClass("hidden");
 				$(".com-prebuilt").css('height', '408px')
 				$('.original-text').remove()

src/web/templates/pc/supsearch.html

@@ -841,7 +841,7 @@ var IframeOnClick = {
   .control-tabBtn a{
     margin-top: 0!important;
   }
-  #pursearch {
+  #searchInner .searchHeader .searchHeader-container .control-tabBtn #pursearch {
     display: none;
   }
   .bidbutdir{