提交

src/api/index.js

@@ -314,4 +314,12 @@ export function jsonCalendarOne(data) {
   });
 }
 
+export function jsonCalendarTwo(data) {
+  return ajax({
+    urlType: "cxzx",
+    url: `/zhoubao/data/calendar-${data.date}.json?${data.time}`,
+    method: "GET",
+  });
+}
+
 export default {};

src/views/MenuDiet1.vue

@@ -4,7 +4,7 @@
     <br v-if="load" />
     <van-skeleton title v-if="load" :row="10" />
     <van-empty v-if="!list.length && !load" description="今日休息" />
-    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
+    <van-swipe class="my-swipe" :autoplay="10000" indicator-color="white">
       <van-swipe-item
         v-for="(v, index) in list"
         :key="index"

src/views/report/Calendar/index.vue

@@ -76,7 +76,7 @@
 import watermark from "watermark-package";
 import DayJs from "dayjs";
 // import {} from "../utils/tool";
-import { jsonCalendarOne } from "../../../api/index";
+import { jsonCalendarOne, jsonCalendarTwo } from "../../../api/index";
 
 // import echarts from "../../../utils/echarts";
 
@@ -122,16 +122,21 @@ export default {
         const v = dataOne[i];
         // 判断第一天是周几，不是周一向前补到周一，最后一天不是周日补到周日
         const Month = JSON.parse(JSON.stringify(v.data || []));
-        v.Month = this.getMonth(v.data[0].dt);
+        v.Month = this.getMonth(Month[0].dt);
         for (let o = 0; o < Month.length; o++) {
           const item = Month[o];
-          const dt = new DayJs(item.dt);
-          Month[o].week = dt.format("ddd").toLocaleUpperCase();
+          console.log(item)
+          for (let p = 0; p < (item.list).length; p++) {
+            
+          const dt = new DayJs(Month[o][p].dt);
+          Month[o][p].week = dt.format("ddd").toLocaleUpperCase();
           Month[o].weekNum = dt.format("d") === 0 ? 7 : dt.format("d");
           Month[o].day = dt.format("D");
           if (o % 7 === 0) li.push([]);
           const li_index = li.length ? li.length - 1 : 0;
           li[li_index].push(Month[o]);
+            
+          }
         }
         if (Month[0].weekNum !== 1)
           li[0].unshift(...new Array(Month[0].weekNum - 1));
@@ -140,9 +145,15 @@ export default {
           li[li_out_index].push(...new Array(7 - Month[0].weekNum));
         v.data = li;
       }
-      console.log(dataOne);
       this.dataOne = dataOne;
     });
+
+    jsonCalendarTwo({
+      date: this.$route.params.date,
+      time: Date.now(),
+    }).then(r=>{
+        console.log(r)
+    })
   },
   computed: {},
   methods: {