diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+
+

diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {

diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
diff --git a/packageA/accountBound/accountBound.vue b/packageA/accountBound/accountBound.vue
index 0c822b3..c856add 100644
--- a/packageA/accountBound/accountBound.vue
+++ b/packageA/accountBound/accountBound.vue
@@ -33,20 +33,30 @@
 						border="none"
 					></u--input>
 					<view class="code-img-wrapper" @click="updateImageCode">
-					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
+					  <!-- <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas> -->
+					  <image :src="codeUrl" style="width: 140px;height: 60px;"></image>
 					</view>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="button" @click="submit">确定</view>
+		<view class="reister">
+			<view> </view>
+			<!-- <view @click="changePage('changePassword')">忘记密码</view> -->
+			<view @click="changePage('register')">还没账号？去注册</view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	import { loginUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				rules: {
 					// 用户名
 					'name': [
@@ -100,36 +110,105 @@
 					name: '',  //用户名
 					password: '',  //密码
 					code: '',  //验证码
+					timeStr:'',
+					token:''
 				},
 			}
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
-			this.mcaptcha = new Mcaptcha({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: ""
-			});
+			// this.mcaptcha = new Mcaptcha({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: ""
+			// });
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			submit() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('校验通过')
-					//调改密码接口
+					// uni.$u.toast('校验通过')
+					// 登录接口
+					// this.form.timeStr = new Date().getTime()
+					// loginUser(this.form).then(res => {
+					// 	console.log(res, '用户信息')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟登录成功
+					const userInfo = {
+						id:'b56d2019f49353aa85a93c06228b8d80', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+					wx.setStorageSync('userInfoxj', userInfo)
+					setTimeout(() => {
+						wx.switchTab({
+							url:'/pages/mine/mine'
+						},500)
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
-			// 刷新验证码
+			// // 刷新验证码
+			// updateImageCode() {
+			//   this.mcaptcha.refresh()
+			// },
+			// 换验证码
 			updateImageCode() {
-			  this.mcaptcha.refresh()
+				this.fetchCodeURl()
+			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// 忘记密码或注册
+			changePage(val) {
+				let url = `/packageA/${val}/${val}`
+				wx.navigateTo({
+					url: url
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.reister{
+		padding: 0 10px;
+		display: flex;
+		justify-content: space-between;
+	}
 	.account-bound {
 		width: 100%;
 		height: 100%;

diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
diff --git a/packageA/accountBound/accountBound.vue b/packageA/accountBound/accountBound.vue
index 0c822b3..c856add 100644
--- a/packageA/accountBound/accountBound.vue
+++ b/packageA/accountBound/accountBound.vue
@@ -33,20 +33,30 @@
 						border="none"
 					></u--input>
 					<view class="code-img-wrapper" @click="updateImageCode">
-					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
+					  <!-- <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas> -->
+					  <image :src="codeUrl" style="width: 140px;height: 60px;"></image>
 					</view>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="button" @click="submit">确定</view>
+		<view class="reister">
+			<view> </view>
+			<!-- <view @click="changePage('changePassword')">忘记密码</view> -->
+			<view @click="changePage('register')">还没账号？去注册</view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	import { loginUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				rules: {
 					// 用户名
 					'name': [
@@ -100,36 +110,105 @@
 					name: '',  //用户名
 					password: '',  //密码
 					code: '',  //验证码
+					timeStr:'',
+					token:''
 				},
 			}
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
-			this.mcaptcha = new Mcaptcha({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: ""
-			});
+			// this.mcaptcha = new Mcaptcha({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: ""
+			// });
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			submit() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('校验通过')
-					//调改密码接口
+					// uni.$u.toast('校验通过')
+					// 登录接口
+					// this.form.timeStr = new Date().getTime()
+					// loginUser(this.form).then(res => {
+					// 	console.log(res, '用户信息')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟登录成功
+					const userInfo = {
+						id:'b56d2019f49353aa85a93c06228b8d80', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+					wx.setStorageSync('userInfoxj', userInfo)
+					setTimeout(() => {
+						wx.switchTab({
+							url:'/pages/mine/mine'
+						},500)
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
-			// 刷新验证码
+			// // 刷新验证码
+			// updateImageCode() {
+			//   this.mcaptcha.refresh()
+			// },
+			// 换验证码
 			updateImageCode() {
-			  this.mcaptcha.refresh()
+				this.fetchCodeURl()
+			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// 忘记密码或注册
+			changePage(val) {
+				let url = `/packageA/${val}/${val}`
+				wx.navigateTo({
+					url: url
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.reister{
+		padding: 0 10px;
+		display: flex;
+		justify-content: space-between;
+	}
 	.account-bound {
 		width: 100%;
 		height: 100%;
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..ea9ac0d 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="account-info">
 		<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" v-if="!isShowInfo">
+		<view class="main" v-if="">
 			<view class="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
 				<view class="title-icon">
@@ -13,10 +13,10 @@
 			</view>
 		</view>
 		
-		<view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view>
+		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
 		<view class="button-bottom">
-			<view class="button button-left" @click="changePage('register')">用户注册</view>
-			<view class="button button-right" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
+			<view class="button" @click="changePage('changePassword')">修改密码</view>
 		</view>
 	</view>
 </template>
@@ -77,52 +77,54 @@
 		},
 		methods: {
 			getData() {
+				const userinfo = wx.getStorageSync('userInfoxj')
+				console.log(userinfo, 'userinfo')
 				this.$set(this.list, 0, {
 					id: 'username',
 					name: '用户名:',
-					value: '123123',
+					value: userinfo.account,
 					icon: '../../static/mine/username.png'
 				});
 				this.$set(this.list, 1, {
 					id: 'name',
 					name: '姓名:',
-					value: 'ddd',
+					value: userinfo.name,
 					icon: '../../static/mine/name.png'
 				},);
 				this.$set(this.list, 2, {
 					id: 'sex',
 					name: '性别:',
-					value: '女',
+					value: userinfo.sex,
 					icon: '../../static/mine/sex.png'
 				},);
 				this.$set(this.list, 3, {
 					id: 'phone',
 					name: '手机号:',
-					value: '12345678978',
+					value: userinfo.phone,
 					icon: '../../static/mine/phone.png'
 				},);
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
-					value: '123123246@qq.com',
+					value: userinfo.email,
 					icon: '../../static/mine/email.png'
 				},);
 				this.$set(this.list, 5, {
 					id: 'region',
 					name: '地区:',
-					value: '北京市海淀区',
+					value: `${userinfo.province}/${userinfo.city}/${userinfo.county}`,
 					icon: '../../static/mine/region.png'
 				});
 				this.$set(this.list, 6, {
 					id: 'address',
 					name: '详细地址:',
-					value: '某街道某小区1号楼6单元102区1号楼6单元1区1号楼6单元1区1号楼6单元1区1号楼6单元1',
+					value: userinfo.address,
 					icon: '../../static/mine/address.png'
 				},);
 				this.isShowInfo = this.list.every(item => {
 					return item.value === '';
 				});
-				console.log(this.isShowInfo)
+
 			},
 			changePage(val) {
 				let url = `/packageA/${val}/${val}`

diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
diff --git a/packageA/accountBound/accountBound.vue b/packageA/accountBound/accountBound.vue
index 0c822b3..c856add 100644
--- a/packageA/accountBound/accountBound.vue
+++ b/packageA/accountBound/accountBound.vue
@@ -33,20 +33,30 @@
 						border="none"
 					></u--input>
 					<view class="code-img-wrapper" @click="updateImageCode">
-					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
+					  <!-- <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas> -->
+					  <image :src="codeUrl" style="width: 140px;height: 60px;"></image>
 					</view>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="button" @click="submit">确定</view>
+		<view class="reister">
+			<view> </view>
+			<!-- <view @click="changePage('changePassword')">忘记密码</view> -->
+			<view @click="changePage('register')">还没账号？去注册</view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	import { loginUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				rules: {
 					// 用户名
 					'name': [
@@ -100,36 +110,105 @@
 					name: '',  //用户名
 					password: '',  //密码
 					code: '',  //验证码
+					timeStr:'',
+					token:''
 				},
 			}
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
-			this.mcaptcha = new Mcaptcha({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: ""
-			});
+			// this.mcaptcha = new Mcaptcha({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: ""
+			// });
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			submit() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('校验通过')
-					//调改密码接口
+					// uni.$u.toast('校验通过')
+					// 登录接口
+					// this.form.timeStr = new Date().getTime()
+					// loginUser(this.form).then(res => {
+					// 	console.log(res, '用户信息')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟登录成功
+					const userInfo = {
+						id:'b56d2019f49353aa85a93c06228b8d80', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+					wx.setStorageSync('userInfoxj', userInfo)
+					setTimeout(() => {
+						wx.switchTab({
+							url:'/pages/mine/mine'
+						},500)
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
-			// 刷新验证码
+			// // 刷新验证码
+			// updateImageCode() {
+			//   this.mcaptcha.refresh()
+			// },
+			// 换验证码
 			updateImageCode() {
-			  this.mcaptcha.refresh()
+				this.fetchCodeURl()
+			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// 忘记密码或注册
+			changePage(val) {
+				let url = `/packageA/${val}/${val}`
+				wx.navigateTo({
+					url: url
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.reister{
+		padding: 0 10px;
+		display: flex;
+		justify-content: space-between;
+	}
 	.account-bound {
 		width: 100%;
 		height: 100%;
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..ea9ac0d 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="account-info">
 		<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" v-if="!isShowInfo">
+		<view class="main" v-if="">
 			<view class="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
 				<view class="title-icon">
@@ -13,10 +13,10 @@
 			</view>
 		</view>
 		
-		<view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view>
+		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
 		<view class="button-bottom">
-			<view class="button button-left" @click="changePage('register')">用户注册</view>
-			<view class="button button-right" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
+			<view class="button" @click="changePage('changePassword')">修改密码</view>
 		</view>
 	</view>
 </template>
@@ -77,52 +77,54 @@
 		},
 		methods: {
 			getData() {
+				const userinfo = wx.getStorageSync('userInfoxj')
+				console.log(userinfo, 'userinfo')
 				this.$set(this.list, 0, {
 					id: 'username',
 					name: '用户名:',
-					value: '123123',
+					value: userinfo.account,
 					icon: '../../static/mine/username.png'
 				});
 				this.$set(this.list, 1, {
 					id: 'name',
 					name: '姓名:',
-					value: 'ddd',
+					value: userinfo.name,
 					icon: '../../static/mine/name.png'
 				},);
 				this.$set(this.list, 2, {
 					id: 'sex',
 					name: '性别:',
-					value: '女',
+					value: userinfo.sex,
 					icon: '../../static/mine/sex.png'
 				},);
 				this.$set(this.list, 3, {
 					id: 'phone',
 					name: '手机号:',
-					value: '12345678978',
+					value: userinfo.phone,
 					icon: '../../static/mine/phone.png'
 				},);
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
-					value: '123123246@qq.com',
+					value: userinfo.email,
 					icon: '../../static/mine/email.png'
 				},);
 				this.$set(this.list, 5, {
 					id: 'region',
 					name: '地区:',
-					value: '北京市海淀区',
+					value: `${userinfo.province}/${userinfo.city}/${userinfo.county}`,
 					icon: '../../static/mine/region.png'
 				});
 				this.$set(this.list, 6, {
 					id: 'address',
 					name: '详细地址:',
-					value: '某街道某小区1号楼6单元102区1号楼6单元1区1号楼6单元1区1号楼6单元1区1号楼6单元1',
+					value: userinfo.address,
 					icon: '../../static/mine/address.png'
 				},);
 				this.isShowInfo = this.list.every(item => {
 					return item.value === '';
 				});
-				console.log(this.isShowInfo)
+
 			},
 			changePage(val) {
 				let url = `/packageA/${val}/${val}`
diff --git a/packageA/changePassword/changePassword.vue b/packageA/changePassword/changePassword.vue
index bb1f63b..0cf4927 100644
--- a/packageA/changePassword/changePassword.vue
+++ b/packageA/changePassword/changePassword.vue
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+	import { updateUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
@@ -114,6 +115,16 @@
 				this.$refs.form.validate().then(res => {
 					uni.$u.toast('校验通过')
 					//调改密码接口
+					const userinfo = wx.getStorageSync('userInfoxj')
+					const data = {
+						'userPasswordVo.userId':userinfo.id, // 用户id
+						'userPasswordVo.newPassword':this.form.oldPassword, // 新密码
+						'userPasswordVo.oldPassword':this.form.newPassword, // 旧密码
+						'token':''
+					}
+					updateUser(data).then(res => {
+						console.log(res, '修改密码结果')
+					})
 				}).catch(errors => {
 					uni.$u.toast('请将信息填写完整')
 				})

diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
diff --git a/packageA/accountBound/accountBound.vue b/packageA/accountBound/accountBound.vue
index 0c822b3..c856add 100644
--- a/packageA/accountBound/accountBound.vue
+++ b/packageA/accountBound/accountBound.vue
@@ -33,20 +33,30 @@
 						border="none"
 					></u--input>
 					<view class="code-img-wrapper" @click="updateImageCode">
-					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
+					  <!-- <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas> -->
+					  <image :src="codeUrl" style="width: 140px;height: 60px;"></image>
 					</view>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="button" @click="submit">确定</view>
+		<view class="reister">
+			<view> </view>
+			<!-- <view @click="changePage('changePassword')">忘记密码</view> -->
+			<view @click="changePage('register')">还没账号？去注册</view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	import { loginUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				rules: {
 					// 用户名
 					'name': [
@@ -100,36 +110,105 @@
 					name: '',  //用户名
 					password: '',  //密码
 					code: '',  //验证码
+					timeStr:'',
+					token:''
 				},
 			}
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
-			this.mcaptcha = new Mcaptcha({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: ""
-			});
+			// this.mcaptcha = new Mcaptcha({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: ""
+			// });
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			submit() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('校验通过')
-					//调改密码接口
+					// uni.$u.toast('校验通过')
+					// 登录接口
+					// this.form.timeStr = new Date().getTime()
+					// loginUser(this.form).then(res => {
+					// 	console.log(res, '用户信息')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟登录成功
+					const userInfo = {
+						id:'b56d2019f49353aa85a93c06228b8d80', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+					wx.setStorageSync('userInfoxj', userInfo)
+					setTimeout(() => {
+						wx.switchTab({
+							url:'/pages/mine/mine'
+						},500)
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
-			// 刷新验证码
+			// // 刷新验证码
+			// updateImageCode() {
+			//   this.mcaptcha.refresh()
+			// },
+			// 换验证码
 			updateImageCode() {
-			  this.mcaptcha.refresh()
+				this.fetchCodeURl()
+			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// 忘记密码或注册
+			changePage(val) {
+				let url = `/packageA/${val}/${val}`
+				wx.navigateTo({
+					url: url
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.reister{
+		padding: 0 10px;
+		display: flex;
+		justify-content: space-between;
+	}
 	.account-bound {
 		width: 100%;
 		height: 100%;
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..ea9ac0d 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="account-info">
 		<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" v-if="!isShowInfo">
+		<view class="main" v-if="">
 			<view class="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
 				<view class="title-icon">
@@ -13,10 +13,10 @@
 			</view>
 		</view>
 		
-		<view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view>
+		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
 		<view class="button-bottom">
-			<view class="button button-left" @click="changePage('register')">用户注册</view>
-			<view class="button button-right" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
+			<view class="button" @click="changePage('changePassword')">修改密码</view>
 		</view>
 	</view>
 </template>
@@ -77,52 +77,54 @@
 		},
 		methods: {
 			getData() {
+				const userinfo = wx.getStorageSync('userInfoxj')
+				console.log(userinfo, 'userinfo')
 				this.$set(this.list, 0, {
 					id: 'username',
 					name: '用户名:',
-					value: '123123',
+					value: userinfo.account,
 					icon: '../../static/mine/username.png'
 				});
 				this.$set(this.list, 1, {
 					id: 'name',
 					name: '姓名:',
-					value: 'ddd',
+					value: userinfo.name,
 					icon: '../../static/mine/name.png'
 				},);
 				this.$set(this.list, 2, {
 					id: 'sex',
 					name: '性别:',
-					value: '女',
+					value: userinfo.sex,
 					icon: '../../static/mine/sex.png'
 				},);
 				this.$set(this.list, 3, {
 					id: 'phone',
 					name: '手机号:',
-					value: '12345678978',
+					value: userinfo.phone,
 					icon: '../../static/mine/phone.png'
 				},);
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
-					value: '123123246@qq.com',
+					value: userinfo.email,
 					icon: '../../static/mine/email.png'
 				},);
 				this.$set(this.list, 5, {
 					id: 'region',
 					name: '地区:',
-					value: '北京市海淀区',
+					value: `${userinfo.province}/${userinfo.city}/${userinfo.county}`,
 					icon: '../../static/mine/region.png'
 				});
 				this.$set(this.list, 6, {
 					id: 'address',
 					name: '详细地址:',
-					value: '某街道某小区1号楼6单元102区1号楼6单元1区1号楼6单元1区1号楼6单元1区1号楼6单元1',
+					value: userinfo.address,
 					icon: '../../static/mine/address.png'
 				},);
 				this.isShowInfo = this.list.every(item => {
 					return item.value === '';
 				});
-				console.log(this.isShowInfo)
+
 			},
 			changePage(val) {
 				let url = `/packageA/${val}/${val}`
diff --git a/packageA/changePassword/changePassword.vue b/packageA/changePassword/changePassword.vue
index bb1f63b..0cf4927 100644
--- a/packageA/changePassword/changePassword.vue
+++ b/packageA/changePassword/changePassword.vue
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+	import { updateUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
@@ -114,6 +115,16 @@
 				this.$refs.form.validate().then(res => {
 					uni.$u.toast('校验通过')
 					//调改密码接口
+					const userinfo = wx.getStorageSync('userInfoxj')
+					const data = {
+						'userPasswordVo.userId':userinfo.id, // 用户id
+						'userPasswordVo.newPassword':this.form.oldPassword, // 新密码
+						'userPasswordVo.oldPassword':this.form.newPassword, // 旧密码
+						'token':''
+					}
+					updateUser(data).then(res => {
+						console.log(res, '修改密码结果')
+					})
 				}).catch(errors => {
 					uni.$u.toast('请将信息填写完整')
 				})
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..aea5209 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)">
 			<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: {
@@ -46,11 +47,12 @@
 		},
 		methods: {
 			// 点击卡片
-			handleClick(code) {
+			handleClick(info) {
 				wx.navigateTo({
-					url: `/packageB/recordDetail/recordDetail?code=${code}`
+					url: `/packageB/recordDetail/recordDetail?info=${JSON.stringify(info)}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>

diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
diff --git a/packageA/accountBound/accountBound.vue b/packageA/accountBound/accountBound.vue
index 0c822b3..c856add 100644
--- a/packageA/accountBound/accountBound.vue
+++ b/packageA/accountBound/accountBound.vue
@@ -33,20 +33,30 @@
 						border="none"
 					></u--input>
 					<view class="code-img-wrapper" @click="updateImageCode">
-					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
+					  <!-- <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas> -->
+					  <image :src="codeUrl" style="width: 140px;height: 60px;"></image>
 					</view>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="button" @click="submit">确定</view>
+		<view class="reister">
+			<view> </view>
+			<!-- <view @click="changePage('changePassword')">忘记密码</view> -->
+			<view @click="changePage('register')">还没账号？去注册</view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	import { loginUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				rules: {
 					// 用户名
 					'name': [
@@ -100,36 +110,105 @@
 					name: '',  //用户名
 					password: '',  //密码
 					code: '',  //验证码
+					timeStr:'',
+					token:''
 				},
 			}
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
-			this.mcaptcha = new Mcaptcha({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: ""
-			});
+			// this.mcaptcha = new Mcaptcha({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: ""
+			// });
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			submit() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('校验通过')
-					//调改密码接口
+					// uni.$u.toast('校验通过')
+					// 登录接口
+					// this.form.timeStr = new Date().getTime()
+					// loginUser(this.form).then(res => {
+					// 	console.log(res, '用户信息')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟登录成功
+					const userInfo = {
+						id:'b56d2019f49353aa85a93c06228b8d80', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+					wx.setStorageSync('userInfoxj', userInfo)
+					setTimeout(() => {
+						wx.switchTab({
+							url:'/pages/mine/mine'
+						},500)
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
-			// 刷新验证码
+			// // 刷新验证码
+			// updateImageCode() {
+			//   this.mcaptcha.refresh()
+			// },
+			// 换验证码
 			updateImageCode() {
-			  this.mcaptcha.refresh()
+				this.fetchCodeURl()
+			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// 忘记密码或注册
+			changePage(val) {
+				let url = `/packageA/${val}/${val}`
+				wx.navigateTo({
+					url: url
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.reister{
+		padding: 0 10px;
+		display: flex;
+		justify-content: space-between;
+	}
 	.account-bound {
 		width: 100%;
 		height: 100%;
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..ea9ac0d 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="account-info">
 		<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" v-if="!isShowInfo">
+		<view class="main" v-if="">
 			<view class="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
 				<view class="title-icon">
@@ -13,10 +13,10 @@
 			</view>
 		</view>
 		
-		<view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view>
+		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
 		<view class="button-bottom">
-			<view class="button button-left" @click="changePage('register')">用户注册</view>
-			<view class="button button-right" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
+			<view class="button" @click="changePage('changePassword')">修改密码</view>
 		</view>
 	</view>
 </template>
@@ -77,52 +77,54 @@
 		},
 		methods: {
 			getData() {
+				const userinfo = wx.getStorageSync('userInfoxj')
+				console.log(userinfo, 'userinfo')
 				this.$set(this.list, 0, {
 					id: 'username',
 					name: '用户名:',
-					value: '123123',
+					value: userinfo.account,
 					icon: '../../static/mine/username.png'
 				});
 				this.$set(this.list, 1, {
 					id: 'name',
 					name: '姓名:',
-					value: 'ddd',
+					value: userinfo.name,
 					icon: '../../static/mine/name.png'
 				},);
 				this.$set(this.list, 2, {
 					id: 'sex',
 					name: '性别:',
-					value: '女',
+					value: userinfo.sex,
 					icon: '../../static/mine/sex.png'
 				},);
 				this.$set(this.list, 3, {
 					id: 'phone',
 					name: '手机号:',
-					value: '12345678978',
+					value: userinfo.phone,
 					icon: '../../static/mine/phone.png'
 				},);
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
-					value: '123123246@qq.com',
+					value: userinfo.email,
 					icon: '../../static/mine/email.png'
 				},);
 				this.$set(this.list, 5, {
 					id: 'region',
 					name: '地区:',
-					value: '北京市海淀区',
+					value: `${userinfo.province}/${userinfo.city}/${userinfo.county}`,
 					icon: '../../static/mine/region.png'
 				});
 				this.$set(this.list, 6, {
 					id: 'address',
 					name: '详细地址:',
-					value: '某街道某小区1号楼6单元102区1号楼6单元1区1号楼6单元1区1号楼6单元1区1号楼6单元1',
+					value: userinfo.address,
 					icon: '../../static/mine/address.png'
 				},);
 				this.isShowInfo = this.list.every(item => {
 					return item.value === '';
 				});
-				console.log(this.isShowInfo)
+
 			},
 			changePage(val) {
 				let url = `/packageA/${val}/${val}`
diff --git a/packageA/changePassword/changePassword.vue b/packageA/changePassword/changePassword.vue
index bb1f63b..0cf4927 100644
--- a/packageA/changePassword/changePassword.vue
+++ b/packageA/changePassword/changePassword.vue
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+	import { updateUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
@@ -114,6 +115,16 @@
 				this.$refs.form.validate().then(res => {
 					uni.$u.toast('校验通过')
 					//调改密码接口
+					const userinfo = wx.getStorageSync('userInfoxj')
+					const data = {
+						'userPasswordVo.userId':userinfo.id, // 用户id
+						'userPasswordVo.newPassword':this.form.oldPassword, // 新密码
+						'userPasswordVo.oldPassword':this.form.newPassword, // 旧密码
+						'token':''
+					}
+					updateUser(data).then(res => {
+						console.log(res, '修改密码结果')
+					})
 				}).catch(errors => {
 					uni.$u.toast('请将信息填写完整')
 				})
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..aea5209 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)">
 			<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: {
@@ -46,11 +47,12 @@
 		},
 		methods: {
 			// 点击卡片
-			handleClick(code) {
+			handleClick(info) {
 				wx.navigateTo({
-					url: `/packageB/recordDetail/recordDetail?code=${code}`
+					url: `/packageB/recordDetail/recordDetail?info=${JSON.stringify(info)}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index c0795a1..f8244a0 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="!loading && !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" 
@@ -41,9 +41,9 @@
 		
 		<!-- 空 -->
 		<u-empty
-			v-if="isEmpty"
+			v-if="loading || isEmpty"
 			mode="search"
-			text="暂无结果"
+			:text="loading ? '数据加载中' : isEmpty ? '暂无结果' : ''"
 			: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,21 @@
 				// immediate: true,
 			}
 		},
-		mounted() {
+		onShow() {
+			const userinfo =  wx.getStorageSync('userInfoxj')
+			console.log(userinfo, 'userinfouserinfo')
+			wx.setNavigationBarTitle({title: userinfo ? '我的举报' : '匿名举报'});
+			
+		},
+		async mounted() {
+			this.loading = true
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			
-			this.currentTab = getLocationParams('tabType'); // 当前tab
-			this.clickTab(null, this.currentTab);
+			this.currentTab = getLocationParams('tabType') || '0'; // 当前tab
+			// 获取举报列表
+		    this.fetchReportData()
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,91 +134,39 @@
 			
 		},
 		methods: {
+			// 获取举报列表数据
+			async fetchReportData() {
+				const userinfo =  wx.getStorageSync('userInfoxj')
+				const data = {
+					'userInfoVo.id':userinfo.id ? userinfo.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.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				}).catch((error) => {
+					this.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				})
+			},
 			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
+					console.log('全部')
 				} 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 )
+					console.log('待评估')
+				} else if((val && val.index === 2) || currentTab === '2') { // 已评估
+					this.reportList = this.dataList.filter(item => item.status === 2 )
+					console.log('已评估')
 				} else {
 					this.reportList = []
 				}
@@ -220,17 +178,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/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
diff --git a/packageA/accountBound/accountBound.vue b/packageA/accountBound/accountBound.vue
index 0c822b3..c856add 100644
--- a/packageA/accountBound/accountBound.vue
+++ b/packageA/accountBound/accountBound.vue
@@ -33,20 +33,30 @@
 						border="none"
 					></u--input>
 					<view class="code-img-wrapper" @click="updateImageCode">
-					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
+					  <!-- <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas> -->
+					  <image :src="codeUrl" style="width: 140px;height: 60px;"></image>
 					</view>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="button" @click="submit">确定</view>
+		<view class="reister">
+			<view> </view>
+			<!-- <view @click="changePage('changePassword')">忘记密码</view> -->
+			<view @click="changePage('register')">还没账号？去注册</view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	import { loginUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				rules: {
 					// 用户名
 					'name': [
@@ -100,36 +110,105 @@
 					name: '',  //用户名
 					password: '',  //密码
 					code: '',  //验证码
+					timeStr:'',
+					token:''
 				},
 			}
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
-			this.mcaptcha = new Mcaptcha({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: ""
-			});
+			// this.mcaptcha = new Mcaptcha({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: ""
+			// });
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			submit() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('校验通过')
-					//调改密码接口
+					// uni.$u.toast('校验通过')
+					// 登录接口
+					// this.form.timeStr = new Date().getTime()
+					// loginUser(this.form).then(res => {
+					// 	console.log(res, '用户信息')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟登录成功
+					const userInfo = {
+						id:'b56d2019f49353aa85a93c06228b8d80', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+					wx.setStorageSync('userInfoxj', userInfo)
+					setTimeout(() => {
+						wx.switchTab({
+							url:'/pages/mine/mine'
+						},500)
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
-			// 刷新验证码
+			// // 刷新验证码
+			// updateImageCode() {
+			//   this.mcaptcha.refresh()
+			// },
+			// 换验证码
 			updateImageCode() {
-			  this.mcaptcha.refresh()
+				this.fetchCodeURl()
+			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// 忘记密码或注册
+			changePage(val) {
+				let url = `/packageA/${val}/${val}`
+				wx.navigateTo({
+					url: url
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.reister{
+		padding: 0 10px;
+		display: flex;
+		justify-content: space-between;
+	}
 	.account-bound {
 		width: 100%;
 		height: 100%;
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..ea9ac0d 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="account-info">
 		<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" v-if="!isShowInfo">
+		<view class="main" v-if="">
 			<view class="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
 				<view class="title-icon">
@@ -13,10 +13,10 @@
 			</view>
 		</view>
 		
-		<view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view>
+		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
 		<view class="button-bottom">
-			<view class="button button-left" @click="changePage('register')">用户注册</view>
-			<view class="button button-right" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
+			<view class="button" @click="changePage('changePassword')">修改密码</view>
 		</view>
 	</view>
 </template>
@@ -77,52 +77,54 @@
 		},
 		methods: {
 			getData() {
+				const userinfo = wx.getStorageSync('userInfoxj')
+				console.log(userinfo, 'userinfo')
 				this.$set(this.list, 0, {
 					id: 'username',
 					name: '用户名:',
-					value: '123123',
+					value: userinfo.account,
 					icon: '../../static/mine/username.png'
 				});
 				this.$set(this.list, 1, {
 					id: 'name',
 					name: '姓名:',
-					value: 'ddd',
+					value: userinfo.name,
 					icon: '../../static/mine/name.png'
 				},);
 				this.$set(this.list, 2, {
 					id: 'sex',
 					name: '性别:',
-					value: '女',
+					value: userinfo.sex,
 					icon: '../../static/mine/sex.png'
 				},);
 				this.$set(this.list, 3, {
 					id: 'phone',
 					name: '手机号:',
-					value: '12345678978',
+					value: userinfo.phone,
 					icon: '../../static/mine/phone.png'
 				},);
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
-					value: '123123246@qq.com',
+					value: userinfo.email,
 					icon: '../../static/mine/email.png'
 				},);
 				this.$set(this.list, 5, {
 					id: 'region',
 					name: '地区:',
-					value: '北京市海淀区',
+					value: `${userinfo.province}/${userinfo.city}/${userinfo.county}`,
 					icon: '../../static/mine/region.png'
 				});
 				this.$set(this.list, 6, {
 					id: 'address',
 					name: '详细地址:',
-					value: '某街道某小区1号楼6单元102区1号楼6单元1区1号楼6单元1区1号楼6单元1区1号楼6单元1',
+					value: userinfo.address,
 					icon: '../../static/mine/address.png'
 				},);
 				this.isShowInfo = this.list.every(item => {
 					return item.value === '';
 				});
-				console.log(this.isShowInfo)
+
 			},
 			changePage(val) {
 				let url = `/packageA/${val}/${val}`
diff --git a/packageA/changePassword/changePassword.vue b/packageA/changePassword/changePassword.vue
index bb1f63b..0cf4927 100644
--- a/packageA/changePassword/changePassword.vue
+++ b/packageA/changePassword/changePassword.vue
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+	import { updateUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
@@ -114,6 +115,16 @@
 				this.$refs.form.validate().then(res => {
 					uni.$u.toast('校验通过')
 					//调改密码接口
+					const userinfo = wx.getStorageSync('userInfoxj')
+					const data = {
+						'userPasswordVo.userId':userinfo.id, // 用户id
+						'userPasswordVo.newPassword':this.form.oldPassword, // 新密码
+						'userPasswordVo.oldPassword':this.form.newPassword, // 旧密码
+						'token':''
+					}
+					updateUser(data).then(res => {
+						console.log(res, '修改密码结果')
+					})
 				}).catch(errors => {
 					uni.$u.toast('请将信息填写完整')
 				})
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..aea5209 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)">
 			<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: {
@@ -46,11 +47,12 @@
 		},
 		methods: {
 			// 点击卡片
-			handleClick(code) {
+			handleClick(info) {
 				wx.navigateTo({
-					url: `/packageB/recordDetail/recordDetail?code=${code}`
+					url: `/packageB/recordDetail/recordDetail?info=${JSON.stringify(info)}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index c0795a1..f8244a0 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="!loading && !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" 
@@ -41,9 +41,9 @@
 		
 		<!-- 空 -->
 		<u-empty
-			v-if="isEmpty"
+			v-if="loading || isEmpty"
 			mode="search"
-			text="暂无结果"
+			:text="loading ? '数据加载中' : isEmpty ? '暂无结果' : ''"
 			: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,21 @@
 				// immediate: true,
 			}
 		},
-		mounted() {
+		onShow() {
+			const userinfo =  wx.getStorageSync('userInfoxj')
+			console.log(userinfo, 'userinfouserinfo')
+			wx.setNavigationBarTitle({title: userinfo ? '我的举报' : '匿名举报'});
+			
+		},
+		async mounted() {
+			this.loading = true
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			
-			this.currentTab = getLocationParams('tabType'); // 当前tab
-			this.clickTab(null, this.currentTab);
+			this.currentTab = getLocationParams('tabType') || '0'; // 当前tab
+			// 获取举报列表
+		    this.fetchReportData()
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,91 +134,39 @@
 			
 		},
 		methods: {
+			// 获取举报列表数据
+			async fetchReportData() {
+				const userinfo =  wx.getStorageSync('userInfoxj')
+				const data = {
+					'userInfoVo.id':userinfo.id ? userinfo.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.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				}).catch((error) => {
+					this.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				})
+			},
 			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
+					console.log('全部')
 				} 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 )
+					console.log('待评估')
+				} else if((val && val.index === 2) || currentTab === '2') { // 已评估
+					this.reportList = this.dataList.filter(item => item.status === 2 )
+					console.log('已评估')
 				} else {
 					this.reportList = []
 				}
@@ -220,17 +178,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/packageA/register/register.vue b/packageA/register/register.vue
index 6c0e279..d2a7291 100644
--- a/packageA/register/register.vue
+++ b/packageA/register/register.vue
@@ -62,7 +62,8 @@
 					<!-- <view class="code-img-wrapper" @click="updateImageCode">
 					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
 					</view> -->
-					<image :src="canvasImgUrl" style="width: 140px;height: 80px;" @click="updateImageCode"></image>
+					<!-- <image :src="canvasImgUrl" style="width: 140px;height: 80px;" @click="updateImageCode"></image> -->
+					 <image :src="codeUrl" style="width: 140px;height: 60px;"@click="updateImageCode"></image>
 				</u-form-item>
 			</u--form>
 		</view>
@@ -84,15 +85,18 @@
 
 <script>
 	import Message from '../../components/base/message.vue';
-	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	// import { Mcaptcha  } from '../../common/mcaptcha.js';
 	import { createCanvas, validateCode } from '../../common/createCanvas.js';
 	// import validate from '../../common/createCanvas.js';
+	import { registerUser } from '../../api/mine.js'
 	export default {
 		components: {
 			Message
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				canvasImgUrl: '',
 				showMessage: false, //注册须知弹框显隐
 				messageContent: '依法打击网上有害不良信息，事关国家安全、民族团结、社会稳定、事关人民群众根本利益。\n\n举报中心欢迎广大网民积极举报网上有害不良信息，对举报有功人员继续给予奖励，对提供重大线索、为打击暴恐犯罪发挥重要作用的举报有功人员最高给予10万元奖励。',
@@ -224,28 +228,75 @@
 			// 	height: 80,
 			// 	createCodeImg: "",
 			// });
-			createCanvas({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: "",
-			}, this).then(res => {
-				this.canvasImgUrl = res;
-				console.log('绘画')
-			})
+			// createCanvas({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: "",
+			// }, this).then(res => {
+			// 	this.canvasImgUrl = res;
+			// 	console.log('绘画')
+			// })
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			// 立即注册
 			register() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('注册成功')
-					setTimeout(() => {
-						wx.navigateBack({
-						  delta: 1
-						})
-					}, 2000)
-					//调改密码接口
+					// uni.$u.toast('注册成功')
+					// setTimeout(() => {
+					// 	wx.navigateBack({
+					// 	  delta: 1
+					// 	})
+					// }, 2000)
+					//注册
+					const data = {
+						'userInfoVo.account': this.form.name, //用户名(必填）
+						'userInfoVo.name':'',
+						'userInfoVo.sex':'',
+						'userInfoVo.nation':'',
+						'userInfoVo.idCard':'',
+						'userInfoVo.phone':this.form.phone, //手机号(必填）
+						'userInfoVo.email': this.form.email, //电子邮箱(必填）
+						'userInfoVo.country': '中国',
+						'userInfoVo.province': '',
+						'userInfoVo.city': '',
+						'userInfoVo.county': '',
+						'userInfoVo.address': '',
+						'userInfoVo.verifyCode':this.form.code, // 验证码(必填）
+						'userInfoVo.password':this.form.password,  //(必填MD5加密）(必填MD5加密）
+						'userInfoVo.accountType':1, // 默认值1（普通账号）(必填）
+						'timeStr':new Date().getTime(), //时间戳（必填）
+						'token':''
+
+					}
+					// registerUser(data).then(res => {
+					// 	console.log(res, '注册结果')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟注册成功
+					const userInfo = {
+						id:'用户ID', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+				    wx.setStorageSync('userInfoxj', userInfo)
+					wx.switchTab({
+						url:'/pages/mine/mine'
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
@@ -260,19 +311,44 @@
 				this.form.code = '';
 				this.$refs.form.clearValidate();
 			},
-			// 刷新验证码
+			// 换验证码
 			updateImageCode() {
-			  // this.mcaptcha.refresh();
-				createCanvas({
-					el: 'canvas',
-					width: 140,
-					height: 80,
-					createCodeImg: "",
-				}, this).then(res => {
-					this.canvasImgUrl = res;
-					console.log('绘画')
-				})
+				this.fetchCodeURl()
 			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// // 刷新验证码
+			// updateImageCode() {
+			//   // this.mcaptcha.refresh();
+			// 	createCanvas({
+			// 		el: 'canvas',
+			// 		width: 140,
+			// 		height: 80,
+			// 		createCodeImg: "",
+			// 	}, this).then(res => {
+			// 		this.canvasImgUrl = res;
+			// 		console.log('绘画')
+			// 	})
+			// },
 			//拒绝注册须知, 返回上一页
 			refuse(val) {
 				wx.navigateBack()

diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
diff --git a/packageA/accountBound/accountBound.vue b/packageA/accountBound/accountBound.vue
index 0c822b3..c856add 100644
--- a/packageA/accountBound/accountBound.vue
+++ b/packageA/accountBound/accountBound.vue
@@ -33,20 +33,30 @@
 						border="none"
 					></u--input>
 					<view class="code-img-wrapper" @click="updateImageCode">
-					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
+					  <!-- <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas> -->
+					  <image :src="codeUrl" style="width: 140px;height: 60px;"></image>
 					</view>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="button" @click="submit">确定</view>
+		<view class="reister">
+			<view> </view>
+			<!-- <view @click="changePage('changePassword')">忘记密码</view> -->
+			<view @click="changePage('register')">还没账号？去注册</view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	import { loginUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				rules: {
 					// 用户名
 					'name': [
@@ -100,36 +110,105 @@
 					name: '',  //用户名
 					password: '',  //密码
 					code: '',  //验证码
+					timeStr:'',
+					token:''
 				},
 			}
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
-			this.mcaptcha = new Mcaptcha({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: ""
-			});
+			// this.mcaptcha = new Mcaptcha({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: ""
+			// });
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			submit() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('校验通过')
-					//调改密码接口
+					// uni.$u.toast('校验通过')
+					// 登录接口
+					// this.form.timeStr = new Date().getTime()
+					// loginUser(this.form).then(res => {
+					// 	console.log(res, '用户信息')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟登录成功
+					const userInfo = {
+						id:'b56d2019f49353aa85a93c06228b8d80', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+					wx.setStorageSync('userInfoxj', userInfo)
+					setTimeout(() => {
+						wx.switchTab({
+							url:'/pages/mine/mine'
+						},500)
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
-			// 刷新验证码
+			// // 刷新验证码
+			// updateImageCode() {
+			//   this.mcaptcha.refresh()
+			// },
+			// 换验证码
 			updateImageCode() {
-			  this.mcaptcha.refresh()
+				this.fetchCodeURl()
+			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// 忘记密码或注册
+			changePage(val) {
+				let url = `/packageA/${val}/${val}`
+				wx.navigateTo({
+					url: url
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.reister{
+		padding: 0 10px;
+		display: flex;
+		justify-content: space-between;
+	}
 	.account-bound {
 		width: 100%;
 		height: 100%;
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..ea9ac0d 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="account-info">
 		<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" v-if="!isShowInfo">
+		<view class="main" v-if="">
 			<view class="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
 				<view class="title-icon">
@@ -13,10 +13,10 @@
 			</view>
 		</view>
 		
-		<view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view>
+		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
 		<view class="button-bottom">
-			<view class="button button-left" @click="changePage('register')">用户注册</view>
-			<view class="button button-right" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
+			<view class="button" @click="changePage('changePassword')">修改密码</view>
 		</view>
 	</view>
 </template>
@@ -77,52 +77,54 @@
 		},
 		methods: {
 			getData() {
+				const userinfo = wx.getStorageSync('userInfoxj')
+				console.log(userinfo, 'userinfo')
 				this.$set(this.list, 0, {
 					id: 'username',
 					name: '用户名:',
-					value: '123123',
+					value: userinfo.account,
 					icon: '../../static/mine/username.png'
 				});
 				this.$set(this.list, 1, {
 					id: 'name',
 					name: '姓名:',
-					value: 'ddd',
+					value: userinfo.name,
 					icon: '../../static/mine/name.png'
 				},);
 				this.$set(this.list, 2, {
 					id: 'sex',
 					name: '性别:',
-					value: '女',
+					value: userinfo.sex,
 					icon: '../../static/mine/sex.png'
 				},);
 				this.$set(this.list, 3, {
 					id: 'phone',
 					name: '手机号:',
-					value: '12345678978',
+					value: userinfo.phone,
 					icon: '../../static/mine/phone.png'
 				},);
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
-					value: '123123246@qq.com',
+					value: userinfo.email,
 					icon: '../../static/mine/email.png'
 				},);
 				this.$set(this.list, 5, {
 					id: 'region',
 					name: '地区:',
-					value: '北京市海淀区',
+					value: `${userinfo.province}/${userinfo.city}/${userinfo.county}`,
 					icon: '../../static/mine/region.png'
 				});
 				this.$set(this.list, 6, {
 					id: 'address',
 					name: '详细地址:',
-					value: '某街道某小区1号楼6单元102区1号楼6单元1区1号楼6单元1区1号楼6单元1区1号楼6单元1',
+					value: userinfo.address,
 					icon: '../../static/mine/address.png'
 				},);
 				this.isShowInfo = this.list.every(item => {
 					return item.value === '';
 				});
-				console.log(this.isShowInfo)
+
 			},
 			changePage(val) {
 				let url = `/packageA/${val}/${val}`
diff --git a/packageA/changePassword/changePassword.vue b/packageA/changePassword/changePassword.vue
index bb1f63b..0cf4927 100644
--- a/packageA/changePassword/changePassword.vue
+++ b/packageA/changePassword/changePassword.vue
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+	import { updateUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
@@ -114,6 +115,16 @@
 				this.$refs.form.validate().then(res => {
 					uni.$u.toast('校验通过')
 					//调改密码接口
+					const userinfo = wx.getStorageSync('userInfoxj')
+					const data = {
+						'userPasswordVo.userId':userinfo.id, // 用户id
+						'userPasswordVo.newPassword':this.form.oldPassword, // 新密码
+						'userPasswordVo.oldPassword':this.form.newPassword, // 旧密码
+						'token':''
+					}
+					updateUser(data).then(res => {
+						console.log(res, '修改密码结果')
+					})
 				}).catch(errors => {
 					uni.$u.toast('请将信息填写完整')
 				})
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..aea5209 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)">
 			<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: {
@@ -46,11 +47,12 @@
 		},
 		methods: {
 			// 点击卡片
-			handleClick(code) {
+			handleClick(info) {
 				wx.navigateTo({
-					url: `/packageB/recordDetail/recordDetail?code=${code}`
+					url: `/packageB/recordDetail/recordDetail?info=${JSON.stringify(info)}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index c0795a1..f8244a0 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="!loading && !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" 
@@ -41,9 +41,9 @@
 		
 		<!-- 空 -->
 		<u-empty
-			v-if="isEmpty"
+			v-if="loading || isEmpty"
 			mode="search"
-			text="暂无结果"
+			:text="loading ? '数据加载中' : isEmpty ? '暂无结果' : ''"
 			: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,21 @@
 				// immediate: true,
 			}
 		},
-		mounted() {
+		onShow() {
+			const userinfo =  wx.getStorageSync('userInfoxj')
+			console.log(userinfo, 'userinfouserinfo')
+			wx.setNavigationBarTitle({title: userinfo ? '我的举报' : '匿名举报'});
+			
+		},
+		async mounted() {
+			this.loading = true
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			
-			this.currentTab = getLocationParams('tabType'); // 当前tab
-			this.clickTab(null, this.currentTab);
+			this.currentTab = getLocationParams('tabType') || '0'; // 当前tab
+			// 获取举报列表
+		    this.fetchReportData()
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,91 +134,39 @@
 			
 		},
 		methods: {
+			// 获取举报列表数据
+			async fetchReportData() {
+				const userinfo =  wx.getStorageSync('userInfoxj')
+				const data = {
+					'userInfoVo.id':userinfo.id ? userinfo.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.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				}).catch((error) => {
+					this.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				})
+			},
 			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
+					console.log('全部')
 				} 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 )
+					console.log('待评估')
+				} else if((val && val.index === 2) || currentTab === '2') { // 已评估
+					this.reportList = this.dataList.filter(item => item.status === 2 )
+					console.log('已评估')
 				} else {
 					this.reportList = []
 				}
@@ -220,17 +178,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/packageA/register/register.vue b/packageA/register/register.vue
index 6c0e279..d2a7291 100644
--- a/packageA/register/register.vue
+++ b/packageA/register/register.vue
@@ -62,7 +62,8 @@
 					<!-- <view class="code-img-wrapper" @click="updateImageCode">
 					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
 					</view> -->
-					<image :src="canvasImgUrl" style="width: 140px;height: 80px;" @click="updateImageCode"></image>
+					<!-- <image :src="canvasImgUrl" style="width: 140px;height: 80px;" @click="updateImageCode"></image> -->
+					 <image :src="codeUrl" style="width: 140px;height: 60px;"@click="updateImageCode"></image>
 				</u-form-item>
 			</u--form>
 		</view>
@@ -84,15 +85,18 @@
 
 <script>
 	import Message from '../../components/base/message.vue';
-	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	// import { Mcaptcha  } from '../../common/mcaptcha.js';
 	import { createCanvas, validateCode } from '../../common/createCanvas.js';
 	// import validate from '../../common/createCanvas.js';
+	import { registerUser } from '../../api/mine.js'
 	export default {
 		components: {
 			Message
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				canvasImgUrl: '',
 				showMessage: false, //注册须知弹框显隐
 				messageContent: '依法打击网上有害不良信息，事关国家安全、民族团结、社会稳定、事关人民群众根本利益。\n\n举报中心欢迎广大网民积极举报网上有害不良信息，对举报有功人员继续给予奖励，对提供重大线索、为打击暴恐犯罪发挥重要作用的举报有功人员最高给予10万元奖励。',
@@ -224,28 +228,75 @@
 			// 	height: 80,
 			// 	createCodeImg: "",
 			// });
-			createCanvas({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: "",
-			}, this).then(res => {
-				this.canvasImgUrl = res;
-				console.log('绘画')
-			})
+			// createCanvas({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: "",
+			// }, this).then(res => {
+			// 	this.canvasImgUrl = res;
+			// 	console.log('绘画')
+			// })
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			// 立即注册
 			register() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('注册成功')
-					setTimeout(() => {
-						wx.navigateBack({
-						  delta: 1
-						})
-					}, 2000)
-					//调改密码接口
+					// uni.$u.toast('注册成功')
+					// setTimeout(() => {
+					// 	wx.navigateBack({
+					// 	  delta: 1
+					// 	})
+					// }, 2000)
+					//注册
+					const data = {
+						'userInfoVo.account': this.form.name, //用户名(必填）
+						'userInfoVo.name':'',
+						'userInfoVo.sex':'',
+						'userInfoVo.nation':'',
+						'userInfoVo.idCard':'',
+						'userInfoVo.phone':this.form.phone, //手机号(必填）
+						'userInfoVo.email': this.form.email, //电子邮箱(必填）
+						'userInfoVo.country': '中国',
+						'userInfoVo.province': '',
+						'userInfoVo.city': '',
+						'userInfoVo.county': '',
+						'userInfoVo.address': '',
+						'userInfoVo.verifyCode':this.form.code, // 验证码(必填）
+						'userInfoVo.password':this.form.password,  //(必填MD5加密）(必填MD5加密）
+						'userInfoVo.accountType':1, // 默认值1（普通账号）(必填）
+						'timeStr':new Date().getTime(), //时间戳（必填）
+						'token':''
+
+					}
+					// registerUser(data).then(res => {
+					// 	console.log(res, '注册结果')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟注册成功
+					const userInfo = {
+						id:'用户ID', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+				    wx.setStorageSync('userInfoxj', userInfo)
+					wx.switchTab({
+						url:'/pages/mine/mine'
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
@@ -260,19 +311,44 @@
 				this.form.code = '';
 				this.$refs.form.clearValidate();
 			},
-			// 刷新验证码
+			// 换验证码
 			updateImageCode() {
-			  // this.mcaptcha.refresh();
-				createCanvas({
-					el: 'canvas',
-					width: 140,
-					height: 80,
-					createCodeImg: "",
-				}, this).then(res => {
-					this.canvasImgUrl = res;
-					console.log('绘画')
-				})
+				this.fetchCodeURl()
 			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// // 刷新验证码
+			// updateImageCode() {
+			//   // this.mcaptcha.refresh();
+			// 	createCanvas({
+			// 		el: 'canvas',
+			// 		width: 140,
+			// 		height: 80,
+			// 		createCodeImg: "",
+			// 	}, this).then(res => {
+			// 		this.canvasImgUrl = res;
+			// 		console.log('绘画')
+			// 	})
+			// },
 			//拒绝注册须知, 返回上一页
 			refuse(val) {
 				wx.navigateBack()
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index 2605880..0cc0d7d 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -3,23 +3,26 @@
 		<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.infoSource}}
 				</u-form-item>
 				<u-form-item label="举报时间" prop="visitorName" labelWidth="100" borderBottom>
-					{{form.time}}
+					{{stamp2Time(form.createTime)}}
 				</u-form-item>
 				<u-form-item label="分数" prop="visitorIdCard" borderBottom labelWidth="100">
 					{{form.score}}
@@ -30,31 +33,88 @@
 </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', // 分数
 				},
+			    reportTypeList:[
+					{
+						id: 1,
+						label: '涉领导人类'
+					},
+					{
+						id: 2,
+						label: '涉党军政类'
+					},
+					{
+						id: 3,
+						label: '涉爆涉恐类'
+					},
+					{
+						id: 4,
+						label: '民族宗教类'
+					},
+					{
+						id: 5,
+						label: '治疆政策类'
+					},
+					{
+						id: 6,
+						label: '涉疆案（事）件类'
+					},
+					{
+						id:7,
+						label: '公共安全类'
+					},
+					{
+						id: 8,
+						label: '组织人事类'
+					},
+					{
+						id: 9,
+						label: '社会民生类'
+					},
+					{
+						id: 10,
+						label: '其他类'
+					},
+				]
 			}
 		},
+		// onLoad: function (option) { 
+		//         console.log(option); //打印出上个页面传递的参数。
+		//     },
 		mounted() {
-			const code = getLocationParams('code') // 举报号
-			console.log(code, 'lll')
+			const info = getLocationParams('info') // 举报号
 			//-------------用这个举报号去调搜索接口---获取详情
-			this.fetchData(code)
+			this.fetchData(JSON.parse(info))
 		},
 		methods: {
-			fetchData(code) {
+			fetchData(info) {
+				console.log(info, '举报详情')
 				// 调接口逻辑
-			}
+				// getReportDetail({reportNo: code}).then(res => {
+				// 	this.form = res
+				// 	this.form.reportType = this.reportTypeList.filter(item => item.id === this.form.reportType)[0]?.label
+				// 	console.log(res, '举报详情信息')
+				// }).catch((error) => {
+				// 	console.log(error)
+				// })
+				this.form = info
+				this.form.reportType = this.reportTypeList.filter(item => item.id === Number(this.form.reportType))[0]?.label
+				this.form.infoSource = this.form.infoSource === 0 ? '网站' : this.form.infoSource === 5 ? '其他' : '专项'
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>

diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
diff --git a/packageA/accountBound/accountBound.vue b/packageA/accountBound/accountBound.vue
index 0c822b3..c856add 100644
--- a/packageA/accountBound/accountBound.vue
+++ b/packageA/accountBound/accountBound.vue
@@ -33,20 +33,30 @@
 						border="none"
 					></u--input>
 					<view class="code-img-wrapper" @click="updateImageCode">
-					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
+					  <!-- <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas> -->
+					  <image :src="codeUrl" style="width: 140px;height: 60px;"></image>
 					</view>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="button" @click="submit">确定</view>
+		<view class="reister">
+			<view> </view>
+			<!-- <view @click="changePage('changePassword')">忘记密码</view> -->
+			<view @click="changePage('register')">还没账号？去注册</view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	import { loginUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				rules: {
 					// 用户名
 					'name': [
@@ -100,36 +110,105 @@
 					name: '',  //用户名
 					password: '',  //密码
 					code: '',  //验证码
+					timeStr:'',
+					token:''
 				},
 			}
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
-			this.mcaptcha = new Mcaptcha({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: ""
-			});
+			// this.mcaptcha = new Mcaptcha({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: ""
+			// });
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			submit() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('校验通过')
-					//调改密码接口
+					// uni.$u.toast('校验通过')
+					// 登录接口
+					// this.form.timeStr = new Date().getTime()
+					// loginUser(this.form).then(res => {
+					// 	console.log(res, '用户信息')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟登录成功
+					const userInfo = {
+						id:'b56d2019f49353aa85a93c06228b8d80', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+					wx.setStorageSync('userInfoxj', userInfo)
+					setTimeout(() => {
+						wx.switchTab({
+							url:'/pages/mine/mine'
+						},500)
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
-			// 刷新验证码
+			// // 刷新验证码
+			// updateImageCode() {
+			//   this.mcaptcha.refresh()
+			// },
+			// 换验证码
 			updateImageCode() {
-			  this.mcaptcha.refresh()
+				this.fetchCodeURl()
+			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// 忘记密码或注册
+			changePage(val) {
+				let url = `/packageA/${val}/${val}`
+				wx.navigateTo({
+					url: url
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.reister{
+		padding: 0 10px;
+		display: flex;
+		justify-content: space-between;
+	}
 	.account-bound {
 		width: 100%;
 		height: 100%;
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..ea9ac0d 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="account-info">
 		<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" v-if="!isShowInfo">
+		<view class="main" v-if="">
 			<view class="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
 				<view class="title-icon">
@@ -13,10 +13,10 @@
 			</view>
 		</view>
 		
-		<view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view>
+		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
 		<view class="button-bottom">
-			<view class="button button-left" @click="changePage('register')">用户注册</view>
-			<view class="button button-right" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
+			<view class="button" @click="changePage('changePassword')">修改密码</view>
 		</view>
 	</view>
 </template>
@@ -77,52 +77,54 @@
 		},
 		methods: {
 			getData() {
+				const userinfo = wx.getStorageSync('userInfoxj')
+				console.log(userinfo, 'userinfo')
 				this.$set(this.list, 0, {
 					id: 'username',
 					name: '用户名:',
-					value: '123123',
+					value: userinfo.account,
 					icon: '../../static/mine/username.png'
 				});
 				this.$set(this.list, 1, {
 					id: 'name',
 					name: '姓名:',
-					value: 'ddd',
+					value: userinfo.name,
 					icon: '../../static/mine/name.png'
 				},);
 				this.$set(this.list, 2, {
 					id: 'sex',
 					name: '性别:',
-					value: '女',
+					value: userinfo.sex,
 					icon: '../../static/mine/sex.png'
 				},);
 				this.$set(this.list, 3, {
 					id: 'phone',
 					name: '手机号:',
-					value: '12345678978',
+					value: userinfo.phone,
 					icon: '../../static/mine/phone.png'
 				},);
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
-					value: '123123246@qq.com',
+					value: userinfo.email,
 					icon: '../../static/mine/email.png'
 				},);
 				this.$set(this.list, 5, {
 					id: 'region',
 					name: '地区:',
-					value: '北京市海淀区',
+					value: `${userinfo.province}/${userinfo.city}/${userinfo.county}`,
 					icon: '../../static/mine/region.png'
 				});
 				this.$set(this.list, 6, {
 					id: 'address',
 					name: '详细地址:',
-					value: '某街道某小区1号楼6单元102区1号楼6单元1区1号楼6单元1区1号楼6单元1区1号楼6单元1',
+					value: userinfo.address,
 					icon: '../../static/mine/address.png'
 				},);
 				this.isShowInfo = this.list.every(item => {
 					return item.value === '';
 				});
-				console.log(this.isShowInfo)
+
 			},
 			changePage(val) {
 				let url = `/packageA/${val}/${val}`
diff --git a/packageA/changePassword/changePassword.vue b/packageA/changePassword/changePassword.vue
index bb1f63b..0cf4927 100644
--- a/packageA/changePassword/changePassword.vue
+++ b/packageA/changePassword/changePassword.vue
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+	import { updateUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
@@ -114,6 +115,16 @@
 				this.$refs.form.validate().then(res => {
 					uni.$u.toast('校验通过')
 					//调改密码接口
+					const userinfo = wx.getStorageSync('userInfoxj')
+					const data = {
+						'userPasswordVo.userId':userinfo.id, // 用户id
+						'userPasswordVo.newPassword':this.form.oldPassword, // 新密码
+						'userPasswordVo.oldPassword':this.form.newPassword, // 旧密码
+						'token':''
+					}
+					updateUser(data).then(res => {
+						console.log(res, '修改密码结果')
+					})
 				}).catch(errors => {
 					uni.$u.toast('请将信息填写完整')
 				})
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..aea5209 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)">
 			<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: {
@@ -46,11 +47,12 @@
 		},
 		methods: {
 			// 点击卡片
-			handleClick(code) {
+			handleClick(info) {
 				wx.navigateTo({
-					url: `/packageB/recordDetail/recordDetail?code=${code}`
+					url: `/packageB/recordDetail/recordDetail?info=${JSON.stringify(info)}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index c0795a1..f8244a0 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="!loading && !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" 
@@ -41,9 +41,9 @@
 		
 		<!-- 空 -->
 		<u-empty
-			v-if="isEmpty"
+			v-if="loading || isEmpty"
 			mode="search"
-			text="暂无结果"
+			:text="loading ? '数据加载中' : isEmpty ? '暂无结果' : ''"
 			: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,21 @@
 				// immediate: true,
 			}
 		},
-		mounted() {
+		onShow() {
+			const userinfo =  wx.getStorageSync('userInfoxj')
+			console.log(userinfo, 'userinfouserinfo')
+			wx.setNavigationBarTitle({title: userinfo ? '我的举报' : '匿名举报'});
+			
+		},
+		async mounted() {
+			this.loading = true
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			
-			this.currentTab = getLocationParams('tabType'); // 当前tab
-			this.clickTab(null, this.currentTab);
+			this.currentTab = getLocationParams('tabType') || '0'; // 当前tab
+			// 获取举报列表
+		    this.fetchReportData()
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,91 +134,39 @@
 			
 		},
 		methods: {
+			// 获取举报列表数据
+			async fetchReportData() {
+				const userinfo =  wx.getStorageSync('userInfoxj')
+				const data = {
+					'userInfoVo.id':userinfo.id ? userinfo.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.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				}).catch((error) => {
+					this.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				})
+			},
 			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
+					console.log('全部')
 				} 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 )
+					console.log('待评估')
+				} else if((val && val.index === 2) || currentTab === '2') { // 已评估
+					this.reportList = this.dataList.filter(item => item.status === 2 )
+					console.log('已评估')
 				} else {
 					this.reportList = []
 				}
@@ -220,17 +178,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/packageA/register/register.vue b/packageA/register/register.vue
index 6c0e279..d2a7291 100644
--- a/packageA/register/register.vue
+++ b/packageA/register/register.vue
@@ -62,7 +62,8 @@
 					<!-- <view class="code-img-wrapper" @click="updateImageCode">
 					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
 					</view> -->
-					<image :src="canvasImgUrl" style="width: 140px;height: 80px;" @click="updateImageCode"></image>
+					<!-- <image :src="canvasImgUrl" style="width: 140px;height: 80px;" @click="updateImageCode"></image> -->
+					 <image :src="codeUrl" style="width: 140px;height: 60px;"@click="updateImageCode"></image>
 				</u-form-item>
 			</u--form>
 		</view>
@@ -84,15 +85,18 @@
 
 <script>
 	import Message from '../../components/base/message.vue';
-	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	// import { Mcaptcha  } from '../../common/mcaptcha.js';
 	import { createCanvas, validateCode } from '../../common/createCanvas.js';
 	// import validate from '../../common/createCanvas.js';
+	import { registerUser } from '../../api/mine.js'
 	export default {
 		components: {
 			Message
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				canvasImgUrl: '',
 				showMessage: false, //注册须知弹框显隐
 				messageContent: '依法打击网上有害不良信息，事关国家安全、民族团结、社会稳定、事关人民群众根本利益。\n\n举报中心欢迎广大网民积极举报网上有害不良信息，对举报有功人员继续给予奖励，对提供重大线索、为打击暴恐犯罪发挥重要作用的举报有功人员最高给予10万元奖励。',
@@ -224,28 +228,75 @@
 			// 	height: 80,
 			// 	createCodeImg: "",
 			// });
-			createCanvas({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: "",
-			}, this).then(res => {
-				this.canvasImgUrl = res;
-				console.log('绘画')
-			})
+			// createCanvas({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: "",
+			// }, this).then(res => {
+			// 	this.canvasImgUrl = res;
+			// 	console.log('绘画')
+			// })
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			// 立即注册
 			register() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('注册成功')
-					setTimeout(() => {
-						wx.navigateBack({
-						  delta: 1
-						})
-					}, 2000)
-					//调改密码接口
+					// uni.$u.toast('注册成功')
+					// setTimeout(() => {
+					// 	wx.navigateBack({
+					// 	  delta: 1
+					// 	})
+					// }, 2000)
+					//注册
+					const data = {
+						'userInfoVo.account': this.form.name, //用户名(必填）
+						'userInfoVo.name':'',
+						'userInfoVo.sex':'',
+						'userInfoVo.nation':'',
+						'userInfoVo.idCard':'',
+						'userInfoVo.phone':this.form.phone, //手机号(必填）
+						'userInfoVo.email': this.form.email, //电子邮箱(必填）
+						'userInfoVo.country': '中国',
+						'userInfoVo.province': '',
+						'userInfoVo.city': '',
+						'userInfoVo.county': '',
+						'userInfoVo.address': '',
+						'userInfoVo.verifyCode':this.form.code, // 验证码(必填）
+						'userInfoVo.password':this.form.password,  //(必填MD5加密）(必填MD5加密）
+						'userInfoVo.accountType':1, // 默认值1（普通账号）(必填）
+						'timeStr':new Date().getTime(), //时间戳（必填）
+						'token':''
+
+					}
+					// registerUser(data).then(res => {
+					// 	console.log(res, '注册结果')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟注册成功
+					const userInfo = {
+						id:'用户ID', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+				    wx.setStorageSync('userInfoxj', userInfo)
+					wx.switchTab({
+						url:'/pages/mine/mine'
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
@@ -260,19 +311,44 @@
 				this.form.code = '';
 				this.$refs.form.clearValidate();
 			},
-			// 刷新验证码
+			// 换验证码
 			updateImageCode() {
-			  // this.mcaptcha.refresh();
-				createCanvas({
-					el: 'canvas',
-					width: 140,
-					height: 80,
-					createCodeImg: "",
-				}, this).then(res => {
-					this.canvasImgUrl = res;
-					console.log('绘画')
-				})
+				this.fetchCodeURl()
 			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// // 刷新验证码
+			// updateImageCode() {
+			//   // this.mcaptcha.refresh();
+			// 	createCanvas({
+			// 		el: 'canvas',
+			// 		width: 140,
+			// 		height: 80,
+			// 		createCodeImg: "",
+			// 	}, this).then(res => {
+			// 		this.canvasImgUrl = res;
+			// 		console.log('绘画')
+			// 	})
+			// },
 			//拒绝注册须知, 返回上一页
 			refuse(val) {
 				wx.navigateBack()
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index 2605880..0cc0d7d 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -3,23 +3,26 @@
 		<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.infoSource}}
 				</u-form-item>
 				<u-form-item label="举报时间" prop="visitorName" labelWidth="100" borderBottom>
-					{{form.time}}
+					{{stamp2Time(form.createTime)}}
 				</u-form-item>
 				<u-form-item label="分数" prop="visitorIdCard" borderBottom labelWidth="100">
 					{{form.score}}
@@ -30,31 +33,88 @@
 </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', // 分数
 				},
+			    reportTypeList:[
+					{
+						id: 1,
+						label: '涉领导人类'
+					},
+					{
+						id: 2,
+						label: '涉党军政类'
+					},
+					{
+						id: 3,
+						label: '涉爆涉恐类'
+					},
+					{
+						id: 4,
+						label: '民族宗教类'
+					},
+					{
+						id: 5,
+						label: '治疆政策类'
+					},
+					{
+						id: 6,
+						label: '涉疆案（事）件类'
+					},
+					{
+						id:7,
+						label: '公共安全类'
+					},
+					{
+						id: 8,
+						label: '组织人事类'
+					},
+					{
+						id: 9,
+						label: '社会民生类'
+					},
+					{
+						id: 10,
+						label: '其他类'
+					},
+				]
 			}
 		},
+		// onLoad: function (option) { 
+		//         console.log(option); //打印出上个页面传递的参数。
+		//     },
 		mounted() {
-			const code = getLocationParams('code') // 举报号
-			console.log(code, 'lll')
+			const info = getLocationParams('info') // 举报号
 			//-------------用这个举报号去调搜索接口---获取详情
-			this.fetchData(code)
+			this.fetchData(JSON.parse(info))
 		},
 		methods: {
-			fetchData(code) {
+			fetchData(info) {
+				console.log(info, '举报详情')
 				// 调接口逻辑
-			}
+				// getReportDetail({reportNo: code}).then(res => {
+				// 	this.form = res
+				// 	this.form.reportType = this.reportTypeList.filter(item => item.id === this.form.reportType)[0]?.label
+				// 	console.log(res, '举报详情信息')
+				// }).catch((error) => {
+				// 	console.log(error)
+				// })
+				this.form = info
+				this.form.reportType = this.reportTypeList.filter(item => item.id === Number(this.form.reportType))[0]?.label
+				this.form.infoSource = this.form.infoSource === 0 ? '网站' : this.form.infoSource === 5 ? '其他' : '专项'
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 9d625fe..fabee13 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -713,13 +713,15 @@
 					} else {
 						infoSource = this.typeMapDict[this.reportType]
 					}
+					// 登录的用户使用
+					const userinfo = wx.getStorageSync('userInfoxj')
 					// ------------------------------------------------------------------------------------------
 					const submitParams = {
 						"anonymousUserInfo.name": this.form.reportName, // 举报人
 						"anonymousUserInfo.phone": this.form.phone,// 手机号
 						"anonymousUserInfo.email": '', //email
-						"reportInfo.reportUser": this.form.reportName,//举报人
-						"reportInfo.reportName": this.form.reportName,// 举报人
+						"reportInfo.reportUser": userinfo.account ? userinfo.account : '',//举报人
+						"reportInfo.reportName": userinfo.account ? userinfo.name : userinfo.account || '',// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
 						"reportInfo.infoSource": infoSource, // 网站举报（必填固定不变）
 						"reportInfo.infoType": '1', //（三种类型举报都传递1）
@@ -752,6 +754,7 @@
 						"videoBatchIdsStr": '',//？
 						"verifyCode": this.form.code, // 验证码
 						"timeStr": this.timeStr, // 当前时间戳
+						"userID": '865a2ab9faf7c05fed57293212ec2aff',
 					}
 					this.$refs.form.validate().then(res => {
 						

diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
diff --git a/packageA/accountBound/accountBound.vue b/packageA/accountBound/accountBound.vue
index 0c822b3..c856add 100644
--- a/packageA/accountBound/accountBound.vue
+++ b/packageA/accountBound/accountBound.vue
@@ -33,20 +33,30 @@
 						border="none"
 					></u--input>
 					<view class="code-img-wrapper" @click="updateImageCode">
-					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
+					  <!-- <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas> -->
+					  <image :src="codeUrl" style="width: 140px;height: 60px;"></image>
 					</view>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="button" @click="submit">确定</view>
+		<view class="reister">
+			<view> </view>
+			<!-- <view @click="changePage('changePassword')">忘记密码</view> -->
+			<view @click="changePage('register')">还没账号？去注册</view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	import { loginUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				rules: {
 					// 用户名
 					'name': [
@@ -100,36 +110,105 @@
 					name: '',  //用户名
 					password: '',  //密码
 					code: '',  //验证码
+					timeStr:'',
+					token:''
 				},
 			}
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
-			this.mcaptcha = new Mcaptcha({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: ""
-			});
+			// this.mcaptcha = new Mcaptcha({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: ""
+			// });
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			submit() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('校验通过')
-					//调改密码接口
+					// uni.$u.toast('校验通过')
+					// 登录接口
+					// this.form.timeStr = new Date().getTime()
+					// loginUser(this.form).then(res => {
+					// 	console.log(res, '用户信息')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟登录成功
+					const userInfo = {
+						id:'b56d2019f49353aa85a93c06228b8d80', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+					wx.setStorageSync('userInfoxj', userInfo)
+					setTimeout(() => {
+						wx.switchTab({
+							url:'/pages/mine/mine'
+						},500)
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
-			// 刷新验证码
+			// // 刷新验证码
+			// updateImageCode() {
+			//   this.mcaptcha.refresh()
+			// },
+			// 换验证码
 			updateImageCode() {
-			  this.mcaptcha.refresh()
+				this.fetchCodeURl()
+			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// 忘记密码或注册
+			changePage(val) {
+				let url = `/packageA/${val}/${val}`
+				wx.navigateTo({
+					url: url
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.reister{
+		padding: 0 10px;
+		display: flex;
+		justify-content: space-between;
+	}
 	.account-bound {
 		width: 100%;
 		height: 100%;
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..ea9ac0d 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="account-info">
 		<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" v-if="!isShowInfo">
+		<view class="main" v-if="">
 			<view class="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
 				<view class="title-icon">
@@ -13,10 +13,10 @@
 			</view>
 		</view>
 		
-		<view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view>
+		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
 		<view class="button-bottom">
-			<view class="button button-left" @click="changePage('register')">用户注册</view>
-			<view class="button button-right" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
+			<view class="button" @click="changePage('changePassword')">修改密码</view>
 		</view>
 	</view>
 </template>
@@ -77,52 +77,54 @@
 		},
 		methods: {
 			getData() {
+				const userinfo = wx.getStorageSync('userInfoxj')
+				console.log(userinfo, 'userinfo')
 				this.$set(this.list, 0, {
 					id: 'username',
 					name: '用户名:',
-					value: '123123',
+					value: userinfo.account,
 					icon: '../../static/mine/username.png'
 				});
 				this.$set(this.list, 1, {
 					id: 'name',
 					name: '姓名:',
-					value: 'ddd',
+					value: userinfo.name,
 					icon: '../../static/mine/name.png'
 				},);
 				this.$set(this.list, 2, {
 					id: 'sex',
 					name: '性别:',
-					value: '女',
+					value: userinfo.sex,
 					icon: '../../static/mine/sex.png'
 				},);
 				this.$set(this.list, 3, {
 					id: 'phone',
 					name: '手机号:',
-					value: '12345678978',
+					value: userinfo.phone,
 					icon: '../../static/mine/phone.png'
 				},);
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
-					value: '123123246@qq.com',
+					value: userinfo.email,
 					icon: '../../static/mine/email.png'
 				},);
 				this.$set(this.list, 5, {
 					id: 'region',
 					name: '地区:',
-					value: '北京市海淀区',
+					value: `${userinfo.province}/${userinfo.city}/${userinfo.county}`,
 					icon: '../../static/mine/region.png'
 				});
 				this.$set(this.list, 6, {
 					id: 'address',
 					name: '详细地址:',
-					value: '某街道某小区1号楼6单元102区1号楼6单元1区1号楼6单元1区1号楼6单元1区1号楼6单元1',
+					value: userinfo.address,
 					icon: '../../static/mine/address.png'
 				},);
 				this.isShowInfo = this.list.every(item => {
 					return item.value === '';
 				});
-				console.log(this.isShowInfo)
+
 			},
 			changePage(val) {
 				let url = `/packageA/${val}/${val}`
diff --git a/packageA/changePassword/changePassword.vue b/packageA/changePassword/changePassword.vue
index bb1f63b..0cf4927 100644
--- a/packageA/changePassword/changePassword.vue
+++ b/packageA/changePassword/changePassword.vue
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+	import { updateUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
@@ -114,6 +115,16 @@
 				this.$refs.form.validate().then(res => {
 					uni.$u.toast('校验通过')
 					//调改密码接口
+					const userinfo = wx.getStorageSync('userInfoxj')
+					const data = {
+						'userPasswordVo.userId':userinfo.id, // 用户id
+						'userPasswordVo.newPassword':this.form.oldPassword, // 新密码
+						'userPasswordVo.oldPassword':this.form.newPassword, // 旧密码
+						'token':''
+					}
+					updateUser(data).then(res => {
+						console.log(res, '修改密码结果')
+					})
 				}).catch(errors => {
 					uni.$u.toast('请将信息填写完整')
 				})
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..aea5209 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)">
 			<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: {
@@ -46,11 +47,12 @@
 		},
 		methods: {
 			// 点击卡片
-			handleClick(code) {
+			handleClick(info) {
 				wx.navigateTo({
-					url: `/packageB/recordDetail/recordDetail?code=${code}`
+					url: `/packageB/recordDetail/recordDetail?info=${JSON.stringify(info)}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index c0795a1..f8244a0 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="!loading && !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" 
@@ -41,9 +41,9 @@
 		
 		<!-- 空 -->
 		<u-empty
-			v-if="isEmpty"
+			v-if="loading || isEmpty"
 			mode="search"
-			text="暂无结果"
+			:text="loading ? '数据加载中' : isEmpty ? '暂无结果' : ''"
 			: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,21 @@
 				// immediate: true,
 			}
 		},
-		mounted() {
+		onShow() {
+			const userinfo =  wx.getStorageSync('userInfoxj')
+			console.log(userinfo, 'userinfouserinfo')
+			wx.setNavigationBarTitle({title: userinfo ? '我的举报' : '匿名举报'});
+			
+		},
+		async mounted() {
+			this.loading = true
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			
-			this.currentTab = getLocationParams('tabType'); // 当前tab
-			this.clickTab(null, this.currentTab);
+			this.currentTab = getLocationParams('tabType') || '0'; // 当前tab
+			// 获取举报列表
+		    this.fetchReportData()
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,91 +134,39 @@
 			
 		},
 		methods: {
+			// 获取举报列表数据
+			async fetchReportData() {
+				const userinfo =  wx.getStorageSync('userInfoxj')
+				const data = {
+					'userInfoVo.id':userinfo.id ? userinfo.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.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				}).catch((error) => {
+					this.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				})
+			},
 			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
+					console.log('全部')
 				} 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 )
+					console.log('待评估')
+				} else if((val && val.index === 2) || currentTab === '2') { // 已评估
+					this.reportList = this.dataList.filter(item => item.status === 2 )
+					console.log('已评估')
 				} else {
 					this.reportList = []
 				}
@@ -220,17 +178,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/packageA/register/register.vue b/packageA/register/register.vue
index 6c0e279..d2a7291 100644
--- a/packageA/register/register.vue
+++ b/packageA/register/register.vue
@@ -62,7 +62,8 @@
 					<!-- <view class="code-img-wrapper" @click="updateImageCode">
 					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
 					</view> -->
-					<image :src="canvasImgUrl" style="width: 140px;height: 80px;" @click="updateImageCode"></image>
+					<!-- <image :src="canvasImgUrl" style="width: 140px;height: 80px;" @click="updateImageCode"></image> -->
+					 <image :src="codeUrl" style="width: 140px;height: 60px;"@click="updateImageCode"></image>
 				</u-form-item>
 			</u--form>
 		</view>
@@ -84,15 +85,18 @@
 
 <script>
 	import Message from '../../components/base/message.vue';
-	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	// import { Mcaptcha  } from '../../common/mcaptcha.js';
 	import { createCanvas, validateCode } from '../../common/createCanvas.js';
 	// import validate from '../../common/createCanvas.js';
+	import { registerUser } from '../../api/mine.js'
 	export default {
 		components: {
 			Message
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				canvasImgUrl: '',
 				showMessage: false, //注册须知弹框显隐
 				messageContent: '依法打击网上有害不良信息，事关国家安全、民族团结、社会稳定、事关人民群众根本利益。\n\n举报中心欢迎广大网民积极举报网上有害不良信息，对举报有功人员继续给予奖励，对提供重大线索、为打击暴恐犯罪发挥重要作用的举报有功人员最高给予10万元奖励。',
@@ -224,28 +228,75 @@
 			// 	height: 80,
 			// 	createCodeImg: "",
 			// });
-			createCanvas({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: "",
-			}, this).then(res => {
-				this.canvasImgUrl = res;
-				console.log('绘画')
-			})
+			// createCanvas({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: "",
+			// }, this).then(res => {
+			// 	this.canvasImgUrl = res;
+			// 	console.log('绘画')
+			// })
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			// 立即注册
 			register() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('注册成功')
-					setTimeout(() => {
-						wx.navigateBack({
-						  delta: 1
-						})
-					}, 2000)
-					//调改密码接口
+					// uni.$u.toast('注册成功')
+					// setTimeout(() => {
+					// 	wx.navigateBack({
+					// 	  delta: 1
+					// 	})
+					// }, 2000)
+					//注册
+					const data = {
+						'userInfoVo.account': this.form.name, //用户名(必填）
+						'userInfoVo.name':'',
+						'userInfoVo.sex':'',
+						'userInfoVo.nation':'',
+						'userInfoVo.idCard':'',
+						'userInfoVo.phone':this.form.phone, //手机号(必填）
+						'userInfoVo.email': this.form.email, //电子邮箱(必填）
+						'userInfoVo.country': '中国',
+						'userInfoVo.province': '',
+						'userInfoVo.city': '',
+						'userInfoVo.county': '',
+						'userInfoVo.address': '',
+						'userInfoVo.verifyCode':this.form.code, // 验证码(必填）
+						'userInfoVo.password':this.form.password,  //(必填MD5加密）(必填MD5加密）
+						'userInfoVo.accountType':1, // 默认值1（普通账号）(必填）
+						'timeStr':new Date().getTime(), //时间戳（必填）
+						'token':''
+
+					}
+					// registerUser(data).then(res => {
+					// 	console.log(res, '注册结果')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟注册成功
+					const userInfo = {
+						id:'用户ID', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+				    wx.setStorageSync('userInfoxj', userInfo)
+					wx.switchTab({
+						url:'/pages/mine/mine'
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
@@ -260,19 +311,44 @@
 				this.form.code = '';
 				this.$refs.form.clearValidate();
 			},
-			// 刷新验证码
+			// 换验证码
 			updateImageCode() {
-			  // this.mcaptcha.refresh();
-				createCanvas({
-					el: 'canvas',
-					width: 140,
-					height: 80,
-					createCodeImg: "",
-				}, this).then(res => {
-					this.canvasImgUrl = res;
-					console.log('绘画')
-				})
+				this.fetchCodeURl()
 			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// // 刷新验证码
+			// updateImageCode() {
+			//   // this.mcaptcha.refresh();
+			// 	createCanvas({
+			// 		el: 'canvas',
+			// 		width: 140,
+			// 		height: 80,
+			// 		createCodeImg: "",
+			// 	}, this).then(res => {
+			// 		this.canvasImgUrl = res;
+			// 		console.log('绘画')
+			// 	})
+			// },
 			//拒绝注册须知, 返回上一页
 			refuse(val) {
 				wx.navigateBack()
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index 2605880..0cc0d7d 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -3,23 +3,26 @@
 		<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.infoSource}}
 				</u-form-item>
 				<u-form-item label="举报时间" prop="visitorName" labelWidth="100" borderBottom>
-					{{form.time}}
+					{{stamp2Time(form.createTime)}}
 				</u-form-item>
 				<u-form-item label="分数" prop="visitorIdCard" borderBottom labelWidth="100">
 					{{form.score}}
@@ -30,31 +33,88 @@
 </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', // 分数
 				},
+			    reportTypeList:[
+					{
+						id: 1,
+						label: '涉领导人类'
+					},
+					{
+						id: 2,
+						label: '涉党军政类'
+					},
+					{
+						id: 3,
+						label: '涉爆涉恐类'
+					},
+					{
+						id: 4,
+						label: '民族宗教类'
+					},
+					{
+						id: 5,
+						label: '治疆政策类'
+					},
+					{
+						id: 6,
+						label: '涉疆案（事）件类'
+					},
+					{
+						id:7,
+						label: '公共安全类'
+					},
+					{
+						id: 8,
+						label: '组织人事类'
+					},
+					{
+						id: 9,
+						label: '社会民生类'
+					},
+					{
+						id: 10,
+						label: '其他类'
+					},
+				]
 			}
 		},
+		// onLoad: function (option) { 
+		//         console.log(option); //打印出上个页面传递的参数。
+		//     },
 		mounted() {
-			const code = getLocationParams('code') // 举报号
-			console.log(code, 'lll')
+			const info = getLocationParams('info') // 举报号
 			//-------------用这个举报号去调搜索接口---获取详情
-			this.fetchData(code)
+			this.fetchData(JSON.parse(info))
 		},
 		methods: {
-			fetchData(code) {
+			fetchData(info) {
+				console.log(info, '举报详情')
 				// 调接口逻辑
-			}
+				// getReportDetail({reportNo: code}).then(res => {
+				// 	this.form = res
+				// 	this.form.reportType = this.reportTypeList.filter(item => item.id === this.form.reportType)[0]?.label
+				// 	console.log(res, '举报详情信息')
+				// }).catch((error) => {
+				// 	console.log(error)
+				// })
+				this.form = info
+				this.form.reportType = this.reportTypeList.filter(item => item.id === Number(this.form.reportType))[0]?.label
+				this.form.infoSource = this.form.infoSource === 0 ? '网站' : this.form.infoSource === 5 ? '其他' : '专项'
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 9d625fe..fabee13 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -713,13 +713,15 @@
 					} else {
 						infoSource = this.typeMapDict[this.reportType]
 					}
+					// 登录的用户使用
+					const userinfo = wx.getStorageSync('userInfoxj')
 					// ------------------------------------------------------------------------------------------
 					const submitParams = {
 						"anonymousUserInfo.name": this.form.reportName, // 举报人
 						"anonymousUserInfo.phone": this.form.phone,// 手机号
 						"anonymousUserInfo.email": '', //email
-						"reportInfo.reportUser": this.form.reportName,//举报人
-						"reportInfo.reportName": this.form.reportName,// 举报人
+						"reportInfo.reportUser": userinfo.account ? userinfo.account : '',//举报人
+						"reportInfo.reportName": userinfo.account ? userinfo.name : userinfo.account || '',// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
 						"reportInfo.infoSource": infoSource, // 网站举报（必填固定不变）
 						"reportInfo.infoType": '1', //（三种类型举报都传递1）
@@ -752,6 +754,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,

diff --git a/api/mine.js b/api/mine.js
new file mode 100644
index 0000000..7a536f3
--- /dev/null
+++ b/api/mine.js
@@ -0,0 +1,20 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+
+const USER_REGISTER = BASE_URL + '/webserver/userInfo/saveUserRegInfo.do'
+const USER_LOGIN = BASE_URL + '/webserver/userInfo/verifyUserLoginInfo.do'
+const USER_UPDATE = BASE_URL + '/webserver/userInfo/modifyPersonPassword.do'
+// 用户注册
+export function registerUser(data) {
+	return fetch.post(USER_REGISTER, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户登录
+export function loginUser(data) {
+	return fetch.post(USER_LOGIN, data, {}, {'content-type': 'application/x-www-form-urlencoded'}).then(res => res);
+}
+// 用户修改密码
+export function updateUser(data) {
+	return fetch.post(USER_UPDATE, 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/components/card.vue b/components/card.vue
index 6b118d5..b284762 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -120,10 +120,11 @@
 					deep:true,
 					handler(newVal){
 						if (this.currentShow) {
+							const userinfo = wx.getStorageSync('userInfoxj')
 							// this.isVoteFlag = false
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:localStorage.getItem('userIdentifying') // 用户唯一标识
+								votePerson:userinfo.phone ?userinfo.phone  : '123' // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -138,9 +139,10 @@
 			methods: {  
 				// 点击真假进行投票
 				vote(flag) {
+					const userinfo = wx.getStorageSync('userInfoxj')
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:localStorage.getItem('userIdentifying'), // 用户唯一标识
+						votePerson:userinfo.phone ?userinfo.phone  : '123', // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
diff --git a/packageA/accountBound/accountBound.vue b/packageA/accountBound/accountBound.vue
index 0c822b3..c856add 100644
--- a/packageA/accountBound/accountBound.vue
+++ b/packageA/accountBound/accountBound.vue
@@ -33,20 +33,30 @@
 						border="none"
 					></u--input>
 					<view class="code-img-wrapper" @click="updateImageCode">
-					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
+					  <!-- <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas> -->
+					  <image :src="codeUrl" style="width: 140px;height: 60px;"></image>
 					</view>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="button" @click="submit">确定</view>
+		<view class="reister">
+			<view> </view>
+			<!-- <view @click="changePage('changePassword')">忘记密码</view> -->
+			<view @click="changePage('register')">还没账号？去注册</view>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	import { loginUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				rules: {
 					// 用户名
 					'name': [
@@ -100,36 +110,105 @@
 					name: '',  //用户名
 					password: '',  //密码
 					code: '',  //验证码
+					timeStr:'',
+					token:''
 				},
 			}
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
-			this.mcaptcha = new Mcaptcha({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: ""
-			});
+			// this.mcaptcha = new Mcaptcha({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: ""
+			// });
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			submit() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('校验通过')
-					//调改密码接口
+					// uni.$u.toast('校验通过')
+					// 登录接口
+					// this.form.timeStr = new Date().getTime()
+					// loginUser(this.form).then(res => {
+					// 	console.log(res, '用户信息')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟登录成功
+					const userInfo = {
+						id:'b56d2019f49353aa85a93c06228b8d80', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+					wx.setStorageSync('userInfoxj', userInfo)
+					setTimeout(() => {
+						wx.switchTab({
+							url:'/pages/mine/mine'
+						},500)
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
-			// 刷新验证码
+			// // 刷新验证码
+			// updateImageCode() {
+			//   this.mcaptcha.refresh()
+			// },
+			// 换验证码
 			updateImageCode() {
-			  this.mcaptcha.refresh()
+				this.fetchCodeURl()
+			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// 忘记密码或注册
+			changePage(val) {
+				let url = `/packageA/${val}/${val}`
+				wx.navigateTo({
+					url: url
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.reister{
+		padding: 0 10px;
+		display: flex;
+		justify-content: space-between;
+	}
 	.account-bound {
 		width: 100%;
 		height: 100%;
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index 6a7048c..ea9ac0d 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="account-info">
 		<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" v-if="!isShowInfo">
+		<view class="main" v-if="">
 			<view class="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
 				<view class="title-icon">
@@ -13,10 +13,10 @@
 			</view>
 		</view>
 		
-		<view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view>
+		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
 		<view class="button-bottom">
-			<view class="button button-left" @click="changePage('register')">用户注册</view>
-			<view class="button button-right" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
+			<view class="button" @click="changePage('changePassword')">修改密码</view>
 		</view>
 	</view>
 </template>
@@ -77,52 +77,54 @@
 		},
 		methods: {
 			getData() {
+				const userinfo = wx.getStorageSync('userInfoxj')
+				console.log(userinfo, 'userinfo')
 				this.$set(this.list, 0, {
 					id: 'username',
 					name: '用户名:',
-					value: '123123',
+					value: userinfo.account,
 					icon: '../../static/mine/username.png'
 				});
 				this.$set(this.list, 1, {
 					id: 'name',
 					name: '姓名:',
-					value: 'ddd',
+					value: userinfo.name,
 					icon: '../../static/mine/name.png'
 				},);
 				this.$set(this.list, 2, {
 					id: 'sex',
 					name: '性别:',
-					value: '女',
+					value: userinfo.sex,
 					icon: '../../static/mine/sex.png'
 				},);
 				this.$set(this.list, 3, {
 					id: 'phone',
 					name: '手机号:',
-					value: '12345678978',
+					value: userinfo.phone,
 					icon: '../../static/mine/phone.png'
 				},);
 				this.$set(this.list, 4, {
 					id: 'email',
 					name: '电子邮箱:',
-					value: '123123246@qq.com',
+					value: userinfo.email,
 					icon: '../../static/mine/email.png'
 				},);
 				this.$set(this.list, 5, {
 					id: 'region',
 					name: '地区:',
-					value: '北京市海淀区',
+					value: `${userinfo.province}/${userinfo.city}/${userinfo.county}`,
 					icon: '../../static/mine/region.png'
 				});
 				this.$set(this.list, 6, {
 					id: 'address',
 					name: '详细地址:',
-					value: '某街道某小区1号楼6单元102区1号楼6单元1区1号楼6单元1区1号楼6单元1区1号楼6单元1',
+					value: userinfo.address,
 					icon: '../../static/mine/address.png'
 				},);
 				this.isShowInfo = this.list.every(item => {
 					return item.value === '';
 				});
-				console.log(this.isShowInfo)
+
 			},
 			changePage(val) {
 				let url = `/packageA/${val}/${val}`
diff --git a/packageA/changePassword/changePassword.vue b/packageA/changePassword/changePassword.vue
index bb1f63b..0cf4927 100644
--- a/packageA/changePassword/changePassword.vue
+++ b/packageA/changePassword/changePassword.vue
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+	import { updateUser } from '../../api/mine.js'
 	export default {
 		data() {
 			return {
@@ -114,6 +115,16 @@
 				this.$refs.form.validate().then(res => {
 					uni.$u.toast('校验通过')
 					//调改密码接口
+					const userinfo = wx.getStorageSync('userInfoxj')
+					const data = {
+						'userPasswordVo.userId':userinfo.id, // 用户id
+						'userPasswordVo.newPassword':this.form.oldPassword, // 新密码
+						'userPasswordVo.oldPassword':this.form.newPassword, // 旧密码
+						'token':''
+					}
+					updateUser(data).then(res => {
+						console.log(res, '修改密码结果')
+					})
 				}).catch(errors => {
 					uni.$u.toast('请将信息填写完整')
 				})
diff --git a/packageA/components/record.vue b/packageA/components/record.vue
index 4777006..aea5209 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)">
 			<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: {
@@ -46,11 +47,12 @@
 		},
 		methods: {
 			// 点击卡片
-			handleClick(code) {
+			handleClick(info) {
 				wx.navigateTo({
-					url: `/packageB/recordDetail/recordDetail?code=${code}`
+					url: `/packageB/recordDetail/recordDetail?info=${JSON.stringify(info)}`
 				})
-			}
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index c0795a1..f8244a0 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="!loading && !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" 
@@ -41,9 +41,9 @@
 		
 		<!-- 空 -->
 		<u-empty
-			v-if="isEmpty"
+			v-if="loading || isEmpty"
 			mode="search"
-			text="暂无结果"
+			:text="loading ? '数据加载中' : isEmpty ? '暂无结果' : ''"
 			: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,21 @@
 				// immediate: true,
 			}
 		},
-		mounted() {
+		onShow() {
+			const userinfo =  wx.getStorageSync('userInfoxj')
+			console.log(userinfo, 'userinfouserinfo')
+			wx.setNavigationBarTitle({title: userinfo ? '我的举报' : '匿名举报'});
+			
+		},
+		async mounted() {
+			this.loading = true
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			
-			this.currentTab = getLocationParams('tabType'); // 当前tab
-			this.clickTab(null, this.currentTab);
+			this.currentTab = getLocationParams('tabType') || '0'; // 当前tab
+			// 获取举报列表
+		    this.fetchReportData()
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,91 +134,39 @@
 			
 		},
 		methods: {
+			// 获取举报列表数据
+			async fetchReportData() {
+				const userinfo =  wx.getStorageSync('userInfoxj')
+				const data = {
+					'userInfoVo.id':userinfo.id ? userinfo.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.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				}).catch((error) => {
+					this.dataList = []
+					this.loading = false
+					this.clickTab(null, getLocationParams('tabType') || '0');
+				})
+			},
 			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
+					console.log('全部')
 				} 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 )
+					console.log('待评估')
+				} else if((val && val.index === 2) || currentTab === '2') { // 已评估
+					this.reportList = this.dataList.filter(item => item.status === 2 )
+					console.log('已评估')
 				} else {
 					this.reportList = []
 				}
@@ -220,17 +178,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/packageA/register/register.vue b/packageA/register/register.vue
index 6c0e279..d2a7291 100644
--- a/packageA/register/register.vue
+++ b/packageA/register/register.vue
@@ -62,7 +62,8 @@
 					<!-- <view class="code-img-wrapper" @click="updateImageCode">
 					  <canvas style="width: 280rpx;height: 140rpx;" canvas-id="canvas"></canvas>
 					</view> -->
-					<image :src="canvasImgUrl" style="width: 140px;height: 80px;" @click="updateImageCode"></image>
+					<!-- <image :src="canvasImgUrl" style="width: 140px;height: 80px;" @click="updateImageCode"></image> -->
+					 <image :src="codeUrl" style="width: 140px;height: 60px;"@click="updateImageCode"></image>
 				</u-form-item>
 			</u--form>
 		</view>
@@ -84,15 +85,18 @@
 
 <script>
 	import Message from '../../components/base/message.vue';
-	import { Mcaptcha  } from '../../common/mcaptcha.js';
+	// import { Mcaptcha  } from '../../common/mcaptcha.js';
 	import { createCanvas, validateCode } from '../../common/createCanvas.js';
 	// import validate from '../../common/createCanvas.js';
+	import { registerUser } from '../../api/mine.js'
 	export default {
 		components: {
 			Message
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
 				canvasImgUrl: '',
 				showMessage: false, //注册须知弹框显隐
 				messageContent: '依法打击网上有害不良信息，事关国家安全、民族团结、社会稳定、事关人民群众根本利益。\n\n举报中心欢迎广大网民积极举报网上有害不良信息，对举报有功人员继续给予奖励，对提供重大线索、为打击暴恐犯罪发挥重要作用的举报有功人员最高给予10万元奖励。',
@@ -224,28 +228,75 @@
 			// 	height: 80,
 			// 	createCodeImg: "",
 			// });
-			createCanvas({
-				el: 'canvas',
-				width: 140,
-				height: 80,
-				createCodeImg: "",
-			}, this).then(res => {
-				this.canvasImgUrl = res;
-				console.log('绘画')
-			})
+			// createCanvas({
+			// 	el: 'canvas',
+			// 	width: 140,
+			// 	height: 80,
+			// 	createCodeImg: "",
+			// }, this).then(res => {
+			// 	this.canvasImgUrl = res;
+			// 	console.log('绘画')
+			// })
+			this.fetchCodeURl() // 获取验证码
 		},
 		methods: {
 			// 立即注册
 			register() {
 				this.$refs.form.validate().then(res => {
-					uni.$u.toast('注册成功')
-					setTimeout(() => {
-						wx.navigateBack({
-						  delta: 1
-						})
-					}, 2000)
-					//调改密码接口
+					// uni.$u.toast('注册成功')
+					// setTimeout(() => {
+					// 	wx.navigateBack({
+					// 	  delta: 1
+					// 	})
+					// }, 2000)
+					//注册
+					const data = {
+						'userInfoVo.account': this.form.name, //用户名(必填）
+						'userInfoVo.name':'',
+						'userInfoVo.sex':'',
+						'userInfoVo.nation':'',
+						'userInfoVo.idCard':'',
+						'userInfoVo.phone':this.form.phone, //手机号(必填）
+						'userInfoVo.email': this.form.email, //电子邮箱(必填）
+						'userInfoVo.country': '中国',
+						'userInfoVo.province': '',
+						'userInfoVo.city': '',
+						'userInfoVo.county': '',
+						'userInfoVo.address': '',
+						'userInfoVo.verifyCode':this.form.code, // 验证码(必填）
+						'userInfoVo.password':this.form.password,  //(必填MD5加密）(必填MD5加密）
+						'userInfoVo.accountType':1, // 默认值1（普通账号）(必填）
+						'timeStr':new Date().getTime(), //时间戳（必填）
+						'token':''
+
+					}
+					// registerUser(data).then(res => {
+					// 	console.log(res, '注册结果')
+					// }).catch((error) => {
+					// 	console.log(error)
+					// })
+					// 模拟注册成功
+					const userInfo = {
+						id:'用户ID', 
+						account:'用户账号',
+						name:'姓名',
+						sex:'性别',
+						nation:'民族', 
+						IDCard:'身份证号',
+						phone:'手机号码', 
+						email:'电子邮箱',
+						country:'国家', 
+						province:'省', 
+						city:'市', 
+						county:'县', 
+						address:'详细地址', 
+						regTime:'注册时间'}
+				    wx.setStorageSync('userInfoxj', userInfo)
+					wx.switchTab({
+						url:'/pages/mine/mine'
+					})
 				}).catch(errors => {
+					console.log(errors, 'errors')
 					uni.$u.toast('请将信息填写完整')
 				})
 			},
@@ -260,19 +311,44 @@
 				this.form.code = '';
 				this.$refs.form.clearValidate();
 			},
-			// 刷新验证码
+			// 换验证码
 			updateImageCode() {
-			  // this.mcaptcha.refresh();
-				createCanvas({
-					el: 'canvas',
-					width: 140,
-					height: 80,
-					createCodeImg: "",
-				}, this).then(res => {
-					this.canvasImgUrl = res;
-					console.log('绘画')
-				})
+				this.fetchCodeURl()
 			},
+			// 获取验证码
+			fetchCodeURl() {
+				var that = this
+				that.timeStr = new Date().getTime()
+				wx.request({
+				  url: 'https://www.xjwljb.com/webserver/captchaController/generateVerifyCodeOfReport.do',
+				  method: 'GET',
+					data: {
+						timeStr: that.timeStr
+					},
+				  success(res) {
+						if(res.statusCode === 200) {
+							that.codeUrl = res.data
+						}
+				  },
+				  fail(err) {
+						console.log('fail', err)
+				    reject(err);
+				  },
+				});
+			},
+			// // 刷新验证码
+			// updateImageCode() {
+			//   // this.mcaptcha.refresh();
+			// 	createCanvas({
+			// 		el: 'canvas',
+			// 		width: 140,
+			// 		height: 80,
+			// 		createCodeImg: "",
+			// 	}, this).then(res => {
+			// 		this.canvasImgUrl = res;
+			// 		console.log('绘画')
+			// 	})
+			// },
 			//拒绝注册须知, 返回上一页
 			refuse(val) {
 				wx.navigateBack()
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index 2605880..0cc0d7d 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -3,23 +3,26 @@
 		<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.infoSource}}
 				</u-form-item>
 				<u-form-item label="举报时间" prop="visitorName" labelWidth="100" borderBottom>
-					{{form.time}}
+					{{stamp2Time(form.createTime)}}
 				</u-form-item>
 				<u-form-item label="分数" prop="visitorIdCard" borderBottom labelWidth="100">
 					{{form.score}}
@@ -30,31 +33,88 @@
 </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', // 分数
 				},
+			    reportTypeList:[
+					{
+						id: 1,
+						label: '涉领导人类'
+					},
+					{
+						id: 2,
+						label: '涉党军政类'
+					},
+					{
+						id: 3,
+						label: '涉爆涉恐类'
+					},
+					{
+						id: 4,
+						label: '民族宗教类'
+					},
+					{
+						id: 5,
+						label: '治疆政策类'
+					},
+					{
+						id: 6,
+						label: '涉疆案（事）件类'
+					},
+					{
+						id:7,
+						label: '公共安全类'
+					},
+					{
+						id: 8,
+						label: '组织人事类'
+					},
+					{
+						id: 9,
+						label: '社会民生类'
+					},
+					{
+						id: 10,
+						label: '其他类'
+					},
+				]
 			}
 		},
+		// onLoad: function (option) { 
+		//         console.log(option); //打印出上个页面传递的参数。
+		//     },
 		mounted() {
-			const code = getLocationParams('code') // 举报号
-			console.log(code, 'lll')
+			const info = getLocationParams('info') // 举报号
 			//-------------用这个举报号去调搜索接口---获取详情
-			this.fetchData(code)
+			this.fetchData(JSON.parse(info))
 		},
 		methods: {
-			fetchData(code) {
+			fetchData(info) {
+				console.log(info, '举报详情')
 				// 调接口逻辑
-			}
+				// getReportDetail({reportNo: code}).then(res => {
+				// 	this.form = res
+				// 	this.form.reportType = this.reportTypeList.filter(item => item.id === this.form.reportType)[0]?.label
+				// 	console.log(res, '举报详情信息')
+				// }).catch((error) => {
+				// 	console.log(error)
+				// })
+				this.form = info
+				this.form.reportType = this.reportTypeList.filter(item => item.id === Number(this.form.reportType))[0]?.label
+				this.form.infoSource = this.form.infoSource === 0 ? '网站' : this.form.infoSource === 5 ? '其他' : '专项'
+			},
+			stamp2Time:stamp2Time,
 		}
 	}
 </script>
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 9d625fe..fabee13 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -713,13 +713,15 @@
 					} else {
 						infoSource = this.typeMapDict[this.reportType]
 					}
+					// 登录的用户使用
+					const userinfo = wx.getStorageSync('userInfoxj')
 					// ------------------------------------------------------------------------------------------
 					const submitParams = {
 						"anonymousUserInfo.name": this.form.reportName, // 举报人
 						"anonymousUserInfo.phone": this.form.phone,// 手机号
 						"anonymousUserInfo.email": '', //email
-						"reportInfo.reportUser": this.form.reportName,//举报人
-						"reportInfo.reportName": this.form.reportName,// 举报人
+						"reportInfo.reportUser": userinfo.account ? userinfo.account : '',//举报人
+						"reportInfo.reportName": userinfo.account ? userinfo.name : userinfo.account || '',// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
 						"reportInfo.infoSource": infoSource, // 网站举报（必填固定不变）
 						"reportInfo.infoType": '1', //（三种类型举报都传递1）
@@ -752,6 +754,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,
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 53eb47e..84bbeca 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -55,6 +55,25 @@
 				</view>
 			</view>
 		</view>
+		<!-- 登录弹窗提醒 -->
+			<u-modal
+			    :show="showMessage"
+			    v-model="showMessage"
+				title="登录提醒" 
+				content='您还未登录,点击去登录'
+				:title-style="{
+					color: '#408bf6',
+				}"
+				:content-style = "{
+					'text-align': 'center'
+				}"
+				:show-cancel-button="true"
+				@confirm="confirm"
+				@cancel="cancel"
+				confirmColor="#408bf6"
+				confirmText="登录"
+				cancelText="取消"></u-modal
+			>
 	</view>
 </template>
 
@@ -78,9 +97,26 @@
 				],
 				phone: '0991-2384777',
 				nickName: '微信用户',
+				showMessage: false, // 登录提示
+			}
+		},
+		onReady() {
+			// 同步存储
+			// wx.setStorageSync('list1', {name:"name",age:5})
+			// 读取本地数据
+			// 在小程序中可以通过wx.getStorage/wx.getStorageSync将数据存储到本地。
+			// 判断用户用户有无登录
+			console.log( wx.getStorageSync('userInfoxj'), '123123')
+			if (wx.getStorageSync('userInfoxj')) {
+				// 已经登陆
+				this.showMessage = false
+			} else {
+				// 未登录
+				this.showMessage = true
 			}
 		},
 		mounted(){
+			console.log('我的页面挂载')
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
@@ -100,6 +136,22 @@
 			}
 		},
 		methods: {
+			//拒绝登录
+			cancel(val) {
+				//  返回首页
+				wx.switchTab({
+					url:'/pages/index/index'
+				})
+			},
+			// 点击去登录
+			confirm() {
+				// wx.navigateTo({
+				// 	url: '/packageA/accountBound/accountBound'
+				// })
+				wx.redirectTo({
+				   url:'/packageA/accountBound/accountBound'
+				 })
+			},
 			// 点击举报电话
 			call() {
 				wx.makePhoneCall({