Skip to content

S
schedule
Commit 863064e3 by liang ce
Options

合并代码

parents f61a539c 4e007456
Showing with 430 additions and 82 deletions
.tea/configuration/mini-program.json
<<<<<<< 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-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"}
>>>>>>> 4e007456e7efda136edec7b454fed353ed316e78
.tea/entryFiles-development/config$.js
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
const g = typeof global !== 'undefined' ? global : self; const g = typeof global !== 'undefined' ? global : self;
g.appXAppJson = { g.appXAppJson = {
"app": { "app": {
"$homepage": "pages/index/index" "$homepage": "pages/createOrEditSchedule/createOrEditSchedule"
} }
}; };
.tea/entryFiles-development/index$.web.js
...@@ -2,7 +2,8 @@ require('@alipay/appx-compiler/lib/sjsEnvInit'); ...@@ -2,7 +2,8 @@ require('@alipay/appx-compiler/lib/sjsEnvInit');
require('./config$'); require('./config$');
require('../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); require('../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7');
require('../../pages/scheduleDetail/scheduleDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7');
require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
.tea/entryFiles-development/index$.worker.js
...@@ -30,9 +30,10 @@ if(AFAppX.registerApp) { ...@@ -30,9 +30,10 @@ if(AFAppX.registerApp) {
function success() { function success() {
require('../../app'); require('../../app');
require('../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); require('../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7');
require('../../pages/scheduleDetail/scheduleDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7');
require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
} }
self.bootstrapApp ? self.bootstrapApp({ success }) : success(); self.bootstrapApp ? self.bootstrapApp({ success }) : success();
......
.tea/entryFiles-production/index$.web.js
require('@alipay/appx-compiler/lib/sjsEnvInit'); require('@alipay/appx-compiler/lib/sjsEnvInit');
require('./config$'); require('./config$');
require('../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7');
require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
.tea/entryFiles-production/index$.worker.js
...@@ -54,9 +54,10 @@ if(AFAppX.registerApp) { ...@@ -54,9 +54,10 @@ if(AFAppX.registerApp) {
function success() { function success() {
require('../../app'); require('../../app');
require('../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7');
require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
} }
self.bootstrapApp ? self.bootstrapApp({ success }) : success(); self.bootstrapApp ? self.bootstrapApp({ success }) : success();
......
.tea/layout.json
<<<<<<< HEAD {"layout":{"left":{"currentId":"explorer","size":310},"right":{"currentId":""},"bottom":{"currentId":"","size":280}},"storageVersion":"1.5.7"}
{"layout":{"left":{"currentId":"explorer","size":295},"right":{"currentId":""},"bottom":{"currentId":"devtools","size":266}},"storageVersion":"1.5.5"} \ No newline at end of file
=======
{"layout":{"left":{"currentId":"explorer","size":330},"right":{"currentId":""},"bottom":{"currentId":"","size":280}},"storageVersion":"1.5.7"}
>>>>>>> 907505a0e30e08ac629232f61c09769fd862ca08
.tea/recent.json
<<<<<<< HEAD
{"OPENED_FILE":["file:///Users/ryousaku/Desktop/schedule/app.json","file:///Users/ryousaku/Desktop/schedule/pages/index/index.js","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.js","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.axml","file:///Users/ryousaku/Desktop/schedule/api/request.js","file:///Users/ryousaku/Desktop/schedule/pages/index/index%202.js","file:///Users/ryousaku/Desktop/schedule/app.js","file:///Users/ryousaku/Desktop/schedule/api/login.js","file:///Users/ryousaku/Desktop/schedule/api/http.js","file:///Users/ryousaku/Desktop/schedule/api/api.ts","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.json","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule%202.axml","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.acss","file:///Users/ryousaku/Desktop/schedule/mwSelectTimeModal/mwSelectTimeModal.js","file:///Users/ryousaku/Desktop/schedule/package-lock.json","file:///Users/ryousaku/Desktop/schedule/.gitignore","file:///Users/ryousaku/Desktop/schedule/app.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/zhaoyufeng/Desktop/work/schedule/app.js","file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/example","file:///Users/zhaoyufeng/Desktop/work/schedule/app.json","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.svg","file:///Users/zhaoyufeng/Desktop/work/schedule/font/demo.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.ttf","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.js","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.eot","file:///Users/zhaoyufeng/Desktop/work/schedule/app.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.js","file:///Users/zhaoyufeng/Desktop/work/schedule/snapshot.png"],"SEARCH_WORD":["a:fo"],"storageVersion":"1.5.5"} {"OPENED_FILE":["file:///Users/ryousaku/Desktop/schedule/app.json","file:///Users/ryousaku/Desktop/schedule/pages/index/index.js","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.js","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.axml","file:///Users/ryousaku/Desktop/schedule/api/request.js","file:///Users/ryousaku/Desktop/schedule/pages/index/index%202.js","file:///Users/ryousaku/Desktop/schedule/app.js","file:///Users/ryousaku/Desktop/schedule/api/login.js","file:///Users/ryousaku/Desktop/schedule/api/http.js","file:///Users/ryousaku/Desktop/schedule/api/api.ts","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.json","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule%202.axml","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.acss","file:///Users/ryousaku/Desktop/schedule/mwSelectTimeModal/mwSelectTimeModal.js","file:///Users/ryousaku/Desktop/schedule/package-lock.json","file:///Users/ryousaku/Desktop/schedule/.gitignore","file:///Users/ryousaku/Desktop/schedule/app.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/zhaoyufeng/Desktop/work/schedule/app.js","file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/example","file:///Users/zhaoyufeng/Desktop/work/schedule/app.json","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.svg","file:///Users/zhaoyufeng/Desktop/work/schedule/font/demo.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.ttf","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.js","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.eot","file:///Users/zhaoyufeng/Desktop/work/schedule/app.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.js","file:///Users/zhaoyufeng/Desktop/work/schedule/snapshot.png"],"SEARCH_WORD":["a:fo"],"storageVersion":"1.5.5"}
=======
{"OPENED_FILE":["file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/zhaoyufeng/Desktop/work/schedule/app.js","file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore","file:///Users/zhaoyufeng/Desktop/work/schedule/components/.DS_Store","file:///Users/zhaoyufeng/Desktop/work/schedule/app.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/%20scheduleDetail/%20scheduleDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/%20scheduleDetail/%20scheduleDetail.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/%20scheduleDetail/%20scheduleDetail.js","file:///Users/zhaoyufeng/Desktop/work/schedule/api/request.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js","file:///Users/zhaoyufeng/Desktop/work/schedule/api/http.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/index.js","file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/index.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/index.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/api/login.js","file:///Users/zhaoyufeng/Desktop/work/schedule/app.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/.DS_Store","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule%20.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/components/mwSelectTimeModal/mwSelectTimeModal.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/assests/cancel.png","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.json","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/example","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.svg","file:///Users/zhaoyufeng/Desktop/work/schedule/font/demo.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.ttf","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.js","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.eot","file:///Users/zhaoyufeng/Desktop/work/schedule/snapshot.png"],"SEARCH_WORD":["a:fo","border","debugger","request","participants","dd.se",".icon","scroll"," getUserScheduleInTime(data).then(res => {","getUserScheduleInTime(data)"],"storageVersion":"1.5.7"}
>>>>>>> 4e007456e7efda136edec7b454fed353ed316e78
.tea/workbench.json
<<<<<<< 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/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"}
>>>>>>> 4e007456e7efda136edec7b454fed353ed316e78
api/http.js
...@@ -24,10 +24,11 @@ export default function http (data) { ...@@ -24,10 +24,11 @@ export default function http (data) {
} else { } else {
return new Promise((resolve, rejects) => { return new Promise((resolve, rejects) => {
login().then(res => { login().then(res => {
getApp().globalData.token = res.data.data.accessToken.access_token //'3a025eee-15ae-4805-9214-fe0599d47f17' // // getApp().globalData.token = res.data.data.accessToken.access_token //'3a025eee-15ae-4805-9214-fe0599d47f17' //
getApp().globalData.name = res.data.data.oapiUser.name getApp().globalData.token = 'b1b2c5fd-1706-4c35-91ee-683b6397ad37' //'3a025eee-15ae-4805-9214-fe0599d47f17' //
getApp().globalData.userid = res.data.data.oapiUser.userid // getApp().globalData.name = res.data.data.oapiUser.name
getApp().globalData.avatar = res.data.data.oapiUser.avatar // getApp().globalData.userid = res.data.data.oapiUser.userid
// getApp().globalData.avatar = res.data.data.oapiUser.avatar
dd.httpRequest({ dd.httpRequest({
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
......
api/request.js
...@@ -151,3 +151,22 @@ export function getHomeUserSchedule (data) { ...@@ -151,3 +151,22 @@ export function getHomeUserSchedule (data) {
url: `/meet/schedule/getHomeUserSchedule ` url: `/meet/schedule/getHomeUserSchedule `
}) })
} }
/* 创建日程全部请求 */
// 创建日程
export function addSchedule (data) {
return $http({
method: 'post',
data: JSON.stringify(data),
url: `/meet/schedule/addSchedule `
})
}
// 获取参会会人员的日程
export function getUserScheduleInTime (data) {
return $http({
method: 'post',
data: JSON.stringify(data),
url: `/meet/schedule/getUserScheduleInTime `
})
}
\ No newline at end of file
app.json
{ {
"pages": [ "pages": [
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/scheduleDetail/scheduleDetail",
"pages/index/index", "pages/index/index",
"pages/place/place", "pages/place/place",
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/participantsDetail/participantsDetail" "pages/participantsDetail/participantsDetail"
], ],
"window": { "window": {
......
pages/createOrEditSchedule/createOrEditSchedule .axml deleted 100644 → 0
<view>
New Page
</view>
\ No newline at end of file
pages/createOrEditSchedule/createOrEditSchedule.axml
<view class="createOrEditSchedule"> <view class="createOrEditSchedule">
<!-- 主题 --> <!-- 主题 -->
<view class="theme"> <view class="theme">
<input placeholder="添加主题" /> <input placeholder="添加主题" onInput="getTitle" />
</view> </view>
<!-- 时间 --> <!-- 时间 -->
<view class="time"> <view class="time">
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
<view class="icon iconfont icondingwei"> <view class="icon iconfont icondingwei">
</view> </view>
<view class="text" data-nextPage="place" onTap="nextPage"> <view class="text" data-nextPage="place" onTap="nextPage">
<view class="selectPlace" a:if="{{!!place}}"> <view class="selectPlace" a:if="{{!!locationName}}">
<text>{{place}}</text> <text>{{locationName}}</text>
<text class="iconshanchu iconfont" catchTap="closePlace"></text> <text class="iconshanchu iconfont" catchTap="closePlace"></text>
</view> </view>
<text a:else>添加地点</text> <text a:else>添加地点</text>
...@@ -52,29 +52,29 @@ ...@@ -52,29 +52,29 @@
<view class="icon iconfont iconcanhuiren1"> <view class="icon iconfont iconcanhuiren1">
</view> </view>
<view class="text"> <view class="text">
<view a:if="{{participants.length}}"> <view a:if="{{participatorList.length}}">
<view class="people"> <view class="people">
<view class="scrollPeople" catchTap="nextPage" data-nextPage="participantsDetail"> <view class="scrollPeople" catchTap="nextPage" data-nextPage="participantsDetail">
<text class="imageGroup" a:for="{{participants}}" a:for-item="item"> <text class="imageGroup" a:for="{{participatorList}}" a:for-item="item">
<text> <text>
<image a:if="{{!!item.avatar}}" mode="scaleToFill" src="{{item.avatar}}"/> <image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<text a:else class="name">{{item.name.substring(item.name.length - 2, item.name.length)}}</text> <text a:else class="name">{{item.username.substring(item.username.length - 2, item.username.length)}}</text>
</text> </text>
<text class="conflictTip"></text> <text a:if={{conflictPeople.indexOf(item.userId)>-1}} class="conflictTip"></text>
</text> </text>
</view> </view>
<view class="addPeople iconfont icontianjia" onTap="addParticipants"> <view class="addPeople iconfont icontianjia" onTap="addParticipants">
</view> </view>
<view class="rightPeople"> <view class="rightPeople">
<text>{{participants.length}}人</text> <text>{{participatorList.length}}人</text>
<text class="iconfont iconyoujinru"></text> <text class="iconfont iconyoujinru"></text>
</view> </view>
</view> </view>
<view class="tip"> <view class="tip">
<!--<text class="noConflict"> <text class="noConflict" a:if="conflictPeope === []">
所有参与者都有空</text> --> 所有参与者都有空</text>
<text class="conflict"> <text class="conflict" a:else>
叶琴、王梦琳、冯召玉、等9:30-10:00 会议冲突 <text a:if="{{conflictPeople.indexOf(list.userId)>-1}}" a:for="{{participatorList}}" a:for-list="item">{{list.username}}</text> 会议冲突
</text> </text>
</view> </view>
</view> </view>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</view> </view>
<!-- 保存 --> <!-- 保存 -->
<view class="save"> <view class="save">
<view> <view onTap="saveCreate">
立即创建 立即创建
</view> </view>
</view> </view>
...@@ -100,3 +100,4 @@ ...@@ -100,3 +100,4 @@
<mw-modal isShowModal="{{isShowModal}}" time="{{propsTime}}" onChange="changeSelectTime"> <mw-modal isShowModal="{{isShowModal}}" time="{{propsTime}}" onChange="changeSelectTime">
</mw-modal> </mw-modal>
<!-- <mw-message visible="{true}" onDmMessageHide="onDmMessageHide" type="{{type}}" content="{{content}}" duration="800"></mw-message> -->
\ No newline at end of file
pages/createOrEditSchedule/createOrEditSchedule.js
import create from 'dd-store' import create from 'dd-store'
import exampleStore from '/stores/exampleStore' import exampleStore from '/stores/exampleStore'
import { saveMettingRoom, getUserScheduleInTime } from '../../api/request'
create.Page({ create.Page({
store: exampleStore, store: exampleStore,
useAll: true, useAll: true,
data: { data: {
timeStaus: '', timeStaus: '',
isShowModal: false, isShowModal: false,
title: null,
time1: '', time1: '',
week1: '', week1: '',
time2: '', time2: '',
week2: '', week2: '',
propsTime: '' propsTime: '',
conflictPeople: []
}, },
onLoad() { onLoad() {
this.store.data.participants = [] this.store.data.participatorList = []
this.store.data.place = '' this.store.data.locationName = ''
this.store.data.participatorUserId = []
this.update() this.update()
dd.setNavigationBar({ dd.setNavigationBar({
title: '创建会议' title: '创建会议'
}) })
var date = new Date(); var date = new Date();
var y = date.getFullYear(); var y = date.getFullYear();
var m = (date.getMonth()+1)<10?"0"+(date.getMonth()+1):(date.getMonth()+1);//获取当前月份的日期，不足10补0 var m = (date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1) : (date.getMonth() + 1);//获取当前月份的日期，不足10补0
var d = date.getDate()<10?"0"+date.getDate():date.getDate();//获取当前几号，不足10补0 var d = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();//获取当前几号，不足10补0
var weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'] var weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
var w = weekList[date.getDay()]; var w = weekList[date.getDay()];
var h = date.getHours() var h = date.getHours()
var min = date.getMinutes(); var min = date.getMinutes();
console.log(h,min) console.log(h, min)
this.setData({ this.setData({
time1: `${y}-${m}-${d} ${h<10? "0"+date.getHours() : date.getHours()}:${min < 30 ? '00' : '30'}`, 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'}`, 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, week1: w,
week2: w, week2: w,
}) })
...@@ -53,16 +57,16 @@ create.Page({ ...@@ -53,16 +57,16 @@ create.Page({
if (this.data.timeStaus == 0) { if (this.data.timeStaus == 0) {
if (new Date(e.time).getTime() > new Date(this.data.time2).getTime()) { if (new Date(e.time).getTime() > new Date(this.data.time2).getTime()) {
var date = new Date(e.time); var date = new Date(e.time);
date.setMinutes (date.getMinutes () + 30) date.setMinutes(date.getMinutes() + 30)
var y = date.getFullYear(); var y = date.getFullYear();
var m = (date.getMonth()+1)<10?"0"+(date.getMonth()+1):(date.getMonth()+1);//获取当前月份的日期，不足10补0 var m = (date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1) : (date.getMonth() + 1);//获取当前月份的日期，不足10补0
var d = date.getDate()<10?"0"+date.getDate():date.getDate();//获取当前几号，不足10补0 var d = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();//获取当前几号，不足10补0
var w2 = weekList[date.getDay()]; var w2 = weekList[date.getDay()];
var h = date.getHours() var h = date.getHours()
var min = date.getMinutes(); var min = date.getMinutes();
this.setData({ this.setData({
time1: e.time, 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, isShowModal: false,
week1: w1, week1: w1,
week2: w2 week2: w2
...@@ -75,7 +79,7 @@ create.Page({ ...@@ -75,7 +79,7 @@ create.Page({
}) })
} }
} else { } else {
if(new Date(e.time).getTime() < new Date(this.data.time1).getTime()) { if (new Date(e.time).getTime() < new Date(this.data.time1).getTime()) {
dd.alert({ dd.alert({
title: '提示', title: '提示',
content: '会议结束时间不能小于开始时间', content: '会议结束时间不能小于开始时间',
...@@ -97,6 +101,12 @@ create.Page({ ...@@ -97,6 +101,12 @@ create.Page({
}) })
} }
}, },
// input 输入事件
getTitle(event) {
this.setData({
title: event.detail.value
})
},
// 添加参会人 // 添加参会人
addParticipants() { addParticipants() {
const _that = this const _that = this
...@@ -105,20 +115,21 @@ create.Page({ ...@@ -105,20 +115,21 @@ create.Page({
multiple: true, //是否多选 multiple: true, //是否多选
limitTips: "超出了", //超过限定人数返回提示 limitTips: "超出了", //超过限定人数返回提示
maxUsers: 1000, //最大可选人数 maxUsers: 1000, //最大可选人数
pickedUsers: [], //已选用户 pickedUsers: _that.store.data.participatorUserId, //已选用户
pickedDepartments: [], //已选部门
disabledUsers: [], //不可选用户
disabledDepartments: [], //不可选部门
requiredUsers: [], //必选用户（不可取消选中状态） requiredUsers: [], //必选用户（不可取消选中状态）
requiredDepartments: [], //必选部门（不可取消选中状态） requiredDepartments: [], //必选部门（不可取消选中状态）
permissionType: "xxx", //可添加权限校验，选人权限，目前只有GLOBAL这个参数 permissionType: "xxx", //可添加权限校验，选人权限，目前只有GLOBAL这个参数
responseUserOnly: true, //返回人，或者返回人和部门 responseUserOnly: true, //返回人，或者返回人和部门
success: function (res) { success: function (res) {
res.users.forEach((item, index) => { res.users.forEach((item, index) => {
_that.store.data.participants.push(item) _that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.headUrl })
_that.store.data.participatorUserId.push(item.userId)
}) })
_that.store.data.participants = _that.setArrary(_that.store.data.participants) _that.store.data.participatorList = _that.setArrary(_that.store.data.participatorList)
_that.store.data.participatorUserId = [...new Set(_that.store.data.participatorUserId)]
_that.update() _that.update()
_that.conflict()
}, },
fail: function (err) { fail: function (err) {
} }
...@@ -143,10 +154,56 @@ create.Page({ ...@@ -143,10 +154,56 @@ create.Page({
} }
return Object.values(containt) return Object.values(containt)
}, },
// 保存
saveCreate() {
let data = {
title: this.data.title || '无主题',
location: {
longitude: '10',
latitude: '10',
locationName: this.store.data.locationName || ''
},
startTime: `${this.data.time1}:00`,
endTime: `${this.data.time2} :00`,
scheduleType: 'common',
noticeType: 'dd_notice',
participatorList: this.store.participatorList,
repeatable: 0,
aheadTimes: [],
recurrenceModel: {
model: 'no_repeat'
},
meetingRoomId: 222 || null
}
saveMettingRoom(data).then(res => {
dd.navigateBack({
delta: 1
})
})
},
// 清除地点 // 清除地点
closePlace () { closePlace() {
this.store.data.place="" this.store.data.place = ""
this.update() this.update()
},
// 会议冲突
conflict() {
let data = {
startTime: `${this.data.time1}:00`,
endTime: `${this.data.time2}:00`,
userIds: this.store.data.participatorUserId
}
getUserScheduleInTime(data).then(res => {
for(let value in res.data.data) {
if(res.data.data[value] === []) {
conflictPeople.push(value)
}
} }
})
}
}); });
pages/index/index.axml
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<text>00</text> <text>00</text>
</view> </view>
<view class="dataSchedule"> <view class="dataSchedule">
<view class="overdue"> <view class="overdue" onTap="nextDetail">
<view class="dataScheduleName"> <view class="dataScheduleName">
过期的会议 过期的会议
</view> </view>
......
pages/index/index.js
...@@ -45,5 +45,10 @@ Page({ ...@@ -45,5 +45,10 @@ Page({
nextPage() { nextPage() {
dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' }) dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
},
nextDetail () {
dd.navigateTo({ url: './../scheduleDetail/scheduleDetail' })
} }
}); });
pages/participantsDetail/participantsDetail.axml
<view> <view>
<view class="list" a:for="{{participants}}" a:for-item="item"> <view class="list" a:for="{{participatorList}}" a:for-item="item">
<view class="headImg"> <view class="headImg">
<image a:if="{{!!item.avatar}}" mode="scaleToFill" src="{{item.avatar}}"/> <image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<text a:else>{{item.name.substring(0, 1)}}</text> <text a:else>{{item.username.substring(0, 1)}}</text>
</view> </view>
<view class="info"> <view class="info">
<text class="name">{{item.name}}</text> <text class="name">{{item.username}}</text>
<text class="close iconshanchu iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text> <text class="close iconshanchu iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text>
</view> </view>
</view> </view>
......
pages/participantsDetail/participantsDetail.js
...@@ -7,7 +7,7 @@ create.Page({ ...@@ -7,7 +7,7 @@ create.Page({
}, },
onLoad() { onLoad() {
dd.setNavigationBar({ dd.setNavigationBar({
title: `参会人(${this.store.data.participants.length}人）` title: `参会人(${this.store.data.participatorList.length}人）`
}) })
}, },
...@@ -26,22 +26,20 @@ create.Page({ ...@@ -26,22 +26,20 @@ create.Page({
multiple: true, //是否多选 multiple: true, //是否多选
limitTips: "超出了", //超过限定人数返回提示 limitTips: "超出了", //超过限定人数返回提示
maxUsers: 1000, //最大可选人数 maxUsers: 1000, //最大可选人数
pickedUsers: [], //已选用户 pickedUsers: _that.store.data.participatorUserId, //已选用户
pickedDepartments: [], //已选部门 requiredUsers: [], //必选用户（不可取消选中状态
disabledUsers: [], //不可选用户
disabledDepartments: [], //不可选部门
requiredUsers: [], //必选用户（不可取消选中状态）
requiredDepartments: [], //必选部门（不可取消选中状态）
permissionType: "xxx", //可添加权限校验，选人权限，目前只有GLOBAL这个参数
responseUserOnly: true, //返回人，或者返回人和部门 responseUserOnly: true, //返回人，或者返回人和部门
success: function (res) { success: function (res) {
res.users.forEach((item, index) => { res.users.forEach((item, index) => {
_that.store.data.participants.push(item) _that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.headUrl })
_that.store.data.participatorUserId.push(item.userId)
}) })
_that.store.data.participants = _that.setArrary(_that.store.data.participants) _that.store.data.participatorList = _that.setArrary(_that.store.data.participatorList)
_that.store.data.participatorUserId = [...new Set(_that.store.data.participatorUserId)]
_that.update() _that.update()
dd.setNavigationBar({ dd.setNavigationBar({
title: `参会人(${_that.store.data.participants.length}人）` title: `参会人(${_that.store.data.participatorList.length}人）`
}) })
}, },
fail: function (err) { fail: function (err) {
...@@ -51,16 +49,22 @@ create.Page({ ...@@ -51,16 +49,22 @@ create.Page({
// 删除参会人 // 删除参会人
delParticipants(event) { delParticipants(event) {
let userId = event.target.dataset.userId let userId = event.target.dataset.userId
console.log(event.target.dataset.userId) this.store.data.participatorList.forEach((item, index) => {
this.store.data.participants.forEach((item, index) => {
if (userId === item.userId) { if (userId === item.userId) {
this.store.data.participants.splice(index, 1) this.store.data.participatorList.splice(index, 1)
this.update()
return
}
})
this.store.data.participatorUserId.forEach((item, index) => {
if (userId === item) {
this.store.data.participatorUserId.splice(index, 1)
this.update() this.update()
return return
} }
}) })
dd.setNavigationBar({ dd.setNavigationBar({
title: `参会人(${this.store.data.participants.length}人）` title: `参会人(${this.store.data.participatorList.length}人）`
}) })
}, },
......
pages/place/place.axml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<view class="title"> <view class="title">
可用会议室 可用会议室
</view> </view>
<view class="mettingRoom" data-place="未来Park1" onTap="selectPlace"> <view class="mettingRoom" data-locationName="未来Park1" onTap="selectPlace">
<view class="icon iconfont iconhuiyishi"> <view class="icon iconfont iconhuiyishi">
</view> </view>
<view class="mettingRoomRight"> <view class="mettingRoomRight">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="mettingRoom" data-place="未来Park2" onTap="selectPlace"> <view class="mettingRoom" data-locationName="未来Park2" onTap="selectPlace">
<view class="icon iconfont iconhuiyishi"> <view class="icon iconfont iconhuiyishi">
</view> </view>
<view class="mettingRoomRight"> <view class="mettingRoomRight">
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="mettingRoom" data-place="未来Park3" onTap="selectPlace"> <view class="mettingRoom" data-locationName="未来Park3" onTap="selectPlace">
<view class="icon iconfont iconhuiyishi"> <view class="icon iconfont iconhuiyishi">
</view> </view>
<view class="mettingRoomRight"> <view class="mettingRoomRight">
......
pages/place/place.js
...@@ -10,12 +10,10 @@ create.Page({ ...@@ -10,12 +10,10 @@ create.Page({
}) })
}, },
selectPlace(event) { selectPlace(event) {
this.store.data.place = event.target.dataset.place this.store.data.locationName = event.target.dataset.locationName
this.update() this.update()
dd.navigateBack({ dd.navigateBack({
delta: 1 delta: 1
}) })
} }
}); });
pages/scheduleDetail/scheduleDetail.acss 0 → 100644
@import "../../font/iconfont.acss";
page {
background: #f6f6f6;
font-family: PingFangSC-Regular;
font-size: 34rpx;
color: #191F25;
}
::-webkit-scrollbar {
display: none
}
.scheduleInfo {
border-top: 1rpx solid rgba(25, 31, 37, 0.12);
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
background: white;
padding-left: 32rpx;
}
.title, .place, .time, .remind {
height: 112rpx;
display: flex;
background: white;
}
.icon {
line-height: 112rpx;
text-align: left;
font-size: 40rpx;
color: #191F25;
vertical-align: center;
margin-right: 25rpx;
}
.title .text, .place .text, .time .text, .remind .text {
line-height: 112rpx;
width: 100%;
height: 112rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.time .text {
border: none;
}
.participants {
position: relative;
background: #fff;
margin: 16rpx 0;
height: 112rpx;
line-height: 112rpx;
padding: 0 32rpx;
display: flex;
}
.scroll {
white-space: nowrap;
overflow-x: scroll;
max-width: 400rpx;
}
.scroll>image {
vertical-align: top;
border-radius: 50%;
width: 58rpx;
height: 58rpx;
margin-top: 27rpx;
background: #3296Fa;
margin-right: 16rpx;
}
.number {
margin-right: 16rpx;
vertical-align: top;
}
.right {
position: absolute;
right: 32rpx;
;
opacity: 0.56;
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #191F25;
}
.iconyoujinru, .icontianjia {
line-height: 112rpx;
font-size: 40rpx;
color: rgba(25, 31, 37, 0.40);
}
.remind {
padding: 0 32rpx;
}
.remind .text {
border: none;
}
.dynamic {
position: relative;
background: #fff;
height: 112rpx;
line-height: 112rpx;
padding: 0 32rpx;
display: flex;
margin-top: 16rpx;
}
.upload {
font-size: 24rpx;
position: absolute;
right: 32rpx;
color: #3296FA;
}
.upload text {
color: #3296FA;
vertical-align: top;
}
.icontianjia {
margin-left: 4rpx;
}
.tip {
text-align: center;
margin-top: 48rpx;
font-size: 24rpx;
color: rgba(25, 31, 37, 0.56);
}
.bottom {
width: 686rpx;
display: flex;
line-height: 112rpx;
padding: 0 32rpx;
position: fixed;
background: white;
height: 112rpx;
bottom: 0;
justify-content: space-between;
color: rgba(25,31,37,0.56);
font-size: 28rpx;
}
.bottom .iconfont {
font-size: 40rpx;
margin-right: 8rpx;
}
.buttonGroup text {
vertical-align: top;
}
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.axml 0 → 100644
<view class="scheduleDetail">
<view class="scheduleInfo">
<view class="title">
<view class="icon icondidianmiaoshu iconfont">
</view>
<view class="text">
产品技术评估
</view>
</view>
<view class="place">
<view class="icon icondingwei iconfont">
</view>
<view class="text">
西城广场星巴克
</view>
</view>
<view class="time">
<view class="icon iconshijian iconfont">
</view>
<view class="text">
01月29日 周三 09:00-10:00
</view>
</view>
</view>
<view class="participants">
<view class="icon iconcanhuiren1 iconfont">
</view>
<view class="scroll">
<image mode="scaleToFill" src=""/>
<image mode="scaleToFill" src=""/>
<image mode="scaleToFill" src=""/>
<image mode="scaleToFill" src=""/>
<image mode="scaleToFill" src=""/>
<image mode="scaleToFill" src=""/>
<image mode="scaleToFill" src=""/>
<image mode="scaleToFill" src=""/>
</view>
<view class="right">
<text class="number">3人参与</text>
<text class="iconyoujinru iconfont"></text>
</view>
</view>
<view class="remind">
<view class="icon iconshijian iconfont">
</view>
<view class="text">
提前15分钟提醒
</view>
</view>
<view class="dynamic">
<view class="icon iconhuiyimiaoshu iconfont">
</view>
<view class="text">
会议动态
</view>
<view class="upload">
<text>文件上传</text>
<text class="icontianjia iconfont"></text>
</view>
</view>
<view class="tip">
李文 修改了会议 2月12日 12:10
</view>
<view class="tip">
王新萌 创建了会议 2月11日 10:32
</view>
<view class="bottom">
<view class="buttonGroup">
<text class="icondidianmiaoshu iconfont"></text>
<text>编辑</text>
</view>
<view class="buttonGroup">
<text class="icondidianmiaoshu iconfont"></text>
<text>删除</text>
</view>
<view class="buttonGroup">
<text class="icondidianmiaoshu iconfont"></text>
<text>编辑</text>
</view>
<view class="buttonGroup">
<text class="icondidianmiaoshu iconfont"></text>
<text>编辑</text>
</view>
</view>
</view>
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.js 0 → 100644
Page({
data: {},
onLoad() {
dd.setNavigationBar({
title: '会议详情'
})
},
});
pages/scheduleDetail/scheduleDetail.json 0 → 100644
{}
\ No newline at end of file
stores/exampleStore.js
class Store { class Store {
data = { data = {
participants: [], participatorList: [], // 参会人列表
place: '' locationName: '',
participatorUserId: [], // 参会人的userId
} }
} }
......
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