merge conf

components/MobileLandPage.vue

@@ -15,17 +15,17 @@
 				</div>
 			</template>
 			<!-- 红包 -->
-			<template v-else-if="isCommonCpd">
+			<template v-else-if="isLottaryCpd">
 				<div class="mobile-land-page-prize-info-test">You are gifted an entries to earn</div>
 				<div class="mobile-land-page-prize-info-test">
 					<img v-if="!isCustomRewardCpd" class="icon" :src="currencyIconPath" />
 					<span class="pre-amount-value">{{ isCustomRewardCpd ? 1 : amountValue }}</span>
 					<span class="prize-name">{{ prize }}</span>
-					<span class="usd-amount" v-if="!isCustomRewardCpd"> (${{ usValue }})</span>
+					<span class="usd-amount" v-if="!isCustomRewardCpd && usValue"> (${{ usValue }})</span>
 				</div>
 			</template>
 			<!-- 抽奖 -->
-			<template v-else-if="isLottaryCpd">
+			<template v-else-if="isCommonCpd">
 				<div class="mobile-land-page-prize-info-test">
 					You Won
 					<img v-if="!isCustomRewardCpd" class="icon" :src="currencyIconPath" />
@@ -33,7 +33,7 @@
 					<FontZoom width="240" style="color: #000">
 						<span class="prize-name">{{ prize }}</span>
 					</FontZoom>
-					<span class="usd-amount" v-if="!isCustomRewardCpd"> (${{ usValue }})</span>
+					<span class="usd-amount" v-if="!isCustomRewardCpd && usValue"> (${{ usValue }})</span>
 				</div>
 				<div class="mobile-land-page-prize-info-test">in the Giveaway!</div>
 			</template>
@@ -41,6 +41,9 @@
 			<template v-else-if="isTreasureCpd">
 				<div class="mobile-land-page-prize-info-test">Complete the quest to win up to</div>
 				<div class="mobile-land-page-prize-info-test">
+					<img class="icon" :src="currencyIconPath" />
+					<span class="pre-amount-value" v-if="amountValue">{{ amountValue }}</span>
+					<span class="prize-name">{{ prize }}</span>
 					<span class="usd-amount treasure-usd-amount"> ${{ usValue }} for you two!</span>
 				</div>
 			</template>
@@ -105,12 +108,12 @@ export default {
 		},
 		amountValue: {
 			// 奖品数量
-			type: String,
+			type: [String, Number],
 			default: '1',
 		},
 		usValue: {
 			// 转换为美金 的价值
-			type: String,
+			type: [String, Number],
 			default: '',
 		},
 		prize: {
@@ -168,7 +171,9 @@ export default {
 			}
 		},
 		tipCpd() {
-			if (this.isCommonCpd) {
+			if (!this.useFul) {
+				return 'login Twitter to install DeNet Chrome Extension';
+			} else if (this.isCommonCpd) {
 				return 'to claim,  log in twitter to install Denet Chrome Extension';
 			} else if (this.isLottaryCpd) {
 				return 'To participate, login Twitter to install DeNet Chrome Extension';
@@ -330,7 +335,7 @@ export default {
 			}
 
 			.treasure-usd-amount {
-				color: #F99D23;
+				color: #f99d23;
 				font-weight: 700;
 				font-size: 18px;
 			}