Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev

This commit is contained in:
wenjiarui 2023-04-12 19:27:01 +08:00
commit fc24142008
2 changed files with 27 additions and 5 deletions

View File

@ -491,14 +491,15 @@ exports.default = OakComponent({
fs.saveFile({
tempFilePath: filePath,
success: function (res) {
console.log(res, '下载成功');
// console.log(res, '下载成功');
wx.hideLoading();
var savedFilePath = res.savedFilePath;
// 打开文件
wx.openDocument({
filePath: savedFilePath,
showMenu: true,
success: function (res) {
console.log('打开文档成功');
// console.log('打开文档成功');
},
fail: function (res) {
console.log(res, 'openDocument');
@ -535,10 +536,11 @@ exports.default = OakComponent({
},
onOpenByMp: function (event) {
return tslib_1.__awaiter(this, void 0, void 0, function () {
var value, fileUrl, extension, extensions;
var value, fileUrl, that, extension, extensions;
return tslib_1.__generator(this, function (_a) {
value = event.currentTarget.dataset.value;
fileUrl = this.features.extraFile.getUrl(value);
that = this;
extension = value.extension.toLowerCase();
extensions = [
'doc',
@ -574,11 +576,20 @@ exports.default = OakComponent({
},
fail: function (err) {
console.log(err);
that.setMessage({
type: 'error',
content: '打开文件失败',
});
},
});
},
fail: function (res) {
console.log(res);
wx.hideLoading();
that.setMessage({
type: 'error',
content: '下载失败',
});
},
complete: function (res) { },
});

View File

@ -390,14 +390,15 @@ export default OakComponent({
fs.saveFile({
tempFilePath: filePath,
success: (res) => {
console.log(res, '下载成功');
// console.log(res, '下载成功');
wx.hideLoading();
const savedFilePath = res.savedFilePath;
// 打开文件
wx.openDocument({
filePath: savedFilePath,
showMenu: true,
success: function (res) {
console.log('打开文档成功');
// console.log('打开文档成功');
},
fail: function (res) {
console.log(res, 'openDocument');
@ -432,6 +433,7 @@ export default OakComponent({
async onOpenByMp(event: WechatMiniprogram.Touch) {
const { value } = event.currentTarget.dataset;
const fileUrl = this.features.extraFile.getUrl(value);
const that = this;
let extension = value.extension.toLowerCase();
let extensions = [
'doc',
@ -468,11 +470,20 @@ export default OakComponent({
},
fail: function (err) {
console.log(err);
that.setMessage({
type: 'error',
content: '打开文件失败',
});
},
});
},
fail: function (res) {
console.log(res);
wx.hideLoading();
that.setMessage({
type: 'error',
content: '下载失败',
});
},
complete: function (res) { },
});