选择奖品突出查看奖品

packagePrize/choice/index.vue

@@ -1,63 +1,13 @@
 	<template>
 	<view>
-		<!-- <view class="choice">
-			<view class="choice-title" v-if="!tipShow">恭喜你获得</view>
-			<view class="choice-all" v-if="total > 1 && !tipShow">以下奖品任选其一</view>
-			<view class="flex choice-list">
-				<view class="choice-list-item" v-for="(item, index) in prizeList" :key="index"
-					@click="selectPrize(item, index)">
-					<view
-						:class="{'item-info action': actionIndex == index, 'item-info confirm': actionIndex != index, 'item-info null': item.remainQty == 0}">
-						<view class="flex info-image">
-							<image :src="item.picUrl" mode="aspectFill"></image>
-						</view>
-						<view class="title" v-if="item.prizeType && item.prizeType.value != 'coin'">{{ item.title }}
-						</view>
-						<view class="title" v-else>盲豆x {{ item.value }}</view>
-						<view class="tip" v-if="item.remainQty == 0">已兑完</view>
-						<view class="flex action-icon" v-if="actionIndex == index">
-							<u-icon name="checkmark" color="#fff" size="24"></u-icon>
-						</view>
-					</view>
-				</view>
-			</view> -->
-			<!-- <view class="flex btn">
-				<view class="confirm" @click="confirmPrize" v-if="!tipShow">确认</view>
-			</view> -->
-		<!-- </view> -->
-
-		<!-- <view class="footer-fixed" v-if="!tipShow">
-			<view class="flex btn">
-				<button type="default" @click="confirmPrize">确认</button>
-			</view>
-		</view> -->
-
 		<u-popup :show="tipShow" :round="10" mode="center" :safeAreaInsetBottom="false">
 			<view class="null-prize">
 				<view class="title">该盲票已被他人买走了</view>
-				<navigator open-type="exit" target="miniProgram" hover-class="none" class="btn">确认</navigator>
+				<!-- <navigator open-type="exit" target="miniProgram" hover-class="none" class="btn">确认</navigator> -->
+				<view class="btn" @click="toUser">确认</view>
 			</view>
 		</u-popup>
 
-		<!-- <u-popup :show="comfirmShow" :round="10" mode="center" :safeAreaInsetBottom="false">
-			<view class="confirm-prize">
-				<view class="flex confirm-prize-info">
-					<image :src="actionInfo.picUrl" mode="aspectFill"></image>
-					<view class="title" v-if="actionInfo.prizeType && actionInfo.prizeType.value != 'coin'">
-						{{ actionInfo.title }}
-					</view>
-					<view class="title" v-else>盲豆x {{ actionInfo.value }}</view>
-				</view>
-				<view class="confirm-prize-tip" v-if="actionInfo.prizeType && actionInfo.prizeType.value != 'coin'">
-					已放入我的仓库<text @click="toPrize(actionInfo.prizeType)">前往查看</text></view>
-				<view class="confirm-prize-tip" v-else>已放入“我的盲豆”<text @click="toPrize('coin')">去兑换商品</text></view>
-				<view class="flex confirm-prize-btn">
-					<view class="back" @click="back">返回</view>
-					<view class="confirm" @click="again">再来一张</view>
-				</view>
-			</view>
-		</u-popup> -->
-		
 		<view class="choice">
 			<!-- 返回 -->
 			<view class="choice-navLeft flex" :style="{ top: statusHeight + 'px' }" @click="back">
@@ -111,16 +61,16 @@
 					<view class="choice-info-content-price" v-else>{{ actionInfo.value }}个</view>
 					<view class="choice-info-content-title" v-if="actionInfo.prizeType && actionInfo.prizeType.value != 'coin'">{{ actionInfo.title }}</view>
 					<view class="choice-info-content-title" v-else>盲豆</view>
-					<view class="choice-info-content-tip flex"  @click="toPrize(actionInfo.prizeType)">
-						<view class="txt" v-if="actionInfo.prizeType && actionInfo.prizeType.value != 'coin'">哇，去瞅瞅我的宝贝</view>
-						<view class="txt" v-else>哇，去商城兑换商品</view>
+					<view class="choice-info-content-tip flex" @click="again">
+						<view class="txt">再来一张</view>
 					</view>
 				</view>
 			</view>
 			<view class="choice-btn flex" v-if="comfirmShow">
-				<view class="choice-btn-content flex"  @click="again">
+				<view class="choice-btn-content flex"  @click="toPrize(actionInfo.prizeType)">
 					<image src="../../packagePrize/static/rolling_btn.png" mode="aspectFit"></image>
-					<view class="choice-btn-content-txt">再来一张</view>
+					<view class="choice-btn-content-txt" v-if="actionInfo.prizeType && actionInfo.prizeType.value != 'coin'">哇，去瞅瞅我的宝贝</view>
+					<view class="choice-btn-content-txt" v-else>哇，去商城兑换商品</view>
 				</view>
 			</view>
 		</view>
@@ -307,6 +257,12 @@
 				}
 			},
 			
+			toUser() {
+				uni.switchTab({
+					url: '/pages/user/index'
+				})
+			},
+			
 			getGoodsDetail(id) {
 				uni.showLoading({
 					title: '加载中'
@@ -516,11 +472,11 @@
 						padding: 10rpx 0;
 						width: 75%;
 						text-align: center;
-						background: rgba(255, 211, 157, .3);
+						background: rgba(255, 211, 157, .44);
 						border-radius: 30rpx;
 						font-size: 30rpx;
 						font-weight: 500;
-						color: #FC8D03;
+						color: #fff;
 					}
 				}
 			}

packagePrize/rolling/index.vue

@@ -66,17 +66,20 @@
 					<view class="prize-info-content-price" v-else>{{ prizeInfo.value }}个</view>
 					<view class="prize-info-content-title" v-if="prizeInfo.prizeType && prizeInfo.prizeType.value != 'coin'">{{ prizeInfo.title }}</view>
 					<view class="prize-info-content-title" v-else>盲豆</view>
-					<view class="prize-info-content-tip flex" v-if="isTry == 0" @click="toPrize(prizeInfo.prizeType)">
-						<view class="txt" v-if="prizeInfo.prizeType && prizeInfo.prizeType.value != 'coin'">哇，去瞅瞅我的宝贝</view>
-						<view class="txt" v-else>哇，去商城兑换商品</view>
+					<view class="prize-info-content-tip flex" v-if="isTry == 0" @click="back">
+						<view class="txt">再来一张</view>
 					</view>
 				</view>
 			</view>
 			<view class="prize-btn flex">
-				<view class="prize-btn-content flex" @click="back">
+				<view class="prize-btn-content flex" v-if="isTry == 0">
 					<image src="../../packagePrize/static/rolling_btn.png" mode="aspectFit"></image>
-					<view class="prize-btn-content-txt" v-if="isTry == 0">再来一张</view>
-					<view class="prize-btn-content-txt" v-else>来把真的</view>
+					<view class="prize-btn-content-txt" @click="toPrize(prizeInfo.prizeType)" v-if="prizeInfo.prizeType && prizeInfo.prizeType.value != 'coin'">哇，去瞅瞅我的宝贝</view>
+					<view class="prize-btn-content-txt" @click="toPrize(prizeInfo.prizeType)" v-else>哇，去商城兑换商品</view>
+				</view>
+				<view class="prize-btn-content flex" v-else @click="back">
+					<image src="../../packagePrize/static/rolling_btn.png" mode="aspectFit"></image>
+					<view class="prize-btn-content-txt">来把真的</view>
 				</view>
 			</view>
 		</view>
@@ -567,11 +570,11 @@
 						padding: 10rpx 0;
 						width: 75%;
 						text-align: center;
-						background: rgba(255, 211, 157, .3);
+						background: rgba(255, 211, 157, .44);
 						border-radius: 30rpx;
 						font-size: 30rpx;
 						font-weight: 500;
-						color: #FC8D03;
+						color: #FFF;
 					}
 				}
 			}

pages/lucky/index.vue

@@ -43,7 +43,8 @@
 			@touchmove.prevent.stop>
 			<view class="null-prize">
 				<view class="title">该盲票已兑奖</view>
-				<navigator open-type="exit" target="miniProgram" hover-class="none" class="btn">确认</navigator>
+				<!-- <navigator open-type="exit" target="miniProgram" hover-class="none" class="btn">确认</navigator> -->
+				<view class="btn" @click="toUser">确认</view>
 			</view>
 		</u-popup>
 
@@ -243,6 +244,12 @@
 					uni.hideLoading();
 				})
 			},
+			
+			toUser() {
+				uni.switchTab({
+					url: '/pages/user/index'
+				})
+			},
 
 			saveImg() {
 				this.$refs.hchPoster.posterShow()