listrender

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

@@ -3,11 +3,13 @@ require('./config$');
 
 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/pagehuo_dong_ye/pagehuo_dong_ye?hash=90465399d3364a1028b01344ac9aa9dacad0f7e0');
-require('../../pages/pagejie_shu_ye/pagejie_shu_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+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

@@ -34,11 +34,13 @@ function success() {
 require('../../app');
 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/pagehuo_dong_ye/pagehuo_dong_ye?hash=90465399d3364a1028b01344ac9aa9dacad0f7e0');
-require('../../pages/pagejie_shu_ye/pagejie_shu_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+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.js

@@ -6,7 +6,7 @@ cloud.init({
 });
 
 App({
-  requestType: 'cloud', // yapi，cloud: 云函数
+  // requestType: 'cloud', // yapi，cloud: 云函数
   requestType: 'yapi', // yapi，cloud: 云函数
   cloudName: 'floor', // 主云函数项目名 base clientTemplate2C
   cloud,
@@ -25,5 +25,6 @@ App({
   handleQuery(query) {
     const { activityId } = query;
     this.activityId = activityId || '5f505873738989c8b356e284';
+    // this.activityId = activityId || '5f5759b2114fbb8f6d91245c';
   }
 });

dist/components/comgong_xi_huo_jiang/comgong_xi_huo_jiang.js

@@ -3,13 +3,15 @@
 import resList from '../../resconfig/resList';
 Component({
   props: {},
-  data: {},
+  data: {
+    resList: resList
+  },
   methods: {},
 
   onInit(props) {
-    this.setData({
-      resList: resList
-    });
+    // this.setData({
+    //   resList: resList
+    // });
   }
 
 });
\ No newline at end of file

dist/components/comhen_yi_han23/comhen_yi_han23.axml

@@ -10,4 +10,6 @@
           <image class="ca_jian_er_guo" src={{resList['bbeaaf95-4954-46ad-b1aa-e8ae55c9e2b1'].url}} />
         </view>
         <image class="an_niu30" src={{resList['92e51b4c-be5e-4459-8379-6a2bc1f2a3b2'].url}} />
+        <text a:if="{{openPrizeStatus==OPEN_PRIZE_STATUS.NOT_OPEN}}">不开奖</text>
+        <text a:if="{{openPrizeStatus!=OPEN_PRIZE_STATUS.NOT_OPEN}}">未中奖</text>
       </view>
\ No newline at end of file

dist/components/comhen_yi_han23/comhen_yi_han23.js

 'use strict';
-
+import OPEN_PRIZE_STATUS from '/utils/OPEN_PRIZE_STATUS';
 import resList from '../../resconfig/resList';
 Component({ 
   props: {},
-  data: {},
+  data: {
+    resList: resList,
+    OPEN_PRIZE_STATUS:OPEN_PRIZE_STATUS
+  },
   methods: {},
 
   onInit(props) {
-    this.setData({
-      resList: resList
-    });
+    console.log('fuck',props)
+    // this.setData({
+    //   resList: resList
+    // });
   }
 
 });
\ No newline at end of file

dist/pages/pagejie_shu_ye/pagejie_shu_ye.axml

@@ -92,3 +92,5 @@
           </view>
         </view>
       </view>
+      <prize-modal a:if="{{prizeVisible}}" ></prize-modal>
+      <noprize-modal a:if="{{noprizeVisible}}" openPrizeStatus="{{openPrizeStatus}}" ></noprize-modal>
\ No newline at end of file

dist/pages/pagejie_shu_ye/pagejie_shu_ye.js

@@ -5,6 +5,9 @@ import API from '../../api';
 
 Page({
   data: {
+    prizeVisible:false,
+    noprizeVisible:false,
+    openPrizeStatus:0,
     // 购买记录列表
     orderList:[],
     // 中奖名单

dist/pages/pagejie_shu_ye/pagejie_shu_ye.json

 {
-  "usingComponents": {}
+  "usingComponents": {
+    "prize-modal": "/components/comgong_xi_huo_jiang/comgong_xi_huo_jiang",
+    "noprize-modal": "/components/comhen_yi_han23/comhen_yi_han23"
+  }
 }
\ No newline at end of file

dist/pages/pageshou_ye/pageshou_ye.js

@@ -55,14 +55,15 @@ Page({
     })
   },
   async init() {
-    const [{ data: { isUserJoin, endTime, openPrizeStatus,prize } }, vipInfo] = await Promise.all([
+    const [{ data: { isUserJoin, endTime, openPrizeStatus, prize, isShowPrize } }, vipInfo] = await Promise.all([
       API.getActivityBaseInfoById(),
       API.getVipInfo(),
     ]);
-    vipInfo.isVip = true;
+    // vipInfo.isVip = true;
     if (vipInfo.isVip && isUserJoin) {
-      if (isEnd(endTime) && openPrizeStatus == OPEN_PRIZE_STATUS.SUCCESS) {//活动结束，开奖成功
-        my.redirectTo({ url: '/pages/pagejie_shu_ye/pagejie_shu_ye?prize='+JSON.stringify(prize) });
+      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' });
       }