1

dist/app.js

@@ -7,7 +7,7 @@ cloud.init({
 
 App({
   requestType: 'cloud', // yapi，cloud: 云函数
-  // requestType: 'yapi', // yapi，cloud: 云函数
+  requestType: 'yapi', // yapi，cloud: 云函数
   cloudName: 'floor', // 主云函数项目名 base clientTemplate2C
   cloud,
   tbcc,

dist/components/comgong_xi_huo_jiang/comgong_xi_huo_jiang.acss

@@ -30,13 +30,13 @@
   position: absolute;
 }
 .gong_xi_huo_jiang .mai_dao_zhong_jiang_lou_ceng_huo_de_yi_xia_jiang_pin {
-  width: 382rpx;
+  width: 390rpx;
   height: 30rpx;
   opacity: 1;
   left: 156rpx;
   top: 157rpx;
   position: absolute;
-  font-size: 19.90768rpx;
+  font-size: 30rpx;
   color: #ffffff;
 }
 .gong_xi_huo_jiang .ke_yi_zai_wo_de_jiang_pin_ye_mian_cha_kan_jiang_pin {
@@ -46,7 +46,7 @@
   left: 175rpx;
   top: 574rpx;
   position: absolute;
-  font-size: 14.93076rpx;
+  font-size: 22rpx;
   color: #ff5835;
 }
 .gong_xi_huo_jiang .ju_xing88726 {

dist/components/comgou_mai_ji_lu32/comgou_mai_ji_lu32.acss

@@ -46,16 +46,18 @@
 }
 .gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 {
   width: 476rpx;
-  height: 346rpx;
+  height: 646rpx;
   opacity: 1;
   left: 60rpx;
   position: absolute;
+  /* overflow-y: auto; */
+  overflow-x: hidden;
 }
 
 .gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .list {
   /* width: 453rpx; */
   width: 500rpx;
-  height: 383rpx;
+  height: 400rpx;
   opacity: 1;
   top: 150rpx;
   position: absolute;

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.js

@@ -401,7 +401,8 @@ Page({
             position: 'absolute',
             color: 'white',
             width:100+'rpx',
-            textAlign:'center'
+            textAlign:'center',
+            overflow:'hidden'
           }
         }
         data[i].order = orderStyle;

dist/pages/pagejie_shu_ye/pagejie_shu_ye.axml

@@ -13,7 +13,7 @@
   </view>
   <view 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代表盖楼结束时的总楼层 -->
-          买中<label a:for="{{list}}" a:key="i" a:for-item="items"> N*{{items.probability}}%,</label>楼层的用户可获得奖品 N代表盖楼结束时的总楼层
+          买中<label a:for="{{list}}" a:key="i" a:for-index="indes" a:for-item="items"> N*{{items.probability}}%{{indes !== listlength-1 ? ',' : ''}}</label>楼层的用户可获得奖品 N代表盖楼结束时的总楼层
   </view>
   <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

@@ -22,7 +22,8 @@ Page({
     myPrize:'',
     maskVisible:false,
     list:'',
-    totalFloor:''
+    totalFloor:'',
+    listlength:''
   },
 
   onLoad(props) {
@@ -132,7 +133,8 @@ Page({
             position: 'absolute',
             color: 'white',
             width:100+'rpx',
-            textAlign:'center'
+            textAlign:'center',
+            overflow:'hidden'
           }
         }
         data[i].order = orderStyle;
@@ -224,11 +226,13 @@ Page({
       if(res.success && res.data){
         let data = res.data;
         let list = data.list;
+        let listlength = list.length;
         let totalFloor = res.totalFloor;
         this.setData({
           ruleData:res.data.rule,
           list,
-          totalFloor
+          totalFloor,
+          listlength
         })
       }
     })

dist/pages/pageshou_ye/pageshou_ye.acss

@@ -7,6 +7,16 @@
   display: block;
   position: fixed;
 }
+
+.mask {
+  position: fixed;
+  width: 750rpx;
+  height: 1624rpx;
+  z-index: 99;
+  background-color: #000;
+  opacity: 0.7;
+}
+
 .shou_ye .di_kao_bei {
   width: 750rpx;
   height: 1624rpx;

dist/pages/pageshou_ye/pageshou_ye.axml

@@ -8,6 +8,5 @@
   <image onTap="onPrizeBtnClick" a:if="{{myPrizeBtnVisible}}" class="jiang_pinicon" src={{resList['b7517eae-3bc2-4456-935a-e6e3e1fe995e'].url}} />
   <image a:if="{{ruleModalBtnVisible}}" class="gui_zeicon" onTap="showRuleModal"  src={{resList['d826a2f1-a3ec-4764-aad2-f6cacc43cfce'].url}} />
   <text a:if="{{ruleModalBtnVisible}}" class="can_yu_ren_shu">已有{{joinCount}}人参与</text>
+<rule-modal a:if="{{ruleModalVisible}}"  onModalClose="ruleModalClose"><text>{{ruleData}}</text></rule-modal>
 </view>
-
-<rule-modal a:if="{{ruleModalVisible}}"  onModalClose="ruleModalClose"><text>{{ruleData}}</text></rule-modal>
\ No newline at end of file