sss

dist/app.js

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

dist/components/comgou_mai_ji_lu32/comgou_mai_ji_lu32.acss

@@ -50,7 +50,17 @@
   left: 60rpx;
   position: absolute;
 }
-.gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .zu13434 {
+
+.gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .list {
+  width: 453rpx;
+  height: 483rpx;
+  opacity: 1;
+  /* top: 163rpx; */
+  position: absolute;
+  overflow-y: auto;
+}
+
+.gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .list .zu13434 {
   width: 453rpx;
   height: 183rpx;
   opacity: 1;

dist/components/comgou_mai_ji_lu32/comgou_mai_ji_lu32.axml

@@ -5,10 +5,12 @@
     <image class="zu7" src={{resList['ae013a3c-875a-461d-9273-1f58dd01eca2'].url}} />
     <image class="yuan_jiao_ju_xing71744" src={{resList['1a960b92-d4b6-40fe-8e31-9658a5d904ec'].url}} />
     <view class="zu135">
-      <view class="zu13434" a:if="{{orderList.length !== 0}}" a:for="{{orderList}}" a:key="index" a:for-item="item">
-        <label style="{{item.order.orderDay}}">{{item.monthDate}}</label>
-        <label style="{{item.order.orderFloor}}">{{item.floorRange}}</label>
-        <label style="{{item.order.orderCredits}}">{{item.credits}}</label>
+      <view class="list">
+        <view class="zu13434" a:if="{{orderList.length !== 0}}" a:for="{{orderList}}" a:key="index" a:for-item="item">
+          <label style="{{item.order.orderDay}}">{{item.monthDate}}</label>
+          <label style="{{item.order.orderFloor}}">{{item.floorRange}}</label>
+          <label style="{{item.order.orderCredits}}">{{item.credits}}</label>
+        </view>
       </view>
       <!-- <view a:else>暂无购买记录</view> -->
 

dist/components/comhui_yuan/comhui_yuan.js

@@ -2,9 +2,13 @@
 
 import resList from '../../resconfig/resList';
 import API from '../../api'
+const app = getApp();
+const { tbcc } = app;
+const { commonToast, getAuthUserInfo, navigateToOutside } = tbcc.tb;
+
 Component({
   props: {
-
+    onUserCredit:()=>{}
   },
   data: {
     resList: resList
@@ -34,8 +38,23 @@ Component({
       //  })
       // let {message,data,code,success} = API.submit({floor: vipCredits.canBuyFloor, grade:vipCredits.grade}) || {};
 
-      API.submit({floor: vipCredits.canBuyFloor, grade:vipCredits.grade}).then((res)=>{
+      await API.submit({floor: vipCredits.canBuyFloor, grade:vipCredits.grade}).then((res)=>{
         console.log(res,'res');
+        if(res.success){
+          console.log('success')
+          // 更新积分
+          // API.getCredits().then((res)=>{
+          //   if(res.success){
+          //     let userCredits = res.data;
+          //     this.props.onUserCredit();
+              
+          //   }
+          // })
+
+          // this.props.onUserCredit();
+        }else{
+          console.log('fail')
+        }
       })
 
       // console.log('succ',success)

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.axml

@@ -30,8 +30,8 @@
         <label class="xxx_yuan_jiang_pin79">XXX元奖品</label> -->
 
         <!-- bianli -->
-        <!-- <image style="width:100;height:100" src={{item.image}}></image> -->
-        <view style="width:100rpx;height:100rpx;background:white;marginLeft:25rpx"></view>
+        <image style="width:100rpx;height:100rpx;display:block" src={{item.image}}></image>
+        <!-- <view style="width:100rpx;height:100rpx;background:white;marginLeft:25rpx"></view> -->
         <label>{{item.probability}}</label>
         <label>{{item.name}}</label>
 
@@ -55,6 +55,6 @@
 </view>
 <order-record a:if="{{orderModalVisible}}" orderList="{{orderList}}" onOrderModalClose="orderModalClose"></order-record>
 
-<order-now a:if="{{orderNowModalVisible}}" vipCredits="{{vipCredits}}" onOrderNowModalClose="orderNowModalClose"></order-now>
+<order-now a:if="{{orderNowModalVisible}}" onUserCredit="onUserCredit" vipCredits="{{vipCredits}}" onOrderNowModalClose="orderNowModalClose"></order-now>
 
-<rule-modal a:if="{{ruleModalVisible}}"  onModalClose="ruleModalClose"><text>{{ruleData}}222</text></rule-modal>
+<rule-modal a:if="{{ruleModalVisible}}"  onModalClose="ruleModalClose"><text>{{ruleData}}</text></rule-modal>
\ No newline at end of file

dist/pages/pagejie_shu_ye/pagejie_shu_ye.axml

@@ -6,10 +6,10 @@
 
         <view class="dao_ji_shi69">
           <image class="di74" src={{resList['ad6e754e-6243-4acf-9ffd-9a7aeb3f4971'].url}} />
-          <label class="tu_ceng2273">22</label>
-          <label class="tu_ceng22_kao_bei72">22</label>
-          <label class="tu_ceng2271">22</label>
-          <label class="tu_ceng22_kao_bei370">22</label>
+          <label class="tu_ceng2273">00</label>
+          <label class="tu_ceng22_kao_bei72">00</label>
+          <label class="tu_ceng2271">00</label>
+          <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代表盖楼结束时的总楼层
@@ -99,4 +99,4 @@
       <prize-modal a:if="{{prizeVisible}}" ></prize-modal>
       <noprize-modal a:if="{{noprizeVisible}}" openPrizeStatus="{{openPrizeStatus}}" ></noprize-modal>
 
-      <rule-modal a:if="{{ruleModalVisible}}"  onModalClose="ruleModalClose"><text>{{ruleData}}1111</text></rule-modal>
+      <rule-modal a:if="{{ruleModalVisible}}"  onModalClose="ruleModalClose"><text>{{ruleData}}</text></rule-modal>
\ No newline at end of file

dist/pages/pagejie_shu_ye/pagejie_shu_ye.js

@@ -17,6 +17,7 @@ Page({
 
     ruleModalVisible: false,
     // myPrizeBtnVisible: false,
+    ruleData:''
   },
 
   onLoad(props) {
@@ -33,7 +34,7 @@ Page({
         })
       }
     }
-
+    this.getRuleSource();
     this.setData({
       resList: resList
     });
@@ -167,6 +168,17 @@ Page({
       prizeMenu: floorPrize
     })
    
+  },
+
+  // 获取规则接口
+  async getRuleSource(){
+    API.getActivityBaseInfoById().then((res)=>{
+      if(res.success){
+        this.setData({
+          ruleData:res.data.rule
+        })
+      }
+    })
   }
 
 });
\ No newline at end of file

dist/pages/pageshou_ye/pageshou_ye.axml

@@ -6,7 +6,7 @@
   <image class="wen_an" src={{resList['2a026ac4-0a9c-497b-9469-2da99f935821'].url}} />
   <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>
+  <text a:if="{{ruleModalBtnVisible}}" class="can_yu_ren_shu">已有{{joinCount * 20}}人参与</text>
 </view>
 
 <rule-modal a:if="{{ruleModalVisible}}"  onModalClose="ruleModalClose"><text>{{ruleData}}</text></rule-modal>
\ No newline at end of file

dist/pages/pageshou_ye/pageshou_ye.js

@@ -35,6 +35,7 @@ Page({
         navigateToOutside(res.data.url)
       else
         my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye' });
+        // my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye?data=' + JSON.stringify() });
     })
   },
 
@@ -65,6 +66,9 @@ Page({
       API.getActivityBaseInfoById(),
       API.getVipInfo(),
     ]);
+
+    console.log('fuck');
+
     // vipInfo..data.isVip = true;
     if (vipInfo.data.isVip && isUserJoin) {
       if (isEnd(endTime) &&