1

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

@@ -53,18 +53,33 @@
 
 .gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .list {
   width: 453rpx;
-  height: 483rpx;
+  height: 383rpx;
   opacity: 1;
-  /* top: 163rpx; */
+  top: 150rpx;
   position: absolute;
   overflow-y: auto;
 }
 
+.gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .no_order{
+  width: 453rpx;
+  height: 383rpx;
+  opacity: 1;
+  top: 180rpx;
+  left: 10rpx;
+  position: absolute;
+  text-align: center;
+  color: white;
+  font-size: 24rpx;
+}
+
+/* 
+  
+*/
 .gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .list .zu13434 {
   width: 453rpx;
   height: 183rpx;
   opacity: 1;
-  top: 163rpx;
+  top: 10rpx;
   position: absolute;
 }
 .gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .zu13434 .tu_ceng09_yue15_ri43 {

dist/components/comgou_mai_ji_lu32/comgou_mai_ji_lu32.axml

@@ -5,14 +5,14 @@
     <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="list">
-        <view class="zu13434" a:if="{{orderList.length !== 0}}" a:for="{{orderList}}" a:key="index" a:for-item="item">
+      <view class="list" a:if="{{orderList != null}}">
+        <view class="zu13434"  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> -->
+      <view class="no_order" a:elif="{{orderList == null}}">暂无购买记录</view>
 
         <!-- <text >{{JSON.stringify(orderList)}}</text> -->
 

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.acss

@@ -283,12 +283,12 @@
 }
 .huo_dong_ye .xxxxxx {
   width: 120rpx;
-  height: 24rpx;
+  height: 36rpx;
   opacity: 1;
-  left: 315rpx;
-  top: 475rpx;
+  left: 345rpx;
+  top: 455rpx;
   position: absolute;
-  font-size: 31.96651rpx;
+  font-size: 28rpx;
   color: #e7210a;
 }
 .huo_dong_ye .ji_fen {
@@ -317,9 +317,9 @@
   width: 172rpx;
   height: 25rpx;
   opacity: 1;
-  left: 26rpx;
-  top: 13rpx;
+  left: 30rpx;
+  top: 5rpx;
   position: absolute;
-  font-size: 16.17499rpx;
+  font-size: 24rpx;
   color: #5392cc;
 }

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.axml

@@ -30,10 +30,10 @@
         <label class="xxx_yuan_jiang_pin79">XXX元奖品</label> -->
 
         <!-- bianli -->
-        <image style="width:100rpx;height:100rpx;display:block" src={{item.image}}></image>
+        <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> -->
-        <label>{{item.probability}}</label>
-        <label>{{item.name}}</label>
+        <view style="fontSize:22rpx">{{item.probability}}</view>
+        <label style="fontSize:22rpx">{{item.name}}</label>
 
       </view>
     </view>
@@ -50,7 +50,7 @@
   <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">当前积分:{{userCredits}}</label>
   </view>
 </view>
 <order-record a:if="{{orderModalVisible}}" orderList="{{orderList}}" onOrderModalClose="orderModalClose"></order-record>

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.js

@@ -116,6 +116,12 @@ Page({
     }
   },
 
+  // 购买成功后更新积分
+  onUserCredit(){
+    this.getUserCredits();
+    console.log(this.data.userCredits,'更新后的用户积分');
+  },
+
 
   // 减楼层
   reduceFloor() {
@@ -313,7 +319,10 @@ Page({
       })
     } else {
       // 购买记录为空
-
+      console.log('购买记录为空');
+      this.setData({
+        orderList:null
+      })
     }
 
   },

dist/pages/pagejie_shu_ye/pagejie_shu_ye.acss

@@ -119,6 +119,7 @@
   height: 320rpx;
   opacity: 1;
   position: absolute;
+  overflow-y: auto;
 }
 .jie_shu_ye .zhong_jiang_ming_dan .zhong_jiang_zhuang_tai .yi_zhong_jiang .dixxx_ceng68 {
   width: 84rpx;
@@ -454,8 +455,12 @@
 }
 
 .jie_shu_ye .gou_mai_ji_lu46 .zu13447 .item{
-  width: 100%;
-  height:50rpx;
+  top:0rpx;
+  width: 453rpx;
+  height: 222rpx;
+  opacity: 1;
+  left: 10rpx;
+  position: absolute;
 }
 
 .jie_shu_ye .gou_mai_ji_lu46 .zu13447 .tu_ceng09_yue15_ri56 {

dist/pages/pagejie_shu_ye/pagejie_shu_ye.axml

@@ -52,10 +52,12 @@
               <label class="ba_la_kao_bei4">巴***拉</label> -->
 
               <!-- 有中奖用户 -->
-              <view a:for="{{prizeMenu}}" a:key="idx" a:for-item="prizeItem" >
-                <label style="{{prizeItem.prizestyle.prizefloor}}">第{{prizeItem.floor}}层</label>
-                <label style="{{prizeItem.prizestyle.prizeuser}}">{{prizeItem.username}}</label>
-                <image style="{{prizeItem.prizestyle.prizeimage}}" src={{prizeItem.image}}></image>
+              <view style="position:absolute" a:for="{{prizeMenu}}" a:key="idx" a:for-item="prizeItem" >
+                <view style="height:40rpx;position:absolute">
+                  <label style="{{prizeItem.prizestyle.prizefloor}}">第{{prizeItem.floor}}层</label>
+                  <label style="{{prizeItem.prizestyle.prizeuser}}">{{prizeItem.username}}</label>
+                  <image style="{{prizeItem.prizestyle.prizeimage}}" src={{prizeItem.image}}></image>
+                </view>
               </view>
 
             </view>

dist/pages/pagejie_shu_ye/pagejie_shu_ye.js

@@ -154,8 +154,9 @@ Page({
         },
         prizeimage: {
           left: 400 + 'rpx',
-          top: 45 * i + 'rpx',
           position: 'absolute',
+          verticalAlign:'middle',
+          top: 40 * i + 10 + 'rpx',
           color: 'white',
           width:40 + 'rpx',
           height: 30 + 'rpx'