Jelajahi Sumber

修改今日必学逻辑

zhangbiao 4 tahun lalu
induk
melakukan
284bb000ec

+ 0 - 3
src/views/home/index.vue

@@ -106,7 +106,6 @@ export default {
       this.$_http
         .get(this.$_API.JTXT_GET_USER_ADMIN_USERS)
         .then(res => {
-          console.log(res);
           this.$store.commit("updateUserItemStore", {
             field: "userInfo",
             value: res.data[0]
@@ -148,8 +147,6 @@ export default {
         .get(this.$pathParams(this.$_API.JTXT_GET_USER_FAVORITES, path))
         .then(res => {
           if (res.data.materials) {
-            console.log("--已收藏--");
-            console.log(res.data);
             this.$store.commit("updateFavoriteItemStore", {
               field: "materials",
               value: res.data.materials

+ 12 - 24
src/views/home/learn/page-learn-child.vue

@@ -1,11 +1,6 @@
 <template>
   <div class="contentBody" v-if="learnChildList.length > 0">
-    <van-tabs
-      :active="active"
-      type="line"
-      line-height="0px"
-      @click="childChange"
-    >
+    <van-tabs :active="active" type="line" line-height="0px" @click="childChange">
       <!-- 子目录 -->
       <van-tab
         v-for="(tabItem, tabIndex) in learnChildList"
@@ -13,12 +8,7 @@
         :title="tabItem.name"
         :title-style="titleStyle"
       >
-        <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
-        >
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
           <van-cell
             v-for="(contentItem, contentIndex) in contentList"
             :key="contentIndex"
@@ -27,23 +17,18 @@
             <div slot="default" class="contentItemDiv">
               <div class="contentItemTitleTitleRow">
                 <div class="contentItemTitle">{{ contentItem.name }}</div>
-                <div
-                  v-if="contentItem.isNeedStudyToday"
-                  class="contentItemstates"
-                >
-                  今日必学
-                </div>
+                <div v-if="contentItem.isNeedStudyToday" class="contentItemstates">今日必学</div>
               </div>
               <div class="contentItemDescription">
                 <div class="contentItemDescriptionTime">
                   {{
-                    formateDatesFun(contentItem.createdTime) ||
-                      contentItem.createdTime
+                  formateDatesFun(contentItem.createdTime) ||
+                  contentItem.createdTime
                   }}
                 </div>
                 <div class="contentItemDescriptionStudyNeedTime">
                   所需学习时间:{{
-                    getTimeHoursMinuteSecondsFun(contentItem.readTimeInSec)
+                  getTimeHoursMinuteSecondsFun(contentItem.readTimeInSec)
                   }}
                 </div>
               </div>
@@ -124,9 +109,12 @@ export default {
     },
     // 判断是否今日必学
     formatNeedStudyTodayFun(datas) {
-      let current = new Date();
-      let todayStr = current.toLocaleDateString().replace(/\//g, "");
-      console.log(todayStr);
+      let date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      month = month >= 10 ? "" + month : "0" + month;
+      let day = date.getDate();
+      let todayStr = year + month + day;
       datas.forEach(item => {
         item.tags.forEach(itemChild => {
           if (itemChild === todayStr) {

+ 17 - 30
src/views/home/learn/page-learn-recommend.vue

@@ -1,21 +1,10 @@
 <template>
   <div class="contentBody">
-    <van-list
-      v-model="loading"
-      :finished="finished"
-      finished-text="没有更多了"
-      @load="onLoad"
-    >
+    <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
       <template>
         <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
           <van-swipe-item v-for="(item, index) in swiperList" :key="index">
-            <van-image
-              width="100%"
-              height="100%"
-              fit="cover"
-              :src="item.url"
-              :show-error="true"
-            />
+            <van-image width="100%" height="100%" fit="cover" :src="item.url" :show-error="true" />
           </van-swipe-item>
         </van-swipe>
       </template>
@@ -27,20 +16,18 @@
         <div slot="default" class="contentItemDiv" v-if="contentItem">
           <div class="contentItemTitleTitleRow">
             <div class="contentItemTitle">{{ contentItem.name }}</div>
-            <div v-if="contentItem.isNeedStudyToday" class="contentItemstates">
-              今日必学
-            </div>
+            <div v-if="contentItem.isNeedStudyToday" class="contentItemstates">今日必学</div>
           </div>
           <div class="contentItemDescription">
             <div class="contentItemDescriptionTime">
               {{
-                formateDatesFun(contentItem.createdTime) ||
-                contentItem.createdTime
+              formateDatesFun(contentItem.createdTime) ||
+              contentItem.createdTime
               }}
             </div>
             <div class="contentItemDescriptionStudyNeedTime">
               所需学习时间:{{
-                getTimeHoursMinuteSecondsFun(contentItem.readTimeInSec)
+              getTimeHoursMinuteSecondsFun(contentItem.readTimeInSec)
               }}
             </div>
           </div>
@@ -68,23 +55,15 @@ export default {
   computed: {},
   created() {
     this.getNewsfeed();
-    this.checkTodabTag();
   },
   mounted() {},
   watch: {},
   methods: {
-    checkTodabTag(tags) {
-      let current = new Date();
-      let todayStr = current.toLocaleDateString().replace(/\//g, "");
-      console.log(todayStr);
-    },
     //   查询子目录
     getNewsfeed() {
       this.$_http
         .get(this.$_API.JTXT_GET_NEWSFEED)
         .then(res => {
-          console.log("--newsfeed-");
-          console.log(res);
           this.formatNeedStudyTodayFun(res.data);
           this.finished = true;
         })
@@ -94,10 +73,18 @@ export default {
     },
     // 判断是否今日必学
     formatNeedStudyTodayFun(datas) {
+      let date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      month = month >= 10 ? "" + month : "0" + month;
+      let day = date.getDate();
+      let todayStr = year + month + day;
       datas.forEach(item => {
-        if (item && item.tags.length > 0) {
-          item.isNeedStudyToday = true;
-        }
+        item.tags.forEach(itemChild => {
+          if (itemChild === todayStr) {
+            item.isNeedStudyToday = true;
+          }
+        });
       });
       this.contentList = datas;
     },