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
2c8c903a
Commit
2c8c903a
authored
Feb 12, 2020
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
时间组件兼容IOS
parent
863064e3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
23 additions
and
28 deletions
+23
-28
mini-program.json
.tea/configuration/mini-program.json
+2
-5
config$.js
.tea/entryFiles-development/config$.js
+1
-1
index$.web.js
.tea/entryFiles-development/index$.web.js
+1
-1
index$.worker.js
.tea/entryFiles-development/index$.worker.js
+1
-1
index$.web.js
.tea/entryFiles-production/index$.web.js
+2
-1
index$.worker.js
.tea/entryFiles-production/index$.worker.js
+2
-1
layout.json
.tea/layout.json
+2
-2
recent.json
.tea/recent.json
+0
-0
workbench.json
.tea/workbench.json
+2
-5
app.json
app.json
+1
-1
mwSelectTimeModal.js
components/mwSelectTimeModal/mwSelectTimeModal.js
+2
-2
createOrEditSchedule.js
pages/createOrEditSchedule/createOrEditSchedule.js
+7
-8
No files found.
.tea/configuration/mini-program.json
View file @
2c8c903a
<<<<<<<
HEAD
{
"tinyType"
:
"dingtalk"
,
"tinyCnName"
:
"钉钉"
,
"tinyProjectType"
:
"dingtalk-biz-isv"
,
"dingtalk:dingtalk-biz-isv:tinyIcon"
:
"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg"
,
"dingtalk:dingtalk-biz-isv:compilePreviewTime"
:
"2020-02-05 11:55:36"
,
"dingtalk:dingtalk-biz-isv:compilePreviewWholePackSize"
:
"18.9 KB"
,
"dingtalk:dingtalk-biz-isv:compilePreviewSubpackSizes"
:
""
,
"dingtalk:dingtalk-biz-isv:_appIdList"
:[{
"orgName"
:
"叶琴的体验团队"
,
"corpId"
:
"ding1fc0618931c5be0a35c2f4657eb6378f"
,
"orgId"
:
30571993
,
"apps"
:[{
"miniAppName"
:
"企业e卡通"
,
"bizType"
:
1
,
"miniAppId"
:
"2019082266405446"
,
"icon"
:
"https://static.dingtalk.com/media/lALPDeC2uVA51FrMyMzI_200_200.png"
}]},{
"orgName"
:
"爸爸的测试企业"
,
"corpId"
:
"dingeb04d7fcad9041a435c2f4657eb6378f"
,
"orgId"
:
94926075
,
"apps"
:[{
"miniAppName"
:
"明我会议室"
,
"bizType"
:
1
,
"miniAppId"
:
"2021000196656527"
,
"icon"
:
"https://static.dingtalk.com/media/lADPDeC2usmAs3LMyMzI_200_200.jpg"
}]},{
"orgName"
:
"明我mingwork"
,
"corpId"
:
"dingc105456f10a5234f"
,
"orgLogo"
:
"@lALPBY0V41nzq_PNAoDNAoA"
,
"orgId"
:
5118349
,
"apps"
:[]},{
"orgName"
:
"亢建荣测试"
,
"corpId"
:
"ding9a93ca550f036ffe35c2f4657eb6378f"
,
"orgId"
:
39441482
,
"apps"
:[{
"miniAppName"
:
"明我盒子测试版"
,
"bizType"
:
1
,
"miniAppId"
:
"2018070960528738"
,
"icon"
:
"https://static.dingtalk.com/media/lALPBY0V45ZQ69DNAeTNAoI_642_484.png"
},{
"miniAppName"
:
"mingpay"
,
"bizType"
:
1
,
"miniAppId"
:
"2019051664880184"
,
"icon"
:
"https://static.dingtalk.com/media/lALPDeC2uFBmiNDMkMyQ_144_144.png"
},{
"miniAppName"
:
"企业e卡通测试"
,
"bizType"
:
1
,
"miniAppId"
:
"2019080766135403"
,
"icon"
:
"https://static.dingtalk.com/media/lALPDeC2ulRyREDMyMzI_200_200.png"
},{
"miniAppName"
:
"明我会议室"
,
"bizType"
:
1
,
"miniAppId"
:
"2021001100624233"
,
"icon"
:
"https://static.dingtalk.com/media/lALPDeC2uv2EoenMkMyQ_144_144.png"
}]}],
"dingtalk:dingtalk-biz-isv:preAuditLimit"
:
5
,
"dingtalk:dingtalk-biz-isv:preAuditUsed"
:
0
,
"dingtalk:dingtalk-biz-isv:uploadTime"
:
""
,
"dingtalk:dingtalk-biz-isv:packageSize"
:
""
,
"dingtalk:dingtalk-biz-isv:auditLink"
:
null
,
"dingtalk:dingtalk-biz-isv:whiteListLink"
:
null
,
"dingtalk:dingtalk-biz-isv:_enableAutoPush"
:
false
,
"dingtalk:dingtalk-biz-isv:_appId"
:
"2021001100624233"
,
"dingtalk:dingtalk-biz-isv:_appName"
:
"明我会议室"
,
"dingtalk:dingtalk-biz-isv:_orgId"
:
39441482
,
"dingtalk:dingtalk-biz-isv:_corpId"
:
"ding9a93ca550f036ffe35c2f4657eb6378f"
,
"dingtalk:dingtalk-biz-isv:remoteVersion"
:
"0.0.19"
,
"dingtalk:dingtalk-biz-isv:currentVersion"
:
"0.0.20"
,
"dingtalk:dingtalk-biz-isv:whiteList"
:[
"gateway-beta.mingwork.com"
],
"dingtalk:dingtalk-biz-isv:h5WhiteList"
:[],
"dingtalk:dingtalk-biz-isv:experCorpId"
:
"dingb625cb941fe828d935c2f4657eb6378f"
,
"dingtalk:dingtalk-biz-isv:experCorpName"
:
"亢建荣体验馆"
,
"dingtalk:dingtalk-biz:tinyIcon"
:
"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg"
,
"dingtalk:dingtalk-biz:compilePreviewTime"
:
"2020-02-07 12:54:57"
,
"dingtalk:dingtalk-biz:compilePreviewWholePackSize"
:
"42.5 KB"
,
"dingtalk:dingtalk-biz:compilePreviewSubpackSizes"
:
""
,
"dingtalk:dingtalk-biz:_appIdList"
:[{
"orgName"
:
"亢建荣测试"
,
"corpId"
:
"ding9a93ca550f036ffe35c2f4657eb6378f"
,
"orgId"
:
39441482
,
"apps"
:[{
"miniAppName"
:
"mingpay2"
,
"bizType"
:
2
,
"miniAppId"
:
"2019061465615005"
,
"icon"
:
"https://static.dingtalk.com/media/lADPDeC2uJiDYQDNAZvNApI_658_411.jpg"
}]}],
"dingtalk:dingtalk-biz:preAuditLimit"
:
5
,
"dingtalk:dingtalk-biz:preAuditUsed"
:
0
,
"dingtalk:dingtalk-biz:uploadTime"
:
""
,
"dingtalk:dingtalk-biz:packageSize"
:
""
,
"dingtalk:dingtalk-biz:auditLink"
:
null
,
"dingtalk:dingtalk-biz:whiteListLink"
:
null
,
"dingtalk:dingtalk-biz:_enableAutoPush"
:
false
,
"dingtalk:dingtalk-biz:_appId"
:
"2019061465615005"
,
"dingtalk:dingtalk-biz:_appName"
:
"mingpay2"
,
"dingtalk:dingtalk-biz:_orgId"
:
"39441482"
,
"dingtalk:dingtalk-biz:_corpId"
:
"ding9a93ca550f036ffe35c2f4657eb6378f"
,
"dingtalk:dingtalk-biz:remoteVersion"
:
"0.0.33"
,
"dingtalk:dingtalk-biz:currentVersion"
:
"0.0.34"
,
"dingtalk:dingtalk-biz:whiteList"
:[
"139.196.213.18"
],
"dingtalk:dingtalk-biz:h5WhiteList"
:[],
"isSimulatorOpen"
:
true
,
"isNotFirstToggleSimulator"
:
true
,
"dingtalk:dingtalk-biz:lastZoom"
:
125
,
"SimulatorMode"
:
"WINDOW"
,
"isSimulatorDefaultSticky"
:
true
,
"storageVersion"
:
"1.5.5"
}
=======
{
"tinyType"
:
"dingtalk"
,
"tinyCnName"
:
"钉钉"
,
"tinyProjectType"
:
"dingtalk-biz"
,
"dingtalk:dingtalk-biz:tinyIcon"
:
"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg"
,
"dingtalk:dingtalk-biz:compilePreviewTime"
:
"2020-02-12 13:33:52"
,
"dingtalk:dingtalk-biz:compilePreviewWholePackSize"
:
"52.6 KB"
,
"dingtalk:dingtalk-biz:compilePreviewSubpackSizes"
:
""
,
"dingtalk:dingtalk-biz:_appIdList"
:[{
"orgName"
:
"亢建荣测试"
,
"corpId"
:
"ding9a93ca550f036ffe35c2f4657eb6378f"
,
"orgId"
:
39441482
,
"apps"
:[{
"miniAppName"
:
"mingpay2"
,
"bizType"
:
2
,
"miniAppId"
:
"2019061465615005"
,
"icon"
:
"https://static.dingtalk.com/media/lADPDeC2uJiDYQDNAZvNApI_658_411.jpg"
}]}],
"dingtalk:dingtalk-biz:preAuditLimit"
:
5
,
"dingtalk:dingtalk-biz:preAuditUsed"
:
0
,
"dingtalk:dingtalk-biz:uploadTime"
:
""
,
"dingtalk:dingtalk-biz:packageSize"
:
""
,
"dingtalk:dingtalk-biz:auditLink"
:
null
,
"dingtalk:dingtalk-biz:whiteListLink"
:
null
,
"dingtalk:dingtalk-biz:_enableAutoPush"
:
false
,
"dingtalk:dingtalk-biz:_appId"
:
"2019061465615005"
,
"dingtalk:dingtalk-biz:_appName"
:
"mingpay2"
,
"dingtalk:dingtalk-biz:_orgId"
:
"39441482"
,
"dingtalk:dingtalk-biz:_corpId"
:
"ding9a93ca550f036ffe35c2f4657eb6378f"
,
"dingtalk:dingtalk-biz:remoteVersion"
:
"0.0.33"
,
"dingtalk:dingtalk-biz:currentVersion"
:
"0.0.34"
,
"dingtalk:dingtalk-biz:whiteList"
:[
"139.196.213.18"
],
"dingtalk:dingtalk-biz:h5WhiteList"
:[],
"isSimulatorOpen"
:
true
,
"isNotFirstToggleSimulator"
:
true
,
"storageVersion"
:
"1.5.7"
}
>>>>>>>
4e007456
e
7
efda
136
edec
7
b
454
fed
353
ed
316e78
{
"tinyType"
:
"dingtalk"
,
"tinyCnName"
:
"钉钉"
,
"tinyProjectType"
:
"dingtalk-biz-isv"
,
"dingtalk:dingtalk-biz-isv:tinyIcon"
:
"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg"
,
"dingtalk:dingtalk-biz-isv:compilePreviewTime"
:
"2020-02-12 17:39:38"
,
"dingtalk:dingtalk-biz-isv:compilePreviewWholePackSize"
:
"53.7 KB"
,
"dingtalk:dingtalk-biz-isv:compilePreviewSubpackSizes"
:
""
,
"dingtalk:dingtalk-biz-isv:_appIdList"
:[{
"orgName"
:
"叶琴的体验团队"
,
"corpId"
:
"ding1fc0618931c5be0a35c2f4657eb6378f"
,
"orgId"
:
30571993
,
"apps"
:[{
"miniAppName"
:
"企业e卡通"
,
"bizType"
:
1
,
"miniAppId"
:
"2019082266405446"
,
"icon"
:
"https://static.dingtalk.com/media/lALPDeC2uVA51FrMyMzI_200_200.png"
}]},{
"orgName"
:
"爸爸的测试企业"
,
"corpId"
:
"dingeb04d7fcad9041a435c2f4657eb6378f"
,
"orgId"
:
94926075
,
"apps"
:[{
"miniAppName"
:
"明我会议室"
,
"bizType"
:
1
,
"miniAppId"
:
"2021000196656527"
,
"icon"
:
"https://static.dingtalk.com/media/lADPDeC2usmAs3LMyMzI_200_200.jpg"
}]},{
"orgName"
:
"明我mingwork"
,
"corpId"
:
"dingc105456f10a5234f"
,
"orgLogo"
:
"@lALPBY0V41nzq_PNAoDNAoA"
,
"orgId"
:
5118349
,
"apps"
:[]},{
"orgName"
:
"亢建荣测试"
,
"corpId"
:
"ding9a93ca550f036ffe35c2f4657eb6378f"
,
"orgId"
:
39441482
,
"apps"
:[{
"miniAppName"
:
"明我盒子测试版"
,
"bizType"
:
1
,
"miniAppId"
:
"2018070960528738"
,
"icon"
:
"https://static.dingtalk.com/media/lALPBY0V45ZQ69DNAeTNAoI_642_484.png"
},{
"miniAppName"
:
"mingpay"
,
"bizType"
:
1
,
"miniAppId"
:
"2019051664880184"
,
"icon"
:
"https://static.dingtalk.com/media/lALPDeC2uFBmiNDMkMyQ_144_144.png"
},{
"miniAppName"
:
"企业e卡通测试"
,
"bizType"
:
1
,
"miniAppId"
:
"2019080766135403"
,
"icon"
:
"https://static.dingtalk.com/media/lALPDeC2ulRyREDMyMzI_200_200.png"
},{
"miniAppName"
:
"明我会议室"
,
"bizType"
:
1
,
"miniAppId"
:
"2021001100624233"
,
"icon"
:
"https://static.dingtalk.com/media/lALPDeC2uv2EoenMkMyQ_144_144.png"
}]}],
"dingtalk:dingtalk-biz-isv:preAuditLimit"
:
5
,
"dingtalk:dingtalk-biz-isv:preAuditUsed"
:
0
,
"dingtalk:dingtalk-biz-isv:uploadTime"
:
""
,
"dingtalk:dingtalk-biz-isv:packageSize"
:
""
,
"dingtalk:dingtalk-biz-isv:auditLink"
:
null
,
"dingtalk:dingtalk-biz-isv:whiteListLink"
:
null
,
"dingtalk:dingtalk-biz-isv:_enableAutoPush"
:
false
,
"dingtalk:dingtalk-biz-isv:_appId"
:
"2021001100624233"
,
"dingtalk:dingtalk-biz-isv:_appName"
:
"明我会议室"
,
"dingtalk:dingtalk-biz-isv:_orgId"
:
39441482
,
"dingtalk:dingtalk-biz-isv:_corpId"
:
"ding9a93ca550f036ffe35c2f4657eb6378f"
,
"dingtalk:dingtalk-biz-isv:remoteVersion"
:
"0.0.19"
,
"dingtalk:dingtalk-biz-isv:currentVersion"
:
"0.0.20"
,
"dingtalk:dingtalk-biz-isv:whiteList"
:[
"gateway-beta.mingwork.com"
],
"dingtalk:dingtalk-biz-isv:h5WhiteList"
:[],
"dingtalk:dingtalk-biz-isv:experCorpId"
:
"dingb625cb941fe828d935c2f4657eb6378f"
,
"dingtalk:dingtalk-biz-isv:experCorpName"
:
"亢建荣体验馆"
,
"dingtalk:dingtalk-biz:tinyIcon"
:
"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg"
,
"dingtalk:dingtalk-biz:compilePreviewTime"
:
"2020-02-07 12:54:57"
,
"dingtalk:dingtalk-biz:compilePreviewWholePackSize"
:
"42.5 KB"
,
"dingtalk:dingtalk-biz:compilePreviewSubpackSizes"
:
""
,
"dingtalk:dingtalk-biz:_appIdList"
:[{
"orgName"
:
"亢建荣测试"
,
"corpId"
:
"ding9a93ca550f036ffe35c2f4657eb6378f"
,
"orgId"
:
39441482
,
"apps"
:[{
"miniAppName"
:
"mingpay2"
,
"bizType"
:
2
,
"miniAppId"
:
"2019061465615005"
,
"icon"
:
"https://static.dingtalk.com/media/lADPDeC2uJiDYQDNAZvNApI_658_411.jpg"
}]}],
"dingtalk:dingtalk-biz:preAuditLimit"
:
5
,
"dingtalk:dingtalk-biz:preAuditUsed"
:
0
,
"dingtalk:dingtalk-biz:uploadTime"
:
""
,
"dingtalk:dingtalk-biz:packageSize"
:
""
,
"dingtalk:dingtalk-biz:auditLink"
:
null
,
"dingtalk:dingtalk-biz:whiteListLink"
:
null
,
"dingtalk:dingtalk-biz:_enableAutoPush"
:
false
,
"dingtalk:dingtalk-biz:_appId"
:
"2019061465615005"
,
"dingtalk:dingtalk-biz:_appName"
:
"mingpay2"
,
"dingtalk:dingtalk-biz:_orgId"
:
"39441482"
,
"dingtalk:dingtalk-biz:_corpId"
:
"ding9a93ca550f036ffe35c2f4657eb6378f"
,
"dingtalk:dingtalk-biz:remoteVersion"
:
"0.0.33"
,
"dingtalk:dingtalk-biz:currentVersion"
:
"0.0.34"
,
"dingtalk:dingtalk-biz:whiteList"
:[
"139.196.213.18"
],
"dingtalk:dingtalk-biz:h5WhiteList"
:[],
"isSimulatorOpen"
:
true
,
"isNotFirstToggleSimulator"
:
true
,
"dingtalk:dingtalk-biz:lastZoom"
:
125
,
"SimulatorMode"
:
"WINDOW"
,
"isSimulatorDefaultSticky"
:
true
,
"storageVersion"
:
"1.5.5"
}
\ No newline at end of file
.tea/entryFiles-development/config$.js
View file @
2c8c903a
...
...
@@ -2,6 +2,6 @@
const
g
=
typeof
global
!==
'undefined'
?
global
:
self
;
g
.
appXAppJson
=
{
"app"
:
{
"$homepage"
:
"pages/
createOrEditSchedule/createOrEditSchedule
"
"$homepage"
:
"pages/
index/index
"
}
};
.tea/entryFiles-development/index$.web.js
View file @
2c8c903a
...
...
@@ -2,8 +2,8 @@ require('@alipay/appx-compiler/lib/sjsEnvInit');
require
(
'./config$'
);
require
(
'../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'
);
require
(
'../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7'
);
require
(
'../../pages/scheduleDetail/scheduleDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
.tea/entryFiles-development/index$.worker.js
View file @
2c8c903a
...
...
@@ -30,9 +30,9 @@ if(AFAppX.registerApp) {
function
success
()
{
require
(
'../../app'
);
require
(
'../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'
);
require
(
'../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7'
);
require
(
'../../pages/scheduleDetail/scheduleDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
}
...
...
.tea/entryFiles-production/index$.web.js
View file @
2c8c903a
...
...
@@ -3,6 +3,7 @@ require('./config$');
require
(
'../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'
);
require
(
'../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7'
);
require
(
'../../pages/scheduleDetail/scheduleDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
.tea/entryFiles-production/index$.worker.js
View file @
2c8c903a
...
...
@@ -56,8 +56,9 @@ function success() {
require
(
'../../app'
);
require
(
'../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'
);
require
(
'../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7'
);
require
(
'../../pages/scheduleDetail/scheduleDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
}
self
.
bootstrapApp
?
self
.
bootstrapApp
({
success
})
:
success
();
...
...
.tea/layout.json
View file @
2c8c903a
{
"layout"
:{
"left"
:{
"currentId"
:
"explorer"
,
"size"
:
310
},
"right"
:{
"currentId"
:
""
},
"bottom"
:{
"currentId"
:
""
,
"size"
:
280
}},
"storageVersion"
:
"1.5.7"
}
\ No newline at end of file
{
"layout"
:{
"left"
:{
"currentId"
:
"explorer"
,
"size"
:
295
},
"right"
:{
"currentId"
:
""
},
"bottom"
:{
"currentId"
:
"devtools"
,
"size"
:
241
}},
"storageVersion"
:
"1.5.5"
}
\ No newline at end of file
.tea/recent.json
View file @
2c8c903a
This diff is collapsed.
Click to expand it.
.tea/workbench.json
View file @
2c8c903a
<<<<<<<
HEAD
{
"grid"
:{
"editorGroup"
:{
"uris"
:[
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml"
,
"file:///Users/ryousaku/Desktop/schedule/app.json"
,
"file:///Users/ryousaku/Desktop/schedule/package-lock.json"
,
"file:///Users/ryousaku/Desktop/schedule/app.js"
,
"file:///Users/ryousaku/Desktop/schedule/app.acss"
,
"file:///Users/ryousaku/Desktop/schedule/.gitignore"
,
"file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.js"
,
"file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.acss"
,
"file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.axml"
,
"file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.json"
,
"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.json"
,
"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml"
,
"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.js"
,
"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss"
,
"file:///Users/ryousaku/Desktop/schedule/api/http.js"
,
"file:///Users/ryousaku/Desktop/schedule/api/login.js"
,
"file:///Users/ryousaku/Desktop/schedule/api/request.js"
,
"file:///Users/ryousaku/Desktop/schedule/pages/index/index.js"
],
"current"
:
"file:///Users/ryousaku/Desktop/schedule/app.json"
,
"previewIndex"
:
-1
}},
"storageVersion"
:
"1.5.5"
}
=======
{
"grid"
:{
"editorGroup"
:{
"uris"
:[
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/.DS_Store"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.js"
],
"current"
:
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml"
,
"previewIndex"
:
-1
}},
"storageVersion"
:
"1.5.7"
}
>>>>>>>
4e007456
e
7
efda
136
edec
7
b
454
fed
353
ed
316e78
{
"grid"
:{
"editorGroup"
:{
"uris"
:[
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml"
,
"file:///Users/ryousaku/Desktop/schedule/app.json"
,
"file:///Users/ryousaku/Desktop/schedule/package-lock.json"
,
"file:///Users/ryousaku/Desktop/schedule/app.js"
,
"file:///Users/ryousaku/Desktop/schedule/app.acss"
,
"file:///Users/ryousaku/Desktop/schedule/.gitignore"
,
"file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.js"
,
"file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.acss"
,
"file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.axml"
,
"file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.json"
,
"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.json"
,
"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml"
,
"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.js"
,
"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss"
,
"file:///Users/ryousaku/Desktop/schedule/api/http.js"
,
"file:///Users/ryousaku/Desktop/schedule/api/login.js"
,
"file:///Users/ryousaku/Desktop/schedule/api/request.js"
,
"file:///Users/ryousaku/Desktop/schedule/pages/index/index.js"
],
"current"
:
"file:///Users/ryousaku/Desktop/schedule/app.json"
,
"previewIndex"
:
-1
}},
"storageVersion"
:
"1.5.5"
}
\ No newline at end of file
app.json
View file @
2c8c903a
{
"pages"
:
[
"pages/index/index"
,
"pages/createOrEditSchedule/createOrEditSchedule"
,
"pages/scheduleDetail/scheduleDetail"
,
"pages/index/index"
,
"pages/place/place"
,
"pages/participantsDetail/participantsDetail"
],
...
...
components/mwSelectTimeModal/mwSelectTimeModal.js
View file @
2c8c903a
...
...
@@ -32,7 +32,7 @@ Component({
var
h
=
date
.
getHours
()
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
();
var
min
=
date
.
getMinutes
()
<
10
?
"0"
+
date
.
getMinutes
()
:
date
.
getMinutes
();
var
pickerValue
=
[
this
.
data
.
timeData
.
indexOf
(
y
+
"
-"
+
m
+
"-
"
+
d
+
" "
+
w
),
this
.
data
.
timeHour
.
indexOf
(
`
${
h
}
`
),
this
.
data
.
timeMin
.
indexOf
(
`
${
min
}
`
)]
var
pickerValue
=
[
this
.
data
.
timeData
.
indexOf
(
y
+
"
/"
+
m
+
"/
"
+
d
+
" "
+
w
),
this
.
data
.
timeHour
.
indexOf
(
`
${
h
}
`
),
this
.
data
.
timeMin
.
indexOf
(
`
${
min
}
`
)]
console
.
log
(
pickerValue
)
this
.
setData
({
pickerValue
:
pickerValue
,
...
...
@@ -55,7 +55,7 @@ Component({
var
d
=
time
.
getDate
()
<
10
?
"0"
+
time
.
getDate
():
time
.
getDate
();
//获取当前几号,不足10补0
var
weekList
=
[
'周日'
,
'周一'
,
'周二'
,
'周三'
,
'周四'
,
'周五'
,
'周六'
]
var
w
=
weekList
[
time
.
getDay
()]
return
y
+
"
-"
+
m
+
"-
"
+
d
+
" "
+
w
;
return
y
+
"
/"
+
m
+
"/
"
+
d
+
" "
+
w
;
},
onDetermine
(
e
)
{
this
.
props
.
onChange
({
status
:
1
,
time
:
this
.
data
.
time
})
...
...
pages/createOrEditSchedule/createOrEditSchedule.js
View file @
2c8c903a
...
...
@@ -33,8 +33,8 @@ create.Page({
var
min
=
date
.
getMinutes
();
console
.
log
(
h
,
min
)
this
.
setData
({
time1
:
`
${
y
}
-
${
m
}
-
${
d
}
${
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()}
:
${
min
<
30
?
'00'
:
'30'
}
`
,
time2
:
`
${
y
}
-
${
m
}
-
${
d
}
${
min
<
30
?
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()
:
(
h
+
1
)
<
10
?
"0"
+
(
date
.
getHours
()
+
1
)
:
date
.
getHours
()
+
1
}
:
${
min
<
30
?
'30'
:
'00'
}
`
,
time1
:
`
${
y
}
/
${
m
}
/
${
d
}
${
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()}
:
${
min
<
30
?
'00'
:
'30'
}
`
,
time2
:
`
${
y
}
/
${
m
}
/
${
d
}
${
min
<
30
?
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()
:
(
h
+
1
)
<
10
?
"0"
+
(
date
.
getHours
()
+
1
)
:
date
.
getHours
()
+
1
}
:
${
min
<
30
?
'30'
:
'00'
}
`
,
week1
:
w
,
week2
:
w
,
})
...
...
@@ -66,7 +66,7 @@ create.Page({
var
min
=
date
.
getMinutes
();
this
.
setData
({
time1
:
e
.
time
,
time2
:
`
${
y
}
-
${
m
}
-
${
d
}
${
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()}
:
${
min
<
10
?
"0"
+
min
:
min
}
`
,
time2
:
`
${
y
}
/
${
m
}
/
${
d
}
${
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()}
:
${
min
<
10
?
"0"
+
min
:
min
}
`
,
isShowModal
:
false
,
week1
:
w1
,
week2
:
w2
...
...
@@ -163,8 +163,8 @@ create.Page({
latitude
:
'10'
,
locationName
:
this
.
store
.
data
.
locationName
||
''
},
startTime
:
`
${
this
.
data
.
time1
}
:00`
,
endTime
:
`
${
this
.
data
.
time2
}
:00`
,
startTime
:
`
${
this
.
data
.
time1
.
replace
(
/
\/
/g
,
"-"
)
}
:00`
,
endTime
:
`
${
this
.
data
.
time2
.
replace
(
/
\/
/g
,
'-'
)
}
:00`
,
scheduleType
:
'common'
,
noticeType
:
'dd_notice'
,
participatorList
:
this
.
store
.
participatorList
,
...
...
@@ -179,7 +179,6 @@ create.Page({
dd
.
navigateBack
({
delta
:
1
})
})
},
...
...
@@ -192,8 +191,8 @@ create.Page({
// 会议冲突
conflict
()
{
let
data
=
{
startTime
:
`
${
this
.
data
.
time1
}
:00`
,
endTime
:
`
${
this
.
data
.
time2
}
:00`
,
startTime
:
`
${
this
.
data
.
time1
.
replace
(
/
\/
/g
,
"-"
)
}
:00`
,
endTime
:
`
${
this
.
data
.
time2
.
replace
(
/
\/
/g
,
"-"
)
}
:00`
,
userIds
:
this
.
store
.
data
.
participatorUserId
}
getUserScheduleInTime
(
data
).
then
(
res
=>
{
...
...
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