Переглянути джерело

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

tsz 3 роки тому
батько
коміт
789a7caced
27 змінених файлів з 1233 додано та 609 видалено
  1. 8 0
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  2. 10 0
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js
  3. 26 0
      src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html
  4. 2 1
      src/jfw/modules/app/src/web/templates/big-member/page_forecast_detail.html
  5. 26 1
      src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html
  6. 42 2
      src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html
  7. 273 36
      src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html
  8. 4 10
      src/jfw/modules/bigmember/src/service/use/use.go
  9. 48 20
      src/jfw/modules/publicapply/src/attachmentdow/service/service.go
  10. 87 3
      src/jfw/modules/subscribepay/src/service/vipSubscribePay.go
  11. 8 1
      src/web/staticres/big-member/css/page_index.css
  12. BIN
      src/web/staticres/big-member/image/new_big_index/footer-banner.png
  13. BIN
      src/web/staticres/big-member/image/new_big_index/icon_sprites.png
  14. BIN
      src/web/staticres/big-member/image/new_big_index/item-bg.png
  15. BIN
      src/web/staticres/big-member/image/new_big_index/top-bg.png
  16. 5 0
      src/web/staticres/big-member/js/unit_portrayal.js
  17. 5 0
      src/web/staticres/common-module/collection/js/ent_portrait.js
  18. 69 0
      src/web/staticres/css/dev2/newBidSearch.css
  19. BIN
      src/web/staticres/images/icon-download.png
  20. BIN
      src/web/staticres/images/pc/pc_mh.png
  21. BIN
      src/web/staticres/images/pc/pc_zzt.png
  22. 7 1
      src/web/staticres/js/login.js
  23. 34 4
      src/web/staticres/js/pc-collect-user-info.js
  24. 33 0
      src/web/templates/big-member/pc/page_index.html
  25. 1 1
      src/web/templates/big-member/wx/page_unit_portrayal.html
  26. 1 1
      src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html
  27. 544 528
      src/web/templates/pc/biddetail_rec.html

+ 8 - 0
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -262,6 +262,9 @@ var vNode = {
         return item
       })
       return !isShow
+    },
+    getfreeEntPort:function(){
+      return this.freeEntPort >-1;
     }
   },
   methods: {
@@ -650,6 +653,7 @@ var vNode = {
           } else {
             _this.$toast(res.error_msg)
           }
+          _this.freeEntPort=res.data.freeEntPort;
         },
         complete: function () {
           if (_this.loading) {
@@ -1186,6 +1190,10 @@ var vNode = {
           confirmButtonText: '我知道了'
         }).then(function () {})
       }
+    },
+    //免费赠送企业全景分析体验 去解锁
+    goGiveAnalysis: function(){
+      location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=entportrait_freeuser';
     }
   }
 }

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

@@ -155,8 +155,12 @@ var vNode = {
             })
         },
         getStatus: function () {
+          console.log(11)
           return this.power.indexOf(5)  == -1 // power == 5
         },
+        getfreeBuyerPort:function(){
+          return this.freeBuyerPort >-1;
+        }
     },
     watch: {
       // 监听热力图
@@ -221,6 +225,8 @@ var vNode = {
                     var member = res.data.memberStatus
                     var vip = res.data.vipStatus
                     var userType = ''
+                    //免费用户可查看采购单位画像次数(-1:已使用;0:未使用;1:可使用次数)
+                   _this.freeBuyerPort = res.data.freeBuyerPort; 
                     if (vip > 0) {
                       userType = '1'
                     }
@@ -1329,6 +1335,10 @@ var vNode = {
         goHighSet: function() {
           sessionStorage.setItem('is-click-set', 1)
           location.href = './free_high_set?header=采购单位高级分析设置&entName=' + decodeURIComponent(utils.getParam('entName'))
+        },
+        //免费赠送采购单位全景分析体验 去解锁
+        goGiveAnalysis: function(){
+          location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyerportrait_freeuser';
         }
     }
 }

+ 26 - 0
src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -55,6 +55,27 @@
     background-size: 100% 100%;
     box-sizing: border-box;
   }
+  
+  .free-give{
+      padding: 0.24rem 0.32rem;
+      background-color: #fff;
+      font-size: .24rem;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+  }
+  .go-btn{
+      background-color:#2cb7ca;
+      color: #FFFFFF;
+      width: 1.1rem;
+      text-align: center;
+      height: 0.5rem;
+      border-radius: 9px;
+      line-height: 0.5rem;
+  }
+  .go-text{
+    color: #2cb7ca !important;
+  }
 </style>
 
 <body>
@@ -229,6 +250,11 @@
               <van-icon name="arrow"></van-icon>
             </div>
           </div>
+          <!-- 免费用户采购单位全景分析提示 -->
+          <div v-if="getfreeEntPort" style="margin-top: .24rem; " class="free-give">
+              <div class="go-text"> 免费赠送1次【企业中标信息】权益体验机会!</div>
+              <div class="go-btn"  @click="goGiveAnalysis">去解锁</div>
+          </div>
           <div class="bg-white tab-card" v-if="conf._4 && !getStatus">
             <div class="tab-card-title" style="padding: 0.16rem .32rem .12rem;">中标信息统计结果</div>
             <div class="card-row zb-info">

+ 2 - 1
src/jfw/modules/app/src/web/templates/big-member/page_forecast_detail.html

@@ -266,7 +266,8 @@
                     type:'POST',
                     url:'/bigmember/forecast/forPContent',
                     data:{
-                        id: utils.getParam('id')
+                        id: utils.getParam('id'),
+                        keys: that.keys
                     },
                     success:function(res) {
                         console.log(res)

+ 26 - 1
src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html

@@ -61,6 +61,26 @@
             background-size: 100% 100%;
             box-sizing: border-box;
         }
+        .free-give{
+            padding: 0.24rem 0.32rem;
+            background-color: #fff;
+            font-size: .24rem;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+        }
+        .go-btn{
+            background-color:#2cb7ca;
+            color: #FFFFFF;
+            width: 1.1rem;
+            text-align: center;
+            height: 0.5rem;
+            border-radius: 9px;
+            line-height: 0.5rem;
+        }
+        .go-text{
+          color: #2cb7ca;
+        }
     </style>
 </head>
 <body>
@@ -79,6 +99,11 @@
                 <p class="region">所在地:${statistics.province || '--'} ${statistics.city}</p>
                 <p class="buyer-type">采购单位类型:${statistics.buyerClass || '--'}</p>
             </div>
+            <!-- 免费用户采购单位全景分析提示 -->
+            <div v-if="getfreeBuyerPort" style="margin-top: .24rem; " class="free-give">
+                <div class="go-text"> 免费赠送1次【采购单位全景分析】权益体验机会!</div>
+                <div class="go-btn"  @click="goGiveAnalysis">去解锁</div>
+            </div>
             <!-- 采购单位通讯录 -->
             <div v-if="getStatus" style="margin-top: .24rem;">
               <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/01-bg.png') no-repeat;background-size:100% 100%">
@@ -414,7 +439,7 @@
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/buyer-example.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/history-project.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/unit_portrayal.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/unit_portrayal.js?v={{Msg "seo" "version"}}11'></script>
 
 </body>
 </html>

+ 42 - 2
src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -590,7 +590,10 @@
           app_analysis_kongkim: '请完善个人信息,辅助你做投标决策及报价参考!',
           app_analysis_follow_project: '请完善个人信息,辅助你做投标决策及报价参考!',
           app_analysis_follow_ent: '请完善个人信息,辅助你做投标决策及报价参考!',
-          'jy-wxsearch-index-tap': '请留下联系方式,我们会尽快联系您体验:市场分析周报/月报、竞对实时监控和分析、业主采购趋势/客户分析等'
+          'jy-wxsearch-index-tap': '请留下联系方式,我们会尽快联系您体验:市场分析周报/月报、竞对实时监控和分析、业主采购趋势/客户分析等',
+          article_attach_freeuser: '请留下联系方式,立即免费体验【附件下载】1次,招标文件/采购清单一键下载,商机更完整!',
+          ent_portrait_freeuser: '请留下联系方式,立即免费体验【企业中标分析】1次,多维度可视化分析竞争对手!',
+          buyer_portrait_freeuser: '请留下联系方式,立即免费体验【采购单位全景分析】1次,帮你全面洞察采购单位,开发新客户!'
         }
 
         var infoText = ''
@@ -602,13 +605,20 @@
         }
 
         if (infoText) {
-          document.title = '欢迎体验剑鱼大会员'
+          
           if (source !== 'article_original' &&  source !== 'article_collection') {
             for (var k in this.moduleShow) {
               this.moduleShow[k] = false
             }
             this.moduleShow.position = true
           }
+          
+          if (source.indexOf('_freeuser') > -1 && infoText.indexOf('【') > -1) {
+            var r = infoText.match(/\【(.+?)\】/g)
+            document.title = '欢迎体验' + r[0].replace('【','').replace('】','')
+          } else{
+            document.title = '欢迎体验剑鱼大会员'
+          }
         } else {
           document.title = '完善信息'
         }
@@ -1050,6 +1060,36 @@
               if (_this.ajaxParams.source === 'member_freeuse' || utils.getParam('source')) {
                 if (_this.ajaxParams.source === 'bid_document_Introduction_page') {
                   _this.bidShow = true
+                } 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({

+ 273 - 36
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -28,6 +28,58 @@
         white-space: nowrap;
         color:#2ABED1;
       }
+      .join{
+        display: flex;
+        align-items: center;
+      }
+      .free-down-text,.file-count-tip{
+        display: none;
+        margin-left: .24rem;
+        padding: 0 .16rem;
+        background: rgba(42, 189, 209, 0.1);
+        border-radius: 10px;
+        line-height: .4rem;
+        font-size: .22rem;
+        color: #2ABDD1;
+      }
+      .menu_list,.downfiles{
+        color: #2ABED1;
+      }
+      .van-overlay{
+        z-index: 100000!important;
+      }
+      .custom-dialog{
+        z-index: 100001!important;
+      }
+      .custom-dialog .van-dialog__header{
+        font-size: 18px;
+        color: #161826;
+      }
+      .custom-dialog .van-dialog__message{
+        /* color: #5E5E64; */
+      }
+      .custom-dialog .van-button{
+        font-size: 18px;
+      }
+      .concat-kf {
+        display: none;
+        padding: 0.06rem .16rem;
+        background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDY3IDc5LjE1Nzc0NywgMjAxNS8wMy8zMC0yMzo0MDo0MiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjNGMjBGMzQ2NEYyQzExRUNBNDRBRDFDQjI2MEM5NTRBIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjNGMjBGMzQ3NEYyQzExRUNBNDRBRDFDQjI2MEM5NTRBIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6M0YyMEYzNDQ0RjJDMTFFQ0E0NEFEMUNCMjYwQzk1NEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6M0YyMEYzNDU0RjJDMTFFQ0E0NEFEMUNCMjYwQzk1NEEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5KLSJ9AAAABlBMVEX///////9VfPVsAAAAAnRSTlP/AOW3MEoAAABISURBVHjazNIxDgAgCEPR9v6XdsBEUL6udiPPEBVkiC6gCIL+AtN1GUyt2rdH1UgBpa7zlLasb0cwQqU6QYRE58wR3lsyBBgA3KsBiK25dREAAAAASUVORK5CYII=) no-repeat 6px center #2ABDD1;
+        background-size: .28rem .28rem;
+        padding-left: .48rem;
+        border-radius: 8px;
+        color:#fff;
+        font-size: .22rem;
+        line-height: normal;
+      }
+      .icon-help{
+        display: none;
+        width: .32rem;
+        height: .32rem;
+        margin: 0 .38rem 0 .2rem;
+        background: url(/images/help-b.png) no-repeat center center;
+        background-size: contain;
+      }
     </style>
 </head>
 <body>
@@ -134,7 +186,6 @@
                 type: 'POST',
                 url: '/publicapply/bidcoll/power',
                 success: function(res) {
-                    console.log(res)
                     if(res.error_code == 0) {
                         if(!res.data.entniche && !res.data.member && res.data.vip <= 0) {
                             (window.slotbydup = window.slotbydup || []).push({
@@ -160,7 +211,7 @@
                         position: '公告详情页顶部'
                     },
                     success: function(res) {
-                        console.log(res)
+                        // console.log(res)
                     }
                     })
                 }
@@ -175,7 +226,7 @@
                                 position: '公告详情页顶部'
                             },
                             success: function(res) {
-                                console.log(res)
+                                // console.log(res)
                             }
                         })
                     }  
@@ -432,7 +483,7 @@
             </div>
         </div>
         <div class="content"  style="">
-            <div class="prebuilt hidden">
+            <div class="prebuilt hidden" style="position:relative;">
                 <div class="pre-title">项目基本信息</div>
                 <ul>
                     {{ if .T.obj.projectinfo.approvecode}}
@@ -495,6 +546,20 @@
                         </li>
                     {{end}}
                 </ul>
+                <div class="mask-zz" style="position:absolute; top:0;width: 380px;padding:0;height: 100%;background-color:white;z-index: 1;">
+                    <img style="width: 100%;height: 100%" src="/images/pc/pc_mh.png">
+                    <div class="mask-zz" style="position:absolute; left: 50%; top: 50%; margin-top: -110px;margin-left: -150px;width: 300px;height: 220px;background-color: white;z-index: 100;border-radius: 10px">
+                        <div style="position: relative">
+                            <img style="width: 100%;height: 30%" src="/images/pc/pc_zzt.png">
+                            <div style="position: absolute;top: 50%;left: 50%; margin-left: -100px;width: 200px;height: 26px;color: antiquewhite;font-size: 16px;">想中标?提前介入很关键!</div>
+                        </div>
+                        <div style="display: flex;flex-direction: column;justify-content: center;align-items: center;padding: 20px;">
+                            <div style="color: #0d0d0d;font-size: 16px;font-weight: 500;margin-bottom: 5px">提前获取正在审批中的新项目,比招标信息更超前!</div>
+                            <div style="color: #0d0d0d;font-size: 16px;font-weight: 500;margin-bottom: 20px">助您提前了解项目信息,把握重要商机!</div>
+                            <button style="background-color: deepskyblue;color: white;border:none;width: 105px;height:30px;border-radius: 5px;margin-bottom: 20px" @click="onFree">免费体验</button>
+                        </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">
@@ -534,9 +599,9 @@
                     </div>
                 </div>
                 <!-- e 大会员引流 e -->
-                <div id="tab2">
-                    <pre id="h_content">{{Html (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>")}}</pre>
-                </div>
+<!--                <div id="tab2">-->
+<!--                    <pre id="h_content">{{Html (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>")}}</pre>-->
+<!--                </div>-->
             </div>
             {{if .T.obj.projectinfo.attachments}}
                 <div class="pre-enclosure hidden"><img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wx/enclosure.png?v={{Msg "seo" "version"}}"/>附件(1个)</div>
@@ -555,12 +620,12 @@
                 <a class="iconarrow"></a>
             </div>
             <!--s 大会员引流 s-->
-            <div class="bigvip_drain" style="background: #f5f6f7;">
-                <div class="bigvip_text">
-                    <span class="bigvip_ad">想让剑鱼帮你找合作伙伴吗?</span>
-                    <span class="bigvip_btn">点这里</span>
-                </div>
-            </div>
+<!--            <div class="bigvip_drain" style="background: #f5f6f7;">-->
+<!--                <div class="bigvip_text">-->
+<!--                    <span class="bigvip_ad">想让剑鱼帮你找合作伙伴吗?</span>-->
+<!--                    <span class="bigvip_btn">点这里</span>-->
+<!--                </div>-->
+<!--            </div>-->
             <!-- e 大会员引流 e -->
             <div class="atta-download" style="display:none;height: 1.2rem;background: #F5F6F7;border-radius: 8px; color:#2cb7ca;margin-top: 16px; align-items: center;padding: 0 .32rem;" onclick="adv_statistics(this)">
                 <a class="adv_dataexprt" style="width: .48rem; height: .48rem;margin-right: .24rem;display: flex;"></a>
@@ -577,6 +642,10 @@
                     <a class="adv_center" style="display: flex;flex-direction: column;flex: 1;">
                         <div class="join">
                             附件下载
+                            <span class="free-down-text">免费用户享有1次附件下载权益</span>
+                            <span class="file-count-tip">本月剩余:<em class="file-count"></em>次</span>
+                            <span class="icon-help"></span>
+                            <span class="concat-kf">联系客服</span>
                         </div>
                     </a>
                 </div>
@@ -934,13 +1003,18 @@
     function isOpening() {
         $.ajax({
             type:'GET',
-            url:'/bigmember/use/isAdd',
+            url:'/bigmember/use/isAdd?t=' + Date.now(),
             success: function(res) {
-                if (res.data.memberStatus <= 0 || res.data.power.indexOf(3) == -1) {
+                // 是大会员没有下载权限
+                if (res.data.memberStatus > 0 && res.data.power.indexOf(3) == -1) {
                     window.isNoMember = true
                 }
-                //console.log(res)
-                // res.data.memberStatus = 0
+                window.isFree = res.data.isFree // 是否是免费用户
+                window.freeFile = res.data.freeFile // 免费用户 是否体验过 0:未体验过 -1:体验过
+                window.vipStatus = res.data.vipStatus // 是否是超级订阅用户
+                window.viper = res.data.viper // 是否是超级订阅老用户 false:老用户 true: 新用户
+                window.entniche = res.data.entniche // 商机管理用户
+                window.fileNum = res.data.fileNum // 超级订阅用户可下载附件次数
                 bigstatus = res.data.memberStatus
                 hasServiceArr = res.data.power ? res.data.power : []
                 isFollow()
@@ -980,6 +1054,16 @@
                 } else {
                     $('.bigvip_drain').hide()
                 }
+                // 免费用户展示可下载一次提示(免费用户且没有体验过附件下载权益的展示)
+                if (res.data && res.data.isFree && res.data.freeFile == 0) {
+                  $('.free-down-text').css('display', 'inline-block')
+                }
+                if (res.data && res.data.vipStatus > 0 && res.data.viper) {
+                  $('.file-count-tip').css('display', 'inline-block')
+                  $('.concat-kf').css('display', 'inline-block')
+                  $('.icon-help').css('display', 'inline-block')
+                  $('.file-count').html(res.data.fileNum)
+                }
             },
             error:function(err) {
                 console.log(err)
@@ -996,7 +1080,6 @@
                 subtype: subtype
             },
             success: function(res) {
-                console.log(res)
                 if(res.error_code == 0) {
                     if(res.data) {
                         $('.bigvip_ad').text(res.data.s_content)
@@ -1009,6 +1092,22 @@
             }
         })
     }
+    //是否显示遮罩层
+    function checkShowDialog (res) {
+        var bidmember = false
+        var entniche = false
+        var vip = 0
+        bidmember = res.data.member
+        entniche = res.data.entniche
+        vip = res.data.vip
+        var subType = {{.T.obj.subtype}}
+        if (subType == '拟建' && !bidmember && !entniche && vip <=0){
+            // if (subType == '拟建' && entniche == false){
+            $('.mask-zz').show()
+        } else {
+            $('.mask-zz').hide()
+        }
+    }
 
     // 判断账户权限
     function getAccountInfo () {
@@ -1017,11 +1116,12 @@
             url: '/publicapply/bidcoll/power',
             success: function(res) {
                 if(res.error_code == 0) {
+                    checkShowDialog(res)
                     if(res.data) {
                         drainPower = res.data
-                        if (!res.data.member) {
-                            window.isNoMember = true
-                        }
+                        // if (!res.data.member) {
+                        //     window.isNoMember = true
+                        // }
                     }
                 }
             },
@@ -1072,7 +1172,6 @@
                 platform: platform
             }),
             success: function(res) {
-                console.log(res)
                 if(res.data) {
                     location.href = '/jyapp/big/page/landingPage?mid=' + res.data + '&dsid=' + drainInfo.s_serviceid
                 }
@@ -1106,18 +1205,107 @@
                     }
 
                     $('.download-list>ul').append(html)
+                     // 下载附件
                     $('.downs').on('click', function() {
-                        var url = $(this).find('a').attr('data-href')
-                        //  留资判断
-                        if (window.isNoMember == true) {
-                            location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=member_attach'
-                            return
+                      var url = $(this).find('a').attr('data-href')
+                      console.log(window.isNoMember, window.isFree,window.freeFile, window.vipStatus, window.viper)
+                      // 免费用户 
+                      if (window.isFree) {
+                        // 判断有无体验过 0:未体验过
+                        if (window.freeFile == 0) {
+                          // 判断有无留过资 且未体验过 - 去留资
+                          location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=article_attach_freeuser'
+                        } else if (window.freeFile > 0 ){
+                          // 留过资 更新下载次数 进入附件下载页面
+                          if (url) {
+                            if(mySysIsIos()){
+                              iosShow(url)
+                            } else {
+                              location.href = url
+                            }
+                          }
+                        } else {
+                          // 免费用户 体验过 下载次数为-1 弹框提醒跳至超级订阅购买页
+                          vant.Dialog.confirm({
+                            title: '开通超级订阅',
+                            message: '您已经免费解锁过【附件下载】权益1次,暂无免费查看权限。如需查看更多,请开通超级订阅获取更多权限。',
+                            showCancelButton: true,
+                            confirmButtonText: '去开通',
+                            confirmButtonColor: '#2ABDD1',
+                            className: 'custom-dialog',
+                            width: 303,
+                            messageAlign: 'left',
+
+                          }).then(() => {
+                            location.href = '/front/vipsubscribe/vipsubscribe_new'
+                          })
+                          .catch(() => {})
                         }
-                        if(mySysIsIos()){
+                      } else {
+                        // 付费用户
+                        // 大会员用户 有下载权限
+                        if (bigstatus > 0 && hasServiceArr.indexOf(3) > -1) {
+                          if(mySysIsIos()){
                             iosShow(url)
-                        } else {
+                          } else {
                             location.href = url
+                          }
+                          return
+                        }
+                        // 超级订阅用户
+                        if (window.vipStatus > 0) {
+                          // 是新超级订阅用户
+                          if (window.viper) {
+                            // 有下载次数
+                            if (window.fileNum > 0) {
+                              if(mySysIsIos()){
+                                iosShow(url)
+                              } else {
+                                location.href = url
+                              }
+                            } else {
+                              // 次数用完提醒联系客服
+                              vant.Dialog.confirm({
+                                message: '您本月查看机会已经消耗完毕,如需要更多服务,请前往联系客服。',
+                                showCancelButton: true,
+                                confirmButtonText: '联系客服',
+                                confirmButtonColor: '#2ABDD1',
+                                className: 'custom-dialog',
+                                width: 303
+
+                              }).then(() => {
+                                location.href = '/jyapp/free/customer'
+                              })
+                              .catch(() => {})
+                            }
+                          } else {
+                            // 老超级订阅用户 提醒升级
+                            vant.Dialog.confirm({
+                              title: '升级超级订阅',
+                              message: '对不起,暂无权限,您可升级超级订阅解锁附件下载',
+                              showCancelButton: true,
+                              confirmButtonText: '前往升级',
+                              confirmButtonColor: '#2ABDD1',
+                              className: 'custom-dialog',
+                              width: 303
+                            }).then(() => {
+                              location.href = '/jyapp/vipsubscribe/upgradePage'
+                            }).catch(() => {})
+                          }
+                          return
                         }
+                        // 是大会员自定义版本没有下载权限 或 非超级订阅的商机管理用户 (弹框提醒联系客服)
+                        if (window.isNoMember == true || (window.vipStatus <=0 && window.entniche)) {
+                          vant.Dialog.alert({
+                            message: '对不起,暂无权限,请联系客服',
+                            className: 'custom-dialog',
+                            confirmButtonText: '我知道了',
+                            confirmButtonColor: '#2ABDD1',
+                            width: 303,
+                          }).then(() => {})
+                          return
+                        }
+                      }
                     })
                     $('.atta-list').show()
                 }else{
@@ -1194,7 +1382,6 @@
                 downurl:url
             },
             success:function(res){
-                //console.log(res)
                 if(res.data.status){
                     var sendhtml = "<img class=sendsuccess src='/jyapp/images/choose.png'>"+"<p class=alsend>已发送至</p><p class=emailinput>"+email+"</p>";
                     popTipShow.alert(' ',[sendhtml],['我知道了'], function(e){//do something
@@ -1255,7 +1442,6 @@
 
     // isFollow();
     function isFollow(){
-      console.log(hasServiceArr)
         $.post("/bigmember/follow/project/check",{sid:{{.T.obj._id}}},function(fd){
             if(fd&&fd.data&&fd.data.showFollow){
                 $(".keyword.project").removeClass("hideLine")
@@ -1289,9 +1475,9 @@
                 type:"GET",
                 url:'/bigmember/use/isAdd',
                 success:function(res){
-                    if (res.data.memberStatus <= 0 || res.data.power.indexOf(3) == -1) {
-                        window.isNoMember = true
-                    }
+                    // if (res.data.memberStatus <= 0 || res.data.power.indexOf(3) == -1) {
+                    //     window.isNoMember = true
+                    // }
                     if(res.data.memberStatus <= 0 || hasServiceArr.indexOf(14) == -1){
                         if (hsn){
                             if (projectname != "" || projectcode != "" ){
@@ -1769,7 +1955,6 @@
               type:'GET',
               url:'/bigmember/use/isAdd',
               success:function(res){
-                  //console.log(res)
                   if(res.data.memberStatus<=0 || hasServiceArr.indexOf(15) == -1){
                       var landproinfo = {
                           anchor:'中标企业预测',
@@ -2166,7 +2351,35 @@
             }
         })
     }
-    $('.collec_star').on('click', function () {
+
+    // 是否留过资
+    function isReservedInfo(callback){
+      $.ajax({
+        url: '/salesLeads/retainedCapital',
+        type: 'POST',
+        timeout: 5000,
+        data: {
+          source: 'article_attach_freeuser'
+        },
+        success: function (res) {
+          if (res.error_code == 0) {
+            if (res.data) {
+              callback && callback(res.data)
+            } else {
+              EasyAlert.show(res.error_msg)
+            }
+          } else {
+            EasyAlert.show(res.error_msg)
+          }
+        },
+        error: function(error) {
+          EasyAlert.show("查询是否留资失败")
+        }
+      })
+    }
+    $(function(){
+      // 收藏
+      $('.collec_star').on('click', function () {
         var $this = $(this)
         var $icon = $this.children('.icon')
         var shoucang = $icon.hasClass('weishoucang')
@@ -2174,6 +2387,30 @@
         if (vKeepComponent) {
           vKeepComponent.changeBid(id, shoucang)
         }
+      })
+      // 免费1次提醒
+      $('.free-down-text').on('click', function() {
+        //  留资判断
+        isReservedInfo(function(data){
+          if (data.retainedCapital) {
+            location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=article_attach_freeuser'
+          }
+        })
+      })
+      // 下载帮助
+      $('.icon-help').click(function(){
+        vant.Dialog.alert({
+          message: '点击附件即为下载,系统会扣除当月附件下载次数;每月下载次数有限,次月清零,请合理使用。',
+          className: 'custom-dialog',
+          confirmButtonText: '我知道了',
+          confirmButtonColor: '#2ABDD1',
+          width: 303,
+        }).then(() => {})
+      })
+      // 联系客服
+      $('.concat-kf').click(function(){
+        location.href = '/jyapp/free/customer'
+      })
     })
 </script>
 {{include "/common/baiducc.html"}}

+ 4 - 10
src/jfw/modules/bigmember/src/service/use/use.go

@@ -431,16 +431,10 @@ func (u *Use) Attachment() {
 		BaseMsg := jy.GetBigVipUserBaseMsg(userid, db.Mysql, db.Mgo)
 		status := BaseMsg.Status
 		if status <= 0 {
-			//判断免费用户是否有留资下载权限
-			if _, _, freeFileNum := jy.FreeExperience(userid); freeFileNum == 1 {
-				//免费用户下载后取消下载权限
-				redis.PutKV(fmt.Sprintf(jy.PowerCacheFileKey, userid), -1)
-			} else {
-				for _, v := range m {
-					for k, _ := range v {
-						if k != "filename" && k != "size" {
-							delete(v, k)
-						}
+			for _, v := range m {
+				for k, _ := range v {
+					if k != "filename" && k != "size" {
+						delete(v, k)
 					}
 				}
 			}

+ 48 - 20
src/jfw/modules/publicapply/src/attachmentdow/service/service.go

@@ -6,6 +6,7 @@ import (
 	"db"
 	"fmt"
 	"github.com/go-xweb/xweb"
+	"jfw/public"
 	"log"
 	qu "qfw/util"
 	"qfw/util/jy"
@@ -31,18 +32,15 @@ func (u *Dow) Subdow() {
 		}
 
 		BaseMsg := jy.GetBigVipUserBaseMsg(userid, db.Mysql, db.Mgo)
-		status := BaseMsg.VipStatus
-		if status <= 0 {
-			return Result{Data: nil, Error_msg: "非超级订阅用户,无下载权限"}
-		}
-		mon := fmt.Sprintf(jy.VipFileUploadNumKey, userid, fmt.Sprint(time.Now().Month()))
-		ss := redis.GetInt(jy.PowerCacheDb, mon)
-		if config.Config.File_number <= ss {
-			return Result{Data: nil, Error_msg: "您本月查看机会已经消耗完毕,如需要更多服务,请前往联系客服。"}
-		}
+		vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userid)
 
+		var (
+			mon string
+			ss  int
+		)
 		//前端传的是加密的id 需要解密
 		infoId := util.DecodeId(u.GetString("infoId")) //"5ddf222ce9d1f601e469e00c  5f50c37dc0145440737556d0"
+
 		// 调用rpc
 		req := util.JyMemberRequest{infoId}
 		rep, err := util.Attachment(&req)
@@ -52,19 +50,49 @@ func (u *Dow) Subdow() {
 		if rep.Rep == nil {
 			rep.Rep = []map[string]interface{}{}
 		}
-		//下载后自增一次
-		redis.Incr(jy.VipFileUploadNumKey, mon)
 
 		m := rep.Rep
-		data := make(map[string]interface{})
-		data["p_userid"] = userid
-		data["p_infoId"] = infoId
-		data["p_create_time"] = time.Now().Unix()
-		data["p_rep"] = rep
-		data["p_type"] = "超级订阅用户附件下载"
-		//存库记录
-		db.Mgo.Save("filehistroy", data)
-		log.Printf("超级订阅用户%s,%s月第%d次下载附件", userid, mon, ss)
+		//超级订阅用户下载
+		if BaseMsg.VipStatus > 0 {
+			filehistroyone, _ := db.Mgo.FindOne("filehistroy", map[string]interface{}{"p_userid": userid, "p_infoId": infoId})
+			//已经下载过同类后续下载不在增加次数
+			if filehistroyone == nil || len(*filehistroyone) == 0 {
+				mon = fmt.Sprintf(jy.VipFileUploadNumKey, userid, fmt.Sprint(time.Now().Month()))
+				ss = redis.GetInt(jy.PowerCacheDb, mon)
+				if config.Config.File_number <= ss {
+					return Result{Data: nil, Error_msg: "您本月查看机会已经消耗完毕,如需要更多服务,请前往联系客服。"}
+				}
+				//下载后自增一次
+				defer func() {
+					redis.Incr(jy.VipFileUploadNumKey, mon)
+					data := make(map[string]interface{})
+					data["p_userid"] = userid
+					data["p_infoId"] = infoId
+					data["p_create_time"] = time.Now().Unix()
+					data["p_rep"] = rep
+					data["p_type"] = "超级订阅用户附件下载"
+					//存库记录
+					db.Mgo.Save("filehistroy", data)
+					log.Printf("超级订阅用户%s,%s月第%d次下载附件", userid, mon, ss)
+				}()
+			}
+		} else if !vipStatus.IsPayedUser() {
+			//判断免费用户是否有留资下载权限
+			if _, _, freeFileNum := jy.FreeExperience(userid); freeFileNum == 1 {
+				//免费用户下载后取消下载权限
+				redis.PutKV(fmt.Sprintf(jy.PowerCacheFileKey, userid), -1)
+			} else {
+				//免费用户下载
+				for _, v := range m {
+					for k, _ := range v {
+						if k != "filename" && k != "size" {
+							delete(v, k)
+						}
+					}
+				}
+			}
+		}
+
 		return Result{Data: map[string]interface{}{
 			"attachment": m,
 			"len":        len(rep.Rep),

+ 87 - 3
src/jfw/modules/subscribepay/src/service/vipSubscribePay.go

@@ -23,15 +23,99 @@ import (
 //vip订阅付费
 type SubVipPayOrder struct {
 	*xweb.Action
-	getPrice    xweb.Mapper `xweb:"/vipsubscribe/getPrice"`    //获取价格
-	createOrder xweb.Mapper `xweb:"/vipsubscribe/createOrder"` //创建订单并支付
-	renew       xweb.Mapper `xweb:"/vipsubscribe/renew"`       //续费超级订阅
+	getPrice       xweb.Mapper `xweb:"/vipsubscribe/getPrice"`       //获取价格
+	createOrder    xweb.Mapper `xweb:"/vipsubscribe/createOrder"`    //创建订单并支付
+	renew          xweb.Mapper `xweb:"/vipsubscribe/renew"`          //续费超级订阅
+	getSelectPrice xweb.Mapper `xweb:"/vipsubscribe/getSelectPrice"` //获取当前选择内容的价格
 }
 
 func init() {
 	xweb.AddAction(&SubVipPayOrder{})
 }
 
+// 获取当前选择内容的价格
+func (this *SubVipPayOrder) GetSelectPrice() {
+	userId := qutil.ObjToString(this.GetSession("userId"))
+	r := func() *entity.FuncResult {
+		area := qutil.ObjToMap(this.GetString("area")) //地区
+		timeRenew := this.GetString("time")            //周期
+		orderType, _ := this.GetInteger("orderType")   //1 购买;2 续费;3 升级
+		// 原价;订单价
+		original_price, order_price := 0, 0
+		userMsg := jy.GetBigVipUserBaseMsg(userId, util.Mysql, util.MQFW)
+		if (userMsg.VipStatus > 0 && orderType == 1) || (userMsg.VipStatus <= 0 && (orderType == 3 || orderType == 2)) {
+			return &entity.FuncResult{false, errors.New("参数异常"), nil}
+		} else if userMsg.VipStatus <= 0 && orderType == 1 { //购买价格
+			date_count, date_unit, err := checkReqDate(timeRenew)
+			if err != nil {
+				return &entity.FuncResult{false, err, nil}
+			}
+			buyset := entity.JyVipSubStruct.NewBuySet(area, nil, true) //改版后只能购买升级版超级订阅
+			//计算价格
+			original_price = entity.JyVipSubStruct.GetSubVipPrice(buyset, date_count, date_unit)
+		} else if userMsg.VipStatus > 0 { //2:续费价格(只延长时间);3:升级价格(升级只升级地区)
+			rData, oldBuyset, _ := entity.JyVipSubStruct.GetVipDetail(userId)
+			switch orderType {
+			case 2:
+				now := time.Now()
+				date_count, date_unit, err := checkReqDate(timeRenew)
+				if err != nil {
+					return &entity.FuncResult{false, err, nil}
+				}
+				endUnix := qutil.Int64All((*rData)["l_vip_endtime"])
+				isTrail := qutil.IntAll((*rData)["i_vip_status"]) == 1
+				if time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 59, now.Location()).
+					AddDate(3, 0, 0).Before(util.GetDATE(date_unit, date_count, endUnix)) && !isTrail {
+					return &entity.FuncResult{false, errors.New("订阅周期超过三年"), nil}
+				}
+				original_price = entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset, date_count, date_unit, false)
+			case 3:
+				endUnix := qutil.Int64All((*rData)["l_vip_endtime"])
+				newBuyset := entity.JyVipSubStruct.NewBuySet(area, nil, true) //改版后只能购买升级版超级订阅
+				//升级校验
+				original_price, _ = getNewUpgradeDetail(userId, newBuyset, oldBuyset, endUnix, 0, 0)
+				if original_price < 0 {
+					if original_price == -1 {
+						return &entity.FuncResult{false, errors.New("不能升级此状态"), nil}
+					} else {
+						return &entity.FuncResult{false, errors.New("查询续费订单出错"), nil}
+					}
+				}
+			}
+		}
+		order_price = original_price
+		//卡卷信息的id
+		lotteryId := this.GetString("lotteryId")
+		useProduct, _ := this.GetInteger("useProduct")
+		if lotteryId != "" {
+			products := config.CouponConfig.Products["超级订阅"]
+			if useProduct > 0 {
+				products = strconv.Itoa(useProduct)
+			}
+			full_price, reduce_price := 0, 0
+			var discount float64
+			full_price, reduce_price, discount, _ = util.GetCouponInfo(userId, lotteryId, products)
+			if full_price <= original_price {
+				if discount == 100 { //满减
+					order_price = original_price - reduce_price
+				} else { //满折
+					disCount_int := int(math.Ceil(discount * 100))
+					order_price = original_price * disCount_int / 1000
+				}
+			}
+		}
+		return &entity.FuncResult{true, nil, map[string]interface{}{
+			"original_price": original_price,
+			"order_price":    order_price,
+		},
+		}
+	}()
+	if r.Err != nil {
+		log.Printf("%s 价格计算 err:%v\n", userId, r.Err.Error())
+	}
+	this.ServeJson(r.Format())
+}
+
 //支付价格
 func (this *SubVipPayOrder) GetPrice() {
 	if active.ActiveConfig.DoubleEleven.Active_Start < time.Now().Unix() && active.ActiveConfig.DoubleEleven.Active_End > time.Now().Unix() {

+ 8 - 1
src/web/staticres/big-member/css/page_index.css

@@ -1104,6 +1104,11 @@
   box-shadow: 0px 10px 16px 1px rgba(233, 183, 105, 0.20000000298023224);
 }
 
+.subpage-button.darkblue {
+  background: linear-gradient(90deg, #353470 0%, #0F0644 100%);
+  box-shadow: 0px 10px 16px 1px rgba(51, 49, 110, 0.20000000298023224);
+}
+
 .subpage-button.lightBlue {
   background: linear-gradient(90deg, #F9FAFF 0%, #C0BDFB 100%);
   box-shadow: 0px 10px 16px 1px rgba(51, 49, 110, 0.20000000298023224);
@@ -1142,6 +1147,7 @@
   text-align: center;
 }
 .title-info-group::after {
+  z-index: 2;
   content: "";
   position: absolute;
   bottom: 0;
@@ -1153,7 +1159,7 @@
   background-size: cover;
 }
 .title-info-group::before {
-  z-index: -1;
+  z-index: 1;
   content: "";
   position: absolute;
   bottom: 7px;
@@ -1165,6 +1171,7 @@
   transform: rotate(-180deg);
 }
 .title-info-group {
+  z-index: 3;
   display: inline-block;
   position: relative;
   font-family: Microsoft YaHei;

BIN
src/web/staticres/big-member/image/new_big_index/footer-banner.png


BIN
src/web/staticres/big-member/image/new_big_index/icon_sprites.png


BIN
src/web/staticres/big-member/image/new_big_index/item-bg.png


BIN
src/web/staticres/big-member/image/new_big_index/top-bg.png


+ 5 - 0
src/web/staticres/big-member/js/unit_portrayal.js

@@ -117,6 +117,7 @@ var vNode = {
             encryptId: '', // 首次埋点返回的加密id 用于点击去开通传参
             power: [],
             hotChart: null,
+      		isFreeExper: false, // 免费用户体验标识
             pieChart: null
         }
     },
@@ -238,6 +239,10 @@ var vNode = {
                 if (res.data.power.indexOf(5) === -1) {
                   _this.getBuried(userType)
                 }
+	            //免费用户体验权限
+	            if(res.data.isFree&&res.data.freeEntPort==0){
+	            	_this.isFreeExper=true
+	            }
               }
             },
             error: function (error) {

+ 5 - 0
src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -109,6 +109,7 @@ var vNode = {
       svip: false, // 判断是否是超级订阅的企业画像
       overlayShow: true, // 弹窗遮罩是否显示
       isVip: false, // 只是超级订阅
+      isFreeExper: false, // 免费用户体验标识
       bidcollPowerInfo: {
         vip: 0,
         text: '开通',
@@ -626,6 +627,10 @@ var vNode = {
                 _this.getEntVisits()
                 _this.portrait = 'winnerVip'
               }
+	            //免费用户体验权限
+	            if(res.data.isFree&&res.data.freeEntPort==0){
+	            	_this.isFreeExper=true
+	            }
               _this.singleTab = false
             }
 

+ 69 - 0
src/web/staticres/css/dev2/newBidSearch.css

@@ -473,4 +473,73 @@
   color: #fff;
   background: #2cb7ca;
   border-color: #2cb7ca;
+}
+.free-download{
+  display: none;
+  width: 130px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 4px;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAMAAADW3miqAAAAAXNSR0IArs4c6QAAADNQTFRFAAAA////////////////////////////////////////////////////////////////t5XiggAAABB0Uk5TABAgQFBfYHB/gJ+vv8/f79YNkTsAAACLSURBVDjL7dTLDsIgEIXhcpFCpTP/+z+tC5VC7NiujCaeHeRLIMMJ0/QLmdOxKVAOUYXljz6GQrijEGyTIVdYMswmugIKClQTRVqifV56mredSifMQ+0aX+WyKW0myur6ykpbuG1/7UcxoC7S9/0s0j2kPUqAykt0GKoTjPS38IYSPz5b2Un44t/oBiRjDVV6Qa8lAAAAAElFTkSuQmCC) no-repeat 12px center #2CB7CA;
+  background-size: 18px 18px;
+  padding-left: 16px;
+  margin-left: 32px;
+  text-align: center;
+  font-size: 14px;
+  color: #fff;
+  cursor: pointer;
+}
+.file-count-tip{
+  margin-left: 32px;
+  font-size: 14px;
+  color: #686868;
+}
+.file-count-tip .file-count{
+  color: #2CB7CA;
+}
+.file-icon-help{
+  margin-left: 8px;
+  width: 18px;
+  height: 18px;
+  cursor: pointer;
+}
+.concat-kf{
+  display: inline-block;
+  width: 90px;
+  height: 30px;
+  margin-left: 24px;
+  line-height: 30px;
+  background: #2CB7CA;
+  border-radius: 4px;
+  color: #fff;
+  font-size: 14px;
+  text-align: center;
+  cursor: pointer;
+}
+.custom-alert{
+  border-radius: 8px;
+  width: 380px;
+}
+.custom-alert .el-message-box__content{
+  padding: 0 15px!important;
+  font-size: 14px;
+  color: #686868;
+}
+.custom-confirm-btn,
+.custom-confirm-btn:focus,
+.custom-confirm-btn:hover{
+  width: 132px;
+  margin-top: 22px;
+  color: #fff;
+  background: #2CB7CA;
+  font-size: 16px;
+  border: 0;
+  box-sizing: border-box;
+}
+.custom-cancel-btn{
+  width: 132px;
+  height: 34px;
+}
+.custom-alert .el-message-box__btns button:nth-child(2){
+  margin-left: 32px;
 }

BIN
src/web/staticres/images/icon-download.png


BIN
src/web/staticres/images/pc/pc_mh.png


BIN
src/web/staticres/images/pc/pc_zzt.png


+ 7 - 1
src/web/staticres/js/login.js

@@ -293,7 +293,13 @@ function checkBigStatus () {
       if (res && res.data) {
         window.memberStatus = res.data.memberStatus
         window.memberPower = res.data.power
-        window.vipStatus = res.data.vipStatus
+        window.vipStatus = res.data.vipStatus // 是否是超级订阅用户
+        window.isFree = res.data.isFree // 是否是免费用户
+        window.freeFile = res.data.freeFile // 免费用户 是否体验过 0:未体验过 -1:体验过
+        window.viper = res.data.viper // 是否是超级订阅老用户 false:老用户 true: 新用户
+        window.entniche = res.data.entniche // 商机管理用户
+        window.fileNum = res.data.fileNum // 超级订阅用户可下载附件次数
+        window.isLogin = true // 用于其他页面判断是否已登录
         sessionStorage.setItem('bidPower', JSON.stringify(res.data.power))
         if (res.data.memberStatus > 0) {
           $(".myorderDiv.lastBox").show()

+ 34 - 4
src/web/staticres/js/pc-collect-user-info.js

@@ -129,7 +129,7 @@ var temp = `
       <div class="mask"></div>
       <div class="success-dialog-container">
         <div class="success-title">提交成功</div>
-        <div class="success-content">我们会尽快联系您并预约演示时间,请耐心等待~<br>您将获得免费体验大会员全部功能!</div>
+        <div class="success-content">@@successText@@</div>
         <div class="success-footer">
           <button type="button" class="custom-btn go-know" @click="showSuccess = false">我知道了</button>
         </div>
@@ -357,7 +357,10 @@ var vm = new Vue({
         pc_index_bottom_adv: '请留下联系方式,我们会尽快联系您体验:市场分析周报/月报、竞对实时监控和分析、业主采购趋势/客户分析等',
         article_ent_portrait: '请留下联系方式,我们会尽快联系您!体验企业画像分析,帮你透视企业!',
         article_buyer_portrait: '请留下联系方式,我们会尽快联系您!体验采购单位画像分析,为你挖掘客户!',
-        article_slogan: '请留下联系方式,我们会尽快联系您体验大会员全部功能!'
+        article_slogan: '请留下联系方式,我们会尽快联系您体验大会员全部功能!',
+        article_attach_freeuser: '请留下联系方式,立即免费体验【附件下载】1次,招标文件/采购清单一键下载,商机更完整!',
+        ent_portrait_freeuser: '请留下联系方式,立即免费体验【企业中标分析】1次,多维度可视化分析竞争对手!',
+        buyer_portrait_freeuser: '请留下联系方式,立即免费体验【采购单位全景分析】1次,帮你全面洞察采购单位,开发新客户!'
       }
     }
   },
@@ -376,6 +379,25 @@ var vm = new Vue({
       var zc = this.form.job.indexOf('总裁') > -1
       var zjl = this.form.job.indexOf('总经理') > -1
       return !(zc || zjl) && this.form.job
+    },
+    successText: function() {
+      if (this.source.indexOf('_freeuser') > -1) {
+        var text = ''
+        switch (this.source) {
+          case 'ent_portrait_freeuser':
+            text = '企业中标分析'
+            break;
+          case 'buyer_portrait_freeuser':
+            text = '采购单位全景分析'
+            break;
+          case 'article_attach_freeuser':
+            text = '附件下载'
+            break;
+        }
+        return '恭喜您,成功解锁【' + text + '】权益1次。如需查看更多,请开通超级订阅,为您提供最新的商业情报,抢占先机。'
+      } else {
+        return '我们会尽快联系您并预约演示时间,请耐心等待~<br>您将获得免费体验大会员全部功能!'
+      }
     }
   },
   mounted() {
@@ -404,8 +426,14 @@ var vm = new Vue({
         }
       }
       if (text) {
-        this.dialogTitle = text
-        this.dialogTitleTop = '欢迎体验剑鱼大会员'
+        if (this.source.indexOf('_freeuser') > -1) {
+          var r = text.match(/\【(.+?)\】/g)
+          this.dialogTitleTop = '欢迎体验' + r[0].replace('【','').replace('】','')
+          this.dialogTitle = text
+        } else {
+          this.dialogTitle = text
+          this.dialogTitleTop = '欢迎体验剑鱼大会员'
+        }
         for (var k in this.moduleShow) {
           this.moduleShow[k] = false
         }
@@ -536,6 +564,8 @@ var vm = new Vue({
               }
             } else if (source == 'pc_index_bottom_adv') {
               location.href = '/big/page/index'
+            }  else if (source.indexOf('_freeuser') > -1) {
+              _this.showSuccess = true
             } else {
               _this.showSuccess = true
             }

Різницю між файлами не показано, бо вона завелика
+ 33 - 0
src/web/templates/big-member/pc/page_index.html


+ 1 - 1
src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -108,7 +108,7 @@
               <p class="buyer-type">采购单位类型:${statistics.buyerClass || '--'}</p>
           </div>
           <!-- 免费用户体验-->
-          <div class="freeExper">
+          <div  v-if="isFreeExper" class="freeExper">
               <p class="freeRemark">免费赠送1次【采购单位全景分析】权益体验机会!</p>
               <span>去解锁</span>
           </div>

+ 1 - 1
src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -244,7 +244,7 @@
                   </div>
                 </div>
                 <!--免费用户体验-->
-                <div class="freeExper">
+                <div v-if="isFreeExper" class="freeExper">
                     <p class="freeRemark">免费赠送1次【采购单位全景分析】权益体验机会!</p>
                     <span>去解锁</span>
                 </div>

Різницю між файлами не показано, бо вона завелика
+ 544 - 528
src/web/templates/pc/biddetail_rec.html


Деякі файли не було показано, через те що забагато файлів було змінено