From 03a94c601bf8d7b10a92436870d48547e5a20807 Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Mon, 28 Mar 2022 15:41:51 +0800
Subject: [PATCH] 商品详情点击促销中的专享礼包跳转到专享礼包详情页

---
 pages/giftpack/giftpacklist/giftpacklist.js   |  97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 pages/giftpack/giftpacklist/giftpacklist.wxml | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------
 2 files changed, 183 insertions(+), 84 deletions(-)

diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index b37183c..848f1db 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -75,7 +75,7 @@ Page({
     })
   },
   init(){
-    let options = this.data?.params;
+    let options = this.data?.params; // this.data == null ? undefined:this.data.params
     var th = this;
     this.setData({
       getUserID: d.user_id,
@@ -85,6 +85,7 @@ Page({
       isBuy: options.isBuy,
       getGiftID: options.lbId,
       orderSn: options.orderSn,
+			flag: options.flag, // 如果从商品详情页的促销处点击专享礼包跳转到此页，则flag为1
     })
     if (options.lbId) th.data.lbId = options.lbId;
     //-- 获取分享人的ID --
@@ -103,11 +104,17 @@ Page({
       })
     }
     th.close();
-    if (this.data.isBuy == 0) {
-      this.GetMyGiftList();
-    } else {
-      this.GetBuyGiftList();
-    }
+    
+		
+		if(this.data.flag == 1) {
+			this.getZxlbDetails();
+		} else {
+			if (this.data.isBuy == 0) {
+			  this.GetMyGiftList();
+			} else if (this.data.isBuy == 1) {
+			  this.GetBuyGiftList();
+			};
+		};
   },
 
   onShow: function () {
@@ -329,6 +336,84 @@ Page({
     });
 
   },
+	
+	getZxlbDetails: function () {
+		
+	  var th = this;
+	  getApp().request.get('/api/weshop/marketing/giftbag/detail/getNew', {
+	    isShowLoading: true,
+	    data: {
+	      "storeId": a.stoid, //商家ID
+	      //"userId": d.user_id, //用户ID
+	      "giftBagId": th.data.lbId
+	    },
+	    success: function (res) {
+	      if (res.data.code == 0) {
+	        th.setData({
+	          giftImage: th.data.iurl + res.data.data.lbUrl,
+	          giftTitle: res.data.data.lbTitle,
+	          default_color: res.data.data.bgcolor
+	        })
+	        if (res.data.data.lbIntro == '') {
+	          th.setData({
+	            giftRemark: '暂无详情......'
+	          })
+	        } else {
+	          th.setData({
+	            giftRemark: res.data.data.lbIntro.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+	          })
+	        }
+	
+	        //---获取日期的时间戳---
+					let exchangeType = res.data.data.exchangeType;
+					let exchangeDay = res.data.data.exchangeDay;
+					let exchangeStartTime = res.data.data.exchangeStartTime;
+					let exchangeEndTime = res.data.data.exchangeEndTime;
+					// let t_endtime;
+
+					if(exchangeType == 2) {
+						if(exchangeStartTime == 0 || !exchangeStartTime) {
+							exchangeStartTime = ut.gettimestamp();
+						};
+						exchangeStartTime = ut.formatTime(exchangeStartTime, 0);
+						exchangeEndTime = ut.formatTime(exchangeEndTime, 0);
+					}
+	
+	
+	        th.setData({
+	          // giftDate: t_endtime,
+	          giftPosPrice: res.data.data.oldPrice,
+	          giftQty: res.data.data.lbNum,
+	          giftIntegral: res.data.data.exchangeIntegral,
+	          giftPrice: res.data.data.lbPrice,
+	          giftType: res.data.data.actType,
+	          actTitle: res.data.data.actTitle,
+	          wareCard: res.data.data.wareCard,
+	          lbId: res.data.data.lbId,
+						exchangeType: exchangeType,
+						exchangeDay: exchangeDay,
+						exchangeStartTime: exchangeStartTime,
+						exchangeEndTime: exchangeEndTime,
+	        })
+	        //判断是否有礼包
+	        for (var i = 0; i < res.data.data.wareCard.length; i++) {
+	          if (res.data.data.wareCard[i].lbType == 1) {
+	            th.setData({
+	              is_lb: 1
+	            })
+	            break;
+	          }
+	        }
+	      } else {
+	        getApp().my_warnning(res.data.msg, 0, th);
+	        return false;
+	      }
+	    }
+	  });
+	
+	},
+	
+	
   //显示核销码
   code_show: function (e) {
     var th = this;
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index f4d613e..dde5f6a 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -6,20 +6,28 @@
     <view class="top_title data-v-3a5b7e36">
       <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
     </view>
-    <view class="top_time data-v-3a5b7e36">
-      <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 class="top_time data-v-3a5b7e36" wx:if="{{!flag}}">
+		  <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_time data-v-3a5b7e36" wx:if="{{flag == 1}}">
+			<text class="data-v-3a5b7e36" wx:if="{{exchangeType == 1}}">
+			   {{"兑换时间：领取后"+exchangeDay+"天内兑换"}}
+			</text>
+			<text class="data-v-3a5b7e36" wx:elif="{{exchangeType == 2}}">
+			   {{"兑换时间："+exchangeStartTime+"至"+exchangeEndTime}}
+			</text>
     </view>
+		
     <view class="top_price data-v-3a5b7e36">
       <block wx:if="{{giftPrice>0}}">
         <text class="data-v-3a5b7e36">{{"￥"+giftPrice}}</text>
@@ -39,7 +47,8 @@
         <text class="data-v-3a5b7e36">{{"零售价:"+giftPosPrice+"元"}}</text>
       </view>
       <view class="top_foot_qty data-v-3a5b7e36">
-        <text class="data-v-3a5b7e36">{{"已售:"+giftQty+"件"}}</text>
+        <text class="data-v-3a5b7e36" wx:if="{{!flag}}">{{"已售:"+giftQty+"件"}}</text>
+				<text class="data-v-3a5b7e36" wx:elif="{{flag == 1 && giftQty > 0}}">{{"数量:"+giftQty+"件"}}</text>
       </view>
     </view>
   </view>
@@ -77,7 +86,7 @@
             <text class="data-v-3a5b7e36 ellipsis-1">
 			        {{"数量:"+item.num}}
 			      </text>
-            <block wx:if="{{isBuy==0}}">
+            <block wx:if="{{isBuy==0 && !flag}}">
               <text style="margin-left:10rpx" wx:if="{{item.useState}}">
               已核销
             </text>
@@ -86,7 +95,7 @@
             </text>
             </block>
           </view>
-          <view class="box_ware_code data-v-3a5b7e36">
+          <view class="box_ware_code data-v-3a5b7e36" wx:if="{{!flag}}">
             <!-- <block wx:if="{{c_state==0}}"> -->
               <block wx:if="{{isBuy==0&item.lbType==1}}">
                 <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" data-codeId="{{item.Id}}" class="data-v-3a5b7e36"></image>
@@ -121,68 +130,73 @@
       <rich-text nodes="{{giftRemark}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
     </view>
   </view>
-  <view class="foot_empty data-v-3a5b7e36"></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>
-          <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>
-
-        <block wx:if="{{giftPrice<=0 && giftIntegral<=0}}">
-          <view class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetFree" 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">
-      <block wx:if="{{is_lb!=1}}">
-        <view class="foot_button_buy data-v-3a5b7e36 overdue">
-          <text class="data-v-3a5b7e36">无核销商品</text>
-        </view>
-      </block>
-      <block wx:else>
-        <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
-          <text class="data-v-3a5b7e36">立即使用</text>
-        </view>
-        <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue" bindtap="getcode">
-          <text class="data-v-3a5b7e36">商品已核销</text>
-        </view>
-        <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue">
-          <text class="data-v-3a5b7e36">商品兑换时间已过</text>
-        </view>
-
-      </block>
-    </view>
-  </block>
+	
+	
+		<view class="foot_empty data-v-3a5b7e36"></view>
+		
+	<block wx:if="{{flag != 1}}">
+		<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>
+		        <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>
+		
+		      <block wx:if="{{giftPrice<=0 && giftIntegral<=0}}">
+		        <view class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetFree" 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">
+		    <block wx:if="{{is_lb!=1}}">
+		      <view class="foot_button_buy data-v-3a5b7e36 overdue">
+		        <text class="data-v-3a5b7e36">无核销商品</text>
+		      </view>
+		    </block>
+		    <block wx:else>
+		      <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
+		        <text class="data-v-3a5b7e36">立即使用</text>
+		      </view>
+		      <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue" bindtap="getcode">
+		        <text class="data-v-3a5b7e36">商品已核销</text>
+		      </view>
+		      <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue">
+		        <text class="data-v-3a5b7e36">商品兑换时间已过</text>
+		      </view>
+		    </block>
+		  </view>
+		</block>
+	</block>
+  
 </view>
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
--
libgit2 0.21.4