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/templates/weixin/wxinfocontent.html

@@ -1234,7 +1234,7 @@
                 title: title
             },
             success: function (r) {
-                if (r&&r.r&&r.r.code){
+                if (r&&r.r&&r.r.code&&r.r.code<0&&window.vipStatus>0){
                     // 次数用完提醒联系客服
                     vant.Dialog.confirm({
                         message: '您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。',
@@ -1347,6 +1347,7 @@
                               return iosShow(url, fileName)
                             }
                             downFileOfVIP(fileName)
+                            return
                             //if (window.fileNum <= 0) {
                             //}else{
                               //window.fileNum = window.fileNum - 1;

src/jfw/modules/subscribepay/src/entity/basePack.go

@@ -108,6 +108,7 @@ func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string,
 	} else {
 		//判断免费用户是否有留资下载权限
 		if _, _, freeFileNum := jy.FreeExperience(this.UserId); freeFileNum == 1 {
+			r = fileAttachRpc(_fileName, _id)
 			//免费用户下载后取消下载权限
 			redis.PutKV(fmt.Sprintf(jy.PowerCacheFileKey, this.UserId), -1)
 		} else {

src/jfw/modules/subscribepay/src/entity/commonApi.go

@@ -181,7 +181,6 @@ func InitFindRecord(userId, resourceType, queryTime, platform string, pageSize,
 	if pageSize == 0 {
 		pageSize = 10
 	}
-	pageNum += 1
 	if pageNum <= 0 {
 		pageNum = 1
 	}

src/web/staticres/common-module/file-pack/js/index-wx.js

@@ -61,7 +61,7 @@ var vm = new Vue({
       contracted: false,
       listInfo: {
         value: '',
-        pageNum: 0,
+        pageNum: 1,
         pageSize: 10,
         total: -1,
         loading: true,
@@ -143,7 +143,6 @@ var vm = new Vue({
     	this.points.usage = r.data.total
         this.working = false
         this.empty = true
-        this.listInfo.pageNum++
         if (this.listInfo.pageNum === 1) {
           if (r.data.total || r.data.total === 0) {
             this.listInfo.total = r.data.total
@@ -151,6 +150,7 @@ var vm = new Vue({
             this.listInfo.finished = true
           }
         }
+        this.listInfo.pageNum++
 
         if (Array.isArray(r.data.list) && r.data.list.length !== 0) {
           this.list = this.list.concat(r.data.list.map(function (v) {
@@ -251,7 +251,7 @@ var vm = new Vue({
     confirmed(val) {
       this.years = val.getFullYear()
       this.months = val.getMonth() + 1
-      this.listInfo.pageNum = 0
+      this.listInfo.pageNum = 1
       this.list = []
       this.listInfo.total = -1
       this.listInfo.finished = false

src/web/staticres/common-module/file-pack/js/index.js

@@ -61,7 +61,7 @@ var vm = new Vue({
       contracted: false,
       listInfo: {
         value: '',
-        pageNum: 0,
+        pageNum: 1,
         pageSize: 10,
         total: -1,
         loading: true,
@@ -144,7 +144,6 @@ var vm = new Vue({
     	this.points.usage = r.data.total
         this.working = false
         this.empty = true
-        this.listInfo.pageNum++
         if (this.listInfo.pageNum === 1) {
           if (r.data.total || r.data.total === 0) {
             this.listInfo.total = r.data.total
@@ -152,6 +151,7 @@ var vm = new Vue({
             this.listInfo.finished = true
           }
         }
+        this.listInfo.pageNum++
 
         if (Array.isArray(r.data.list) && r.data.list.length !== 0) {
           this.list = this.list.concat(r.data.list.map(function (v) {
@@ -253,7 +253,7 @@ var vm = new Vue({
     confirmed (val) {
       this.years = val.getFullYear()
       this.months = val.getMonth() + 1
-      this.listInfo.pageNum = 0
+      this.listInfo.pageNum = 1
       this.list = []
       this.listInfo.total = -1
       this.listInfo.finished = false

src/web/templates/pc/biddetail_rec.html

@@ -3485,7 +3485,7 @@ function fromwhere(text){
   		  },
 	  success:function(data){
         if(data){
-          if (data.r&&data.r.code){
+          if (data.r&&data.r.code&&data.r.code<0&&window.vipStatus>0){
             // 次数用完提醒去充值
 						bidVue.$confirm('您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。', {
 							showClose:false,
@@ -3523,7 +3523,8 @@ function fromwhere(text){
               if (!data.r["isExists"]){
                 $(".file-count").text($(".file-count").text()-1);
               }
-              goDownload(data.r["downUrl"])
+              location.href = url
+              //goDownload(data.r["downUrl"])
 					  }
           }
 			  }
@@ -3577,6 +3578,7 @@ function fromwhere(text){
 						// 留过资 更新下载次数 进入附件下载页面
 						cjdyDownload(fname)
 					}else {
+            window.freeFile == -1
 						// 免费用户 体验过 下载次数为-1 弹框提醒跳至超级订阅购买页
 						bidVue.$alert('您已经免费解锁过【附件下载】权益1次，暂无免费查看权限。如需查看更多，请开通超级订阅获取更多权限。', '开通超级订阅', {
 							showClose:false,

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1776,6 +1776,7 @@ function andownload() {
                       return
                     }else if(window.freeFile>0){
                       window.freeFile=-1
+                      gotoFilePage($(this).find('a').text())
                     }
                   }else{
                     // 付费用户
@@ -1804,7 +1805,7 @@ function andownload() {
                                 title: title
                             },
                             success: function (r) {
-                                if (r&&r.r&&r.r.code){
+                                if (r&&r.r&&r.r.code&&r.r.code<0&&window.vipStatus>0){
                                   vant.Dialog.confirm({
                                     message: '您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。',
                                     showCancelButton: true,