From bb7d4ae74afa79516821d99ce6907073539d063c Mon Sep 17 00:00:00 2001
From: qian <1694319867@qq.com>
Date: Fri, 28 Oct 2022 22:34:57 +0800
Subject: [PATCH] =?UTF-8?q?v2.2.4=202022-10-28=201.=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   2 +-
 pages/mine/mine.vue                           |   4 +-
 .../choujiangzhushou/choujiangzhushou.vue     | 143 +++++++--
 .../choujiangzhushou/jiaruchoujiang.vue       | 294 +++++++++++-------
 pages/subpages/suijitouzi/suijitouzi.vue      |   6 +-
 readme.md                                     |   6 +-
 6 files changed, 305 insertions(+), 150 deletions(-)

diff --git a/pages.json b/pages.json
index f54af4e..0882f95 100644
--- a/pages.json
+++ b/pages.json
@@ -1,4 +1,5 @@
 {
+
 	"pages": [{
 			"path": "pages/home/home",
 			"style": {
@@ -81,7 +82,6 @@
 				"navigationBarTitleText": "随机骰子",
 				"navigationBarBackgroundColor": "#f6f7f9"
 			}
-
 		}, {
 			"path": "pages/subpages/choujiangzhushou/choujiangzhushou",
 			"style": {
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 2cee974..fb9e372 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -30,11 +30,11 @@
 				<text class="i-name">开发日志</text>
 				<text class="i-more iconfont icon-arrow-right"></text>
 			</button>
-			<button class="item love" @tap="admire()">
+			<!-- <button class="item love" @tap="admire()">
 				<image class="i-icon" src="/static/icons/icon_love.png" mode="widthFix"></image>
 				<text class="i-name">捐赠作者</text>
 				<text class="i-more iconfont icon-arrow-right"></text>
-			</button>
+			</button> -->
 			<button class="item share" open-type="share">
 				<image class="i-icon" src="/static/icons/icon_share.png" mode="widthFix"></image>
 				<text class="i-name">分享好友</text>
diff --git a/pages/subpages/choujiangzhushou/choujiangzhushou.vue b/pages/subpages/choujiangzhushou/choujiangzhushou.vue
index 3825967..d6655c2 100644
--- a/pages/subpages/choujiangzhushou/choujiangzhushou.vue
+++ b/pages/subpages/choujiangzhushou/choujiangzhushou.vue
@@ -60,9 +60,11 @@
 		<!-- 我的抽奖 -->
 		<view class="gift-history">
 			<!-- <text class="history-tip">我的抽奖</text> -->
-			<view class="item item-history" v-for="(item,index) in giftList" :key="index">
-				<text class="item-tip">{{item.name}}</text>
-				<text class="item-tip">{{item.open?'已开奖':'待开奖'}}</text>
+			<view class="item item-history" v-for="(item,index) in awardList" :key="index" @tap="turnTo(item.id)"  @longtap="del(item.id)" :hidden="item.isDelete==1">
+				<text class="item-tip">{{item.awardName}}</text>
+				<text class="item-tip award-detail">{{item.awardDetail}}</text>
+				<text class="item-tip"
+					:class="item.isOpened == 1?'award-opened':'award-unopened'">{{item.isOpened==1?'已开奖':'待开奖'}}</text>
 			</view>
 		</view>
 		<!-- 发起抽奖 -->
@@ -94,7 +96,7 @@
 				openNeedUsers: 0,
 				awardId: '',
 				isCreate: false,
-				giftList: []
+				awardList: []
 			}
 		},
 		computed: {
@@ -105,6 +107,9 @@
 				return this.getDate('end');
 			}
 		},
+		onLoad() {
+			this.init();
+		},
 		methods: {
 			changeImage() {
 				const that = this;
@@ -148,28 +153,38 @@
 			// 发起抽奖
 			start() {
 				const that = this;
-				if(that.awardName=='') {
-					that.toast('奖品名称','error');
-					return;
+				if (that.awardName == '') {
+					that.toast('奖品名称', 'error');
+					return false;
 				}
-				if(that.awardNum == 0) {
-					that.toast('奖品数量','error');
-					return;
+				if (that.awardNum == 0) {
+					that.toast('奖品数量', 'error');
+					return false;
 				}
-				if(that.awardDetail == '') {
-					that.toast('奖品说明','error');
-					return;
+				if (that.awardDetail == '') {
+					that.toast('奖品说明', 'error');
+					return false;
 				}
-				if((that.typeIndex == 1)&&(that.openNeedUsers == 0)) {
-					that.toast('抽奖人数','error');
-					return;
+				if ((that.typeIndex == 1) && (that.openNeedUsers == 0)) {
+					that.toast('抽奖人数', 'error');
+					return false;
 				}
-				if((that.typeIndex == 1)&&(that.awardNum >= that.openNeedUsers)) {
-					that.toast('奖品太多','error');
-					return; 
+				if ((that.typeIndex == 1) && (that.awardNum >= that.openNeedUsers)) {
+					that.toast('奖品太多', 'error');
+					return false;
 				}
 				const openDateTime = this.date + ' ' + this.time;
 				const startDateTime = this.getDate() + ' ' + this.getTime();
+				const pretime = new Date(startDateTime);
+				const opentime = new Date(openDateTime);
+				if ((that.typeIndex == 0)&&(pretime >= opentime)) {
+					that.toast("时光倒流", 'error');
+					return false;
+				}
+				if ((that.typeIndex == 0)&&(opentime.getTime() - pretime.getTime() < 300000)) {
+					that.toast(((opentime.getTime() - pretime.getTime()) / 60000) + "分钟太短", 'error');
+					return false;
+				}
 				let rst = {
 					ownerId: app.globalData.openId,
 					ownerImage: app.globalData.userInfo.avatarUrl,
@@ -192,7 +207,7 @@
 					method: 'POST',
 					data: rst,
 					success(res) {
-							console.log(res);
+						console.log("1.加入抽奖",res);
 						if (res.data.err == 1) {
 							uni.hideLoading();
 							uni.showToast({
@@ -203,6 +218,7 @@
 							if (that.awardId != '') {
 								that.isCreate = true;
 							}
+							that.init();
 						} else if (res.data.err == 0) {
 							uni.hideLoading();
 							uni.showToast({
@@ -219,6 +235,35 @@
 					}
 				})
 			},
+			del(id) {
+				const that = this;
+				uni.showModal({
+					title:'提示',
+					content:'是否删除此次抽奖',
+					confirmText:'是的',
+					cancelText:'点错了',
+					success(res) {
+						if(res.confirm) {
+							uni.request({
+								url: app.globalData.website + '/tools/choujiangzhushou/delAwardInfo.php',
+								method: 'POST',
+								data: {
+									openId: app.globalData.openId,
+									awardId: id
+								},
+								success(res) {
+									if(res.data.err == 1){
+										that.init();
+									} else {
+										that.toast("删除失败", 'error');
+									}
+								}
+							});
+						}
+					}
+				})
+				
+			},
 			getDate(type) {
 				const date = new Date();
 				let year = date.getFullYear();
@@ -226,9 +271,11 @@
 				let day = date.getDate();
 
 				if (type === 'start') {
-					year = year - 60;
+					year = year;
+					month = month;
 				} else if (type === 'end') {
-					year = year + 2;
+					year = year;
+					month = month + 1;
 				}
 				month = month > 9 ? month : '0' + month;
 				day = day > 9 ? day : '0' + day;
@@ -247,6 +294,28 @@
 					title: title,
 					icon: icon
 				})
+			},
+			turnTo(id) {
+				console.log('2.抽奖跳转');
+				uni.navigateTo({
+					url: '/pages/subpages/choujiangzhushou/jiaruchoujiang?awardId=' + id,
+				})
+			},
+			init() {
+				const that = this;
+				uni.request({
+					url: app.globalData.website + '/tools/choujiangzhushou/getUserAward.php',
+					method: 'POST',
+					data: {
+						'openId': app.globalData.openId
+					},
+					success(res) {
+						console.log('1.获取用户所建抽奖', res);
+						if (res.data.result) {
+							that.awardList = res.data.result;
+						}
+					}
+				})
 			}
 		},
 		onShareAppMessage() {
@@ -263,7 +332,7 @@
 					icon: 'error'
 				})
 			}
-		}
+		},
 	}
 </script>
 
@@ -374,19 +443,20 @@
 		display: block;
 		width: auto;
 		justify-content: space-between;
-		float:right;
+		float: right;
 		/* background-color: red; */
 		margin-right: 10px;
 	}
-	
+
 	.picker-date {
 		flex: 7;
 		text-align: right;
 	}
+
 	.picker-time {
 		flex: 1;
 	}
-	
+
 	/* 开奖时间 */
 	.item-etip {
 		padding: 10px;
@@ -434,4 +504,25 @@
 		border-radius: 0;
 		border-bottom: 3px solid white;
 	}
+
+	/* 所有开奖 */
+	/* 开奖详情 */
+	.award-detail {
+		font-size: 14px;
+		color: #888888;
+		text-align: left;
+	}
+
+	/* 开奖情况 */
+	.award-opened {
+		font-size: 12px;
+		color: #888888;
+		text-align: right;
+	}
+
+	.award-unopened {
+		font-size: 12px;
+		color: red;
+		text-align: right;
+	}
 </style>
diff --git a/pages/subpages/choujiangzhushou/jiaruchoujiang.vue b/pages/subpages/choujiangzhushou/jiaruchoujiang.vue
index 94c3901..7b09b70 100644
--- a/pages/subpages/choujiangzhushou/jiaruchoujiang.vue
+++ b/pages/subpages/choujiangzhushou/jiaruchoujiang.vue
@@ -36,6 +36,7 @@
 				userId: 0,
 				joinList: [],
 				joinCount: 0,
+				requestStatus: false,
 				isOpened: false,
 				isJoin: false,
 				isClick: false,
@@ -45,61 +46,39 @@
 		onLoad(option) {
 			const that = this;
 			that.awardId = option.awardId;
+			uni.showLoading({
+				title: '正在加载...',
+				icon: 'loading'
+			})
 			that.refresh();
 		},
 		methods: {
-			join() {
+			async join() {
 				const that = this;
-				uni.showLoading({
-					title: '正在加入',
-					icon: 'loading'
-				});
-				uni.request({
-					url: app.globalData
-						.website +
-						"/tools/choujiangzhushou/userJoin.php",
-					method: 'POST',
-					data: {
-						awardId: that.awardId,
-						userId: that.userId
-					},
-					success(res1) {
-						console.log('5.用户加入', res1);
-						uni.hideLoading();
-						if (res1.data.err == 0) {
-							uni.showToast({
-								title: '加入失败',
-								icon: 'error',
-							});
-						} else if (res1.data.err == 1) {
-							uni.showToast({
-								title: '加入成功',
-								icon: 'success'
-							})
-							that.isJoin = true;
-						} else if (res1.data.err == 2) {
-							that.isClick = false;
-							uni.showLoading({
-								title: '正在开奖中',
-								icon: 'loading'
-							});
-							// 是否中奖
-							that.checkLuckyClover();
-						} else if (res1.data.err == 3) {
-							that.isClick = false;
-							uni.showToast({
-								title: "开奖失败",
-								icon: 'error'
-							})
-						} else {
-							uni.showModal({
-								title: '提示',
-								content: res1.data.msg
-							})
-						}
-						that.refresh();
-					}
-				});
+				if(that.requestStatus) {
+					uni.showToast({
+						title: '点的太快了',
+						icon: 'error',
+					});
+					return false;
+				}
+				if((!that.userId)||(that.userId == 0)||(that.userId == '')){
+					uni.showToast({
+						title: '加入失败',
+						icon: 'loading'
+					});
+					return false;
+				}else {
+					uni.showLoading({
+						title: '正在加入',
+						icon: 'loading'
+					});
+					await that.joinAward();
+				}
+				that.requestStatus = true;
+				setTimeout(()=>{
+					that.requestStatus = false;
+				}, 2000);
 			},
 			load() {
 				var msg = '条件';
@@ -114,11 +93,99 @@
 					content: msg,
 				})
 			},
-			refresh() {
+			async refresh() {
 				const that = this;
 				that.joinList = [];
 				that.isJoin = false;
 				that.isClick = false;
+				// 1.通过奖品号获取奖品信息
+				await that.getAwardInfo();
+				// 2.通过openId获取用户Id
+				await that.getUserId();
+				// 3.通过奖品Id获取参与用户ID
+				await that.showUsers();
+				// 若开奖停用按钮
+				if (that.isLockyClover) {
+					that.isClick = false;
+					uni.hideLoading();
+				}
+				if (that.isOpened) {
+					that.isClick = false;
+				}
+			},
+			checkLuckyClover() {
+				const that = this;
+				uni.request({
+					url: app.globalData.website + '/tools/choujiangzhushou/checkLuckyClover.php',
+					method: 'POST',
+					data: {
+						awardId: that.awardId,
+						userId: that.userId
+					},
+					success(res) {
+						console.log('6.查看是否中奖', res);
+						uni.hideLoading();
+						if (res.data.result.length > 0) {
+							that.isLockyClover = (res.data.result[0].luckyClover == 1);
+						}
+					}
+				})
+			},
+			showUsers() {
+				const that = this;
+				// 通过奖品ID查询各种信息
+				uni.request({
+					url: app.globalData.website + '/tools/choujiangzhushou/joinUserInfo.php',
+					method: 'POST',
+					data: {
+						awardId: that.awardId
+					},
+					success(res) {
+						console.log('3.通过奖品Id获取参与用户ID', res);
+						const users = res.data.result;
+						that.joinUserID = users;
+						that.joinCount = Number(users.length);
+						for (var i = 0; i < users.length; i++) {
+							const user = users[i];
+							uni.request({
+								url: app.globalData.website + '/api/getUserInfoById.php',
+								method: 'POST',
+								data: {
+									id: user.userId
+								},
+								success(res1) {
+									console.log('4.通过userId获取用户信息(图像)', res1);
+									for (var i = 0; i < res1.data.result.length; i++) {
+										that.joinList.push({
+											userImg: res1.data.result[0].avatarUrl
+										});
+									}
+								}
+							});
+							if (user.userId == that.userId) {
+								that.isJoin = true;
+								console.log("用户已参与抽奖");
+							}
+						}
+						setTimeout(function() {
+							uni.hideLoading();
+							if(!that.isOpened){
+								that.isClick = true;
+							}
+						}, 1000);
+						// 若开奖,查看是否中奖品，放这里因为这里产生userId
+						if(that.isOpened) {
+							// 检测是否中奖
+							that.checkLuckyClover();
+						}
+					},
+					fail(res) {
+						console.log('访问失败', res);
+					}
+				});
+			},
+			getAwardInfo() {
+				const that = this;
 				// 请求奖品信息
 				uni.request({
 					url: app.globalData.website + '/tools/choujiangzhushou/getAwardInfo.php',
@@ -144,11 +211,11 @@
 								icon: 'error'
 							})
 						}
-						if (that.isOpened) {
-							that.isClick = false;
-						}
 					}
 				});
+			},
+			getUserId() {
+				const that = this;
 				uni.request({
 					url: app.globalData.website + "/api/getUserInfo.php",
 					method: 'POST',
@@ -159,85 +226,76 @@
 						console.log('2.通过openId获取用户Id', res);
 						if (res.data.result) {
 							that.userId = res.data.result[0].id;
+							if(that.userId == 0){
+								uni.hideLoading();
+								uni.showToast({
+									title: '加载失败',
+									icon: 'error'
+								});
+								that.isClick = false;
+								return false;
+							}
 						} else {
 							uni.hideLoading();
-							console.log(res);
+							console.log('通过OpenId获取userId失败',res);
 							uni.showToast({
-								title: '加载成功',
+								title: '加载失败',
 								icon: 'success'
 							})
 						}
-						// 若开奖,查看是否中奖品，放这里因为这里产生userId
-						if(that.isOpened) {
-							// 检测是否中奖
-							that.checkLuckyClover();
-						}
 					}
 				});
-				// 通过奖品ID查询各种信息
-				uni.request({
-					url: app.globalData.website + '/tools/choujiangzhushou/userJoinInfo.php',
-					method: 'POST',
-					data: {
-						awardId: that.awardId
-					},
-					success(res) {
-						console.log('3.通过奖品Id获取参与用户ID', res);
-						const users = res.data.result;
-						that.joinCount = Number(users.length);
-						for (var i = 0; i < users.length; i++) {
-							const user = users[i];
-							uni.request({
-								url: app.globalData.website + '/api/getUserInfoById.php',
-								method: 'POST',
-								data: {
-									id: user.userId
-								},
-								success(res1) {
-									console.log('4.通过userId获取用户信息(图像)', res1);
-									for (var i = 0; i < res1.data.result.length; i++) {
-										that.joinList.push({
-											userImg: res1.data.result[0].avatarUrl
-										});
-									}
-								}
-							});
-							if (user.userId == that.userId) {
-								that.isJoin = true;
-							}
-						}
-						setTimeout(function() {
-							if(!that.isOpened){
-								that.isClick = true;
-							}
-						}, 1000);
-					},
-					fail(res) {
-						console.log('访问失败', res);
-					}
-				});
-				// 若开奖停用按钮
-				if (that.isLockyClover) {
-					that.isClick = false;
-				}
 			},
-			checkLuckyClover() {
+			joinAward() {
 				const that = this;
 				uni.request({
-					url: app.globalData.website + '/tools/choujiangzhushou/isluckyClover.php',
+					url: app.globalData
+						.website +
+						"/tools/choujiangzhushou/joinUser.php",
 					method: 'POST',
 					data: {
 						awardId: that.awardId,
 						userId: that.userId
 					},
-					success(res) {
-						console.log('6.查看是否中奖', res);
+					success(res1) {
+						console.log('5.用户加入', res1);
 						uni.hideLoading();
-						if (res.data.result) {
-							that.isLockyClover = res.data.result[0].luckyClover == 1;
+						if (res1.data.err == 0) {
+							uni.showToast({
+								title: '加入失败',
+								icon: 'error',
+							});
+						} else if (res1.data.err == 1) {
+							uni.showToast({
+								title: '加入成功',
+								icon: 'success'
+							})
+							that.isJoin = true;
+						} else if (res1.data.err == 2) {
+							that.isClick = false;
+							uni.showLoading({
+								title: '正在开奖中',
+								icon: 'loading'
+							});
+							setTimeout(function(){
+								// 是否中奖
+								that.checkLuckyClover();
+							},2000);
+						} else if (res1.data.err == 3) {
+							that.isClick = false;
+							uni.showToast({
+								title: "开奖失败",
+								icon: 'error'
+							})
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: res1.data.msg
+							})
 						}
+						that.refresh();
 					}
-				})
+				});
 			}
 		},
 		onPullDownRefresh() {
@@ -250,9 +308,11 @@
 		},
 		onShareAppMessage() {
 			return {
-				title: '参与抽奖'
+				title: '参与 ' + this.awardName + 'x' + this.awardNum + ' 抽奖',
+				path: `/pages/subpages/choujiangzhushou/jiaruchoujiang?awardId=${this.awardId}`,
+				imageUrl: this.picUrl
 			}
-		}
+		},
 	}
 </script>
 
diff --git a/pages/subpages/suijitouzi/suijitouzi.vue b/pages/subpages/suijitouzi/suijitouzi.vue
index 5eba9ea..c80a0c7 100644
--- a/pages/subpages/suijitouzi/suijitouzi.vue
+++ b/pages/subpages/suijitouzi/suijitouzi.vue
@@ -24,7 +24,7 @@
 		</picker>
 
 		<button class="btn-start" @tap="start()">{{sum}}</button>
-		<ad class="sjtz-ad" adpid="1211145435"></ad>
+		<!-- <ad class="sjtz-ad" adpid="1211145435"></ad> -->
 	</view>
 </template>
 
@@ -161,7 +161,7 @@
 		background-color: #262626;
 		color: white;
 	}
-	
+
 	.sjtz-share {
 		position: absolute;
 		top: 20px;
@@ -177,7 +177,7 @@
 		background-size: 60% 60%;
 		z-index: 10;
 	}
-	
+
 	.sjtz-ad {
 		margin: 20px;
 	}
diff --git a/readme.md b/readme.md
index c0c01e6..2ed9d63 100644
--- a/readme.md
+++ b/readme.md
@@ -34,4 +34,8 @@ v2.2.2 2022-10-25
 
 v2.2.3 2022-10-26
 
-1.实现根据人数自动开奖的功能
\ No newline at end of file
+1.实现根据人数自动开奖的功能
+
+v2.2.4 2022-10-28
+
+1.更新部分代码
\ No newline at end of file