From 861f12bf1e0d063e76ffa5321d5bc1ad48c18c0b Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 21 Mar 2023 15:19:37 +0800
Subject: [PATCH] up

---
 pages.json                   |  23 ++++-
 pages/bd/bddetail.vue        | 174 +++++++++++++++++++++++++++++++++++
 pages/bd/mine.vue            |  50 ++++++----
 pages/bd/record.vue          |  44 ++++++---
 pages/index/index.vue        |  12 ++-
 pages/visit/addrecord.vue    |   2 +-
 pages/visit/detail.vue       |  88 +++++++++---------
 pages/visit/study.vue        |  15 +--
 pages/visit/successform.vue  |  69 ++++++++++++++
 pages/visit/testStudy.vue    |   7 +-
 pages/visit/visithistory.vue | 162 ++++++++++++++++++++++++++++++++
 static/img/success.png       | Bin 0 -> 9167 bytes
 utils/util.js                |  19 +++-
 13 files changed, 575 insertions(+), 90 deletions(-)
 create mode 100644 pages/bd/bddetail.vue
 create mode 100644 pages/visit/successform.vue
 create mode 100644 pages/visit/visithistory.vue
 create mode 100644 static/img/success.png

diff --git a/pages.json b/pages.json
index d86948f..cfad06e 100644
--- a/pages.json
+++ b/pages.json
@@ -14,24 +14,43 @@
 				"backgroundColor": "#fff"
 			}
 		},
+		// bd用户
 		{
 			"path": "pages/bd/mine"
 		},
+		// bd用户列表
 		{
 			"path": "pages/bd/record"
 		},
+		//  bd访问详情
 		{
-			"path": "pages/visit/detail"
+			"path": "pages/bd/bddetail"
 		},
+		// 访问新增
 		{
 			"path": "pages/visit/addrecord"
 		},
+		// 学习
 		{
 			"path": "pages/visit/study"
 		},
+		// 测试并提交
 		{
 			"path": "pages/visit/testStudy"
-		}
+		},
+		// 提交后页面
+		{
+			"path": "pages/visit/successform"
+		},
+		// 访客 历史拜访记录
+		{
+			"path": "pages/visit/visithistory"
+		},
+		// 访客 详情
+		{
+			"path": "pages/visit/detail"
+		}
+		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "#FFFFFF",
diff --git a/pages/bd/bddetail.vue b/pages/bd/bddetail.vue
new file mode 100644
index 0000000..fd462ce
--- /dev/null
+++ b/pages/bd/bddetail.vue
@@ -0,0 +1,174 @@
+<template>
+	<view class="containers">
+		<view class="db">
+			<view class="dblist">
+				<view>
+					<view class="dbitem">
+						<text class="dbtype">{{info.type_text}}</text>
+						<view class="dbstatus bm">
+							<view>{{info.audit_status_text}}</view>
+							<view>
+								<text style="margin-right:10px">访问时间：{{info.date}}</text>
+								<text>{{info.visit_time.start_time}}至{{info.visit_time.end_time}}</text>
+							</view>
+							<view v-if="info.type=='2'">施工时段：{{info.work_start_time}}至{{info.work_end_time}}</view>
+						</view>
+						<view class="dbinfo justify-left">
+							<view>
+								<view>被访人：<text>{{info.accept_admin.name}}</text></view>
+								<view>部门：<text>{{info.accept_admin.department.name}}</text></view>
+								<view>访问区域：<text>{{info.visit_area.name}}</text></view>
+							</view>
+							<view>
+								<view>拜访人：<text>{{info.name}}</text></view>
+								<view>电话：{{info.mobile}}</view>
+								<view v-if="info.type=='1'">事由：<text>{{info.reason}}</text></view>
+								<view v-else-if="info.type=='3'">车牌：<text>{{info.plate}}</text></view>
+							</view>
+						</view>
+						<view class="dblong">
+							<view>长期访客申请：<text>{{info.long_time==0?'否':'是'}}</text></view>
+							<view v-if="info.long_time==1">长期访问时间：{{info.start_date}} 至 {{info.end_date}}</view>
+						</view>
+						
+					</view>
+				</view>
+				<template v-if="info.type!='3'">
+					<view class="dbtext">随访人员</view>
+					<view class="dbitem sfyritem">
+						<template v-if="info.follw_people">
+							<view class="dbinfo justify-left" v-for="people in info.follw_people">
+								<view>
+									<view>
+										随访人：<text>{{people.name}}</text>
+									</view>
+									<view>证件类型：<text>{{people.credent_name}}</text></view>
+									<view>证件号：<text>{{people.idcard}}</text></view>
+								</view>
+								<view>
+									电话：<text>{{people.mobile}}</text>
+								</view>
+							</view>
+						</template>
+						<template v-else>
+							<view class="dbinfo justify-left">
+								无
+							</view>
+						</template>
+					</view>
+				</template>
+				
+				<template v-if="info.type!='3'">
+					<view class="dbtext">到访车辆</view>
+					<view class="dbitem sfyritem">
+						<view class="dbinfo">
+							<view class="onechild">
+								车牌：<text>{{info.cars}}</text>
+							</view>
+						</view>
+					</view>
+				</template>
+		
+				<template v-if="info.type=='3'">
+					<view class="dbtext">收货人</view>
+					<view class="dbitem sfyritem">
+						<view class="dbinfo justify-left">
+							<view>
+								部门：<text>{{info.accept_goods_admin.department.name}}</text>
+							</view>
+							<view>
+								人员：<text>{{info.accept_goods_admin.name}}</text>
+							</view>
+						</view>
+					</view>
+				</template>
+				<view class="dbtext">被访人员</view>
+				<view class="dbitem sfyritem">
+					<view class="dbinfo justify-left">
+						<view>
+							部门：<text>{{info.accept_admin.department.name}}</text>
+						</view>
+						<view>
+							人员：<text>{{info.accept_admin.name}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import '@/static/css/bd.css'
+	export default{
+		data(){
+			return{
+				id:"",
+				info:{}
+			}
+		},
+		onReady() {
+			
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.loadDetail()
+		},
+		methods:{
+			loadDetail(){
+				let that = this
+				this.util.request({
+					api: '/api/admin/visit/show',
+					method: "get",
+					requestType:'bd',
+					data: {
+						id:that.id
+					},
+					utilSuccess: function(res) {
+						
+						that.info = res
+					},
+					utilFail: function(res) {
+						uni.showToast({
+							title: res.errmsg,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			isnull(p){
+				if(p == '' || p == undefined || p == null || p == 'undefined' || p == 'null'){
+					return ""
+				}else{
+					return p
+				}
+			}
+		}
+		
+		
+	}
+</script>
+
+<style scoped>
+	.containers{
+		background-color: #eceefe;
+		min-height: 100vh;
+		padding-top:20rpx;
+	}
+	.dbtext{
+		padding-top:10rpx;
+		margin-bottom:30rpx;
+		color:#303639;
+		font-size:40rpx;
+		padding-left:30rpx
+	}
+	.sfyritem{
+		padding-bottom:10rpx
+	}
+	.dbinfo>view text {
+	    color: #8f9596;
+	}
+</style>
diff --git a/pages/bd/mine.vue b/pages/bd/mine.vue
index 10a8c76..f893ce3 100644
--- a/pages/bd/mine.vue
+++ b/pages/bd/mine.vue
@@ -48,24 +48,28 @@
 								</view>
 								<view class="dbinfo justify-left">
 									<view>
-										<view>被访人：<text>{{item.accept_admin_id}}</text></view>
-										<view>部门：<text>生产</text></view>
-										<view>访问区域：<text>{{item.visit_area_id}}</text></view>
+										<view>被访人：<text>{{item.accept_admin.name}}</text></view>
+										<view>部门：<text>{{item.accept_admin.department.name}}</text></view>
+										<view>访问区域：<text>{{item.visit_area.name}}</text></view>
 									</view>
 									<view>
-										<view>拜访人：<text>{{item.name}}</text></view>
+										<view>拜访人：<text>{{item.name}}</text></view>
 										<view>电话：{{item.mobile}}</view>
-										<view v-if="item.type=='1'">事由：<text>{{item.reason}}</text></view>
+										<view v-if="item.type=='1'">事由：<text>{{item.reason}}</text></view>
 										<view v-else-if="item.type=='3'">车牌：<text>{{item.plate}}</text></view>
 									</view>
 								</view>
-								<view class="dblong">
+								<view class="dblong">
 									<view>长期访客申请：<text>{{item.long_time==0?'否':'是'}}</text></view>
 									<text v-if="item.long_time==1">长期访问时间：{{item.start_date}} 至 {{item.end_date}}</text>
 								</view>
 							</view>
 						</view>
 					</view>
+					<view v-if="isEmpty">
+						<u-empty mode="data">
+						</u-empty>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -106,10 +110,11 @@
 				select: {
 					page: 1,
 					page_size: 5,
-					total: 0,
-					audit_status:0,
-					keyword:""
-				}
+					total: 0,
+					audit_status: 0,
+					keyword: ""
+				},
+				isEmpty: false
 			}
 		},
 		onLoad() {
@@ -145,7 +150,7 @@
 			},
 			toDetail(id) {
 				uni.navigateTo({
-					url: '/pages/visit/detail?id=' + id
+					url: '/pages/bd/bddetail?id=' + id
 				})
 			},
 			getBdInfo() {
@@ -153,6 +158,7 @@
 				this.util.request({
 					api: '/api/admin/auth/me',
 					method: "POST",
+					requestType: 'bd',
 					utilSuccess: function(res) {
 						console.log(res)
 						that.userName = res.name
@@ -178,13 +184,17 @@
 				this.util.request({
 					api: '/api/admin/visit/index',
 					method: "get",
+					requestType: 'bd',
 					data: {
 						page: this.select.page,
-						page_size: this.select.page_size,
-						audit_status:this.select.audit_status,
-						keyword:this.select.keyword
+						page_size: this.select.page_size,
+						audit_status: this.select.audit_status,
+						keyword: this.select.keyword
 					},
 					utilSuccess: function(res) {
+						if (res.total == 0) {
+							that.isEmpty = true
+						}
 						if (that.select.page == 1) {
 							that.list = res.data
 						} else {
@@ -202,10 +212,10 @@
 					}
 				})
 			},
-			searchList(val) {
-				this.select.keyword = val
-				this.select.page = 1
-				this.loadList()
+			searchList(val) {
+				this.select.keyword = val
+				this.select.page = 1
+				this.loadList()
 			},
 			// scrolltolower(){},
 
@@ -272,4 +282,8 @@
 		text-align: center;
 		margin-top: 15rpx
 	}
+
+	/deep/ .u-empty {
+		min-height: 30vh;
+	}
 </style>
diff --git a/pages/bd/record.vue b/pages/bd/record.vue
index 9c717ab..38d1496 100644
--- a/pages/bd/record.vue
+++ b/pages/bd/record.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="containers">
 		<view class="dbbtns justify-between">
-			<text v-for="item in btnList" :class="{'active':btnActive===item.value}" @click="btnActive=item.value">
+			<text v-for="item in btnList" :class="{'active':btnActive===item.value}" @click="btnActiveList(item.value)">
 				{{item.label}}
 			</text>
 			<!-- <text >已完成</text>
@@ -22,9 +22,9 @@
 							</view>
 							<view class="dbinfo justify-left">
 								<view>
-									<view>被访人：<text>{{item.accept_admin_id}}</text></view>
-									<view>部门：<text>生产</text></view>
-									<view>访问区域：<text>{{item.visit_area_id}}</text></view>
+									<view>被访人：<text>{{item.accept_admin.name}}</text></view>
+									<view>部门：<text>{{item.accept_admin.department.name}}</text></view>
+									<view>访问区域：<text>{{item.visit_area.name}}</text></view>
 								</view>
 								<view>
 									<view>拜访人：<text>{{item.name}}</text></view>
@@ -40,6 +40,10 @@
 						</view>
 					</view>
 				</view>
+				<view v-if="isEmpty">
+					<u-empty mode="data">
+					</u-empty>
+				</view>
 			</view>
 
 		</view>
@@ -54,18 +58,18 @@
 	export default {
 		data() {
 			return {
-				btnActive: "all",
+				btnActive: "",
 				btnList: [{
 						label: "全部",
-						value: 'all'
+						value: ''
 					},
 					{
 						label: "已完成",
-						value: 'complete'
+						value: 4
 					},
 					{
 						label: "待完成",
-						value: 'going'
+						value: 0
 					}
 				],
 				list: [],
@@ -74,7 +78,8 @@
 					page_size: 5,
 					total: 0,
 					audit_status: 0
-				}
+				},
+				isEmpty:false,
 			}
 		},
 		onLoad() {
@@ -102,22 +107,34 @@
 			}
 		},
 		methods: {
-			toDetail() {
+			toDetail(id) {
 				uni.navigateTo({
-					url: '/pages/visit/detail'
+					url: '/pages/bd/bddetail?id=' + id
 				})
 			},
+			btnActiveList(val) {
+				this.btnActive = val
+				this.select.audit_status = val
+				this.select.page = 1
+				this.list = []
+				this.isEmpty = false
+				this.loadList()
+			},
 			loadList() {
 				let that = this
 				this.util.request({
 					api: '/api/admin/visit/index',
 					method: "get",
+					requestType: "bd",
 					data: {
 						page: this.select.page,
 						page_size: this.select.page_size,
 						audit_status: this.select.audit_status
 					},
-					utilSuccess: function(res) {
+					utilSuccess: function(res) {
+						if(res.total==0){
+							that.isEmpty=true
+						}
 						if (that.select.page == 1) {
 							that.list = res.data
 						} else {
@@ -144,5 +161,8 @@
 		background-color: #eceefe;
 		min-height: 100vh;
 		/* padding-top:20rpx; */
+	}
+	/deep/ .u-empty{
+		min-height: 60vh;
 	}
 </style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bbd99e3..4149107 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,9 @@
 <template>
 	<view class="containers" :style="{'height':winHeight+'px'}">
-		<view class="title">BD访客</view>
+		<view class="title justify-between">
+			<text>BD访客</text>
+			<text @click="toUrl(0)">我的历史记录</text>
+		</view>
 		<view class="bdfk">
 			<view>
 				<u--image :showLoading="true" :src="ptfk" width="315rpx" height="600rpx" @click="toUrl(1)"></u--image>
@@ -48,8 +51,10 @@
 						url = "/pages/visit/addrecord?type=2"
 						break;
 					case 3:
-						url = "/pages/visit/addrecord?type=3"
-						// url = "/pages/visit/study?type=3"
+						url = "/pages/visit/addrecord?type=3"
+						break;
+					case 0:
+						url = "/pages/visit/visithistory"
 						break;
 					case 4:
 						if(!this.util.isNull(this.isBd)){
@@ -60,7 +65,6 @@
 						
 						break;
 				}
-				console.log(url)
 				uni.navigateTo({
 					url:url
 				})
diff --git a/pages/visit/addrecord.vue b/pages/visit/addrecord.vue
index 69f298b..f8e64e5 100644
--- a/pages/visit/addrecord.vue
+++ b/pages/visit/addrecord.vue
@@ -291,7 +291,7 @@
 						for (var m of res.detail) {
 							arr.push({
 								text: m.value,
-								value: m.id
+								value: m.value
 							})
 						}
 						that.reasonList = arr
diff --git a/pages/visit/detail.vue b/pages/visit/detail.vue
index 35eecf7..fc95ca8 100644
--- a/pages/visit/detail.vue
+++ b/pages/visit/detail.vue
@@ -15,9 +15,9 @@
 						</view>
 						<view class="dbinfo justify-left">
 							<view>
-								<view>被访人：<text>{{info.accept_admin_id}}</text></view>
-								<view>部门：<text>生产</text></view>
-								<view>访问区域：<text>{{info.visit_area_id}}</text></view>
+								<view>被访人：<text>{{info.accept_admin.name}}</text></view>
+								<view>部门：<text>{{info.accept_admin.department.name}}</text></view>
+								<view>访问区域：<text>{{info.visit_area.name}}</text></view>
 							</view>
 							<view>
 								<view>拜访人：<text>{{info.name}}</text></view>
@@ -33,57 +33,63 @@
 						
 					</view>
 				</view>
-			
-				<view class="dbtext">随访人员</view>
-				<view class="dbitem sfyritem">
-					<template v-if="info.follw_people">
-						<view class="dbinfo justify-left" v-for="people in info.follw_people">
-							<view>
+				<template v-if="info.type!='3'">
+					<view class="dbtext">随访人员</view>
+					<view class="dbitem sfyritem">
+						<template v-if="info.follw_people">
+							<view class="dbinfo justify-left" v-for="people in info.follw_people">
 								<view>
-									随访人：<text>{{people.name}}</text>
+									<view>
+										随访人：<text>{{people.name}}</text>
+									</view>
+									<view>证件类型：<text>{{people.credent_name}}</text></view>
+									<view>证件号：<text>{{people.idcard}}</text></view>
+								</view>
+								<view>
+									电话：<text>{{people.mobile}}</text>
 								</view>
-								<view>证件类型：<text>{{people.credent_name}}</text></view>
-								<view>证件号：<text>{{people.idcard}}</text></view>
 							</view>
-							<view>
-								联系电话：<text>{{people.mobile}}</text>
+						</template>
+						<template v-else>
+							<view class="dbinfo justify-left">
+								无
 							</view>
-						</view>
-					</template>
-					<template>
-						<view class="dbinfo justify-left">
-							无
-						</view>
-					</template>
-					
-				</view>
-				<view class="dbtext">到访车辆</view>
-				<view class="dbitem sfyritem">
-					<view class="dbinfo">
-						<view class="onechild">
-							车牌：<text>{{info.cars}}</text>
-						</view>
+						</template>
 					</view>
-				</view>
-				<view class="dbtext">收货人</view>
-				<view class="dbitem sfyritem">
-					<view class="dbinfo justify-left">
-						<view>
-							部门：<text>{{info.accpet_department_id}}</text>
+				</template>
+				
+				<template v-if="info.type!='3'">
+					<view class="dbtext">到访车辆</view>
+					<view class="dbitem sfyritem">
+						<view class="dbinfo">
+							<view class="onechild">
+								车牌：<text>{{info.cars}}</text>
+							</view>
 						</view>
-						<view>
-							人员：<text>{{info.accept_goods_admin_id}}</text>
+					</view>
+				</template>
+		
+				<template v-if="info.type=='3'">
+					<view class="dbtext">收货人</view>
+					<view class="dbitem sfyritem">
+						<view class="dbinfo justify-left">
+							<view>
+								部门：<text>{{info.accept_goods_admin.department.name}}</text>
+							</view>
+							<view>
+								人员：<text>{{info.accept_goods_admin.name}}</text>
+							</view>
 						</view>
 					</view>
-				</view>
+				</template>
 				<view class="dbtext">被访人员</view>
 				<view class="dbitem sfyritem">
 					<view class="dbinfo justify-left">
 						<view>
-							部门：<text>{{info.accept_admin_sign}}</text>
+							部门：<text>{{info.accept_admin.department.name}}</text>
 						</view>
 						<view>
-							人员：<text>{{info.accept_admin_id}}</text>
+							人员：<text>{{info.accept_admin.name}}</text>
 						</view>
 					</view>
 				</view>
@@ -114,7 +120,7 @@
 			loadDetail(){
 				let that = this
 				this.util.request({
-					api: '/api/admin/visit/show',
+					api: '/api/mobile/user/my-visit-detail',
 					method: "get",
 					data: {
 						id:that.id
diff --git a/pages/visit/study.vue b/pages/visit/study.vue
index 3932dfd..75a2477 100644
--- a/pages/visit/study.vue
+++ b/pages/visit/study.vue
@@ -70,7 +70,8 @@
 					},
 					utilSuccess: function(res) {
 						that.studyInfo = res
-						that.studyMin = res.minute * 60
+						that.studyMin = res.minute * 60
+						// that.studyMin = .1 * 60
 					},
 					utilFail: function(res) {}
 				})
@@ -105,12 +106,14 @@
 		padding-bottom: 60rpx;
 		position: relative;
 	}
-	.containers>button{
-		position: absolute;
-		bottom:60rpx;
-		margin:20rpx;
-		width:90%;
+
+	.containers>button {
+		position: absolute;
+		bottom: 60rpx;
+		margin: 20rpx;
+		width: 90%;
 	}
+
 	.steps {
 		margin-bottom: 40rpx
 	}
diff --git a/pages/visit/successform.vue b/pages/visit/successform.vue
new file mode 100644
index 0000000..e2b5967
--- /dev/null
+++ b/pages/visit/successform.vue
@@ -0,0 +1,69 @@
+<template>
+	<view class="containers">
+		<view>
+			<img :src="succ" alt="">
+			<view>提交成功，等待审核</view>
+			<view>审核通过后，系统将在第一时间通知你</view>
+			<view>
+				<button @click="toHistory">我的拜访记录</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				succ: require('../../static/img/success.png')
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			toHistory() {
+				uni.navigateTo({
+					url: '/pages/visit/visithistory'
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.containers {
+		background-color: #fff;
+		min-height: 80vh;
+		padding: 20rpx;
+		position: relative;
+	}
+
+	.containers>view {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 70%;
+		text-align: center;
+	}
+
+	.containers>view img {
+		width: 200rpx;
+		height: 200rpx;
+	}
+
+	.containers>view view {
+		margin-bottom: 40rpx
+	}
+
+	.containers>view view:first-child {
+		font-size: 40rpx;
+		color: #000
+	}
+
+	.containers>view button {
+		background-color: #044ed7;
+		color: #fff
+	}
+</style>
diff --git a/pages/visit/testStudy.vue b/pages/visit/testStudy.vue
index 15b3113..c37dd16 100644
--- a/pages/visit/testStudy.vue
+++ b/pages/visit/testStudy.vue
@@ -116,7 +116,6 @@
 			},
 			// 匹配答案正确率
 			submitAnswer() {
-				console.log(this.correctNum)
 				let correctLength = 0
 				for (var key in this.correctNum) {
 					if (this.correctNum[key] == 1) {
@@ -139,9 +138,13 @@
 					data: that.formData,
 					utilSuccess: function(res) {
 						uni.showToast({
-							title: res.errmsg,
+							title: res.msg,
 							duration: 2000,
 							icon: 'none'
+						})
+						uni.removeStorageSync('formData')
+						uni.navigateTo({
+							url:'/pages/visit/successform'
 						})
 					},
 					utilFail: function(res) {
diff --git a/pages/visit/visithistory.vue b/pages/visit/visithistory.vue
new file mode 100644
index 0000000..548cae1
--- /dev/null
+++ b/pages/visit/visithistory.vue
@@ -0,0 +1,162 @@
+<template>
+	<view class="containers">
+		<!-- <view class="dbbtns justify-between">
+			<text v-for="item in btnList" :class="{'active':btnActive===item.value}" @click="btnActiveList(item.value)">
+				{{item.label}}
+			</text>
+		</view> -->
+		<view class="db">
+			<view class="dblist">
+				<view>
+					<view v-for="(item, index) in list" :key="index">
+						<view class="dbitem" @click="toDetail(item.id)">
+							<text class="dbtype">{{item.type_text}}</text>
+							<view class="dbstatus bm">
+								<view>{{item.audit_status_text}}</view>
+								<view>
+									<text style="margin-right:10px">访问时间：{{item.date}}</text>
+									<text>{{item.visit_time.start_time}}至{{item.visit_time.end_time}}</text>
+								</view>
+							</view>
+							<view class="dbinfo justify-left">
+								<view>
+									<view>被访人：<text>{{item.accept_admin.name}}</text></view>
+									<view>部门：<text>{{item.accept_admin.department.name}}</text></view>
+									<view>访问区域：<text>{{item.visit_area.name}}</text></view>
+								</view>
+								<view>
+									<view>拜访人：<text>{{item.name}}</text></view>
+									<view>电话：{{item.mobile}}</view>
+									<view v-if="item.type=='1'">事由：<text>{{item.reason}}</text></view>
+									<view v-else-if="item.type=='3'">车牌：<text>{{item.plate}}</text></view>
+								</view>
+							</view>
+							<view class="dblong">
+								<view>长期访客申请：<text>{{item.long_time==0?'否':'是'}}</text></view>
+								<text v-if="item.long_time==1">长期访问时间：{{item.start_date}} 至 {{item.end_date}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="isEmpty">
+					<u-empty mode="data">
+					</u-empty>
+				</view>
+			</view>
+
+		</view>
+
+
+
+	</view>
+</template>
+
+<script>
+	import '@/static/css/bd.css'
+	export default {
+		data() {
+			return {
+				btnActive: "",
+				btnList: [{
+						label: "全部",
+						value: ''
+					},
+					{
+						label: "已完成",
+						value: 4
+					},
+					{
+						label: "待完成",
+						value: 0
+					}
+				],
+				list: [],
+				select: {
+					page: 1,
+					page_size: 5,
+					total: 0,
+					type: ""
+				},
+				isEmpty:false,
+			}
+		},
+		onLoad() {
+			this.loadList()
+		},
+		onPullDownRefresh() {
+			this.select.page = 1
+			this.loadList()
+			uni.stopPullDownRefresh();
+		},
+		//上拉加载
+		onReachBottom() {
+			//当当前列表数据长度>=数据总长度时
+			if (this.list.length >= this.select.total) {
+				//提示
+				uni.showToast({
+					title: '没有更多了',
+					duration: 1000,
+					icon: 'none'
+				})
+			} else {
+				//否则，页码+1，继续请求列表
+				this.select.page++
+				this.loadList()
+			}
+		},
+		methods: {
+			toDetail(id) {
+				uni.navigateTo({
+					url: '/pages/visit/detail?id=' + id
+				})
+			},
+			btnActiveList(val) {
+				this.btnActive = val
+				this.select.audit_status = val
+				this.loadList()
+			},
+			loadList() {
+				let that = this
+				this.util.request({
+					api: '/api/mobile/user/my-visit',
+					method: "get",
+					data: {
+						page: this.select.page,
+						page_size: this.select.page_size,
+						type: this.select.type
+					},
+					utilSuccess: function(res) {
+						if(res.total==0){
+							that.isEmpty=true
+						}
+						if (that.select.page == 1) {
+							that.list = res.data
+						} else {
+							that.list.push(...res.data)
+						}
+						that.select.total = res.total
+
+					},
+					utilFail: function(res) {
+						uni.showToast({
+							title: res.errmsg,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.containers {
+		background-color: #eceefe;
+		min-height: 100vh;
+		/* padding-top:20rpx; */
+	}
+	/deep/ .u-empty{
+		min-height: 60vh;
+	}
+</style>
diff --git a/static/img/success.png b/static/img/success.png
new file mode 100644
index 0000000000000000000000000000000000000000..e839c050ce207e6ab8fe4f0ae6c3d1c971905769
GIT binary patch
literal 9167
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

literal 0
HcmV?d00001

diff --git a/utils/util.js b/utils/util.js
index fe80af8..08ec418 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -58,7 +58,14 @@ const getOpenidInfo = (cb, refresh) => {
 			uni.request({
 				url: url,
 				method: 'GET',
-				success: result => {
+				success: result => {
+					// if(result.errmsg){
+					// 	uni.showToast({
+					// 		title:result.errmsg,
+					// 		duration:2000
+					// 	})
+					// 	return
+					// }
 					let user_info = result.data
 					uni.setStorageSync(user_info_key, user_info)
 					cb(user_info)
@@ -166,10 +173,14 @@ const request = options => {
 	}; // 如果已登录,请求中拼openId
 
 	var access_token = uni.getStorageSync(user_info_key).token;
-	var access_token_bd = uni.getStorageSync(userInfo_BD_token).token;
+	var access_bd_token = uni.getStorageSync(userInfo_BD_token).token;
 	
-	var request_token = access_token_bd?access_token_bd:access_token
-	console.log(request_token)
+	var request_token = access_token
+	if(options.requestType=='bd'){
+		request_token = access_bd_token
+	}
+	// var request_token = access_bd_token?access_bd_token:access_token
+	// console.log(request_token)
 	if (isLogin()) {
 		options.data = {
 			...options.data,