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

dist/.tea/entryFiles-development/config$.js

@@ -2,6 +2,6 @@
 const g = typeof global !== 'undefined' ? global : self;
 g.appXAppJson = {
   "app": {
-    "$homepage": "pages/pageshou_ye/pageshou_ye"
+    "$homepage": "pages/pagehuo_dong_ye/pagehuo_dong_ye"
   }
 };

dist/.tea/entryFiles-development/index$.web.js

 require('@alipay/appx-compiler/lib/sjsEnvInit');
 require('./config$');
 
-require('../../components/comyou_xi_gui_ze27/comyou_xi_gui_ze27?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/comgou_mai_ji_lu32/comgou_mai_ji_lu32?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/comhui_yuan/comhui_yuan?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/comgong_xi_huo_jiang/comgong_xi_huo_jiang?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/comhen_yi_han23/comhen_yi_han23?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../components/comyou_xi_gui_ze27/comyou_xi_gui_ze27?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/logisticsModal/logisticsModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/prizeModal/prizeModal?hash=951cb6a7fcdd2a5332763295aa08b4f86b6fd2e1');
-require('../../pages/pageshou_ye/pageshou_ye?hash=f6ca2530b12f33cb12545f5a792a8e73d47ec084');
 require('../../pages/pagehuo_dong_ye/pagehuo_dong_ye?hash=90465399d3364a1028b01344ac9aa9dacad0f7e0');
 require('../../pages/pagejie_shu_ye/pagejie_shu_ye?hash=1959bae1d571bb9ed770cf51fdf6090f42925135');
+require('../../pages/pageshou_ye/pageshou_ye?hash=f6ca2530b12f33cb12545f5a792a8e73d47ec084');
 require('../../pages/myprize/myprize?hash=74b7edb09b315961bb13059a83b72836912bfd2c');
 require('../../pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');

dist/.tea/entryFiles-development/index$.worker.js

@@ -32,16 +32,16 @@ if(AFAppX.registerApp) {
 
 function success() {
 require('../../app');
-require('../../components/comyou_xi_gui_ze27/comyou_xi_gui_ze27?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/comgou_mai_ji_lu32/comgou_mai_ji_lu32?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/comhui_yuan/comhui_yuan?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/comgong_xi_huo_jiang/comgong_xi_huo_jiang?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/comhen_yi_han23/comhen_yi_han23?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../components/comyou_xi_gui_ze27/comyou_xi_gui_ze27?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/logisticsModal/logisticsModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/prizeModal/prizeModal?hash=951cb6a7fcdd2a5332763295aa08b4f86b6fd2e1');
-require('../../pages/pageshou_ye/pageshou_ye?hash=f6ca2530b12f33cb12545f5a792a8e73d47ec084');
 require('../../pages/pagehuo_dong_ye/pagehuo_dong_ye?hash=90465399d3364a1028b01344ac9aa9dacad0f7e0');
 require('../../pages/pagejie_shu_ye/pagejie_shu_ye?hash=1959bae1d571bb9ed770cf51fdf6090f42925135');
+require('../../pages/pageshou_ye/pageshou_ye?hash=f6ca2530b12f33cb12545f5a792a8e73d47ec084');
 require('../../pages/myprize/myprize?hash=74b7edb09b315961bb13059a83b72836912bfd2c');
 require('../../pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 }

dist/app.json

 {
   "pages": [
-    "pages/pageshou_ye/pageshou_ye",
     "pages/pagehuo_dong_ye/pagehuo_dong_ye",
     "pages/pagejie_shu_ye/pagejie_shu_ye",
+    "pages/pageshou_ye/pageshou_ye",
     "pages/myprize/myprize",
     "pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1"
   ],

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.acss

@@ -116,7 +116,7 @@
   height: 191rpx;
   opacity: 1;
   position: absolute;
-  overflow-x: auto;
+  overflow-y: auto;
 }
 .huo_dong_ye .jiang_pin78 .zu114 .zu128 .ju_xing51_kao_bei2 {
   width: 681rpx;

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.axml

@@ -14,7 +14,7 @@
     <image class="zu116" src={{resList['51ca8493-ed2a-4273-a6b6-300bd9b2eb93'].url}} />
     <image class="zu5" src={{resList['e7baa6fe-46fd-422f-ac6a-3298fb965e6f'].url}} />
     <view class="zu114">
-      <view class="zu128" a:for="{{prizeList}}" a:for-index="index" a:for-item="item" style="{{item.liststyle}}">
+      <view class="zu128" a:for="{{prizeList}}" a:key="index" a:for-item="item" style="{{item.liststyle}}">
         <!-- <image class="ju_xing51_kao_bei2" src={{resList['6b68feb2-7c84-473e-8f2c-b6571e7659e3'].url}} />
         <label class="n20_lou_ceng86">n*20%楼层</label>
         <label class="xxx_yuan_jiang_pin85">XXX元奖品</label>

dist/pages/pagejie_shu_ye/pagejie_shu_ye.acss

@@ -432,7 +432,14 @@
   left: 61rpx;
   top: 147rpx;
   position: absolute;
+  overflow-y: auto;
 }
+
+.jie_shu_ye .gou_mai_ji_lu46 .zu13447 .item{
+  width: 100%;
+  height:50rpx;
+}
+
 .jie_shu_ye .gou_mai_ji_lu46 .zu13447 .tu_ceng09_yue15_ri56 {
   width: 101rpx;
   height: 21rpx;

dist/pages/pagejie_shu_ye/pagejie_shu_ye.axml

@@ -84,10 +84,10 @@
             <label class="tu_ceng200_kao_bei3">200</label>
             <label class="tu_ceng09_yue15_ri_kao_bei3">09 月 15日</label> -->
 
-            <view a:for="{{orderList}}" a:for-index="index" a:for-item="item">
-              <label>购买日期{{item.createTime}}</label>
-              <label>购买楼层数{{item.floorRange}}</label>
-              <label>消耗积分{{item.credits}}</label>
+            <view class="item" a:for="{{orderList}}" a:for-index="index" a:for-item="item" >
+              <label style="{{item.order.orderDay}}">{{item.createTime}}</label>
+              <label style="{{item.order.orderFloor}}">{{item.floorRange}}</label>
+              <label style="{{item.order.orderCredits}}">{{item.credits}}</label>
             </view>
           </view>
         </view>

dist/pages/pagejie_shu_ye/pagejie_shu_ye.js

@@ -11,42 +11,65 @@ Page({
     // 购买记录列表
     orderList:[],
     // 中奖名单
-    prizeMenu:[]
+    prizeMenu:[],
+    // 购买列表渲染
+    orderStyle:[]
   },
 
   onLoad(props) {
-    console.log('fuck',JSON.parse(props.data))
-    const {prize, openPrizeStatus, isShowPrize} =JSON.parse(props.data);
-    if(isShowPrize) {
-      if(prize) {
-        this.setData({prizeVisible:true})
-      }else {
-        this.setData({
-          noprizeVisible:true,
-          openPrizeStatus:openPrizeStatus
-        })
-      }
-    }
+    // console.log('fuck',JSON.parse(props.prize))
     this.setData({
       resList: resList
     });
     
     this.getOrderList();
-    this.getPrizeMenu();
+    // this.getPrizeMenu();
   },
 
   // 获取购买记录
   async getOrderList(){
     let {data} = await API.getBuyFloorList() || {};
+    let orderStyleArr = [];
+    let lens = data.length;
+    for(let i=0;i<lens;i++){
+      let orderStyle = {
+        orderDay:{
+          left: 0,
+          top: 40*i+'rpx',
+          position:'absolute',
+          color:'white'
+        },
+        orderFloor:{
+          left: 200+'rpx',
+          top: 40*i + 'rpx',
+          position:'absolute',
+          color:'white'
+        },
+        orderCredits:{
+          left:400 + 'rpx',
+          top: 40 * i + 'rpx',
+          position:'absolute',
+          color:'white'
+        }
+      }
+      // orderStyleArr.push(orderStyle);
+      data[i].order = orderStyle;
+    }
+    // 合并样式
+    // for(let i=0;i<lens;i++){
+    //   data[i].order = orderStyleArr[i];
+    // }
     this.setData({
-      orderList:data
+      orderList:data,
+      // orderStyle:orderStyleArr
     })
   },
 
   async getPrizeMenu(){
-    let floorPrize = await API.getFloorPrize().data || {};
+    let {data} = await API.getFloorPrize() || {};
     // 用户名单处理
-    let personMenuArr = [];
+    let floorPrize = data;
+    var personMenuArr = [];
     for(let i=0; i<floorPrize.length;i++){
       let userName = floorPrize[i].uerNick;
       if(userName.length >= 2){
@@ -56,11 +79,12 @@ Page({
       }
       personMenuArr.push(userName);
     }
+    console.log(floorPrize,'arr')
     // 处理好的姓名合并到floorPrize
     if(floorPrize != null){
-      for(let floorprize of floorPrize){
-        for(let username of personMenuArr){
-          floorprize.username = username;
+      for(var floorprize of floorPrize){
+        for(var usernames of personMenuArr){
+          floorprize.username = usernames;
         }
       }
     }

dist/pages/pageshou_ye/pageshou_ye.axml

@@ -2,7 +2,7 @@
   <image class="di_kao_bei" src={{resList['66f2b76f-7265-4cb2-9b4d-7e8207ab1d74'].url}} />
   <image class="logo" src={{resList['dd7d3a3b-6fcb-427d-8353-da169708bbab'].url}} />
   <image class="tu" src={{resList['41567d28-d1c4-454f-8bb4-4bcb6a103be0'].url}} />
-  <image a:if="{{startBtnVisible}}" class="an_niu" onTap="handleStart" src={{resList['9720b3cc-2faa-4bac-8244-d5f0d018a6e7'].url}} />
+  <image a:if="{{startBtnVisible}}" class="an_niu" onTap="gotoVipPage" src={{resList['9720b3cc-2faa-4bac-8244-d5f0d018a6e7'].url}} />
   <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}} />