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
e7c85a16
Commit
e7c85a16
authored
5 years ago
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into release_beta/1.0.0
parents
e92444ff
8d084bbc
release_beta/1.0.0
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
index.axml
pages/index/index.axml
+1
-6
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+1
-0
uploadFile.js
pages/meetingDetail/uploadFile.js
+1
-1
No files found.
pages/index/index.axml
View file @
e7c85a16
...
@@ -50,12 +50,7 @@
...
@@ -50,12 +50,7 @@
<view a:if="{{!loading}}">
<view a:if="{{!loading}}">
<view class="scheduleHeader">
<view class="scheduleHeader">
<view>{{currentData.split('/')[0]}}年{{currentData.split('/')[1] || '1'}}月</view>
<view>{{currentData.split('/')[0]}}年{{currentData.split('/')[1] || '1'}}月</view>
<view onTap="changesidebar" class="headerIcon">
<!--<view onTap="changesidebar" class="headerIcon"><text class="iconfont iconicon_app1"></text><view></view></view> -->
<text class="iconfont iconicon_app1">
</text>
<view>
</view>
</view>
</view>
</view>
<scroll-view class="indexScrollView" scroll-y="{{true}}" onScroll="scroll" lower-threshold="{{400}}" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
<scroll-view class="indexScrollView" scroll-y="{{true}}" onScroll="scroll" lower-threshold="{{400}}" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" key="{{item.dateStr}}">
<block a:for="{{scheduleList}}" key="{{item.dateStr}}">
...
...
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.js
View file @
e7c85a16
...
@@ -245,6 +245,7 @@ create.Page({
...
@@ -245,6 +245,7 @@ create.Page({
}
}
}
}
this
.
setData
({
this
.
setData
({
currentPeople
:
getApp
().
globalData
.
userid
,
aheadTimes
:
!!
res
.
data
.
data
.
aheadTimes
?
res
.
data
.
data
.
aheadTimes
:
[],
aheadTimes
:
!!
res
.
data
.
data
.
aheadTimes
?
res
.
data
.
data
.
aheadTimes
:
[],
'comListData.aheadTimesListId'
:
!!
res
.
data
.
data
.
aheadTimes
?
res
.
data
.
data
.
aheadTimes
:
[
-
1
],
'comListData.aheadTimesListId'
:
!!
res
.
data
.
data
.
aheadTimes
?
res
.
data
.
data
.
aheadTimes
:
[
-
1
],
mrReserveStatus
:
res
.
data
.
data
.
mrReserveStatus
,
mrReserveStatus
:
res
.
data
.
data
.
mrReserveStatus
,
...
...
This diff is collapsed.
Click to expand it.
pages/meetingDetail/uploadFile.js
View file @
e7c85a16
...
@@ -25,7 +25,7 @@ async function uploadImg(imgInfo) {
...
@@ -25,7 +25,7 @@ async function uploadImg(imgInfo) {
const
random
=
getRndInteger
(
1000
,
10000
)
const
random
=
getRndInteger
(
1000
,
10000
)
const
fileName
=
timestamp
.
toString
()
+
random
.
toString
()
+
'.'
+
imgInfo
.
files
[
0
].
fileType
;
const
fileName
=
timestamp
.
toString
()
+
random
.
toString
()
+
'.'
+
imgInfo
.
files
[
0
].
fileType
;
const
key
=
permisson
.
data
.
data
.
dir
+
fileName
;
const
key
=
permisson
.
data
.
data
.
dir
+
fileName
;
return
new
Promise
(
resolve
=>
{
return
new
Promise
(
(
resolve
,
rejects
)
=>
{
dd
.
uploadFile
({
dd
.
uploadFile
({
url
:
permisson
.
data
.
data
.
host
,
url
:
permisson
.
data
.
data
.
host
,
fileType
:
'image'
,
fileType
:
'image'
,
...
...
This diff is collapsed.
Click to expand it.
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