Sfoglia il codice sorgente

feat:移动端附件下载调整

wangshan 3 anni fa
parent
commit
ef21c33289

+ 6 - 2
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1305,7 +1305,7 @@
                               .catch(() => {})
                               return
                             }else{
-                              window.fileNum = window.fileNum - 1;
+                              //window.fileNum = window.fileNum - 1;
                               gotoFilePageOfVip($(this).find('a').text())
                               return
                             }
@@ -1370,8 +1370,12 @@
             },
             success: function (r) {
                 if (r && r.m === '' && r.r) {
-                    var url = r.r.downurl
+                    var url = r.r.downUrl
                     if (url){
+                      if (!r.r.isExists){
+                        window.fileNum = window.fileNum - 1;
+                        $('.file-count').html($('.file-count').text()-1)
+                      }
                         if(mySysIsIos()){
                             iosShow(url)
                         } else {

+ 9 - 8
src/jfw/modules/subscribepay/src/entity/basePack.go

@@ -64,8 +64,8 @@ func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string)
 			}
 			if isCanConsume_f || isCanConsume_p {
 				r = fileAttachRpc(_fileName, _id)
-				if r["downurl"] != nil {
-					this.Remarks["downUrl"] = r["downurl"]
+				if r["downUrl"] != nil {
+					this.Remarks["downUrl"] = r["downUrl"]
 					this.Remarks["size"] = r["size"]
 					if isCanConsume_p {
 						//中台消费记录
@@ -111,10 +111,11 @@ var jyCC = "jy_consumepack"
 //查询jy 消费日志记录
 func (this *UseBalanceStruct) FindJyConsumePackRecord() bool {
 	query := map[string]interface{}{
-		"s_id":      this.Remarks["id"],
-		"s_userId":  this.UserId,
-		"s_product": this.Name,
-		"s_month":   time.Now().Format("2006-01"),
+		"s_id":       this.Remarks["id"].(string),
+		"s_userId":   this.UserId,
+		"s_product":  this.Name,
+		"s_month":    time.Now().Format("2006-01"),
+		"s_fileName": this.Remarks["fileName"].(string),
 	}
 	res, ok := util.MQFW.FindOne(jyCC, query)
 	if ok && res != nil {
@@ -162,8 +163,8 @@ func fileAttachRpc(fileName, id string) (r map[string]interface{}) {
 			for _, v := range rep.Rep {
 				if qutil.ObjToString(v["filename"]) == fileName {
 					r = map[string]interface{}{
-						"downurl":  qutil.ObjToString(v["downurl"]),
-						"filename": qutil.ObjToString(v["filename"]),
+						"downUrl":  qutil.ObjToString(v["downurl"]),
+						"fileName": qutil.ObjToString(v["filename"]),
 						"size":     qutil.ObjToString(v["size"]),
 					}
 					break

+ 1 - 1
src/web/templates/pc/biddetail_rec.html

@@ -3665,7 +3665,7 @@ function fromwhere(text){
       $('.super-vip-show .file-count').html(window.fileNum)
       $('.recharge-new').unbind("click").bind("click",function(){
         //超级订阅附件下载立即充值页面
-        window.open("")
+        window.open("/swordfish/page_big_pc/free/filePack/buy")
       })
     }
 	  // 大会员隐藏次数

+ 7 - 3
src/web/templates/weixin/wxinfocontent_rec.html

@@ -1809,7 +1809,7 @@ function andownload() {
                           .catch(() => {})
                           return
                         }else{
-                          window.fileNum = window.fileNum - 1;
+                          //window.fileNum = window.fileNum - 1;
                           gotoFilePageOfVip($(this).find('a').text())
                           return
                         }
@@ -1877,9 +1877,13 @@ function andownload() {
             },
             success: function (r) {
                 if (r && r.m === '' && r.r) {
-                    var url = r.r.downurl
+                    var url = r.r.downUrl
                     if (url){
-						location.href = url
+                      if (!r.r.isExists){
+                        window.fileNum = window.fileNum - 1;
+                        $('.file-count').html($('.file-count').text()-1)
+                      }
+						          location.href = url
                     } else {
                         EasyAlert.show('获取附件地址失败');
                     }