11

dist/components/comgong_xi_huo_jiang/comgong_xi_huo_jiang.axml

@@ -6,6 +6,5 @@
   <label class="ke_yi_zai_wo_de_jiang_pin_ye_mian_cha_kan_jiang_pin">可以在「我的奖品」页面查看奖品</label>
   <image class="ju_xing88726" src={{resList['d9283186-3e0a-4875-bd28-e296e22d1139'].url}} />
   <image class="ju_xing88726" src={{myPrize.image}} />
-        
   <image class="an_niu_kao_bei3" onTap="gotoPrizePage" src={{resList['38aa87d7-c85e-497c-85a2-f5a980bc742f'].url}} />
-      </view>
+</view>
\ No newline at end of file

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.acss

 .huo_dong_ye {
-  width: 750rpx;
+  /* width: 750rpx;
   height: 1624rpx;
   opacity: 1;
+  position: absolute; */
+  /* overflow: hidden; */
+  width: 100vw;
+  height: 100vh;
+  left: 0;
+  /* top: 0; */
+  position: absolute;
+
+}
+
+.mask {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  z-index: 999;
+  background-color: #000;
+  opacity: 0.7;
+}
+
+.huo_dong_ye .logo {
+  width: 160rpx;
+  height: 58rpx;
+  opacity: 1;
+  left: 295rpx;
+  top: 222rpx;
   position: absolute;
 }
+
 .huo_dong_ye .di_kao_bei2 {
   width: 750rpx;
   height: 1624rpx;

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.axml

-<view class="huo_dong_ye">
+<view class="huo_dong_ye" style="top:{{screentop}}">
   <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}} />
   <image class="gui_zeicon" onTap="showRuleModal"  src={{resList['d826a2f1-a3ec-4764-aad2-f6cacc43cfce'].url}} />
 
@@ -32,7 +32,7 @@
         <!-- bianli -->
         <image style="width:100rpx;height:100rpx;display:block;marginLeft:25rpx" src={{item.image}}></image>
         <!-- <view style="width:100rpx;height:100rpx;background:white;marginLeft:25rpx"></view> -->
-        <view style="fontSize:22rpx">{{item.probability}}</view>
+        <view style="fontSize:22rpx">{{item.floors}}楼层</view>
         <label style="fontSize:22rpx">{{item.name}}</label>
 
       </view>
@@ -52,6 +52,7 @@
     <image class="zu3" onTap="orderRecord"  src={{resList['0c7c2470-690e-43df-aa7e-ed9aa99fb859'].url}} />
     <label class="dang_qian_ji_fenxxxx">当前积分:{{userCredits}}</label>
   </view>
+  <!-- <view class="{{maskVisible ? 'mask' : ''}}"></view> -->
 </view>
 <order-record a:if="{{orderModalVisible}}" orderList="{{orderList}}" onOrderModalClose="orderModalClose"></order-record>
 

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.js

@@ -50,7 +50,9 @@ Page({
     ruleModalVisible: false,
     myPrizeBtnVisible: false,
 
-    ruleData: ''
+    ruleData: '',
+    screentop:'',
+    maskVisible:false
   },
 
 
@@ -63,9 +65,17 @@ Page({
     // this.getRuleSource();
     this.getUserCredits();
     this.getOrderList();
-
+    // this.screenAdapt();
   },
 
+  // screenAdapt(){
+  //   let t = my.getSystemInfoSync().windowHeight;
+  //   let top = (1624 - t) / 2;
+  //   this.setData({
+  //     screentop:top + 'rpx'
+  //   })
+  // },
+
   onPrizeBtnClick() {
     my.navigateTo({
       url: '/pages/myprize/myprize'
@@ -118,7 +128,7 @@ Page({
     // let {orderModalVisible} = this.data
     console.log('click', this.data)
     this.setData({
-      orderModalVisible: true
+      orderModalVisible: true,
     })
   },
   // 关闭弹窗
@@ -256,6 +266,7 @@ Page({
           textAlign: 'center'
         }
         list[i].liststyle = listStyle;
+        list[i].floors = Math.round(list.probability* totalFloor * 0.01);
       }
 
       this.setData({

dist/pages/pagejie_shu_ye/pagejie_shu_ye.acss

@@ -5,6 +5,15 @@
   position: absolute;
 }
 
+.jie_shu_ye .logo {
+  width: 160rpx;
+  height: 58rpx;
+  opacity: 1;
+  left: 295rpx;
+  top: 222rpx;
+  position: absolute;
+}
+
 .jie_shu_ye .jiang_pinicon {
   width: 136rpx;
   height: 48rpx;

dist/pages/pagejie_shu_ye/pagejie_shu_ye.axml

 <view class="jie_shu_ye">
         <image class="di_kao_bei3" 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}} />
         <image class="gui_zeicon" onTap="showRuleModal"  src={{resList['d826a2f1-a3ec-4764-aad2-f6cacc43cfce'].url}} />
 
@@ -29,7 +29,7 @@
                 </view>
               </view>
 
-              <!-- <view  class="no_prize" a:else>无中奖名单</view> -->
+              <view  class="no_prize" a:if="{{prizeMenu == null}}">总楼层不足,无人中奖</view>
 
             </view>
             <!-- <view class="wei_zhong_jiang">

dist/pages/pagejie_shu_ye/pagejie_shu_ye.js

@@ -146,6 +146,9 @@ Page({
       for(let i=0; i<floorPrize.length;i++){
         let userName = floorPrize[i].userNick ;
         console.log(userName,'userName');
+        if(userName.length == 1){
+          userName = '***';
+        }
         if(userName.length >=2){
           console.log(userName.length);
           let length = userName.length;

dist/pages/pageshou_ye/pageshou_ye.js

@@ -39,9 +39,9 @@ Page({
       if (currentTime < startTime) {
         commonToast('活动未开始');
       }
-      if (currentTime > endTime) {
-        commonToast('活动已结束');
-      }
+      // if (currentTime > endTime) {
+      //   commonToast('活动已结束');
+      // }
 
       if (!res.data.isVip) {
         commonToast('立即加入会员，即可开始盖楼')
@@ -91,16 +91,7 @@ Page({
     console.log('fuck');
 
     let currentTime = new Date().getTime();
-    if (currentTime < startTime) {
-      commonToast('活动未开始');
-    }
-    if (currentTime > endTime) {
-      commonToast('活动已结束');
-    } else
-
-
       if (vipInfo.data.isVip && isUserJoin) {
-        
         // vipInfo..data.isVip = true;
         if (isEnd(endTime) &&
           (openPrizeStatus == OPEN_PRIZE_STATUS.SUCCESS || openPrizeStatus == OPEN_PRIZE_STATUS.NOT_OPEN)) {//活动结束，开奖成功or不开奖