Commit 7bcbc03e by fengzhaoyu

fix: 创建选择zoom问题 修改图片预览 描述带着上一次问题

parent 89772eb5
...@@ -34,6 +34,7 @@ export default function xFetch({ url, method, data, type }) { ...@@ -34,6 +34,7 @@ export default function xFetch({ url, method, data, type }) {
if (err.errorMsg === 'socket is closed') { if (err.errorMsg === 'socket is closed') {
} else { } else {
console.log(err)
alertOnce((err && err.errorMsg) || '网络异常,请重试', rejects); alertOnce((err && err.errorMsg) || '网络异常,请重试', rejects);
} }
} }
......
...@@ -39,11 +39,25 @@ create.Component({ ...@@ -39,11 +39,25 @@ create.Component({
return return
} }
const file = e.target.dataset.file const file = e.target.dataset.file
const imageType = ['jpg', 'bmp', 'png', 'gif', 'jpeg']
previewOss(file.fileId).then(res => { previewOss(file.fileId).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
openLink({ if (imageType.includes(file.fileType)) {
url: res.data.data 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
})
}
} }
}) })
......
...@@ -116,7 +116,8 @@ ...@@ -116,7 +116,8 @@
<popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup"> <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
<meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" isIPX="{{isIPX}}"></meeting-time-picker> <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> <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>
<list a:if="{{comType == 'meetingWayModel'}}" dataComList="{{relatedAppPlatform.includes('zoom') ? comListData.meetingWayList: [comListData.meetingWayList[0]] }}" onComSelectList="selectComList" comSelectListId="{{comListData.meetingWayModelId}}" iconType="{{comListData.iconType}}"></list>
</popup> </popup>
</view> </view>
\ No newline at end of file
...@@ -2,6 +2,7 @@ import { addSchedule, getUserScheduleInTime } from '../../api/request.js' ...@@ -2,6 +2,7 @@ import { addSchedule, getUserScheduleInTime } from '../../api/request.js'
import { throttle, getInterTime } from './../../utils/utils.js' import { throttle, getInterTime } from './../../utils/utils.js'
import { checkFullScren } from "../../utils/checkFullScren"; import { checkFullScren } from "../../utils/checkFullScren";
import create from 'dd-store' import create from 'dd-store'
import pageStore from '../meetingDetail/store';
create.Page({ create.Page({
data: { data: {
$data: null, $data: null,
...@@ -16,8 +17,8 @@ create.Page({ ...@@ -16,8 +17,8 @@ create.Page({
], ],
meetingWayList: [ meetingWayList: [
// { id: 0, text: 'Webex meeting', imageUrl: '../../assests/Webex.png', meetingWayModel: { model: 'webex' } }, // { 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: 0, text: '钉钉', imageUrl: '../../assests/dingding.png', meetingWayModel: { model: 'dingtalk' } },
{ id: 1, text: '钉钉', imageUrl: '../../assests/dingding.png', meetingWayModel: { model: 'dingtalk' } } { id: 1, text: 'Zoom Meeting', imageUrl: '../../assests/Zoom.png', meetingWayModel: { model: 'zoom' } }
], ],
comSelectListId: 0, comSelectListId: 0,
meetingWayModelId: null, meetingWayModelId: null,
......
...@@ -885,7 +885,7 @@ create.Page({ ...@@ -885,7 +885,7 @@ create.Page({
maxClickCount--; maxClickCount--;
if (maxClickCount == 0) { if (maxClickCount == 0) {
dd.alert({ dd.alert({
content: "0.0.28" content: "0.0.29"
}); });
maxClickCount = 5; maxClickCount = 5;
} }
......
...@@ -117,6 +117,7 @@ create.Page({ ...@@ -117,6 +117,7 @@ create.Page({
onShow() { onShow() {
// this.conflictPeople() // this.conflictPeople()
this.store.data.fileInfos = [] this.store.data.fileInfos = []
this.store.data.description = ''
this.update() this.update()
setTimeout(() => { setTimeout(() => {
this.update() this.update()
......
...@@ -2,8 +2,6 @@ import { getRndInteger } from '../../utils/utils.js' ...@@ -2,8 +2,6 @@ import { getRndInteger } from '../../utils/utils.js'
import { getOssPermission } from '../../api/request.js' import { getOssPermission } from '../../api/request.js'
import { saveFileInfo, getMeetingRoomAffairs, createMeetingTask, deleteMeetingTask, updateMeetingTask, uploadPermissions } from '../../api/request'; import { saveFileInfo, getMeetingRoomAffairs, createMeetingTask, deleteMeetingTask, updateMeetingTask, uploadPermissions } from '../../api/request';
import pageStore from './store' import pageStore from './store'
console.log(pageStore)
console.log(374774747)
// pageStore.data.language = 'zh_cn' // pageStore.data.language = 'zh_cn'
// pageStore.update() // pageStore.update()
...@@ -110,5 +108,4 @@ export async function uploadOss() { ...@@ -110,5 +108,4 @@ export async function uploadOss() {
fileSize: imgInfo.files[0].size fileSize: imgInfo.files[0].size
}]); }]);
pageStore.update() pageStore.update()
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment