소스 검색

iso日期兼容

喻文俊 3 년 전
부모
커밋
e99024b3bb

+ 11 - 2
components/cm-module/activity/pageFloor.vue

@@ -6,7 +6,7 @@
                     <view class="tui-group-l">{{ page.title }}</view>
                     <view
                         class="tui-group-r"
-                        v-if="isSwiperTemp.indexOf(page.floorContent.templateType) === -1"
+                        v-if="showMore(page)"
                         @click="NavToDetailPage(page)"
                     >
                         <text>更多</text> <text class="iconfont icon-xiayibu"></text>
@@ -186,7 +186,7 @@ export default {
     data() {
         return {
             pageFloorList: [],
-            isSwiperTemp: ['1', '2', '9', '21', '5', '7', '22', '23', '24', '25', '27', '8']
+            isSwiperTemp: ['1', '2', '9', '21', '5', '7', '22', '23', '24', '25', '27']
         }
     },
     created() {
@@ -201,6 +201,15 @@ export default {
             this.$api.navigateTo(
                 `/pages/h5/activity/activity-floorMore?pageType=${this.pageType}&floorId=${page.id}&title=${page.title}`
             )
+        },
+        showMore(page){
+            // if(page.floorContent.templateType)
+            if(page.floorContent.templateType == 10){
+               if(page.floorImageList.length <= 1){
+                    return false
+               }
+            }
+            return !this.isSwiperTemp.includes(page.floorContent.templateType)
         }
     }
 }

+ 1 - 1
components/cm-module/liveTemplate/components/scroll-temp.vue

@@ -25,7 +25,7 @@ export default {
     computed: {
         checkDisplayDate() {
             const nowDate = new Date().getTime()
-            const displayDate = new Date(this.displayDate).getTime()
+            const displayDate = new Date(this.displayDate.replace(/-/g, '/')).getTime()
             const oneDay = 60 * 60 * 24 * 1000
             // 未开始
             if (nowDate < displayDate && nowDate > displayDate - oneDay) {

+ 1 - 1
components/cm-module/liveTemplate/components/swiper-temp1.vue

@@ -65,7 +65,7 @@ export default {
         },
         checkDisplayDate() {
             const nowDate = new Date().getTime()
-            const displayDate = new Date(this.displayDate).getTime()
+            const displayDate = new Date(this.displayDate.replace(/-/g, '/')).getTime()
             const oneDay = 60 * 60 * 24 * 1000
             // 未开始
             if (nowDate < displayDate) {

+ 1 - 1
components/cm-module/liveTemplate/components/swiper-temp2.vue

@@ -65,7 +65,7 @@ export default {
         },
         checkDisplayDate() {
             const nowDate = new Date().getTime()
-            const displayDate = new Date(this.displayDate).getTime()
+            const displayDate = new Date(this.displayDate.replace(/-/g, '/')).getTime()
             const oneDay = 60 * 60 * 24 * 1000
             // 未开始
             if (nowDate < displayDate) {