From 0b7803920728865e2b7c2178481a3afce7302ce3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 17 四月 2024 09:20:19 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageDomain/pages/resourceDetails/myAudio/index.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 9a00794..f8a4e1d 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -283,7 +283,7 @@
showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + datas.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey);
} else {
console.log(datas);
- showDataUrl = app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file;
+ showDataUrl = datas.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.freeFile
}
titleName = datas.name;
}
@@ -326,7 +326,7 @@
} else {
this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
+ showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile
})
this.pubulicPlayFun()
}
--
Gitblit v1.9.1