From 72e075d3a9ea8fccba4e8402a0cc0f6837cf5965 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 15 Sep 2021 10:04:15 +0800
Subject: [PATCH] 1。    我的礼包的优化显示内容  未开始的优化 2。   组合购的因房间号的bug的优化

---
 packageA/pages/myGift/myGift.js                 | 14 ++++++++++----
 packageA/pages/myGiftDetails/myGiftDetails.wxml |  4 ++--
 packageB/pages/zuhegou/index/index.js           |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js
index 4fc4253..3ff812b 100644
--- a/packageA/pages/myGift/myGift.js
+++ b/packageA/pages/myGift/myGift.js
@@ -35,6 +35,7 @@ Page({
 		
 		if(index == 0) {
 			url = '/api/weshop/libao/libaoForm/page';
+            data.timetype=1;
 		} else if(index == 1) {
 			url = '/api/weshop/libao/libaoFormvip/page';
 		};
@@ -88,6 +89,7 @@ Page({
 
 				if(index == 0) {
 					url = '/api/weshop/libao/libaoForm/page';
+					data.timetype=1;
 				} else if(index == 1) {
 					url = '/api/weshop/libao/libaoFormvip/page';
 				};
@@ -125,17 +127,21 @@ Page({
 
       var url="";
       var index=this.data.currentIndex;
+
+      var req_data={
+          store_id: app.globalData.setting.stoid,
+          user_id: app.globalData.user_id,
+      }
+
       if(index == 0) {
           url = '/api/weshop/libao/libaoForm/page';
+          req_data.timetype=1;
       } else if(index == 1) {
           url = '/api/weshop/libao/libaoFormvip/page';
       };
 
 
-		this.scrollToLower(url, {
-			store_id: app.globalData.setting.stoid,
-			user_id: app.globalData.user_id,
-		});
+		this.scrollToLower(url, req_data);
   },
 
   /**
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index d24e590..a85c217 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -86,9 +86,9 @@
 			<block wx:for="{{item.goods_num-0}}" wx:for-item="nitem" wx:for-index="idx">
 				<view class="lb_quan" style="background-image: url({{imghost}}/miniapp/images/yhq_{{index%2+1}}.png)">
 					 <view class="flex fs28 fir_view">
-						 <view>满{{item.condition}}使用</view>
+						 <view>满{{item.condition?item.condition:'0.00'}}使用</view>
 						 <view wx:if="{{item.type==6}}" class="fs8" style="text-align: center; padding-right: 40rpx; font-size: 35rpx">包邮</view>
-						 <view wx:else class="fs8" style="text-align: right">￥{{item.money}}</view>
+						 <view wx:else class="fs8" style="text-align: center; width: 140rpx">￥{{filter.toFix(item.money,2)}}</view>
 					 </view>
 					
 				
diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index 1efaf5d..c0a7545 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -938,7 +938,7 @@ Page({
 
             //让商品带上房间号
             if (th.data.sys_switch.is_skuroom_id == 1) {
-                if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
+                if (th.data.sele_g.goods_id == getApp().globalData.room_goods_id) {
                     newd.room_id = getApp().globalData.room_id;
                 }
             } else {
--
libgit2 0.21.4