From 966a8768ef1f929178ad3d548257513e25698475 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 10 Jul 2020 10:51:55 +0800
Subject: [PATCH] 礼包活动未开始，和互动结束的bug优化

---
 pages/giftpack/giftpacklist/giftpacklist.js   |  5 ++---
 pages/giftpack/giftpacklist/giftpacklist.wxml | 56 +++++++++++++++++++++++++++++++++-----------------------
 pages/giftpack/giftpacklist/giftpacklist.wxss |  4 ++--
 3 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 05050b3..ff806b1 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -239,7 +239,7 @@ Page({
             }
           }
         } else {
-          getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
+          getApp().my_warnning(res.data.msg, 0, th);
           return false;
         }
       }
@@ -293,7 +293,7 @@ Page({
             isStart:isStart,
           })
         } else {
-          getApp().my_warnning("系统繁忙,请稍后再试", 0, _this2);
+          getApp().my_warnning(res.data.msg, 0, _this2);
           return false;
         }
       }
@@ -337,7 +337,6 @@ Page({
 
       },
       "put"
-
     )
 
   },
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index de8a720..92065b4 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -100,29 +100,39 @@
     </view>
   </view>
   <view class="foot_empty data-v-3a5b7e36"></view>
-  <block wx:if="{{isBuy==1}}">
-    <view class="foot_button data-v-3a5b7e36">
-      <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
-        <view class="foot_button_left data-v-3a5b7e36 {{isStart?'':'gray'}}" data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
-           <text class="data-v-3a5b7e36  ">立即购买</text>
-        </view>
-      </block>
-      <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
-        <view class="foot_button_right data-v-3a5b7e36 {{isStart?'':'gray'}}" bindtap="GetBuyIntegral" data-id="{{lbId}}">
-          <text class="data-v-3a5b7e36">立即兑换</text>
-        </view>
-      </block>
-      <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
-        <view class="foot_button_buy data-v-3a5b7e36 {{isStart?'':'gray'}}" data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
-          <text class="data-v-3a5b7e36">立即购买</text>
-        </view>
-      </block>
-      <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
-        <view class="foot_button_intalge data-v-3a5b7e36 {{isStart?'':'gray'}}" bindtap="GetBuyIntegral" data-id="{{lbId}}">
-          <text class="data-v-3a5b7e36">立即兑换</text>
-        </view>
-      </block>
-    </view>
+  <block wx:if="{{isBuy==1 && giftTitle}}">
+    <block wx:if="{{isStart==1}}">
+      <view class="foot_button data-v-3a5b7e36">
+        <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
+          <view class="foot_button_left data-v-3a5b7e36 " data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
+            <text class="data-v-3a5b7e36  ">立即购买</text>
+          </view>
+        </block>
+        <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
+          <view class="foot_button_right data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
+            <text class="data-v-3a5b7e36">立即兑换</text>
+          </view>
+        </block>
+        <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
+          <view class="foot_button_buy data-v-3a5b7e36 " data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
+            <text class="data-v-3a5b7e36">立即购买</text>
+          </view>
+        </block>
+        <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
+           <view class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
+              <text class="data-v-3a5b7e36">立即兑换</text>
+           </view>
+        </block>
+      </view>
+    </block>
+    <block wx:else>
+      <view class="foot_button data-v-3a5b7e36">
+      <view class="foot_button_intalge data-v-3a5b7e36 gray ">
+          <text class="data-v-3a5b7e36">活动还未开始</text>
+      </view>
+      </view>
+    </block>
+
   </block>
   <block wx:if="{{isBuy==0}}">
     <view class="foot_button data-v-3a5b7e36">
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxss b/pages/giftpack/giftpacklist/giftpacklist.wxss
index 26e7cbb..958233b 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxss
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxss
@@ -245,5 +245,5 @@ page.data-v-3a5b7e36 {
   background-color: rgb(153,153,153);
 }
 
-.foot_button_left.data-v-3a5b7e36.gray{ background-color: #aaa; }
-.foot_button_right.data-v-3a5b7e36.gray{ background-color: #aaa;}
+.foot_button_intalge.data-v-3a5b7e36.gray{ background-color: #aaa; }
+
--
libgit2 0.21.4