hwb0 3 жил өмнө
parent
commit
ace9a0d971

+ 1 - 1
packageOther/about/index.vue

@@ -4,7 +4,7 @@
 		<view class="about">
 			<view class="flex about-logo">
 				<image src="../../static/public/logo.png" mode=""></image>
-				<view class="edition">v 2.0.0</view>
+				<view class="edition">v 2.0.1</view>
 			</view>
 			<view class="about-action">
 				<u-cell-group :border="false">

+ 5 - 3
pages/index/index.vue

@@ -254,9 +254,11 @@
 			// 活动
 			getActivityList() {
 				$http.post(`/api/v1/mp/user/marketing/recent`, {}).then(res => {
-					let data = res && res.data
-					let timestamp = parseInt(new Date().getTime())
-					this.activityTime = data.endTime - timestamp
+					if(res && res.data) {
+						let data = res && res.data
+						let timestamp = parseInt(new Date().getTime())
+						this.activityTime = data.endTime - timestamp
+					}
 				})
 			},