From 3210b7d4be3039d799867392ff56c8b9448c4abc Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Tue, 18 Apr 2023 11:09:45 +0800
Subject: [PATCH] 每月礼包优化

---
 packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js   | 13 +++++++++----
 packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
index 3835cdb..e7e0d9b 100644
--- a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
+++ b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
@@ -157,11 +157,16 @@ Page({
         if (this.data.flag == 1) {
             this.getZxlbDetails();
         } else {
-            if (this.data.isBuy == 0) {
-                this.GetMyGiftList();
-            } else if (this.data.isBuy == 1) {
-                this.GetBuyGiftList();
+            if(this.data.orderSn){
+              this.GetMyGiftList();
+            }else{
+              this.GetBuyGiftList();
             }
+            // if (this.data.isBuy == 0) {
+            //     this.GetMyGiftList();
+            // } else if (this.data.isBuy == 1) {
+            //     this.GetBuyGiftList();
+            // }
 
         }
 
diff --git a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
index c74ad30..3106cfb 100644
--- a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
+++ b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
@@ -150,7 +150,7 @@
 		<view class="foot_empty data-v-3a5b7e36"></view>
 		
 	<block wx:if="{{flag != 1}}">
-		<block wx:if="{{isBuy==1 && giftTitle}}">
+		<block wx:if="{{isBuy==0 && giftTitle}}">
 		  <block wx:if="{{isStart==1}}">
 		    <view class="foot_button data-v-3a5b7e36">
 		      <!-- <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
@@ -181,13 +181,13 @@
 		      </block>
 		    </view>
 		  </block>
-		  <block wx:else>
+		  <!-- <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>
 		<block wx:if="{{false && isBuy==0}}">
--
libgit2 0.21.4