From 7bcbc03e57473452314658a4163601ae5ae2e963 Mon Sep 17 00:00:00 2001
From: ‘fengzhaoyu’ <feng.zhaoyu@mingwork.com>
Date: Thu, 14 May 2020 22:17:57 +0800
Subject: [PATCH] fix: 创建选择zoom问题 修改图片预览 描述带着上一次问题
---
api/xFetch.js | 1 +
components/fileList/fileList.js | 20 +++++++++++++++++---
pages/createMeeting/createMeeting.axml | 3 ++-
pages/createMeeting/createMeeting.js | 5 +++--
pages/index/index.js | 2 +-
pages/meetingDetail/meetingDetail.js | 1 +
pages/meetingDetail/uploadFile.js | 3 ---
7 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/api/xFetch.js b/api/xFetch.js
index e58138e..6a30b04 100644
--- a/api/xFetch.js
+++ b/api/xFetch.js
@@ -34,6 +34,7 @@ export default function xFetch({ url, method, data, type }) {
if (err.errorMsg === 'socket is closed') {
} else {
+ console.log(err)
alertOnce((err && err.errorMsg) || '网络异常，请重试', rejects);
}
}
diff --git a/components/fileList/fileList.js b/components/fileList/fileList.js
index 3b4ac43..2cf7f69 100644
--- a/components/fileList/fileList.js
+++ b/components/fileList/fileList.js
@@ -39,11 +39,25 @@ create.Component({
return
}
const file = e.target.dataset.file
+ const imageType = ['jpg', 'bmp', 'png', 'gif', 'jpeg']
previewOss(file.fileId).then(res => {
if (res.data.code === 0) {
- openLink({
- url: res.data.data
- });
+ if (imageType.includes(file.fileType)) {
+ dd.previewImage({
+ current: 1,
+ urls: [res.data.data],
+ success: (res) => {
+ console.log(JSON.stringify(res))
+ },
+ fail: (err) => {
+ console.log(JSON.stringify(err))
+ }
+ })
+ } else {
+ openLink({
+ url: res.data.data
+ })
+ }
}
})
diff --git a/pages/createMeeting/createMeeting.axml b/pages/createMeeting/createMeeting.axml
index 8b9396a..e094185 100644
--- a/pages/createMeeting/createMeeting.axml
+++ b/pages/createMeeting/createMeeting.axml
@@ -116,7 +116,8 @@
<popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
<meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" isIPX="{{isIPX}}"></meeting-time-picker>
<hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>
- <list a:if="{{comType=='repeat' || comType=='meetingWayModel'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : comListData.meetingWayList}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : comListData.meetingWayModelId}}" iconType="{{comListData.iconType}}">
+ <list a:if="{{comType=='repeat'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : comListData.meetingWayList}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : comListData.meetingWayModelId}}" iconType="{{comListData.iconType}}">
</list>
+ <list a:if="{{comType == 'meetingWayModel'}}" dataComList="{{relatedAppPlatform.includes('zoom') ? comListData.meetingWayList: [comListData.meetingWayList[0]] }}" onComSelectList="selectComList" comSelectListId="{{comListData.meetingWayModelId}}" iconType="{{comListData.iconType}}"></list>
</popup>
</view>
\ No newline at end of file
diff --git a/pages/createMeeting/createMeeting.js b/pages/createMeeting/createMeeting.js
index 07d43b9..54fc94c 100644
--- a/pages/createMeeting/createMeeting.js
+++ b/pages/createMeeting/createMeeting.js
@@ -2,6 +2,7 @@ import { addSchedule, getUserScheduleInTime } from '../../api/request.js'
import { throttle, getInterTime } from './../../utils/utils.js'
import { checkFullScren } from "../../utils/checkFullScren";
import create from 'dd-store'
+import pageStore from '../meetingDetail/store';
create.Page({
data: {
$data: null,
@@ -16,8 +17,8 @@ create.Page({
],
meetingWayList: [
// { id: 0, text: 'Webex meeting', imageUrl: '../../assests/Webex.png', meetingWayModel: { model: 'webex' } },
- { id: 0, text: 'Zoom Meeting', imageUrl: '../../assests/Zoom.png', meetingWayModel: { model: 'zoom' } },
- { id: 1, text: '钉钉', imageUrl: '../../assests/dingding.png', meetingWayModel: { model: 'dingtalk' } }
+ { id: 0, text: '钉钉', imageUrl: '../../assests/dingding.png', meetingWayModel: { model: 'dingtalk' } },
+ { id: 1, text: 'Zoom Meeting', imageUrl: '../../assests/Zoom.png', meetingWayModel: { model: 'zoom' } }
],
comSelectListId: 0,
meetingWayModelId: null,
diff --git a/pages/index/index.js b/pages/index/index.js
index 98a0c03..bafbd5b 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -885,7 +885,7 @@ create.Page({
maxClickCount--;
if (maxClickCount == 0) {
dd.alert({
- content: "0.0.28"
+ content: "0.0.29"
});
maxClickCount = 5;
}
diff --git a/pages/meetingDetail/meetingDetail.js b/pages/meetingDetail/meetingDetail.js
index faa7bed..9ae065c 100644
--- a/pages/meetingDetail/meetingDetail.js
+++ b/pages/meetingDetail/meetingDetail.js
@@ -117,6 +117,7 @@ create.Page({
onShow() {
// this.conflictPeople()
this.store.data.fileInfos = []
+ this.store.data.description = ''
this.update()
setTimeout(() => {
this.update()
diff --git a/pages/meetingDetail/uploadFile.js b/pages/meetingDetail/uploadFile.js
index b841c0d..59db3c7 100644
--- a/pages/meetingDetail/uploadFile.js
+++ b/pages/meetingDetail/uploadFile.js
@@ -2,8 +2,6 @@ import { getRndInteger } from '../../utils/utils.js'
import { getOssPermission } from '../../api/request.js'
import { saveFileInfo, getMeetingRoomAffairs, createMeetingTask, deleteMeetingTask, updateMeetingTask, uploadPermissions } from '../../api/request';
import pageStore from './store'
-console.log(pageStore)
-console.log(374774747)
// pageStore.data.language = 'zh_cn'
// pageStore.update()
@@ -110,5 +108,4 @@ export async function uploadOss() {
fileSize: imgInfo.files[0].size
}]);
pageStore.update()
-
}
--
libgit2 0.26.0