xiaoe_mp_npm 0.2.1-t220110 → 0.2.1

package/.gitlab-ci.yml

@@ -3,7 +3,8 @@ build_test:
   stage: build
   only:
     - dev
-    - dev-gwenniezhou
+    - feature/live_marketing_iteration
+    - fix/record-lottery
   tags:
     - fe-group-prod-runner-2
   script:
@@ -13,7 +14,6 @@ build_test:
     - export version=${version:2:$[${#version}-4]}
     - export message=$(git log --pretty=format:%s -1)
     - export author=$(git log --pretty=format:%an -1)
-    - if [ $CI_COMMIT_REF_NAME != "master" ] && [ $(echo $version | grep -E "r|t" ) != "" ]; then echo "正常发包"; else exit 0; fi
     - cnpm i
     - npm run build
     - cnpm publish

package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.js

@@ -185,7 +185,7 @@ Component({
       this.getTopInviter()
       const timer = setInterval(() => {
         this.getTopInviter()
-      }, 2000)
+      }, 30*1000)
       this.timer = timer;
     },
     // 获取邀请用户排名列表

package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.js

@@ -219,6 +219,17 @@ Component({
     },
   },
   observers: {
+    distributionMode(val) {
+      if (val === 1) {
+        this.setData({
+          express_type: val
+        })
+      } else if (val === 2) {
+        this.setData({
+          express_type: val
+        })
+      }
+    },
     marketingData(marketingData) {
       // 这里的逻辑应该是存在拼团的时候那么payment_type就要赋值为13，如果是限时折扣或者是单买的话，payment_type不做赋值默认为2
       if (

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/ImageData/index.js

@@ -1,5 +1,6 @@
 // src/ConfirmOrder/components/GoodsInfo/components/ImageData/index.js
 const computedBehavior = require('miniprogram-computed').behavior
+const {utils} = require("live-mp-tools");
 
 Component({
   behaviors: [computedBehavior],
@@ -51,28 +52,9 @@ Component({
   },
   computed: {
     realSrc(data) {
-      
       // 腾讯云图片才会支持去压缩裁剪
       if (data.src.indexOf("myqcloud") > 0 && data.showCompress) {
-        const formatSrc = data.src.replace(/^http:/, "https:");
-        const curSrc = `${formatSrc.replace("file", "picsh")}?imageView2`;
-        const compressType = data.compressType ? `/${data.compressType}` : "";
-        const compressWidth = data.compressWidth
-          ? `/w/${data.compressWidth}`
-          : "";
-        const compressHeight = data.compressHeight
-          ? `/h/${data.compressHeight}`
-          : "";
-        const compress = data.compress ? `/q/${data.compress}` : "";
-        const format = data.format ? `/format/${data.format}` : "";
-        return (
-          curSrc +
-          compressType +
-          compressWidth +
-          compressHeight +
-          compress +
-          format
-        );
+        return utils.replaceCDN(data.src, `?imageView2/2/w/${data.compressWidth || 400}/h/${data.compressHeight || 400}/q/${data.compress || 100}`)
       } else {
         return data.src;
       }

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/index.js

@@ -15,6 +15,7 @@ import {
   SPECIAL_COLUMN,
   E_BOOK,
   TRAINING_CAMP,
+  SERVICE_GOODS,
   SVIP_SPU_TYPE,
 } from "../../../common/utils/constants";
 import {
@@ -140,7 +141,7 @@ Component({
       }
     },
     showStepper(data) {
-      let spuTypes = [ENTITY_GOODS, VALUE_COUPON];
+      let spuTypes = [ENTITY_GOODS, VALUE_COUPON, SERVICE_GOODS];
       return (
         (spuTypes.includes(data.baseInfo?.spu_type) || data.sendFriend) &&
         !data.goodsInfo.is_goods_package

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.less

@@ -1,9 +1,24 @@
 .pickup-select-content {
   .van-cell__value {
     flex: 3;
-    text-align: right;
   }
-  .custom-title {
-    margin-left: 16rpx;
+  .right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    .custom-title {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
+    .custom-site {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
   }
 }

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.wxml

@@ -5,8 +5,10 @@
       <view slot="title">
         <van-tag color="#EBF1FF" text-color="#105CFB">自提</van-tag>
       </view>
-      <view class="custom-title">{{ setPlace_name }}</view>
-      <view class="custom-site">{{ setPlace_area }}</view>
+      <view class="right">
+        <view class="custom-title">{{ setPlace_name }}</view>
+        <view class="custom-site">{{ setPlace_area }}</view>
+      </view>
     </van-cell>
   </van-cell-group>
 </view>

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.wxss

@@ -1,7 +1,22 @@
 .pickup-select-content .van-cell__value {
   flex: 3;
-  text-align: right;
 }
-.pickup-select-content .custom-title {
+.pickup-select-content .right {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.pickup-select-content .right .custom-title {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  margin-left: 16rpx;
+}
+.pickup-select-content .right .custom-site {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   margin-left: 16rpx;
 }

package/miniprogram_dist/CouponList/components/CouponItem/index.js

@@ -19,7 +19,8 @@ Component({
       },
       couponType: {
         //  优惠券 couponType: 1-领取 2-继续领 3-已领完 4-已过期(领取失败) 5-已结束 6-已达上限 7、已失效 
-        type: [Number, String],
+        type: Number,
+        optionalTypes: [String],
         value: 1
       },
       aliveInfo: { // 直播间信息
@@ -162,11 +163,12 @@ Component({
                 has_received: true
               })
               // 达到领取上限，隐藏按钮
-              if (dataInfo && dataInfo.receive_rule === dataInfo.current_user_received_count) {
+              if (dataInfo.receive_rule && dataInfo.receive_rule === dataInfo.current_user_received_count) {
                 this.setData({
                   coupon_type: 6
                 })
               }
+              this.triggerEvent('receivedSuccess') //优惠券领取成功抛出方法用于直播间热度上报
               wx.showToast({
                 title: '领取成功',
                 icon: 'none'

package/miniprogram_dist/CouponList/couponColumn/index.js

@@ -57,6 +57,9 @@ Component({
       },
       showPopup() {
         this.triggerEvent('showPopup')
+      },
+      receivedSuccess() {
+        this.triggerEvent('receivedSuccess')
       }
     }
 })

package/miniprogram_dist/CouponList/couponColumn/index.wxml

@@ -17,6 +17,7 @@
         aliveInfo="{{aliveInfo}}"
         catch:showPopup="showPopup"
         sensorReportParams="{{sensorReportParams}}"
+				bindreceivedSuccess="receivedSuccess" 
     />
   </view>
 </view >

package/miniprogram_dist/GoodsItem/index.js

@@ -8,27 +8,9 @@
  */
 import {debounce} from "../common/utils/index"
 import { getUserPermission, snapCheck } from "../common/api/liveGoodsList"
-import { sensorLog } from "live-mp-tools";
+const {utils, sensorLog } = require("live-mp-tools");
 
 const computedBehavior = require('miniprogram-computed').behavior
-const SPU_TYPE = {
-  1:"ITX",
-  2:"ADO",
-  3:"VDO",
-  4:"LVE",
-  5:"MMB",
-  6:"SPC",
-  8:"BSC",
-  20:"EBK",
-  25:"TCP",
-  29:"OLC",
-  21:"ENT",
-  35:"BTK",
-  41:"VCP",
-  42:"OLP",
-  45:"ALC"
-}
-
 
 Component({
   behaviors: [computedBehavior],
@@ -183,12 +165,12 @@ Component({
     },
     //销量/订阅。只有 实物商品 21 、专栏 6、大专栏 8、会员 5 展示,受B端店铺设置（hide_sub_count）：隐藏商品销量控制 0-显示 1-隐藏
     hasSaleNum(data){
-      return [21,6,8,5,41].indexOf(data.goodsItem.resource_type) > -1 && !data.goodsItem.hide_sub_count && data.goodsItem.order_num > 0
+      return [21,6,8,5,41,68].indexOf(data.goodsItem.resource_type) > -1 && !data.goodsItem.hide_sub_count && data.goodsItem.order_num > 0
     },
     //销量/订阅。只有 实物商品 21 、专栏 6、大专栏 8、会员 5 展示
     saleNum(data){
       //实物商品
-      if(data.goodsItem.resource_type === 21 || data.goodsItem.resource_type === 41){
+      if(data.goodsItem.resource_type === 21 || data.goodsItem.resource_type === 41 || data.goodsItem.resource_type === 68){
           return ' 已售 ' + (data.goodsItem.order_num || 0)
       } else if(data.goodsItem.resource_type === 6 || data.goodsItem.resource_type === 8 || data.goodsItem.resource_type === 5){
           return ' 订阅 ' + (data.goodsItem.order_num || 0)
@@ -250,6 +232,9 @@ Component({
         }else {
             return ''
         }
+    },
+    filterSrc(data){
+      return utils.replaceCDN(data.goodsItem.img_url, '?imageMogr2/thumbnail/400x400>/ignore-error/1')
     }
   },
   /**
@@ -339,8 +324,8 @@ Component({
   },
   // 判断权益
   judgePermission: debounce(async function (permission){
-    // 实物21 可多次购买,去详情页; 直播商品不管有没有权益都去详情页啦。
-    if(this.data.goodsItem.resource_type === 21 || this.data.goodsItem.resource_type === 4){
+    // 实物21 有价优惠券41  可多次购买,去详情页; 直播商品4不管有没有权益都去详情页啦。
+    if([41, 4, 21].indexOf(Number(this.data.goodsItem.resource_type)) > -1){
       this.toDetails()
       return
     }
@@ -382,7 +367,7 @@ getUserPermission(){
           spu_id: this.data.goodsItem.resource_id,
           resource_type: this.data.goodsItem.resource_type,
           resource_id: this.data.goodsItem.id,
-          spu_type: SPU_TYPE[this.data.goodsItem.resource_type],
+          spu_type: this.data.goodsItem.spu_type,
           sku,
           count: 1,
           isAlive:1,

package/miniprogram_dist/GoodsItem/index.wxml

@@ -15,9 +15,9 @@
           <image  alt=""
                 class="goods-img"
                 mode="aspectFit"
-                src="{{goodsItem.img_url}}" />
+                src="{{filterSrc}}" />
           <text class="index">{{index + 1}}</text>
-          <text class="goods-type">{{goodsItem.resourceTypeName}}</text>
+          <text class="goods-type">{{goodsItem.resource_type_name}}</text>
           <image wx:if="{{ isShowExamplaining }}" class="goods-explaining" src="../../common/assets/images/liveGoodsList/explaining.png" />
         </view>
         <view class="right">

package/miniprogram_dist/LiveGoodsList/index.js

@@ -104,7 +104,8 @@ Component({
       formExplainingGoods: {}, //小卡片拿不到一些字段，从props接受到讲解中的商品resourceID 再从接口返回里面取
       explainingGoodsIndex: 1,
       coupon_switch: true,
-      currentGoodsItem: {}
+      currentGoodsItem: {},
+      componentsState: 1
     },
     lifetimes: {
         // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
@@ -169,7 +170,8 @@ Component({
             if(this.data.finished || this._freshing){
                 return
             }
-            this.getGoodsList()
+            let onScrolltolower  = true
+            this.getGoodsList(onScrolltolower)
         },
         getExplainingGoodsInfo() {
           // 打散获取讲解中商品的请求，缓解后台压力
@@ -199,7 +201,8 @@ Component({
             })
           }, this.getRandomInt(0, 1000));
         },
-        getGoodsList(){
+        getGoodsList(onScrolltolower = false){
+            let state = this.data.componentsState 
             let params = {
               alive_id: this.data.aliveInfo.alive_id,
               type: 1,
@@ -210,16 +213,14 @@ Component({
             getGoodsList(params).then(res=>{
               let { data, code } = res.data
               if (code === 0) {
+                // 关闭弹窗的时候返回的数据丢弃 // 上拉加载与下拉刷新一起触发时丢弃上拉加载数据
+                if(state !==this.data.componentsState || (this._freshing === true && onScrolltolower) ) {
+                  return
+                }
                 var total = data[0] ? data[0].total : this.data.total
                 var finishedTxt = "加载中"
                 var finished = false
-
-                if(this._freshing){
-                    //下拉加载直接赋值
-                    this.formatData(data, true)
-                }else {
-                    this.formatData(data)
-                }
+                this.formatData(data,onScrolltolower)
                 // 下拉加载，且数据返回空
                 if(this._freshing && data.length === 0){
                   finishedTxt = "no-data"
@@ -243,22 +244,23 @@ Component({
               }
             })
         },
-        formatData(data, refreshing = false){
+        formatData(data,onScrolltolower){
+          //onScrolltolower代表是上拉加载的标识，网卡的时候有上拉加载与下拉刷新同时请求，上拉加载的数据也push进去的情况。
             let goodsInfo = this.data.goodsInfo
             data.forEach((item,index) => {
                 this.formatItem(item)
-                if (!refreshing) {
+                if (!this._freshing && onScrolltolower) {
                   goodsInfo.push(item)
                 }
               })
-              if (refreshing) {
+              if (this._freshing && !onScrolltolower) {
                 //下拉刷新的时候直接赋值
                 goodsInfo = JSON.parse(JSON.stringify(data))
               }
               this.setData({goodsInfo})
         },
         formatItem(e) {
-            e.resourceTypeName = SPU_TYPE[e.resource_type] // 商品类型
+            e.resourceTypeName = e.resource_type_name // 商品类型
             e.leftStock = e.is_activity && e.now_stock ? e.now_stock : e.stock // 商品库存，活动中且有活动库存就用活动库存
             // 处理未到活动时间的限时折扣
             if (e.activity_type === 3) {
@@ -286,7 +288,7 @@ Component({
             arr.push({
                 active: "",
                 price: e.price,
-                weight: e.price + 0.0002,
+                weight: e.price + 0.0003,
               })
             // 活动管理、实物商品、有价优惠券、线下课和课时包不能设置活动库存，其他可以设置活动库存得需要判断是否还剩余活动库存;拼团也不能设置活动库存。
             let notExistNowStock = [9, 21, 41, 29, 42].indexOf(e.resource_type) > -1
@@ -305,7 +307,7 @@ Component({
                 //判断超级会员价
                 active: "超级会员",
                 price: e.svip_price,
-                weight: e.svip_price + 0.0003,
+                weight: e.svip_price + 0.0002,
               })
             arr.sort((a, b) => a.weight - b.weight)
             let svipAllFree = e.resource_rights_type === 1
@@ -323,7 +325,7 @@ Component({
             }
             e.priceLineShowInt = this.priceInt(e.priceLine) // 展示划线价的整数部分
             e.priceLineShowFlow = this.priceFlow(e.priceLine) // 展示划线的小数部分
-            e.entityShowStock =  (e.resource_type === 21 || e.resource_type === 41) && e.show_stock // 实物商品库存依赖 B端店铺设置（show_stock）：详情页展示不展示剩余件数
+            e.entityShowStock =  (e.resource_type === 21 || e.resource_type === 41 || e.resource_type === 68) && e.show_stock // 实物商品库存依赖 B端店铺设置（show_stock）：详情页展示不展示剩余件数
             e.hasStock = [29,35].indexOf(e.resource_type) > -1 || e.entityShowStock || e.now_stock // 班课、线下课、实物商品、体验课、有活动库存，满足其一即展示库存
           },
         priceInt(val){
@@ -351,7 +353,14 @@ Component({
         showInfoCollection(){
           this.triggerEvent("showInfoCollection")
         },
+        // 领取成功优惠券上报热度
+        receivedSuccess() {
+          this.triggerEvent("receivedSuccess")
+        },
         closePop(){
+          this.setData({
+            componentsState: this.data.componentsState + 1
+          })
            this.triggerEvent("closePop")
         },
         gotoPayRecords(){

package/miniprogram_dist/LiveGoodsList/index.wxml

@@ -11,7 +11,7 @@
 <view>
   <custom-popup
     showPopup="{{ show }}"
-    customStyle="height: calc(100% - 494rpx);"
+    customStyle="height: calc(100% - 422rpx);"
     bind:close="closePop"
     overlay="{{false}}">
     <view slot="header">
@@ -23,7 +23,7 @@
       <!-- 商品列表 start-->
       <scroll-view class="goods-list"  scroll-y="true" bindscrolltolower="onScrolltolower" refresher-triggered="{{refreshing}}" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}">
       <!-- 优惠券列表 start -->
-      <coupon-list aliveInfo="{{ aliveInfo }}" bind:showPopup="showInfoCollection" sensorReportParams="{{sensorReportParams}}"></coupon-list>
+      <coupon-list aliveInfo="{{ aliveInfo }}" bind:showPopup="showInfoCollection" bind:receivedSuccess="receivedSuccess" sensorReportParams="{{sensorReportParams}}"></coupon-list>
       <!-- 优惠券列表 end -->
       <!-- 讲解中的商品 start -->
         <block wx:if="{{showExplainingGoods}}">

package/miniprogram_dist/Lottery/components/AddressCollection/index.js

@@ -1,5 +1,5 @@
 import {connect} from '../../store/index'
-import {toast} from '../../utils'
+import {toast, hasKey} from '../../utils'
 
 const computedBehavior = require('miniprogram-computed').behavior
 
@@ -8,6 +8,8 @@ const mapState = state => ({
   addressInfo: state.addressInfo,
   addressSubmitCallback: state.addressSubmitCallback
 })
+
+
 Component(
   connect(mapState)({
     behaviors: [computedBehavior],
@@ -20,7 +22,11 @@ Component(
         return Object.keys(data.addressQuery).length > 0
       },
       isAddressInfoReady(data) {
-        return data.addressInfo.addressInfo && Object.keys(data.addressInfo.addressInfo).length > 0;
+        const { addressInfo } = data
+        if(addressInfo.express_type === 2) {
+          return hasKey(addressInfo.pickerUserInfo) && hasKey(addressInfo.picksiteInfo)
+        }
+        return hasKey(addressInfo.addressInfo) 
       }
     },
     observers: {},
@@ -45,16 +51,13 @@ Component(
       onStateChange({detail: isEntry}) {
         this.setData({isEntry})
       },
-      hasKey(obj) {
-        return obj && Object.keys(obj).length > 0
-      },
       validateSubmitInfo() {
         const info = this.data.addressInfo
-        if (info.express_type === 1 && !this.hasKey(info.addressInfo)) {
+        if (info.express_type === 1 && !hasKey(info.addressInfo)) {
           toast('请先添加收货地址')
           return false
         }
-        if (info.express_type === 2 && !(this.hasKey(info.pickerUserInfo) && this.hasKey(info.picksiteInfo))) {
+        if (info.express_type === 2 && !(hasKey(info.pickerUserInfo) && hasKey(info.picksiteInfo))) {
           toast('请完善提货信息')
           return false
         }
@@ -67,4 +70,4 @@ Component(
       }
     }
   })
-)
+)

package/miniprogram_dist/Lottery/components/CommonPopup/index.less

@@ -17,7 +17,7 @@
   &.red {
     // 红色背景的抽奖弹窗顶部超出一部分，高度特殊计算
     overflow: hidden;
-    height: calc(100% - 388rpx);
+    height: calc(100% - 320rpx);
     background: transparent !important;
     .close-icon {
       top: 136rpx;
@@ -37,7 +37,7 @@
     }
   }
   &.orange {
-    height: calc(100% - 490rpx);
+    height: calc(100% - 422rpx);
     background: transparent !important;
     .close-icon {
       top: 24rpx;
@@ -48,7 +48,7 @@
     }
   }
   &.white {
-    height: calc(100% - 490rpx);
+    height: calc(100% - 422rpx);
     background: #fff;
     .close-icon {
       top: 24rpx;
@@ -60,7 +60,7 @@
   }
   // custom-classes
   &.address-collection-popup {
-    height: calc(100% - 490rpx);
+    height: calc(100% - 422rpx);
     background: #f5f5f5;
   }
 }

package/miniprogram_dist/Lottery/components/CommonPopup/index.wxss

@@ -15,7 +15,7 @@
 }
 .common-popup.red {
   overflow: hidden;
-  height: calc(100% - 388rpx);
+  height: calc(100% - 320rpx);
   background: transparent !important;
 }
 .common-popup.red .close-icon {
@@ -34,7 +34,7 @@
   background: linear-gradient(to right, #FE8758, #FE9656);
 }
 .common-popup.orange {
-  height: calc(100% - 490rpx);
+  height: calc(100% - 422rpx);
   background: transparent !important;
 }
 .common-popup.orange .close-icon {
@@ -45,7 +45,7 @@
   left: 0;
 }
 .common-popup.white {
-  height: calc(100% - 490rpx);
+  height: calc(100% - 422rpx);
   background: #fff;
 }
 .common-popup.white .close-icon {
@@ -56,6 +56,6 @@
   height: 240rpx;
 }
 .common-popup.address-collection-popup {
-  height: calc(100% - 490rpx);
+  height: calc(100% - 422rpx);
   background: #f5f5f5;
 }

package/miniprogram_dist/Lottery/components/LotteryInfo/index.js

@@ -20,13 +20,14 @@ Component(
     data: {
       remotePic,
       prizeInfo: {},
-      selectedIndex: 0
+      selectedIndex: 0,
+      isShowParticipant: 0 //0 不展示，1 展示
     },
     computed: {
       countdownLabel(data) {
         return `${
           data.prizeInfo.prize_activity_num ? `${data.prizeInfo.prize_activity_num}人已参与` : '暂无人参与'
-        }，开奖倒计时`
+        }`
       },
       joinPrompt(data) {
         const joinBtnMap = {
@@ -108,7 +109,9 @@ Component(
             if (data.code === 0) {
               const prizeInfo = data.data || {}
               this.setData({prizeInfo})
+              this.setData({isShowParticipant: prizeInfo.is_show_participant})
               this.store.dispatch({type: 'set_participation_condition', payload: prizeInfo.prize_condition})
+              this.store.dispatch({type: 'is_show_participant', payload: prizeInfo.is_show_participant})
             }
           })
           .catch(err => {
@@ -124,22 +127,25 @@ Component(
             app_id: this.data.baseInfo.app_id, // 店铺id
             alive_id: this.data.baseInfo.alive_id,
             user_id: this.data.baseInfo.user_id,
-            prize_id: this.data.prizeInfo.prize_id
+            prize_id: this.data.prizeInfo.prize_id,
+            type: 1
           }
           joinCommentLottery(params)
             .then(({data}) => {
-              if (data.code === 0) {
-                this.store.dispatch({type: 'set_is_ready_to_comment', payload: true})
-                this.store.dispatch({type: 'hide_lottery_info'})
-                if (prizeCondition === PARTICIPATION_CONDITION.SPECIFY_COMMENT) {
-                  eventBus.emit('input_change', this.data.lotteryInfo.prize_param.ext.content)
-                }
-                eventBus.emit('input_focus')
+              if (data.code !== 0) {
+                return Promise.reject(data);
               }
             })
             .catch(err => {
               console.error(err)
-            })
+            });
+
+            this.store.dispatch({type: 'set_is_ready_to_comment', payload: true})
+            this.store.dispatch({type: 'hide_lottery_info'})
+            if (prizeCondition === PARTICIPATION_CONDITION.SPECIFY_COMMENT) {
+              eventBus.emit('input_change', this.data.lotteryInfo.prize_param.ext.content)
+            }
+            eventBus.emit('input_focus')
           return
         }
 

package/miniprogram_dist/Lottery/components/LotteryInfo/index.wxml

@@ -9,10 +9,10 @@
           <image class="right-arrow-icon" src="../../../common/assets/images/lottery/white_right_arrow.png" />
         </view>
       </block>
-      <text wx:else>本次抽奖无人参与</text>
+      <text wx:else>本次抽奖无人中奖</text>
     </view>
     <view wx:else class="countdown-box">
-      <text class="label">{{countdownLabel}}</text>
+      <text class="label" wx:if="{{isShowParticipant}}">{{countdownLabel}}，</text><text class="label">开奖倒计时</text>
       <lottery-countdown></lottery-countdown>
     </view>
     <view class="prize-box">