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

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

@@ -257,9 +257,14 @@ var mine = {
 	                } else {
 	                    $('.ent-follow-history').hide()
 	                    $('.buyer-follow-history').hide()
+
 	                }
                     if ($.isArray(res.data.power)) {
                         pageUserInfo.power = res.data.power
+                        // 大会员没有附加下载包权限用户且新版超级订阅用户
+                        if (res.data.memberStatus > 0 && res.data.vipStatus > 0 && res.data.viper && res.data.power.indexOf(3) !== -1) {
+                            $('.my-filePackage').show()
+                        }
                     }
                     if (res.data.viper) {
                         $('.ent-search').show().attr('data-href', '/jyapp/vipsubscribe/entSearch')

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

@@ -128,7 +128,7 @@
         border-collapse: collapse!important;
         border-spacing: 0px !important;
       }
-      #h_content table tr td,.h_content table th{ 
+      #h_content table tr td,.h_content table th{
         border: 1px solid #EBEBEB;
       }
     </style>
@@ -1303,13 +1303,13 @@
                                   if (r&&r.r&&r.r.code){
                                     // 次数用完提醒联系客服
                                       vant.Dialog.confirm({
-                                        message: '您本月查看机会已消耗完毕，如需下载更多附件，请前往充值。',
+                                        message: '您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。',
                                         showCancelButton: true,
                                         confirmButtonText: '立即充值',
                                         confirmButtonColor: '#2ABDD1',
                                         className: 'custom-dialog',
                                         width: 303
-        
+
                                       }).then(() => {
                                         location.href = '/jyapp/filePack/createOrder'
                                       })
@@ -1335,7 +1335,7 @@
                                     }
                                 }
                             })
-                            
+
                             //if (window.fileNum <= 0) {
                             //}else{
                               //window.fileNum = window.fileNum - 1;
@@ -1389,7 +1389,7 @@
             }
         });
     }
-  
+
     function gotoFilePage(name){
       $.ajax({
             type:'post',

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

@@ -109,6 +109,13 @@ var mine = {
                     $('#ent-follow-history').hide()
                     $('#buyer-follow-history').hide()
                   }
+                  if ($.isArray(res.data.power)) {
+                      // 大会员没有附加下载包权限用户且新版超级订阅用户
+                      if (res.data.memberStatus > 0 && res.data.vipStatus > 0 && res.data.viper && res.data.power.indexOf(3) !== -1) {
+                          $('#file-pack').show()
+                      }
+                  }
+
               }
           }
       })

src/web/templates/pc/biddetail_rec.html

@@ -3477,17 +3477,17 @@ function fromwhere(text){
 		  //url:'/publicapply/attachment/get',
 		  url:'/jypay/resourcePack/consumePack',
 		  data:{
-			  id:{{.T.obj._id}},
-        productName:"附件下载包",
-        platform:"PC",
-        fileName:fname,
-        title:{{.T.obj.title}}
+		    id:{{.T.obj._id}},
+			productName:"附件下载包",
+			platform:"PC",
+			fileName:fname,
+			title:{{.T.obj.title}}
   		  },
-		  success:function(data){
+	  success:function(data){
         if(data){
           if (data.r&&data.r.code){
             // 次数用完提醒去充值
-						bidVue.$confirm('您本月查看机会已消耗完毕，如需下载更多附件，请前往充值。', {
+						bidVue.$confirm('您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。', {
 							showClose:false,
 							center: true,
 							confirmButtonText: '立即充值',

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1806,13 +1806,13 @@ function andownload() {
                             success: function (r) {
                                 if (r&&r.r&&r.r.code){
                                   vant.Dialog.confirm({
-                                    message: '您本月查看机会已消耗完毕，如需下载更多附件，请前往充值。',
+                                    message: '您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。',
                                     showCancelButton: true,
                                         confirmButtonText: '立即充值',
                                     confirmButtonColor: '#2ABDD1',
                                     className: 'custom-dialog',
                                     width: 303
-        
+
                                   }).then(() => {
                                         location.href = '/swordfish/filePack/createOrder'
                                   })
@@ -1836,7 +1836,7 @@ function andownload() {
                         })
                         // 次数用完提醒联系客服
                         //if (window.fileNum<=0){
-                          
+
                         //}else{
                           //window.fileNum = window.fileNum - 1;
                          // gotoFilePageOfVip($(this).find('a').text())