Merge branch 'test' of DeNet/de-net-official into master

pages/index.vue

@@ -44,17 +44,18 @@
 						<div class="txt">AWESOME! YOU Will GET</div>
 						<div class="head-money-area">
 							<img :src="currencyIconPath" alt />
-							<span class="money-txt">{{ receiveAmount }}</span>
+							<span class="money-txt" :style="{ fontSize: amount_font_size + 'px' }">{{ receiveAmount }}</span>
 						</div>
 					</div>
 				</div>
 
 				<!-- 领取列表 -->
 				<div class="luck-list-title">
-					<div>{{ detail.postBizData.receiveCount || 0 }}/{{ detail.postBizData.totalCount || 0 }} Winners</div>
+					<div>{{ detail.postBizData.receiveCount || 0 }}/{{ detail.postBizData.totalCount || 0 }} Winners
+					</div>
 					<div> {{ detail.postBizData.receiveAmountValue }} / {{
 							detail.postBizData.amountValue || ''
-					}} {{ detail.postBizData.amountCurrencyCode || '' }}</div>
+					}} {{ detail.postBizData.currencySymbol || '' }}</div>
 				</div>
 				<div class="luck-list" @scroll="handleScroll($event)">
 					<div class="luck-item" v-for="item, i in luck_list" v-bind:key="i">
@@ -104,7 +105,7 @@
 						<div class="num">2</div>
 						<span>Complete Tasks by {{ detail.postBizData.postUserInfo.nickName }}</span>
 					</div>
-					<div class="tip">Follow、Like tweet、Retweet (Just 1-3 minutes)</div>
+					<div class="tip">Complete like, retweet and follow in a simple way</div>
 				</div>
 			</div>
 
@@ -138,7 +139,7 @@
 				<div>{{ detail.postBizData.receiveCount || 0 }}/{{ detail.postBizData.totalCount || 0 }} Winners</div>
 				<div> {{ detail.postBizData.receiveAmountValue }} / {{
 						detail.postBizData.amountValue || ''
-				}} {{ detail.postBizData.amountCurrencyCode || '' }}</div>
+				}} {{ detail.postBizData.currencySymbol || '' }}</div>
 			</div>
 			<div class="luck-list" @scroll="handleScroll($event)">
 				<div class="luck-item" v-for="item, i in luck_list" v-bind:key="i">
@@ -215,6 +216,7 @@ export default {
 			show_moblie: false,
 			show_home: false,
 			layer_show: false,
+			amount_font_size:46,
 			validity: '',
 			receiveAmount: 0,
 			validity_state: true,
@@ -236,7 +238,7 @@ export default {
 			luck_list: [],
 			luck_list_end: false,
 			config: {
-				extensionsInstallChannel : 'officeDownload', // chromeAppStore
+				extensionsInstallChannel: 'officeDownload', // chromeAppStore
 				extensionsInstallUrl: ''
 			}
 		}
@@ -268,7 +270,7 @@ export default {
 		}
 	},
 	methods: {
-		clickOpenChrome(){
+		clickOpenChrome() {
 			window.open('https://www.google.com/chrome')
 		},
 		isMobile() {
@@ -276,7 +278,7 @@ export default {
 			return flag;
 		},
 		installExtension() {
-			let {extensionsInstallChannel, extensionsInstallUrl} = this.config;
+			let { extensionsInstallChannel, extensionsInstallUrl } = this.config;
 			let url = extensionsInstallUrl || "https://d1mcov78iir8kk.cloudfront.net/extensions/chrome/denet1_0_1.zip"
 			switch (extensionsInstallChannel) {
 				case "officeDownload":
@@ -310,6 +312,10 @@ export default {
 				this.getReceivedList()
 			}
 		},
+		getFontSize(amount) {
+			let _num = parseInt(360 / amount.length);
+			this.amount_font_size = _num < 46 ? _num : 46;
+		},
 		setCookieMid() {
 			let _cookie_mid_arr = Cookies.get('mid') || []
 			if (_cookie_mid_arr.length > 0) {
@@ -345,6 +351,7 @@ export default {
 					}
 					this.getValidity(data.data.endTimestamp)
 					this.receiveAmount = data.data.receiveAmount
+					this.getFontSize(this.receiveAmount)
 					break;
 				case '2003':
 					this.status = 'expire'
@@ -438,7 +445,7 @@ export default {
 			}
 		},
 		async getConfig() {
-			let {data} = await axios.post(`${baseURL}/denet/base/config/getFrontConfig`, {
+			let { data } = await axios.post(`${baseURL}/denet/base/config/getFrontConfig`, {
 				baseInfo: {
 					appVersionCode: this.appVersionCode,
 					mid: this.mid
@@ -483,6 +490,7 @@ export default {
 		if (!this.detail.postId) {
 			return
 		}
+		console.log(this.detail)
 		//改变font-size
 		// (function (doc, win) {
 		// 	var docEI = doc.documentElement,
@@ -630,7 +638,7 @@ body,
 		flex: 1;
 		width: 100%;
 		background: #fff;
-		overflow: auto;
+		overflow-y: auto;
 
 		.luck-item {
 			display: flex;
@@ -839,7 +847,7 @@ body,
 		height: 65rem;
 		border-radius: 2rem;
 		// background: red;
-		overflow: hidden;
+		overflow-y: hidden;
 		box-shadow: 0 0 5px #888888;
 		background: #fff;
 
@@ -936,6 +944,7 @@ body,
 					span {
 						margin-left: 1.3rem;
 						font-size: 4.6rem;
+						word-break: break-all;
 					}
 				}
 			}
@@ -955,7 +964,7 @@ body,
 
 		.luck-list {
 			background: #fff;
-			overflow: auto;
+			overflow-y: auto;
 
 			.luck-item {
 				display: flex;