Commit d3461687 by fengzhaoyu

11

parents 40463012 95b17105
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"pages/index/index", "pages/index/index",
"pages/uploadFile/uploadFile", "pages/uploadFile/uploadFile",
"pages/repetitionTime/repetitionTime", "pages/repetitionTime/repetitionTime",
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/repeatMechanism/repeatMechanism", "pages/repeatMechanism/repeatMechanism",
"pages/attendingSituation/attendingSituation", "pages/attendingSituation/attendingSituation",
"pages/addRemark/addRemark", "pages/addRemark/addRemark",
......
<!-- <mw-select></mw-select> --> <!-- <mw-select></mw-select> -->
版本号:92版 更新跨天会议 权限 上传 版本号:94版
<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" style="height: 100vh;" scroll-into-view="{{todayStr}}"> <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" style="height: 100vh;" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList"> <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleYearList}}"> <block a:for="{{scheduleYearList}}">
......
...@@ -109,6 +109,9 @@ create.Page({ ...@@ -109,6 +109,9 @@ create.Page({
space: { spaceId: _that.data.uploadSpaceId, compress: true, isCopy: 1, max: 9 }, space: { spaceId: _that.data.uploadSpaceId, compress: true, isCopy: 1, max: 9 },
types: ["photo", "camera", "space"], types: ["photo", "camera", "space"],
success: (res) => { success: (res) => {
console.log(111111)
console.log(JSON.stringify(res))
console.log(2222)
dd.navigateTo({ url: `./../uploadFile/uploadFile?scheduleItem=${JSON.stringify(_that.data.scheduleItem)}&upLoadInfo=${JSON.stringify(res)}` }) dd.navigateTo({ url: `./../uploadFile/uploadFile?scheduleItem=${JSON.stringify(_that.data.scheduleItem)}&upLoadInfo=${JSON.stringify(res)}` })
}, },
fail: (err) => { fail: (err) => {
...@@ -227,7 +230,7 @@ create.Page({ ...@@ -227,7 +230,7 @@ create.Page({
let timeResule = '' let timeResule = ''
if ((nowTime - time) / 1000 < 60) { if ((nowTime - time) / 1000 < 60) {
timeResule = '刚刚' timeResule = '刚刚'
} else if((nowTime - time) / 1000 < 60*5 && (nowTime - time) / 1000==60 ){ } else if((nowTime - time) / 1000 < 60*5 || (nowTime - time) / 1000==60 ){
timeResule = '5分钟以内' timeResule = '5分钟以内'
} else { } else {
timeResule = creatTime.substring(0, 16) timeResule = creatTime.substring(0, 16)
......
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