Commit 50f675963e88fa8d63a04b0cb53c7162102d902d
Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa
Showing
3 changed files
with
10 additions
and
2 deletions
pages/index/index/index.js
| ... | ... | @@ -97,6 +97,7 @@ Page({ |
| 97 | 97 | nav_type: 1, //导航类型 |
| 98 | 98 | searchbox_transparent: 1, //搜索框背景是否透明 |
| 99 | 99 | is_show_top:0, //是否置顶显示 |
| 100 | + right_floating_length:0, //右边悬浮窗的个数，用于当抢红包和右边悬浮同时存在时，红包定位用 | |
| 100 | 101 | // nav_but_color: '#32ACF9', //导航按钮颜色 |
| 101 | 102 | // sele_pickup: null, //默认门店 |
| 102 | 103 | // nav_bg_color:'#e823e8', //导航按钮颜色 |
| ... | ... | @@ -690,6 +691,7 @@ Page({ |
| 690 | 691 | } |
| 691 | 692 | }) |
| 692 | 693 | } |
| 694 | + let right_floating_length = 0 | |
| 693 | 695 | if (floatw && floatw.content) { |
| 694 | 696 | let fi = right_arr.findIndex(ite=>ite.ename=='floatingWindow') |
| 695 | 697 | let datas={} |
| ... | ... | @@ -706,6 +708,10 @@ Page({ |
| 706 | 708 | if (floatw.content.loaction_index==1) { |
| 707 | 709 | right_arr.splice(fi,1,floatw) |
| 708 | 710 | // right_arr.unshift(floatw) |
| 711 | + if (floatw.content.data && floatw.content.data.length>0) { | |
| 712 | + right_floating_length+=floatw.content.data.length | |
| 713 | + right_floating_length--; //减去一个 | |
| 714 | + } | |
| 709 | 715 | }else{ |
| 710 | 716 | left_arr.unshift(floatw) |
| 711 | 717 | right_arr.splice(fi,1) |
| ... | ... | @@ -720,6 +726,7 @@ Page({ |
| 720 | 726 | t_arr.push(obj) |
| 721 | 727 | } |
| 722 | 728 | if (right_arr.length>0) { |
| 729 | + right_floating_length+= right_arr.length | |
| 723 | 730 | let obj={ |
| 724 | 731 | ename:'floatingBox', |
| 725 | 732 | content:right_arr, |
| ... | ... | @@ -730,6 +737,7 @@ Page({ |
| 730 | 737 | |
| 731 | 738 | |
| 732 | 739 | th.setData({ |
| 740 | + right_floating_length, | |
| 733 | 741 | nav_but_color, |
| 734 | 742 | is_full_screen_navigation, |
| 735 | 743 | is_full_screen_navigation_index, | ... | ... |
pages/index/index/index.wxml
| ... | ... | @@ -669,6 +669,6 @@ |
| 669 | 669 | |
| 670 | 670 | <block wx:if="{{showHongbaoSmall}}"> |
| 671 | 671 | <view> |
| 672 | - <image src="{{url + 'miniapp/images/redmoney/hongbao_sm.gif'}}" class="hongbao_sm-img" bindtap="nav_goto" data-url="/packageA/pages/hongBao/hongBao" /> | |
| 672 | + <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" /> | |
| 673 | 673 | </view> |
| 674 | 674 | </block> |
| 675 | 675 | \ No newline at end of file | ... | ... |
pages/index/index/index.wxss