Skip to content

S
schedule
Commit db558e35 by liang ce
Options

合并代码

parents 76921e89 907505a0
Showing with 721 additions and 39 deletions
.tea/configuration/mini-program.json
{"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":"2019080766135403","dingtalk:dingtalk-biz-isv:_appName":"企业e卡通测试","dingtalk:dingtalk-biz-isv:_orgId":39441482,"dingtalk:dingtalk-biz-isv:_corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","dingtalk:dingtalk-biz-isv:remoteVersion":"0.0.23","dingtalk:dingtalk-biz-isv:currentVersion":"0.0.24","dingtalk:dingtalk-biz-isv:whiteList":["60.191.0.172","gateway-beta.mingwork.com","restapi.amap.com","mingpos.mingwork.com","139.196.213.18","60.191.0.166","192.168.1.101"],"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","storageVersion":"1.5.5"} <<<<<<< HEAD
\ No newline at end of file {"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":"2019080766135403","dingtalk:dingtalk-biz-isv:_appName":"企业e卡通测试","dingtalk:dingtalk-biz-isv:_orgId":39441482,"dingtalk:dingtalk-biz-isv:_corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","dingtalk:dingtalk-biz-isv:remoteVersion":"0.0.23","dingtalk:dingtalk-biz-isv:currentVersion":"0.0.24","dingtalk:dingtalk-biz-isv:whiteList":["60.191.0.172","gateway-beta.mingwork.com","restapi.amap.com","mingpos.mingwork.com","139.196.213.18","60.191.0.166","192.168.1.101"],"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","storageVersion":"1.5.5"}
=======
{"tinyType":"dingtalk","tinyCnName":"钉钉","tinyProjectType":"dingtalk-biz","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":"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":"2019080766135403","dingtalk:dingtalk-biz-isv:_appName":"企业e卡通测试","dingtalk:dingtalk-biz-isv:_orgId":39441482,"dingtalk:dingtalk-biz-isv:_corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","dingtalk:dingtalk-biz-isv:remoteVersion":"0.0.23","dingtalk:dingtalk-biz-isv:currentVersion":"0.0.24","dingtalk:dingtalk-biz-isv:whiteList":["60.191.0.172","gateway-beta.mingwork.com","restapi.amap.com","mingpos.mingwork.com","139.196.213.18","60.191.0.166","192.168.1.101"],"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-10 16:56:10","dingtalk:dingtalk-biz:compilePreviewWholePackSize":"48.3 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":100,"storageVersion":"1.5.7"}
>>>>>>> 907505a0e30e08ac629232f61c09769fd862ca08
.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/createOrEditSchedule/createOrEditSchedule" "$homepage": "pages/index/index"
} }
}; };
.tea/entryFiles-development/index$.web.js
...@@ -2,6 +2,7 @@ require('@alipay/appx-compiler/lib/sjsEnvInit'); ...@@ -2,6 +2,7 @@ require('@alipay/appx-compiler/lib/sjsEnvInit');
require('./config$'); require('./config$');
require('../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); 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/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7');
require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/index/index?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/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7'); require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7');
require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
} }
self.bootstrapApp ? self.bootstrapApp({ success }) : success(); self.bootstrapApp ? self.bootstrapApp({ success }) : success();
} }
\ No newline at end of file
.tea/entryFiles-production/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/createOrEditSchedule/createOrEditSchedule" "$homepage": "pages/index/index"
} }
}; };
.tea/entryFiles-production/index$.web.js
require('@alipay/appx-compiler/lib/sjsEnvInit'); require('@alipay/appx-compiler/lib/sjsEnvInit');
require('./config$'); require('./config$');
require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/index/index?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('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
} }
self.bootstrapApp ? self.bootstrapApp({ success }) : success(); self.bootstrapApp ? self.bootstrapApp({ success }) : success();
} }
\ No newline at end of file
.tea/layout.json
{"layout":{"left":{"currentId":"explorer","size":295},"right":{"currentId":""},"bottom":{"currentId":"devtools","size":266}},"storageVersion":"1.5.5"} <<<<<<< HEAD
\ No newline at end of file {"layout":{"left":{"currentId":"explorer","size":295},"right":{"currentId":""},"bottom":{"currentId":"devtools","size":266}},"storageVersion":"1.5.5"}
=======
{"layout":{"left":{"currentId":"explorer","size":330},"right":{"currentId":""},"bottom":{"currentId":"","size":280}},"storageVersion":"1.5.7"}
>>>>>>> 907505a0e30e08ac629232f61c09769fd862ca08
.tea/recent.json
{"OPENED_FILE":["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.js","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.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/ryousaku/Desktop/schedule/app.js","file:///Users/ryousaku/Desktop/schedule/app.json","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"} <<<<<<< HEAD
\ No newline at end of file {"OPENED_FILE":["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.js","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.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/ryousaku/Desktop/schedule/app.js","file:///Users/ryousaku/Desktop/schedule/app.json","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/stores/exampleStore.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml","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/pages/place/place.js","file:///Users/zhaoyufeng/Desktop/work/schedule/app.json","file:///Users/zhaoyufeng/Desktop/work/schedule/app.js","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/pages/place/place.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.js","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore","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/app.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/zhaoyufeng/Desktop/work/schedule/snapshot.png"],"SEARCH_WORD":["a:fo","border","debugger"],"storageVersion":"1.5.7"}
>>>>>>> 907505a0e30e08ac629232f61c09769fd862ca08
.tea/workbench.json
{"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"],"current":"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","previewIndex":-1}},"storageVersion":"1.5.5"} <<<<<<< HEAD
\ No newline at end of file {"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"],"current":"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","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/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","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/pages/participantsDetail/participantsDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js"],"current":"file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js","previewIndex":-1}},"storageVersion":"1.5.7"}
>>>>>>> 907505a0e30e08ac629232f61c09769fd862ca08
app.js
...@@ -2,7 +2,7 @@ App({ ...@@ -2,7 +2,7 @@ App({
onLaunch(options) { onLaunch(options) {
// 第一次打开 // 第一次打开
// options.query == {number:1} // options.query == {number:1}
console.info('App onLaunch'); // console.info('App onLaunch');
}, },
onShow(options) { onShow(options) {
// 从后台被 scheme 重新打开 // 从后台被 scheme 重新打开
......
app.json
{ {
"pages": [ "pages": [
"pages/index/index",
"pages/place/place",
"pages/createOrEditSchedule/createOrEditSchedule", "pages/createOrEditSchedule/createOrEditSchedule",
"pages/participantsDetail/participantsDetail", "pages/participantsDetail/participantsDetail"
"pages/index/index"
], ],
"window": { "window": {
"defaultTitle": "My App" "defaultTitle": "My App"
......
components/mwSelectTimeModal/mwSelectTimeModal.acss 0 → 100755
.mwModal{
font-family: PingFangSC-Regular;
font-size: 34rpx;
color: #191F25;
}
.mwModal{
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
display: flex;
background: rgba(25, 31, 37, 0.4);
flex-direction: column-reverse;
}
.mwModalBox{
background: #fff;
width: 100%;
height: 404rpx;
border-radius: 21px 21px 0px 0px;
}
.mwModalHeader{
color: #3296FA;
font-size: 34rpx;
width: 100%;
display: flex;
box-sizing: border-box;
padding: 32rpx;
}
.mwModalHeader view{
flex: 1;
}
.mwModalHeader view:nth-of-type(1){
color: #191F25;
}
.mwModalHeader view:nth-of-type(2){
text-align: right;
}
.mwModalBody{
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 60rpx;
}
.mwModalBody picker-view{
width: 100%;
height: 292rpx;
display: flex;
}
.son2{
flex: 1;
}
.son{
flex: 2;
}
\ No newline at end of file
components/mwSelectTimeModal/mwSelectTimeModal.axml 0 → 100644
<view class="mwModal" a:if="{{isShowModal === true}}">
<view class="mwModalBox">
<view class="mwModalHeader">
<view onTap="ModalCancel" catchTap="onCancel">
取消
</view>
<view onTap="mwModalDetermine" catchTap="onDetermine">
确定
</view>
</view>
<view class="mwModalBody">
<picker-view value="{{pickerValue}}" class="parent" onChange="onChange">
<picker-view-column class="son">
<view a:for="{{timeData}}">{{item}}</view>
</picker-view-column>
<picker-view-column class="son2">
<view a:for="{{timeHour}}">{{item}}</view>
</picker-view-column>
<picker-view-column class="son2">
<view a:for="{{timeMin}}">{{item}}</view>
</picker-view-column>
</picker-view>
</view>
</view>
</view>
\ No newline at end of file
components/mwSelectTimeModal/mwSelectTimeModal.js 0 → 100644
Component({
mixins: [],
data: {
timeData: [],
timeHour: ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09','10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23'],
timeMin: ['00', '05', '10', '15', '20', '25', '30', '35', '40', '45', '50', '55'],
pickerValue: [],
time: ''
},
props: {
isShowModal: 'false'
},
didMount() {
let timeData = [];
for(let i=365;i>=0;i--) {
timeData.push(this.GetDateStr(-i));
}
for(var i=1;i<365;i++){
timeData.push(this.GetDateStr(i));
}
this.setData({
timeData: timeData
})
},
didUpdate() {
var date = new Date(this.props.time);
var y = date.getFullYear();
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 weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
var w = weekList[date.getDay()];
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}`)]
console.log(pickerValue)
this.setData({
pickerValue: pickerValue,
time: this.props.time
})
},
didUnmount() {},
methods: {
showModal(e) {
console.log(e)
},
onCancel(e) {
this.props.onChange({status: 0})
},
GetDateStr(AddDayCount) {
var time = new Date();
time.setDate(time.getDate()+AddDayCount);//获取AddDayCount天后的日期
var y = time.getFullYear();
var m = (time.getMonth()+1)<10?"0"+(time.getMonth()+1):(time.getMonth()+1);//获取当前月份的日期，不足10补0
var d = time.getDate()<10?"0"+time.getDate():time.getDate();//获取当前几号，不足10补0
var weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
var w = weekList[time.getDay()]
return y+"-"+m+"-"+d+" "+w;
},
onDetermine(e) {
this.props.onChange({status: 1, time: this.data.time})
},
onChange(e) {
console.log(e)
let index = e.detail.value
this.props.time = `${this.data.timeData[index[0]].slice(0,10)} ${this.data.timeHour[index[1]]}:${this.data.timeMin[index[2]]}`
this.setData({
time: `${this.data.timeData[index[0]].slice(0,10)} ${this.data.timeHour[index[1]]}:${this.data.timeMin[index[2]]}`
})
console.log(this.data.time)
}
},
});
components/mwSelectTimeModal/mwSelectTimeModal.json 0 → 100644
{
"component": true
}
\ No newline at end of file
pages/createOrEditSchedule/createOrEditSchedule .axml 0 → 100644
<view>
New Page
</view>
\ No newline at end of file
pages/createOrEditSchedule/createOrEditSchedule.acss
...@@ -224,7 +224,7 @@ page { ...@@ -224,7 +224,7 @@ page {
background: #E60012; background: #E60012;
position: absolute; position: absolute;
color: rgb(211, 190, 192); color: rgb(211, 190, 192);
bottom: 2rpx; bottom: -1rpx;
right: 13rpx; right: 13rpx;
} }
...@@ -253,4 +253,12 @@ page { ...@@ -253,4 +253,12 @@ page {
width: 100%; width: 100%;
display: inline-block; display: inline-block;
height: 100%; height: 100%;
} }
\ No newline at end of file .selectPlace {
display: flex;
justify-content: space-between;
}
.iconshanchu {
color: rgba(25, 31, 37, 0.28);
}
pages/createOrEditSchedule/createOrEditSchedule.axml
...@@ -38,8 +38,13 @@ ...@@ -38,8 +38,13 @@
<view class="place"> <view class="place">
<view class="icon iconfont icondingwei"> <view class="icon iconfont icondingwei">
</view> </view>
<view class="text"> <view class="text" data-nextPage="place" onTap="nextPage">
添加地点 <view class="selectPlace" a:if="{{!!place}}">
<text>{{place}}</text>
<text class="iconshanchu iconfont" catchTap="closePlace"></text>
</view>
<text a:else>添加地点</text>
</view> </view>
</view> </view>
<!-- 参会人 --> <!-- 参会人 -->
...@@ -49,7 +54,7 @@ ...@@ -49,7 +54,7 @@
<view class="text"> <view class="text">
<view a:if="{{participants.length}}"> <view a:if="{{participants.length}}">
<view class="people"> <view class="people">
<view class="scrollPeople" catchTap="nextPage"> <view class="scrollPeople" catchTap="nextPage" data-nextPage="participantsDetail">
<text class="imageGroup" a:for="{{participants}}" a:for-item="item"> <text class="imageGroup" a:for="{{participants}}" a:for-item="item">
<text> <text>
<image a:if="{{!!item.avatar}}" mode="scaleToFill" src="{{item.avatar}}"/> <image a:if="{{!!item.avatar}}" mode="scaleToFill" src="{{item.avatar}}"/>
...@@ -73,7 +78,7 @@ ...@@ -73,7 +78,7 @@
</text> </text>
</view> </view>
</view> </view>
<text class="addParticipants" a:else onTap="addParticipants">添加参会人</text> <text class="addParticipants" a:else data-nextPage="participantsDetail" onTap="addParticipants">添加参会人</text>
</view> </view>
</view> </view>
<!-- 提醒 --> <!-- 提醒 -->
......
pages/createOrEditSchedule/createOrEditSchedule.js
import create from 'dd-store' import create from 'dd-store'
import exampleStore from '/stores/exampleStore' import exampleStore from '/stores/exampleStore'
create.Page({ create.Page({
store: exampleStore, store: exampleStore,
useAll: true, useAll: true,
data: { data: {
timeStaus: '', timeStaus: '',
isShowModal: false, isShowModal: false,
...@@ -13,7 +13,9 @@ useAll: true, ...@@ -13,7 +13,9 @@ useAll: true,
propsTime: '' propsTime: ''
}, },
onLoad() { onLoad() {
console.log(this.store.data.participants) this.store.data.participants = []
this.store.data.place = ''
this.update()
dd.setNavigationBar({ dd.setNavigationBar({
title: '创建会议' title: '创建会议'
}) })
...@@ -112,11 +114,11 @@ useAll: true, ...@@ -112,11 +114,11 @@ useAll: true,
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.participants.push(item)
}) })
_that.store.data.participants = _that.setArrary(_that.store.data.participants) _that.store.data.participants = _that.setArrary(_that.store.data.participants)
_that.update() _that.update()
}, },
fail: function (err) { fail: function (err) {
} }
...@@ -124,15 +126,27 @@ useAll: true, ...@@ -124,15 +126,27 @@ useAll: true,
}, },
// 跳转下一页 // 跳转下一页
nextPage(event) { nextPage(event) {
dd.navigateTo({url:'./../participantsDetail/participantsDetail'}) switch (event.target.dataset.nextPage) {
case 'participantsDetail':
dd.navigateTo({ url: './../participantsDetail/participantsDetail' })
break;
case 'place':
dd.navigateTo({ url: './../place/place' })
break;
}
}, },
// 数组去重 // 数组去重
setArrary(arr, userId) { setArrary(arr, userId) {
console.log(arr)
let containt = {} let containt = {}
for (let x of arr) { for (let x of arr) {
containt['id' + x.userId] = x containt['id' + x.userId] = x
} }
return Object.values(containt) return Object.values(containt)
}, },
// 清除地点
closePlace () {
this.store.data.place=""
this.update()
}
}); });
pages/index/index.acss
@import "../../font/iconfont.acss";
page {
background: #fff;
font-family: PingFangSC-Regular;
font-size: 42rpx;
color: #191F25;
}
.scheduleList {
margin-bottom: 48rpx;
}
.month {
font-family: PingFangSC-Medium;
padding: 0 32rpx;
height: 48rpx;
line-height: 48rpx;
margin-bottom: 50rpx;
}
.manyWeeks {
font-size: 26rpx;
color: rgba(25, 31, 37, 0.56);
height: 37rpx;
padding-left: 146rpx;
line-height: 37rpx;
margin: 48rpx 0;
}
.date {
display: flex;
padding: 0 32rpx;
margin-bottom: 48rpx;
}
.dateTime {
margin-right: 34rpx;
}
.dateTime>view {
font-size: 24rpx;
line-height: 24rpx;
color: #191F25;
/* margin-bottom: 8rpx; */
}
.dateTime>text {
margin-left: 3rpx;
font-family: DINAlternate-Bold;
font-size: 42rpx;
color: #191F25;
line-height: 42rpx;
}
.dataSchedule>view {
width: 604rpx;
border-radius: 8rpx;
font-size: 26rpx;
color: #0080FF;
height: 90rpx;
overflow: hidden;
background: #CFECFF;
margin-bottom: 16rpx;
}
.dataSchedule .overdue {
background: #F6F6F6;
color: rgba(25, 31, 37, 0.56);
}
.dataSchedule .cancel {
width: 602rpx;
overflow: hidden;
background: url(../../assests/cancel.png) center /100% 100%;
border: 1rpx solid rgba(25, 31, 37, 0.28);
color: rgba(25, 31, 37, 0.56);
}
.dataSchedule>view>view {
margin-left: 32rpx;
}
.dataScheduleName {
margin-top: 16rpx;
margin-bottom: 8rpx;
}
.dataSchedule>view:last-child {
margin-bottom: 0;
}
.dataScheduleTime {
font-size: 22rpx;
}
.createSchedule {
vertical-align: top;
font-size: 80rpx;
width: 98rpx;
height: 98rpx;
border-radius: 50%;
position: fixed;
right: 32rpx;
bottom: 98rpx;
color: white;
text-align: center;
line-height: 98rpx;
background: #3296FA;
box-shadow: 0 8px 14px 0 rgba(50, 150, 250, 0.30);
}
\ No newline at end of file
pages/index/index.axml
<view> <view>
Create edit schedule <view class="scheduleList">
<view class="month">
2019年12月
</view> </view>
<view class="week">
<view class="manyWeeks">
第49周，12月1日 - 7日
</view>
</view>
<view class="week">
<view class="manyWeeks">
第49周，12月1日 - 7日
</view>
</view>
<view class="week">
<view class="manyWeeks">
第49周，12月1日 - 7日
</view>
</view>
<view class="week">
<view class="manyWeeks">
第49周，12月1日 - 7日
</view>
</view>
</view>
<view class="scheduleList">
<view class="month">
1月
</view>
<view class="week">
<view class="manyWeeks">
第1周，1月1日 - 7日
</view>
<view class="date">
<view class="dateTime">
<view>
周三
</view>
<text>00</text>
</view>
<view class="dataSchedule">
<view class="overdue">
<view class="dataScheduleName">
过期的会议
</view>
<view class="dataScheduleTime">
10:00-10:30
</view>
</view>
<view class="overdue">
<view class="dataScheduleName">
过期的会议
</view>
<view class="dataScheduleTime">
10:00-10:30
</view>
</view>
</view>
</view>
<view class="date">
<view class="dateTime">
<view>
周四
</view>
<text>01</text>
</view>
<view class="dataSchedule">
<view>
<view class="dataScheduleName">
正常的会议
</view>
<view class="dataScheduleTime">
10:00-10:30
</view>
</view>
<view>
<view class="dataScheduleName">
公司技术讨论会
</view>
<view class="dataScheduleTime">
10:00-10:30
</view>
</view>
</view>
</view>
</view>
<view class="week">
<view class="manyWeeks">
第2周，1月1日 - 14日
</view>
<view class="date">
<view class="dateTime">
<view>
周四
</view>
<text>14</text>
</view>
<view class="dataSchedule">
<view class="cancel">
<view class="dataScheduleName">
取消的会议
</view>
<view class="dataScheduleTime">
10:00-10:30
</view>
</view>
</view>
</view>
</view>
<view class="week">
<view class="manyWeeks">
第3周，12月1日 - 7日
</view>
</view>
<view class="week">
<view class="manyWeeks">
第4周，12月1日 - 7日
</view>
</view>
</view>
<view class="createSchedule " onTap="nextPage">
+
</view>
</view>
\ No newline at end of file
pages/index/index.js
Page({ Page({
onLoad(query) { onLoad(query) {
// 页面加载 // 页面加载
dd.setNavigationBar({
title: '首页'
})
}, },
onReady() { onReady() {
// 页面加载完成 // 页面加载完成
...@@ -31,4 +34,8 @@ Page({ ...@@ -31,4 +34,8 @@ Page({
path: 'pages/index/index', path: 'pages/index/index',
}; };
}, },
nextPage() {
dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
}
}); });
pages/place/place.acss 0 → 100644
@import "../../font/iconfont.acss";
page {
background: #f6f6f6;
font-family: PingFangSC-Regular;
font-size: 34rpx;
color: #191F25;
}
.icon {
text-align: left;
font-size: 40rpx;
color: rgba(25, 31, 37, 0.40);
vertical-align: center;
margin-right: 24rpx;
}
.search {
background: white;
display: flex;
padding: 38rpx 32rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.search input {
font-size: 40rpx;
width: 100%;
padding-left: 0;
height: 40rpx;
line-height: 40rpx;
}
.availableList {
background: #fff;
margin-top: 16rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
border-top: 1rpx solid rgba(25, 31, 37, 0.12);
}
.title {
height: 90rpx;
line-height: 90rpx;
padding: 0 32rpx;
opacity: 0.75;
font-size: 28rpx;
color: #191F25;
}
.iconhuiyishi {
line-height: 112rpx;
}
.mettingRoom {
height: 112rpx;
display: flex;
padding-left: 32rpx;
}
.mettingRoomRight {
width: 100%;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12)
}
.name {
margin-top: 20rpx;
font-size: 34rpx;
color: #191F25;
line-height: 34rpx;
}
.numIcon {
font-size: 30rpx;
margin-right: 9rpx;
}
.mettingRoomDetail {
display: flex;
}
.num text {
font-size: 24rpx;
color: #7D8082;
line-height: 24rpx;
}
.equipment {
margin-left: 16rpx;
}
.equipment text {
font-size: 24rpx;
line-height: 26rpx;
color: #7D8082;
margin-right: 4rpx;
}
.allMettingRoom {
font-size: 34rpx;
color: #3296FA;
height: 112rpx;
line-height: 112rpx;
text-align: center;
background: white;
}
.mettingRoom:last-child .mettingRoomRight {
border: none
}
.customLocation {
margin-top: 13rpx;
background: white;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
padding: 25rpx 32rpx;
}
.customName {
height: 48rpx;
line-height: 48rpx;
color: #3296FA;
}
.tip {
height: 33rpx;
line-height: 33rpx;
font-size: 24rpx;
color: rgba(25, 31, 37, 0.28);
}
\ No newline at end of file
pages/place/place.axml 0 → 100644
<view class="place">
<view class="search">
<view class="icon iconfont iconsousuo">
</view>
<input placeholder="搜索地点" />
</view>
<view class="availableList" a:if="{{true}}">
<view class="title">
可用会议室
</view>
<view class="mettingRoom" data-place="未来Park1" onTap="selectPlace">
<view class="icon iconfont iconhuiyishi">
</view>
<view class="mettingRoomRight">
<view class="name">
未来Park-5F-510
</view>
<view class="mettingRoomDetail">
<view class="num">
<text class="numIcon iconfont iconbeifangren"></text>
<text>10</text>
</view>
<view class="equipment">
<text>投影</text>
<text>粉笔</text>
<text>黑板</text>
</view>
</view>
</view>
</view>
<view class="mettingRoom" data-place="未来Park2" onTap="selectPlace">
<view class="icon iconfont iconhuiyishi">
</view>
<view class="mettingRoomRight">
<view class="name">
未来Park-5F-510
</view>
<view class="mettingRoomDetail">
<view class="num">
<text class="numIcon iconfont iconbeifangren"></text>
<text>10</text>
</view>
<view class="equipment">
<text>投影</text>
<text>粉笔</text>
<text>黑板</text>
</view>
</view>
</view>
</view>
<view class="mettingRoom" data-place="未来Park3" onTap="selectPlace">
<view class="icon iconfont iconhuiyishi">
</view>
<view class="mettingRoomRight">
<view class="name">
未来Park-5F-510
</view>
<view class="mettingRoomDetail">
<view class="num">
<text class="numIcon iconfont iconbeifangren"></text>
<text>10</text>
</view>
<view class="equipment">
<text>投影</text>
<text>粉笔</text>
<text>黑板</text>
</view>
</view>
</view>
</view>
</view>
<view class="customLocation" a:else>
<view class="customName">
西城广场星巴克2F
</view>
<view class="tip">
自定义位置
</view>
</view>
<view class="allMettingRoom" a:if="{{true}}" >
查看所有会议室
</view>
</view>
</view>
\ No newline at end of file
pages/place/place.js 0 → 100644
import create from 'dd-store'
import exampleStore from '/stores/exampleStore'
create.Page({
store: exampleStore,
useAll: true,
data: {},
onLoad() {
dd.setNavigationBar({
title: '会议地点'
})
},
selectPlace(event) {
this.store.data.place = event.target.dataset.place
this.update()
dd.navigateBack({
delta: 1
})
}
});
pages/place/place.json 0 → 100644
{}
\ No newline at end of file
stores/exampleStore.js
class Store { class Store {
data = { data = {
participants: [] participants: [],
place: ''
} }
} }
......
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