免费模块模页面调整

packageOperate/activity/index.vue

@@ -157,7 +157,7 @@
 		<u-popup v-if="info.status && JSON.parse(info.status).value == 4" show="true" mode="center" @close="close" round="11">
 			<view style="text-align: center;width: 700rpx; height: 600rpx;">
 					<view style="color: #666;margin-top: 160rpx;font-size: 40rpx;">来晚了，活动已结束</view>
-					<view style="color: #666;margin-top: 50rpx;font-size: 40rpx;">是否前往查看新的免费抽奖活动</view> 
+					<view style="color: #666;margin-top: 50rpx;font-size: 40rpx;">点击前往查看新的免费抽奖活动</view> 
 					<button @click="toActivity" type="default" style="background-color: #FF8000;color: #fff; width: 400rpx;margin-top: 70rpx;">确定</button>
 			</view>
 		</u-popup>	

packageOperate/activity/record.vue

@@ -53,11 +53,15 @@
 					<image :src="listData.prizePicUrl" mode="aspectFit" class="relaimg"></image>
 					<!-- <image src="../static/activity/effectstwo.png" mode="aspectFit" class="relaimg"></image> -->
 				</view>
-				<view class="activityShow-wrap-library">
+				<view v-if="listData.prizeType && listData.prizeType !='cion'" class="activityShow-wrap-library">
 					奖品已放入我的奖品库</view>
+				<view v-else class="activityShow-wrap-library">奖品已放入“我的盲豆”</view>
 				<view class="flex activityShow-wrap-btn">
-					<button @click="toPrize()" class="btnone" style="">前往查看</button><button @click="close()"
-						class="btntwo" style="">关闭</button>
+					<button @click="toPrize()" v-if="listData.prizeType && listData.prizeType !='cion'" class="btnone"
+						style="">前往查看</button>
+					<button @click="toCore()" v-else class="btnone" style="">去兑换商品</button>
+
+					<button @click="close()" class="btntwo" style="">关闭</button>
 
 				</view>
 
@@ -68,10 +72,16 @@
 		<u-popup :show="closeShow" mode="center" round="17" @close="close" :closeable="true" overlayOpacity="0.5"
 			@touchmove.prevent.stop>
 			<view class="choiceShow-wrap">
-				<view style="width: 200rpx; height: 200rpx;margin: 100rpx; text-align: center;">
-					很遗憾你未中奖,欢迎继续参与其他抽奖，好运就在你身边
+				<view class="choiceShow-wrap-award">
+					<view></view>
+					<view style="padding-top: 106rpx; color: #fff;font-size: 40rpx;">
+						很遗憾, 您未中奖
+					</view>
+					<view style="padding-top: 92rpx;color: #fff;font-size: 30rpx;">
+						欢迎继续参与其他抽奖, 好运就在你身边
+					</view>
 				</view>
-				<button @click="close()">确定</button>
+				<button @click="close()" class="btntwo">确定</button>
 			</view>
 		</u-popup>
 	</view>
@@ -86,7 +96,7 @@
 				list: [],
 				marketingId: '',
 				closeShow: false,
-				activityShow: true,
+				activityShow: false,
 				listData: {},
 				pagesNum: "",
 			}
@@ -104,6 +114,11 @@
 					url: `/pages/activity/index?triggerStatus=1`
 				})
 			},
+			toCore() {
+				uni.reLaunch({
+					url: '/pages/core/index'
+				})
+			},
 
 			pageList() {
 				this.pageNum = 1
@@ -152,9 +167,16 @@
 			},
 
 			toPrize() {
-				uni.navigateTo({
-					url: '/packagePrize/prize/index'
-				})
+				if (listData.prizeType != 'goods') {
+					uni.navigateTo({
+						url: '/packagePrize/prize/index?coupon=1'
+					})
+				}else{
+					uni.navigateTo({
+						url: '/packagePrize/prize/index?coupon=0'
+					})
+				}
+
 			},
 			successFail() {
 				this.listData = {}
@@ -262,7 +284,8 @@
 			width: 100%;
 			height: 350rpx;
 			text-align: center;
-			background-image: radial-gradient(#FFAE64, #FF866B);
+			background: linear-gradient(0deg, #FF866B, #FFAE64);
+			box-shadow: 0px 6px 6px 0px rgba(26, 109, 190, 0.1);
 			text-align: center;
 
 			.award {
@@ -313,5 +336,28 @@
 		}
 	}
 
-	.choiceShow-wrap {}
+	.choiceShow-wrap {
+		border-radius: 22rpx;
+		overflow: hidden;
+		width: 700rpx;
+		height: 600rpx;
+		&-award {
+			width: 100%;
+			height: 350rpx;
+			text-align: center;
+			font-weight: bold;
+			background: linear-gradient(0deg, #FF866B, #FFAE64);
+			box-shadow: 0px 6px 6px 0px rgba(26, 109, 190, 0.1);
+			text-align: center;
+		}
+		.btntwo {
+			width: 288rpx;
+			height: 100rpx;
+			font-size: 30rpx;
+			line-height: 90rpx;
+			background-color: #F8832C;
+			color: #fff;
+			margin-top: 68rpx;
+		}
+	}
 </style>

pages/activity/index.vue

@@ -71,7 +71,7 @@
 			}
 		},
 		onShow() {
-			this.pageList()
+			this.getList()
 		},
 		methods: {
 			toRecord(item){
@@ -91,11 +91,6 @@
 				} else if (e.index == 1) {
 					this.triggerStatus = 1
 				}
-				this.pageList()
-			},
-			pageList() {
-				this.pageNum = 1
-				this.list = []
 				this.getList()
 			},
 			getList() {