免费抽奖模块调整

components/activity-help/activity-help.vue

@@ -63,8 +63,6 @@
 			},
 			
 			activityHelp() {
-				console.log(this.marketingId);
-				console.log(this.inviteCode);
 				uni.showLoading({
 					title: '助力中'
 				});

packageOperate/activity/index.vue

@@ -1,30 +1,46 @@
 <template>
-	<view>
+	<view style="background-image: linear-gradient(#ff7f00,#ffd600,#ff7f00); width: 100%; height: 100%;">
 		<u-navbar title="免费抽奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
-		<u-count-down v-if="info.status && JSON.parse(info.status).value == 3" :time="activityTime" format="DD:HH:mm:ss"
-			autoStart millisecond @change="onChange">
-			<view style="height: 98rpx;background-color: #fff;margin: 0 30rpx;line-height: 98rpx;overflow: hidden;">
-				<view class="data-btn">距离开奖时间：
-					<text v-if="timeData.days != 0">{{timeData.days}}&nbsp;天</text>
-					<text>{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours }}&nbsp;:</text>
-					<text>{{ timeData.minutes>=10?timeData.minutes:'0'+timeData.minutes }}&nbsp;:</text>
-					<text>{{ timeData.seconds>=10?timeData.seconds:'0'+timeData.seconds }}</text>
+		<view class="wrap" style="background: ;">
+			<view class="wrap-fakeNum">
+				<view class="fakeNum" >{{info.fakeNum}}人已参与</view>
+			</view>
+			<view v-if="info.status && JSON.parse(info.status).value == 3" class="wrap-date" >
+				<view class="wrap-date-on">
+					<view class="wrap-date-on-line" style="right: 30rpx;"></view>距离开奖
+					<view class="wrap-date-on-line" style="left: 30rpx;"></view>
 				</view>
-				<view style="float: right;"><span style="font-weight: 600;">{{info.fakeNum}}</span>人已参与</view>
+				<u-count-down :time="activityTime" format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
+					<view class="wrap-date-date">
+						<text v-if="timeData.days != 0">{{timeData.days}}天</text>
+						<text>{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours }}:</text>
+						<text>{{ timeData.minutes>=10?timeData.minutes:'0'+timeData.minutes }}:</text>
+						<text>{{ timeData.seconds>=10?timeData.seconds:'0'+timeData.seconds }}</text>
+					</view>
+				</u-count-down>
+			</view>
+			<view v-if="info.status && JSON.parse(info.status).value == 2" class="wrap-date" >
+				<view class="wrap-date-on">
+					<view class="wrap-date-on-line" style="right: 30rpx;"></view>距离开始
+					<view class="wrap-date-on-line" style="left: 30rpx;"></view>
+				</view>
+				<u-count-down :time="activityTimeTwo" format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
+					<view class="wrap-date-date">
+						<text v-if="timeData.days != 0">{{timeData.days}}天</text>
+						<text>{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours }}:</text>
+						<text>{{ timeData.minutes>=10?timeData.minutes:'0'+timeData.minutes }}:</text>
+						<text>{{ timeData.seconds>=10?timeData.seconds:'0'+timeData.seconds }}</text>
+					</view>
+				</u-count-down>
 			</view>
-		</u-count-down>
-		<u-count-down v-if="info.status && JSON.parse(info.status).value == 2" :time="activityTimeTwo"
-			format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
-			<view style="height: 98rpx;background-color: #fff;margin: 0 30rpx;line-height: 98rpx;overflow: hidden;">
-				<view class="data-btn">距离开始时间：
-					<text v-if="timeData.days != 0">{{timeData.days}}&nbsp;天</text>
-					<text>{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}&nbsp;:</text>
-					<text>{{timeData.minutes>=10?timeData.minutes:'0'+timeData.minutes}}&nbsp;:</text>
-					<text>{{timeData.seconds>=10?timeData.seconds:'0'+timeData.seconds}}</text>
+			<view style="height: 630rpx; width: ; background-color: #fff; margin: 15rpx 30rpx;">
+				<view>
+					<image src="../static/activity/effectstwo.png" mode=""></image>
 				</view>
-				<view style="float: right;"><span style="font-weight: 600;">{{info.fakeNum}}</span>人已参与</view>
 			</view>
-		</u-count-down>
+		</view>
+		
+		
 
 		<view>
 			<view v-for="(item,index) in awardsList" :key="index">
@@ -240,6 +256,26 @@
 </script>
 
 <style lang="scss" scoped>
+	.wrap{
+		&-fakeNum {
+			margin-top: 46rpx;
+			.fakeNum{
+				line-height: 66rpx; text-align: center; width: 266rpx; height: 76rpx; background: url(../static/activity/rectangle.png) no-repeat center center; background-size: 266rpx 76rpx;  margin: 0 auto; color: #A13D01; font-size: 30rpx;
+			}
+		}
+		&-date {
+			text-align: center;width: 100%;font-family: YouSheBiaoTiHei;color: #FFFFFF;
+			&-on {
+				display: inline-block;font-size: 76rpx;line-height: 68rpx;
+				&-line {
+					display: inline-block; width: 68rpx; height: 2rpx; overflow: hidden;background-color: #fff; position: relative; bottom: 25rpx;
+				}
+			}
+			&-date {
+				font-size: 52rpx;
+			}
+		}
+	}
 	.data-btn {
 		float: left;
 

pages/activity/index.vue

@@ -20,7 +20,7 @@
 		<view class="list">
 			<view v-for="(item,index) in list" :key="index" class="list-view">
 				<view class="list-view-slot">
-					<navigator hover-class="none" :url="item.status.value == 4 ?`/packageOperate/activity/record?id=${ item.id }`:`/packageOperate/activity/index?id=${ item.id }`">
+					<view @click="toRecord(item)">
 						<view>
 							<image :src="item.picUrl" mode="" class="list-view-slot-img"></image>
 						</view>
@@ -37,7 +37,7 @@
 								<button class="details-buttonTwo" v-else >即将开始</button>
 							</view>
 						</view>
-					</navigator>
+					</view>
 				</view>
 
 			</view>
@@ -69,6 +69,17 @@
 			this.pageList()
 		},
 		methods: {
+			toRecord(item){
+				if(!uni.getStorageSync('token')) {
+					uni.navigateTo({
+						url: '/pages/login/index'
+					})
+					return
+				}
+				uni.navigateTo({
+					url: item.status.value == 4 ?`/packageOperate/activity/record?id=${ item.id }`:`/packageOperate/activity/index?id=${ item.id }`
+				})
+			},
 			changeTab(e) {
 				if (e.index == 0) {
 					this.triggerStatus = 0

pages/index/index.vue

@@ -173,7 +173,6 @@
 			};
 		},
 		onLoad(opthios) {
-			console.log(13233433,JSON.stringify(opthios));
 			/**
 			 * 免费活动邀请助力分享跳转接收参数
 			 * inviteCode: 邀请码