lilei 4 лет назад
Родитель
Сommit
307493dc39
3 измененных файлов с 34 добавлено и 36 удалено
  1. 2 2
      App.vue
  2. 8 1
      api/luckyDraw.js
  3. 24 33
      pagesA/luckDraw/luckDraw.vue

+ 2 - 2
App.vue

@@ -1,6 +1,6 @@
 <script>
-	const uat_domain = 'https://lese.test.sxzxyj.net' // 预发布
-	// const uat_domain = 'http://192.168.16.105:8302' // 本地
+	// const uat_domain = 'https://lese.test.sxzxyj.net' // 预发布
+	const uat_domain = 'http://192.168.16.105:8302' // 本地
 	const pro_domain = 'https://lese.sxzxyj.net' // 生产
 	const uat_URL = uat_domain+'/gc-shop/' // 预发布
 	const pro_URL = pro_domain+'/gc-shop/'  // 生产

+ 8 - 1
api/luckyDraw.js

@@ -6,6 +6,13 @@ export const findEnable = params => {
     method: 'get',
   })
 };
+// 抽奖takeOut
+export const takeOut = params => {
+  return axios.request({
+    url: `luckyDraw/takeOut/${params.id}`,
+    method: 'get',
+  })
+};
 // 获取免费抽奖次数
 export const findCustomerTimes = params => {
   return axios.request({
@@ -27,4 +34,4 @@ export const buyDrawTimes = params => {
     method: 'post',
 	data: params
   })
-};
+};

+ 24 - 33
pagesA/luckDraw/luckDraw.vue

@@ -145,7 +145,7 @@
 <script>
 import AlmostLottery from '@/components/almost-lottery/almost-lottery.vue';
 import { clearCacheFile } from '@/almost-utils/almost-utils.js';
-import { findCustomerTimes, buyDrawTimes } from '@/api/luckyDraw.js'
+import { findCustomerTimes, buyDrawTimes, takeOut } from '@/api/luckyDraw.js'
 import { existPayPwd } from '@/api/order.js'
 export default {
 	name: 'Home',
@@ -291,9 +291,9 @@ export default {
 					let temp = []
 					prizeList.map(item => {
 						temp.push({
-							prizeId: item.id,
+							prizeId: item.luckyDrawPrizeNo,
 							name: item.prizeType == 'GOLD' ? (item.prizeDesc + '乐豆') : item.prizeDesc,
-							stock: item.prizeNum,
+							stock: item.prizeNum||0,
 							weight: item.prizeRate,
 							prizeImage: item.prizeImage,
 							prizeType: item.prizeType,
@@ -344,46 +344,37 @@ export default {
 				return
 			}
 			let list = [...this.prizeList];
-			// 模拟请求
-			let stoTimer = setTimeout(() => {
-				clearTimeout(stoTimer);
-				stoTimer = null;
-				// 这里随机产生的 prizeId 是模拟后端返回的 prizeId
-				let prizeId = Math.floor(Math.random() * list.length + 1);
-				console.log(prizeId)
-				list.forEach((item, index) => {
-					if (item.prizeId === ['210509167852392448','210509167852392449','210509167852392450'][prizeId]) {
-						// 中奖下标
-						this.prizeIndex = index;
+			
+			takeOut({id: this.luckDraw.luckyDrawNo}).then(res => {
+				if(res.status == 200){
+					console.log(res)
+					let prizeId = res.data;
+					let index = list.findIndex(item => item.prizeId === prizeId)
+					this.prizeIndex = index;
+					console.log(res, this.prizeIndex)
+					if(this.prizeIndex>=0){
+						console.log('本次抽中奖品 =>', this.prizeList[this.prizeIndex].name);
+						if (this.onStock) {
+							console.log('本次奖品库存 =>', this.prizeList[this.prizeIndex].stock);
+						}
 					}
-				});
-				console.log('本次抽中奖品 =>', this.prizeList[this.prizeIndex].name);
-				if (this.onStock) {
-					console.log('本次奖品库存 =>', this.prizeList[this.prizeIndex].stock);
+					this.reTimes = this.reTimes -1
 				}
-				this.reTimes = this.reTimes -1
-			}, 200);
+			})
 		},
 		// 本次抽奖结束
 		handleDrawEnd() {
 			let curPrize = this.prizeList[this.prizeIndex]
 			console.log(curPrize,'curPrize')
 			this.targetPrize = curPrize
-			// 旋转结束后,可以执行拿到结果后的逻辑
-			let prizeName = curPrize.name;
-			if (this.onStock) {
-				let prizeStock = curPrize.stock;
-				this.targetName = prizeName === '谢谢参与' ? prizeName : prizeStock ? `恭喜您,获得 ${prizeName}` : '很抱歉,您来晚了,当前奖品已无库存';
-			} else {
-				this.targetName = prizeName === '谢谢参与' ? prizeName : `恭喜您,获得 ${prizeName}`;
-			}
-			
+			// 是否未中奖
+			let isNoPrize = curPrize ? curPrize.prizeType == 'NONE' : false
+			console.log(isNoPrize)
 			if(this.onStock){
-				let prizeStock = curPrize.stock;
-				if(prizeName === '谢谢参与'){
+				if(isNoPrize){
 					this.winTypes = 'win_0'
 				}else{
-					if(prizeStock){
+					if(curPrize.stock){
 						this.winTypes = 'win_2'
 					}else{
 						this.targetName = '很抱歉,您来晚了,当前奖品已无库存'
@@ -391,7 +382,7 @@ export default {
 					}
 				}
 			}else{
-				if(prizeName === '谢谢参与'){
+				if(isNoPrize){
 					this.winTypes = 'win_0'
 				}else{
 					this.winTypes = 'win_2'