Merge branch 'master' of gitlab2.dui88.com:wanghongyuan/hello_taobao

dist/components/comgong_xi_huo_jiang/comgong_xi_huo_jiang.acss

@@ -5,6 +5,7 @@
   left: 34rpx;
   top: 357rpx;
   position: absolute;
+  z-index: 999;
 }
 .gong_xi_huo_jiang .cha_cha000 {
   width: 72rpx;

dist/components/comgou_mai_ji_lu32/comgou_mai_ji_lu32.acss

@@ -5,6 +5,7 @@
   left: 34rpx;
   top: 357rpx;
   position: absolute;
+  z-index: 999;
 }
 .gou_mai_ji_lu32 .cha_cha102 {
   width: 72rpx;

dist/components/comhui_yuan/comhui_yuan.acss

@@ -5,6 +5,7 @@
   left: 40rpx;
   top: 482rpx;
   position: absolute;
+  z-index: 999;
 }
 .hui_yuan .cha_cha4582 {
   width: 72rpx;

dist/components/comyou_xi_gui_ze27/comyou_xi_gui_ze27.acss

@@ -5,6 +5,7 @@
   left: 34rpx;
   top: 357rpx;
   position: absolute;
+  z-index: 999;
 }
 .you_xi_gui_ze27 .cha_cha123 {
   width: 72rpx;

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.acss

@@ -16,7 +16,7 @@
   position: fixed;
   width: 100%;
   height: 100%;
-  z-index: 999;
+  z-index: 99;
   background-color: #000;
   opacity: 0.7;
 }

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.axml

 <view class="huo_dong_ye" style="top:{{screentop}}">
-  <!-- <view class="{{maskVisible ? 'mask' : ''}}"></view> -->
+  <view class="{{maskVisible ? 'mask' : ''}}"></view>
   <image class="di_kao_bei2"  src={{resList['66f2b76f-7265-4cb2-9b4d-7e8207ab1d74'].url}} />
   <image class="logo" src={{resList['dd7d3a3b-6fcb-427d-8353-da169708bbab'].url}} />
   <image onTap="onPrizeBtnClick"  class="jiang_pinicon" src={{resList['b7517eae-3bc2-4456-935a-e6e3e1fe995e'].url}} />

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.js

@@ -86,12 +86,14 @@ Page({
   },
   showRuleModal() {
     this.setData({
-      ruleModalVisible: true
+      ruleModalVisible: true,
+      maskVisible:true
     })
   },
   ruleModalClose() {
     this.setData({
-      ruleModalVisible: false
+      ruleModalVisible: false,
+      maskVisible:false
     })
   },
 

dist/pages/pagejie_shu_ye/pagejie_shu_ye.acss

@@ -9,7 +9,7 @@
   position: fixed;
   width: 100%;
   height: 100%;
-  z-index: 999;
+  z-index: 99;
   background-color: #000;
   opacity: 0.7;
 }

dist/pages/pagejie_shu_ye/pagejie_shu_ye.axml

@@ -44,8 +44,8 @@
       </view>
     </view>
   </view>
-</view>
 <prize-modal a:if="{{prizeVisible}}" onPrizeModalClose="onPrizeModalClose" myPrize="{{myPrize}}"></prize-modal>
 <noprize-modal a:if="{{noprizeVisible}}" openPrizeStatus="{{openPrizeStatus}}" onHandleNoPrizeClose="onHandleNoPrizeClose" myPrize="{{myPrize}}"></noprize-modal>
 <rule-modal a:if="{{ruleModalVisible}}" onModalClose="ruleModalClose">
-  <text>{{ruleData}}</text></rule-modal>
+  <text>{{ruleData}}</text></rule-modal>
\ No newline at end of file
+</view>
\ No newline at end of file

dist/pages/pageshou_ye/pageshou_ye.axml

 <view class="shou_ye">
+<view class="{{maskVisible ? 'mask' : ''}}"></view>
   <image class="di_kao_bei" src={{resList['66f2b76f-7265-4cb2-9b4d-7e8207ab1d74'].url}} />
   <image class="logo" src={{resList['dd7d3a3b-6fcb-427d-8353-da169708bbab'].url}} />
   <image class="tu" src={{resList['41567d28-d1c4-454f-8bb4-4bcb6a103be0'].url}} />

dist/pages/pageshou_ye/pageshou_ye.js

@@ -18,7 +18,8 @@ Page({
     ruleData: '',
     joinCount: '',
     endTime: '',
-    startTime: ''
+    startTime: '',
+    maskVisible:false
   },
 
   onLoad(query) {
@@ -66,7 +67,8 @@ Page({
   },
   showRuleModal() {
     this.setData({
-      ruleModalVisible: true
+      ruleModalVisible: true,
+      maskVisible:true
     })
   },
   onPrizeBtnClick() {
@@ -77,7 +79,8 @@ Page({
 
   ruleModalClose() {
     this.setData({
-      ruleModalVisible: false
+      ruleModalVisible: false,
+      maskVisible:false
     })
   },
   async init() {