Merge branch 'ymf' of https://e.coding.net/g-cphe0354/duanju/video_app into test

components/pop-ling-qu.vue

@@ -0,0 +1,156 @@
+<template>
+	<view>
+		<u-popup v-model="show" mode="center">
+			<view class="bg">
+				<view class="title">恭喜您获得</view>
+				<view class="goods">
+					<template v-if="result&&result.type==3">
+						<view class="u-flex  u-col-center u-row-center">
+							<image style="height: 42px;" src="/static/red-pack.png" mode="heightFix"></image>
+						</view>
+						<view class="u-flex u-row-center">
+							<view class="type">物品</view>
+						</view>
+					</template>
+					<template v-if="result&&result.type==2">
+						<view class="u-flex color-money u-col-center u-row-center">
+							<view class="money">{{result.number}}</view>
+							<view class="font-bold" style="margin-top: 20rpx;">元</view>
+						</view>
+						<view class="u-flex u-row-center">
+							<view class="type">现金红包</view>
+						</view>
+					</template>
+					
+				</view>
+				<view class="u-flex u-row-center btn-box">
+					<view class="btn" @click="lingqu">立即领取</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				result: ''
+			}
+		},
+		methods: {
+			open(data) {
+				console.log(data);
+				this.result = data
+				this.show = true
+			},
+			lingqu() {
+				const {
+					orderId,
+					id
+				} = this.result
+				this.$Request.postJson('app/discSpinning/receive', this.result).then(res => {
+					this.result = ''
+					console.log(res)
+					if (res.code == 0) {
+						uni.showToast({
+							title: '领取成功',
+							icon: 'none'
+						})
+						this.$emit('success')
+						this.close()
+					} else {
+						uni.showToast({
+							title: '领取失败',
+							icon: 'none'
+						})
+					}
+				})
+			},
+			close() {
+				this.show = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	::v-deep .u-mode-center-box {
+		background-color: transparent;
+	}
+
+	.color-money {
+		color: #E42F00;
+	}
+
+	.money {
+		font-weight: 700;
+		font-size: 72rpx;
+		letter-spacing: 2px;
+	}
+
+	.bg {
+		width: 628rpx;
+		height: 770rpx;
+		margin-right: 10rpx;
+		background-color: transparent;
+		background-repeat: no-repeat;
+		background-position: center center;
+		background-size: cover;
+		background-image: url("~static/images/zhuanpan/ling-qu.png");
+		position: relative;
+
+		@media (-webkit-min-device-pixel-ratio: 2),
+		(min-device-pixel-ratio: 2) {
+			background-image: url("~static/images/zhuanpan/ling-qu@2x.png");
+		}
+
+		.title {
+			position: absolute;
+			top: 238rpx;
+			text-align: center;
+			left: 0;
+			right: 0;
+			font-weight: 700;
+			font-size: 58rpx;
+			color: #AF6920;
+			letter-spacing: 4rpx;
+		}
+
+		.goods {
+			position: absolute;
+			top: 326rpx;
+			text-align: center;
+			left: 0;
+			right: 0;
+			text-align: center;
+		}
+
+		.type {
+			padding: 6rpx 28rpx;
+			border-radius: 100rpx;
+			background: #E25B41;
+			font-size: 28rpx;
+			color: #fff;
+			font-weight: bold;
+		}
+
+		.btn-box {
+			position: absolute;
+			top: 574rpx;
+			left: 0;
+			right: 0;
+
+			.btn {
+				padding: 10rpx 60rpx 10rpx 64rpx;
+				text-align: center;
+				font-weight: bold;
+				font-size: 44rpx;
+				color: #AF6920;
+				letter-spacing: 2px;
+			}
+		}
+
+	}
+</style>

me/choujiang/choujiang.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="almost-lottery">
+	<view class="almost-lottery min-page">
 		<!-- head -->
 		<view class="almost-lottery__head">
 			<view class="btn-group u-flex u-row-between">
@@ -25,14 +25,16 @@
 
 		<!-- lottery -->
 		<view class="almost-lottery__wheel">
+			<view class="almost-lottery__count">
+				<text class="text">剩余免费抽奖 {{ freeNum }} 次</text>
+			</view>
+			<!-- <button @click="showLingPop">showLingPop</button> -->
 			<almost-lottery :lottery-size="lotteryConfig.lotterySize" :action-size="lotteryConfig.actionSize"
 				:ring-count="2" :duration="1" :self-rotaty="false" :img-circled="true" :canvasCached="true"
 				:prize-list="prizeList" :prize-index="prizeIndex" :lotteryBg="lotteryBg" :actionBg="actionBg"
 				@reset-index="prizeIndex = -1" @draw-before="handleDrawBefore" @draw-start="handleDrawStart"
 				@draw-end="handleDrawEnd" @finish="handleDrawFinish" v-if="prizeList.length" />
-			<view class="almost-lottery__count">
+			
-				<text class="text">剩余免费抽奖 {{ freeNum }} 次</text>
-			</view>
 		</view>
 		<!-- rule -->
 		<view class="almost-lottery__rule">
@@ -74,11 +76,13 @@
 				</template> -->
 			</view>
 		</view>
+		<ling-qu ref="refLingqu" @success="getRedPack"></ling-qu>
 	</view>
 </template>
 
 <script>
 	import AlmostLottery from '@/uni_modules/almost-lottery/components/almost-lottery/almost-lottery.vue'
+	import lingQu from '@/components/pop-ling-qu.vue'
 	import {
 		clearCacheFile,
 		clearStore
@@ -86,7 +90,7 @@
 	export default {
 		name: 'Home',
 		components: {
-			AlmostLottery
+			AlmostLottery,lingQu
 		},
 		data() {
 			return {
@@ -311,7 +315,6 @@
 
 				// 还有免费数次
 				if (this.freeNum > 0) {
-					this.freeNum--
 					flag = true
 				} else {
 					flag = false
@@ -328,7 +331,6 @@
 				console.log('触发抽奖按钮')
 				if (this.prizeing) return
 				this.prizeing = true
-
 				this.tryLotteryDraw()
 			},
 			// 尝试发起抽奖
@@ -418,9 +420,8 @@
 			async remoteGetPrizeIndex() {
 				this.result=''
 				console.warn('###当前处于模拟的请求接口，并返回了中奖信息###')
-				const res = await this.$Request.getT('app/discSpinning/draw', {
+				const res = await this.$Request.getT('app/discSpinning/draw')
-					orderId: this.option.orderId||2145
+				this.freeNum--
-				})
 				this.getCount()
 				console.log(res);
 				if (res.code != 0) {
@@ -461,6 +462,11 @@
 					tipContent = `恭喜您，获得 ${name}${this.result.type==2?(this.result.number+'元'):''} ！`
 				}
 				const _this=this;
+				console.log(this.result);
+				 this.showLingPop({...this.result})
+				 this.result=''
+				 this.prizeing = false
+				 return
 				uni.showModal({
 					content: tipContent,
 					showCancel: false,
@@ -523,6 +529,9 @@
 				if(res.code==0){
 					this.freeNum=res.count||0
 				}
+			},
+			showLingPop(data){
+				this.$refs.refLingqu.open(data)
 			}
 		},
 		onLoad(opt) {
@@ -598,25 +607,6 @@
 			background-image: url("~static/gift.png");
 		}
 
-		.gold {
-			width: 44rpx;
-			height: 44rpx;
-			margin-right: 10rpx;
-			background-repeat: no-repeat;
-			background-position: center center;
-			background-size: contain;
-			background-image: url("~static/images/lottery/gold.png");
-
-			@media (-webkit-min-device-pixel-ratio: 2),
-			(min-device-pixel-ratio: 2) {
-				background-image: url("~static/images/lottery/gold@2x.png");
-			}
-
-			@media (-webkit-min-device-pixel-ratio: 3),
-			(min-device-pixel-ratio: 3) {
-				background-image: url("~static/images/lottery/gold@3x.png");
-			}
-		}
 
 		.num {
 			color: #F9FC31;
@@ -633,14 +623,16 @@
 
 	.almost-lottery__wheel {
 		text-align: center;
-
+		position: relative;
+		z-index: 3;
+		margin-top: -50rpx;
 		.almost-lottery__count {
 			display: flex;
 			flex-direction: column;
 			justify-content: center;
 			align-items: center;
 			text-align: center;
-			padding: 40rpx 0;
+			padding: 20rpx 0 40rpx 0;
 		}
 
 		.text {