浏览代码

[bug]custom in poster

jihuaqiang 2 年之前
父节点
当前提交
3b67e75e8c

+ 6 - 4
src/view/components/custom-card-cover.vue

@@ -5,13 +5,15 @@
         <div class="common-bottom">
             <div class="theme">
                 <img v-if="isLottaryCpd" class="icon" :src="require('@/assets/svg/icon-last-time.svg')"/>
-                <span v-if="isLottaryCpd" class="time" >{{formatSecondsAsDaysOrTime(data.validityDuration * 3600)}}</span>
+                <span v-if="isLottaryCpd" class="time" >{{data.countDown || formatSecondsAsDaysOrTime(data.validityDuration * 3600)}}</span>
                 <span class="info">{{isLottaryCpd ? 'Left' : 'Instant Giveaway'}}</span>
             </div>
             <div class="winner-info">
-                <span class="count">{{data.totalCount}} Winners</span>
-                <span>to Share </span>
-                <span class="prize-name">{{isMoneyRewardCpd ? data.amountValue + ' ' + data.tokenSymbol : data.customizedReward}}</span>
+                <component-zoom width="320" fontSize="12">
+                    <span class="count">{{data.totalCount}} Winners</span>
+                    <span>to Share </span>
+                    <span class="prize-name">{{isMoneyRewardCpd ? data.amountValue + ' ' + data.tokenSymbol : data.customizedReward}}</span>
+                </component-zoom>
             </div>
             <div class="open-btn" @click="open">
                 {{isLottaryCpd ? 'Participate Now' : 'Open Now'}}

+ 2 - 2
src/view/components/custom-card-horizontal-cover.vue

@@ -262,7 +262,7 @@ watch(() => props.data, () => {
         opacity: 0.7;
         .last-time {
             position: absolute;
-            left: 8%;
+            left: 7.5%;
             top: 38%;
         }
         .trophy-count {
@@ -274,7 +274,7 @@ watch(() => props.data, () => {
     &-desc-lottary {
         .trophy-count {
             position: absolute;
-            left: 9%;
+            left: 8%;
             top: 38%;
         }
     }

+ 6 - 6
src/view/iframe/red-packet/luck-draw.vue

@@ -215,7 +215,7 @@
 
         <!-- no-open -->
         <div v-else-if="state.status == 'not-open'" class="not-open">
-            <template v-if="state.detail.posterType === 2 && state.detail.customPosterInstalled">
+            <!-- <template v-if="state.detail.posterType === 2 && state.detail.customPosterInstalled">
                 <img class="customImg" :src="state.detail.customPosterInstalled" />
                 <div class="customBottom">
                     <div class="theme">
@@ -226,14 +226,14 @@
                     <div class="winner-info">
                         <span class="count">{{state.detail.totalCount}} Winners</span>
                         <span>to Share </span>
-                        <span class="prize-name">{{state.detail.amountValue + ' ' + state.detail.currencySymbol}}</span>
+                        <span class="prize-name">{{state.detail.rewardType === RewardType.money ? state.detail.amountValue + ' ' + state.detail.currencySymbol : state.detail.customizedReward}}</span>
                     </div>
                     <div class="open-red" @click="clickOpenRedPacket">
                         Participate Now
                     </div>
                 </div>
-            </template>
-            <template v-else>
+            </template> -->
+            <!-- <template v-else> -->
                 <custom-card-cover 
                     :data="{
                         totalCount: state.detail.totalCount,
@@ -249,11 +249,11 @@
                         },
                         rewardType: state.detail.rewardType,
                         customizedReward: state.detail.customizedReward,
-                        customPosterUrl: ''
+                        customPosterUrl: state.detail.customPosterInstalled
                     }"
                     @clickOpenRedPacket = "clickOpenRedPacket"
                 ></custom-card-cover>
-            </template>
+            <!-- </template> -->
         </div>
 
 

+ 5 - 5
src/view/iframe/red-packet/red-packet.vue

@@ -218,7 +218,7 @@
 
     <!-- no-open -->
     <div v-else-if="state.status == 'not-open'" class="not-open">
-      <template v-if="state.detail.posterType === 2 && state.detail.customPosterInstalled">
+      <!-- <template v-if="state.detail.posterType === 2 && state.detail.customPosterInstalled">
         <img class="customImg" :src="state.detail.customPosterInstalled" />
         <div class="customBottom">
             <div class="theme">
@@ -234,7 +234,7 @@
             </div>
         </div>
       </template>
-      <template v-else>
+      <template v-else> -->
         <custom-card-cover 
           :data="{
               totalCount: state.detail.totalCount,
@@ -248,12 +248,12 @@
                   avatarUrl: state.detail.postUserInfo.avatarUrl
               },
               rewardType: state.detail.rewardType,
-  customizedReward: state.detail.customizedReward,
-              customPosterUrl: ''
+              customizedReward: state.detail.customizedReward,
+              customPosterUrl: state.detail.customPosterInstalled
           }"
           @clickOpenRedPacket = "clickOpenRedPacket"
       ></custom-card-cover>
-      </template>
+      <!-- </template> -->
     </div>