Merge branch 'master' of gitlab2.dui88.com:wanghongyuan/hello_taobao

dist/components/comgou_mai_ji_lu32/comgou_mai_ji_lu32.acss

@@ -50,11 +50,36 @@
   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: 383rpx;
+  opacity: 1;
+  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,12 +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="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 a:else>暂无购买记录</view> -->
+      </view>
+      <view class="no_order" a:elif="{{orderList == null}}">暂无购买记录</view>
 
         <!-- <text >{{JSON.stringify(orderList)}}</text> -->
 

dist/components/comhui_yuan/comhui_yuan.acss

@@ -192,6 +192,18 @@
   opacity: 1;
   position: absolute;
 }
+
+.hui_yuan .hui_yuan_deng_ji .zhu_ce_hui_yuan .grade_name {
+  width: 300rpx;
+  opacity: 1;
+  top: 20rpx;
+  left: 200rpx;
+  color: white;
+  font-size: 50rpx;
+  text-align: center;
+  position: absolute;
+}
+
 .hui_yuan .hui_yuan_deng_ji .hei_qia_hui_yuan .zu926 {
   width: 309rpx;
   height: 44rpx;

dist/components/comhui_yuan/comhui_yuan.axml

@@ -2,8 +2,14 @@
   <image class="cha_cha4582" onTap="onOrderNowModalClose" src={{resList['b8bc26de-51ac-457f-bd3f-348e7df0af34'].url}} />
   <view class="hui_yuan_deng_ji">
     <view class="zhu_ce_hui_yuan">
-      <image class="bei_jing1" src={{resList['26ff41d0-0891-4573-a557-1a0bb7881405'].url}} />
-      <image class="zu012" src={{resList['948928c1-e583-449d-baca-77db2e213fe1'].url}} />
+      <!-- <image class="bei_jing1" src={{resList['26ff41d0-0891-4573-a557-1a0bb7881405'].url}} /> -->
+      <image class="bei_jing5" a:if="{{vipCredits.grade == 5}}" src={{resList['c46f1953-53df-4fdd-aaab-b5e8252b84ce'].url}} />
+      <image class="bei_jing4" a:else src={{resList['fcb78ed4-6a1a-4a00-9a63-14359b9c44ae'].url}} />
+      <!-- <image class="zu012" src={{resList['948928c1-e583-449d-baca-77db2e213fe1'].url}} /> -->
+
+      <!-- 会员标签 -->
+      <label class="grade_name">您是{{vipCredits.gradeName}}</label>
+
       <label class="gou_maixxx_ge_lou_ceng_yi_gong_xu_yao_hua_feixxxx_ji_fen22">
               购买 {{vipCredits.canBuyFloor}} 个楼层 一共需要花费 {{vipCredits.gradeCredits}} 积分
       </label>

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,17 +38,31 @@ 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();
               
-      // console.log('succ',success)
-      // if(success){
-      //   console.log('success');
-      // }else{
-      //   console.log('failed')
           //   }
-      // success
+          // })
+          commonToast("恭喜你购买成功");
+          this.props.onUserCredit();
+
+          // this.props.onUserCredit();
+        }else{
+          // 错误码判断不同情况
+          commonToast(res.message);
+          // if(res.code === '500000'){
+          // }
+          // console.log('fail')
+        }
+      })
+
       this.onOrderNowModalClose();
 
       

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.acss

@@ -62,40 +62,40 @@
   width: 35rpx;
   height: 25rpx;
   opacity: 1;
-  left: 13rpx;
-  top: 47rpx;
+  left: 15rpx;
+  top: 40rpx;
   position: absolute;
-  font-size: 14.41518rpx;
+  font-size: 25rpx;
   color: #ffffff;
 }
 .huo_dong_ye .dao_ji_shi87 .tu_ceng22_kao_bei90 {
   width: 35rpx;
   height: 25rpx;
   opacity: 1;
-  left: 131rpx;
-  top: 47rpx;
+  left: 135rpx;
+  top: 40rpx;
   position: absolute;
-  font-size: 14.41518rpx;
+  font-size: 25rpx;
   color: #ffffff;
 }
 .huo_dong_ye .dao_ji_shi87 .tu_ceng2289 {
   width: 35rpx;
   height: 25rpx;
   opacity: 1;
-  left: 246rpx;
-  top: 47rpx;
+  left: 248rpx;
+  top: 40rpx;
   position: absolute;
-  font-size: 14.41518rpx;
+  font-size: 25rpx;
   color: #ffffff;
 }
 .huo_dong_ye .dao_ji_shi87 .tu_ceng22_kao_bei388 {
   width: 35rpx;
   height: 25rpx;
   opacity: 1;
-  left: 357rpx;
-  top: 47rpx;
+  left: 360rpx;
+  top: 40rpx;
   position: absolute;
-  font-size: 14.41518rpx;
+  font-size: 25rpx;
   color: #ffffff;
 }
 .huo_dong_ye .jiang_pin78 {
@@ -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:100;height:100" src={{item.image}}></image> -->
-        <view style="width:100rpx;height:100rpx;background:white;marginLeft:25rpx"></view>
-        <label>{{item.probability}}</label>
-        <label>{{item.name}}</label>
+        <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>
+        <label style="fontSize:22rpx">{{item.name}}</label>
 
       </view>
     </view>
@@ -50,11 +50,11 @@
   <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>
 
-<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.acss

@@ -119,7 +119,22 @@
   height: 320rpx;
   opacity: 1;
   position: absolute;
+  overflow-y: auto;
 }
+
+.jie_shu_ye .zhong_jiang_ming_dan .zhong_jiang_zhuang_tai .yi_zhong_jiang .no_prize{
+  width: 458rpx;
+  height: 320rpx;
+  top:20rpx;
+  left: 10rpx;
+  opacity: 1;
+  position: absolute;
+  text-align: center;
+
+}
+/* 
+  
+*/
 .jie_shu_ye .zhong_jiang_ming_dan .zhong_jiang_zhuang_tai .yi_zhong_jiang .dixxx_ceng68 {
   width: 84rpx;
   height: 23rpx;
@@ -454,8 +469,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

@@ -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代表盖楼结束时的总楼层
@@ -52,11 +52,15 @@
               <label class="ba_la_kao_bei4">巴***拉</label> -->
 
               <!-- 有中奖用户 -->
-              <view a:for="{{prizeMenu}}" a:key="idx" a:for-item="prizeItem" >
+              <view style="position:absolute" a:if="{{prizeMenu != null}}"  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 class="no_prize">无中奖名单</view>
 
             </view>
             <!-- <view class="wei_zhong_jiang">
@@ -99,4 +103,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
     });
@@ -119,6 +120,8 @@ Page({
   async getPrizeMenu(){
     let {data} = await API.getFloorPrize() || {};
     console.log(data,'prizemenu')
+
+    if(data != null){
       // 用户名单处理
       let floorPrize = data;
       var personMenuArr = [];
@@ -153,8 +156,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'
@@ -166,7 +170,24 @@ Page({
       this.setData({
         prizeMenu: floorPrize
       })
+    } else {
+      // 无中奖
+      this.setData({
+        prizeMenu:null
+      })
+    }
    
+  },
+
+  // 获取规则接口
+  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

@@ -15,7 +15,8 @@ Page({
     ruleModalBtnVisible: false,
 
     ruleData:'',
-    joinCount:''
+    joinCount:'',
+    endTime:''
   },
 
   onLoad(query) {
@@ -29,12 +30,14 @@ Page({
 
   },
   gotoVipPage() {
+    let {endTime} = this.data
     API.getVipInfo().then(res => {
       // res.data.isVip=true;
       if (!res.data.isVip)
         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' });
+        my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye?data=' + JSON.stringify({endTime}) });
     })
   },
 
@@ -65,13 +68,21 @@ Page({
       API.getActivityBaseInfoById(),
       API.getVipInfo(),
     ]);
+
+    this.setData({
+      endTime
+    })
+
+    console.log('fuck');
+
     // vipInfo..data.isVip = true;
     if (vipInfo.data.isVip && isUserJoin) {
       if (isEnd(endTime) &&
         (openPrizeStatus == OPEN_PRIZE_STATUS.SUCCESS || openPrizeStatus == OPEN_PRIZE_STATUS.NOT_OPEN)) {//活动结束，开奖成功or不开奖
         my.redirectTo({ url: '/pages/pagejie_shu_ye/pagejie_shu_ye?data=' + JSON.stringify({ prize, openPrizeStatus, isShowPrize }) });
       } else {
-        my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye' });
+        // my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye' });
+        my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye?data=' + JSON.stringify({endTime}) });
       }
     } else {
       //设置状态