Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
schedule
Commits
7bcbc03e
Commit
7bcbc03e
authored
May 14, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 创建选择zoom问题 修改图片预览 描述带着上一次问题
parent
89772eb5
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
8 deletions
+24
-8
xFetch.js
api/xFetch.js
+1
-0
fileList.js
components/fileList/fileList.js
+15
-1
createMeeting.axml
pages/createMeeting/createMeeting.axml
+3
-1
createMeeting.js
pages/createMeeting/createMeeting.js
+3
-2
index.js
pages/index/index.js
+1
-1
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+1
-0
uploadFile.js
pages/meetingDetail/uploadFile.js
+0
-3
No files found.
api/xFetch.js
View file @
7bcbc03e
...
...
@@ -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
);
}
}
...
...
components/fileList/fileList.js
View file @
7bcbc03e
...
...
@@ -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
)
{
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
});
})
}
}
})
...
...
pages/createMeeting/createMeeting.axml
View file @
7bcbc03e
...
...
@@ -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
pages/createMeeting/createMeeting.js
View file @
7bcbc03e
...
...
@@ -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
,
...
...
pages/index/index.js
View file @
7bcbc03e
...
...
@@ -885,7 +885,7 @@ create.Page({
maxClickCount
--
;
if
(
maxClickCount
==
0
)
{
dd
.
alert
({
content
:
"0.0.2
8
"
content
:
"0.0.2
9
"
});
maxClickCount
=
5
;
}
...
...
pages/meetingDetail/meetingDetail.js
View file @
7bcbc03e
...
...
@@ -117,6 +117,7 @@ create.Page({
onShow
()
{
// this.conflictPeople()
this
.
store
.
data
.
fileInfos
=
[]
this
.
store
.
data
.
description
=
''
this
.
update
()
setTimeout
(()
=>
{
this
.
update
()
...
...
pages/meetingDetail/uploadFile.js
View file @
7bcbc03e
...
...
@@ -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
()
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment