From ce9392ed8b7395e08c34b942a56832f7795509e3 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 31 Oct 2022 14:46:40 +0800
Subject: [PATCH] 判断图片组合要不要显示的优化

---
 components/diy_picMax/diy_picMax.js   | 24 +++++++++++++++++++++++-
 components/diy_picMax/diy_picMax.wxml |  2 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/components/diy_picMax/diy_picMax.js b/components/diy_picMax/diy_picMax.js
index fd3bb0e..0be7da0 100644
--- a/components/diy_picMax/diy_picMax.js
+++ b/components/diy_picMax/diy_picMax.js
@@ -1,3 +1,4 @@
+var  ut = require("../../utils/util.js");
 Component({
   properties: {
     object: {
@@ -10,7 +11,8 @@ Component({
     // 这里是一些组件内部数据
     someData: {},
     pic_height: 0,//图片组合的高度
-    is_yspan: 0,  //是否要严格按照比例来实现 
+    is_yspan: 0,  //是否要严格按照比例来实现
+    is_time_show:0
   },
   ready: function () {
     //-- console.log(this.data.object.data) --
@@ -25,6 +27,26 @@ Component({
 
     })
     this.setData({ pic_height: height, is_yspan: is_yspan })
+
+
+    var start_time=this.properties.object.start_time;
+    var end_time=this.properties.object.end_time;
+
+    if(start_time && end_time) {
+
+      var start_time = Date.parse(new Date(start_time.replace(/-/g, '/'))) / 1000;
+      var end_time = Date.parse(new Date(end_time.replace(/-/g, '/'))) / 1000;
+      var now = ut.gettimestamp();
+
+
+      if (start_time < now && end_time > now) {
+        this.setData({is_time_show: 1});
+      }
+    }else{
+      this.setData({is_time_show: 1});
+    }
+
+
   },
   methods: {
     //-- 智能跳转到页面 --
diff --git a/components/diy_picMax/diy_picMax.wxml b/components/diy_picMax/diy_picMax.wxml
index a6b21a2..77af1e4 100644
--- a/components/diy_picMax/diy_picMax.wxml
+++ b/components/diy_picMax/diy_picMax.wxml
@@ -1,4 +1,5 @@
 <!-- 图片组合 -->
+<block wx:if="{{is_time_show}}">
 <wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
 <!-- 如果有纵向合并的时候，要求要按照绝对布局来实现 -->
 <block wx:if="{{is_yspan}}">
@@ -49,4 +50,5 @@
 		</view>
 		<view class="picMax-clear"></view>
 	</view>
+</block>
 </block>
\ No newline at end of file
--
libgit2 0.21.4