zhangwei před 3 roky
rodič
revize
267a555098
1 změnil soubory, kde provedl 32 přidání a 15 odebrání
  1. 32 15
      pages/index.vue

+ 32 - 15
pages/index.vue

@@ -1,12 +1,13 @@
 <template>
-	<div class="content" :style="{ 'backgroundImage': `url(${this.back_img})` }" v-show="home_show">
+	<div class="content" :style="{ 'backgroundImage': `url(${this.back_img})` }" v-show="home_show" v-if="detail">
 		<div class="logo">
 			<img src="/svg/icon-logo.svg" alt />
 		</div>
 		<!-- 红包 -->
 		<div class="redPacket" :class="{ redPacket2: status != 'open', key_packet: status == 'open' }"
 			v-show="status != 'error'">
-			<div class="area" :class="{ key_area: status == 'open' }" v-show="status == 'open' || status == 'no-chrome'">
+			<div class="area" :class="{ key_area: status == 'open' }"
+				v-show="status == 'open' || status == 'no-chrome'">
 				<div class="title">
 					<img :src="detail.postBizData.postUserInfo.avatarUrl" alt />
 					<span>Giveaways from: {{ detail.postBizData.postUserInfo.nickName }}</span>
@@ -32,7 +33,7 @@
 				<div class="head-area" v-else-if="status == 'nothing'">Better luck next time!</div>
 				<div class="head-area" v-else-if="status == 'expire'">
 					<div>This Giveways</div>
-					<div>expired on 03-14</div>
+					<div>expired on {{ formatTime(detail.postBizData.endTimestamp,'MM-DD') }}</div>
 				</div>
 				<div class="head-money" v-if="status == 'open' || status == 'opened'">
 					<img src="/svg/icon-usd.svg" alt />
@@ -126,9 +127,9 @@ import { isBrowser } from '../utils/help.js'
 var moment = require('moment');
 
 const api = {
-	prod: 'https://api.denet.me',
-	pre: 'https://preapi.denet.me',
-	test: 'https://testapi.denet.me',
+	prod: 'https://api.denet.net',
+	pre: 'https://preapi.denet.net',
+	test: 'https://testapi.denet.net',
 }
 
 const baseURL = api[process.env.MODE]
@@ -198,8 +199,8 @@ export default {
 		}
 	},
 	methods: {
-		formatTime(time) {
-			return moment(time).format('MM-DD hh:mm:ss')
+		formatTime(time,_type = 'MM-DD hh:mm:ss') {
+			return moment(time).format(_type)
 		},
 		guid() {
 			return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
@@ -248,6 +249,9 @@ export default {
 					this.getValidity(data.data.endTimestamp)
 					this.receiveAmount = data.data.receiveAmount
 					break;
+				case '2003':
+					this.status = 'expire'
+					break
 				// 红包被领完了
 				case '2008':
 					this.status = 'nothing'
@@ -258,6 +262,7 @@ export default {
 					break
 				default:
 					console.log('getRedPacket', data)
+					this.home_show = false
 					break;
 			}
 			// 领取列表分页
@@ -306,8 +311,10 @@ export default {
 			}, 1000)
 		},
 		setPickupInfo() {
-			let  pickupInfo = {	srcContentId: this.detail.srcContentId,
-								postNickName: this.detail.postBizData.postUserInfo.nickName };
+			let pickupInfo = {
+				srcContentId: this.detail.srcContentId,
+				postNickName: this.detail.postBizData.postUserInfo.nickName
+			};
 			Cookies.set('pickup_info', JSON.stringify(pickupInfo), { expires: 100 });
 		}
 	},
@@ -331,14 +338,25 @@ export default {
 			if (data.data && data.data.postBizData && typeof data.data.postBizData == 'string') {
 				data.data.postBizData = JSON.parse(data.data.postBizData)
 			}
-			return {
-				base_url:baseURL,
-				detail: data.data,
-			}
+		}
+		return {
+			base_url: baseURL,
+			detail: data.data || {
+				postId: '',
+				postBizData: {
+					imagePath: '',
+					postUserInfo: {
+					}
+				}
+			},
 		}
 	},
 
 	mounted() {
+		console.log('this.detail', this.detail)
+		if (!this.detail.postId) {
+			return
+		}
 		//改变font-size
 		(function (doc, win) {
 			var docEI = doc.documentElement,
@@ -490,7 +508,6 @@ body,
 
 			.head-area {
 				height: 10rem;
-				line-height: 10rem;
 				text-align: center;
 				letter-spacing: 0.3px;
 				font-size: 2rem;