From 1dd40f0cef2cd13e70b8f05139c7fa254af84e2c Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 10 Jul 2020 11:29:50 +0800
Subject: [PATCH] 1.  活动开始时候，文字标题的蟹盖 2.  把模板预览改成 模板的标题

---
 pages/giftpack/giftpacklist/giftpacklist.js   |  1 +
 pages/giftpack/giftpacklist/giftpacklist.wxml | 14 ++++++++++++--
 pages/template/index.js                       |  9 ++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index ff806b1..1e0becd 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -283,6 +283,7 @@ Page({
 
           _this2.setData({
             giftDate: res.data.data.endTime,
+            giftStart: res.data.data.starTime,
             giftPosPrice: res.data.data.giftPosPrice,
             giftQty: res.data.data.giftQty,
             giftIntegral: res.data.data.payIntegral,
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 92065b4..70208c2 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -7,8 +7,18 @@
       <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
     </view>
     <view class="top_time data-v-3a5b7e36">
-      <text class="data-v-3a5b7e36" wx:if="{{isBuy==0}}">{{"兑换截至时间："+giftDate}}</text>
-      <text class="data-v-3a5b7e36" wx:else>{{"活动结束至时间："+giftDate}}</text>
+      <block wx:if="{{isBuy==1 && giftTitle && isStart!=1}}" >
+         <text class="data-v-3a5b7e36">
+            {{"活动开始时间："+giftStart}}
+         </text>
+      </block>
+      <block wx:else>
+        <text class="data-v-3a5b7e36" wx:if="{{isBuy==0}}">{{"兑换结束时间："+giftDate}}</text>
+        <text class="data-v-3a5b7e36" wx:else>
+            {{"活动结束时间："+giftDate}}
+        </text>
+      </block>
+
     </view>
     <view class="top_price data-v-3a5b7e36">
       <block wx:if="{{giftPrice>0}}">
diff --git a/pages/template/index.js b/pages/template/index.js
index 28870d2..bfbc70d 100644
--- a/pages/template/index.js
+++ b/pages/template/index.js
@@ -45,6 +45,11 @@ Page({
       var data = res.data.data;
       if (data) {
         var temp_data = data;
+
+        wx.setNavigationBarTitle({
+          title: temp_data.page_title,
+        });
+
         var t_arr = JSON.parse(temp_data.json_str);
         th.setData({
           template_arr: t_arr,
@@ -63,9 +68,7 @@ Page({
       }
     })
 	
-    wx.setNavigationBarTitle({
-        title: '模板预览',
-    });
+
  
   },
 
--
libgit2 0.21.4