From f721da71f04ba68d91a33e41c82f97ee3a695663 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Wed, 4 Aug 2021 14:22:57 +0800
Subject: [PATCH] 大转盘活动展示修改

---
 packageB/pages/luckactivity/luckinfo/luckinfo.wxml | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
index de1cf7f..e49b1a8 100644
--- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
+++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
@@ -62,28 +62,24 @@
 		</view>
 	</view>
 	<!-- 活动展示 -->
-	<view wx:if="{{luckInfo.remark}}">
+	<view>
 		<view class="badge-container"><image src="{{imghost + 'miniapp/images/luckDraw/badge.png'}}" class="badge activity" lazy-load></image></view>
 		<view class="bg-white br12 pd20 fs28">
 			<!-- {{luckInfo.remark}} -->
 			<import src="../../../../utils/wxParse/wxParse.wxml"/>
-			<template is="wxParse" data="{{wxParseData:content.nodes}}"/>
+			<!-- <template is="wxParse" data="{{wxParseData:content.nodes}}"/> -->
 			<!-- 时间 -->
-			<!-- <view class="bdb">
-				<view class="">
+			<view class="bdb">
+				<!-- <view class=""> -->
 					<view class="txt-red">活动时间：</view>
-					<view class="fs28 pdv20">187606546456</view>
-				</view>
-				<view>
-					<view class="txt-red">兑换时间：</view>
-					<view class="fs28 pdv20">-</view>
-				</view>
-			</view> -->
+					<view class="fs28 pdv20">{{filter.format_time(luckInfo.begindate, 1) + ' 至 ' + filter.format_time(luckInfo.enddate, 1)}}</view>
+				<!-- </view> -->
+			</view>
 			<!-- 规则 -->
-			<!-- <view class="bdb">
-				<view class="txt-red pdt20">活动规则：</view>
-				<view class="fs28 pdv20">-</view>
-			</view> -->
+			<view class="bdb" wx:if="{{luckInfo.remark}}">
+				<view class="txt-red pdt20">活动说明：</view>
+				<view class="fs28 pdv20"><template is="wxParse" data="{{wxParseData:content.nodes}}"/></view>
+			</view>
 			<!-- 电话 -->
 			<!-- <view class="bdb">
 				<view class="txt-red pdt20">联系电话：</view>
--
libgit2 0.21.4