Commit 38672136 by liang ce

首页重复日程替换bug修改

parent f4bf6607
...@@ -161,6 +161,7 @@ ...@@ -161,6 +161,7 @@
.month { .month {
padding: 0 32rpx; padding: 0 32rpx;
height: 48rpx; height: 48rpx;
font-size: 48rpx;
line-height: 48rpx; line-height: 48rpx;
margin-bottom: 50rpx; margin-bottom: 50rpx;
font-weight: bold; font-weight: bold;
......
...@@ -28,11 +28,6 @@ create.Component({ ...@@ -28,11 +28,6 @@ create.Component({
props: {}, props: {},
didMount() { didMount() {
this.getDate(); this.getDate();
let userMsg = {
headUrl: getApp().globalData.avatar || "",
userName: getApp().globalData.name
};
console.log(userMsg);
this.setData({ this.setData({
userMsg: { userMsg: {
headUrl: getApp().globalData.avatar || "", headUrl: getApp().globalData.avatar || "",
...@@ -130,15 +125,7 @@ create.Component({ ...@@ -130,15 +125,7 @@ create.Component({
this.data.response.templateList.map(item => { this.data.response.templateList.map(item => {
// TO DO 判断所获取的时间区间 // TO DO 判断所获取的时间区间
// 将会议的年,月,日拆分,时分拆分,生成rrules规则 // 将会议的年,月,日拆分,时分拆分,生成rrules规则
let initialTime = item.initialTime.split("-"); // let initialTime = item.initialTime.split("-");
// <<<<<<< HEAD
// let initialTimeDate = new Date(parseInt(initialTime[0]), parseInt(initialTime[1]) - 1, parseInt(initialTime[2]));
// initialTimeDate.setDate(initialTimeDate.getDate() - 1)
// console.log(initialTimeDate.toLocaleDateString())
// let initialTimeDateyear = initialTimeDate.getFullYear()
// let initialTimeDatemonth = initialTimeDate.getMonth() + 1 < 10 ? '0' + (initialTimeDate.getMonth() + 1) : initialTimeDate.getMonth() + 1
// let initialTimeDateday = initialTimeDate.getDate() < 10 ? '0' + initialTimeDate.getDate() : initialTimeDate.getDate()
// =======
let initialTimeDate = new Date( let initialTimeDate = new Date(
parseInt(initialTime[0]), parseInt(initialTime[0]),
parseInt(initialTime[1]) - 1, parseInt(initialTime[1]) - 1,
...@@ -231,11 +218,15 @@ create.Component({ ...@@ -231,11 +218,15 @@ create.Component({
} else if ( } else if (
item.scheduleTemplateId && item.scheduleTemplateId &&
scheduleMap.get( scheduleMap.get(
`${item.planDate.replace(/-/g, "/")}/${item.scheduleTemplateId}` `${new Date(
item.planDate.replace(/-/g, "/")
).toLocaleDateString()}/${item.scheduleTemplateId}`
) )
) { ) {
scheduleMap.set( scheduleMap.set(
`${item.planDate.replace(/-/g, "/")}/${item.scheduleTemplateId}`, `${new Date(
item.planDate.replace(/-/g, "/")
).toLocaleDateString()}/${item.scheduleTemplateId}`,
item item
); );
} }
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
.iconicon_days { .iconicon_days {
position: absolute; position: absolute;
left: 5rpx; left: 5rpx;
top: 5rpx; top: 6rpx;
font-size: 30rpx; font-size: 30rpx;
} }
......
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