Commit 39b3bc13 by liang ce

同步代码

parent efb0d958
...@@ -24,7 +24,8 @@ export default function http (data) { ...@@ -24,7 +24,8 @@ 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.token = "157bad88-d68b-4d80-bec1-375f3756a398"
getApp().globalData.name = res.data.data.oapiUser.name getApp().globalData.name = res.data.data.oapiUser.name
getApp().globalData.userid = res.data.data.oapiUser.userid getApp().globalData.userid = res.data.data.oapiUser.userid
getApp().globalData.avatar = res.data.data.oapiUser.avatar getApp().globalData.avatar = res.data.data.oapiUser.avatar
......
...@@ -9,6 +9,9 @@ Page({ ...@@ -9,6 +9,9 @@ Page({
dd.setNavigationBar({ dd.setNavigationBar({
title: '首页' title: '首页'
}) })
},
onReady() {
let data = { let data = {
"startTime":"2020-01-01 00:00:00", "startTime":"2020-01-01 00:00:00",
"endTime":"2025-12-30 23:59:59" "endTime":"2025-12-30 23:59:59"
...@@ -27,9 +30,6 @@ Page({ ...@@ -27,9 +30,6 @@ Page({
}) })
}) })
}, },
onReady() {
// 页面加载完成
},
onShow() { onShow() {
// 页面显示 // 页面显示
}, },
...@@ -85,7 +85,7 @@ Page({ ...@@ -85,7 +85,7 @@ Page({
for(let j = 0;j<=count;j++) { for(let j = 0;j<=count;j++) {
let time = new Date(); let time = new Date();
time.setDate(time.getDate()+j) time.setDate(time.getDate()+j)
// let finalDate = day.setDate(day.getDate()+j)
console.log(`${time.getFullYear()}/${time.getMonth()+1}/${time.getDate()}`) console.log(`${time.getFullYear()}/${time.getMonth()+1}/${time.getDate()}`)
DateMap.get(`${time.getFullYear()}/${time.getMonth()+1}/${time.getDate()}`).scheduleList.push({ DateMap.get(`${time.getFullYear()}/${time.getMonth()+1}/${time.getDate()}`).scheduleList.push({
...this.data.AllScheduleList[y], ...this.data.AllScheduleList[y],
......
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