删除空格

api/http.js

@@ -24,11 +24,12 @@ export default function http (data) {
   } else {
     return new Promise((resolve, rejects) => {
       login().then(res => {
-        // getApp().globalData.token = res.data.data.accessToken.access_token //'3a025eee-15ae-4805-9214-fe0599d47f17' //
-        getApp().globalData.token = 'b1b2c5fd-1706-4c35-91ee-683b6397ad37' //'3a025eee-15ae-4805-9214-fe0599d47f17' //
+        getApp().globalData.token = res.data.data.accessToken.access_token //'3a025eee-15ae-4805-9214-fe0599d47f17' //
+        // getApp().globalData.token = 'b1b2c5fd-1706-4c35-91ee-683b6397ad37' //'3a025eee-15ae-4805-9214-fe0599d47f17' //
         // getApp().globalData.name = res.data.data.oapiUser.name
         // getApp().globalData.userid = res.data.data.oapiUser.userid
         // getApp().globalData.avatar = res.data.data.oapiUser.avatar
+        console.log(`${getApp().globalData.globalUrl}${data.url}`)
         dd.httpRequest({
           headers: {
             "Content-Type": "application/json",

api/request.js

@@ -148,7 +148,7 @@ export function getHomeUserSchedule (data) {
   return $http({
     method: 'post',
     data: JSON.stringify(data),
-    url: `/meet/schedule/getHomeUserSchedule `
+    url: `/meet/schedule/getHomeUserSchedule`
   })
 }
 
@@ -159,7 +159,7 @@ export function addSchedule (data) {
   return $http({
     method: 'post',
     data: JSON.stringify(data),
-    url: `/meet/schedule/addSchedule  `
+    url: `/meet/schedule/addSchedule`
   })
 }
 // 获取参会会人员的日程
@@ -167,6 +167,6 @@ export function getUserScheduleInTime (data) {
   return $http({
     method: 'post',
     data: JSON.stringify(data),
-    url: `/meet/schedule/getUserScheduleInTime `
+    url: `/meet/schedule/getUserScheduleInTime`
   })
 }
\ No newline at end of file

pages/index/index.js

 import { getHomeUserSchedule } from '../../api/request.js'
 Page({
+  data: {
+    AllScheduleList: [],
+    scheduleList: []
+  },
   onLoad(query) {
     // 页面加载
     dd.setNavigationBar({
@@ -9,8 +13,18 @@ Page({
       "startTime":"2020-01-01 00:00:00",
       "endTime":"2025-12-30 23:59:59"
     }
+    let that = this
     getHomeUserSchedule(data).then(res => {
-      console.log(res)
+      that.setData({
+        AllScheduleList: res.data.data
+      },() => {
+        let now = new Date()
+        let year = now.getFullYear();
+        let scheduleList = this.returnScheduleList(year);
+        that.setData({
+          scheduleList: scheduleList
+        })
+      })
     })
   },
   onReady() {
@@ -19,6 +33,46 @@ Page({
   onShow() {
     // 页面显示
   },
+  returnScheduleList (year) {
+    let DateMap = new Map();
+    if (year % 4 == 0 && year % 100 != 0 || year % 400 ==0) {
+      for(let i = 1; i <= 366; i++) {
+        DateMap.set(`${new Date(year, 0, i).toLocaleDateString()}`, {
+          scheduleList:[]
+        })
+      }
+    } else {
+      for(let i = 1; i <= 365; i++) {
+        DateMap.set(`${new Date(year, 0, i).toLocaleDateString()}`, {
+          scheduleList:[]
+        })
+      }
+    }
+    for(let y=0;y<this.data.AllScheduleList.length;y++) {
+      let date1 = this.data.AllScheduleList[y].startTime.slice(0,10)
+      let date2 = this.data.AllScheduleList[y].endTime.slice(0,10)
+      let count = this.count(date1, date2)
+      if(count == 0) {
+        DateMap.get(`${new Date(this.data.AllScheduleList[y].startTime).toLocaleDateString()}`).scheduleList.push(this.data.AllScheduleList[y])
+      } else {
+        for(let j = 0;j<=count;j++) {
+          let time = new Date();
+          time.setDate(time.getDate()+j)
+          // let finalDate = day.setDate(day.getDate()+j)
+          console.log(`${time.getFullYear()}/${time.getMonth()+1}/${time.getDate()}`)
+          DateMap.get(`${time.getFullYear()}/${time.getMonth()+1}/${time.getDate()}`).scheduleList.push(this.data.AllScheduleList[y])
+        }
+      }
+    }
+    console.log(DateMap)
+    return DateMap
+  },
+  count(date1, date2){
+    var date1=new Date(date1);
+    var date2=new Date(date2);
+    var date=(date2.getTime()-date1.getTime())/(1000*60*60*24);/*不用考虑闰年否*/
+    return date
+  },
   onHide() {
     // 页面隐藏
   },