1

dist/components/comgong_xi_huo_jiang/comgong_xi_huo_jiang.js

@@ -24,6 +24,7 @@ Component({
           
         }
       });
+      this.handleClose();
     }
   },
 

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.acss

@@ -85,41 +85,45 @@
   position: absolute;
 }
 .huo_dong_ye .dao_ji_shi87 .tu_ceng2291 {
-  width: 35rpx;
-  height: 25rpx;
+  width: 50rpx;
+  height: 40rpx;
   opacity: 1;
-  left: 15rpx;
+  left: 5rpx;
   top: 40rpx;
+  text-align: center;
   position: absolute;
   font-size: 25rpx;
   color: #ffffff;
 }
 .huo_dong_ye .dao_ji_shi87 .tu_ceng22_kao_bei90 {
-  width: 35rpx;
-  height: 25rpx;
+  width: 50rpx;
+  height: 40rpx;
   opacity: 1;
-  left: 135rpx;
+  left: 125rpx;
   top: 40rpx;
+  text-align: center;
   position: absolute;
   font-size: 25rpx;
   color: #ffffff;
 }
 .huo_dong_ye .dao_ji_shi87 .tu_ceng2289 {
-  width: 35rpx;
-  height: 25rpx;
+  width: 50rpx;
+  height: 40rpx;
   opacity: 1;
-  left: 248rpx;
+  left: 240rpx;
   top: 40rpx;
+  text-align: center;
   position: absolute;
   font-size: 25rpx;
   color: #ffffff;
 }
 .huo_dong_ye .dao_ji_shi87 .tu_ceng22_kao_bei388 {
-  width: 35rpx;
-  height: 25rpx;
+  width: 50rpx;
+  height: 40rpx;
   opacity: 1;
-  left: 360rpx;
+  left: 350rpx;
   top: 40rpx;
+  text-align: center;
   position: absolute;
   font-size: 25rpx;
   color: #ffffff;
@@ -308,13 +312,15 @@
 }
 .huo_dong_ye .xxxxxx {
   width: 120rpx;
-  height: 36rpx;
+  height: 40rpx;
   opacity: 1;
-  left: 345rpx;
+  left: 315rpx;
   top: 455rpx;
   position: absolute;
-  font-size: 28rpx;
+  font-size: 32rpx;
   color: #e7210a;
+  font-weight: 600;
+  text-align: center;
 }
 .huo_dong_ye .ji_fen {
   width: 371rpx;
@@ -339,7 +345,7 @@
   position: absolute;
 }
 .huo_dong_ye .ji_fen .dang_qian_ji_fenxxxx {
-  width: 172rpx;
+  width: 110rpx;
   height: 25rpx;
   opacity: 1;
   left: 30rpx;
@@ -348,3 +354,14 @@
   font-size: 24rpx;
   color: #5392cc;
 }
+.huo_dong_ye .ji_fen .current_credits {
+  width: 80rpx;
+  height: 25rpx;
+  opacity: 1;
+  left: 140rpx;
+  top: 5rpx;
+  text-align: center;
+  position: absolute;
+  font-size: 24rpx;
+  color: #5392cc;
+}

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.axml

@@ -52,7 +52,8 @@
   <view class="ji_fen">
     <image class="di111" src={{resList['8cb47bc2-bc31-4713-86ba-c8738367cb82'].url}} />
     <image class="zu3" onTap="orderRecord"  src={{resList['0c7c2470-690e-43df-aa7e-ed9aa99fb859'].url}} />
-    <label class="dang_qian_ji_fenxxxx">当前积分:{{userCredits}}</label>
+    <label class="dang_qian_ji_fenxxxx">当前积分:</label>
+    <label class="current_credits">{{userCredits}}</label>
   </view>
   </view>
   

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.js

@@ -162,7 +162,7 @@ Page({
         grade,
         gradeName
       },
-      maskVisible:true
+      
     })
     // 判断活动时间
     let currentTime = new Date().getTime();
@@ -176,7 +176,8 @@ Page({
         // 可以买
         // 显示
         this.setData({
-          orderNowModalVisible: true
+          orderNowModalVisible: true,
+          maskVisible:true
         })
       } else{
         commonToast('当前最多可购买'+ reduced +'层');

dist/pages/pagejie_shu_ye/pagejie_shu_ye.acss

@@ -64,41 +64,45 @@
   position: absolute;
 }
 .jie_shu_ye .dao_ji_shi69 .tu_ceng2273 {
-  width: 35rpx;
-  height: 25rpx;
+  width: 50rpx;
+  height: 40rpx;
   opacity: 1;
-  left: 15rpx;
+  left: 5rpx;
   top: 40rpx;
+  text-align: center;
   position: absolute;
   font-size: 25rpx;
   color: #ffffff;
 }
 .jie_shu_ye .dao_ji_shi69 .tu_ceng22_kao_bei72 {
-  width: 35rpx;
-  height: 25rpx;
+  width: 50rpx;
+  height: 40rpx;
   opacity: 1;
-  left: 135rpx;
+  left: 125rpx;
   top: 40rpx;
+  text-align: center;
   position: absolute;
   font-size: 25rpx;
   color: #ffffff;
 }
 .jie_shu_ye .dao_ji_shi69 .tu_ceng2271 {
-  width: 35rpx;
-  height: 25rpx;
+  width: 50rpx;
+  height: 40rpx;
   opacity: 1;
-  left: 248rpx;
+  left: 240rpx;
   top: 40rpx;
+  text-align: center;
   position: absolute;
   font-size: 25rpx;
   color: #ffffff;
 }
 .jie_shu_ye .dao_ji_shi69 .tu_ceng22_kao_bei370 {
-  width: 35rpx;
-  height: 25rpx;
+  width: 50rpx;
+  height: 40rpx;
   opacity: 1;
-  left: 360rpx;
+  left: 350rpx;
   top: 40rpx;
+  text-align: center;
   position: absolute;
   font-size: 25rpx;
   color: #ffffff;
@@ -110,7 +114,7 @@
   left: 131rpx;
   top: 1337rpx;
   position: absolute;
-  font-size: 13.68653rpx;
+  font-size: 22rpx;
   color: #ffffff;
 }
 .jie_shu_ye .zhong_jiang_ming_dan {

dist/pages/pagejie_shu_ye/pagejie_shu_ye.axml

@@ -12,7 +12,8 @@
     <label class="tu_ceng22_kao_bei370">00</label>
   </view>
   <label class="mai_zhongn20n50n80_lou_ceng_de_yong_hu_ke_huo_de_jiang_pinn_dai_biao_gai_lou_jie_shu_shi_de_zong_lou_ceng">
-          买中N*20%，N*50%，N*80%楼层的用户可获得奖品 N代表盖楼结束时的总楼层
+          <!-- 买中N*20%，N*50%，N*80%楼层的用户可获得奖品 N代表盖楼结束时的总楼层 -->
+          买中<label a:for="{{list}}" a:key="i" a:for-item="items"> {{totalFloor}}*{{items.probability}} </label>楼层的用户可获得奖品 N代表盖楼结束时的总楼层
   </label>
   <view class="zhong_jiang_ming_dan">
     <image class="di953" src={{resList['e701381d-fb5a-4b6a-8fc1-71aedea9416d'].url}} />

dist/pages/pagejie_shu_ye/pagejie_shu_ye.js

@@ -19,7 +19,9 @@ Page({
     // myPrizeBtnVisible: false,
     ruleData:'',
     myPrize:'',
-    maskVisible:false
+    maskVisible:false,
+    list:'',
+    totalFloor:''
   },
 
   onLoad(props) {
@@ -212,9 +214,14 @@ Page({
   // 获取规则接口
   async getRuleSource(){
     API.getActivityBaseInfoById().then((res)=>{
-      if(res.success){
+      if(res.success && res.data){
+        let data = res.data;
+        let list = res.list;
+        let totalFloor = res.totalFloor;
         this.setData({
-          ruleData:res.data.rule
+          ruleData:res.data.rule,
+          list,
+          totalFloor
         })
       }
     })