From e0b197b7496a4e216edc9b5a4f73848ca3dbaadb Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Sun, 21 May 2023 11:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                |  34 +------
 pages.json             |   6 ++
 pages/index/cancel.vue | 207 +++++++++++++++++++++++++++--------------
 pages/index/index.vue  | 124 +++++++++++++++++++++---
 pages/index/list.vue   | 142 ++++++++++++++++++++++++++++
 5 files changed, 394 insertions(+), 119 deletions(-)
 create mode 100644 pages/index/list.vue

diff --git a/App.vue b/App.vue
index 1721fd7..5d42c02 100644
--- a/App.vue
+++ b/App.vue
@@ -57,39 +57,7 @@
 		justify-content: flex-end;
 	}
 
-	.mpopup {
-		margin-top: 60rpx;
-		min-height: 600rpx;
-		min-width: 540rpx;
-		margin-bottom: 20rpx;
-	}
-
-	.mpopup-title {
-		font-size: 32rpx;
-		font-family: PingFang SC;
-		font-weight: 400;
-		color: #351C1B;
-		line-height: 40rpx;
-		text-align: center;
-		padding: 0rpx 42rpx;
-	}
-
-	.u-popup__content {
-
-		background: linear-gradient(0deg, #ffffff 85%, #E4C8A2);
-	}
-
-	.mpopup-content {
-		font-size: 24rpx;
-		padding: 71rpx 0rpx;
-		padding: 0rpx 42rpx;
-	}
-
-
-	.mpopup-footer {
-		display: flex;
-		padding: 0rpx 42rpx;
-	}
+	
 
 	.orderBoxInfoRowTxt {
 		font-size: 28rpx !important;
diff --git a/pages.json b/pages.json
index 901776e..66bb63a 100644
--- a/pages.json
+++ b/pages.json
@@ -20,6 +20,12 @@
 			"style": {
 				"navigationBarTitleText": "访客核销"
 			}
+		},
+		{
+			"path": "pages/index/list",
+			"style": {
+				"navigationBarTitleText": "访客列表"
+			}
 		}
     ],
 	"globalStyle": {
diff --git a/pages/index/cancel.vue b/pages/index/cancel.vue
index dca89fe..b29c176 100644
--- a/pages/index/cancel.vue
+++ b/pages/index/cancel.vue
@@ -1,80 +1,143 @@
-<template>
-	<view class="wrap">
-		<view class="cancelcode">
-			<view>核销码：{{code}}</view>
-			<u-button @click='cancelcode' type="primary" text="核销" color='deepskyblue'></u-button>
-		</view>
-		<view class="cancelinfo">
-			<view>访客信息</view>
+<template>
+	<view class="wrap">
+		<view class="list">
+			<view class='listitem'>
+				<view class="code">核销码：{{code}}</view>
+				<view>
+					<text>2023-05-15</text>
+					<text class="textr">待核销</text>
+				</view>
+				<view>
+					拜访时间：09:00
+				</view>
+				<view>
+					<text>拜访人：张三</text>
+					<text>拜访事由：开会</text>
+				</view>
+				<view>
+					单位信息：苏州朗业网络科技有限公司
+				</view>
+				<view>
+					<text>受访人：李四</text>
+					<text>受访科室：信息科</text>
+				</view>
+			</view>
+		</view>
+		<view class="cancelcode" @click='cancelcode'>
+			确认核销
+		</view>
+		<view class="logs">
 			<view>
-				<view>姓名：</view>
-				<view>访问日期：</view>
-				<view>访问时段：</view>
-				<view>访问事由：</view>
-				<view>拜访单位：</view>
-				<view>受访人：</view>
-				<view>受访科室：</view>
+				<text>日期</text>
+				<text>内容</text>
 			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				code:''
-			}
-		},
-		onLoad(options) {
-			this.code = options.code
-		},
-		methods: {
-			cancelcode(){
-				uni.showToast({
-					icon: "none",
-					title: '核销成功',
-					duration: 3000
-				})
-				setTimeout(function(){
-					uni.navigateTo({
-						url:'/pages/index/index'
-					})
-				},500)
+			<block>
+				<view>
+					<text>2023-05-15</text>
+					<text>xxx进行了邀请</text>
+				</view>
 				
-				
-				
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.wrap{
-		padding:30rpx
-	}
-	
-	.cancelcode{
-		/* display: flex;
-		justify-content: space-between; */
-	}
-	.cancelcode view{
-		margin-bottom:30rpx;
-		font-size: 36rpx;
-	}
-	/deep/ .cancelcode .u-button__text{
-		font-size: 36rpx!important;
+			</block>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				code: ''
+			}
+		},
+		onLoad(options) {
+			this.code = options.code
+		},
+		methods: {
+			cancelcode() {
+				uni.showToast({
+					icon: "none",
+					title: '核销成功',
+					duration: 3000
+				})
+				setTimeout(function() {
+					uni.navigateTo({
+						url: '/pages/index/index'
+					})
+				}, 500)
+
+
+
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.wrap {
+		padding: 30rpx
+	}
+
+	.cancelcode {
+		width: 300rpx;
+		height: 300rpx;
+		border-radius: 200rpx;
+		background-color: deepskyblue;
+		line-height: 300rpx;
+		color: #fff;
+		font-size: 36rpx;
+		box-shadow: 0 0 0px 4px lightskyblue;
+		margin: 50rpx auto;
+		text-align: center;
+		margin-bottom:100rpx
+	}
+
+	.list {
+		/* height:65vh; */
+		margin-top: 20rpx
+	}
+
+	.code {
+		border-bottom: 1px solid #ddd;
+		padding-bottom: 20rpx
+	}
+
+	.listitem {
+		padding: 20rpx;
+		background-color: #fff;
+		box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.5);
+		margin-bottom: 30rpx
+	}
+
+	.listitem view {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 10rpx
+	}
+
+	.listitem view text {
+		width: 50%;
+		text-align: left;
+	}
+
+	.listitem view text.textr {
+		text-align: right;
 	}
-	.cancelinfo{
-		font-size: 36rpx;
-		margin-top:30rpx
+	.logs{
+		border:1px solid #ddd;
+		border-bottom:none
 	}
-	.cancelinfo view{
-		color:#ddd;
-		margin-bottom:30rpx
+	.logs view:first-child{
+		background-color: lightgrey;
 	}
-	.cancelinfo view view{
-		color:#333
+	.logs view text{
+		display: inline-block;
+		width:60%;
+		border-bottom:1px solid #ddd;
+		padding:10rpx
 	}
-	
+	.logs view text:first-child{
+		width:40%;
+		border-right:1px solid #ddd
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 32dde2e..1efaf2c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,20 +1,49 @@
 <template>
 	<view class="wrap">
-		<view class="scan" @click="toscan">
-			扫码
+		<u-modal :show="show" title='核销码' showCancelButton @confirm='tocancel'@cancel='closeshow'>
+			<view class="slot-content">
+				 <u--input
+				    placeholder="请输入核销码"
+				    border="surround"
+				    v-model="code"
+				  ></u--input>
+			</view>
+		</u-modal>
+		<view class="scancode">
+			<view class="scan" @click="toscan">
+				扫码核销
+			</view>
+			<view class="code" @click="show=true">
+				核验码核销
+			</view>
 		</view>
+		<view class="tips">提示：扫描访客的二维码或输入核销码进行核销</view>
+
 		<view>
-			<view>今日访客</view>
+			<view class="listtitle">
+				<text>今日待核销访客</text>
+				<text @click='tolist'>访客列表</text>
+			</view>
 			<view class="list">
 				<view class='listitem'>
-					<text>张三</text>
-					<text>9:00</text>
-					<text>未核销</text>
-				</view>
-				<view class='listitem'>
-					<text>张三</text>
-					<text>9:00</text>
-					<text>已核销</text>
+					<view>
+						<text>2023-05-15</text>
+						<text class="textr">待核销</text>
+					</view>
+					<view>
+						拜访时间：09:00
+					</view>
+					<view>
+						<text>拜访人：张三</text>
+						<text>拜访事由：开会</text>
+					</view>
+					<view>
+						单位信息：苏州朗业网络科技有限公司
+					</view>
+					<view>
+						<text>受访人：李四</text>
+						<text>受访科室：信息科</text>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -25,6 +54,8 @@
 	export default {
 		data() {
 			return {
+				show:false,
+				code:''
 			}
 		},
 		onLoad() {
@@ -34,7 +65,31 @@
 				uni.navigateTo({
 					url:'/pages/index/scancode'
 				})
+			},
+			tolist(){
+				uni.navigateTo({
+					url:'/pages/index/list'
+				})
+			},
+			tocancel(){
+				if(this.code!=''){
+					uni.navigateTo({
+						url:'/pages/index/cancel?code='+this.code
+					})
+					this.closeshow()
+				}else{
+					uni.showToast({
+						title:'请输入核销码',
+						duration:2000,
+						icon:'none'
+					})
+				}
+			},
+			closeshow(){
+				this.show = false
+				this.code=''
 			}
+			
 		}
 	}
 </script>
@@ -45,6 +100,10 @@
 		min-height: 90vh;
 		padding:30rpx;
 	}
+	.scancode{
+		display: flex;
+		justify-content: space-between;
+	}
 	.scan {
 		width: 200rpx;
 		height: 200rpx;
@@ -57,14 +116,51 @@
 		margin: 30rpx auto;
 		text-align: center;
 	}
+	.code{
+		width: 200rpx;
+		height: 200rpx;
+		border-radius: 200rpx;
+		background-color: darkgreen;
+		line-height: 200rpx;
+		color: #fff;
+		font-size: 36rpx;
+		box-shadow: 0 0 0px 4px lightgreen;
+		margin: 30rpx auto;
+		text-align: center;
+	}
+	.tips{
+		font-size:40rpx;
+		margin:30rpx 0
+	}
+	.listtitle{
+		font-size:40rpx;
+		display: flex;
+		justify-content: space-between;
+		margin-bottom:30rpx
+	}
+	.listtitle text+text{
+		color:deepskyblue
+	}
 	.list{
-		height:65vh;
+		/* height:65vh; */
 		margin-top:20rpx
 	}
 	.listitem{
+		padding:20rpx;
+		background-color: #fff;
+		box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.5);
+		margin-bottom:30rpx
+	}
+	.listitem view{
 		display: flex;
 		justify-content: space-between;
-		padding:20rpx;
-		border-bottom:1px solid #ccc
+		margin-bottom:10rpx
+	}
+	.listitem view text{
+		width:50%;
+		text-align: left;
+	}
+	.listitem view text.textr{
+		text-align: right;
 	}
 </style>
diff --git a/pages/index/list.vue b/pages/index/list.vue
new file mode 100644
index 0000000..28f9ac4
--- /dev/null
+++ b/pages/index/list.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="wrap">
+		<u-datetime-picker @cancel="startshow=false" @confirm='confirmStart' :show="startshow" v-model="starttime1"
+			mode="date"></u-datetime-picker>
+		<u-datetime-picker @cancel="endshow=false" @confirm='confirmEnd' :show="endshow" v-model="endtime1"
+			mode="date"></u-datetime-picker>
+		<u-picker @cancel="statusshow=false" @confirm='confirmStatus' :show="statusshow" :columns="statuscolumns"></u-picker>
+		<view class="select">
+			<u--input placeholder="开始时间" border="surround" v-model="starttime" suffixIcon="arrow-down" disabled
+				@click.native='startshow=true'></u--input>
+			<u--input placeholder="结束时间" border="surround" v-model="endtime" suffixIcon="arrow-down" disabled
+				@click.native='endshow=true'></u--input>
+			<u--input placeholder="状态" border="surround" v-model="status" suffixIcon="arrow-down" disabled
+				@click.native='statusshow=true'></u--input>
+		</view>
+		<view class="btn">
+			<u-button type="primary" text="查询"></u-button>
+		</view>
+
+		<view class="list">
+			<view class='listitem'>
+				<view>
+					<text>2023-05-15</text>
+					<text class="textr">待核销</text>
+				</view>
+				<view>
+					拜访时间：09:00
+				</view>
+				<view>
+					<text>拜访人：张三</text>
+					<text>拜访事由：开会</text>
+				</view>
+				<view>
+					单位信息：苏州朗业网络科技有限公司
+				</view>
+				<view>
+					<text>受访人：李四</text>
+					<text>受访科室：信息科</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				startshow: false,
+				endshow: false,
+				starttime: '',
+				starttime1: Number(new Date()),
+				endtime1: Number(new Date()),
+				endtime: '',
+				status: '',
+				statusshow:false,
+				statuscolumns:[
+					['待核销','已核销']
+				]
+
+			}
+		},
+		methods: {
+			confirmStart(val) {
+				this.starttime = this.$moment(val.value).format("YYYY-MM-DD")
+				this.startshow = false
+			},
+			confirmEnd(val) {
+				this.endtime = this.$moment(val.value).format("YYYY-MM-DD")
+				this.endshow = false
+			},
+			confirmStatus(val){
+				console.log(val)
+				this.status = val.value[0]
+				this.statusshow = false
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/* .wrap {
+		height: 90vh;
+		min-height: 90vh;
+		padding: 30rpx;
+	} */
+
+	.select {
+		display: flex;
+		justify-content: space-between;
+		margin: 0 -10rpx
+	}
+
+	/deep/ .select .u-input {
+		margin: 0 10rpx;
+		border-radius: 0;
+		padding: 6px 5px !important;
+		padding-right: 2px !important;
+	}
+
+	.btn {
+		text-align: center;
+		text-align: center;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx
+	}
+
+	/deep/ .btn .u-button {
+		background-color: deepskyblue;
+		border-color: deepskyblue;
+		/* width:90% */
+	}
+
+	.list {
+		/* height:65vh; */
+		margin-top: 20rpx;
+		padding: 30rpx;
+	}
+
+	.listitem {
+		padding: 20rpx;
+		background-color: #fff;
+		box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.5);
+		margin-bottom: 30rpx
+	}
+
+	.listitem view {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 10rpx
+	}
+
+	.listitem view text {
+		width: 50%;
+		text-align: left;
+	}
+
+	.listitem view text.textr {
+		text-align: right;
+	}
+</style>
\ No newline at end of file