diff --git a/api/request.js b/api/request.js index 47c253c..f908422 100644 --- a/api/request.js +++ b/api/request.js @@ -292,6 +292,6 @@ export function setRead(meetingId) { export function previewOssFile(fileId) { return $http({ method: 'get', - url: `meet/fileDetail?objectName=${fileId}` + url: `/meet/fileDetail?objectName=${fileId}` }) } \ No newline at end of file diff --git a/components/fileList/fileList.acss b/components/fileList/fileList.acss index 14322da..67e08cd 100644 --- a/components/fileList/fileList.acss +++ b/components/fileList/fileList.acss @@ -112,11 +112,11 @@ background: url(../../assests/pdf.png) center /100% 100% !important; } -.png, .jpg, .svg, .jpeg { +.png, .jpg, .svg, .jpeg, .picture { background: url(../../assests/image.png) center /100% 100% !important; } -.docx, .txt, .doc, .pages, .wps { +.docx, .txt, .doc, .pages, .wps, .file { background: url(../../assests/docx.png) center /100% 100% !important; } diff --git a/components/fileList/fileList.axml b/components/fileList/fileList.axml index 8a682b8..466b6ac 100644 --- a/components/fileList/fileList.axml +++ b/components/fileList/fileList.axml @@ -4,7 +4,8 @@ </view> <view class="file-list {{customClass}}" a:for="{{fileList}}"> <view class="file-box {{isCanDelete ? 'file-box-close': ''}}" catchTap="preview" data-file="{{item}}"> - <view class="file-icon {{item.mimeType}}"></view> + <view a:if="{{item.platform === 'oss'}}" class="file-icon {{item.fileType}}"></view> + <view a:else class="file-icon {{item.mimeType}}"></view> <view class="file-title"> <text>{{item.name.slice(0, item.name.length - 5)}}</text> <text>{{item.name.slice(-5)}}</text> diff --git a/components/fileList/fileList.js b/components/fileList/fileList.js index 0b8885e..80be372 100644 --- a/components/fileList/fileList.js +++ b/components/fileList/fileList.js @@ -71,9 +71,9 @@ create.Component({ }); } else { // 预览文件 - previewOssFile(file.fileId).then(res => { + previewOssFile(encodeURIComponent(file.fileId)).then(res => { openLink({ - url: res.data.webUrl + url: res.data.data.webUrl }); }) } diff --git a/stores/exampleStore.js b/stores/exampleStore.js index d87ec3c..71a3643 100644 --- a/stores/exampleStore.js +++ b/stores/exampleStore.js @@ -7,6 +7,7 @@ class Store { roomId: '', startTime: '', endTime: '', + shouldUpdateShowTime: false, currentPeople: '', originUsers: [], originalData: null,