分支合并

src/jfw/front/shorturl.go

@@ -650,7 +650,7 @@ func (s *Short) LoginCommon(userId, stype, id string, bm bool) error {
 }
 
 func CNode(userId string) bool {
-	if hasRetainedCapital(userId, "jyarticle_see3_plus") {
+	if hasRetainedCapital(userId, []string{"jyarticle_see3_plus", "pc_article_member_freeuse", "app_article_member_freeuse", "app_article_member_freeuse", "wx_article_member_freeuse", "h5_article_member_freeuse"}) {
 		return true
 	}
 	rM := map[string]interface{}{}
@@ -978,8 +978,8 @@ func RemoveDuplicatesAndEmpty(a []string) (ret []string) {
 }
 
 // 该节点是否留资
-func hasRetainedCapital(uid, source string) bool {
-	if count, err := mongodb.CountByErr("saleLeads", map[string]interface{}{"userid": uid, "source": source}); err != nil || count > 0 {
+func hasRetainedCapital(uid string, source []string) bool {
+	if count, err := mongodb.CountByErr("saleLeads", map[string]interface{}{"userid": uid, "source": map[string]interface{}{"$in": source}}); err != nil || count > 0 {
 		return true
 	}
 	return false

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

@@ -65,6 +65,7 @@ var TypeCodeMap = map[string]string{
 	"验收":   "验收公告信息",
 	"违规":   "违规信息",
 }
+var redisLimitation = "limitation"
 
 func (s *Short) WhiteList() error {
 	ipInitAuthentication := s.GetString("ipInitAuthentication")
@@ -163,7 +164,7 @@ func (s *Short) Article(contentType, stype, id string) error {
 				if strings.Contains(subTypeStr, "拟建") || strings.Contains(subTypeStr, "采购意向") {
 					canRead = false
 				} else {
-					if resVal := redis.GetStr("other", watchKey); resVal != "" {
+					if resVal := redis.GetStr(redisLimitation, watchKey); resVal != "" {
 						sidss := strings.Split(resVal, "_")
 						canReadNotice := config.Sysconfig["canReadNotice"]
 						if len(sidss) < util.IntAll(canReadNotice) {
@@ -171,7 +172,7 @@ func (s *Short) Article(contentType, stype, id string) error {
 							sidss = append(sidss, sid)
 							arrs := RemoveDuplicatesAndEmpty(sidss)
 							newVal := strings.Join(arrs, "_")
-							redis.Put("other", watchKey, newVal, jy.GetExpire())
+							redis.Put(redisLimitation, watchKey, newVal, jy.GetExpire())
 						} else {
 							canRead = false
 							for _, v := range sidss {
@@ -182,7 +183,7 @@ func (s *Short) Article(contentType, stype, id string) error {
 							}
 						}
 					} else {
-						redis.Put("other", watchKey, sid, jy.GetExpire())
+						redis.Put(redisLimitation, watchKey, sid, jy.GetExpire())
 						canRead = true
 					}
 					//检验是否留资
@@ -484,7 +485,7 @@ func RegDetail(html string) string {
 }
 
 func CNode(userId string) bool {
-	if hasRetainedCapital(userId, "jyarticle_see3_plus") {
+	if hasRetainedCapital(userId, []string{"jyarticle_see3_plus", "pc_article_member_freeuse", "app_article_member_freeuse", "app_article_member_freeuse", "wx_article_member_freeuse", "h5_article_member_freeuse"}) {
 		return true
 	}
 	rM := map[string]interface{}{}
@@ -641,8 +642,8 @@ func RemoveDuplicatesAndEmpty(a []string) (ret []string) {
 }
 
 // 该节点是否留资
-func hasRetainedCapital(uid, source string) bool {
-	if count, err := mongodb.CountByErr("saleLeads", map[string]interface{}{"userid": uid, "source": source}); err != nil || count > 0 {
+func hasRetainedCapital(uid string, source []string) bool {
+	if count, err := mongodb.CountByErr("saleLeads", map[string]interface{}{"userid": uid, "source": map[string]interface{}{"$in": source}}); err != nil || count > 0 {
 		return true
 	}
 	return false

src/jfw/modules/app/src/db.json

@@ -40,7 +40,7 @@
     },
   "redis": {
     "main":{
-      "address": "other=192.168.3.11:1712,push=192.168.3.206:1712,sso=192.168.3.206:1712,session=192.168.3.11:1713,recovery=192.168.3.11:1712,merge=192.168.3.11:1712,newother=192.168.3.11:1712,seoCache=192.168.3.11:1712"
+      "address": "other=192.168.3.11:1712,push=192.168.3.206:1712,sso=192.168.3.206:1712,session=192.168.3.11:1713,recovery=192.168.3.11:1712,merge=192.168.3.11:1712,newother=192.168.3.11:1712,seoCache=192.168.3.11:1712,limitation=192.168.3.11:1713"
     }
     },
     "mysql": {

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

@@ -325,7 +325,7 @@
               var canAuto = !skipAuto.some(function (v) {
                 return _this.ajaxParams.source.indexOf(v) > -1
               })
-              this.submitForm(canAuto)
+              // this.submitForm(canAuto)
             }
           }
         })

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

@@ -185,7 +185,7 @@
               var canAuto = !skipAuto.some(function (v) {
                 return _this.ajaxParams.source.indexOf(v) > -1
               })
-              this.submitForm(canAuto)
+              // this.submitForm(canAuto)
             }
           }
         })

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

@@ -321,7 +321,7 @@
               var canAuto = !skipAuto.some(function (v) {
                 return _this.ajaxParams.source.indexOf(v) > -1
               })
-              this.submitForm(canAuto)
+              // this.submitForm(canAuto)
             }
           }
         })

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

@@ -35,6 +35,11 @@
     <div class="j-main perfect-info-group" id="perfect-info-solution" v-cloak>
         <div class="j-container">
             <div class="j-main info-collect">
+                <div class="top-tip-group" v-if="getTipStr">
+                    <p class="top-tip-text">
+                        @@getTipStr@@
+                    </p>
+                </div>
                 <div class="form-card-group">
                     <div class="form-title">基本信息</div>
                     <div class="form-content-card">
@@ -129,8 +134,13 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.8.2/vant.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
-
 <script>
+
+  var tipMap = {
+    // 电信行业解决方案
+    telecom_solution: '请留下您的信息，我们会尽快和您联系!'
+  }
+
   var vNode = {
     delimiters: ['@@', '@@'],
     el: '#perfect-info-solution',
@@ -348,6 +358,18 @@
         var zc = this.infoMap.position.indexOf('总裁') > -1
         var zjl = this.infoMap.position.indexOf('总经理') > -1
         return !(zc || zjl) && this.infoMap.position
+      },
+      getTipStr () {
+        var source = this.ajaxParams.source
+        // 提示语
+        var infoText = ''
+        for (var key in tipMap) {
+          if (source.indexOf(key) !== -1) {
+            infoText = tipMap[key]
+            break
+          }
+        }
+        return infoText || ''
       }
     },
     methods: {
@@ -378,7 +400,7 @@
               var canAuto = !skipAuto.some(function (v) {
                 return _this.ajaxParams.source.indexOf(v) > -1
               })
-              this.submitForm(canAuto)
+              // this.submitForm(canAuto)
             }
           }
         })

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

@@ -490,7 +490,7 @@
               var canAuto = !skipAuto.some(function (v) {
                 return _this.ajaxParams.source.indexOf(v) > -1
               })
-              this.submitForm(canAuto)
+              // this.submitForm(canAuto)
             }
           }
         })

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

@@ -136,6 +136,106 @@
           overflow: hidden;
           margin: 0 auto;
       }
+      .compare-dialog .mask-zz{
+          width: 6.7rem;
+      }
+      .compare-dialog .compare-dialog-head{
+          height: 1.12rem;
+          background: url("/jyapp/images/wx/pc_zzt2.png") no-repeat center center;
+          background-size: contain;
+          color: #171826;
+          text-align: center;
+          font-family: PingFang SC;
+          font-size: 15px;
+          font-style: normal;
+          font-weight: 400;
+          line-height: 1.12rem;
+      }
+      .compare-dialog .compare-dialog-body{
+          padding: .28rem .3rem .32rem;
+      }
+      .compare-dialog .table-box{
+          border: 1px solid #E5E5E5;
+          border-radius :6px;
+          flex-shrink: 0;
+      }
+      .compare-dialog .table-column{
+          display: flex;
+          justify-content: space-around;
+          align-items: center;
+          border-bottom: 1px solid #E5E5E5;
+
+      }
+      .compare-dialog .table-column li {
+          height:100%;
+          text-align: center;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          color:#171826;
+          font-size: .26rem;
+          line-height: .32rem;
+      }
+      .compare-dialog .table-column li:nth-of-type(1){
+          width: 28%;
+      }
+      .compare-dialog .table-column li:not(:first-child){
+          width: 36%;
+      }
+      .compare-dialog .table-column li:not(:nth-last-child(1)){
+          border-right: 1px solid #E5E5E5;
+      }
+      .compare-dialog .table-column .free-btn-reword{
+          border-radius: 4px;
+          background: #2ABED1;
+          height: .6rem;
+          color: #FFF;
+          text-align: center;
+          font-size: .26rem;
+          padding: .1rem .12rem;
+          line-height: .4rem;
+          cursor: pointer;
+          margin-bottom: .08rem;
+      }
+      .compare-dialog .table-column  .free-btn-experience{
+          border-radius: 4px;
+          border: 1px solid #E7C28A;
+          height: .6rem;
+          background: linear-gradient(270deg, #FEF0D7 0%, #FFF9F0 100%);
+          cursor: pointer;
+          color: #B1700E;
+          text-align: center;
+          font-size: .26rem;
+          line-height: .4rem;
+          padding:  .1rem .38rem;
+          margin-bottom: .08rem;
+      }
+      .compare-dialog p{
+          margin:0;
+      }
+      .compare-dialog li img {
+          width:.32rem;
+          height:.32rem;
+      }
+      .compare-dialog .split-row{
+          display: flex;
+          padding: .02rem .32rem;
+          height:.52rem;
+          justify-content: center;
+          align-items: center;
+          color: #2ABED1;
+          font-size: .24rem;
+          line-height: 18px;
+          border-bottom: 0.5px solid #E5E5E5;
+          background: #ECFCFE;
+      }
+      .blue-color {
+          color: #2ABED1 !important;
+      }
+      .gold-color {
+          color: #B1700E !important;
+      }
       .free-open-tip{
         display: flex;
         align-items: center;
@@ -723,7 +823,7 @@
                     {{end}}
                 </ul>
             </div>
-            <div class="mask-zz dialog-tip-group hidden">
+            <div class="mask-zz dialog-tip-group default-dialog hidden">
                 <div class="mask-zz">
                     <div style="position: relative">
                         <img class="dialog-top-img" src='/jyapp/images/wx/pc_zzt.png?v={{Msg "seo" "version"}}'>
@@ -737,6 +837,41 @@
                     </div>
                 </div>
             </div>
+            <div class="mask-zz dialog-tip-group compare-dialog hidden">
+                <div class="mask-zz">
+                    <div class="compare-dialog-head">
+                        <div id="compare-dialog-title">您尚未完善信息，今日查看公告权限用完啦</div>
+                    </div>
+                    <div  class="compare-dialog-body">
+                        <div class="table-box">
+                            <ul class="table-column" style="height:1.28rem;">
+                                <li style="background:#F5F6F7;font-size:.24rem;">免费注册用户</li>
+                                <li style="background-color:#2ABED1;color:#fff;font-size:.24rem;"><span style="font-size:.26rem;font-weight: bold;">免费注册用户 </span>（完善信息）</li>
+                                <li class="jump-bigmember-page" style="padding: 0;background: linear-gradient(270deg, #F4DEB1 0%, #FFF3E0 100%);color:#593913;"><span style="font-size:.26rem;font-weight: bold;">大会员</span><span style="text-decoration-line: underline;text-underline: #593913;font-size:.24rem;">大数据赋能企业 <br>数字化营销&gt;</span></li>
+                            </ul>
+                            <p class="split-row">标讯权益</p>
+                            <p style="padding: .04rem .24rem;color:#5F5E64;font-size:.26rem;line-height: .4rem;border-bottom:1px solid #E5E5E5;">可查看招标预告、招标公告、招标结果、招标信用信息</p>
+                            <p class="split-row">超前项目权益</p>
+                            <ul class="table-column" style="height:1.52rem;">
+                                <li><img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}\jyapp\images\icon-close.png?v={{Msg "seo" "version"}}" alt=""></li>
+                                <li><img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}\jyapp\images\icon-close.png?v={{Msg "seo" "version"}}" alt=""></li>
+                                <li class="gold-color" style="line-height:.4rem;">采购意向<br>拟建项目<br>AI智能预测 </li>
+                            </ul>
+                            <p class="split-row">每日查看数量</p>
+                            <ul class="table-column" style="height:.8rem;">
+                                <li>3条</li>
+                                <li class="blue-color">不限</li>
+                                <li class="gold-color">不限</li>
+                            </ul>
+                            <ul class="table-column" style="height:1.44rem;border-bottom:0;">
+                                <li>&#x3000;</li>
+                                <li><span class="free-btn-reword">完善个人信息</span><span>&#x3000;</span></li>
+                                <li class="gold-color"><span class="free-btn-experience">免费体验</span><span style="text-decoration-line: underline;" class="jump-customer-service">咨询客服</span></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="lead-btn-nj" style="color:#2cb7ca;margin:15px 0;display:none;margin-top:20px;"><div class="adv_tosieve" style="font-size:.25rem;"></div><div class="join" onclick="adv_statistics(this)" adv_name="微信三级页引导按钮"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
             <div class="tab-ct">
                 <div id="tab1" style="display:none;">
@@ -1413,11 +1548,15 @@
                 $('#dialog-tip-title').text('项目提前介入，中标更轻松')
                 $(".dialog-tip-text").html('提前1-3个月获取项目信息，及早介入准备更充分')
             }
+            if(!canRead) {
+              $('.default-dialog').removeClass("hidden")
+            }
         } else {
             if (!canRead) {
-                $('#dialog-tip-title').text('免费查看更多公告')
-                $(".dialog-tip-text").html('请完善个人信息，获取更多免费查看公告权限')
-                $(".free-btn-reword").text('立即解锁')
+                // $('#dialog-tip-title').text('免费查看更多公告')
+                // $(".dialog-tip-text").html('请完善个人信息，获取更多免费查看公告权限')
+                // $(".free-btn-reword").text('立即解锁')
+                $('.compare-dialog').removeClass("hidden")
             }
             if (!canRead) {
                 $(".right-container").hide() // 收藏和关注
@@ -1431,7 +1570,7 @@
             $(".tab-ct").hide() // 正文信息
             $(".abs").hide() // 阅读原文和意见反馈
             $(".atta-list").hide() // 附件列表
-            $(".mask-zz").removeClass("hidden");
+            // $(".mask-zz").removeClass("hidden");
 
         } else {
             $(".prebuilt").css('height', 'unset')
@@ -1485,6 +1624,23 @@
         //  留资判断
         location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + sourceKey
     })
+    // 免费体验
+    $('.free-btn-experience').on('click', function() {
+      var sourceKey = 'app_article_member_freeuse'
+      if (utils.$envs.inH5) {
+        sourceKey = 'h5_article_member_freeuse'
+      }
+      //  留资跳转
+      location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + sourceKey
+    })
+    // 咨询客服
+    $('.jump-customer-service').on('click', function() {
+      location.href = "/jyapp/free/customer"
+    })
+    // 跳转大会员落地页
+    $('.jump-bigmember-page').on('click', function() {
+      location.href = "/jyapp/big/page/index"
+    })
 
     // 大会员文案点击
     $('.bigvip_drain').on('click', function() {
@@ -2342,7 +2498,9 @@
             if(title !==''){
                 $('.time_label').addClass('new_layout')
                 $('.tool_bottom').addClass('new_layout free_user')
-                $('.forecast').css('display','flex')
+                if(canRead) {
+                  $('.forecast').css('display','flex')
+                }
             }else{
                 $('.time_label').css({'justify-content':'space-between'})
                 $('.tool_bottom').css({'justify-content':'space-between'})

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

@@ -226,7 +226,7 @@ $(function () {
                     return
                 }
                 vm.isNeedSubmit(sourceMap[typeKey].source,function(){
-                    vm.showSuccess = true
+                    // vm.showSuccess = true
                 })
                 break
             }
@@ -297,7 +297,7 @@ $(function () {
             return
         }
         vm.isNeedSubmit('member_freeuser',function(){
-            vm.showSuccess = true
+            // vm.showSuccess = true
         })
     })
 

src/web/staticres/common-module/pc-dialog/js/leave-info-dialog.js

@@ -538,42 +538,62 @@ var vm = new Vue({
           }
           var result = checkRequiredKeys(checkKeys, res.info)
           res.info.interest = interest
-          if (result) {
-            callback && callback()
-            _this.formAjax(_this.source, res.info)
-          } else if (res.data) {
-            _this.isForce = res.data.fource
-            if (res.data.retainedCapital) {
-              _this.showForm = true
-            // 当前头部背景图
-              _this.isSelfHeader()
-              // _this.changeTop()
-              if (res.info) {
-                echoRequiredValues(_this.form, res.info, ['name', 'phone', 'mail', 'branch'])
-                // 原有赋值回显逻辑
-                _this.form.oldPhone = res.info.phone ? res.info.phone : ''
-                _this.form.companyName = res.info.company ? res.info.company : ''
-                _this.form.companyType = res.info.companyType ? res.info.companyType.split(',') : []
-                if (res.info.position) {
-                  if (jobJson.indexOf(res.info.position) == -1) {
-                    // _this.form.job = '其他'
-                    // _this.form.otherJob = res.data.position.replace('其他/', '')
-                    _this.form.job = ''
-                    _this.form.otherJob = ''
-                  } else {
-                    _this.form.job = res.info.position
-                  }
-                } else {
-                  _this.form.job = ''
-                }
+          _this.showForm = true
+          // 当前头部背景图
+          _this.isSelfHeader()
+          if (res.info) {
+            echoRequiredValues(_this.form, res.info, ['name', 'phone', 'mail', 'branch'])
+            // 原有赋值回显逻辑
+            _this.form.oldPhone = res.info.phone ? res.info.phone : ''
+            _this.form.companyName = res.info.company ? res.info.company : ''
+            _this.form.companyType = res.info.companyType ? res.info.companyType.split(',') : []
+            if (res.info.position) {
+              if (jobJson.indexOf(res.info.position) == -1) {
+                _this.form.job = ''
+                _this.form.otherJob = ''
+              } else {
+                _this.form.job = res.info.position
               }
             } else {
-              callback && callback()
-              // 缺陷出现场景为：在其他页面留过资，但没有邮箱信息（user表也没有存邮箱字段），当前source也已留过资（是否需要留资字段返回为false）
-              // 如出现改场景 则会一直提交（更新）不了留资信息， 引次此处也需要再次提交 
-              // _this.formAjax(_this.source, res.info)
+              _this.form.job = ''
             }
           }
+          // if (result) {
+          //   callback && callback()
+          //   _this.formAjax(_this.source, res.info)
+          // } else if (res.data) {
+          //   _this.isForce = res.data.fource
+          //   if (res.data.retainedCapital) {
+          //     _this.showForm = true
+          //     // 当前头部背景图
+          //     _this.isSelfHeader()
+          //     // _this.changeTop()
+          //     if (res.info) {
+          //       echoRequiredValues(_this.form, res.info, ['name', 'phone', 'mail', 'branch'])
+          //       // 原有赋值回显逻辑
+          //       _this.form.oldPhone = res.info.phone ? res.info.phone : ''
+          //       _this.form.companyName = res.info.company ? res.info.company : ''
+          //       _this.form.companyType = res.info.companyType ? res.info.companyType.split(',') : []
+          //       if (res.info.position) {
+          //         if (jobJson.indexOf(res.info.position) == -1) {
+          //           // _this.form.job = '其他'
+          //           // _this.form.otherJob = res.data.position.replace('其他/', '')
+          //           _this.form.job = ''
+          //           _this.form.otherJob = ''
+          //         } else {
+          //           _this.form.job = res.info.position
+          //         }
+          //       } else {
+          //         _this.form.job = ''
+          //       }
+          //     }
+          //   } else {
+          //     callback && callback()
+          //     // 缺陷出现场景为：在其他页面留过资，但没有邮箱信息（user表也没有存邮箱字段），当前source也已留过资（是否需要留资字段返回为false）
+          //     // 如出现改场景 则会一直提交（更新）不了留资信息， 引次此处也需要再次提交 
+          //     // _this.formAjax(_this.source, res.info)
+          //   }
+          // }
         }
       })
     },
@@ -697,7 +717,7 @@ var vm = new Vue({
     brightKeyword: function (val) {
       var name = this.form.companyName
       if (val.indexOf(name) !== -1) {
-        return val.replace(name, "<span style='color:#2ABED1;'>" + name + "</span")
+        return val.replace(name, "<span style='color:#2ABED1;'>" + name + "</span>")
       } else {
         return val
       }

src/web/staticres/common-module/perfect-info/js/perfect-info.js

@@ -7,6 +7,9 @@ var emailRegExp = /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/
 
 // 标题
 var titleMap = {
+  app_article_member_freeuse: '免费体验大会员功能权益',
+  wx_article_member_freeuse: '免费体验大会员功能权益',
+  h5_article_member_freeuse: '免费体验大会员功能权益',
   activity_free_plan: '完善信息',
   super_membership_day: '欢迎体验剑鱼大会员',
   ent_portrait_freeuser: '欢迎体验企业中标分析',
@@ -15,10 +18,10 @@ var titleMap = {
 
   'ent-manage-wx': '欢迎体验剑鱼标讯商机管理',
   'jypush_see10_plus_wx':'完善信息',
-  'jyarticle_see3_plus_wx':'完善信息',
+  'jyarticle_see3_plus_wx':'免费享无限次查看标讯体验',
   'ent-manage-app': '欢迎体验剑鱼标讯商机管理',
   'jypush_see10_plus_app':'完善信息',
-  'jyarticle_see3_plus_app':'完善信息',
+  'jyarticle_see3_plus_app':'免费享无限次查看标讯体验',
 
   'article_collection': '完善信息',
   'article_original': '完善信息',
@@ -45,6 +48,10 @@ var titleMap = {
   wx_search_dzhfxbg: '欢迎体验剑鱼大会员',
   app_analysis_ProjectDetails: '欢迎体验剑鱼大会员',
   wx_analysis_ProjectDetails: '欢迎体验剑鱼大会员',
+  // 标讯详情免费用户--免费体验
+  app_article_member_freeuse: '免费体验大会员功能权益',
+  h5_article_member_freeuse: '免费体验大会员功能权益',
+  wx_article_member_freeuse: '免费体验大会员功能权益',
 
   // 数据超市列表-申请数据定制
   app_DataSupermarket_Customization: '量身定制数据解决方案',
@@ -57,11 +64,18 @@ var titleMap = {
   // 数据超市详情-申请数据定制
   app_supermarket_details_customization: '量身定制数据解决方案',
   wx_supermarket_details_customization: '量身定制数据解决方案',
-  h5_supermarket_details_customization: '量身定制数据解决方案'
+  h5_supermarket_details_customization: '量身定制数据解决方案',
+  // 标书制作
+  bid_document_Introduction_page: '完善信息',
+  // 电信行业解决方案
+  telecom_solution: '完善信息'
 }
 
 // tip
 var tipMap = {
+  app_article_member_freeuse: '请升级大会员无限制查看标讯、超前项目，优先对接项目负责人，抢占绝对先机！',
+  wx_article_member_freeuse: '请升级大会员无限制查看标讯、超前项目，优先对接项目负责人，抢占绝对先机！',
+  h5_article_member_freeuse: '请升级大会员无限制查看标讯、超前项目，优先对接项目负责人，抢占绝对先机！',
   article_attach_freeuser: freeAttachText,
   ent_portrait_freeuser: freeEntText,
   ent_portrait_winnerNewMsg_freeuser: freeEntText,
@@ -95,6 +109,8 @@ var tipMap = {
 
   article_original: '为给您匹配精准的推荐信息，请完善个人信息，免费查看原文',
   article_collection: '重要项目一键创建标签收藏！请完善个人信息，为您匹配精准服务',
+  // 标讯详情免费用户--免费体验
+  article_member_freeuse: '请升级大会员无限制查看标讯、超前项目，优先对接项目负责人，抢占绝对先机！',
   member_attach: '请留下联系方式，我们会尽快联系您！体验附件下载特权，挖掘更多项目情报！',
   member_freeuse: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
   month_: '请留下联系方式，我们会尽快联系您！体验市场分析周报/月报！',
@@ -124,8 +140,8 @@ var tipMap = {
   'ent-manage-app': '请留下联系方式，我们会尽快联系您体验商机管理全部功能！',
   'jypush_see10_plus_wx':'请完善个人信息，为您匹配更多精准项目信息',
   'jypush_see10_plus_app':'请完善个人信息，为您匹配更多精准项目信息',
-  'jyarticle_see3_plus_wx':'请完善个人信息，获取更多免费查看公告权限',
-  'jyarticle_see3_plus_app':'请完善个人信息，获取更多免费查看公告权限',
+  'jyarticle_see3_plus_wx':'请完善个人信息，即刻享无限次查看标讯的权益，如需查看超前项目请联系客服：400-108-6670',
+  'jyarticle_see3_plus_app':'请完善个人信息，即刻享无限次查看标讯的权益，如需查看超前项目请联系客服：400-108-6670',
 
   'certificateServices-': '请留下联系方式，我们会尽快联系您！',
   peugeot_supplier_regist:'请完善您的个人信息，抢先对接采购单位',
@@ -161,7 +177,18 @@ var tipMap = {
   // 数据超市详情-申请数据定制
   app_supermarket_details_customization: '专业数据团队，支持私有化部署。请完善个人信息，获取定制化数据解决方案。',
   wx_supermarket_details_customization: '专业数据团队，支持私有化部署。请完善个人信息，获取定制化数据解决方案。',
-  h5_supermarket_details_customization: '专业数据团队，支持私有化部署。请完善个人信息，获取定制化数据解决方案。'
+  h5_supermarket_details_customization: '专业数据团队，支持私有化部署。请完善个人信息，获取定制化数据解决方案。',
+  // 标书制作
+  bid_document_Introduction_page: '请留下联系方式，我们会尽快联系您！',
+  // 电信行业解决方案
+  telecom_solution: '请留下您的信息，我们会尽快和您联系'
+}
+
+// 留资来源（数据库新增字段，记录留资对应的来源，之前未记录的不考虑，新增的source要记录）
+var sourceDescMap = {
+  app_article_member_freeuse: '标讯详情页-免费体验大会员',
+  wx_article_member_freeuse: '标讯详情页-免费体验大会员',
+  h5_article_member_freeuse: '标讯详情页-免费体验大会员'
 }
 
 var vNode = {
@@ -610,9 +637,12 @@ var vNode = {
             var canAuto = !skipAuto.some(function (v) {
               return _this.ajaxParams.source.indexOf(v) > -1
             })
-            if(!isCollect) {
-              this.submitForm(canAuto)
-            }
+            /**
+             * P403需求：需要用户确认完留资信息后再提交 不再自动提交
+             */
+            // if(!isCollect) {
+            //   this.submitForm(canAuto)
+            // }
           }
         }
       })
@@ -900,28 +930,28 @@ var vNode = {
       sessionStorage.removeItem('salesBackStatus')
       history.back()
     },
-      showMessage: function (msg, confirmText, callback) {
-        var message = msg || '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验大会员全部功能！'
-        this.$dialog.close()
-        this.$dialog.confirm({
-          message: message,
-          className: 'ent-search-dialog max-54',
-          overlayClass: 'z-2030',
-          showCancelButton: false,
-          getContainer: '.perfect-info-group',
-          confirmButtonText: confirmText || '我知道了',
-        }).then(function () {
-          if (callback) {
-            callback()
-          } else {
-            sessionStorage.setItem('salesBackStatus', 'true')
-            history.back()
-          }
-        }).catch(function () {
+    showMessage: function (msg, confirmText, callback) {
+      var message = msg || '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验大会员全部功能！'
+      this.$dialog.close()
+      this.$dialog.confirm({
+        message: message,
+        className: 'ent-search-dialog max-54',
+        overlayClass: 'z-2030',
+        showCancelButton: false,
+        getContainer: '.perfect-info-group',
+        confirmButtonText: confirmText || '我知道了',
+      }).then(function () {
+        if (callback) {
+          callback()
+        } else {
           sessionStorage.setItem('salesBackStatus', 'true')
           history.back()
-        })
-      },
+        }
+      }).catch(function () {
+        sessionStorage.setItem('salesBackStatus', 'true')
+        history.back()
+      })
+    },
     submitForm (auto) {
       if (utils.isWeiXinBrowser) {
         this.wxTweetAjax('isICRW') // 提交留资埋点公众号推文
@@ -943,6 +973,7 @@ var vNode = {
       this.ajaxParams.partnerNeeds = this.infoMap.partnerNeeds
       this.ajaxParams.agree = this.isRead
       this.ajaxParams.branch = this.infoMap.branch.indexOf('总裁') > -1 || this.infoMap.branch.indexOf('总经理') > -1 ? '' : this.infoMap.branch
+      this.ajaxParams.source_desc = sourceDescMap[this.ajaxParams.source]
 
       var _this = this
       var loading = _this.showLoading()
@@ -958,6 +989,10 @@ var vNode = {
             sessionStorage.setItem('salesBackData', JSON.stringify(sessionData))
             Object.assign(_this.submitResponse, r)
             switch (source) {
+              case '_article_member_freeuse': {
+                _this.showMessage('已收到您提交的免费体验大会员申请，我们会尽快联系您并预约演示时间。')
+                break
+              }
               case 'member_freeuse': {
                 _this.showMessage('您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验大会员全部功能！')
                 break
@@ -979,19 +1014,20 @@ var vNode = {
                 break
               }
               case 'jyarticle_see3_plus_wx': {
-                _this.showToast('提交成功')
+                _this.showMessage('您已获得无限次免费查看标讯的权益，如需查看超前项目请联系客服：400-108-6670', '确定', function () {
+                  history.back()
+                }, '提交成功')
                 setTimeout(function () {
                   sessionStorage.setItem('salesBackStatus', 'true')
                   history.back()
-                }, 1500)
+                }, '提交成功')
                 break
               }
               case 'jyarticle_see3_plus_app': {
-                _this.showToast('提交成功')
-                setTimeout(function () {
+                _this.showMessage('您已获得无限次免费查看标讯的权益，如需查看超前项目请联系客服：400-108-6670', '确定', function () {
                   sessionStorage.setItem('salesBackStatus', 'true')
                   history.back()
-                }, 1500)
+                }, '提交成功')
                 break
               }
               case 'jypush_see10_plus_wx': {
@@ -999,7 +1035,7 @@ var vNode = {
                 setTimeout(function () {
                   sessionStorage.setItem('salesBackStatus', 'true')
                   history.back()
-                }, 1500)
+                }, 2000)
                 break
               }
               case 'jypush_see10_plus_app': {
@@ -1050,12 +1086,20 @@ var vNode = {
               case 'h5_supermarket_details_customization': {
                 _this.showMessage('我们的客户经理会在24小时内尽快与您联系。', '我知道了', function () {
                   history.back()
-                })
+                },)
+                break
+              }
+              case 'app_article_member_freeuse':
+              case 'h5_article_member_freeuse':
+              case 'wx_article_member_freeuse': {
+                _this.showMessage('已收到您提交的免费体验大会员申请，我们会尽快联系您并预约演示时间。', '确定', function () {
+                  history.back()
+                }, '提交成功')
                 break
               }
               default: {
                 // 标书制作或者三方认证(case语句满足不了条件，放default中做更多判断)
-                if (source === 'bid_document_Introduction_page' || source.indexOf('certificateServices') > -1) {
+                if (source === 'bid_document_Introduction_page' || source.indexOf('certificateServices') > -1 || source === 'telecom_solution') {
                   _this.bidShow = true
                   break
                 }

src/web/staticres/frontRouter/pc/activity/js/task-202207.js

@@ -1051,7 +1051,7 @@ var task = new Vue({
         trackClick('点击福利三-立即体验-留资')
       }
       vm.isNeedSubmit('super_membership_day',function(){
-        vm.showSuccess = true
+        // vm.showSuccess = true
       })
     },
     doCopy: function () {

src/web/staticres/frontRouter/pc/activity/js/task-20221111.js

@@ -969,7 +969,7 @@ var task = new Vue({
         trackClick('点击福利三-立即体验-留资')
       }
       vm.isNeedSubmit('super_membership_day',function(){
-        vm.showSuccess = true
+        // vm.showSuccess = true
       })
     },
     doCopy: function () {

src/web/staticres/frontRouter/pc/activity/js/task.js

@@ -421,7 +421,7 @@ var task = new Vue({
             // 留资
             function collectSubmitCallback (key, result) {
               if (key === 'activity_free_plan' && result) {
-                vm.showSuccess = true
+                // vm.showSuccess = true
                 _this.ajaxProgress()
               }
             }

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

@@ -184,3 +184,14 @@
 .is-quest .dialog-footer .el-button+.el-button {
   margin-left: 32px;
 }
+
+.el-checkbox__input.is-checked+.el-checkbox__label{
+  color: #2CB7CA;
+}
+.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+  background-color: #2CB7CA;
+  border-color: #2CB7CA;
+}
+.el-input.is-active .el-input__inner, .el-input__inner:focus{
+  border-color: #2CB7CA;
+}

src/web/staticres/frontRouter/pc/bidedoc/js/index-pc.js

@@ -93,30 +93,44 @@ var bidLeaveInfo = new Vue({
           // 判断当前信息否在其他页面留资  如果全部留资 直接弹窗提交成功
           var checkKeys = ['name', 'phone', 'company', 'companyType']
           var result = checkRequiredKeys(checkKeys, res.info)
-          if (result) {
-            _this.showSuccess = true
-            options && options.alreadySubmitCb && options.alreadySubmitCb()
-            _this.formAjax(_this.source, res.info)
-          } else if (res.data){
-            window.isRetained = res.data.retainedCapital
-            options && options.needSubmitCb && options.needSubmitCb()
-            if (res.data.retainedCapital) {
-              _this.isShow = true
-              if (res.info) {
-                if (res.info.companyType) {
-                  res.info.companyType = res.info.companyType.split(',')
-                } else {
-                  res.info.companyType = []
-                }
-                echoRequiredValues(_this.ruleBide, res.info, checkKeys)
-                if (res.info.company) {
-                  _this.showSearchResult = false
-                }
-              }
+          // *P403需求：所有留资都不需要自动提交，弹出留资弹框回显出来信息 确认后手动提交
+          _this.isShow = true
+          if (res.info) {
+            if (res.info.companyType) {
+              res.info.companyType = res.info.companyType.split(',')
             } else {
-              _this.showSuccess = true
+              res.info.companyType = []
+            }
+            echoRequiredValues(_this.ruleBide, res.info, checkKeys)
+            if (res.info.company) {
+              _this.ruleBide.companyName = res.info.company
+              _this.showSearchResult = false
             }
           }
+          // if (result) {
+          //   _this.showSuccess = true
+          //   options && options.alreadySubmitCb && options.alreadySubmitCb()
+          //   _this.formAjax(_this.source, res.info)
+          // } else if (res.data){
+          //   window.isRetained = res.data.retainedCapital
+          //   options && options.needSubmitCb && options.needSubmitCb()
+          //   if (res.data.retainedCapital) {
+          //     _this.isShow = true
+          //     if (res.info) {
+          //       if (res.info.companyType) {
+          //         res.info.companyType = res.info.companyType.split(',')
+          //       } else {
+          //         res.info.companyType = []
+          //       }
+          //       echoRequiredValues(_this.ruleBide, res.info, checkKeys)
+          //       if (res.info.company) {
+          //         _this.showSearchResult = false
+          //       }
+          //     }
+          //   } else {
+          //     _this.showSuccess = true
+          //   }
+          // }
         }
       })
     },

src/web/staticres/frontRouter/pc/customExport/js/index-pc.js

@@ -19,7 +19,7 @@ $(function(){
 function needSubmitHandle (source){
   // 调用组件是否留资方法 传入一个来源对应模块 弹出弹框 （页面改版改为点击【获取数据样例】触发弹框）
   vm.isNeedSubmit(source, function(){
-    vm.showSuccess = true
+    // vm.showSuccess = true
   })
 }
 

src/web/staticres/frontRouter/pc/solution/js/pc-collect-solution-info.js

@@ -357,35 +357,56 @@ var vmSolution = new Vue({
         success:function (res) {
           var checkKeys = ['name', 'phone', 'company', 'companyType', 'branch', 'position']
           var result = checkRequiredKeys(checkKeys, res.info)
-          if (result) {
-            callback && callback()
-            _this.formAjax(_this.source, res.info)
-          } else if (res.data) {
-            _this.isForce = res.data.fource
-            window.isRetained = res.data.retainedCapital
-            if (res.data.retainedCapital) {
-              _this.showForm = true
-              if (res.info) {
-                echoRequiredValues(_this.form, res.info, ['name', 'phone', 'branch'])
-                _this.form.companyName = res.info.company ? res.info.company : ''
-                if (res.info.position) {
-                  if (jobJson.indexOf(res.info.position) == -1) {
-                    // _this.form.job = '其他'
-                    // _this.form.otherJob = res.data.position.replace('其他/', '')
-                    _this.form.job = ''
-                    _this.form.otherJob = ''
-                  } else {
-                    _this.form.job = res.info.position
-                  }
-                } else {
-                  _this.form.job = ''
-                }
+          _this.showForm = true
+          if (res.info) {
+            echoRequiredValues(_this.form, res.info, ['name', 'phone', 'branch'])
+            _this.form.companyName = res.info.company ? res.info.company : ''
+            if (res.info.companyType) {
+              _this.form.companyType = res.info.companyType.split(',')
+            } else {
+              _this.form.companyType = []
+            }
+            if (res.info.position) {
+              if (jobJson.indexOf(res.info.position) == -1) {
+                _this.form.job = ''
+                _this.form.otherJob = ''
+              } else {
+                _this.form.job = res.info.position
               }
-              _this.curDom = dom
             } else {
-              callback && callback()
+              _this.form.job = ''
             }
           }
+          _this.curDom = dom
+          // if (result) {
+          //   callback && callback()
+          //   _this.formAjax(_this.source, res.info)
+          // } else if (res.data) {
+          //   _this.isForce = res.data.fource
+          //   window.isRetained = res.data.retainedCapital
+          //   if (res.data.retainedCapital) {
+          //     _this.showForm = true
+          //     if (res.info) {
+          //       echoRequiredValues(_this.form, res.info, ['name', 'phone', 'branch'])
+          //       _this.form.companyName = res.info.company ? res.info.company : ''
+          //       if (res.info.position) {
+          //         if (jobJson.indexOf(res.info.position) == -1) {
+          //           // _this.form.job = '其他'
+          //           // _this.form.otherJob = res.data.position.replace('其他/', '')
+          //           _this.form.job = ''
+          //           _this.form.otherJob = ''
+          //         } else {
+          //           _this.form.job = res.info.position
+          //         }
+          //       } else {
+          //         _this.form.job = ''
+          //       }
+          //     }
+          //     _this.curDom = dom
+          //   } else {
+          //     callback && callback()
+          //   }
+          // }
         }
       })
     },

src/web/staticres/js/pc-collect-user-info.js

@@ -361,6 +361,7 @@ var vm = new Vue({
         agree: false,
       },
       sourceTitleMap: {
+        pc_article_member_freeuse: '请升级大会员无限制查看标讯、超前项目，优先对接项目负责人，抢占绝对先机！',
         article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
         // ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
         // ent_portrait_winnerNewMsg_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
@@ -397,13 +398,17 @@ var vm = new Vue({
         article_purchase_intention: '留下您的联系方式，我们会尽快和您联系。提前介入项目，助您轻松中标。', // 三级页-采购意向
         article_proposed_project: '留下您的联系方式，我们会尽快和您联系。提前介入项目，助您轻松中标。', // 三级页-拟建项目
         'ent-manage-pc': '欢迎留下联系方式，我们的大客户经理会在24小时内联系您！',
-        "jyarticle_see3_plus_pc":"请完善个人信息，获取更多免费查看公告权限",
+        "jyarticle_see3_plus_pc":"请完善个人信息，即刻享无限次查看标讯的权益，如需查看超前项目请联系客服：400-108-6670",
         'activity_free_plan': '请完善信息，免费获取200剑鱼币',
         super_membership_day: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
         peugeot_supplier_regist:'请完善您的个人信息，抢先对接采购单位',
         peugeot_view_infor: '请留下联系方式，我们会尽快联系您体验大会员全部功能！'
       },
-      isRefresh: false // 留完资是否需要刷新页面
+      isRefresh: false, // 留完资是否需要刷新页面
+      sourceDescMap: {
+        jyarticle_see3_plus_pc: '标讯详情页-无限次免费查看标讯的权益',
+        pc_article_member_freeuse: '标讯详情页-免费体验大会员'
+      }
     }
   },
   computed: {
@@ -451,7 +456,7 @@ var vm = new Vue({
           return '我们会尽快联系您并预约演示时间，请耐心等待～<br>您将获得免费体验商机管理全部功能！'
         }
         if (this.source.indexOf('jyarticle_see3_plus_pc') > -1) {
-          return ''
+          return '您已获得无限次免费查看标讯的权益，如需查看超前项目请联系客服：400-108-6670'
         }
         if (this.source === 'activity_free_plan') {
           return '完善信息任务已完成，快去领取剑鱼币吧~'
@@ -462,6 +467,9 @@ var vm = new Vue({
         if (this.source === 'pc_index_bid_data') {
           return '我们会尽快联系您并根据您的需求，提供最适合的产品演示服务，请耐心等待。'
         }
+        if (this.source === 'pc_article_member_freeuse') {
+          return '已收到您提交的免费体验大会员申请，我们会尽快联系您并预约演示时间。'
+        }
         return '我们会尽快联系您并预约演示时间，请耐心等待～<br>您将获得免费体验大会员全部功能！'
       }
     }
@@ -529,13 +537,16 @@ var vm = new Vue({
           this.dialogTitleTop = '欢迎体验剑鱼标讯商机管理'
         } else if (source.indexOf('jyarticle_see3_plus_pc') > -1){
           this.dialogTitle = text
-          this.dialogTitleTop = '完善信息'
+          this.dialogTitleTop = '免费享无限次查看标讯体验'
         } else if (source === 'activity_free_plan') {
           this.dialogTitle = text
           this.dialogTitleTop = '完善信息'
         } else if (source === 'article_proposed_project' || source === 'article_purchase_intention') {
           this.dialogTitle = text
           this.dialogTitleTop = '欢迎体验剑鱼大会员'
+        } else if (source === 'pc_article_member_freeuse') {
+          this.dialogTitle = text
+          this.dialogTitleTop = '免费体验大会员功能权益'
         }
         // else if (source.indexOf("article_collection") > -1){
         //   this.dialogTitle = text
@@ -602,17 +613,18 @@ var vm = new Vue({
           }
           var result = checkRequiredKeys(checkKeys, res.info)
           if (result) {
-            _this.showForm = false
-            res.data.retainedCapital = false
-            callback && callback(res)
             // 包含这些source，不存记录
             // 非主动触发留资节点，每点击一次数据库不会记录
             if(!isCollect) {
-              _this.formAjax(_this.source, res.info)
+              _this.showForm = true
+              _this.setEchoInfo(res.info)
+            } else {
+              res.data.retainedCapital = false
+              callback && callback(res)
             }
             switch (source) {
               case 'member_freeuse': {
-                _this.showSuccess = true
+                // _this.showSuccess = true
                 break
               }
               case 'jyarticle_see3_plus_pc': {
@@ -634,11 +646,11 @@ var vm = new Vue({
                 break
               }
               default: {
-                if (source.indexOf('_freeuser') > -1) {
-                  _this.showSuccess = true
-                } else {
-                  _this.showSuccess = true
-                }
+                // if (source.indexOf('_freeuser') > -1) {
+                //   _this.showSuccess = true
+                // } else {
+                //   _this.showSuccess = true
+                // }
               }
             }
           } else if (res.data) {
@@ -647,7 +659,8 @@ var vm = new Vue({
             if(window.isFree || !isCollect) {
               if (res.data.retainedCapital || !result) {
                 _this.showForm = true
-                _this.getOldInfo(source)
+                // _this.getOldInfo(source)
+                _this.setEchoInfo(res.info)
                 _this.curDom = dom
               } else {
                 callback && callback(res)
@@ -694,7 +707,6 @@ var vm = new Vue({
     // 表单提交请求
     formAjax: function(source, info) {
       try {
-        // 谁写的split，这不报错？加个try catch
         var infoid = window.location.pathname.split("/")[3].split(".html")[0]
       } catch (error) {}
       var isProDetail = window.location.pathname.indexOf('/article/content')
@@ -715,7 +727,8 @@ var vm = new Vue({
         // partnerNeeds: this.form.need,
         // agree: this.form.agreeChecked,
         branch: this.form.branch.indexOf('总裁') > -1 || this.form.branch.indexOf('总经理') > -1 ?  '' : this.form.branch,
-        origin: location.origin
+        origin: location.origin,
+        source_desc: this.sourceDescMap[this.source]
       }
       if (infoid != "" && isProDetail != -1){
         params.publish_id = infoid
@@ -735,6 +748,11 @@ var vm = new Vue({
             _this.showForm = false
             typeof collectSubmitCallback === 'function' ? collectSubmitCallback(source, res.data) : null
             switch (source) {
+              // 标讯详情页免费体验留完资 需要自动刷新
+              case 'pc_article_member_freeuse': {
+                _this.showSuccess = true
+                _this.isRefresh = true
+              }
               case 'member_freeuse': {
                 _this.showSuccess = true
                 break
@@ -761,8 +779,10 @@ var vm = new Vue({
                 }
                 break
               }
-              case 'jyarticle_see3_plus_pc': {
-                location.reload()
+              case 'jyarticle_see3_plus_pc':{
+                _this.showSuccess = true
+                _this.isRefresh = true
+                // location.reload()
                 break
               }
               case 'pc_index_bottom_adv': {
@@ -770,11 +790,7 @@ var vm = new Vue({
                 break
               }
               default: {
-                if (source.indexOf('_freeuser') > -1) {
-                  _this.showSuccess = true
-                } else {
-                  _this.showSuccess = true
-                }
+                _this.showSuccess = true
                 break
               }
             }
@@ -898,6 +914,39 @@ var vm = new Vue({
       this.form.scale = ''
       this.form.business = ''
       this.form.need = ''
+    },
+    setEchoInfo: function (data) {
+      if (data) {
+        this.form.name = data.name ? data.name : ''
+        this.form.phone = data.phone ? data.phone : ''
+        this.form.mail = data.mail ? data.mail : ''
+        if (data.province && data.city) {
+          this.form.region = [data.province, data.city]
+        } else if (data.province && !data.city) {
+          this.form.region = [data.province]
+        } else {
+          this.form.region = []
+        }
+        this.form.industry = data.industry ? data.industry.split('_') : []
+        this.form.mold = data.hireType ? data.hireType : '公司'
+        this.form.companyName = data.company ? data.company : ''
+        this.form.companyType = data.companyType ? data.companyType.split(',') : []
+        if (data.position) {
+          if (jobJson.indexOf(data.position) == -1) {
+            this.form.job = ''
+            this.form.otherJob = ''
+          } else {
+            this.form.job = data.position
+          }
+        } else {
+          this.form.job = ''
+        }
+        this.form.scale = data.company_size ? data.company_size : ''
+        this.form.business = data.workScope ? data.workScope : ''
+        this.form.need = data.partnerNeeds ? data.partnerNeeds : ''
+        this.form.agreeChecked = data.agree == undefined ?  true : data.agree
+        this.form.branch = data.branch || ''
+      }
     }
   }
 })

src/web/staticres/js/superSearch.js

@@ -1886,7 +1886,7 @@ function openBigMemberDialog (str, content) {
     $('.auth-dialog').hide(300)
     vm.dialogTitle = '免费用户查看超过500条招标搜索结果'
     vm.isNeedSubmit('jylab_see500_plus', function () {
-      vm.showSuccess = true
+      // vm.showSuccess = true
     })
   })
 }

src/web/staticres/public-pc/js/article-content.js

@@ -348,7 +348,7 @@ var bidNode = {
       $('.el-popover.el-popper').hide()
       this.sourceLogAjax(source)
       vm.isNeedSubmit(source, function() {
-        vm.showSuccess = true
+        // vm.showSuccess = true
       })
     }
   }
@@ -509,7 +509,7 @@ $('.detail-nj-btn').click(function(){
   }
   bidVue.sourceLogAjax(sourceKey)
   vm.isNeedSubmit(sourceKey,function(){
-    vm.showSuccess = true
+    // vm.showSuccess = true
   })
 })
 
@@ -609,7 +609,7 @@ if(adv_from=="中标公告"){
   adv=adv.concat(win_adv);
 }else if(adv_from=="招标公告"){
   adv=adv.concat(zb_adv);
-  $(".detail-nj-btn").text("立即解锁")
+  // $(".detail-nj-btn").text("立即解锁")
 }else if(adv_from=="拟建项目"){
   adv=adv.concat(nj_adv);
 }
@@ -617,7 +617,7 @@ var x = Math.floor(Math.random()*adv.length)
 $(".adv_tosieve").text(adv[x])
 var btn_text="立即体验"
 if(adv[x]== zb_adv){
-  btn_text="立即解锁"
+  // btn_text="立即解锁"
 }
 if (adv[x]==any_adv[0]){
   btn_text="立即查看";
@@ -649,7 +649,7 @@ if (subtype != '拟建' && !isMember) {
           $('.not-bigmember-slogan .free-btn').click(function(){
             bidVue.sourceLogAjax('article_slogan')
             vm.isNeedSubmit('article_slogan',function(){
-              vm.showSuccess = true
+              // vm.showSuccess = true
             })
           })
           $('.not-bigmember-slogan .more-btn').click(function() {
@@ -2556,7 +2556,7 @@ $(function() {
     // 不需要再调是否留资接口 只要isAdd接口里返回得对应参数值为0 即为需要留资 直接调noCallApiFn方法弹出弹框即可
     // vm.noCallApiFn('article_attach_freeuser', true)
     vm.isNeedSubmit('article_attach_freeuser', function() {
-      vm.showSuccess = true
+      // vm.showSuccess = true
     },null,null,'freeDownload')
   })
   // 控制正文下table里没有内容 但有标签时取消其样式
@@ -2594,7 +2594,7 @@ $(function() {
       infoid: id
     }
     vm.isNeedSubmit(info.source, function () {
-      vm.showSuccess = true
+      // vm.showSuccess = true
     },"", info.infoid)
   })
 })

src/web/staticres/tags/js/no-login-detail.js

@@ -159,7 +159,7 @@ $('.detail-nj-btn').click(function(){
   }
   bidVue.sourceLogAjax(sourceKey)
   vm.isNeedSubmit(sourceKey,function(){
-    vm.showSuccess = true
+    // vm.showSuccess = true
   })
 })
 
@@ -2179,7 +2179,7 @@ $(function() {
     // 不需要再调是否留资接口 只要isAdd接口里返回得对应参数值为0 即为需要留资 直接调noCallApiFn方法弹出弹框即可
     // vm.noCallApiFn('article_attach_freeuser', true)
     vm.isNeedSubmit('article_attach_freeuser', function() {
-      vm.showSuccess = true
+      // vm.showSuccess = true
     },null,null,'freeDownload')
   })
   // 控制正文下table里没有内容 但有标签时取消其样式
@@ -2217,7 +2217,7 @@ $(function() {
       infoid: id
     }
     vm.isNeedSubmit(info.source, function () {
-      vm.showSuccess = true
+      // vm.showSuccess = true
     },"", info.infoid)
   })
 

src/web/templates/big-member/pc/page_index_old.html

@@ -1114,7 +1114,7 @@
             }
             // vm.dialogTitle = '请完善个人信息，立刻获得全部功能的产品试用'
             vm.isNeedSubmit('member_freeuse',function(){
-              vm.showSuccess = true
+              // vm.showSuccess = true
             })
           })
         })

src/web/templates/dataMarket/dataInterface/index.html

@@ -116,7 +116,7 @@
   function leaveInfoHandle (){
     // 调用组件是否留资方法 传入一个来源对应模块 弹出弹框 （页面改版改为点击【获取数据样例】触发弹框）
     vm.isNeedSubmit('pc_data_api_interface', function(){
-      vm.showSuccess = true
+      // vm.showSuccess = true
     })
   }
   function animateUp () {

src/web/templates/dataMarket/index.html

@@ -308,7 +308,7 @@
   function needSubmitHandle(source, name) {
     // 调用组件是否留资方法
     vm.isNeedSubmit(source, function () {
-      vm.showSuccess = true
+      // vm.showSuccess = true
     }, name)
   }
 

src/web/templates/frontRouter/pc/solution/free/index.html

@@ -238,7 +238,7 @@
         $('.answerBtn').on('click', function() {
             checkLogin()
             vmSolution.isNeedSubmit('telecom_solution', function () {
-              vmSolution.showSuccess = true
+              // vmSolution.showSuccess = true
             })
         })
 

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

@@ -409,7 +409,7 @@
                 var canAuto = !skipAuto.some(function (v) {
                   return _this.ajaxParams.source.indexOf(v) > -1
                 })
-                this.submitForm(canAuto)
+                // this.submitForm(canAuto)
               }
             }
           })

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

@@ -230,7 +230,7 @@
               var canAuto = !skipAuto.some(function (v) {
                 return _this.ajaxParams.source.indexOf(v) > -1
               })
-              this.submitForm(canAuto)
+              // this.submitForm(canAuto)
             }
           }
         })

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

@@ -46,6 +46,11 @@
     <div class="j-main perfect-info-group" id="perfect-info-page" v-cloak>
       <div class="j-container">
           <div class="j-main info-collect">
+              <div class="top-tip-group" v-if="getTipStr">
+                  <p class="top-tip-text">
+                      @@getTipStr@@
+                  </p>
+              </div>
               <div class="form-card-group">
                   <div class="form-title">基本信息</div>
                   <div class="form-content-card">
@@ -140,6 +145,12 @@
 {{include "/big-member/commonjs.html"}}
 
 <script>
+
+  var tipMap = {
+    // 电信行业解决方案
+    telecom_solution: '请留下您的信息，我们会尽快和您联系!'
+  }
+
   var vNode = {
     delimiters: ['@@', '@@'],
     el: '#perfect-info-page',
@@ -367,6 +378,18 @@
         var zc = this.infoMap.position.indexOf('总裁') > -1
         var zjl = this.infoMap.position.indexOf('总经理') > -1
         return !(zc || zjl) && this.infoMap.position
+      },
+      getTipStr () {
+        var source = this.ajaxParams.source
+        // 提示语
+        var infoText = ''
+        for (var key in tipMap) {
+          if (source.indexOf(key) !== -1) {
+            infoText = tipMap[key]
+            break
+          }
+        }
+        return infoText || ''
       }
     },
     methods: {
@@ -397,7 +420,7 @@
               var canAuto = !skipAuto.some(function (v) {
                 return _this.ajaxParams.source.indexOf(v) > -1
               })
-              this.submitForm(canAuto)
+              // this.submitForm(canAuto)
             }
           }
         })

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

@@ -505,7 +505,7 @@
               var canAuto = !skipAuto.some(function (v) {
                 return _this.ajaxParams.source.indexOf(v) > -1
               })
-              this.submitForm(canAuto)
+              // this.submitForm(canAuto)
             }
           }
         })

src/web/templates/frontRouter/wx/collection/sess/ent_portrait_change.html

@@ -59,8 +59,13 @@
                 <p class="empty-text">暂无工商变动</p>
             </div>
         </div>
+<<<<<<< HEAD
         <div class="vip_component bigVip_com" v-if="!hasPower" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
             <vip-component data-cl-event="c_wx_free_buttonclick" islogin type="item_8" :power="conf" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
+=======
+        <div class="vip_component bigVip_com" v-show="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
+            <vip-component data-cl-event="c_wx_free_buttonclick" type="item_8" :power="conf" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_8.png' :isLogin="true"></vip-component>
+>>>>>>> master
         </div>
         <ul class="ent-change-list" v-else key="changeList">
             <li class="ent-change-item" v-for="(item,index) in changeList" :key="item.changeTime">

src/web/templates/pc/biddetail_rec.html

@@ -147,6 +147,109 @@
         .bid-fl{
           float: left;
         }
+        .free-equity-contrast{
+          display: flex;
+          width: 100%;
+          border: 1px solid #ECECEC;
+          border-radius: 8px;
+        }
+        .free-equity-contrast .gold-bg{
+          border-radius: 0 8px 0 0;
+          border-right:0;
+        }
+        .table-columns:nth-child(1) {width:116px;}
+        .table-columns:nth-child(2) {width:116px;color: #686868;}
+        .table-columns:nth-child(3) {width:154px;color: #686868;}
+        .table-columns:nth-child(4) {width:184px;color: #686868;}
+        .table-columns .item-td{
+          display:flex;
+          flex-direction:column;
+          align-items:center;
+          justify-content:center;
+          border-bottom:1px solid #ececec;
+          border-right:1px solid #ececec;
+          white-space:nowrap;
+          transition: all 0.5s ease;
+          text-align: center;
+        }
+        .table-columns:nth-child(3):hover .item-td:nth-child(1),
+        .table-columns:nth-child(4):hover .item-td:nth-child(1){
+          margin-top:-12px;
+          height: 84px;
+          border-radius:8px 8px 0 0;
+          transition: all 0.5s ease;
+          overflow:hidden;
+        }
+        .table-columns:nth-child(3):hover .item-td:nth-child(5),
+        .table-columns:nth-child(4):hover .item-td:nth-child(5){
+          margin-bottom:-12px;
+          height: 84px;
+          border-radius:0 0 8px 8px;
+          background:#fff;
+          box-shadow: 0 6px 12px rgba(0, 0, 0, 0.1);
+          transition: all 0.5s ease;
+        }
+        .table-columns .item-td:nth-child(1) {height:72px;}
+        .table-columns .item-td:nth-child(2) {height:48px;}
+        .table-columns .item-td:nth-child(3) {height:82px;}
+        .table-columns .item-td:nth-child(4) {height:48px;}
+        .table-columns .item-td:nth-child(5) {height:72px;border-bottom:0;}
+        .table-columns:nth-child(4) .item-td{
+          border-right:0;
+        }
+        .table-columns:nth-child(1) .item-td,
+        .table-columns:nth-child(2) .item-td:nth-child(1){
+          background: #F7F9FC;
+        }
+        .free-equity-contrast .item-td strong{
+          font-weight: 700;
+          font-size: 16px;
+          line-height: 22px;
+        }
+        .free-equity-contrast  .item-td.main-bg{
+          background: #2CB7CA;
+          color: #fff;
+        }
+        .free-equity-contrast .item-td.gold-bg{
+          color: #593913;
+          background: linear-gradient(to right, #FFF3E0, #F4DEB1);
+        }
+        .free-equity-contrast .item-td.main-color{
+          color: #2CB7CA;
+        }
+        .free-equity-contrast .item-td.gold-color{
+          color: #B1700E;
+        }
+        .free-equity-contrast .perfect-btn{
+          display: inline-block;
+          padding: 5px 14px;
+          background: #2ABED1;
+          border-radius: 6px;
+          color: #fff;
+          font-size: 14px;
+          line-height: 22px;
+          text-align: center;
+          cursor: pointer;
+        }
+        .free-equity-contrast .free-taste-btn{
+          display: inline-block;
+          padding: 5px 28px;
+          border: 1px solid #E7C28A;
+          background: linear-gradient(to right, #FFF9F0, #FEF0D7);
+          color: #B1700E;
+          font-size: 14px;
+          text-align: center;
+          border-radius: 6px;
+          cursor: pointer;
+        }
+        .free-equity-contrast .contact-kf {
+          margin-top: 2px;
+          text-decoration: underline;
+          color: #B1700E;
+          font-size: 12px;
+          line-height: 18px;
+          cursor: pointer;
+        }
     </style>
 </head>
 <body style="height: 100%">
@@ -668,16 +771,66 @@
                         </div>
                     </div>
                 </div>
-                <div class="mask-zzz hidden" style="position:absolute; top:0;width: 900px;padding:0;height: 408px;background-color:white;z-index: 1;">
+                <div class="mask-zzz hidden free-equity-mask" style="position:absolute; top:0;width: 900px;padding:0;height: 587px;background-color:white;z-index: 1;">
                     <img style="width: 100%;height: 100%" src="/images/pc/pc_mh.png">
-                    <div class="mask-zzz" style="position:absolute; left: 50%; top: 50%; transform: translate3d(-50%, -50%, 0);width: 500px;background-color: white;z-index: 100;border-radius: 10px">
+                    <div class="mask-zzz" style="position:absolute; left: 50%; top: 50%; transform: translate3d(-50%, -50%, 0);width: 632px;background-color: white;z-index: 100;border-radius: 10px">
                         <div style="position: relative">
-                            <img style="width: 100%;height: 35%" src='{{Msg "seo" "cdn"}}/images/pc/pc_zzt.png?v={{Msg "seo" "version"}}'>
-                            <div style="position: absolute;top: 50%;left: 50%; margin-top: -13px;margin-left: -90px;width: 180px;height: 26px;color: antiquewhite;font-size: 16px;">免费查看更多公告</div>
+                            <img style="width: 100%;height: 35%;border-radius: 10px 10px 0 0;" src='{{Msg "seo" "cdn"}}/images/pc/pc_zzt_new.jpg?v={{Msg "seo" "version"}}'>
+                            <div style="position: absolute;top: 50%;left: 50%; margin-top: -13px;width: 100%;height: 26px;color:#1d1d1d;font-size: 18px;transform: translateX(-50%);text-align: center;">您尚未完善信息，今日查看公告权限用完啦
+                            </div>
                         </div>
-                        <div class="tip-box">
-                            <div class="tip-text">请完善个人信息，获取更多免费查看公告权限</div>
-                            <button class="detail-nj-btn  jyarticle_see3" style="background: #2CB7CA;color: white;border:none;width: 132px;height: 36px;border-radius: 6px;margin-bottom: 12px;margin-top: 10px">立即解锁</button>
+                        <div class="tip-box" style="padding: 12px 32px 32px;border: 0;border-radius: 0 0 8px 8px;">
+                            <!-- <div class="tip-text">请完善个人信息，获取更多免费查看公告权限</div>
+                            <button class="detail-nj-btn  jyarticle_see3" style="background: #2CB7CA;color: white;border:none;width: 132px;height: 36px;border-radius: 6px;margin-bottom: 12px;margin-top: 10px">立即解锁</button> -->
+                            <div class="free-equity-contrast" style="display:flex;">
+                              <div class="table-columns">
+                                <div class="item-td"></div>
+                                <div class="item-td">标讯权益</div>
+                                <div class="item-td">超前项目权益</div>
+                                <div class="item-td">每日查看数量</div>
+                                <div class="item-td"></div>
+                              </div>
+                              <div class="table-columns">
+                                <div class="item-td"><strong style="font-size: 14px;line-height: 22px;color: #1D1D1D;">免费注册用户</strong></div>
+                                <div class="item-td" style="border-right:0;align-items:flex-start;padding-left:16px;">可查看招标预告、</div>
+                                <div class="item-td">
+                                  <img src="/images/icon-aaa.png" alt="" width="24" height="24">
+                                </div>
+                                <div class="item-td">3条</div>
+                                <div class="item-td"></div>
+                              </div>
+                              <div class="table-columns">
+                                <div class="item-td main-bg"><strong>免费注册用户</strong><span style="font-size: 12px;">（完善信息）</span></div>
+                                <div class="item-td" style="border-right:0;align-items:flex-end;">招标公告、招标结果、</div>
+                                <div class="item-td">
+                                  <img src="/images/icon-aaa.png" alt="" width="24" height="24">
+                                </div>
+                                <div class="item-td main-color">不限</div>
+                                <div class="item-td">
+                                  <span class="detail-nj-btn jyarticle_see3 perfect-btn">完善个人信息</span>
+                                </div>
+                              </div>
+                              <div class="table-columns">
+                                <div class="item-td gold-bg">
+                                  <strong>大会员</strong>
+                                  <span style="font-size: 12px;line-height: 18px;">大数据赋能企业数字化营销</span>
+                                  <a href="/big/page/index" target="_blank" style="font-size: 12px;text-decoration: underline;color:rgba(89, 57, 19, 1);">全面了解></a>
+                                </div>
+                                <div class="item-td" style="border-right:0;align-items:flex-start;">招标信用信息</div>
+                                <div class="item-td gold-color">
+                                  采购意向
+                                  <br>
+                                  拟建项目
+                                  <br>
+                                  AI智能预测
+                                </div>
+                                <div class="item-td gold-color">不限</div>
+                                <div class="item-td gold-color">
+                                  <span class="free-taste-btn">免费体验</span>
+                                  <span class="open-customer contact-kf">咨询客服</span>
+                                </div>
+                              </div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -702,7 +855,7 @@
                                 // vm.showForm = true
                                 var infoid = window.location.pathname.split("/")[3].split(".html")[0]
                                 vm.isNeedSubmit('peugeot_supplier_regist', function () {
-                                  vm.showSuccess = true
+                                  // vm.showSuccess = true
                                 },"",infoid)
                                 vm.dialogTitleTop='供应商报名'
                                 vm.dialogTitle = '请完善您的个人信息，抢先对接采购单位'
@@ -1632,10 +1785,10 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
       function checkunPreBuildCanRead () {
         var subType = goTemplateData.params.obj.subtype
         if(!advancedProject && !canRead) {
-          $('#tip-title').text('免费查看更多公告')
-          $(".tip-box .tip-text").eq(0).text('请完善个人信息，获取更多免费查看公告权限')
-          $(".tip-box .tip-text").eq(1).text('')
-          $(".tip-box .detail-nj-btn").text('立即解锁')
+          // $('#tip-title').text('免费查看更多公告')
+          // $(".tip-box .tip-text").eq(0).text('请完善个人信息，获取更多免费查看公告权限')
+          // $(".tip-box .tip-text").eq(1).text('')
+          // $(".tip-box .detail-nj-btn").text('立即解锁')
           $(".tabfat").hide()
           $(".recoveryfat").hide()
           $("#attach-list").hide()
@@ -1676,15 +1829,15 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 
         checkunPreBuildCanRead()
         if (!canRead && !privatedata){
-          if (subType === '拟建') {
-            // $('.nijian-guide').removeClass('hidden')
-          }
-          if (subType === '采购意向') {
-            // $('.caigouyixiang-guide').removeClass('hidden')
-          }
           $(".com-prebuilt").removeClass("hidden");
-          $(".com-prebuilt").css('height', '408px')
-          $(".mask-zz").removeClass("hidden");
+          if (subType === '拟建' || subType === '采购意向') {
+            $(".mask-zz:not(.free-equity-mask)").removeClass("hidden");
+            $(".com-prebuilt").css('height', '408px')
+          } else {
+            $(".com-prebuilt").css('height', '587px')
+            $(".free-equity-mask").removeClass("hidden");
+            $('.reward').hide()
+          }
 
           $('.original-text').hide()
           $(".tabfat").remove()
@@ -1727,7 +1880,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
         // 1. 有权限展示
         // 2. 无权限的非超前项目展示
         if (window.isFree) {
-          if (!advancedProject) {
+          if (!advancedProject && canRead) {
             $('.reward').show()
           }
         } else {
@@ -1829,6 +1982,9 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
          person_Dialog.getData('yes') // 发送获取人员列表请求
         })
       }
+        $('.free-taste-btn').click(function() {
+          vm.isNeedSubmit('pc_article_member_freeuse', function() {})
+        })
 
       })
     </script>

src/web/templates/pc/dataSmt/detail.html

@@ -133,7 +133,7 @@
   function needSubmitHandle (source, name){
       // 调用组件是否留资方法
       vm.isNeedSubmit(source, function(){
-        vm.showSuccess = true
+        // vm.showSuccess = true
       }, name)
     }
 function bright_title () {

src/web/templates/pc/dataSmt/list.html

@@ -215,7 +215,7 @@
   function needSubmitHandle (source, name){
     // 调用组件是否留资方法
     vm.isNeedSubmit(source, function(){
-      vm.showSuccess = true
+      // vm.showSuccess = true
     }, name)
   }
   function brightKeyword () {

src/web/templates/pc/supsearch.html

@@ -4962,7 +4962,7 @@ function checkTagDisabled () {
       onFreeTaste: function () {
         vm.dialogTitle = '免费用户查看超过500条招标搜索结果'
         vm.isNeedSubmit('jylab_see500_plus', function () {
-          vm.showSuccess = true
+          // vm.showSuccess = true
         })
       }
     }

src/web/templates/structuredata/pc/index.html

@@ -313,7 +313,7 @@
             var id = $(this).attr('data-id')
             // 调用组件是否留资方法 传入一个来源对应模块 弹出弹框 （页面改版改为点击【获取数据样例】触发弹框）
             vm.isNeedSubmit(id, function(){
-              vm.showSuccess = true
+              // vm.showSuccess = true
             })
         })
         // 立即体验

src/web/templates/weixin/wxinfocontent_rec.html

@@ -731,6 +731,107 @@ em {
     overflow: hidden;
     margin: 0 auto;
 }
+.compare-dialog .mask-zz{
+    width: 6.7rem;
+}
+.compare-dialog .compare-dialog-head{
+    height: 1.12rem;
+    background: url("/jyapp/images/wx/pc_zzt2.png") no-repeat center center;
+    background-size:contain;
+    color: #171826;
+    text-align: center;
+    font-family: PingFang SC;
+    font-size: 15px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 1.12rem;
+}
+.compare-dialog .compare-dialog-body{
+    padding: .28rem .3rem .32rem;
+}
+.compare-dialog .table-box{
+    border: 1px solid #E5E5E5;
+    border-radius :6px;
+    flex-shrink: 0;
+}
+.compare-dialog .table-column{
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    border-bottom: 1px solid #E5E5E5;
+
+}
+.compare-dialog .table-column li {
+    height:100%;
+    text-align: center;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    color:#171826;
+    font-size: .26rem;
+    line-height: .32rem;
+}
+.compare-dialog .table-column li:nth-of-type(1){
+    width: 28%;
+}
+.compare-dialog .table-column li:not(:first-child){
+    width: 36%;
+}
+.compare-dialog .table-column li:not(:nth-last-child(1)){
+    border-right: 1px solid #E5E5E5;
+}
+.compare-dialog .table-column .free-btn-reword{
+    border-radius: 4px;
+    background: #2ABED1;
+    height: .6rem;
+    color: #FFF;
+    text-align: center;
+    font-size: .26rem;
+    padding: .1rem .12rem;
+    line-height: .4rem;
+    cursor: pointer;
+    margin-bottom: .08rem;
+}
+.compare-dialog .table-column  .free-btn-experience{
+    border-radius: 4px;
+    border: 1px solid #E7C28A;
+    height: .6rem;
+    background: linear-gradient(270deg, #FEF0D7 0%, #FFF9F0 100%);
+    cursor: pointer;
+    color: #B1700E;
+    text-align: center;
+    font-size: .26rem;
+    line-height: .4rem;
+    padding:  .1rem .38rem;
+    margin-bottom: .08rem;
+}
+.compare-dialog p{
+    margin:0;
+}
+.compare-dialog li img {
+    width:.32rem;
+    height:.32rem;
+}
+.compare-dialog .split-row{
+    display: flex;
+    padding: .02rem .32rem;
+    height:.52rem;
+    justify-content: center;
+    align-items: center;
+    color: #2ABED1;
+    font-size: .24rem;
+    line-height: 18px;
+    border-bottom: 0.5px solid #E5E5E5;
+    background: #ECFCFE;
+}
+.blue-color {
+    color: #2ABED1 !important;
+}
+.gold-color {
+    color: #B1700E !important;
+}
+
 .free-open-tip{
   display: flex;
   align-items: center;
@@ -1155,7 +1256,7 @@ body .loading_ p span {
 			</ul>
 
 		</div>
-		<div class="mask-zz dialog-tip-group hidden">
+		<div class="mask-zz dialog-tip-group default-dialog hidden">
 			<div class="mask-zz">
 				<div style="position: relative">
 					<img class="dialog-top-img" src='/images/wx/pc_zzt.png?v={{Msg "seo" "version"}}'>
@@ -1169,6 +1270,41 @@ body .loading_ p span {
 				</div>
 			</div>
 		</div>
+        <div class="mask-zz dialog-tip-group compare-dialog hidden">
+            <div class="mask-zz">
+                <div class="compare-dialog-head">
+                    <div id="compare-dialog-title">您尚未完善信息，今日查看公告权限用完啦</div>
+                </div>
+                <div  class="compare-dialog-body">
+                    <div class="table-box">
+                        <ul class="table-column" style="height:1.28rem;">
+                            <li style="background:#F5F6F7;font-size:.24rem;">免费注册用户</li>
+                            <li style="background-color:#2ABED1;color:#fff;font-size:.24rem;"><span style="font-size:.26rem;font-weight: bold;">免费注册用户 </span>（完善信息）</li>
+                            <li class="jump-bigmember-page" style="padding: 0;background: linear-gradient(270deg, #F4DEB1 0%, #FFF3E0 100%);color:#593913;"><span style="font-size:.26rem;font-weight: bold;">大会员</span><span style="text-decoration-line: underline;text-underline: #593913;font-size:.24rem;">大数据赋能企业 <br>数字化营销&gt;</span></li>
+                        </ul>
+                        <p class="split-row">标讯权益</p>
+                        <p style="padding: .04rem .24rem;color:#5F5E64;font-size:.26rem;line-height: .4rem;border-bottom:1px solid #E5E5E5;">可查看招标预告、招标公告、招标结果、招标信用信息</p>
+                        <p class="split-row">超前项目权益</p>
+                        <ul class="table-column" style="height:1.52rem;">
+                            <li><img src="{{Msg "seo" "cdn"}}\jyapp\images\icon-close.png?v={{Msg "seo" "version"}}" alt=""></li>
+                            <li><img src="{{Msg "seo" "cdn"}}\jyapp\images\icon-close.png?v={{Msg "seo" "version"}}" alt=""></li>
+                            <li class="gold-color" style="line-height:.4rem;">采购意向<br>拟建项目<br>AI智能预测</li>
+                        </ul>
+                        <p class="split-row">每日查看数量</p>
+                        <ul class="table-column" style="height:.8rem;">
+                            <li>3条</li>
+                            <li class="blue-color">不限</li>
+                            <li class="gold-color">不限</li>
+                        </ul>
+                        <ul class="table-column" style="height:1.44rem;border-bottom:0;">
+                            <li>&#x3000;</li>
+                            <li><span class="free-btn-reword">完善个人信息</span><span>&#x3000;</span></li>
+                            <li class="gold-color"><span class="free-btn-experience">免费体验</span><span style="text-decoration-line: underline;" class="jump-customer-service">咨询客服</span></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
     <div class="lead-btn-nj" style="color:#2cb7ca;margin:15px 0;display:none;margin-top:20px;"><div class="adv_tosieve" style="font-size:.25rem;"></div><div class="join" onclick="adv_statistics(this)"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
     <div class="tab-ct">
 			<div id="tab1" style="display:none;">
@@ -1238,12 +1374,12 @@ body .loading_ p span {
 			<a class="iconarrow"></a>
 		</div>
 		<!--s 大会员引流 s-->
-		<div class="bigvip_drain" data-cl-event="c_wx_konwmore_buttonclick" style="background: #f5f6f7;">
-			<div class="bigvip_text">
-					<span class="bigvip_ad">想让剑鱼帮你找合作伙伴吗？</span>
-					<span class="bigvip_btn" >点这里</span>
-			</div>
-		</div>
+<!--		<div class="bigvip_drain" data-cl-event="c_wx_konwmore_buttonclick" style="background: #f5f6f7;">-->
+<!--			<div class="bigvip_text">-->
+<!--					<span class="bigvip_ad">想让剑鱼帮你找合作伙伴吗？</span>-->
+<!--					<span class="bigvip_btn" >点这里</span>-->
+<!--			</div>-->
+<!--		</div>-->
 		<!-- e 大会员引流 e -->
 		<div class="atta-list" style="display:none;">
                 <div class="atta-download-have" style="display:flex;height: 1.2rem;background: #fff;border-radius: 8px; color:#2cb7ca;margin-top: 16px; align-items: center;">
@@ -1834,12 +1970,16 @@ function checkShowDialog () {
 			$('#dialog-tip-title').text('项目提前介入，中标更轻松')
 			$(".dialog-tip-text").html('提前1-3个月获取项目信息，及早介入准备更充分')
 		}
+        if(!canRead) {
+          $('.default-dialog').removeClass("hidden")
+        }
 	} else {
 		// 非超前项目
 		if (!canRead) {
-			$('#dialog-tip-title').text('免费查看更多公告')
-			$(".dialog-tip-text").html('请完善个人信息，获取更多免费查看公告权限')
-			$(".free-btn-reword").text('立即解锁')
+			// $('#dialog-tip-title').text('免费查看更多公告')
+			// $(".dialog-tip-text").html('请完善个人信息，获取更多免费查看公告权限')
+			// $(".free-btn-reword").text('立即解锁')
+            $('.compare-dialog').removeClass("hidden")
 		}
 		if (!canRead) {
 			$(".right-container").hide() // 收藏和关注
@@ -1854,7 +1994,7 @@ function checkShowDialog () {
 		$(".tab-ct").hide() // 正文信息
 		$(".abs").hide() // 阅读原文和意见反馈
 		$(".atta-list").hide() // 附件列表
-		$(".mask-zz").removeClass("hidden");
+		// $(".mask-zz").removeClass("hidden");
 		$(".reward").hide();
 	} else {
 		$(".prebuilt").css('height', 'unset')
@@ -2393,6 +2533,23 @@ function gotoFilePage(name){
         }
       })
 }
+
+    // 免费体验
+    $('.free-btn-experience').on('click', function() {
+      var sourceKey = 'wx_article_member_freeuse'
+      //  留资跳转
+      location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=' + sourceKey
+    })
+    // 咨询客服
+    $('.jump-customer-service').on('click', function() {
+      location.href = "/big/wx/page/customer"
+    })
+    // 跳转大会员落地页
+    $('.jump-bigmember-page').on('click', function() {
+      location.href = "/big/wx/page/landingPage"
+    })
+
+
 // 大会员文案点击
 $('.bigvip_drain').on('click', function() {
 	let powerInt = []