diff --git a/api/tort.js b/api/tort.js
index 934496e..60a4e54 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -8,6 +8,8 @@
 // const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 // const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
+const REPORT_LIST = BASE_URL + '/webserver/reportInfo/queryPersonReportedInfo.do'
+const REPORT_DETAIL = BASE_URL + '/webserver/reportInfos/shortcutQueryReportInfo.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -40,5 +42,13 @@
 	}
 	return fetch.get(GET_CODE_URL, data).then(res => res);
 }
+// 举报列表
+export function getReportList(data) {
+	return fetch.post(REPORT_LIST, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 举报详情
+export function getReportDetail(data) {
+	return fetch.post(REPORT_DETAIL, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
 
 

diff --git a/api/tort.js b/api/tort.js
index 934496e..60a4e54 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -8,6 +8,8 @@
 // const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 // const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
+const REPORT_LIST = BASE_URL + '/webserver/reportInfo/queryPersonReportedInfo.do'
+const REPORT_DETAIL = BASE_URL + '/webserver/reportInfos/shortcutQueryReportInfo.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -40,5 +42,13 @@
 	}
 	return fetch.get(GET_CODE_URL, data).then(res => res);
 }
+// 举报列表
+export function getReportList(data) {
+	return fetch.post(REPORT_LIST, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 举报详情
+export function getReportDetail(data) {
+	return fetch.post(REPORT_DETAIL, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
 
 
diff --git a/common/fetch.js b/common/fetch.js
index 0747653..ba307c4 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -16,7 +16,7 @@
 	'103':'验证码超时',
 }
 function fetch(method) {
-  return function (url, data, otherParams = {}) {
+  return function (url, data, otherParams = {}, headers = {}) {
     // if (method === 'POST' || method === 'PUT') {
     //   data = {
     //     param: data,
@@ -31,14 +31,19 @@
         data,
         header: {
           token: sessionId,
+		  ...headers,
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1 || data.data.code === 200) {
+            if (data.data.status === 1 || data.data.code === 200 || data.data.status ==='1') {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
-              resolve(data.data.data);
+              if (data.data.status === 1) {
+				  resolve(data.data.data ? data.data.data : data.data);
+			  } else {
+				   resolve(data.data.data);
+			  }
             } else if(
 						data.data.status === 103 || data.data.status === 3 || 
 						data.data.status === 2 ||data.data.status === 4 ||

diff --git a/api/tort.js b/api/tort.js
index 934496e..60a4e54 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -8,6 +8,8 @@
 // const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 // const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
+const REPORT_LIST = BASE_URL + '/webserver/reportInfo/queryPersonReportedInfo.do'
+const REPORT_DETAIL = BASE_URL + '/webserver/reportInfos/shortcutQueryReportInfo.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -40,5 +42,13 @@
 	}
 	return fetch.get(GET_CODE_URL, data).then(res => res);
 }
+// 举报列表
+export function getReportList(data) {
+	return fetch.post(REPORT_LIST, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 举报详情
+export function getReportDetail(data) {
+	return fetch.post(REPORT_DETAIL, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
 
 
diff --git a/common/fetch.js b/common/fetch.js
index 0747653..ba307c4 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -16,7 +16,7 @@
 	'103':'验证码超时',
 }
 function fetch(method) {
-  return function (url, data, otherParams = {}) {
+  return function (url, data, otherParams = {}, headers = {}) {
     // if (method === 'POST' || method === 'PUT') {
     //   data = {
     //     param: data,
@@ -31,14 +31,19 @@
         data,
         header: {
           token: sessionId,
+		  ...headers,
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1 || data.data.code === 200) {
+            if (data.data.status === 1 || data.data.code === 200 || data.data.status ==='1') {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
-              resolve(data.data.data);
+              if (data.data.status === 1) {
+				  resolve(data.data.data ? data.data.data : data.data);
+			  } else {
+				   resolve(data.data.data);
+			  }
             } else if(
 						data.data.status === 103 || data.data.status === 3 || 
 						data.data.status === 2 ||data.data.status === 4 ||
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..259c178 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -101,6 +101,8 @@
 					value: '12345678978',
 					icon: '../../static/mine/phone.png'
 				},);
+				// 本地存储手机号，作为用户唯一标识
+				localStorage.setItem('userIdentifying','12345678978')
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',

diff --git a/api/tort.js b/api/tort.js
index 934496e..60a4e54 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -8,6 +8,8 @@
 // const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 // const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
+const REPORT_LIST = BASE_URL + '/webserver/reportInfo/queryPersonReportedInfo.do'
+const REPORT_DETAIL = BASE_URL + '/webserver/reportInfos/shortcutQueryReportInfo.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -40,5 +42,13 @@
 	}
 	return fetch.get(GET_CODE_URL, data).then(res => res);
 }
+// 举报列表
+export function getReportList(data) {
+	return fetch.post(REPORT_LIST, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 举报详情
+export function getReportDetail(data) {
+	return fetch.post(REPORT_DETAIL, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
 
 
diff --git a/common/fetch.js b/common/fetch.js
index 0747653..ba307c4 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -16,7 +16,7 @@
 	'103':'验证码超时',
 }
 function fetch(method) {
-  return function (url, data, otherParams = {}) {
+  return function (url, data, otherParams = {}, headers = {}) {
     // if (method === 'POST' || method === 'PUT') {
     //   data = {
     //     param: data,
@@ -31,14 +31,19 @@
         data,
         header: {
           token: sessionId,
+		  ...headers,
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1 || data.data.code === 200) {
+            if (data.data.status === 1 || data.data.code === 200 || data.data.status ==='1') {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
-              resolve(data.data.data);
+              if (data.data.status === 1) {
+				  resolve(data.data.data ? data.data.data : data.data);
+			  } else {
+				   resolve(data.data.data);
+			  }
             } else if(
 						data.data.status === 103 || data.data.status === 3 || 
 						data.data.status === 2 ||data.data.status === 4 ||
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..259c178 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -101,6 +101,8 @@
 					value: '12345678978',
 					icon: '../../static/mine/phone.png'
 				},);
+				// 本地存储手机号，作为用户唯一标识
+				localStorage.setItem('userIdentifying','12345678978')
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..34a6d66 100644
--- a/packageA/components/record.vue
+++ b/packageA/components/record.vue
@@ -1,21 +1,22 @@
 <template>
 	<view class="record">
-		<view class="record-item" v-for="item in list" :key="item.code" @click="handleClick(item.code)">
+		<view class="record-item" v-for="item in list" :key="item.reportNo" @click="handleClick(item.reportNo)">
 			<view class="left">
-				<text class="code">{{item.code}}</text>
+				<text class="code">{{item.reportNo}}</text>
 				<view class="time">
 					<u-icon name="clock" customStyle="margin-right: 10rpx;" ></u-icon> 
-					{{item.time}}
+					{{stamp2Time(item.createTime)}}
 				</view>
 			</view>
-			<view :class="item.status === '已评估' ? 'green right' : 'right'">
-				{{item.status}}
+			<view :class="item.status === 2 ? 'green right' : 'right'">
+				{{item.status === 2 ? '已评估' :'待评估'}}
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {  stamp2Time } from '../../common/utils.js';
 	export default {
 		props: {
 			list: {
@@ -50,7 +51,8 @@
 				wx.navigateTo({
 					url: `/packageB/recordDetail/recordDetail?code=${code}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>

diff --git a/api/tort.js b/api/tort.js
index 934496e..60a4e54 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -8,6 +8,8 @@
 // const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 // const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
+const REPORT_LIST = BASE_URL + '/webserver/reportInfo/queryPersonReportedInfo.do'
+const REPORT_DETAIL = BASE_URL + '/webserver/reportInfos/shortcutQueryReportInfo.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -40,5 +42,13 @@
 	}
 	return fetch.get(GET_CODE_URL, data).then(res => res);
 }
+// 举报列表
+export function getReportList(data) {
+	return fetch.post(REPORT_LIST, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 举报详情
+export function getReportDetail(data) {
+	return fetch.post(REPORT_DETAIL, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
 
 
diff --git a/common/fetch.js b/common/fetch.js
index 0747653..ba307c4 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -16,7 +16,7 @@
 	'103':'验证码超时',
 }
 function fetch(method) {
-  return function (url, data, otherParams = {}) {
+  return function (url, data, otherParams = {}, headers = {}) {
     // if (method === 'POST' || method === 'PUT') {
     //   data = {
     //     param: data,
@@ -31,14 +31,19 @@
         data,
         header: {
           token: sessionId,
+		  ...headers,
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1 || data.data.code === 200) {
+            if (data.data.status === 1 || data.data.code === 200 || data.data.status ==='1') {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
-              resolve(data.data.data);
+              if (data.data.status === 1) {
+				  resolve(data.data.data ? data.data.data : data.data);
+			  } else {
+				   resolve(data.data.data);
+			  }
             } else if(
 						data.data.status === 103 || data.data.status === 3 || 
 						data.data.status === 2 ||data.data.status === 4 ||
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..259c178 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -101,6 +101,8 @@
 					value: '12345678978',
 					icon: '../../static/mine/phone.png'
 				},);
+				// 本地存储手机号，作为用户唯一标识
+				localStorage.setItem('userIdentifying','12345678978')
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..34a6d66 100644
--- a/packageA/components/record.vue
+++ b/packageA/components/record.vue
@@ -1,21 +1,22 @@
 <template>
 	<view class="record">
-		<view class="record-item" v-for="item in list" :key="item.code" @click="handleClick(item.code)">
+		<view class="record-item" v-for="item in list" :key="item.reportNo" @click="handleClick(item.reportNo)">
 			<view class="left">
-				<text class="code">{{item.code}}</text>
+				<text class="code">{{item.reportNo}}</text>
 				<view class="time">
 					<u-icon name="clock" customStyle="margin-right: 10rpx;" ></u-icon> 
-					{{item.time}}
+					{{stamp2Time(item.createTime)}}
 				</view>
 			</view>
-			<view :class="item.status === '已评估' ? 'green right' : 'right'">
-				{{item.status}}
+			<view :class="item.status === 2 ? 'green right' : 'right'">
+				{{item.status === 2 ? '已评估' :'待评估'}}
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {  stamp2Time } from '../../common/utils.js';
 	export default {
 		props: {
 			list: {
@@ -50,7 +51,8 @@
 				wx.navigateTo({
 					url: `/packageB/recordDetail/recordDetail?code=${code}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index c0795a1..fded6fb 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -21,11 +21,11 @@
 			</u-tabs>
 		</view>
 		<!-- 列表 -->
-		<view class="record-area">
+		<scroll-view v-if="!isEmpty" class="record-area" scroll-y>
 			<Record :list="reportList"/>
-		</view>
+		</scroll-view>
 		
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -43,7 +43,7 @@
 		<u-empty
 			v-if="isEmpty"
 			mode="search"
-			text="暂无结果"
+			:text="loading ? '数据加载中' : '暂无结果'"
 			:show="true"
 			iconColor="#77797d"
 			textColor="#77797d"
@@ -54,13 +54,15 @@
 
 <script>
 	import Record from '../components/record.vue'
-	import { getLocationParams } from '../../common/utils.js';
+	import { getLocationParams, stamp2Time } from '../../common/utils.js';
+	import { getReportList } from '../../api/tort.js';
 	export default {
 		components: {
 			Record
 		},
 		data() {
 			return {
+				loading:true,
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
 				status: 'loadmore', //上滑加载状态 loading加载中，nomore没有更多了
@@ -77,6 +79,7 @@
 					},
 				],
 				reportList: [], // 列表数据
+				dataList:[], //初始数据列表
 			}
 		},
 		watch: {
@@ -92,14 +95,15 @@
 				// immediate: true,
 			}
 		},
-		mounted() {
+		async mounted() {
+			this.loading = true
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			
 			this.currentTab = getLocationParams('tabType'); // 当前tab
 			this.clickTab(null, this.currentTab);
+		    this.fetchReportData()
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,91 +128,30 @@
 			
 		},
 		methods: {
+			// 获取举报列表数据
+			async fetchReportData() {
+				const data = {
+					'userInfoVo.id':'', //用户id
+					'userInfoVo.beginTime':'2020-01-01 00:00:00', //开始时间（Date）
+					'userInfoVo.endTime':stamp2Time(new Date().getTime()), //结束时间  （Date）
+					'userInfoVo.pageIndex':'1', //页码
+					'userInfoVo.count':'50', //页数
+					'userInfoVo.attributeTable': '',  //用户为监督员传“jdy”
+					'token':'',
+				}
+				getReportList(data).then(res => {
+					this.dataList = res.reportInfoVOs
+					this.reportList = this.dataList
+					this.loading = false
+				})
+			},
 			clickTab(val, currentTab) {
 				if((val && val.index === 0) || currentTab === '0') { // 全部
-					this.reportList = [
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-					]
+					this.reportList = this.dataList
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
-					this.reportList = [
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-					]
-				} else if((val && val.index === 1) || currentTab === '2') { // 已评估
-					this.reportList = [
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-					]
+					this.reportList = this.dataList.filter(item => item.status !== 2 )
+				} else if((val && val.index === 2) || currentTab === '2') { // 已评估
+					this.reportList = this.dataList.filter(item => item.status === 2 )
 				} else {
 					this.reportList = []
 				}
@@ -220,17 +163,30 @@
 <style lang="scss" scoped>
 	.my-report {
 		width: 100%;
+		height: 100vh;
 		box-sizing: border-box;
 		padding-top: 146rpx;
+		display: flex;
+		flex-direction: column;// flex垂直布局
+		overflow: hidden;
+		// justify-content: flex-end;
 		.tab-area {
 			position: fixed;
 			box-sizing: border-box;
-			top: 0;
+			top: -1rpx;
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
 			// background-color: #4390f7;
 		}
+		.fix-bg{
+			background-color: #4390f7;
+		}
+		.record-area{
+			overflow: hidden;
+			flex: 1;// 达到高度自适应
+			height: calc(100vh - 66px);
+		}
 	}
 </style>
 <style>

diff --git a/api/tort.js b/api/tort.js
index 934496e..60a4e54 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -8,6 +8,8 @@
 // const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 // const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
+const REPORT_LIST = BASE_URL + '/webserver/reportInfo/queryPersonReportedInfo.do'
+const REPORT_DETAIL = BASE_URL + '/webserver/reportInfos/shortcutQueryReportInfo.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -40,5 +42,13 @@
 	}
 	return fetch.get(GET_CODE_URL, data).then(res => res);
 }
+// 举报列表
+export function getReportList(data) {
+	return fetch.post(REPORT_LIST, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 举报详情
+export function getReportDetail(data) {
+	return fetch.post(REPORT_DETAIL, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
 
 
diff --git a/common/fetch.js b/common/fetch.js
index 0747653..ba307c4 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -16,7 +16,7 @@
 	'103':'验证码超时',
 }
 function fetch(method) {
-  return function (url, data, otherParams = {}) {
+  return function (url, data, otherParams = {}, headers = {}) {
     // if (method === 'POST' || method === 'PUT') {
     //   data = {
     //     param: data,
@@ -31,14 +31,19 @@
         data,
         header: {
           token: sessionId,
+		  ...headers,
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1 || data.data.code === 200) {
+            if (data.data.status === 1 || data.data.code === 200 || data.data.status ==='1') {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
-              resolve(data.data.data);
+              if (data.data.status === 1) {
+				  resolve(data.data.data ? data.data.data : data.data);
+			  } else {
+				   resolve(data.data.data);
+			  }
             } else if(
 						data.data.status === 103 || data.data.status === 3 || 
 						data.data.status === 2 ||data.data.status === 4 ||
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..259c178 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -101,6 +101,8 @@
 					value: '12345678978',
 					icon: '../../static/mine/phone.png'
 				},);
+				// 本地存储手机号，作为用户唯一标识
+				localStorage.setItem('userIdentifying','12345678978')
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..34a6d66 100644
--- a/packageA/components/record.vue
+++ b/packageA/components/record.vue
@@ -1,21 +1,22 @@
 <template>
 	<view class="record">
-		<view class="record-item" v-for="item in list" :key="item.code" @click="handleClick(item.code)">
+		<view class="record-item" v-for="item in list" :key="item.reportNo" @click="handleClick(item.reportNo)">
 			<view class="left">
-				<text class="code">{{item.code}}</text>
+				<text class="code">{{item.reportNo}}</text>
 				<view class="time">
 					<u-icon name="clock" customStyle="margin-right: 10rpx;" ></u-icon> 
-					{{item.time}}
+					{{stamp2Time(item.createTime)}}
 				</view>
 			</view>
-			<view :class="item.status === '已评估' ? 'green right' : 'right'">
-				{{item.status}}
+			<view :class="item.status === 2 ? 'green right' : 'right'">
+				{{item.status === 2 ? '已评估' :'待评估'}}
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {  stamp2Time } from '../../common/utils.js';
 	export default {
 		props: {
 			list: {
@@ -50,7 +51,8 @@
 				wx.navigateTo({
 					url: `/packageB/recordDetail/recordDetail?code=${code}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index c0795a1..fded6fb 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -21,11 +21,11 @@
 			</u-tabs>
 		</view>
 		<!-- 列表 -->
-		<view class="record-area">
+		<scroll-view v-if="!isEmpty" class="record-area" scroll-y>
 			<Record :list="reportList"/>
-		</view>
+		</scroll-view>
 		
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -43,7 +43,7 @@
 		<u-empty
 			v-if="isEmpty"
 			mode="search"
-			text="暂无结果"
+			:text="loading ? '数据加载中' : '暂无结果'"
 			:show="true"
 			iconColor="#77797d"
 			textColor="#77797d"
@@ -54,13 +54,15 @@
 
 <script>
 	import Record from '../components/record.vue'
-	import { getLocationParams } from '../../common/utils.js';
+	import { getLocationParams, stamp2Time } from '../../common/utils.js';
+	import { getReportList } from '../../api/tort.js';
 	export default {
 		components: {
 			Record
 		},
 		data() {
 			return {
+				loading:true,
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
 				status: 'loadmore', //上滑加载状态 loading加载中，nomore没有更多了
@@ -77,6 +79,7 @@
 					},
 				],
 				reportList: [], // 列表数据
+				dataList:[], //初始数据列表
 			}
 		},
 		watch: {
@@ -92,14 +95,15 @@
 				// immediate: true,
 			}
 		},
-		mounted() {
+		async mounted() {
+			this.loading = true
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			
 			this.currentTab = getLocationParams('tabType'); // 当前tab
 			this.clickTab(null, this.currentTab);
+		    this.fetchReportData()
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,91 +128,30 @@
 			
 		},
 		methods: {
+			// 获取举报列表数据
+			async fetchReportData() {
+				const data = {
+					'userInfoVo.id':'', //用户id
+					'userInfoVo.beginTime':'2020-01-01 00:00:00', //开始时间（Date）
+					'userInfoVo.endTime':stamp2Time(new Date().getTime()), //结束时间  （Date）
+					'userInfoVo.pageIndex':'1', //页码
+					'userInfoVo.count':'50', //页数
+					'userInfoVo.attributeTable': '',  //用户为监督员传“jdy”
+					'token':'',
+				}
+				getReportList(data).then(res => {
+					this.dataList = res.reportInfoVOs
+					this.reportList = this.dataList
+					this.loading = false
+				})
+			},
 			clickTab(val, currentTab) {
 				if((val && val.index === 0) || currentTab === '0') { // 全部
-					this.reportList = [
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-					]
+					this.reportList = this.dataList
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
-					this.reportList = [
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-					]
-				} else if((val && val.index === 1) || currentTab === '2') { // 已评估
-					this.reportList = [
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-					]
+					this.reportList = this.dataList.filter(item => item.status !== 2 )
+				} else if((val && val.index === 2) || currentTab === '2') { // 已评估
+					this.reportList = this.dataList.filter(item => item.status === 2 )
 				} else {
 					this.reportList = []
 				}
@@ -220,17 +163,30 @@
 <style lang="scss" scoped>
 	.my-report {
 		width: 100%;
+		height: 100vh;
 		box-sizing: border-box;
 		padding-top: 146rpx;
+		display: flex;
+		flex-direction: column;// flex垂直布局
+		overflow: hidden;
+		// justify-content: flex-end;
 		.tab-area {
 			position: fixed;
 			box-sizing: border-box;
-			top: 0;
+			top: -1rpx;
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
 			// background-color: #4390f7;
 		}
+		.fix-bg{
+			background-color: #4390f7;
+		}
+		.record-area{
+			overflow: hidden;
+			flex: 1;// 达到高度自适应
+			height: calc(100vh - 66px);
+		}
 	}
 </style>
 <style>
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index 2605880..7fac822 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -3,58 +3,73 @@
 		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="main">
 			<u--form labelPosition="left" :model="form">
-				<u-form-item label="操作" prop="staffCode" borderBottom labelWidth="100">
+				<!-- <u-form-item label="操作" prop="staffCode" borderBottom labelWidth="100">
 					{{form.handle}}
+				</u-form-item> -->
+				<u-form-item label="描述" borderBottom labelWidth="100" >
+					{{form.infoDescribe}}
 				</u-form-item>
 				<u-form-item label="举报号" borderBottom labelWidth="100" >
-					{{form.code}}
+					{{form.reportNo}}
 				</u-form-item>
 				<u-form-item label="举报类型" prop="staffCode" borderBottom labelWidth="100">
-					{{form.type}}
+					{{form.reportType}}
 				</u-form-item>
 				<u-form-item label="状态" borderBottom labelWidth="100">
-					{{form.status}}
+					{{form.status === '2' ? '已评估' : '待评估'}}
 				</u-form-item>
 				<u-form-item label="信息来源" borderBottom labelWidth="100">
-					{{form.source}}
+					{{form.webSiteName}}
 				</u-form-item>
 				<u-form-item label="举报时间" prop="visitorName" labelWidth="100" borderBottom>
-					{{form.time}}
+					{{stamp2Time(form.createDate)}}
 				</u-form-item>
-				<u-form-item label="分数" prop="visitorIdCard" borderBottom labelWidth="100">
+				<!-- <u-form-item label="分数" prop="visitorIdCard" borderBottom labelWidth="100">
 					{{form.score}}
-				</u-form-item>
+				</u-form-item> -->
 			</u--form>
 		</view>
 	</view>
 </template>
 
 <script>
-	import { getLocationParams } from '../../common/utils.js'
+	import { getLocationParams, stamp2Time } from '../../common/utils.js'
+	import { getReportDetail } from '../../api/tort.js'
 	export default {
 		data() {
 			return {
 				form:{
-					handle: '操作', // 操作
-					code: '举报号', // 举报号
-					type: '举报类型', // 举报类型
+					infoDescribe: '描述', // 操作
+					reportNo: '举报号', // 举报号
+					reportType: '举报类型', // 举报类型
 					status: '状态', //状态
-					source: '信息来源', // 信息来源
+					webSiteName: '信息来源', // 信息来源
 					time: '举报时间', // 举报时间
-					score: '99', // 分数
+					createDate: '99', // 分数
 				},
 			}
 		},
+		// onLoad: function (option) { 
+		//         console.log(option); //打印出上个页面传递的参数。
+		//     },
 		mounted() {
 			const code = getLocationParams('code') // 举报号
-			console.log(code, 'lll')
 			//-------------用这个举报号去调搜索接口---获取详情
 			this.fetchData(code)
 		},
 		methods: {
 			fetchData(code) {
 				// 调接口逻辑
-			}
+				getReportDetail({reportNo: code}).then(res => {
+					this.form = res
+					// 5 "其他"，填写网址则为：0 网站举报
+					this.form.reportType = this.form.reportType === 0 ? '网站举报' : this.form.reportType === 5 ? '其他举报' : '专项举报'
+					console.log(res, '举报详情信息')
+				}).catch((error) => {
+					console.log(error)
+				})
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>

diff --git a/api/tort.js b/api/tort.js
index 934496e..60a4e54 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -8,6 +8,8 @@
 // const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 // const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
+const REPORT_LIST = BASE_URL + '/webserver/reportInfo/queryPersonReportedInfo.do'
+const REPORT_DETAIL = BASE_URL + '/webserver/reportInfos/shortcutQueryReportInfo.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -40,5 +42,13 @@
 	}
 	return fetch.get(GET_CODE_URL, data).then(res => res);
 }
+// 举报列表
+export function getReportList(data) {
+	return fetch.post(REPORT_LIST, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 举报详情
+export function getReportDetail(data) {
+	return fetch.post(REPORT_DETAIL, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
 
 
diff --git a/common/fetch.js b/common/fetch.js
index 0747653..ba307c4 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -16,7 +16,7 @@
 	'103':'验证码超时',
 }
 function fetch(method) {
-  return function (url, data, otherParams = {}) {
+  return function (url, data, otherParams = {}, headers = {}) {
     // if (method === 'POST' || method === 'PUT') {
     //   data = {
     //     param: data,
@@ -31,14 +31,19 @@
         data,
         header: {
           token: sessionId,
+		  ...headers,
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1 || data.data.code === 200) {
+            if (data.data.status === 1 || data.data.code === 200 || data.data.status ==='1') {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
-              resolve(data.data.data);
+              if (data.data.status === 1) {
+				  resolve(data.data.data ? data.data.data : data.data);
+			  } else {
+				   resolve(data.data.data);
+			  }
             } else if(
 						data.data.status === 103 || data.data.status === 3 || 
 						data.data.status === 2 ||data.data.status === 4 ||
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..259c178 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -101,6 +101,8 @@
 					value: '12345678978',
 					icon: '../../static/mine/phone.png'
 				},);
+				// 本地存储手机号，作为用户唯一标识
+				localStorage.setItem('userIdentifying','12345678978')
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..34a6d66 100644
--- a/packageA/components/record.vue
+++ b/packageA/components/record.vue
@@ -1,21 +1,22 @@
 <template>
 	<view class="record">
-		<view class="record-item" v-for="item in list" :key="item.code" @click="handleClick(item.code)">
+		<view class="record-item" v-for="item in list" :key="item.reportNo" @click="handleClick(item.reportNo)">
 			<view class="left">
-				<text class="code">{{item.code}}</text>
+				<text class="code">{{item.reportNo}}</text>
 				<view class="time">
 					<u-icon name="clock" customStyle="margin-right: 10rpx;" ></u-icon> 
-					{{item.time}}
+					{{stamp2Time(item.createTime)}}
 				</view>
 			</view>
-			<view :class="item.status === '已评估' ? 'green right' : 'right'">
-				{{item.status}}
+			<view :class="item.status === 2 ? 'green right' : 'right'">
+				{{item.status === 2 ? '已评估' :'待评估'}}
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {  stamp2Time } from '../../common/utils.js';
 	export default {
 		props: {
 			list: {
@@ -50,7 +51,8 @@
 				wx.navigateTo({
 					url: `/packageB/recordDetail/recordDetail?code=${code}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index c0795a1..fded6fb 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -21,11 +21,11 @@
 			</u-tabs>
 		</view>
 		<!-- 列表 -->
-		<view class="record-area">
+		<scroll-view v-if="!isEmpty" class="record-area" scroll-y>
 			<Record :list="reportList"/>
-		</view>
+		</scroll-view>
 		
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -43,7 +43,7 @@
 		<u-empty
 			v-if="isEmpty"
 			mode="search"
-			text="暂无结果"
+			:text="loading ? '数据加载中' : '暂无结果'"
 			:show="true"
 			iconColor="#77797d"
 			textColor="#77797d"
@@ -54,13 +54,15 @@
 
 <script>
 	import Record from '../components/record.vue'
-	import { getLocationParams } from '../../common/utils.js';
+	import { getLocationParams, stamp2Time } from '../../common/utils.js';
+	import { getReportList } from '../../api/tort.js';
 	export default {
 		components: {
 			Record
 		},
 		data() {
 			return {
+				loading:true,
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
 				status: 'loadmore', //上滑加载状态 loading加载中，nomore没有更多了
@@ -77,6 +79,7 @@
 					},
 				],
 				reportList: [], // 列表数据
+				dataList:[], //初始数据列表
 			}
 		},
 		watch: {
@@ -92,14 +95,15 @@
 				// immediate: true,
 			}
 		},
-		mounted() {
+		async mounted() {
+			this.loading = true
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			
 			this.currentTab = getLocationParams('tabType'); // 当前tab
 			this.clickTab(null, this.currentTab);
+		    this.fetchReportData()
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,91 +128,30 @@
 			
 		},
 		methods: {
+			// 获取举报列表数据
+			async fetchReportData() {
+				const data = {
+					'userInfoVo.id':'', //用户id
+					'userInfoVo.beginTime':'2020-01-01 00:00:00', //开始时间（Date）
+					'userInfoVo.endTime':stamp2Time(new Date().getTime()), //结束时间  （Date）
+					'userInfoVo.pageIndex':'1', //页码
+					'userInfoVo.count':'50', //页数
+					'userInfoVo.attributeTable': '',  //用户为监督员传“jdy”
+					'token':'',
+				}
+				getReportList(data).then(res => {
+					this.dataList = res.reportInfoVOs
+					this.reportList = this.dataList
+					this.loading = false
+				})
+			},
 			clickTab(val, currentTab) {
 				if((val && val.index === 0) || currentTab === '0') { // 全部
-					this.reportList = [
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-					]
+					this.reportList = this.dataList
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
-					this.reportList = [
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-					]
-				} else if((val && val.index === 1) || currentTab === '2') { // 已评估
-					this.reportList = [
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-					]
+					this.reportList = this.dataList.filter(item => item.status !== 2 )
+				} else if((val && val.index === 2) || currentTab === '2') { // 已评估
+					this.reportList = this.dataList.filter(item => item.status === 2 )
 				} else {
 					this.reportList = []
 				}
@@ -220,17 +163,30 @@
 <style lang="scss" scoped>
 	.my-report {
 		width: 100%;
+		height: 100vh;
 		box-sizing: border-box;
 		padding-top: 146rpx;
+		display: flex;
+		flex-direction: column;// flex垂直布局
+		overflow: hidden;
+		// justify-content: flex-end;
 		.tab-area {
 			position: fixed;
 			box-sizing: border-box;
-			top: 0;
+			top: -1rpx;
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
 			// background-color: #4390f7;
 		}
+		.fix-bg{
+			background-color: #4390f7;
+		}
+		.record-area{
+			overflow: hidden;
+			flex: 1;// 达到高度自适应
+			height: calc(100vh - 66px);
+		}
 	}
 </style>
 <style>
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index 2605880..7fac822 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -3,58 +3,73 @@
 		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="main">
 			<u--form labelPosition="left" :model="form">
-				<u-form-item label="操作" prop="staffCode" borderBottom labelWidth="100">
+				<!-- <u-form-item label="操作" prop="staffCode" borderBottom labelWidth="100">
 					{{form.handle}}
+				</u-form-item> -->
+				<u-form-item label="描述" borderBottom labelWidth="100" >
+					{{form.infoDescribe}}
 				</u-form-item>
 				<u-form-item label="举报号" borderBottom labelWidth="100" >
-					{{form.code}}
+					{{form.reportNo}}
 				</u-form-item>
 				<u-form-item label="举报类型" prop="staffCode" borderBottom labelWidth="100">
-					{{form.type}}
+					{{form.reportType}}
 				</u-form-item>
 				<u-form-item label="状态" borderBottom labelWidth="100">
-					{{form.status}}
+					{{form.status === '2' ? '已评估' : '待评估'}}
 				</u-form-item>
 				<u-form-item label="信息来源" borderBottom labelWidth="100">
-					{{form.source}}
+					{{form.webSiteName}}
 				</u-form-item>
 				<u-form-item label="举报时间" prop="visitorName" labelWidth="100" borderBottom>
-					{{form.time}}
+					{{stamp2Time(form.createDate)}}
 				</u-form-item>
-				<u-form-item label="分数" prop="visitorIdCard" borderBottom labelWidth="100">
+				<!-- <u-form-item label="分数" prop="visitorIdCard" borderBottom labelWidth="100">
 					{{form.score}}
-				</u-form-item>
+				</u-form-item> -->
 			</u--form>
 		</view>
 	</view>
 </template>
 
 <script>
-	import { getLocationParams } from '../../common/utils.js'
+	import { getLocationParams, stamp2Time } from '../../common/utils.js'
+	import { getReportDetail } from '../../api/tort.js'
 	export default {
 		data() {
 			return {
 				form:{
-					handle: '操作', // 操作
-					code: '举报号', // 举报号
-					type: '举报类型', // 举报类型
+					infoDescribe: '描述', // 操作
+					reportNo: '举报号', // 举报号
+					reportType: '举报类型', // 举报类型
 					status: '状态', //状态
-					source: '信息来源', // 信息来源
+					webSiteName: '信息来源', // 信息来源
 					time: '举报时间', // 举报时间
-					score: '99', // 分数
+					createDate: '99', // 分数
 				},
 			}
 		},
+		// onLoad: function (option) { 
+		//         console.log(option); //打印出上个页面传递的参数。
+		//     },
 		mounted() {
 			const code = getLocationParams('code') // 举报号
-			console.log(code, 'lll')
 			//-------------用这个举报号去调搜索接口---获取详情
 			this.fetchData(code)
 		},
 		methods: {
 			fetchData(code) {
 				// 调接口逻辑
-			}
+				getReportDetail({reportNo: code}).then(res => {
+					this.form = res
+					// 5 "其他"，填写网址则为：0 网站举报
+					this.form.reportType = this.form.reportType === 0 ? '网站举报' : this.form.reportType === 5 ? '其他举报' : '专项举报'
+					console.log(res, '举报详情信息')
+				}).catch((error) => {
+					console.log(error)
+				})
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 9d625fe..f2a6d71 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -752,6 +752,7 @@
 						"videoBatchIdsStr": '',//？
 						"verifyCode": this.form.code, // 验证码
 						"timeStr": this.timeStr, // 当前时间戳
+						"userID": '865a2ab9faf7c05fed57293212ec2aff',
 					}
 					this.$refs.form.validate().then(res => {
 						

diff --git a/api/tort.js b/api/tort.js
index 934496e..60a4e54 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -8,6 +8,8 @@
 // const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 // const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
+const REPORT_LIST = BASE_URL + '/webserver/reportInfo/queryPersonReportedInfo.do'
+const REPORT_DETAIL = BASE_URL + '/webserver/reportInfos/shortcutQueryReportInfo.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -40,5 +42,13 @@
 	}
 	return fetch.get(GET_CODE_URL, data).then(res => res);
 }
+// 举报列表
+export function getReportList(data) {
+	return fetch.post(REPORT_LIST, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 举报详情
+export function getReportDetail(data) {
+	return fetch.post(REPORT_DETAIL, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
 
 
diff --git a/common/fetch.js b/common/fetch.js
index 0747653..ba307c4 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -16,7 +16,7 @@
 	'103':'验证码超时',
 }
 function fetch(method) {
-  return function (url, data, otherParams = {}) {
+  return function (url, data, otherParams = {}, headers = {}) {
     // if (method === 'POST' || method === 'PUT') {
     //   data = {
     //     param: data,
@@ -31,14 +31,19 @@
         data,
         header: {
           token: sessionId,
+		  ...headers,
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1 || data.data.code === 200) {
+            if (data.data.status === 1 || data.data.code === 200 || data.data.status ==='1') {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
-              resolve(data.data.data);
+              if (data.data.status === 1) {
+				  resolve(data.data.data ? data.data.data : data.data);
+			  } else {
+				   resolve(data.data.data);
+			  }
             } else if(
 						data.data.status === 103 || data.data.status === 3 || 
 						data.data.status === 2 ||data.data.status === 4 ||
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..259c178 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -101,6 +101,8 @@
 					value: '12345678978',
 					icon: '../../static/mine/phone.png'
 				},);
+				// 本地存储手机号，作为用户唯一标识
+				localStorage.setItem('userIdentifying','12345678978')
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..34a6d66 100644
--- a/packageA/components/record.vue
+++ b/packageA/components/record.vue
@@ -1,21 +1,22 @@
 <template>
 	<view class="record">
-		<view class="record-item" v-for="item in list" :key="item.code" @click="handleClick(item.code)">
+		<view class="record-item" v-for="item in list" :key="item.reportNo" @click="handleClick(item.reportNo)">
 			<view class="left">
-				<text class="code">{{item.code}}</text>
+				<text class="code">{{item.reportNo}}</text>
 				<view class="time">
 					<u-icon name="clock" customStyle="margin-right: 10rpx;" ></u-icon> 
-					{{item.time}}
+					{{stamp2Time(item.createTime)}}
 				</view>
 			</view>
-			<view :class="item.status === '已评估' ? 'green right' : 'right'">
-				{{item.status}}
+			<view :class="item.status === 2 ? 'green right' : 'right'">
+				{{item.status === 2 ? '已评估' :'待评估'}}
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {  stamp2Time } from '../../common/utils.js';
 	export default {
 		props: {
 			list: {
@@ -50,7 +51,8 @@
 				wx.navigateTo({
 					url: `/packageB/recordDetail/recordDetail?code=${code}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index c0795a1..fded6fb 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -21,11 +21,11 @@
 			</u-tabs>
 		</view>
 		<!-- 列表 -->
-		<view class="record-area">
+		<scroll-view v-if="!isEmpty" class="record-area" scroll-y>
 			<Record :list="reportList"/>
-		</view>
+		</scroll-view>
 		
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -43,7 +43,7 @@
 		<u-empty
 			v-if="isEmpty"
 			mode="search"
-			text="暂无结果"
+			:text="loading ? '数据加载中' : '暂无结果'"
 			:show="true"
 			iconColor="#77797d"
 			textColor="#77797d"
@@ -54,13 +54,15 @@
 
 <script>
 	import Record from '../components/record.vue'
-	import { getLocationParams } from '../../common/utils.js';
+	import { getLocationParams, stamp2Time } from '../../common/utils.js';
+	import { getReportList } from '../../api/tort.js';
 	export default {
 		components: {
 			Record
 		},
 		data() {
 			return {
+				loading:true,
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
 				status: 'loadmore', //上滑加载状态 loading加载中，nomore没有更多了
@@ -77,6 +79,7 @@
 					},
 				],
 				reportList: [], // 列表数据
+				dataList:[], //初始数据列表
 			}
 		},
 		watch: {
@@ -92,14 +95,15 @@
 				// immediate: true,
 			}
 		},
-		mounted() {
+		async mounted() {
+			this.loading = true
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			
 			this.currentTab = getLocationParams('tabType'); // 当前tab
 			this.clickTab(null, this.currentTab);
+		    this.fetchReportData()
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,91 +128,30 @@
 			
 		},
 		methods: {
+			// 获取举报列表数据
+			async fetchReportData() {
+				const data = {
+					'userInfoVo.id':'', //用户id
+					'userInfoVo.beginTime':'2020-01-01 00:00:00', //开始时间（Date）
+					'userInfoVo.endTime':stamp2Time(new Date().getTime()), //结束时间  （Date）
+					'userInfoVo.pageIndex':'1', //页码
+					'userInfoVo.count':'50', //页数
+					'userInfoVo.attributeTable': '',  //用户为监督员传“jdy”
+					'token':'',
+				}
+				getReportList(data).then(res => {
+					this.dataList = res.reportInfoVOs
+					this.reportList = this.dataList
+					this.loading = false
+				})
+			},
 			clickTab(val, currentTab) {
 				if((val && val.index === 0) || currentTab === '0') { // 全部
-					this.reportList = [
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-					]
+					this.reportList = this.dataList
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
-					this.reportList = [
-						{
-							code: '1111',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-						{
-							code: '333',
-							status: '待评估',
-							time: '2022-12-12'
-						},
-					]
-				} else if((val && val.index === 1) || currentTab === '2') { // 已评估
-					this.reportList = [
-						{
-							code: '222',
-							status: '已评估',
-							time: '2022-12-12'
-						},
-					]
+					this.reportList = this.dataList.filter(item => item.status !== 2 )
+				} else if((val && val.index === 2) || currentTab === '2') { // 已评估
+					this.reportList = this.dataList.filter(item => item.status === 2 )
 				} else {
 					this.reportList = []
 				}
@@ -220,17 +163,30 @@
 <style lang="scss" scoped>
 	.my-report {
 		width: 100%;
+		height: 100vh;
 		box-sizing: border-box;
 		padding-top: 146rpx;
+		display: flex;
+		flex-direction: column;// flex垂直布局
+		overflow: hidden;
+		// justify-content: flex-end;
 		.tab-area {
 			position: fixed;
 			box-sizing: border-box;
-			top: 0;
+			top: -1rpx;
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
 			// background-color: #4390f7;
 		}
+		.fix-bg{
+			background-color: #4390f7;
+		}
+		.record-area{
+			overflow: hidden;
+			flex: 1;// 达到高度自适应
+			height: calc(100vh - 66px);
+		}
 	}
 </style>
 <style>
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index 2605880..7fac822 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -3,58 +3,73 @@
 		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="main">
 			<u--form labelPosition="left" :model="form">
-				<u-form-item label="操作" prop="staffCode" borderBottom labelWidth="100">
+				<!-- <u-form-item label="操作" prop="staffCode" borderBottom labelWidth="100">
 					{{form.handle}}
+				</u-form-item> -->
+				<u-form-item label="描述" borderBottom labelWidth="100" >
+					{{form.infoDescribe}}
 				</u-form-item>
 				<u-form-item label="举报号" borderBottom labelWidth="100" >
-					{{form.code}}
+					{{form.reportNo}}
 				</u-form-item>
 				<u-form-item label="举报类型" prop="staffCode" borderBottom labelWidth="100">
-					{{form.type}}
+					{{form.reportType}}
 				</u-form-item>
 				<u-form-item label="状态" borderBottom labelWidth="100">
-					{{form.status}}
+					{{form.status === '2' ? '已评估' : '待评估'}}
 				</u-form-item>
 				<u-form-item label="信息来源" borderBottom labelWidth="100">
-					{{form.source}}
+					{{form.webSiteName}}
 				</u-form-item>
 				<u-form-item label="举报时间" prop="visitorName" labelWidth="100" borderBottom>
-					{{form.time}}
+					{{stamp2Time(form.createDate)}}
 				</u-form-item>
-				<u-form-item label="分数" prop="visitorIdCard" borderBottom labelWidth="100">
+				<!-- <u-form-item label="分数" prop="visitorIdCard" borderBottom labelWidth="100">
 					{{form.score}}
-				</u-form-item>
+				</u-form-item> -->
 			</u--form>
 		</view>
 	</view>
 </template>
 
 <script>
-	import { getLocationParams } from '../../common/utils.js'
+	import { getLocationParams, stamp2Time } from '../../common/utils.js'
+	import { getReportDetail } from '../../api/tort.js'
 	export default {
 		data() {
 			return {
 				form:{
-					handle: '操作', // 操作
-					code: '举报号', // 举报号
-					type: '举报类型', // 举报类型
+					infoDescribe: '描述', // 操作
+					reportNo: '举报号', // 举报号
+					reportType: '举报类型', // 举报类型
 					status: '状态', //状态
-					source: '信息来源', // 信息来源
+					webSiteName: '信息来源', // 信息来源
 					time: '举报时间', // 举报时间
-					score: '99', // 分数
+					createDate: '99', // 分数
 				},
 			}
 		},
+		// onLoad: function (option) { 
+		//         console.log(option); //打印出上个页面传递的参数。
+		//     },
 		mounted() {
 			const code = getLocationParams('code') // 举报号
-			console.log(code, 'lll')
 			//-------------用这个举报号去调搜索接口---获取详情
 			this.fetchData(code)
 		},
 		methods: {
 			fetchData(code) {
 				// 调接口逻辑
-			}
+				getReportDetail({reportNo: code}).then(res => {
+					this.form = res
+					// 5 "其他"，填写网址则为：0 网站举报
+					this.form.reportType = this.form.reportType === 0 ? '网站举报' : this.form.reportType === 5 ? '其他举报' : '专项举报'
+					console.log(res, '举报详情信息')
+				}).catch((error) => {
+					console.log(error)
+				})
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 9d625fe..f2a6d71 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -752,6 +752,7 @@
 						"videoBatchIdsStr": '',//？
 						"verifyCode": this.form.code, // 验证码
 						"timeStr": this.timeStr, // 当前时间戳
+						"userID": '865a2ab9faf7c05fed57293212ec2aff',
 					}
 					this.$refs.form.validate().then(res => {
 						
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a9bc07d..31a921f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -310,6 +310,7 @@
 					catalogCode: 'tzgg', //（必传）固定值
 				}
 				getNoticeList(param).then(res => {
+					console.log(res, '通知公告列表')
 					this.tzggList = res.map(item => {
 						return {
 							catalogId: item.catalogId,