Merge branch 'hotfix/v4.8.71.5_ws' of qmx/jy into hotfix/v4.8.71.5

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

@@ -2409,48 +2409,58 @@ function cjdyDownload (fname) {
     title:goTemplateData.params.obj.title
 },
   success:function(data){
-    if(data && !entService){
-      if (data.r&&data.r.code&&data.r.code<0&&window.vipStatus>0){
-        // 次数用完提醒去充值
-        bidVue.$confirm('您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。', {
-          showClose:false,
-          center: true,
-          confirmButtonText: '立即充值',
-          customClass: 'custom-alert',
-          showCancelButton: true,
-          confirmButtonClass: 'custom-confirm-btn',
-          cancelButtonClass: 'custom-cancel-btn',
-          cancelButtonText: '取消'
-        }).then(function(data){
-          location.href = '/swordfish/page_big_pc/free/filePack/buy'
-        }).catch(function(){
-          //$('.open-customer').trigger('click')
-          //$('body').trigger('click')
-        });
-      }else if ((data.m && data.m!="")||data.r["downUrl"]==undefined||data.r["downUrl"]==""){
-        bidVue.$confirm('附件下载异常，请前往联系客服。', {
-          showClose:false,
-          center: true,
-          confirmButtonText: '取消',
-          customClass: 'custom-alert',
-          showCancelButton: true,
-          confirmButtonClass: 'custom-cancel-btn',
-          cancelButtonClass: 'custom-confirm-btn',
-          cancelButtonText: '联系客服'
-        }).then(function(data){
+      //P449 大客户附件下载无限制
+    if(data){
+      if (!entService){
+        if (data.r&&data.r.code&&data.r.code<0&&window.vipStatus>0){
+          // 次数用完提醒去充值
+          bidVue.$confirm('您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。', {
+            showClose:false,
+            center: true,
+            confirmButtonText: '立即充值',
+            customClass: 'custom-alert',
+            showCancelButton: true,
+            confirmButtonClass: 'custom-confirm-btn',
+            cancelButtonClass: 'custom-cancel-btn',
+            cancelButtonText: '取消'
+          }).then(function(data){
+            location.href = '/swordfish/page_big_pc/free/filePack/buy'
+          }).catch(function(){
+            //$('.open-customer').trigger('click')
+            //$('body').trigger('click')
+          });
+        }else if ((data.m && data.m!=="")||data.r["downUrl"]===undefined||data.r["downUrl"]===""){
+          bidVue.$confirm('附件下载异常，请前往联系客服。', {
+            showClose:false,
+            center: true,
+            confirmButtonText: '取消',
+            customClass: 'custom-alert',
+            showCancelButton: true,
+            confirmButtonClass: 'custom-cancel-btn',
+            cancelButtonClass: 'custom-confirm-btn',
+            cancelButtonText: '联系客服'
+          }).then(function(data){
 
-        }).catch(function(){
-          $('.open-customer').trigger('click')
-          $('body').trigger('click')
-        });
+          }).catch(function(){
+            $('.open-customer').trigger('click')
+            $('body').trigger('click')
+          });
+        }else{
+          if(data.r&&fname == data.r["fileName"]){
+            if (!data.r["isExists"]){
+              $(".file-count").text($(".file-count").text()-1);
+            }
+            getFilePackLastCount()
+            location.href = data.r["downUrl"] + '?response-content-type=application/octet-stream'
+            //goDownload(data.r["downUrl"])
+          }
+        }
       }else{
         if(data.r&&fname == data.r["fileName"]){
           if (!data.r["isExists"]){
             $(".file-count").text($(".file-count").text()-1);
           }
-          getFilePackLastCount()
           location.href = data.r["downUrl"] + '?response-content-type=application/octet-stream'
-          //goDownload(data.r["downUrl"])
         }
       }
     }