免费活动模块显示调整

packageOperate/activity/index.vue

@@ -60,9 +60,9 @@
 								<view>
 									<image :src="itemTwo.picUrl" mode="aspectFit"></image>
 								</view>
-								<view class="textone" v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value == 'coin'" > {{itemTwo.title}}x{{itemTwo.value}} </view>
-								<view class="textone" v-else> {{itemTwo.title}} </view>
-								<view class="texttwo" v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value != 'coin'"> ￥{{$numberFormat(itemTwo.value)}} </view>
+								<view class="textone ells-one" v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value == 'coin'" > {{itemTwo.title}}x{{itemTwo.value}} </view>
+								<view class="textone ells-one" v-else> {{itemTwo.title}} </view>
+								<view class="texttwo ells-one" v-if="itemTwo.prizeType && JSON.parse(itemTwo.prizeType).value != 'coin'"> ￥{{$numberFormat(itemTwo.value)}} </view>
 							</view>
 						</view>
 						<view class="effectstwo"></view>
@@ -154,10 +154,10 @@
 		
 		<!-- <u-popup v-if="info.status && JSON.parse(info.status).value == 4"   mode="bottom" @close="close" closeable> -->
 		<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> 
-					<button @click="toActivity" type="default" style="background-color: #FF8000;color: #fff; width: 400rpx;margin-top: 70rpx;">确定</button>
+			<view style="text-align: center;width: 600rpx; height: 500rpx;">
+					<view style="color: #666;margin-top: 110rpx;font-size: 40rpx;">来晚了，活动已结束</view>
+					<view style="color: #666;margin-top: 50rpx;font-size: 36rpx;">点击前往查看新的免费抽奖活动</view> 
+					<button @click="toActivity" type="default" style="background-color: #FF8000;color: #fff; width: 300rpx;margin-top: 70rpx;">确定</button>
 			</view>
 		</u-popup>	
 	</view>

packageOperate/activity/record.vue

@@ -35,7 +35,8 @@
 							</view>
 						</view>
 						<view class="prize">中奖码：{{item.code}}</view>
-						<view class="ells-one prize">{{item.prizeTitle}}</view>
+						<view v-if="item.prizeType =='COIN'"  class="ells-one prize">盲豆 x{{item.value}}</view>
+						<view v-else class="ells-one prize">{{item.prizeTitle}}</view>
 					</view>
 				</view>
 			</view>
@@ -47,19 +48,20 @@
 			<view class="activityShow-wrap">
 				<view class="activityShow-wrap-award">
 					<view class="award">恭喜你 获得{{listData.awardName}}</view>
-					<view class="award-name">{{listData.prizeTitle}}</view>
+					<view v-if="listData.prizeType && listData.prizeType =='COIN'"  class="award-name ells-one">盲豆 x{{listData.value}}</view>
+					<view v-else class="award-name ells-one">{{listData.prizeTitle}}</view>
 				</view>
 				<view class="activityShow-wrap-rela">
 					<image :src="listData.prizePicUrl" mode="aspectFit" class="relaimg"></image>
 					<!-- <image src="../static/activity/effectstwo.png" mode="aspectFit" class="relaimg"></image> -->
 				</view>
-				<view v-if="listData.prizeType && listData.prizeType !='cion'" class="activityShow-wrap-library">
+				<view v-if="listData.prizeType && listData.prizeType !='COIN'" class="activityShow-wrap-library">
 					奖品已放入我的奖品库</view>
 				<view v-else class="activityShow-wrap-library">奖品已放入“我的盲豆”</view>
 				<view class="flex activityShow-wrap-btn">
-					<button @click="toPrize()" v-if="listData.prizeType && listData.prizeType !='cion'" class="btnone"
+					<button @click="toPrize()" v-if="listData.prizeType && listData.prizeType !='COIN'" class="btnone"
 						style="">前往查看</button>
-					<button @click="toCore()" v-else class="btnone" style="">去兑换商品</button>
+					<button @click="toCore()" v-else class="btnone">去兑换商品</button>
 
 					<button @click="close()" class="btntwo" style="">关闭</button>
 
@@ -74,10 +76,10 @@
 			<view class="choiceShow-wrap">
 				<view class="choiceShow-wrap-award">
 					<view></view>
-					<view style="padding-top: 106rpx; color: #fff;font-size: 40rpx;">
+					<view class="awardone">
 						很遗憾, 您未中奖
 					</view>
-					<view style="padding-top: 92rpx;color: #fff;font-size: 30rpx;">
+					<view  class="awardtwo">
 						欢迎继续参与其他抽奖, 好运就在你身边
 					</view>
 				</view>
@@ -167,7 +169,7 @@
 			},
 
 			toPrize() {
-				if (this.listData.prizeType != 'goods') {
+				if (this.listData.prizeType != 'GOODS') {
 					uni.navigateTo({
 						url: '/packagePrize/prize/index?coupon=1'
 					})
@@ -264,24 +266,25 @@
 	.activityShow-wrap {
 		border-radius: 22rpx;
 		overflow: hidden;
-		width: 700rpx;
+		width: 600rpx;
+		height: 650rpx;
 
 		&-rela {
 			position: relative;
 
 			.relaimg {
-				margin-top: 100rpx;
-				height: 310rpx;
+				margin-top: 130rpx;
+				height: 250rpx;
 				position: absolute;
 				top: -260rpx;
-				left: 170rpx;
+				left: 125rpx;
 				width: 350rpx;
 			}
 		}
 
 		&-award {
 			width: 100%;
-			height: 350rpx;
+			height: 320rpx;
 			text-align: center;
 			background: linear-gradient(0deg, #FF866B, #FFAE64);
 			box-shadow: 0px 6px 6px 0px rgba(26, 109, 190, 0.1);
@@ -304,30 +307,31 @@
 
 		&-library {
 			text-align: center;
-			margin-top: 140rpx;
+			margin-top: 110rpx;
 			font-size: 24rpx;
 			color: #999;
 			line-height: 80rpx;
 		}
 
 		&-btn {
-			padding-bottom: 40rpx;
+			// padding-bottom: 40rpx;
+			padding: 10rpx 20rpx 40rpx;
 
 			.btnone {
-				width: 288rpx;
-				height: 100rpx;
-				font-size: 30rpx;
-				line-height: 90rpx;
+				width: 252rpx;
+				height: 84rpx;
+				font-size: 34rpx;
+				line-height: 82rpx;
 				background-color: #fff;
 				color: #F8832C;
 				border: 2rpx solid #F8832C;
 			}
 
 			.btntwo {
-				width: 288rpx;
-				height: 100rpx;
-				font-size: 30rpx;
-				line-height: 90rpx;
+				width: 252rpx;
+				height: 82rpx;
+				font-size: 34rpx;
+				line-height: 82rpx;
 				background-color: #F8832C;
 				color: #fff;
 				border: 2rpx solid #F8832C;
@@ -338,25 +342,32 @@
 	.choiceShow-wrap {
 		border-radius: 22rpx;
 		overflow: hidden;
-		width: 700rpx;
-		height: 600rpx;
+		width: 600rpx;
+		height: 500rpx;
 		&-award {
 			width: 100%;
-			height: 350rpx;
+			height: 290rpx;
 			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;
+			.awardone {
+				padding-top: 70rpx; color: #fff;font-size: 40rpx;
+			}
+			.awardtwo {
+				padding-top: 60rpx;color: #fff;font-size: 30rpx;
+			}
 		}
 		.btntwo {
-			width: 288rpx;
-			height: 100rpx;
-			font-size: 30rpx;
-			line-height: 90rpx;
+			width: 252rpx;
+			height: 82rpx;
+			font-size: 34rpx;
+			line-height: 82rpx;
 			background-color: #F8832C;
 			color: #fff;
-			margin-top: 68rpx;
+			margin-top: 50rpx;
 		}
+
 	}
 </style>

pages/activity/index.vue

@@ -102,7 +102,7 @@
 					title: '加载中'
 				});
 				this.loading = true
-				$http.post(`/api/v1/mp/user/marketing/list?pageNum=${ this.pageNum }&pageSize=20`, {
+				$http.post(`/api/v1/mp/user/marketing/list?pageNum=1&pageSize=30`, {
 					triggerStatus: this.triggerStatus,
 				}).then(res => {
 					uni.hideLoading();

pages/core/index.vue

@@ -441,7 +441,8 @@
 		onShareAppMessage(res) {
 			return {
 				title: '盲票，玩的就是有趣',
-				path: '/pages/index/index'
+				path: '/pages/index/index',
+				// imageUrl:'../../static/icon/lucky_bg.png',
 			}
 		}
 	}