From b2dd6e7725549c96b1ebfebaf4859e19e8f6ea5f Mon Sep 17 00:00:00 2001
From: qian <1694319867@qq.com>
Date: Mon, 24 Oct 2022 22:37:45 +0800
Subject: [PATCH] =?UTF-8?q?v2.2.1=202022-10-24=201.=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E5=8A=A9=E6=89=8B=E5=AD=90=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  25 ++--
 pages/home/home.vue                           |   6 +
 pages/mine/mine.vue                           |  13 ++
 pages/more/more.vue                           |  12 +-
 pages/subpages/bayinhe/bayinhe.vue            |   6 +
 .../choujiangzhushou/choujiangzhushou.vue     |  82 ++++++++++--
 .../choujiangzhushou/jiaruchoujiang.vue       | 125 ++++++++++++++++++
 pages/subpages/erweima/erweima.vue            |   7 +
 pages/subpages/mosidianma/mosidianma.vue      |   6 +
 pages/subpages/qiaomuyu/qiaomuyu.vue          |   7 +
 pages/subpages/suijitouzi/suijitouzi.vue      |   7 +
 .../subpages/zhengjianzhao/zhengjianzhao.vue  |   6 +
 readme.md                                     |  10 +-
 13 files changed, 288 insertions(+), 24 deletions(-)
 create mode 100644 pages/subpages/choujiangzhushou/jiaruchoujiang.vue

diff --git a/pages.json b/pages.json
index 9bdd3d2..7970b14 100644
--- a/pages.json
+++ b/pages.json
@@ -82,17 +82,22 @@
 				"navigationBarBackgroundColor": "#f6f7f9"
 			}
 
+		}, {
+			"path": "pages/subpages/choujiangzhushou/choujiangzhushou",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/subpages/choujiangzhushou/jiaruchoujiang",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
 		}
-	    ,{
-            "path" : "pages/subpages/choujiangzhushou/choujiangzhushou",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "LaiLab工具箱",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 42c30e3..c6d0ae9 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -179,6 +179,12 @@
 						break;
 				}
 			}
+		},
+		onShareAppMessage() {
+			return {
+				title: 'LaiLab工具箱',
+				path: 'pages/home/home'
+			}
 		}
 	}
 </script>
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index d5e6896..ee758f8 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -238,6 +238,13 @@
 						3.实现部分登录逻辑<br /><br />
 					<b>v2.1 2022-10-22</b><br />
 						1.添加自动登录逻辑<br />
+					<b>v2.1 2022-10-22</b><br />
+						1.添加自动登录逻辑<br />
+						2.各个界面微调美化<br />
+					<b>v2.2 2022-10-23</b><br />
+						1.添加抽奖助手界面<br />
+					<b>v2.2.1 2022-10-24</b><br />
+						1.完善抽奖助手子页面<br />
 				`;
 				uni.navigateTo({
 					url: `/pages/utils/showText/showText?nodes=${log}`
@@ -269,6 +276,12 @@
 				this.userInfo = app.globalData.userInfo;
 			}
 		},
+		onShareAppMessage() {
+			return {
+				title: 'LaiLab工具箱',
+				path: 'pages/mine/mine'
+			}
+		}
 
 	}
 </script>
diff --git a/pages/more/more.vue b/pages/more/more.vue
index 81e2119..6931b46 100644
--- a/pages/more/more.vue
+++ b/pages/more/more.vue
@@ -4,8 +4,8 @@
 			<view class="classify-cards" v-for="(items,index) in tools" :key="index">
 				<text class="classify-name" style="margin: 10px auto;">{{items.name}}</text>
 				<view>
-					<tcard class="tool-card" v-for="(item,index1) in items.cards" :key="index1" :title="item.title" :detail="item.detail"
-						:color="item.color" :icon="item.icon" :url="item.url">
+					<tcard class="tool-card" v-for="(item,index1) in items.cards" :key="index1" :title="item.title"
+						:detail="item.detail" :color="item.color" :icon="item.icon" :url="item.url">
 					</tcard>
 				</view>
 			</view>
@@ -37,6 +37,12 @@
 					},
 				});
 			},
+		},
+		onShareAppMessage() {
+			return {
+				title: 'LaiLab工具箱',
+				path: 'pages/more/more'
+			}
 		}
 	}
 </script>
@@ -83,7 +89,7 @@
 	.tool-card:nth-child(2n-1) {
 		margin-right: 5%;
 	}
-	
+
 	.tool-card:last-child {
 		margin-bottom: 0;
 	}
diff --git a/pages/subpages/bayinhe/bayinhe.vue b/pages/subpages/bayinhe/bayinhe.vue
index f047913..e8a2216 100644
--- a/pages/subpages/bayinhe/bayinhe.vue
+++ b/pages/subpages/bayinhe/bayinhe.vue
@@ -136,6 +136,12 @@
 		},
 		onUnload() {
 			this.audioPause();
+		},
+		onShareAppMessage() {
+			return {
+				title: '八音盒',
+				imageUrl: this.picUrl
+			};
 		}
 	}
 </script>
diff --git a/pages/subpages/choujiangzhushou/choujiangzhushou.vue b/pages/subpages/choujiangzhushou/choujiangzhushou.vue
index 2a61853..ac81fbc 100644
--- a/pages/subpages/choujiangzhushou/choujiangzhushou.vue
+++ b/pages/subpages/choujiangzhushou/choujiangzhushou.vue
@@ -2,8 +2,8 @@
 	<view class="container">
 		<!-- 奖品图片 -->
 		<view class="gift-show">
-			<image class="gift-img"></image>
-			<button class="btn-switch">C</button>
+			<image class="gift-img" :src="picUrl" mode="aspectFill"></image>
+			<button class="btn-switch">换</button>
 		</view>
 		<!-- 奖品名称 -->
 		<view class="item gift-name">
@@ -38,7 +38,7 @@
 			<block v-if="typeIndex==0">
 				<text class="item-tip info-tip">开奖时间</text>
 				<view class="uni-list picker-date">
-					<picker mode="dateTime" :value="date" :start="startDate" :end="endDate" @change="bindDataChange">
+					<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDataChange">
 						<view class="uni-input">{{date}}</view>
 					</picker>
 				</view>
@@ -57,10 +57,18 @@
 				</view>
 			</block>
 		</view>
+		<!-- 我的抽奖 -->
+		<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>
+		</view>
 		<!-- 发起抽奖 -->
 		<button class="gift-start">发起抽奖</button>
 		<!-- 分享抽奖 -->
-		<button class="gift-share" v-if="isCreate">分享抽奖</button>
+		<button class="gift-share" v-if="isCreate" open-type="share">分享抽奖</button>
 	</view>
 </template>
 
@@ -72,11 +80,38 @@
 			})
 			const currenTime = this.getTime();
 			return {
+				picUrl: 'https://www.lailab.cn/miniprogram/image/other/image_tool_bayinhe.jpg',
 				openType: ['按时间自动开奖', '按人数自动开奖', '发起者手动开奖'],
 				typeIndex: 0,
 				date: currentDate,
 				time: currenTime,
-				isCreate: true
+				isCreate: true,
+				giftList: [
+					{
+						name: '我的抽奖1',
+						open: true
+					},
+					{
+						name: '我的抽奖2',
+						open: false
+					},
+					{
+						name: '我的抽奖3',
+						open: true
+					},
+					{
+						name: '我的抽奖4',
+						open: false
+					},
+					{
+						name: '我的抽奖5',
+						open: true
+					},
+					{
+						name: '我的抽奖6',
+						open: false
+					},
+				]
 			}
 		},
 		computed: {
@@ -120,15 +155,22 @@
 				minute = minute > 9 ? minute : '0' + minute;
 				return `${hour}:${minute}`;
 			}
+		},
+		onShareAppMessage() {
+			return {
+				title: '参与抽奖',
+				path: '/pages/subpages/choujiangzhushou/jiaruchoujiang',
+				imageUrl: this.picUrl
+			}
 		}
 	}
 </script>
 
 <style>
 	.container {
-		height: 94vh;
+		height: auto;
 		width: 94vw;
-		padding: 3vh 3vw;
+		padding: 0 3vw 20px 3vw;
 	}
 
 	/* 奖品图片展示区域 */
@@ -151,12 +193,12 @@
 
 	/* 更换图片 */
 	.btn-switch {
-		background-color: pink;
 		border: 0;
 		border-radius: 20px;
 		height: 50px;
 		width: 50px;
 		background-color: pink;
+		color: white;
 		position: absolute;
 		top: 20px;
 		right: 20px;
@@ -239,10 +281,30 @@
 		border: 0;
 		border-radius: 20px;
 		font-weight: bold;
-		box-shadow: 0 0 20px orangered;
+		box-shadow: 0 0 10px orangered;
 	}
 	.gift-share {
 		background-color: dodgerblue;
-		box-shadow: 0 0 20px dodgerblue;
+		box-shadow: 0 0 10px dodgerblue;
+	}
+	/* 抽奖历史 */
+	.gift-history {
+		max-height: 150px;
+		overflow: scroll;
+		background-color: #f6f7f9;
+		border-radius: 20px;
+		/* padding: 0 10px 0 10px; */
+	}
+	.history-tip {
+		display: block;
+		width: 100%;
+		padding: 10px 0;
+		border-bottom:3px solid white ;
+	}
+	.item-history {
+		margin: 0;
+		padding: 0;
+		border-radius: 0;
+		border-bottom: 3px solid white;
 	}
 </style>
diff --git a/pages/subpages/choujiangzhushou/jiaruchoujiang.vue b/pages/subpages/choujiangzhushou/jiaruchoujiang.vue
new file mode 100644
index 0000000..f68ffeb
--- /dev/null
+++ b/pages/subpages/choujiangzhushou/jiaruchoujiang.vue
@@ -0,0 +1,125 @@
+<template>
+	<view class="container">
+		<!-- 奖品展示 -->
+		<view class="gift-show">
+			<image class="gift-img" :src="picUrl"></image>
+			<text class="gift-name">奖品:精美老八x8</text>
+			<text class="gift-open">10月23日 11:00 自动开奖</text>
+		</view>
+		<!-- 操作视图 -->
+		<view class="action-view">
+			<button class="gift-add">参与抽奖</button>
+			<text class="gift-person">已有100人参与</text>
+			<view class="handimgs">
+				<image class="handimg" :src="picUrl" mode="aspectFill"></image>
+				<image class="handimg" :src="picUrl" mode="aspectFill"></image>
+				<image class="handimg" :src="picUrl" mode="aspectFill"></image>
+				<image class="handimg" :src="picUrl" mode="aspectFill"></image>
+				<image class="handimg" :src="picUrl" mode="aspectFill"></image>
+				<image class="handimg" :src="picUrl" mode="aspectFill"></image>
+				<image class="handimg" :src="picUrl" mode="aspectFill"></image>
+				<image class="handimg" :src="picUrl" mode="aspectFill"></image>
+				<image class="handimg" :src="picUrl" mode="aspectFill"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				picUrl: 'https://www.lailab.cn/miniprogram/image/other/image_tool_bayinhe.jpg'
+			}
+		},
+		methods: {
+
+		},
+		onShareAppMessage() {
+			return {
+				title: '参与抽奖'
+			}
+		}
+	}
+</script>
+
+<style>
+	.container {
+		height: auto;
+		width: 100vw;
+		/* padding: 0 3vw 20px 3vw; */
+	}
+
+	/* 奖品展示区域 */
+	.gift-show {
+		height: auto;
+		width: 100%;
+		background-color: #f6f7f9;
+	}
+
+	/* 奖品图片展示 */
+	.gift-img {
+		width: 100%;
+		height: 400px;
+	}
+
+	/* 奖品名称 */
+	.gift-name {
+		display: block;
+		font-size: 23px;
+		line-height: 40px;
+		padding-left: 10px;
+	}
+
+	/* 奖品开奖信息 */
+	.gift-open {
+		display: block;
+		font-size: 18px;
+		line-height: 25px;
+		padding-left: 10px;
+		color: gray;
+	}
+
+	/* 操作视图 */
+	.action-view {
+		height: auto;
+		width: 94vw;
+		padding: 0 3vw 20px 3vw;
+	}
+
+	/* 参与抽奖 */
+	.gift-add {
+		height: 45px;
+		margin-top: 20px;
+		background-color: orangered;
+		color: white;
+		border: 0;
+		border-radius: 20px;
+		font-weight: bold;
+		box-shadow: 0 0 10px orangered;
+	}
+
+	/* 参与人数 */
+	.gift-person {
+		line-height: 30px;
+		font-size: 15px;
+	}
+
+	/* 图像视图 */
+	.handimgs {
+		height: auto;
+		width: 100%;
+		/* background-color: red; */
+		text-align: center;
+		overflow: scroll;
+	}
+
+	/* 各个图像 */
+	.handimg {
+		height: 50px;
+		width: 50px;
+		margin: 2px;
+		border-radius: 50%;
+		background-color: green;
+	}
+</style>
diff --git a/pages/subpages/erweima/erweima.vue b/pages/subpages/erweima/erweima.vue
index 838a8a3..99c30bb 100644
--- a/pages/subpages/erweima/erweima.vue
+++ b/pages/subpages/erweima/erweima.vue
@@ -11,6 +11,7 @@
 </template>
 
 <script>
+	const app = getApp();
 	export default {
 		data() {
 			return {
@@ -23,6 +24,12 @@
 				let value = e.detail.value;
 				this.url = "https://www.lailab.cn/miniprogram/tools/qrcode.php?text=" + value;
 			},
+		},
+		onShareAppMessage() {
+			return {
+				title: "二维码生成",
+				imageUrl: app.globalData.website + '/image/swiper/image_swiper_erweima.jpg'
+			};
 		}
 	}
 </script>
diff --git a/pages/subpages/mosidianma/mosidianma.vue b/pages/subpages/mosidianma/mosidianma.vue
index 35ef2e4..29fa1c9 100644
--- a/pages/subpages/mosidianma/mosidianma.vue
+++ b/pages/subpages/mosidianma/mosidianma.vue
@@ -66,6 +66,12 @@
 					}
 				});
 			},
+		},
+		onShareAppMessage() {
+			return {
+				title: '摩斯电码',
+				imageUrl: app.globalData.website + '/image/swiper/image_swiper_mosidianma.jpg'
+			};
 		}
 	}
 </script>
diff --git a/pages/subpages/qiaomuyu/qiaomuyu.vue b/pages/subpages/qiaomuyu/qiaomuyu.vue
index 69af668..878b076 100644
--- a/pages/subpages/qiaomuyu/qiaomuyu.vue
+++ b/pages/subpages/qiaomuyu/qiaomuyu.vue
@@ -13,6 +13,7 @@
 </template>
 
 <script>
+	const app = getApp();
 	export default {
 		data() {
 			return {
@@ -74,6 +75,12 @@
 			})
 			this.animation = animation
 			this.animationData = animation.export()
+		},
+		onShareAppMessage() {
+			return {
+				title: '敲木鱼',
+				imageUrl: app.globalData.website + '/image/swiper/image_swiper_qiaomuyu.jpg'
+			};
 		}
 	}
 </script>
diff --git a/pages/subpages/suijitouzi/suijitouzi.vue b/pages/subpages/suijitouzi/suijitouzi.vue
index 649ab2d..5eba9ea 100644
--- a/pages/subpages/suijitouzi/suijitouzi.vue
+++ b/pages/subpages/suijitouzi/suijitouzi.vue
@@ -29,6 +29,7 @@
 </template>
 
 <script>
+	const app = getApp();
 	export default {
 		data() {
 			return {
@@ -93,6 +94,12 @@
 				this.index = num;
 				this.count = ++num;
 			},
+		},
+		onShareAppMessage() {
+			return {
+				title: '随机骰子',
+				imageUrl: app.globalData.website + '/image/swiper/image_swiper_suijitouzi.jpg'
+			}
 		}
 	}
 </script>
diff --git a/pages/subpages/zhengjianzhao/zhengjianzhao.vue b/pages/subpages/zhengjianzhao/zhengjianzhao.vue
index 4059554..6ac5bb3 100644
--- a/pages/subpages/zhengjianzhao/zhengjianzhao.vue
+++ b/pages/subpages/zhengjianzhao/zhengjianzhao.vue
@@ -117,6 +117,12 @@
 				e.preventDefault();
 			}
 		},
+		onShareAppMessage() {
+			return {
+				title: '证件照助手',
+				imageUrl: app.globalData.website + '/image/swiper/image_swiper_zhengjianzhao.jpg'
+			}
+		}
 	}
 </script>
 
diff --git a/readme.md b/readme.md
index 3ab32a8..f4e1931 100644
--- a/readme.md
+++ b/readme.md
@@ -16,4 +16,12 @@ v2.1 2022-10-22
 
 1.添加自动登录逻辑
 
-2.各个界面微调美化
\ No newline at end of file
+2.各个界面微调美化
+
+v2.2 2022-10-23
+
+1.添加抽奖助手界面
+
+v2.2.1 2022-10-24
+
+1.完善抽奖助手子页面
\ No newline at end of file