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

src/entnichePc.json

@@ -1,4 +1,4 @@
 {
-	"entnichePcUser": [442,1686,1685,1711],
+	"entnichePcUser": [14595,442,1686,1685,1711],
 	"hideEntnicheMenu": [1711,442]
 }

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

@@ -207,7 +207,7 @@ var vNode = {
                 this.bigvariable.mealname = '试用版'
                 this.bigvariable.manyroot = '5'
                 this.bigvariable.seticon = 'icon-white-setting'
-            } else if (this.userinfor.member_status == 3) {
+            } else if (this.userinfor.member_status == 3  || this.userinfor.member_status == 6) {
                 this.bigvariable.isaddclass = 'shangji'
                 this.bigvariable.bgcolor = 'background:#fff'
                 this.bigvariable.mealname = '商机版'
@@ -219,7 +219,7 @@ var vNode = {
                 this.bigvariable.mealname = '智慧版'
                 this.bigvariable.manyroot = '42'
                 this.bigvariable.seticon = 'icon-zh-setting'
-            } else if (this.userinfor.member_status == 1) {
+            } else if (this.userinfor.member_status == 1 || this.userinfor.member_status == 7) {
                 this.bigvariable.isaddclass = 'zhuanjia'
                 this.bigvariable.bgcolor = 'background: rgb(62, 62, 82);'
                 this.bigvariable.mealname = '专家版'

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

@@ -357,13 +357,13 @@ var vNode = {
               console.log(res)
               setTimeout(function() {
                 // location.href = '/jyapp/big/page/buy_commit?bid=' + _this.encryptId
-                location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg'
+                location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg_freeuser'
               }, 200)
             },
             error: function (error) {
               console.log(error)
               // location.href = '/jyapp/big/page/buy_commit?bid=' + _this.encryptId
-              location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg'
+              location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg_freeuser'
             }
           })
         },
@@ -1435,7 +1435,7 @@ var vNode = {
         },
         //免费赠送采购单位全景分析体验 去解锁
         goGiveAnalysis: function(){
-          location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyerportrait_freeuser';
+          location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_freeuser';
         },
         // 前往升级或联系客服
         goUpgradeOrConcat: function (item) {

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

@@ -300,11 +300,11 @@ var mine = {
         }
 
         var icon = $('.user_info .big-vip-icon')
-        if (state == 1 || state == 5) {
+        if (state == 1 || state == 5 || state == 7) {
             icon.removeClass('icon-big-biaozhunhy icon-big-putonghy icon-shiyonghy').addClass('icon-big-gaojihy')
         } else if (state == 2) {
             icon.removeClass('icon-big-gaojihy icon-big-putonghy icon-shiyonghy').addClass('icon-big-biaozhunhy')
-        } else if (state == 3) {
+        } else if (state == 3 || state == 6) {
             icon.removeClass('icon-big-gaojihy icon-big-biaozhunhy icon-shiyonghy').addClass('icon-big-putonghy')
         } else if (state == 4) {
             icon.removeClass('icon-big-putonghy icon-big-gaojihy icon-big-biaozhunhy').addClass('icon-shiyonghy')

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

@@ -50,7 +50,7 @@
             <span class="header-title" style="color: #171826;">剑鱼标讯大会员</span>
             <span class="header-right"></span>
         </div>
-        <div class="j-header jy-app-header" v-if="isbiguser==3" style="background: #fff;">
+        <div class="j-header jy-app-header" v-if="isbiguser==3 || isbiguser==6" style="background: #fff;">
             <span class="header-left" @click="goBack()">
                 <span class="icon-back j-icon base-icon" style="color: #5F5E64;"></span>
             </span>
@@ -64,7 +64,7 @@
             <span class="header-title" style="color: #171826;">剑鱼标讯大会员</span>
             <span class="header-right"></span>
         </div>
-        <div class="j-header jy-app-header" v-if="isbiguser==1 || isbiguser==5" style="background: rgb(62, 62, 82)">
+        <div class="j-header jy-app-header" v-if="isbiguser==1 || isbiguser==5 || isbiguser==7" style="background: rgb(62, 62, 82)">
             <span class="header-left" @click="goBack()">
                 <span class="icon-back-white j-icon base-icon" style="color: #fff;"></span>
             </span>

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -574,6 +574,9 @@
       getTipStr () {
         var source = this.ajaxParams.source
         var tipMap = {
+          article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
+          ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
+          buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
           article_original: '为给您匹配精准的推荐信息，请完善个人信息，免费查看原文',
           article_collection: '重要项目一键创建标签收藏！请完善个人信息，为您匹配精准服务',
           member_attach: '请留下联系方式，我们会尽快联系您！体验附件下载特权，挖掘更多项目情报！',
@@ -591,9 +594,8 @@
           app_analysis_follow_project: '请完善个人信息，辅助你做投标决策及报价参考！',
           app_analysis_follow_ent: '请完善个人信息，辅助你做投标决策及报价参考！',
           'jy-wxsearch-index-tap': '请留下联系方式，我们会尽快联系您体验：市场分析周报/月报、竞对实时监控和分析、业主采购趋势/客户分析等',
-          article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
-          ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
-          buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
+          member_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
+          function_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！'
         }
         var titleMap = {
             ent_portrait_freeuser: '欢迎体验企业中标分析'
@@ -617,10 +619,14 @@
             }
             this.moduleShow.position = true
           }
-
+          
           if (source.indexOf('_freeuser') > -1 && infoText.indexOf('【') > -1) {
             var r = infoText.match(/\【(.+?)\】/g)
-             titleText = '欢迎体验' + r[0].replace('【','').replace('】','')
+            titleText = '欢迎体验' + r[0].replace('【','').replace('】','')
+          } else if (source.indexOf('ent_portrait_') > -1) {
+            titleText = '欢迎体验企业中标分析'
+          } else if (source.indexOf('buyer_portrait_') > -1) {
+            titleText = '欢迎体验采购单位全景分析'
           } else{
             titleText = '欢迎体验剑鱼大会员'
           }

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

@@ -746,7 +746,7 @@
         success: function (r) {
             if (r && r.data) {
                 window.jyAddInfo = r.data
-                if(res.data.memberStatus > 0 && r.data.isSubCount) {
+                if(r.data.memberStatus > 0 && r.data.isSubCount) {
                     $('#resbm').hide()
                 } else {
                     $('#resbm').show()

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

@@ -52,7 +52,7 @@ func CreateSubVipPortraitManager(userid string, pageFlag, searchValue string, is
 			if searchValue != "" && jy.Portraitexperience(userid, searchValue, isWinner) {
 				return &Portrait{userid}, true, nil
 			}
-			if !(pageFlag == "buyerPortraitNotCheckPower" || pageFlag == "buyerPortrait_newMsg") {
+			if !(pageFlag == "buyerPortraitNotCheckPower" || pageFlag == "buyerPortrait_newMsg" || pageFlag == "buyerPortrait_select") {
 				return nil, false, errors.New("非法请求")
 			}
 			return nil, false, nil

src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -244,7 +244,7 @@ func (this *SubVipPortrait) BuyerSelects() {
 		if buyer == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		_, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyer, false)
+		_, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait_select", buyer, false)
 		if err != nil {
 			return nil, err
 		}

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

@@ -993,6 +993,8 @@ func Combo(userid string, member_status int) (combo_name string) {
 			3: "商机版",
 			4: "试用版",
 			5: "自定义",
+			6: "商机版2.0",
+			7: "专家版2.0",
 		}
 		combo_name = level_map[member_status]
 	}

src/jfw/modules/followent/src/web/templates/_error.html

@@ -384,7 +384,7 @@ function infoListCss(){
 		'z-index':'999',
 		'cursor': 'pointer',
 		'height':'auto',
-		'width':'130px'
+		'width':'142px'
 	})
 	$('.one').css({
 		'display': 'inline-block',

src/web/staticres/big-member/js/meauContact.js

@@ -87,7 +87,7 @@ var MeauData = [
     '采购单位全景分析': [
       {
         two: '采购单位通讯录',
-        three: ' 提供采购单位的联系方式，获取销售机会。',
+        three: '提供采购单位的联系方式，获取销售机会。',
         four: 'icon-tick',
         five: 'icon-tick'
       },

src/web/staticres/big-member/js/unit_portrayal.js

@@ -354,13 +354,13 @@ var vNode = {
               console.log(res)
               setTimeout(function() {
                 // location.href = '/big/wx/page/buy_commit?bid=' + _this.encryptId
-                location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg'
+                location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg_freeuser'
               }, 200)
             },
             error: function (error) {
               console.log(error)
               // location.href = '/big/wx/page/buy_commit?bid=' + _this.encryptId
-              location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg'
+              location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg_freeuser'
             }
           })
         },
@@ -1419,7 +1419,7 @@ var vNode = {
         },
         //免费赠送采购单位全景分析体验 去解锁
         goGiveAnalysis: function(){
-          location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyerportrait_freeuser';
+          location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyer_portrait_freeuser';
         },
         // 前往升级或联系客服
         goUpgradeOrConcat: function (item) {

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

@@ -72,7 +72,9 @@ var highSet = new Vue({
       selectScopeList: ['purchasing'],
       matchTypeList: matchTypeList,
       startRange: [],
-      endRange: []
+      endRange: [],
+      bigStatus: 0,
+      power:[]
     }
   },
   watch: {
@@ -116,12 +118,14 @@ var highSet = new Vue({
       }
       var urlMap = {
           bigmember: '/bigmember/portrait/' + path, // 大会员
-          svip: '/bigmember/portrait/subVipPortrait/selects' // 超级订阅
-      }
-      var url = urlMap.bigmember
-      if (urlMap[this.reqSign]) {
-          url = urlMap[this.reqSign]
+          svip: '/bigmember/subVipPortrait/' + path // 超级订阅
       }
+      console.log(this.bigStatus, this.power)
+      var isMember = this.bigStatus > 0 && this.power.indexOf(5) > -1
+      var url = isMember ? urlMap.bigmember : urlMap.svip
+      // if (urlMap[this.reqSign]) {
+      //     url = urlMap[this.reqSign]
+      // }
       return url
     }
   },
@@ -146,11 +150,12 @@ var highSet = new Vue({
     if (reqSign) {
       this.reqSign = reqSign
     }
+    this.getUserInfo()
   },
   mounted () {
     var header = decodeURIComponent(utils.getParam('header'))
     this.setHeaderTitle(header)
-    this.getFilterApi()
+    
     if (this.conf.area == '全国') {
       $('.area-class .van-cell__value span').html('全部')
     } else {
@@ -162,6 +167,25 @@ var highSet = new Vue({
     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 = []

src/web/staticres/common-module/collection/js/buyer-example.js

@@ -86,84 +86,84 @@ var buyerExample = {
         case 'item_1': {
           textMap.headText.top = '采购单位项目动态全面获取,'
           textMap.headText.bot = '帮助企业洞察采购需求，开发新客户！',
-          textMap.source = 'buyer_portrait_contacts'
+          textMap.source = 'buyer_portrait_contacts_freeuser'
           break
         }
           // 年度项目统计
         case 'item_2': {
           textMap.headText.top = '采购单位年度项目规模、增长趋势'
           textMap.headText.bot = '一目了然，快速分析市场！'
-          textMap.source = 'buyer_portrait_yearData'
+          textMap.source = 'buyer_portrait_yearData_freeuser'
           break
         }
           // 月度采购规模统计
         case 'item_3': {
           textMap.headText.top = '通过纵向对比近3年月度中标金额，'
           textMap.headText.bot = '快速分析行业月度采购趋势！'
-          textMap.source = 'buyer_portrait_monthData'
+          textMap.source = 'buyer_portrait_monthData_freeuser'
           break
         }
           // 采购规模分布
         case 'item_4': {
           textMap.headText.top = '全面了解采购单位的年度采购规划、'
           textMap.headText.bot = '项目预算，帮助投标人制定投标策略！'
-          textMap.source = 'buyer_portrait_moneyRange'
+          textMap.source = 'buyer_portrait_moneyRange_freeuser'
           break
         }
           // 各类招标方式占比
         case 'item_5': {
           textMap.headText.top = '洞察采购单位招标方式、数量、金额占比，'
           textMap.headText.bot = '综合了解采购单位，帮企业决策是否投标！'
-          textMap.source = 'buyer_portrait_bidtypeData'
+          textMap.source = 'buyer_portrait_bidtypeData_freeuser'
           break
         }
           // 各行业项目平均节支率
         case 'item_6': {
           textMap.headText.top = '分析行业项目的预算、中标价格差额比率，'
           textMap.headText.bot = '帮助企业核算采购项目的利润率！'
-          textMap.source = 'buyer_portrait_rate'
+          textMap.source = 'buyer_portrait_rate_freeuser'
           break
         }
           // 各行业项目规模占比
         case 'item_7': {
           textMap.headText.top = '通过行业采购项目的规模、数量、利润率，'
           textMap.headText.bot = '洞悉采购单位的采购状况！'
-          textMap.source = 'buyer_portrait_top12'
+          textMap.source = 'buyer_portrait_top12_freeuser'
           break
         }
           // 重点合作企业
         case 'item_8': {
           textMap.headText.top = '通过挖掘重点合作企业，直观了解采购单位'
           textMap.headText.bot = '与企业关系远近，辅助投标决策！'
-          textMap.source = 'buyer_portrait_topShow'
+          textMap.source = 'buyer_portrait_topShow_freeuser'
           break
         }
           // 合作企业注册资本分布
         case 'item_9': {
           textMap.headText.top = '通过分析合作企业注册资本、采购项目规模、'
           textMap.headText.bot = '利润率，全面洞察采购单位合作企业！'
-          textMap.source = 'buyer_portrait_withCapitalData'
+          textMap.source = 'buyer_portrait_withCapitalData_freeuser'
           break
         }
          // 合作企业年龄分布
         case 'item_10': {
           textMap.headText.top = '通过分析合作企业年龄、数量、规模分布情况，'
           textMap.headText.bot = '全面洞察采购单位合作企业！'
-          textMap.source = 'buyer_portrait_withEstablishData'
+          textMap.source = 'buyer_portrait_withEstablishData_freeuser'
           break
         }
         // 合作企业注册地分布
         case 'item_11': {
           textMap.headText.top = '通过分析合作企业的地址、数量、采购规模，'
           textMap.headText.bot = '了解采购单位营商环境，辅助投标决策！'
-          textMap.source = 'buyer_portrait_withAreaData'
+          textMap.source = 'buyer_portrait_withAreaData_freeuser'
           break
         }
         // 重点合作代理机构
         case 'item_12': {
           textMap.headText.top = '通过提供合作代理机构的名录、数量，全面洞察'
           textMap.headText.bot = '采购单位合作环境，辅助投标决策！'
-          textMap.source = 'buyer_portrait_topAgencyData'
+          textMap.source = 'buyer_portrait_topAgencyData_freeuser'
           break
         }
       }

src/web/staticres/css/pc.css

@@ -140,6 +140,7 @@ form{
 	line-height: 45px;
 	text-align:left;
 	padding-left:15px;
+	padding-right:15px;
 /*	border: 1px solid #e0e0e0;*/
 
 }

src/web/staticres/frontRouter/pc/seeBuyerHistory/css/index-pc.css

@@ -164,6 +164,7 @@
     background-position: left;
     padding-left: 22px;
     background-size: 18px;
+    margin-left: 8px;
 }
 .dialog{
     width: 100%;
@@ -209,4 +210,5 @@
     line-height: 36px;
     color: #FFFFFF;
     margin-top: 32px;
+    cursor: pointer;
 }

src/web/staticres/js/login.js

@@ -307,6 +307,9 @@ function checkBigStatus () {
         if (res.data.viper) {
           $(".myorderDiv.ent-search").show()
         }
+		if (res.data.memberStatus<=0&&res.data.vipStatus>0&&res.data.viper){
+			$(".myorderDiv.portraitRecord").show()
+		}
       }
     }
   })
@@ -347,7 +350,7 @@ var logic = function(data,num){
 		$("#bidLogin").modal("hide")
 		$("#bidcommunity").modal("hide")
 		clearInterval(loginfg);
-		loginflag = true;
+		loginflag = true;infoList
 		processpage(data.shareid,num);
 		//登录成功，停止轮询
 		LoginPolling.stop();
@@ -411,6 +414,12 @@ var logic = function(data,num){
           +"<div class=\"myorderDiv bx-collection\" onclick=\"window.location.href='/swordfish/frontPage/collection/sess/index'\">"
           +"<span>标讯收藏</span>"
           +"</div>"
+		  +"<div class=\"myorderDiv portraitRecord\" style='display: none' onclick=\"window.location.href='/swordfish/frontPage/seeHistory/sess/index'\">"
+		  +"<span>企业画像记录</span>"
+		  +"</div>"
+		  +"<div class=\"myorderDiv portraitRecord\" style='display: none' onclick=\"window.location.href='/swordfish/frontPage/seeBuyerHistory/sess/index'\">"
+		  +"<span>采购单位画像记录</span>"
+		  +"</div>"
 					hhtml+= "<div class='exitDiv' onclick='signout()'>"
 						+"<img id='outImg' src='/images/userexit.png'/>"
 						+"<span>退出</span>"
@@ -694,6 +703,12 @@ var haslogin = function(num,kyorpn,url){
             +"<div class=\"myorderDiv bx-collection\" onclick=\"window.location.href='/swordfish/frontPage/collection/sess/index'\">"
             +"<span>标讯收藏</span>"
             +"</div>"
+			+"<div class=\"myorderDiv portraitRecord\" style='display: none' onclick=\"window.location.href='/swordfish/frontPage/seeHistory/sess/index'\">"
+			+"<span>企业画像记录</span>"
+			+"</div>"
+			+"<div class=\"myorderDiv portraitRecord\" style='display: none' onclick=\"window.location.href='/swordfish/frontPage/seeBuyerHistory/sess/index'\">"
+			+"<span>采购单位画像记录</span>"
+			+"</div>"
             hhtml+= "<div class='exitDiv' onclick='signout()'>"
             +"<img id='outImg' src='/images/userexit.png'/>"
             +"<span>退出</span>"

src/web/staticres/landingpage/pc/js/index.js

@@ -172,7 +172,7 @@ function infoListCss() {
 		'z-index': '999',
 		'cursor': 'pointer',
 		'height': 'auto',
-		'width': '130px',
+		'width': '142px',
 		'box-shadow': ' 0 0 20px rgba(0,0,0, .2)'
 	})
 	$('.one').css({

src/web/staticres/me/js/mine.js

@@ -153,11 +153,11 @@ var mine = {
         var state = this.pageUserInfo.bigmemberVip
         var icon = $('.u-i-big-logo')
 
-        if (state == 1 || state == 5) {
+        if (state == 1 || state == 5 || state == 7) {
             icon.show().removeClass('icon-big-biaozhunhy icon-big-putonghy icon-shiyonghy').addClass('icon-big-gaojihy')
         } else if (state == 2) {
             icon.show().removeClass('icon-big-gaojihy icon-big-putonghy icon-shiyonghy').addClass('icon-big-biaozhunhy')
-        } else if (state == 3) {
+        } else if (state == 3 || state == 6) {
             icon.show().removeClass('icon-big-gaojihy icon-big-biaozhunhy icon-shiyonghy').addClass('icon-big-putonghy')
         } else if (state == 4) {
             icon.show().removeClass('icon-big-putonghy icon-big-gaojihy icon-big-biaozhunhy').addClass('icon-shiyonghy')

src/web/templates/_error.html

@@ -435,7 +435,7 @@ function infoListCss(){
 		'z-index':'999',
 		'cursor': 'pointer',
 		'height':'auto',
-		'width':'130px'
+		'width':'142px'
 	})
 	$('.one').css({
 		'display': 'inline-block',

src/web/templates/active/topics.html

@@ -724,7 +724,7 @@ function infoListCss(){
 		'z-index':'999',
 		'cursor': 'pointer',
 		'height':'auto',
-		'width':'130px'
+		'width':'142px'
 	})
 	$('.one').css({
 		'display': 'inline-block',

src/web/templates/common/pchead.html

@@ -1125,7 +1125,7 @@ function infoListCss(){
 		'z-index':'999',
 		'cursor': 'pointer',
 		'height':'auto',
-		'min-width':'130px',
+		'min-width':'142px',
 		'box-shadow':' 0 0 20px rgba(0,0,0, .2)'
 	})
 	$('.userInfo .one').css({

src/web/templates/common/pchead_bak.html

@@ -169,7 +169,7 @@ function infoListCss(){
 		'z-index':'999',
 		'cursor': 'pointer',
 		'height':'auto',
-		'width':'130px'
+		'width':'142px'
 	})
 	$('.one').css({
 		'display': 'inline-block',

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -608,6 +608,9 @@
       getTipStr () {
         var source = this.ajaxParams.source
         var tipMap = {
+          article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
+          ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
+          buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
           article_original: '为给您匹配精准的推荐信息，请完善个人信息，免费查看原文',
           article_collection: '重要项目一键创建标签收藏！请完善个人信息，为您匹配精准服务',
           member_attach: '请留下联系方式，我们会尽快联系您！体验附件下载特权，挖掘更多项目情报！',
@@ -625,9 +628,8 @@
           wx_analysis_follow_project: '请完善个人信息，辅助你做投标决策及报价参考！',
           wx_analysis_follow_ent: '请完善个人信息，辅助你做投标决策及报价参考！',
           'jy-wxsearch-index-tap': '请留下联系方式，我们会尽快联系您体验：市场分析周报/月报、竞对实时监控和分析、业主采购趋势/客户分析等',
-          article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
-          ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
-          buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
+          member_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
+          function_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！'
         }
         var titleMap = {
             ent_portrait_freeuser: '欢迎体验企业中标分析'
@@ -651,11 +653,15 @@
             }
             this.moduleShow.position = true
           }
-         if (source.indexOf('_freeuser') > -1 && infoText.indexOf('【') > -1) {
-                var r = infoText.match(/\【(.+?)\】/g)
-                titleText = '欢迎体验' + r[0].replace('【','').replace('】','')
+          if (source.indexOf('_freeuser') > -1 && infoText.indexOf('【') > -1) {
+            var r = infoText.match(/\【(.+?)\】/g)
+            titleText = '欢迎体验' + r[0].replace('【','').replace('】','')
+          }  else if (source.indexOf('ent_portrait_') > -1) {
+            titleText = '欢迎体验企业中标分析'
+          } else if (source.indexOf('buyer_portrait_') > -1) {
+            titleText = '欢迎体验采购单位全景分析'
           } else{
-                titleText = '欢迎体验剑鱼大会员'
+            titleText = '欢迎体验剑鱼大会员'
           }
         } else {
             titleText = '完善信息'
@@ -1155,6 +1161,36 @@
                       }
                     }
                   })
+                } else if (_this.ajaxParams.source.indexOf('_freeuser') > -1) {
+                  var source = _this.ajaxParams.source
+                  var text = ''
+                  switch (source) {
+                    case 'ent_portrait_freeuser':
+                      text = '企业中标分析'
+                      break;
+                    case 'buyer_portrait_freeuser':
+                      text = '采购单位全景分析'
+                      break;
+                    case 'article_attach_freeuser':
+                      text = '附件下载'
+                      break;
+                  }
+                  _this.$dialog.close()
+                  _this.$dialog.confirm({
+                    title: '提交成功',
+                    message: '恭喜您，成功解锁【' + text + '】权益1次。如需查看更多，请开通超级订阅，为您提供最新的商业情报，抢占先机。',
+                    className: 'ent-search-dialog max-54',
+                    overlayClass: 'z-2030',
+                    showCancelButton: false,
+                    getContainer: '.perfect-info-group',
+                    confirmButtonText: '我知道了',
+                  }).then(function () {
+                    sessionStorage.setItem('salesBackStatus', 'true')
+                    history.back()
+                  }).catch(function () {
+                    sessionStorage.setItem('salesBackStatus', 'true')
+                    history.back()
+                  })
                 } else {
                   _this.$dialog.close()
                   _this.$dialog.confirm({

src/web/templates/pc/biddetail_rec.html

@@ -3233,7 +3233,30 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 			}
 			return ""
 		}
-
+		//金额转化   金额：0-万元以下单位为元  ，万元以上至亿元以下单位为万元 ，亿元以上单位为亿元。保留 小数点后 2 位，不进行四舍五入。
+		function conversionMoeny(money){
+			var m = ""+money;
+			var m_arr = m.split(".")
+			var m_1 = m_arr[0]
+			var len_m1 = m_1.length;
+			if (len_m1 >= 9 ){
+				m = m_1.substring(0,len_m1-8) + "." + m_1.substring(len_m1-8,len_m1-6) + "亿元"
+			} else if (len_m1 >= 5) {
+				m =m_1.substring(0,len_m1-4) + "." + m_1.substring(len_m1-4,len_m1-2) + "万元"
+			} else {
+				if(m_arr.length == 1) {
+					return m + ".00元"
+				}
+				var m_2 = m_arr[1]
+				if (m_2.length > 1) {
+					m_2 = m_2.substring(0,2)
+				} else {
+					m_2 = m_2.substring(0,1) + "0"
+				}
+				m = m_1 + "." + m_2 + "元"
+			}
+			return m
+		}
 function fromwhere(text){
   var ad="pc_articel_";
   if (getinfotype(subtype)=="拟建项目"){
@@ -3356,11 +3379,34 @@ function fromwhere(text){
       }
     }
   }
+
+  //超级订阅附件下载
+  function cjdyDownload () {
+	  $.ajax({
+		  type:'post',
+		  url:'/publicapply/attachment/get',
+		  data:{
+			  infoId:{{.T.obj._id}}
+  		  },
+		  success:function(data){
+			  // TODO 留资判断
+			  for(var i=0;i<data.data.attachment.length;i++) {
+
+			  }
+			  if(data.data && data.data.attachment !=null && data.data.attachment.length!==0){
+				  for(var i=0;i<data.data.attachment.length;i++) {
+					  goDownload(data.data.attachment[i].downurl)
+				  }
+			  }
+	  }
+  });
+  }
+
   // 获取附件内容
   function getFileData () {
     $.ajax({
       type:'post',
-      url:'/publicapply/attachment/get',
+      url:'/bigmember/attachment/get',
       data:{
         infoId:{{.T.obj._id}}
       },
@@ -3369,15 +3415,28 @@ function fromwhere(text){
         if(data.data && data.data.attachment !=null && data.data.attachment.length!==0){
           var html = ''
           for(var i=0;i<data.data.attachment.length;i++) {
-            html += "<div class='downs'>"+"<a class='menu_list' style='text-decoration:underline;color: #2CB7CA' onclick='goDownload(\""+data.data.attachment[i].downurl+"\")'>"+(i+1)+"."+data.data.attachment[i].filename+"</a></div>"
+            // html += "<div class='downs'>"+"<a class='menu_list' style='text-decoration:underline;color: #2CB7CA' onclick='goDownload(\""+data.data.attachment[i].downurl+"\")'>"+(i+1)+"."+data.data.attachment[i].filename+"</a></div>"
+            html += "<div class='downs'>"+"<a class='menu_list' style='text-decoration:underline;color: #2CB7CA'>"+(i+1)+"."+data.data.attachment[i].filename+"</a></div>"
+
           }
           if(html!==""){
             $("#attach-list").css("display","").find(".download-list").html(html)
           }
+			$(".downs").click(function (){
+				cjdyDownload()
+			})
+			// $(".downs").click(function (){
+			//
+			// })
         }
       }
     });
   }
+
+  // $(".menu_list").click(function (){
+  //
+  // })
+
   // 根据isAdd接口 展示附件部分dom
   function showFileSomeDom () {
     // 免费用户展示可下载一次提示(免费用户且没有体验过附件下载权益的展示)