From 3d2e3add87f4453faab0e07df0c2b2945f98dfe1 Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Fri, 5 Feb 2021 09:33:40 +0800
Subject: [PATCH] 首页抢红包显示问题修改

---
 pages/index/index/index.js   | 16 +++++++++++-----
 pages/index/index/index.wxml | 32 ++++++++++++++++++++------------
 pages/index/index/index.wxss |  4 +++-
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 57302ae..9cd9ee0 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -104,8 +104,9 @@ Page({
 	 	// console.log('909090909090----->', data.data.code);
 		let code = data.data.code;
 		if(code == 0) {
-				showHongbao: true,
+	
 			th.setData({
+				showHongbao: true,
 			});
 		} else if(code == -1) {
 			th.setData({
@@ -902,10 +903,15 @@ Page({
   
   //导航跳转
   nav_goto:function(e){
-  		  var url=e.currentTarget.dataset.url;
-  		  if(!url || url=='') return; 
-  		  if(url[0]!='/') url='/'+url;
-  		  getApp().goto(url);
+		var url=e.currentTarget.dataset.url;
+		if(!url || url=='') return; 
+		if(url[0]!='/') url='/'+url;
+		getApp().goto(url);
+		if(this.data.showHongbao) {
+			this.setData({
+				showHongbao: false,
+			});
+		}		
    },
    
    //----跳转到搭配购买----
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 089dbc1..15b276a 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -288,19 +288,7 @@
 
   </view>
 	
-	<!-- 抢红包 -->
-	<block wx:if="{{showHongbao}}">
-		<view class="hongbao-container" bindtap="nav_goto" data-url="/packageA/pages/hongBao/hongBao">
-			<view class="hongbao">
-				<image src="{{url + 'miniapp/images/redmoney/hongBao.png'}}" class="hongbao-img"></image>
-				<image src="{{url + 'miniapp/images/redmoney/xlose.png'}}" class="close" catchtap="closeHongbao"></image>
-			</view>
-		</view>
-	</block>
 	
-	<block wx:if="{{showHongbaoSmall}}">
-		<image src="{{url + 'miniapp/images/redmoney/hongbao_sm.gif'}}" class="hongbao_sm-img" bindtap="nav_goto" data-url="/packageA/pages/hongBao/hongBao"></image>
-	</block>
 
 </view>
 
@@ -392,6 +380,26 @@
   </view>
 </block>
 
+<!-- 抢红包 -->
+<block wx:if="{{showHongbao}}">
+	<view class="hongbao-container">
+		<view class="hongbao">
+			<image src="{{url + 'miniapp/images/redmoney/hongBao.png'}}" class="hongbao-img" bindtap="nav_goto" data-url="/packageA/pages/hongBao/hongBao"/>
+			<image src="{{url + 'miniapp/images/redmoney/xlose.png'}}" class="close" bindtap="closeHongbao"/>
+		</view>
+	</view>
+</block>
+
+
+	
+<block wx:if="{{showHongbaoSmall}}">
+	<view>
+		<image src="{{url + 'miniapp/images/redmoney/hongbao_sm.gif'}}" class="hongbao_sm-img" bindtap="nav_goto" data-url="/packageA/pages/hongBao/hongBao"/>
+	</view>
+</block>
+
+<!-- <hongbao id="hongbao" bind:closeHongbao="closeHongbao" wx:if="{{showHongbao}}" url="{{url}}"></hongbao> -->
+
 
 
 
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 85f4c60..3a0bfc4 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -932,8 +932,10 @@ page {
 	position: fixed;
 	width: 100%;
 	height: 100%;
+	top: 0;
+	left: 0;
 	background-color: rgba(0,0,0,.5);
-	z-index: 10001;
+	z-index: 999;
 }
 
 .hongbao {
--
libgit2 0.21.4