xiaoe_mp_npm 0.1.23-t0321 → 0.2.1

package/.gitlab-ci.yml

@@ -3,7 +3,7 @@ build_test:
   stage: build
   only:
     - dev
-    - dev-gwenniezhou
+    - feature/live_marketing_iteration
     - fix/record-lottery
   tags:
     - fe-group-prod-runner-2

package/miniprogram_dist/GoodsItem/index.js

@@ -234,7 +234,7 @@ Component({
         }
     },
     filterSrc(data){
-      return utils.replaceCDN(data.goodsItem.img_url, '?imageView2/2/w/400/h/400/q/100')
+      return utils.replaceCDN(data.goodsItem.img_url, '?imageMogr2/thumbnail/400x400>/ignore-error/1')
     }
   },
   /**

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 => {

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

@@ -12,7 +12,7 @@
       <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">

package/miniprogram_dist/Lottery/components/LotteryResult/LosingLottery/index.js

@@ -3,7 +3,10 @@ import {connect} from '../../../store/index'
 
 const computedBehavior = require('miniprogram-computed').behavior
 
-const mapState = state => ({lotteryInfo: state.lotteryInfo})
+const mapState = state => ({
+  lotteryInfo: state.lotteryInfo,
+  isShowParticipant: state.isShowParticipant
+})
 Component(
   connect(mapState)({
     behaviors: [computedBehavior],

package/miniprogram_dist/Lottery/components/LotteryResult/LosingLottery/index.wxml

@@ -6,7 +6,7 @@
   <image class="losing-icon" mode="widthFix" src="{{remotePic.losing_lottery}}" />
   <view class="check-winners">
     <block wx:if="{{resultInfo.prize_activity_num}}">
-      <text>共{{resultInfo.prize_activity_num}}人参与，</text>
+      <text wx:if="{{isShowParticipant}}">共{{resultInfo.prize_activity_num}}人参与，</text>
       <view class="inner" bind:tap="checkWinners">
         <text class="inner-under-line">查看中奖名单</text>
       </view>

package/miniprogram_dist/Lottery/components/LotteryResult/WinLottery/index.js

@@ -13,7 +13,8 @@ const computedBehavior = require('miniprogram-computed').behavior
 const mapState = state => ({
   baseInfo: state.baseInfo,
   lotteryStatus: state.lotteryStatus,
-  participationCondition: state.participationCondition
+  participationCondition: state.participationCondition,
+  isShowParticipant: state.isShowParticipant
 })
 Component(
   connect(mapState)({

package/miniprogram_dist/Lottery/components/LotteryResult/WinLottery/index.wxml

@@ -2,7 +2,7 @@
   <image class="title" src="{{remotePic.winner_background_new_title}}" />
   <view class="check-winners">
     <block wx:if="{{resultInfo.prize_activity_num}}">
-      <text>共{{resultInfo.prize_activity_num}}人参与，</text>
+      <text wx:if="{{isShowParticipant}}">共{{resultInfo.prize_activity_num}}人参与，</text>
       <view class="inner" bind:tap="checkWinners">
         <text>查看中奖名单</text>
         <image class="right-arrow-icon" src="../../../../common/assets/images/lottery/white_right_arrow.png" />

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

@@ -10,7 +10,9 @@ const mapState = state => ({
   prizeId: state.currentPrizeId,
   backTo: state.winnersBackTo,
   myLotteryVisible: state.myLotteryVisible,
-  myLotteryContent: state.myLotteryContent
+  myLotteryContent: state.myLotteryContent,
+  isShowParticipant: state.isShowParticipant
+
 })
 Component(
   connect(mapState)({

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

@@ -14,7 +14,8 @@
   <view class="winner-number">
     <image class="emoji-icon" src="../../../common/assets/images/lottery/winner_list_smile_icon.svg" />
     <view class="message-box">
-      <text class="message">共{{winnersInfo.prize_activity_num}}人参与，{{winnersInfo.count}}人中奖</text>
+      <text class="message" wx:if="{{isShowParticipant}}">共{{winnersInfo.prize_activity_num}}人参与，</text>
+      <text class="message">{{winnersInfo.count}}人中奖</text>
     </view>
   </view>
   <scroll-view scroll-y="true" style="height: calc(100% - 198rpx);">

package/miniprogram_dist/Lottery/constants.js

@@ -114,5 +114,6 @@ export const ACTION_TYPE = {
   SET_ADDRESS_QUERY: 'set_address_query',
   SET_ADDRESS_INFO: 'set_address_info',
   SET_ADDRESS_SUBMIT_CALLBACK: 'set_address_submit_callback',
-  SET_PARTICIPATION_CONDITION: 'set_participation_condition'
+  SET_PARTICIPATION_CONDITION: 'set_participation_condition',
+  IS_SHOW_PARTICIPANT: 'is_show_participant'
 }

package/miniprogram_dist/Lottery/store/reducer.js

@@ -182,6 +182,12 @@ export default function reducer(state, action) {
         participationCondition: action.payload
       }
 
+    case ACTION_TYPE.IS_SHOW_PARTICIPANT:
+      return {
+        ...state,
+        isShowParticipant: action.payload
+      }
+
     default:
       return state
   }

package/miniprogram_dist/Sku/commSelect/index.js

@@ -221,7 +221,7 @@ Component({
 			// sku 基本信息
 			this.setData({
 				// 默认主图
-				skuPicture : utils.replaceCDN(baseInfo.goods_img[0], '?imageView2/2/w/600/h/600/q/100'),
+				skuPicture : utils.replaceCDN(baseInfo.goods_img[0], '?imageMogr2/thumbnail/600x600>/ignore-error/1'),
 				// 商品限购
 				limitPurchase:baseInfo.limit_purchase,
 				hasBuy:limitData,

package/miniprogram_dist/common/utils/helper.js

@@ -109,7 +109,7 @@ export const skuPropertyConvert = (skuProperty) => {
           return {
             id: d.attr_value,
             name: d.attr_value,
-            image: utils.replaceCDN(d.attr_img, '?imageView2/2/w/600/h/600/q/100')
+            image: utils.replaceCDN(d.attr_img, '?imageMogr2/thumbnail/600x600>/ignore-error/1')
           }
         })
       })(e)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "0.1.23-t0321",
+  "version": "0.2.1",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

package/src/GoodsItem/index.js

@@ -234,7 +234,7 @@ Component({
         }
     },
     filterSrc(data){
-      return utils.replaceCDN(data.goodsItem.img_url, '?imageView2/2/w/400/h/400/q/100')
+      return utils.replaceCDN(data.goodsItem.img_url, '?imageMogr2/thumbnail/400x400>/ignore-error/1')
     }
   },
   /**

package/src/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/src/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/src/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 => {

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

@@ -12,7 +12,7 @@
       <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">

package/src/Lottery/components/LotteryResult/LosingLottery/index.js

@@ -3,7 +3,10 @@ import {connect} from '../../../store/index'
 
 const computedBehavior = require('miniprogram-computed').behavior
 
-const mapState = state => ({lotteryInfo: state.lotteryInfo})
+const mapState = state => ({
+  lotteryInfo: state.lotteryInfo,
+  isShowParticipant: state.isShowParticipant
+})
 Component(
   connect(mapState)({
     behaviors: [computedBehavior],

package/src/Lottery/components/LotteryResult/LosingLottery/index.wxml

@@ -6,7 +6,7 @@
   <image class="losing-icon" mode="widthFix" src="{{remotePic.losing_lottery}}" />
   <view class="check-winners">
     <block wx:if="{{resultInfo.prize_activity_num}}">
-      <text>共{{resultInfo.prize_activity_num}}人参与，</text>
+      <text wx:if="{{isShowParticipant}}">共{{resultInfo.prize_activity_num}}人参与，</text>
       <view class="inner" bind:tap="checkWinners">
         <text class="inner-under-line">查看中奖名单</text>
       </view>

package/src/Lottery/components/LotteryResult/WinLottery/index.js

@@ -13,7 +13,8 @@ const computedBehavior = require('miniprogram-computed').behavior
 const mapState = state => ({
   baseInfo: state.baseInfo,
   lotteryStatus: state.lotteryStatus,
-  participationCondition: state.participationCondition
+  participationCondition: state.participationCondition,
+  isShowParticipant: state.isShowParticipant
 })
 Component(
   connect(mapState)({

package/src/Lottery/components/LotteryResult/WinLottery/index.wxml

@@ -2,7 +2,7 @@
   <image class="title" src="{{remotePic.winner_background_new_title}}" />
   <view class="check-winners">
     <block wx:if="{{resultInfo.prize_activity_num}}">
-      <text>共{{resultInfo.prize_activity_num}}人参与，</text>
+      <text wx:if="{{isShowParticipant}}">共{{resultInfo.prize_activity_num}}人参与，</text>
       <view class="inner" bind:tap="checkWinners">
         <text>查看中奖名单</text>
         <image class="right-arrow-icon" src="../../../../common/assets/images/lottery/white_right_arrow.png" />

package/src/Lottery/components/Winners/index.js

@@ -10,7 +10,9 @@ const mapState = state => ({
   prizeId: state.currentPrizeId,
   backTo: state.winnersBackTo,
   myLotteryVisible: state.myLotteryVisible,
-  myLotteryContent: state.myLotteryContent
+  myLotteryContent: state.myLotteryContent,
+  isShowParticipant: state.isShowParticipant
+
 })
 Component(
   connect(mapState)({

package/src/Lottery/components/Winners/index.wxml

@@ -14,7 +14,8 @@
   <view class="winner-number">
     <image class="emoji-icon" src="../../../common/assets/images/lottery/winner_list_smile_icon.svg" />
     <view class="message-box">
-      <text class="message">共{{winnersInfo.prize_activity_num}}人参与，{{winnersInfo.count}}人中奖</text>
+      <text class="message" wx:if="{{isShowParticipant}}">共{{winnersInfo.prize_activity_num}}人参与，</text>
+      <text class="message">{{winnersInfo.count}}人中奖</text>
     </view>
   </view>
   <scroll-view scroll-y="true" style="height: calc(100% - 198rpx);">

package/src/Lottery/constants.js

@@ -114,5 +114,6 @@ export const ACTION_TYPE = {
   SET_ADDRESS_QUERY: 'set_address_query',
   SET_ADDRESS_INFO: 'set_address_info',
   SET_ADDRESS_SUBMIT_CALLBACK: 'set_address_submit_callback',
-  SET_PARTICIPATION_CONDITION: 'set_participation_condition'
+  SET_PARTICIPATION_CONDITION: 'set_participation_condition',
+  IS_SHOW_PARTICIPANT: 'is_show_participant'
 }

package/src/Lottery/store/reducer.js

@@ -182,6 +182,12 @@ export default function reducer(state, action) {
         participationCondition: action.payload
       }
 
+    case ACTION_TYPE.IS_SHOW_PARTICIPANT:
+      return {
+        ...state,
+        isShowParticipant: action.payload
+      }
+
     default:
       return state
   }

package/src/Sku/commSelect/index.js

@@ -221,7 +221,7 @@ Component({
 			// sku 基本信息
 			this.setData({
 				// 默认主图
-				skuPicture : utils.replaceCDN(baseInfo.goods_img[0], '?imageView2/2/w/600/h/600/q/100'),
+				skuPicture : utils.replaceCDN(baseInfo.goods_img[0], '?imageMogr2/thumbnail/600x600>/ignore-error/1'),
 				// 商品限购
 				limitPurchase:baseInfo.limit_purchase,
 				hasBuy:limitData,

package/src/common/utils/helper.js

@@ -109,7 +109,7 @@ export const skuPropertyConvert = (skuProperty) => {
           return {
             id: d.attr_value,
             name: d.attr_value,
-            image: utils.replaceCDN(d.attr_img, '?imageView2/2/w/600/h/600/q/100')
+            image: utils.replaceCDN(d.attr_img, '?imageMogr2/thumbnail/600x600>/ignore-error/1')
           }
         })
       })(e)