Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents c843841a bb810211
Showing 3 changed files with 10 additions and 2 deletions
pages/index/index/index.js
pages/index/index/index.wxml
pages/index/index/index.wxss
@@ -97,6 +97,7 @@ Page({
     nav_type: 1,  //导航类型
     searchbox_transparent: 1, //搜索框背景是否透明
     is_show_top:0, //是否置顶显示
+    right_floating_length:0, //右边悬浮窗的个数，用于当抢红包和右边悬浮同时存在时，红包定位用
     // nav_but_color: '#32ACF9', //导航按钮颜色
     // sele_pickup: null, //默认门店
     // nav_bg_color:'#e823e8', //导航按钮颜色
@@ -690,6 +691,7 @@ Page({
             }
           })
         }
+        let right_floating_length = 0
         if (floatw && floatw.content) {
           let fi = right_arr.findIndex(ite=>ite.ename=='floatingWindow')
           let datas={}
@@ -706,6 +708,10 @@ Page({
           if (floatw.content.loaction_index==1) {
             right_arr.splice(fi,1,floatw)
             // right_arr.unshift(floatw)
+            if (floatw.content.data && floatw.content.data.length>0) {           
+              right_floating_length+=floatw.content.data.length
+              right_floating_length--; //减去一个
+            }
           }else{
             left_arr.unshift(floatw)
             right_arr.splice(fi,1)
@@ -720,6 +726,7 @@ Page({
           t_arr.push(obj)
         }
         if (right_arr.length>0) {
+          right_floating_length+= right_arr.length
           let obj={
             ename:'floatingBox',
             content:right_arr,
@@ -730,6 +737,7 @@ Page({
         th.setData({
+          right_floating_length,
           nav_but_color,
           is_full_screen_navigation,
           is_full_screen_navigation_index,
@@ -669,6 +669,6 @@
 <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" />
+    <image src="{{url + 'miniapp/images/redmoney/hongbao_sm.gif'}}" style="bottom:{{right_floating_length ? (right_floating_length*100 + 220 ) : 500}}rpx;" class="hongbao_sm-img" bindtap="nav_goto" data-url="/packageA/pages/hongBao/hongBao" />
   </view>
 </block>
 \ No newline at end of file
@@ -1070,7 +1070,7 @@ page {
 	width: 124rpx;
 	height: 170rpx;
 	position: fixed;
-	top:300rpx;
+	/* top: 50%; */
 	right: 0;
 	/* transform: translateY(-50%); */
 	z-index: 10000;