diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->
diff --git a/packageC/components/noticeList.vue b/packageC/components/noticeList.vue
index 5f8781b..ebe3452 100644
--- a/packageC/components/noticeList.vue
+++ b/packageC/components/noticeList.vue
@@ -37,8 +37,9 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			},
 		}

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->
diff --git a/packageC/components/noticeList.vue b/packageC/components/noticeList.vue
index 5f8781b..ebe3452 100644
--- a/packageC/components/noticeList.vue
+++ b/packageC/components/noticeList.vue
@@ -37,8 +37,9 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageC/components/rumorList.vue b/packageC/components/rumorList.vue
index ec1985d..ed4bb94 100644
--- a/packageC/components/rumorList.vue
+++ b/packageC/components/rumorList.vue
@@ -3,9 +3,20 @@
 		<view class="rumor-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="imgUrl" style="width: 120px;height: 100px;flex-shrink: 0;" mode=""></image>
+			<!-- <view class="" @click.stop>
+				<image 
+					:src="item.contentSmallImage || this.imgUrl" 
+					style="width: 112px;height: 100px;flex-shrink: 0;" 
+					mode=""
+					@click="preImage(item.contentSmallImage)" 
+					:show-menu-by-longpress="true">
+				</image>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -20,14 +31,24 @@
 		data() {
 			return {
 				imgUrl: 'http://111.198.10.15:11604/png/rumor.png',
-				
 			}
 		},
 		
 		methods: {
 			handleClick(val) {
+				// wx.navigateTo({
+				// 	url: '/packageC/rumorDetail/rumorDetail'
+				// })
+				const url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+				})
+			},
+			// 图片预览
+			preImage(src) {
+				wx.previewImage({
+					current: src, // 当前显示图片的http链接
+					urls: [src] // 需要预览的图片http链接列表
 				})
 			}
 		}
@@ -44,7 +65,7 @@
 			justify-content: space-between;
 			align-items: center;
 			width: 100%;
-			height: 240rpx;
+			height: 280rpx;
 			padding: 20rpx 32rpx;
 			background-color: #fff;
 			box-sizing: border-box;

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->
diff --git a/packageC/components/noticeList.vue b/packageC/components/noticeList.vue
index 5f8781b..ebe3452 100644
--- a/packageC/components/noticeList.vue
+++ b/packageC/components/noticeList.vue
@@ -37,8 +37,9 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageC/components/rumorList.vue b/packageC/components/rumorList.vue
index ec1985d..ed4bb94 100644
--- a/packageC/components/rumorList.vue
+++ b/packageC/components/rumorList.vue
@@ -3,9 +3,20 @@
 		<view class="rumor-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="imgUrl" style="width: 120px;height: 100px;flex-shrink: 0;" mode=""></image>
+			<!-- <view class="" @click.stop>
+				<image 
+					:src="item.contentSmallImage || this.imgUrl" 
+					style="width: 112px;height: 100px;flex-shrink: 0;" 
+					mode=""
+					@click="preImage(item.contentSmallImage)" 
+					:show-menu-by-longpress="true">
+				</image>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -20,14 +31,24 @@
 		data() {
 			return {
 				imgUrl: 'http://111.198.10.15:11604/png/rumor.png',
-				
 			}
 		},
 		
 		methods: {
 			handleClick(val) {
+				// wx.navigateTo({
+				// 	url: '/packageC/rumorDetail/rumorDetail'
+				// })
+				const url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+				})
+			},
+			// 图片预览
+			preImage(src) {
+				wx.previewImage({
+					current: src, // 当前显示图片的http链接
+					urls: [src] // 需要预览的图片http链接列表
 				})
 			}
 		}
@@ -44,7 +65,7 @@
 			justify-content: space-between;
 			align-items: center;
 			width: 100%;
-			height: 240rpx;
+			height: 280rpx;
 			padding: 20rpx 32rpx;
 			background-color: #fff;
 			box-sizing: border-box;
diff --git a/packageC/notice/notice.vue b/packageC/notice/notice.vue
index ec1c858..1784152 100644
--- a/packageC/notice/notice.vue
+++ b/packageC/notice/notice.vue
@@ -1,7 +1,7 @@
 <!-- 通知公告列表页 -->
 <template>
 	<view class="notice-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
@@ -23,8 +23,7 @@
 		<view class="rumor-area">
 			<NoticeList :list="noticeList"/>
 		</view>
-		<u-loading-icon :show="loadingMore" color="#0043ac" textColor="#0043ac" text="加载中" textSize="16"></u-loading-icon>
-		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" "/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -65,7 +64,7 @@
 				scrollTop: 0,
 				noticeList: [] ,// 列表数据
 				pageIndex: 1, // 请求第几页
-				loadingMore: false, // 是否显示加载中
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -77,9 +76,9 @@
 		},
 		//上滑加载
 		onReachBottom() {
-			this.loadingMore = true
-			this.fetchNoticeList();
+			this.loadingMoreStatus = 'loading'
 			this.pageIndex = this.pageIndex + 1
+			this.fetchNoticeList();
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -113,6 +112,7 @@
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			// 点击搜索
 			search() {
 				
 			},
@@ -120,23 +120,26 @@
 			fetchNoticeList() {
 				const param = {
 					pageIndex: this.pageIndex, //当前页数（必传）
-					pageSize: 2, //每页数 （必传）
+					pageSize: 10, //每页数 （必传）
 					yuzhong: 'zh',//（必传）固定值
 					siteRoleCode: 'xjwljb', //（必传）固定值
 					catalogCode: 'tzgg', //（必传）固定值
 				}
 				getNoticeList(param).then(res => {
-					const list = res.map(item => {
+					let list = []
+					list = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate),
 							linkAddr: item.linkAddr
 						}
 					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
 					this.noticeList = this.noticeList.concat(list)
-					this.loadingMore = false
-					console.log('this.noticeList')
-					console.log(this.noticeList)
 				})
 			},
 		}

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->
diff --git a/packageC/components/noticeList.vue b/packageC/components/noticeList.vue
index 5f8781b..ebe3452 100644
--- a/packageC/components/noticeList.vue
+++ b/packageC/components/noticeList.vue
@@ -37,8 +37,9 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageC/components/rumorList.vue b/packageC/components/rumorList.vue
index ec1985d..ed4bb94 100644
--- a/packageC/components/rumorList.vue
+++ b/packageC/components/rumorList.vue
@@ -3,9 +3,20 @@
 		<view class="rumor-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="imgUrl" style="width: 120px;height: 100px;flex-shrink: 0;" mode=""></image>
+			<!-- <view class="" @click.stop>
+				<image 
+					:src="item.contentSmallImage || this.imgUrl" 
+					style="width: 112px;height: 100px;flex-shrink: 0;" 
+					mode=""
+					@click="preImage(item.contentSmallImage)" 
+					:show-menu-by-longpress="true">
+				</image>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -20,14 +31,24 @@
 		data() {
 			return {
 				imgUrl: 'http://111.198.10.15:11604/png/rumor.png',
-				
 			}
 		},
 		
 		methods: {
 			handleClick(val) {
+				// wx.navigateTo({
+				// 	url: '/packageC/rumorDetail/rumorDetail'
+				// })
+				const url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+				})
+			},
+			// 图片预览
+			preImage(src) {
+				wx.previewImage({
+					current: src, // 当前显示图片的http链接
+					urls: [src] // 需要预览的图片http链接列表
 				})
 			}
 		}
@@ -44,7 +65,7 @@
 			justify-content: space-between;
 			align-items: center;
 			width: 100%;
-			height: 240rpx;
+			height: 280rpx;
 			padding: 20rpx 32rpx;
 			background-color: #fff;
 			box-sizing: border-box;
diff --git a/packageC/notice/notice.vue b/packageC/notice/notice.vue
index ec1c858..1784152 100644
--- a/packageC/notice/notice.vue
+++ b/packageC/notice/notice.vue
@@ -1,7 +1,7 @@
 <!-- 通知公告列表页 -->
 <template>
 	<view class="notice-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
@@ -23,8 +23,7 @@
 		<view class="rumor-area">
 			<NoticeList :list="noticeList"/>
 		</view>
-		<u-loading-icon :show="loadingMore" color="#0043ac" textColor="#0043ac" text="加载中" textSize="16"></u-loading-icon>
-		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" "/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -65,7 +64,7 @@
 				scrollTop: 0,
 				noticeList: [] ,// 列表数据
 				pageIndex: 1, // 请求第几页
-				loadingMore: false, // 是否显示加载中
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -77,9 +76,9 @@
 		},
 		//上滑加载
 		onReachBottom() {
-			this.loadingMore = true
-			this.fetchNoticeList();
+			this.loadingMoreStatus = 'loading'
 			this.pageIndex = this.pageIndex + 1
+			this.fetchNoticeList();
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -113,6 +112,7 @@
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			// 点击搜索
 			search() {
 				
 			},
@@ -120,23 +120,26 @@
 			fetchNoticeList() {
 				const param = {
 					pageIndex: this.pageIndex, //当前页数（必传）
-					pageSize: 2, //每页数 （必传）
+					pageSize: 10, //每页数 （必传）
 					yuzhong: 'zh',//（必传）固定值
 					siteRoleCode: 'xjwljb', //（必传）固定值
 					catalogCode: 'tzgg', //（必传）固定值
 				}
 				getNoticeList(param).then(res => {
-					const list = res.map(item => {
+					let list = []
+					list = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate),
 							linkAddr: item.linkAddr
 						}
 					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
 					this.noticeList = this.noticeList.concat(list)
-					this.loadingMore = false
-					console.log('this.noticeList')
-					console.log(this.noticeList)
 				})
 			},
 		}
diff --git a/packageC/rumorInfo/rumorInfo.vue b/packageC/rumorInfo/rumorInfo.vue
index b88c945..cf81b1d 100644
--- a/packageC/rumorInfo/rumorInfo.vue
+++ b/packageC/rumorInfo/rumorInfo.vue
@@ -1,6 +1,7 @@
+<!-- 辟谣信息列表页 -->
 <template>
 	<view class="rumor-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">谣言曝光台</view>
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
@@ -9,7 +10,7 @@
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -27,7 +28,7 @@
 		<view class="rumor-area">
 			<RumorList :list="rumorList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'"/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -56,15 +57,20 @@
 
 <script>
 	import RumorList from '../components/rumorList.vue'
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	export default {
 		components: {
 			RumorList
 		},
 		data() {
 			return {
+				keyword: '', // 搜索关键字
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				rumorList: [] // 列表数据
+				rumorList: [], // 列表数据
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -72,40 +78,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.rumorList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-			]
+			this.fetchPyxxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -121,13 +94,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchPyxxList(this.keyword);
+		},
 		watch: {
 			rumorList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -140,7 +121,46 @@
 		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.rumorList = []
+				this.pageIndex = 1
+				this.fetchPyxxList(this.keyword)
+			},
+			// 获取辟谣信息---对应联合辟谣平台的权威发布
+			fetchPyxxList(title = '') {
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'qwfb', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.rumorList = this.rumorList.concat(list)
+				})
 			},
 		}
 	}

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->
diff --git a/packageC/components/noticeList.vue b/packageC/components/noticeList.vue
index 5f8781b..ebe3452 100644
--- a/packageC/components/noticeList.vue
+++ b/packageC/components/noticeList.vue
@@ -37,8 +37,9 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageC/components/rumorList.vue b/packageC/components/rumorList.vue
index ec1985d..ed4bb94 100644
--- a/packageC/components/rumorList.vue
+++ b/packageC/components/rumorList.vue
@@ -3,9 +3,20 @@
 		<view class="rumor-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="imgUrl" style="width: 120px;height: 100px;flex-shrink: 0;" mode=""></image>
+			<!-- <view class="" @click.stop>
+				<image 
+					:src="item.contentSmallImage || this.imgUrl" 
+					style="width: 112px;height: 100px;flex-shrink: 0;" 
+					mode=""
+					@click="preImage(item.contentSmallImage)" 
+					:show-menu-by-longpress="true">
+				</image>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -20,14 +31,24 @@
 		data() {
 			return {
 				imgUrl: 'http://111.198.10.15:11604/png/rumor.png',
-				
 			}
 		},
 		
 		methods: {
 			handleClick(val) {
+				// wx.navigateTo({
+				// 	url: '/packageC/rumorDetail/rumorDetail'
+				// })
+				const url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+				})
+			},
+			// 图片预览
+			preImage(src) {
+				wx.previewImage({
+					current: src, // 当前显示图片的http链接
+					urls: [src] // 需要预览的图片http链接列表
 				})
 			}
 		}
@@ -44,7 +65,7 @@
 			justify-content: space-between;
 			align-items: center;
 			width: 100%;
-			height: 240rpx;
+			height: 280rpx;
 			padding: 20rpx 32rpx;
 			background-color: #fff;
 			box-sizing: border-box;
diff --git a/packageC/notice/notice.vue b/packageC/notice/notice.vue
index ec1c858..1784152 100644
--- a/packageC/notice/notice.vue
+++ b/packageC/notice/notice.vue
@@ -1,7 +1,7 @@
 <!-- 通知公告列表页 -->
 <template>
 	<view class="notice-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
@@ -23,8 +23,7 @@
 		<view class="rumor-area">
 			<NoticeList :list="noticeList"/>
 		</view>
-		<u-loading-icon :show="loadingMore" color="#0043ac" textColor="#0043ac" text="加载中" textSize="16"></u-loading-icon>
-		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" "/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -65,7 +64,7 @@
 				scrollTop: 0,
 				noticeList: [] ,// 列表数据
 				pageIndex: 1, // 请求第几页
-				loadingMore: false, // 是否显示加载中
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -77,9 +76,9 @@
 		},
 		//上滑加载
 		onReachBottom() {
-			this.loadingMore = true
-			this.fetchNoticeList();
+			this.loadingMoreStatus = 'loading'
 			this.pageIndex = this.pageIndex + 1
+			this.fetchNoticeList();
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -113,6 +112,7 @@
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			// 点击搜索
 			search() {
 				
 			},
@@ -120,23 +120,26 @@
 			fetchNoticeList() {
 				const param = {
 					pageIndex: this.pageIndex, //当前页数（必传）
-					pageSize: 2, //每页数 （必传）
+					pageSize: 10, //每页数 （必传）
 					yuzhong: 'zh',//（必传）固定值
 					siteRoleCode: 'xjwljb', //（必传）固定值
 					catalogCode: 'tzgg', //（必传）固定值
 				}
 				getNoticeList(param).then(res => {
-					const list = res.map(item => {
+					let list = []
+					list = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate),
 							linkAddr: item.linkAddr
 						}
 					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
 					this.noticeList = this.noticeList.concat(list)
-					this.loadingMore = false
-					console.log('this.noticeList')
-					console.log(this.noticeList)
 				})
 			},
 		}
diff --git a/packageC/rumorInfo/rumorInfo.vue b/packageC/rumorInfo/rumorInfo.vue
index b88c945..cf81b1d 100644
--- a/packageC/rumorInfo/rumorInfo.vue
+++ b/packageC/rumorInfo/rumorInfo.vue
@@ -1,6 +1,7 @@
+<!-- 辟谣信息列表页 -->
 <template>
 	<view class="rumor-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">谣言曝光台</view>
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
@@ -9,7 +10,7 @@
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -27,7 +28,7 @@
 		<view class="rumor-area">
 			<RumorList :list="rumorList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'"/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -56,15 +57,20 @@
 
 <script>
 	import RumorList from '../components/rumorList.vue'
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	export default {
 		components: {
 			RumorList
 		},
 		data() {
 			return {
+				keyword: '', // 搜索关键字
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				rumorList: [] // 列表数据
+				rumorList: [], // 列表数据
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -72,40 +78,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.rumorList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-			]
+			this.fetchPyxxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -121,13 +94,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchPyxxList(this.keyword);
+		},
 		watch: {
 			rumorList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -140,7 +121,46 @@
 		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.rumorList = []
+				this.pageIndex = 1
+				this.fetchPyxxList(this.keyword)
+			},
+			// 获取辟谣信息---对应联合辟谣平台的权威发布
+			fetchPyxxList(title = '') {
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'qwfb', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.rumorList = this.rumorList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageC/rumorWebView/rumorWebView.vue b/packageC/rumorWebView/rumorWebView.vue
index be4d32c..5b21564 100644
--- a/packageC/rumorWebView/rumorWebView.vue
+++ b/packageC/rumorWebView/rumorWebView.vue
@@ -1,5 +1,5 @@
 <template>
-	<web-view :src="url" ></web-view>
+	<web-view :src="getUrl" ></web-view>
 </template>
 
 <script>
@@ -7,11 +7,11 @@
 	export default {
 		data() {
 			return {
-				url: ''
+				getUrl: ''
 			}
 		},
 		mounted() {
-			this.url = decodeURIComponent(getLocationParams('url'));
+			this.getUrl = decodeURIComponent(getLocationParams('url'));
 		},
 	}
 </script>

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->
diff --git a/packageC/components/noticeList.vue b/packageC/components/noticeList.vue
index 5f8781b..ebe3452 100644
--- a/packageC/components/noticeList.vue
+++ b/packageC/components/noticeList.vue
@@ -37,8 +37,9 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageC/components/rumorList.vue b/packageC/components/rumorList.vue
index ec1985d..ed4bb94 100644
--- a/packageC/components/rumorList.vue
+++ b/packageC/components/rumorList.vue
@@ -3,9 +3,20 @@
 		<view class="rumor-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="imgUrl" style="width: 120px;height: 100px;flex-shrink: 0;" mode=""></image>
+			<!-- <view class="" @click.stop>
+				<image 
+					:src="item.contentSmallImage || this.imgUrl" 
+					style="width: 112px;height: 100px;flex-shrink: 0;" 
+					mode=""
+					@click="preImage(item.contentSmallImage)" 
+					:show-menu-by-longpress="true">
+				</image>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -20,14 +31,24 @@
 		data() {
 			return {
 				imgUrl: 'http://111.198.10.15:11604/png/rumor.png',
-				
 			}
 		},
 		
 		methods: {
 			handleClick(val) {
+				// wx.navigateTo({
+				// 	url: '/packageC/rumorDetail/rumorDetail'
+				// })
+				const url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+				})
+			},
+			// 图片预览
+			preImage(src) {
+				wx.previewImage({
+					current: src, // 当前显示图片的http链接
+					urls: [src] // 需要预览的图片http链接列表
 				})
 			}
 		}
@@ -44,7 +65,7 @@
 			justify-content: space-between;
 			align-items: center;
 			width: 100%;
-			height: 240rpx;
+			height: 280rpx;
 			padding: 20rpx 32rpx;
 			background-color: #fff;
 			box-sizing: border-box;
diff --git a/packageC/notice/notice.vue b/packageC/notice/notice.vue
index ec1c858..1784152 100644
--- a/packageC/notice/notice.vue
+++ b/packageC/notice/notice.vue
@@ -1,7 +1,7 @@
 <!-- 通知公告列表页 -->
 <template>
 	<view class="notice-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
@@ -23,8 +23,7 @@
 		<view class="rumor-area">
 			<NoticeList :list="noticeList"/>
 		</view>
-		<u-loading-icon :show="loadingMore" color="#0043ac" textColor="#0043ac" text="加载中" textSize="16"></u-loading-icon>
-		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" "/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -65,7 +64,7 @@
 				scrollTop: 0,
 				noticeList: [] ,// 列表数据
 				pageIndex: 1, // 请求第几页
-				loadingMore: false, // 是否显示加载中
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -77,9 +76,9 @@
 		},
 		//上滑加载
 		onReachBottom() {
-			this.loadingMore = true
-			this.fetchNoticeList();
+			this.loadingMoreStatus = 'loading'
 			this.pageIndex = this.pageIndex + 1
+			this.fetchNoticeList();
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -113,6 +112,7 @@
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			// 点击搜索
 			search() {
 				
 			},
@@ -120,23 +120,26 @@
 			fetchNoticeList() {
 				const param = {
 					pageIndex: this.pageIndex, //当前页数（必传）
-					pageSize: 2, //每页数 （必传）
+					pageSize: 10, //每页数 （必传）
 					yuzhong: 'zh',//（必传）固定值
 					siteRoleCode: 'xjwljb', //（必传）固定值
 					catalogCode: 'tzgg', //（必传）固定值
 				}
 				getNoticeList(param).then(res => {
-					const list = res.map(item => {
+					let list = []
+					list = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate),
 							linkAddr: item.linkAddr
 						}
 					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
 					this.noticeList = this.noticeList.concat(list)
-					this.loadingMore = false
-					console.log('this.noticeList')
-					console.log(this.noticeList)
 				})
 			},
 		}
diff --git a/packageC/rumorInfo/rumorInfo.vue b/packageC/rumorInfo/rumorInfo.vue
index b88c945..cf81b1d 100644
--- a/packageC/rumorInfo/rumorInfo.vue
+++ b/packageC/rumorInfo/rumorInfo.vue
@@ -1,6 +1,7 @@
+<!-- 辟谣信息列表页 -->
 <template>
 	<view class="rumor-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">谣言曝光台</view>
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
@@ -9,7 +10,7 @@
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -27,7 +28,7 @@
 		<view class="rumor-area">
 			<RumorList :list="rumorList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'"/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -56,15 +57,20 @@
 
 <script>
 	import RumorList from '../components/rumorList.vue'
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	export default {
 		components: {
 			RumorList
 		},
 		data() {
 			return {
+				keyword: '', // 搜索关键字
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				rumorList: [] // 列表数据
+				rumorList: [], // 列表数据
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -72,40 +78,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.rumorList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-			]
+			this.fetchPyxxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -121,13 +94,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchPyxxList(this.keyword);
+		},
 		watch: {
 			rumorList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -140,7 +121,46 @@
 		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.rumorList = []
+				this.pageIndex = 1
+				this.fetchPyxxList(this.keyword)
+			},
+			// 获取辟谣信息---对应联合辟谣平台的权威发布
+			fetchPyxxList(title = '') {
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'qwfb', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.rumorList = this.rumorList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageC/rumorWebView/rumorWebView.vue b/packageC/rumorWebView/rumorWebView.vue
index be4d32c..5b21564 100644
--- a/packageC/rumorWebView/rumorWebView.vue
+++ b/packageC/rumorWebView/rumorWebView.vue
@@ -1,5 +1,5 @@
 <template>
-	<web-view :src="url" ></web-view>
+	<web-view :src="getUrl" ></web-view>
 </template>
 
 <script>
@@ -7,11 +7,11 @@
 	export default {
 		data() {
 			return {
-				url: ''
+				getUrl: ''
 			}
 		},
 		mounted() {
-			this.url = decodeURIComponent(getLocationParams('url'));
+			this.getUrl = decodeURIComponent(getLocationParams('url'));
 		},
 	}
 </script>
diff --git a/pages.json b/pages.json
index 486c1be..b51fd14 100644
--- a/pages.json
+++ b/pages.json
@@ -4,7 +4,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"navigationBarBackgroundColor": "#4390f7",
+				"navigationBarBackgroundColor": "#398ae4",
 				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false
 			}
@@ -14,7 +14,7 @@
 				"style" :                                                                                    
 				{
 					"navigationBarTitleText": "我的",
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white",
 					"enablePullDownRefresh": false
 				}      
@@ -25,7 +25,7 @@
 				{
 					"navigationBarTitleText": "侵权举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -35,7 +35,7 @@
 				{
 					"navigationBarTitleText": "谣言查证",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white",
 					"disableScroll": true
 				}
@@ -44,8 +44,8 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "新疆网络举报",
-		"navigationBarBackgroundColor": "#4390f7"
-		// "backgroundColor": "#4390f7"
+		"navigationBarBackgroundColor": "#398ae4"
+		// "backgroundColor": "#398ae4"
 	},
 	"tabBar": {
 		"color": "#424242",
@@ -88,7 +88,7 @@
 				{
 					"navigationBarTitleText": "账号信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}		
 			},
@@ -125,7 +125,7 @@
 				{
 					"navigationBarTitleText": "我的举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -135,7 +135,7 @@
 				{
 					"navigationBarTitleText": "侵权指引",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -145,11 +145,21 @@
 				{
 					"navigationBarTitleText": "案例警醒",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path" : "phones/phones",
+				"style" :                                                                                    
+				{
+					"navigationBarTitleText": "举报电话",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			}
-		]
+			]
 	},
 	{
 		"root": "packageB",//分包名
@@ -160,7 +170,7 @@
 				{
 					"navigationBarTitleText": "举报指南",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -170,7 +180,7 @@
 				{
 					"navigationBarTitleText": "举报查询",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -180,7 +190,7 @@
 				{
 					"navigationBarTitleText": "详细信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -190,7 +200,7 @@
 				{
 					"navigationBarTitleText": "我要举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -200,7 +210,7 @@
 					{
 						"navigationBarTitleText": "发布举报",
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#4390f7",
+						"navigationBarBackgroundColor": "#398ae4",
 						"navigationBarTextStyle": "white"
 					}
 			},
@@ -210,7 +220,7 @@
 				{
 					"navigationBarTitleText": "网信信息列表",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -229,7 +239,7 @@
 				{
 					"navigationBarTitleText": "申请流程",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			}
@@ -242,7 +252,7 @@
 				"path" : "rumorWebView/rumorWebView",
 				"style" :                                                                                    
 				{
-					"navigationBarTitleText": "辟谣信息",
+					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false
 				}
 			},
@@ -252,7 +262,7 @@
 				{
 					"navigationBarTitleText": "辟谣信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -272,7 +282,7 @@
 					{
 						"navigationBarTitleText": "通知公告",
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#4390f7",
+						"navigationBarBackgroundColor": "#398ae4",
 						"navigationBarTextStyle": "white"
 					}
 				}

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->
diff --git a/packageC/components/noticeList.vue b/packageC/components/noticeList.vue
index 5f8781b..ebe3452 100644
--- a/packageC/components/noticeList.vue
+++ b/packageC/components/noticeList.vue
@@ -37,8 +37,9 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageC/components/rumorList.vue b/packageC/components/rumorList.vue
index ec1985d..ed4bb94 100644
--- a/packageC/components/rumorList.vue
+++ b/packageC/components/rumorList.vue
@@ -3,9 +3,20 @@
 		<view class="rumor-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="imgUrl" style="width: 120px;height: 100px;flex-shrink: 0;" mode=""></image>
+			<!-- <view class="" @click.stop>
+				<image 
+					:src="item.contentSmallImage || this.imgUrl" 
+					style="width: 112px;height: 100px;flex-shrink: 0;" 
+					mode=""
+					@click="preImage(item.contentSmallImage)" 
+					:show-menu-by-longpress="true">
+				</image>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -20,14 +31,24 @@
 		data() {
 			return {
 				imgUrl: 'http://111.198.10.15:11604/png/rumor.png',
-				
 			}
 		},
 		
 		methods: {
 			handleClick(val) {
+				// wx.navigateTo({
+				// 	url: '/packageC/rumorDetail/rumorDetail'
+				// })
+				const url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+				})
+			},
+			// 图片预览
+			preImage(src) {
+				wx.previewImage({
+					current: src, // 当前显示图片的http链接
+					urls: [src] // 需要预览的图片http链接列表
 				})
 			}
 		}
@@ -44,7 +65,7 @@
 			justify-content: space-between;
 			align-items: center;
 			width: 100%;
-			height: 240rpx;
+			height: 280rpx;
 			padding: 20rpx 32rpx;
 			background-color: #fff;
 			box-sizing: border-box;
diff --git a/packageC/notice/notice.vue b/packageC/notice/notice.vue
index ec1c858..1784152 100644
--- a/packageC/notice/notice.vue
+++ b/packageC/notice/notice.vue
@@ -1,7 +1,7 @@
 <!-- 通知公告列表页 -->
 <template>
 	<view class="notice-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
@@ -23,8 +23,7 @@
 		<view class="rumor-area">
 			<NoticeList :list="noticeList"/>
 		</view>
-		<u-loading-icon :show="loadingMore" color="#0043ac" textColor="#0043ac" text="加载中" textSize="16"></u-loading-icon>
-		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" "/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -65,7 +64,7 @@
 				scrollTop: 0,
 				noticeList: [] ,// 列表数据
 				pageIndex: 1, // 请求第几页
-				loadingMore: false, // 是否显示加载中
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -77,9 +76,9 @@
 		},
 		//上滑加载
 		onReachBottom() {
-			this.loadingMore = true
-			this.fetchNoticeList();
+			this.loadingMoreStatus = 'loading'
 			this.pageIndex = this.pageIndex + 1
+			this.fetchNoticeList();
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -113,6 +112,7 @@
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			// 点击搜索
 			search() {
 				
 			},
@@ -120,23 +120,26 @@
 			fetchNoticeList() {
 				const param = {
 					pageIndex: this.pageIndex, //当前页数（必传）
-					pageSize: 2, //每页数 （必传）
+					pageSize: 10, //每页数 （必传）
 					yuzhong: 'zh',//（必传）固定值
 					siteRoleCode: 'xjwljb', //（必传）固定值
 					catalogCode: 'tzgg', //（必传）固定值
 				}
 				getNoticeList(param).then(res => {
-					const list = res.map(item => {
+					let list = []
+					list = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate),
 							linkAddr: item.linkAddr
 						}
 					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
 					this.noticeList = this.noticeList.concat(list)
-					this.loadingMore = false
-					console.log('this.noticeList')
-					console.log(this.noticeList)
 				})
 			},
 		}
diff --git a/packageC/rumorInfo/rumorInfo.vue b/packageC/rumorInfo/rumorInfo.vue
index b88c945..cf81b1d 100644
--- a/packageC/rumorInfo/rumorInfo.vue
+++ b/packageC/rumorInfo/rumorInfo.vue
@@ -1,6 +1,7 @@
+<!-- 辟谣信息列表页 -->
 <template>
 	<view class="rumor-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">谣言曝光台</view>
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
@@ -9,7 +10,7 @@
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -27,7 +28,7 @@
 		<view class="rumor-area">
 			<RumorList :list="rumorList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'"/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -56,15 +57,20 @@
 
 <script>
 	import RumorList from '../components/rumorList.vue'
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	export default {
 		components: {
 			RumorList
 		},
 		data() {
 			return {
+				keyword: '', // 搜索关键字
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				rumorList: [] // 列表数据
+				rumorList: [], // 列表数据
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -72,40 +78,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.rumorList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-			]
+			this.fetchPyxxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -121,13 +94,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchPyxxList(this.keyword);
+		},
 		watch: {
 			rumorList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -140,7 +121,46 @@
 		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.rumorList = []
+				this.pageIndex = 1
+				this.fetchPyxxList(this.keyword)
+			},
+			// 获取辟谣信息---对应联合辟谣平台的权威发布
+			fetchPyxxList(title = '') {
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'qwfb', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.rumorList = this.rumorList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageC/rumorWebView/rumorWebView.vue b/packageC/rumorWebView/rumorWebView.vue
index be4d32c..5b21564 100644
--- a/packageC/rumorWebView/rumorWebView.vue
+++ b/packageC/rumorWebView/rumorWebView.vue
@@ -1,5 +1,5 @@
 <template>
-	<web-view :src="url" ></web-view>
+	<web-view :src="getUrl" ></web-view>
 </template>
 
 <script>
@@ -7,11 +7,11 @@
 	export default {
 		data() {
 			return {
-				url: ''
+				getUrl: ''
 			}
 		},
 		mounted() {
-			this.url = decodeURIComponent(getLocationParams('url'));
+			this.getUrl = decodeURIComponent(getLocationParams('url'));
 		},
 	}
 </script>
diff --git a/pages.json b/pages.json
index 486c1be..b51fd14 100644
--- a/pages.json
+++ b/pages.json
@@ -4,7 +4,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"navigationBarBackgroundColor": "#4390f7",
+				"navigationBarBackgroundColor": "#398ae4",
 				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false
 			}
@@ -14,7 +14,7 @@
 				"style" :                                                                                    
 				{
 					"navigationBarTitleText": "我的",
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white",
 					"enablePullDownRefresh": false
 				}      
@@ -25,7 +25,7 @@
 				{
 					"navigationBarTitleText": "侵权举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -35,7 +35,7 @@
 				{
 					"navigationBarTitleText": "谣言查证",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white",
 					"disableScroll": true
 				}
@@ -44,8 +44,8 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "新疆网络举报",
-		"navigationBarBackgroundColor": "#4390f7"
-		// "backgroundColor": "#4390f7"
+		"navigationBarBackgroundColor": "#398ae4"
+		// "backgroundColor": "#398ae4"
 	},
 	"tabBar": {
 		"color": "#424242",
@@ -88,7 +88,7 @@
 				{
 					"navigationBarTitleText": "账号信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}		
 			},
@@ -125,7 +125,7 @@
 				{
 					"navigationBarTitleText": "我的举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -135,7 +135,7 @@
 				{
 					"navigationBarTitleText": "侵权指引",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -145,11 +145,21 @@
 				{
 					"navigationBarTitleText": "案例警醒",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path" : "phones/phones",
+				"style" :                                                                                    
+				{
+					"navigationBarTitleText": "举报电话",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			}
-		]
+			]
 	},
 	{
 		"root": "packageB",//分包名
@@ -160,7 +170,7 @@
 				{
 					"navigationBarTitleText": "举报指南",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -170,7 +180,7 @@
 				{
 					"navigationBarTitleText": "举报查询",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -180,7 +190,7 @@
 				{
 					"navigationBarTitleText": "详细信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -190,7 +200,7 @@
 				{
 					"navigationBarTitleText": "我要举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -200,7 +210,7 @@
 					{
 						"navigationBarTitleText": "发布举报",
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#4390f7",
+						"navigationBarBackgroundColor": "#398ae4",
 						"navigationBarTextStyle": "white"
 					}
 			},
@@ -210,7 +220,7 @@
 				{
 					"navigationBarTitleText": "网信信息列表",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -229,7 +239,7 @@
 				{
 					"navigationBarTitleText": "申请流程",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			}
@@ -242,7 +252,7 @@
 				"path" : "rumorWebView/rumorWebView",
 				"style" :                                                                                    
 				{
-					"navigationBarTitleText": "辟谣信息",
+					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false
 				}
 			},
@@ -252,7 +262,7 @@
 				{
 					"navigationBarTitleText": "辟谣信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -272,7 +282,7 @@
 					{
 						"navigationBarTitleText": "通知公告",
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#4390f7",
+						"navigationBarBackgroundColor": "#398ae4",
 						"navigationBarTextStyle": "white"
 					}
 				}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e40537e..42f4d21 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,7 +3,13 @@
 	<view class="index">
 		<!-- <div class='slideShine' style="position:absolute;top: 36rpx;left: 46rpx;z-index: -998;font-size: 50rpx;color: #fff;font-weight: 600;letter-spacing: 4rpx;">新疆网络举报</div> -->
 		<!-- <image style="width: 70px;height: 60px;position:absolute;top: 36rpx;left: 60rpx;z-index: -998" src="http://111.198.10.15:11604/png/share.png"></image> -->
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<view style="position:absolute;top: 36rpx;left: 20rpx;z-index: -998;">
+			<view style="color: #fff;display: flex;justify-content: center;align-items: center;font-size: 36rpx;font-weight: 600;letter-spacing: 2rpx;">
+				<image style="width: 49px;height: 42px;margin-right: 16rpx;" src="http://111.198.10.15:11604/png/share.png"/>
+				<text>新疆互联网违法和不良信息举报中心</text>
+			</view>
+		</view>
+		<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="swiper-area">
 			<swiper class="swiper-box" style="height: 300rpx;" :interval="3000" :indicator-dots="true" :autoplay="true" :circular="circular">
 				<swiper-item v-for="(item ,index) in swiperList" :key="index">
@@ -60,7 +66,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in tzggList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'tzgg')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -74,7 +80,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in pyxxList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'pyxx')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -88,7 +94,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in aljxList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'aljx')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -198,7 +204,7 @@
 					{
 						id: 'aljx',
 						name: '案例警醒',
-						value: 'tzggList'
+						value: 'aljxList'
 					},
 				]
 			}
@@ -210,6 +216,7 @@
 			});
 			this.fetchNoticeList() // 获取通知公告列表
 			this.fetchPyxxList() // 获取辟谣信息列表
+			this.fetchAljxList() // 案例警醒列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -270,7 +277,7 @@
 						url: '/packageC/rumorInfo/rumorInfo'
 					})
 				} 
-				if(id === 'tzgg') {
+				if(id === 'tzgg') { // 通知公告
 					wx.navigateTo({
 						url: '/packageC/notice/notice'
 					})
@@ -288,23 +295,50 @@
 				getNoticeList(param).then(res => {
 					this.tzggList = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate)
 						}
 					})
 				})
 			},
-			// 获取辟谣信息
+			// 获取辟谣信息--对应联合辟谣平台的权威发布
 			fetchPyxxList() {
 				const param = {
 					pageIndex: 1,
 					pageSize: 2,
-					siteRoleCode: 'zzqwxbPortal',
-					catalogCode: 'yykt'
+					// siteRoleCode: 'zzqwxbPortal',
+					// catalogCode: 'yykt'
+					siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+					catalogCode: 'qwfb', // 对应权威发布
 				}
 				getPyxxList(param).then(res => {
 					this.pyxxList = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title,
+							publishTime: stamp2Time(item.publishDate)
+						}
+					})
+				})
+			},
+			// 获取案例警醒--对应联合辟谣平台热点聚焦
+			fetchAljxList() {
+				const param = {
+					pageIndex: 1,
+					pageSize: 2,
+					// siteRoleCode: 'zzqwxbPortal',
+					// catalogCode: 'yykt'
+					siteRoleCode: 'zzqwxbPortal', // 对应热点聚焦
+					catalogCode: 'rdjj'
+				}
+				getPyxxList(param).then(res => {
+					this.aljxList = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate)
 						}
@@ -312,10 +346,17 @@
 				})
 			},
 			// 点击标题
-			clickTitle() {
-				console.log('点击标题')
+			clickTitle(val, type) {
+				let url = '';
+				if(type === 'tzgg') { // 通知公告
+					url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				} else if(type === 'pyxx') { // 辟谣信息
+					url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				} else { // 案例警醒
+					url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				}
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			}
 		}

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->
diff --git a/packageC/components/noticeList.vue b/packageC/components/noticeList.vue
index 5f8781b..ebe3452 100644
--- a/packageC/components/noticeList.vue
+++ b/packageC/components/noticeList.vue
@@ -37,8 +37,9 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageC/components/rumorList.vue b/packageC/components/rumorList.vue
index ec1985d..ed4bb94 100644
--- a/packageC/components/rumorList.vue
+++ b/packageC/components/rumorList.vue
@@ -3,9 +3,20 @@
 		<view class="rumor-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="imgUrl" style="width: 120px;height: 100px;flex-shrink: 0;" mode=""></image>
+			<!-- <view class="" @click.stop>
+				<image 
+					:src="item.contentSmallImage || this.imgUrl" 
+					style="width: 112px;height: 100px;flex-shrink: 0;" 
+					mode=""
+					@click="preImage(item.contentSmallImage)" 
+					:show-menu-by-longpress="true">
+				</image>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -20,14 +31,24 @@
 		data() {
 			return {
 				imgUrl: 'http://111.198.10.15:11604/png/rumor.png',
-				
 			}
 		},
 		
 		methods: {
 			handleClick(val) {
+				// wx.navigateTo({
+				// 	url: '/packageC/rumorDetail/rumorDetail'
+				// })
+				const url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+				})
+			},
+			// 图片预览
+			preImage(src) {
+				wx.previewImage({
+					current: src, // 当前显示图片的http链接
+					urls: [src] // 需要预览的图片http链接列表
 				})
 			}
 		}
@@ -44,7 +65,7 @@
 			justify-content: space-between;
 			align-items: center;
 			width: 100%;
-			height: 240rpx;
+			height: 280rpx;
 			padding: 20rpx 32rpx;
 			background-color: #fff;
 			box-sizing: border-box;
diff --git a/packageC/notice/notice.vue b/packageC/notice/notice.vue
index ec1c858..1784152 100644
--- a/packageC/notice/notice.vue
+++ b/packageC/notice/notice.vue
@@ -1,7 +1,7 @@
 <!-- 通知公告列表页 -->
 <template>
 	<view class="notice-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
@@ -23,8 +23,7 @@
 		<view class="rumor-area">
 			<NoticeList :list="noticeList"/>
 		</view>
-		<u-loading-icon :show="loadingMore" color="#0043ac" textColor="#0043ac" text="加载中" textSize="16"></u-loading-icon>
-		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" "/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -65,7 +64,7 @@
 				scrollTop: 0,
 				noticeList: [] ,// 列表数据
 				pageIndex: 1, // 请求第几页
-				loadingMore: false, // 是否显示加载中
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -77,9 +76,9 @@
 		},
 		//上滑加载
 		onReachBottom() {
-			this.loadingMore = true
-			this.fetchNoticeList();
+			this.loadingMoreStatus = 'loading'
 			this.pageIndex = this.pageIndex + 1
+			this.fetchNoticeList();
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -113,6 +112,7 @@
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			// 点击搜索
 			search() {
 				
 			},
@@ -120,23 +120,26 @@
 			fetchNoticeList() {
 				const param = {
 					pageIndex: this.pageIndex, //当前页数（必传）
-					pageSize: 2, //每页数 （必传）
+					pageSize: 10, //每页数 （必传）
 					yuzhong: 'zh',//（必传）固定值
 					siteRoleCode: 'xjwljb', //（必传）固定值
 					catalogCode: 'tzgg', //（必传）固定值
 				}
 				getNoticeList(param).then(res => {
-					const list = res.map(item => {
+					let list = []
+					list = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate),
 							linkAddr: item.linkAddr
 						}
 					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
 					this.noticeList = this.noticeList.concat(list)
-					this.loadingMore = false
-					console.log('this.noticeList')
-					console.log(this.noticeList)
 				})
 			},
 		}
diff --git a/packageC/rumorInfo/rumorInfo.vue b/packageC/rumorInfo/rumorInfo.vue
index b88c945..cf81b1d 100644
--- a/packageC/rumorInfo/rumorInfo.vue
+++ b/packageC/rumorInfo/rumorInfo.vue
@@ -1,6 +1,7 @@
+<!-- 辟谣信息列表页 -->
 <template>
 	<view class="rumor-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">谣言曝光台</view>
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
@@ -9,7 +10,7 @@
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -27,7 +28,7 @@
 		<view class="rumor-area">
 			<RumorList :list="rumorList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'"/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -56,15 +57,20 @@
 
 <script>
 	import RumorList from '../components/rumorList.vue'
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	export default {
 		components: {
 			RumorList
 		},
 		data() {
 			return {
+				keyword: '', // 搜索关键字
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				rumorList: [] // 列表数据
+				rumorList: [], // 列表数据
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -72,40 +78,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.rumorList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-			]
+			this.fetchPyxxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -121,13 +94,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchPyxxList(this.keyword);
+		},
 		watch: {
 			rumorList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -140,7 +121,46 @@
 		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.rumorList = []
+				this.pageIndex = 1
+				this.fetchPyxxList(this.keyword)
+			},
+			// 获取辟谣信息---对应联合辟谣平台的权威发布
+			fetchPyxxList(title = '') {
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'qwfb', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.rumorList = this.rumorList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageC/rumorWebView/rumorWebView.vue b/packageC/rumorWebView/rumorWebView.vue
index be4d32c..5b21564 100644
--- a/packageC/rumorWebView/rumorWebView.vue
+++ b/packageC/rumorWebView/rumorWebView.vue
@@ -1,5 +1,5 @@
 <template>
-	<web-view :src="url" ></web-view>
+	<web-view :src="getUrl" ></web-view>
 </template>
 
 <script>
@@ -7,11 +7,11 @@
 	export default {
 		data() {
 			return {
-				url: ''
+				getUrl: ''
 			}
 		},
 		mounted() {
-			this.url = decodeURIComponent(getLocationParams('url'));
+			this.getUrl = decodeURIComponent(getLocationParams('url'));
 		},
 	}
 </script>
diff --git a/pages.json b/pages.json
index 486c1be..b51fd14 100644
--- a/pages.json
+++ b/pages.json
@@ -4,7 +4,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"navigationBarBackgroundColor": "#4390f7",
+				"navigationBarBackgroundColor": "#398ae4",
 				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false
 			}
@@ -14,7 +14,7 @@
 				"style" :                                                                                    
 				{
 					"navigationBarTitleText": "我的",
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white",
 					"enablePullDownRefresh": false
 				}      
@@ -25,7 +25,7 @@
 				{
 					"navigationBarTitleText": "侵权举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -35,7 +35,7 @@
 				{
 					"navigationBarTitleText": "谣言查证",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white",
 					"disableScroll": true
 				}
@@ -44,8 +44,8 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "新疆网络举报",
-		"navigationBarBackgroundColor": "#4390f7"
-		// "backgroundColor": "#4390f7"
+		"navigationBarBackgroundColor": "#398ae4"
+		// "backgroundColor": "#398ae4"
 	},
 	"tabBar": {
 		"color": "#424242",
@@ -88,7 +88,7 @@
 				{
 					"navigationBarTitleText": "账号信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}		
 			},
@@ -125,7 +125,7 @@
 				{
 					"navigationBarTitleText": "我的举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -135,7 +135,7 @@
 				{
 					"navigationBarTitleText": "侵权指引",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -145,11 +145,21 @@
 				{
 					"navigationBarTitleText": "案例警醒",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path" : "phones/phones",
+				"style" :                                                                                    
+				{
+					"navigationBarTitleText": "举报电话",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			}
-		]
+			]
 	},
 	{
 		"root": "packageB",//分包名
@@ -160,7 +170,7 @@
 				{
 					"navigationBarTitleText": "举报指南",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -170,7 +180,7 @@
 				{
 					"navigationBarTitleText": "举报查询",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -180,7 +190,7 @@
 				{
 					"navigationBarTitleText": "详细信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -190,7 +200,7 @@
 				{
 					"navigationBarTitleText": "我要举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -200,7 +210,7 @@
 					{
 						"navigationBarTitleText": "发布举报",
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#4390f7",
+						"navigationBarBackgroundColor": "#398ae4",
 						"navigationBarTextStyle": "white"
 					}
 			},
@@ -210,7 +220,7 @@
 				{
 					"navigationBarTitleText": "网信信息列表",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -229,7 +239,7 @@
 				{
 					"navigationBarTitleText": "申请流程",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			}
@@ -242,7 +252,7 @@
 				"path" : "rumorWebView/rumorWebView",
 				"style" :                                                                                    
 				{
-					"navigationBarTitleText": "辟谣信息",
+					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false
 				}
 			},
@@ -252,7 +262,7 @@
 				{
 					"navigationBarTitleText": "辟谣信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -272,7 +282,7 @@
 					{
 						"navigationBarTitleText": "通知公告",
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#4390f7",
+						"navigationBarBackgroundColor": "#398ae4",
 						"navigationBarTextStyle": "white"
 					}
 				}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e40537e..42f4d21 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,7 +3,13 @@
 	<view class="index">
 		<!-- <div class='slideShine' style="position:absolute;top: 36rpx;left: 46rpx;z-index: -998;font-size: 50rpx;color: #fff;font-weight: 600;letter-spacing: 4rpx;">新疆网络举报</div> -->
 		<!-- <image style="width: 70px;height: 60px;position:absolute;top: 36rpx;left: 60rpx;z-index: -998" src="http://111.198.10.15:11604/png/share.png"></image> -->
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<view style="position:absolute;top: 36rpx;left: 20rpx;z-index: -998;">
+			<view style="color: #fff;display: flex;justify-content: center;align-items: center;font-size: 36rpx;font-weight: 600;letter-spacing: 2rpx;">
+				<image style="width: 49px;height: 42px;margin-right: 16rpx;" src="http://111.198.10.15:11604/png/share.png"/>
+				<text>新疆互联网违法和不良信息举报中心</text>
+			</view>
+		</view>
+		<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="swiper-area">
 			<swiper class="swiper-box" style="height: 300rpx;" :interval="3000" :indicator-dots="true" :autoplay="true" :circular="circular">
 				<swiper-item v-for="(item ,index) in swiperList" :key="index">
@@ -60,7 +66,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in tzggList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'tzgg')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -74,7 +80,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in pyxxList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'pyxx')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -88,7 +94,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in aljxList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'aljx')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -198,7 +204,7 @@
 					{
 						id: 'aljx',
 						name: '案例警醒',
-						value: 'tzggList'
+						value: 'aljxList'
 					},
 				]
 			}
@@ -210,6 +216,7 @@
 			});
 			this.fetchNoticeList() // 获取通知公告列表
 			this.fetchPyxxList() // 获取辟谣信息列表
+			this.fetchAljxList() // 案例警醒列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -270,7 +277,7 @@
 						url: '/packageC/rumorInfo/rumorInfo'
 					})
 				} 
-				if(id === 'tzgg') {
+				if(id === 'tzgg') { // 通知公告
 					wx.navigateTo({
 						url: '/packageC/notice/notice'
 					})
@@ -288,23 +295,50 @@
 				getNoticeList(param).then(res => {
 					this.tzggList = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate)
 						}
 					})
 				})
 			},
-			// 获取辟谣信息
+			// 获取辟谣信息--对应联合辟谣平台的权威发布
 			fetchPyxxList() {
 				const param = {
 					pageIndex: 1,
 					pageSize: 2,
-					siteRoleCode: 'zzqwxbPortal',
-					catalogCode: 'yykt'
+					// siteRoleCode: 'zzqwxbPortal',
+					// catalogCode: 'yykt'
+					siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+					catalogCode: 'qwfb', // 对应权威发布
 				}
 				getPyxxList(param).then(res => {
 					this.pyxxList = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title,
+							publishTime: stamp2Time(item.publishDate)
+						}
+					})
+				})
+			},
+			// 获取案例警醒--对应联合辟谣平台热点聚焦
+			fetchAljxList() {
+				const param = {
+					pageIndex: 1,
+					pageSize: 2,
+					// siteRoleCode: 'zzqwxbPortal',
+					// catalogCode: 'yykt'
+					siteRoleCode: 'zzqwxbPortal', // 对应热点聚焦
+					catalogCode: 'rdjj'
+				}
+				getPyxxList(param).then(res => {
+					this.aljxList = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate)
 						}
@@ -312,10 +346,17 @@
 				})
 			},
 			// 点击标题
-			clickTitle() {
-				console.log('点击标题')
+			clickTitle(val, type) {
+				let url = '';
+				if(type === 'tzgg') { // 通知公告
+					url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				} else if(type === 'pyxx') { // 辟谣信息
+					url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				} else { // 案例警醒
+					url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				}
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			}
 		}
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 805fea9..53eb47e 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,9 +1,9 @@
 <!-- 我的 -->
 <template>
 	<view class="mine">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="card-wrap"> -->
-			
+		
 			<view class="info">
 				<image style="width: 80px;height: 70px;margin-bottom: 32rpx;" src="http://111.198.10.15:11604/png/share.png"></image>
 				<text style="color: #fff;">{{nickName}}</text>
@@ -12,7 +12,7 @@
 		  <view class="card-box">
 		    <view class="card-info">
 					<view class="title">
-					 	<text>举报中心</text>
+					 	<text>我的举报</text>
 					 	<view class="icon-text" @click="handleClick('0')">
 							<text class="text">全部</text>
 							<u-icon name="arrow-right-double" color="#0043ac" size="18"></u-icon>
@@ -36,7 +36,7 @@
 			<view class="account" @click="changePage">
 				<view class="title">
 					<u-icon name="account-fill" color="#408bf6" size="28"></u-icon>
-					<text class="text">平台账号</text>
+					<text class="text">个人信息</text>
 				</view>
 				
 				<u-icon name="arrow-right" color="#0043ac" size="22"></u-icon>

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->
diff --git a/packageC/components/noticeList.vue b/packageC/components/noticeList.vue
index 5f8781b..ebe3452 100644
--- a/packageC/components/noticeList.vue
+++ b/packageC/components/noticeList.vue
@@ -37,8 +37,9 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageC/components/rumorList.vue b/packageC/components/rumorList.vue
index ec1985d..ed4bb94 100644
--- a/packageC/components/rumorList.vue
+++ b/packageC/components/rumorList.vue
@@ -3,9 +3,20 @@
 		<view class="rumor-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="imgUrl" style="width: 120px;height: 100px;flex-shrink: 0;" mode=""></image>
+			<!-- <view class="" @click.stop>
+				<image 
+					:src="item.contentSmallImage || this.imgUrl" 
+					style="width: 112px;height: 100px;flex-shrink: 0;" 
+					mode=""
+					@click="preImage(item.contentSmallImage)" 
+					:show-menu-by-longpress="true">
+				</image>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -20,14 +31,24 @@
 		data() {
 			return {
 				imgUrl: 'http://111.198.10.15:11604/png/rumor.png',
-				
 			}
 		},
 		
 		methods: {
 			handleClick(val) {
+				// wx.navigateTo({
+				// 	url: '/packageC/rumorDetail/rumorDetail'
+				// })
+				const url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+				})
+			},
+			// 图片预览
+			preImage(src) {
+				wx.previewImage({
+					current: src, // 当前显示图片的http链接
+					urls: [src] // 需要预览的图片http链接列表
 				})
 			}
 		}
@@ -44,7 +65,7 @@
 			justify-content: space-between;
 			align-items: center;
 			width: 100%;
-			height: 240rpx;
+			height: 280rpx;
 			padding: 20rpx 32rpx;
 			background-color: #fff;
 			box-sizing: border-box;
diff --git a/packageC/notice/notice.vue b/packageC/notice/notice.vue
index ec1c858..1784152 100644
--- a/packageC/notice/notice.vue
+++ b/packageC/notice/notice.vue
@@ -1,7 +1,7 @@
 <!-- 通知公告列表页 -->
 <template>
 	<view class="notice-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
@@ -23,8 +23,7 @@
 		<view class="rumor-area">
 			<NoticeList :list="noticeList"/>
 		</view>
-		<u-loading-icon :show="loadingMore" color="#0043ac" textColor="#0043ac" text="加载中" textSize="16"></u-loading-icon>
-		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" "/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -65,7 +64,7 @@
 				scrollTop: 0,
 				noticeList: [] ,// 列表数据
 				pageIndex: 1, // 请求第几页
-				loadingMore: false, // 是否显示加载中
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -77,9 +76,9 @@
 		},
 		//上滑加载
 		onReachBottom() {
-			this.loadingMore = true
-			this.fetchNoticeList();
+			this.loadingMoreStatus = 'loading'
 			this.pageIndex = this.pageIndex + 1
+			this.fetchNoticeList();
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -113,6 +112,7 @@
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			// 点击搜索
 			search() {
 				
 			},
@@ -120,23 +120,26 @@
 			fetchNoticeList() {
 				const param = {
 					pageIndex: this.pageIndex, //当前页数（必传）
-					pageSize: 2, //每页数 （必传）
+					pageSize: 10, //每页数 （必传）
 					yuzhong: 'zh',//（必传）固定值
 					siteRoleCode: 'xjwljb', //（必传）固定值
 					catalogCode: 'tzgg', //（必传）固定值
 				}
 				getNoticeList(param).then(res => {
-					const list = res.map(item => {
+					let list = []
+					list = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate),
 							linkAddr: item.linkAddr
 						}
 					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
 					this.noticeList = this.noticeList.concat(list)
-					this.loadingMore = false
-					console.log('this.noticeList')
-					console.log(this.noticeList)
 				})
 			},
 		}
diff --git a/packageC/rumorInfo/rumorInfo.vue b/packageC/rumorInfo/rumorInfo.vue
index b88c945..cf81b1d 100644
--- a/packageC/rumorInfo/rumorInfo.vue
+++ b/packageC/rumorInfo/rumorInfo.vue
@@ -1,6 +1,7 @@
+<!-- 辟谣信息列表页 -->
 <template>
 	<view class="rumor-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">谣言曝光台</view>
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
@@ -9,7 +10,7 @@
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -27,7 +28,7 @@
 		<view class="rumor-area">
 			<RumorList :list="rumorList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'"/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -56,15 +57,20 @@
 
 <script>
 	import RumorList from '../components/rumorList.vue'
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	export default {
 		components: {
 			RumorList
 		},
 		data() {
 			return {
+				keyword: '', // 搜索关键字
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				rumorList: [] // 列表数据
+				rumorList: [], // 列表数据
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -72,40 +78,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.rumorList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-			]
+			this.fetchPyxxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -121,13 +94,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchPyxxList(this.keyword);
+		},
 		watch: {
 			rumorList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -140,7 +121,46 @@
 		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.rumorList = []
+				this.pageIndex = 1
+				this.fetchPyxxList(this.keyword)
+			},
+			// 获取辟谣信息---对应联合辟谣平台的权威发布
+			fetchPyxxList(title = '') {
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'qwfb', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.rumorList = this.rumorList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageC/rumorWebView/rumorWebView.vue b/packageC/rumorWebView/rumorWebView.vue
index be4d32c..5b21564 100644
--- a/packageC/rumorWebView/rumorWebView.vue
+++ b/packageC/rumorWebView/rumorWebView.vue
@@ -1,5 +1,5 @@
 <template>
-	<web-view :src="url" ></web-view>
+	<web-view :src="getUrl" ></web-view>
 </template>
 
 <script>
@@ -7,11 +7,11 @@
 	export default {
 		data() {
 			return {
-				url: ''
+				getUrl: ''
 			}
 		},
 		mounted() {
-			this.url = decodeURIComponent(getLocationParams('url'));
+			this.getUrl = decodeURIComponent(getLocationParams('url'));
 		},
 	}
 </script>
diff --git a/pages.json b/pages.json
index 486c1be..b51fd14 100644
--- a/pages.json
+++ b/pages.json
@@ -4,7 +4,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"navigationBarBackgroundColor": "#4390f7",
+				"navigationBarBackgroundColor": "#398ae4",
 				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false
 			}
@@ -14,7 +14,7 @@
 				"style" :                                                                                    
 				{
 					"navigationBarTitleText": "我的",
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white",
 					"enablePullDownRefresh": false
 				}      
@@ -25,7 +25,7 @@
 				{
 					"navigationBarTitleText": "侵权举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -35,7 +35,7 @@
 				{
 					"navigationBarTitleText": "谣言查证",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white",
 					"disableScroll": true
 				}
@@ -44,8 +44,8 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "新疆网络举报",
-		"navigationBarBackgroundColor": "#4390f7"
-		// "backgroundColor": "#4390f7"
+		"navigationBarBackgroundColor": "#398ae4"
+		// "backgroundColor": "#398ae4"
 	},
 	"tabBar": {
 		"color": "#424242",
@@ -88,7 +88,7 @@
 				{
 					"navigationBarTitleText": "账号信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}		
 			},
@@ -125,7 +125,7 @@
 				{
 					"navigationBarTitleText": "我的举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -135,7 +135,7 @@
 				{
 					"navigationBarTitleText": "侵权指引",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -145,11 +145,21 @@
 				{
 					"navigationBarTitleText": "案例警醒",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path" : "phones/phones",
+				"style" :                                                                                    
+				{
+					"navigationBarTitleText": "举报电话",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			}
-		]
+			]
 	},
 	{
 		"root": "packageB",//分包名
@@ -160,7 +170,7 @@
 				{
 					"navigationBarTitleText": "举报指南",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -170,7 +180,7 @@
 				{
 					"navigationBarTitleText": "举报查询",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -180,7 +190,7 @@
 				{
 					"navigationBarTitleText": "详细信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -190,7 +200,7 @@
 				{
 					"navigationBarTitleText": "我要举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -200,7 +210,7 @@
 					{
 						"navigationBarTitleText": "发布举报",
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#4390f7",
+						"navigationBarBackgroundColor": "#398ae4",
 						"navigationBarTextStyle": "white"
 					}
 			},
@@ -210,7 +220,7 @@
 				{
 					"navigationBarTitleText": "网信信息列表",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -229,7 +239,7 @@
 				{
 					"navigationBarTitleText": "申请流程",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			}
@@ -242,7 +252,7 @@
 				"path" : "rumorWebView/rumorWebView",
 				"style" :                                                                                    
 				{
-					"navigationBarTitleText": "辟谣信息",
+					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false
 				}
 			},
@@ -252,7 +262,7 @@
 				{
 					"navigationBarTitleText": "辟谣信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -272,7 +282,7 @@
 					{
 						"navigationBarTitleText": "通知公告",
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#4390f7",
+						"navigationBarBackgroundColor": "#398ae4",
 						"navigationBarTextStyle": "white"
 					}
 				}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e40537e..42f4d21 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,7 +3,13 @@
 	<view class="index">
 		<!-- <div class='slideShine' style="position:absolute;top: 36rpx;left: 46rpx;z-index: -998;font-size: 50rpx;color: #fff;font-weight: 600;letter-spacing: 4rpx;">新疆网络举报</div> -->
 		<!-- <image style="width: 70px;height: 60px;position:absolute;top: 36rpx;left: 60rpx;z-index: -998" src="http://111.198.10.15:11604/png/share.png"></image> -->
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<view style="position:absolute;top: 36rpx;left: 20rpx;z-index: -998;">
+			<view style="color: #fff;display: flex;justify-content: center;align-items: center;font-size: 36rpx;font-weight: 600;letter-spacing: 2rpx;">
+				<image style="width: 49px;height: 42px;margin-right: 16rpx;" src="http://111.198.10.15:11604/png/share.png"/>
+				<text>新疆互联网违法和不良信息举报中心</text>
+			</view>
+		</view>
+		<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="swiper-area">
 			<swiper class="swiper-box" style="height: 300rpx;" :interval="3000" :indicator-dots="true" :autoplay="true" :circular="circular">
 				<swiper-item v-for="(item ,index) in swiperList" :key="index">
@@ -60,7 +66,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in tzggList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'tzgg')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -74,7 +80,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in pyxxList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'pyxx')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -88,7 +94,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in aljxList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'aljx')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -198,7 +204,7 @@
 					{
 						id: 'aljx',
 						name: '案例警醒',
-						value: 'tzggList'
+						value: 'aljxList'
 					},
 				]
 			}
@@ -210,6 +216,7 @@
 			});
 			this.fetchNoticeList() // 获取通知公告列表
 			this.fetchPyxxList() // 获取辟谣信息列表
+			this.fetchAljxList() // 案例警醒列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -270,7 +277,7 @@
 						url: '/packageC/rumorInfo/rumorInfo'
 					})
 				} 
-				if(id === 'tzgg') {
+				if(id === 'tzgg') { // 通知公告
 					wx.navigateTo({
 						url: '/packageC/notice/notice'
 					})
@@ -288,23 +295,50 @@
 				getNoticeList(param).then(res => {
 					this.tzggList = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate)
 						}
 					})
 				})
 			},
-			// 获取辟谣信息
+			// 获取辟谣信息--对应联合辟谣平台的权威发布
 			fetchPyxxList() {
 				const param = {
 					pageIndex: 1,
 					pageSize: 2,
-					siteRoleCode: 'zzqwxbPortal',
-					catalogCode: 'yykt'
+					// siteRoleCode: 'zzqwxbPortal',
+					// catalogCode: 'yykt'
+					siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+					catalogCode: 'qwfb', // 对应权威发布
 				}
 				getPyxxList(param).then(res => {
 					this.pyxxList = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title,
+							publishTime: stamp2Time(item.publishDate)
+						}
+					})
+				})
+			},
+			// 获取案例警醒--对应联合辟谣平台热点聚焦
+			fetchAljxList() {
+				const param = {
+					pageIndex: 1,
+					pageSize: 2,
+					// siteRoleCode: 'zzqwxbPortal',
+					// catalogCode: 'yykt'
+					siteRoleCode: 'zzqwxbPortal', // 对应热点聚焦
+					catalogCode: 'rdjj'
+				}
+				getPyxxList(param).then(res => {
+					this.aljxList = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate)
 						}
@@ -312,10 +346,17 @@
 				})
 			},
 			// 点击标题
-			clickTitle() {
-				console.log('点击标题')
+			clickTitle(val, type) {
+				let url = '';
+				if(type === 'tzgg') { // 通知公告
+					url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				} else if(type === 'pyxx') { // 辟谣信息
+					url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				} else { // 案例警醒
+					url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				}
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			}
 		}
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 805fea9..53eb47e 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,9 +1,9 @@
 <!-- 我的 -->
 <template>
 	<view class="mine">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="card-wrap"> -->
-			
+		
 			<view class="info">
 				<image style="width: 80px;height: 70px;margin-bottom: 32rpx;" src="http://111.198.10.15:11604/png/share.png"></image>
 				<text style="color: #fff;">{{nickName}}</text>
@@ -12,7 +12,7 @@
 		  <view class="card-box">
 		    <view class="card-info">
 					<view class="title">
-					 	<text>举报中心</text>
+					 	<text>我的举报</text>
 					 	<view class="icon-text" @click="handleClick('0')">
 							<text class="text">全部</text>
 							<u-icon name="arrow-right-double" color="#0043ac" size="18"></u-icon>
@@ -36,7 +36,7 @@
 			<view class="account" @click="changePage">
 				<view class="title">
 					<u-icon name="account-fill" color="#408bf6" size="28"></u-icon>
-					<text class="text">平台账号</text>
+					<text class="text">个人信息</text>
 				</view>
 				
 				<u-icon name="arrow-right" color="#0043ac" size="22"></u-icon>
diff --git a/pages/rumor/rumor.vue b/pages/rumor/rumor.vue
index 8fa35d9..b9965a2 100644
--- a/pages/rumor/rumor.vue
+++ b/pages/rumor/rumor.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="rumor">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="button-area">
 			<view class="button" @click="goAnotherMiniProgranm">我来查证</view>
 			<button class="button1 button" open-type="contact" session-from="sessionFrom">线索提交</button>

diff --git a/api/tort.js b/api/tort.js
index 9c5c6ce..beb1f02 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,6 +5,7 @@
 const URL_REPEAT = BASE_URL + '/webserver/reportInfos/websiteUrlRepeat.do'
 const UPLOAD_PICTURE = BASE_URL + 'webserver/fileUploadController/uploadToLocal'
 const WEB_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
  * @param {*}  // url: ''
@@ -23,4 +24,12 @@
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
 
+// 获取验证码
+export function getCodeURl() {
+	const data = {
+		timeStr: new Date().getTime()
+	}
+	return fetch.get(GET_CODE_URL, data).then(res => res);
+}
+
 
diff --git a/common/fetch.js b/common/fetch.js
index 1ed1345..9add31a 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -1,6 +1,20 @@
 import { useStore } from "vuex";
 // import { getLogin } from "@/utils/auth.js";
-
+const dict = {
+	'1':'成功',
+	'2':'账户已存在',
+	'3': '验证码错误',
+	'4': '手机号码重复',
+	'5':'邮箱重复',
+	'6': '用户账户被锁',
+	'7': '密码错误',
+	'8':'账号不存在',
+	'9': '监督员状态未审核',
+	'10': '监督员状态未通过',
+	'101':'登陆注册成功',
+	'102':'监督员删除',
+	'103':'验证码超时',
+}
 function fetch(method) {
   return function (url, data, otherParams = {}) {
     // if (method === 'POST' || method === 'PUT') {
@@ -25,7 +39,23 @@
 								wx.setStorageSync('isRepeat', 'false')
 							}
               resolve(data.data.data);
-            } else {
+            } else if(
+						data.data.status === 103 || data.data.status === 3 || 
+						data.data.status === 2 ||data.data.status === 4 ||
+						data.data.status === 5 ||data.data.status === 6 ||
+						data.data.status === 7 || data.data.status === 8 ||
+						data.data.status === 9 ||data.data.status === 10 ||
+						data.data.status === 102 ) { 
+							const status = data.data.status + '';
+							const message = dict[status]
+							uni.showToast({
+							  // title: "系统异常，请稍后再试！",
+							  title: `${message}`,
+							  icon: "none",
+							  duration: 3000,
+							});
+							reject(data.data.status);
+						} else {
 							if(data.data.message === '网址重复') {
 								uni.showToast({
 								  // title: "系统异常，请稍后再试！",
@@ -49,6 +79,7 @@
           }
         },
         fail(err) {
+					console.log('fail', err)
           reject(err);
         },
         ...otherParams,
diff --git a/packageA/accountInfo/accountInfo.vue b/packageA/accountInfo/accountInfo.vue
index bfda7ba..6a7048c 100644
--- a/packageA/accountInfo/accountInfo.vue
+++ b/packageA/accountInfo/accountInfo.vue
@@ -1,7 +1,7 @@
 <!-- 账号信息 -->
 <template>
 	<view class="account-info">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="title">个人信息</view>
 			<view class="info" v-for="item in list" :key="item.id">
@@ -30,7 +30,7 @@
 						id: 'username',
 						name: '用户名:',
 						value: '',
-						icon: 'http://111.198.10.15:11604/png/back.png'
+						icon: 'http://111.198.10.15:11604/png/back_ts.png'
 					},
 					{
 						id: 'name',
diff --git a/packageA/components/egersisList.vue b/packageA/components/egersisList.vue
index 139d43c..e2a65bb 100644
--- a/packageA/components/egersisList.vue
+++ b/packageA/components/egersisList.vue
@@ -7,9 +7,12 @@
 		<view class="egersis-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image>
+			<!-- <image :src="item.img" style="width: 280rpx;height: 200rpx;flex-shrink: 0;" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -28,14 +31,10 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
-				// const url = 'https://www.xjwljb.com/bulletin/newInfo'
-				// const url = 'https://www.xjwljb.com/hotspot/newInfo?id=431bdce525f4dc995629c55988512fb4&catalogId=5fb0f6d7e66cdabaa70ad18465462a6e'
-				// wx.navigateTo({
-				// 	url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				// })
 			}
 		}
 	}
diff --git a/packageA/egersis/egersis.vue b/packageA/egersis/egersis.vue
index 718639b..7a82bb8 100644
--- a/packageA/egersis/egersis.vue
+++ b/packageA/egersis/egersis.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="egersis">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -22,7 +22,7 @@
 		<view class="egersis-area">
 			<Egersis :list="egersisList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'" />
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	import Egersis from '../components/egersisList.vue'
 	export default {
 		components: {
@@ -59,7 +61,10 @@
 			return {
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				egersisList: [] // 列表数据
+				egersisList: [], // 列表数据
+				keyword: '', // 搜索关键字
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -67,48 +72,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.egersisList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12',
-					img: '../../static/share.png'
-				},
-			]
+			this.fetchAljxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -124,13 +88,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchAljxList(this.keyword);
+		},
 		watch: {
 			egersisList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -141,13 +113,49 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		//上滑加载
-		onReachBottom() {
-			
-		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.egersisList = []
+				this.pageIndex = 1
+				this.fetchAljxList(this.keyword)
+			},
+			// 获取案例警醒---对应联合辟谣平台的热点聚焦
+			fetchAljxList(title = '') {
+				this.isEmpty = false
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'rdjj', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.egersisList = this.egersisList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageA/myReport/myReport.vue b/packageA/myReport/myReport.vue
index 442637d..c0795a1 100644
--- a/packageA/myReport/myReport.vue
+++ b/packageA/myReport/myReport.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="my-report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
@@ -142,6 +142,51 @@
 							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'
+						},
 					]
 				} else if((val && val.index === 1) || currentTab === '1') { // 待评估
 					this.reportList = [
@@ -184,7 +229,7 @@
 			left: 0;
 			width: 100%;
 			padding: 20rpx;
-			background-color: #4390f7;
+			// background-color: #4390f7;
 		}
 	}
 </style>
diff --git a/packageA/phones/phones.vue b/packageA/phones/phones.vue
new file mode 100644
index 0000000..1db4f56
--- /dev/null
+++ b/packageA/phones/phones.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="phones">
+		<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 style="color: #fff;font-size: 36rpx;text-align: center;font-weight: 600;">
+			各地、州、市网信部门举报电话
+		</view>
+		<view class="main">
+			<view class="box">
+				<i class="top"></i><i class="bottom"></i>
+				<text>地、州、市</text>
+				<text>举报电话</text>
+			</view>
+			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
+				<text style="color: #000;font-weight: 600;word-break: break-all;">{{item.name}}</text>
+				<view style="color: #000;font-weight: 600;word-break: break-all;" @click="call(item.phone)">{{item.phone}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phonesList: [
+					{
+						name: '乌鲁木齐市',
+						phone: '0991-4168123',
+					},
+					{
+						name: '伊犁哈萨克自治州',
+						phone: '0999-8032982',
+					},
+					{
+						name: '塔城地区',
+						phone: '0901-6856007',
+					},
+					{
+						name: '阿勒泰地区',
+						phone: '0906-2317252',
+					},
+					{
+						name: '克拉玛依市',
+						phone: '0990-6261005',
+					},
+					{
+						name: '博尔塔拉蒙古自治州',
+						phone: '0909-2319278',
+					},
+					{
+						name: '昌吉回族自治州',
+						phone: '0994-2586700',
+					},
+					{
+						name: '哈密市',
+						phone: '0902-7265333',
+					},
+					{
+						name: '吐鲁番市',
+						phone: '0995-8525882',
+					},
+					{
+						name: '巴音郭楞蒙古自治州',
+						phone: '0996-2620315',
+					},
+					{
+						name: '阿克苏地区',
+						phone: '0997-2187788',
+					},
+					{
+						name: '克孜勒苏柯尔克孜自治州',
+						phone: '0908-4234053',
+					},
+					{
+						name: '喀什地区',
+						phone: '0998-2950026',
+					},
+					{
+						name: '和田地区',
+						phone: '0903-2039577',
+					},
+				]
+			}
+		},
+		methods: {
+			// 点击举报电话
+			call(phone) {
+				wx.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.phones {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 60rpx 20rpx;
+		.main {
+			background: #fff;
+			border-radius: 20rpx;
+			line-height: 70rpx;
+			margin-top: 40rpx;
+			overflow: hidden;
+			.title {
+				background-color: #0043ac;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+			}
+			.list-item {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx;
+				border-bottom: 2rpx solid #ccc
+			}
+			.box {
+				width: 100%;
+				height: 100%;
+				padding: 20rpx 40rpx;
+				// padding-left: 0;
+				box-sizing: border-box;
+				background-color: #0043ac;
+				position: relative;
+				overflow: hidden;
+				color: #fff;
+				font-weight: 600;
+				display: flex;
+				justify-content: space-between;
+				&::before {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					top: -100%;
+					left: 0rpx;
+					background-image: linear-gradient(
+						0deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: two 4s linear infinite;
+				}
+				&::after {
+					content: ' ';
+					position: absolute;
+					width: 10rpx;
+					height: 100%;
+					bottom: -100%;
+					right: 0;
+					background-image: linear-gradient(
+						360deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: four 4s linear 2s infinite;
+				}
+				i {
+					position: absolute;
+					display: inline-block;
+					height: 10rpx;
+					width: 100%;
+				}
+				.bottom {
+					bottom: 0;
+					left: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: one 4s linear 1s infinite;
+				}
+				.top {
+					top: 0;
+					right: -100%;
+					background-image: linear-gradient(
+						270deg,
+						transparent,
+						#fff,
+						transparent
+					);
+					animation: three 4s linear 3s infinite;
+				}}
+			@keyframes one {
+			  0% {
+			    left: -100%;
+			  }
+			  50%,
+			  100% {
+			    left: 100%;
+			  }
+			}
+			 
+			@keyframes two {
+			  0% {
+			    top: -100%;
+			  }
+			  50%,
+			  100% {
+			    top: 100%;
+			  }
+			}
+			 
+			@keyframes three {
+			  0% {
+			    right: -100%;
+			  }
+			  50%,
+			  100% {
+			    right: 100%;
+			  }
+			}
+			 
+			@keyframes four {
+			  0% {
+			    bottom: -100%;
+			  }
+			  50%,
+			  100% {
+			    bottom: 100%;
+			  }
+			}
+			
+		}
+	}
+</style>
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
diff --git a/packageA/tortGuide/tortGuide.vue b/packageA/tortGuide/tortGuide.vue
index 167dc7a..7958c58 100644
--- a/packageA/tortGuide/tortGuide.vue
+++ b/packageA/tortGuide/tortGuide.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="tort-guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">网络侵权信息举报指南</view>
 		<view class="time">
 			时间： 2022-05-16 12:28:34
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index cc6d8aa..3610dd8 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="center">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 360rpx;"></image>
+		<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: 360rpx;"></image>
 		<view class="center-title">举报入口</view>
 	
 		<view class="title">举报入口</view>
@@ -190,7 +190,10 @@
 					icon: icon,
 					label: label,
 				}
-				this.actionSheetShow = true
+				// this.actionSheetShow = true
+				wx.navigateTo({
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+				})
 			},
 			// 选择好
 			selectClick(val) {
diff --git a/packageB/guide/guide.vue b/packageB/guide/guide.vue
index a0d509a..caaf101 100644
--- a/packageB/guide/guide.vue
+++ b/packageB/guide/guide.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="guide">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">遇到互联网违法和不良信息该怎么举报？</view>
 		<view class="time">
 			时间： 2022-08-18 17:42:00  
@@ -97,7 +97,8 @@
 			<view class="main-title">三、遇到上述信息内容该怎么举报？</view>
 			<view>
 				<view class="content-text">
-					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一）
+					<!-- 1.电话举报：拨打24小时在线电话0991-2384777，进行举报；（各地、州、市网信部门举报电话见图一） -->
+					1.电话举报：拨打24小时在线电话0991-2384777，进行举报；
 				</view>
 				<view class="content-text">
 					2.网站举报：登陆新疆互联网违法和不良信息举报中心官方网站：www.xjwljb.com进行举报；
@@ -112,13 +113,14 @@
 					5.使用新疆举报小程序进行举报
 				</view>
 				<view class="content-text">
-					6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二）
+					<!-- 6.其他举报：关注“新疆网络举报”微信公众号进行举报。（详细操作流程见图二） -->
+					6.其他举报：关注“新疆网络举报”微信公众号进行举报。
 				</view>
 				
-				<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
+			<!-- 	<image @click="preImage(imgList[0])" :show-menu-by-longpress="true" :src="imgList[0]" style="width: 100%;height: 560px;margin-top: 32rpx;"></image>
 				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图一）</view>
 				<image @click="preImage(imgList[1])" :show-menu-by-longpress="true" :src="imgList[1]" style="width: 100%;height: 650px;margin-top: 20rpx;"></image>
-				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view>
+				<view style="margin: 20rpx 0 32rpx 0;text-align: center;">（图二）</view> -->
 				
 			</view>
 			
diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue
index 2e701a2..c357280 100644
--- a/packageB/messageList/messageList.vue
+++ b/packageB/messageList/messageList.vue
@@ -1,7 +1,7 @@
 <!-- 网信信息列表 -->
 <template>
 	<view class="message-list">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:fixed;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="tab-area">
 			<u-tabs 
 				:list="tabList" 
diff --git a/packageB/recordDetail/recordDetail.vue b/packageB/recordDetail/recordDetail.vue
index a286bee..2605880 100644
--- a/packageB/recordDetail/recordDetail.vue
+++ b/packageB/recordDetail/recordDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="record-detail">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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">
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index 2174f8d..020b2fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -1,8 +1,27 @@
 <!-- 发布举报 -->
 <template>
 	<view class="report">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
-		<view class="title-area">
+		<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="tab-area">
+			<u-tabs 
+				:list="tabList" 
+				:scrollable="false" 
+				:current="currentTab"
+				lineColor="#fff"
+				lineWidth="50"
+				lineHeight="5"
+				:activeStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				:inactiveStyle="{
+					color: '#fff',
+					fontWeight: 'bold',
+				}"
+				@click="clickTab">
+			</u-tabs>
+		</view>
+		<!-- <view class="title-area">
 			<image :src="`${reportIcon}`" style="width: 80rpx;height: 80rpx;" mode=""></image>
 			<view class="title">
 				<text>
@@ -12,7 +31,7 @@
 				<text class="title-text" v-if="label"> - </text>
 				<text class="title-text" v-if="label"> {{label}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="content-area">
 			<view class="content">
 				<u--form
@@ -36,6 +55,9 @@
 					<!-- <u-form-item label="举报类型" prop="type" borderBottom :required="true" @click="typeShow=true">
 						<u--input placeholder="请选择举报类型" suffixIcon="arrow-right" disabled v-model="form.type" border="none"></u--input>
 					</u-form-item> -->
+					<u-form-item label="举报类型" borderBottom>
+						<u--input placeholder="举报类型" disabled v-model="label" border="none"></u--input>
+					</u-form-item>
 					
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
@@ -65,13 +87,13 @@
 					</u-form-item>
 					
 					<u-form-item label="内容描述" prop="desc" borderBottom :required="true">
-						<u--textarea 
+						<u-textarea 
 							v-model="form.desc" 
 							placeholder="描述不超过200个字符" 
 							autoHeight 
 							maxlength='200'
 							:showConfirmBar='true'
-						></u--textarea>
+						></u-textarea>
 					</u-form-item>
 					
 					<u-form-item v-if="reportType !== 'other'" label="发布人" prop="publishName" borderBottom :required="true">
@@ -122,6 +144,15 @@
 							></uni-file-picker>
 						</view>
 					</u-form-item>
+					<!-- 验证码 -->
+					<u-form-item label="验证码" prop="code" borderBottom :required="true">
+						<u--input
+							placeholder="验证码"
+							v-model="form.code"
+							border="none"
+						></u--input>
+						<image :src="codeUrl" style="width: 140px;height: 60px;" @click="updateImageCode"></image>
+					</u-form-item>
 				</u--form>
 			</view>
 		</view>
@@ -178,6 +209,9 @@
 		},
 		data() {
 			return {
+				timeStr: '', // 验证码时间戳
+				codeUrl: '', // 验证码图片
+				currentTab: '0',
 				messageContent: '互联网违法不良信息公众举报平台以高度的责任感对待每一条公众举报内容。举报平台核查线索后，及时将违法和不良信息转交执法部门处置，或通知网站清理，举报人可通过提交举报时反馈的查询码在举报查询中查询处理进度。',
 				showMessage: false, //举报须知弹窗显隐
 				typeLabel: '', //举报类型名称
@@ -189,6 +223,16 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				tabList: [
+					{
+						name: '网站类型举报',
+						id: 'web'
+					},
+					{
+						name: '其他类型举报',
+						id: 'other'
+					},
+				],
 				rules: {
 					//举报人
 					'reportName': [
@@ -249,9 +293,9 @@
 						{
 							validator: (rule, value, callback) => {
 								if(uni.$u.test.url(value)) {
-									this.createWebUrl().then(res => {
-										console.log('3333', res)
-									})
+									// this.createWebUrl().then(res => {
+									// 	console.log('3333', res)
+									// })
 								}
 								return uni.$u.test.url(value);
 							},
@@ -268,6 +312,15 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 描述
+					'code': [
+						{
+							type: 'string',
+							required: true,
+							message: '请输入验证码',
+							trigger: ['blur', 'change']
+						},
+					],
 					// 发布人
 					'publishName': [
 						{
@@ -319,9 +372,10 @@
 					picture: [], //内容截图
 					source: '', //信息来源
 					affix: [], //附件
-					reportType: '1', // 举报类型上传字段
-					publishPlat: '1,1', // 发布平台上传字段
+					reportType: '', // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -452,6 +506,7 @@
 			}
 		},
 		mounted() {
+			this.fetchCodeURl() // 获取验证码
 			this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参
 			this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other
 			this.form.type = getLocationParams('reportType'); // 
@@ -466,6 +521,55 @@
 			this.$refs.form.setRules(this.rules);
 		},
 		methods: {
+			// 点击tab
+			clickTab(e) {
+				console.log(e)
+				this.reportType = e.id
+				this.form = {
+					reportName: '', //举报人
+					phone: '', //手机号
+					type: '', //举报类型
+					url: '', //网站网址
+					zt: '网络数据安全和个人信息保护', //专题
+					isNewMedia: '0',  //是否是新媒体
+					desc: '', //内容描述
+					publishName: '', //发布人
+					publishId: '', //发布人id
+					place: '', //发布平台
+					picture: [], //内容截图
+					source: '', //信息来源
+					affix: [], //附件
+					reportType: this.form.reportType, // 举报类型上传字段
+					publishPlat: '', // 发布平台上传字段
+					sendPicture: [], //内容截图上传数据
+					code: '', // 验证码
+				}
+			},
+			// 换验证码
+			updateImageCode() {
+				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);
+				  },
+				});
+			},
 			//点击选择器取消按钮
 			cancle() {
 				this.typeShow = false;
@@ -556,27 +660,32 @@
 				})
 			},
 			//点击举报
-			submit() {
-				if(this.form.reportName === '') {
-					wx.showToast({
-					  title: '请先注册',
-					  icon: 'none',
-					  duration: 2000
-					})
-					setTimeout(() => {
-						wx.navigateTo({
-							url: '/packageA/pages/register/register'
-						})
-					}, 2000)
-				} else {
+			async submit() {
+				// if(this.form.reportName === '') {
+				// 	wx.showToast({
+				// 	  title: '请先注册',
+				// 	  icon: 'none',
+				// 	  duration: 2000
+				// 	})
+				// 	setTimeout(() => {
+				// 		wx.navigateTo({
+				// 			url: '/packageA/pages/register/register'
+				// 		})
+				// 	}, 2000)
+				// } else {
+				//-------------------------------网址验证----------------------------------------------------
+				if(this.form.url) {
+					await	this.createWebUrl();
 					if(wx.getStorageSync('isRepeat') === 'true') {
 						uni.showToast({
-						  title: `网址重复，请换一个网址`,
-						  icon: "none",
-						  duration: 3000,
+							title: `网址重复，请换一个网址`,
+							icon: "none",
+							duration: 3000,
 						});
 						return false
 					}
+				}
+				// --------------------------------------------------------------------------------------------
 					// -------------------------------------- 处理图片参数----------------------------------------
 					let tempArr = []
 					this.form.picture.forEach(item => {
@@ -591,12 +700,12 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', //？
-						"reportInfo.infoType": '1', //？
-						"reportInfo.topicId": '', // ？
+						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoType": '1', //（三种类型举报都传递1）
+						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
-						"reportInfo.reportUserType": '3', //？
-						"reportInfo.directReport": '', // ?
+						"reportInfo.reportUserType": '3', // //1普通用户2, "监督员"3, "匿名用户"（未注册情况为3）
+						"reportInfo.directReport": '', // 
 						"reportInfo.infoDescribe": this.form.desc, // 描述
 						"reportInfo.publishUser": this.form.publishName, // 发布人
 						"reportInfo.publishUserId": this.form.publishId, //发布人id
@@ -620,12 +729,18 @@
 						"websiteUrlsStr": this.form.url, //网址
 						"videoBatchId": '',//？
 						"videoBatchIdsStr": '',//？
-						"verifyCode": '', // 验证码
-						"timeStr": '1681263354816',
+						"verifyCode": this.form.code, // 验证码
+						"timeStr": this.timeStr, // 当前时间戳
 					}
 					this.$refs.form.validate().then(res => {
+						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+						}).catch(res => {
+							console.log('oooooo', res)
+							if(res === 103) { // 验证码超时
+								this.updateImageCode() // 更新验证码
+							}
 						})
 						uni.$u.toast('举报成功')
 						wx.navigateTo({
@@ -634,7 +749,7 @@
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
-				}
+				// }
 			},
 			//点击重置
 			reset() {
@@ -672,6 +787,7 @@
 			//附件上传
 			affixUpload(val) {
 				console.log('------', val)
+				const tempFilePaths = res.tempFiles;
 				wx.uploadFile({
 					url: '你的接口地址',
 					filePath: tempFilePaths[0].path,
@@ -748,7 +864,6 @@
 				console.log('生成网址', res)
 				// 网址重复验证
 				const resRepeat = await websiteUrlRepeat({reportWebsiteUrl: res})
-				
 			},
 			// 网站类型举报
 			async webReport() {
diff --git a/packageB/search/search.vue b/packageB/search/search.vue
index 7b622bc..5158d68 100644
--- a/packageB/search/search.vue
+++ b/packageB/search/search.vue
@@ -1,7 +1,7 @@
 <!-- 举报查询 -->
 <template>
 	<view class="search">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: 0;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
 		<view class="search-area">
 			<u-search
 				placeholder="请输入关键字" 
diff --git a/packageB/supervisor/supervisor.vue b/packageB/supervisor/supervisor.vue
index abc5b10..1bb73f7 100644
--- a/packageB/supervisor/supervisor.vue
+++ b/packageB/supervisor/supervisor.vue
@@ -1,7 +1,7 @@
 <!-- 举报指南 -->
 <template>
 	<view class="supervisor">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">成为监督员</view>
 		
 		<!-- 1 -->
diff --git a/packageC/components/noticeList.vue b/packageC/components/noticeList.vue
index 5f8781b..ebe3452 100644
--- a/packageC/components/noticeList.vue
+++ b/packageC/components/noticeList.vue
@@ -37,8 +37,9 @@
 		},
 		methods: {
 			handleClick(val) {
+				const url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageC/components/rumorList.vue b/packageC/components/rumorList.vue
index ec1985d..ed4bb94 100644
--- a/packageC/components/rumorList.vue
+++ b/packageC/components/rumorList.vue
@@ -3,9 +3,20 @@
 		<view class="rumor-item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
 			<view class="left">
 				<text class="title">{{item.title}}</text>
-				<text class="time">{{item.time}}</text>
+				<view style="margin-top: 20rpx;">
+					<text class="time">时间：{{item.publishTime}}</text><br/>
+					<text class="time">来源：{{item.linkAddr ? item.linkAddr : '未知'}}</text>
+				</view>
 			</view>
-			<image :src="imgUrl" style="width: 120px;height: 100px;flex-shrink: 0;" mode=""></image>
+			<!-- <view class="" @click.stop>
+				<image 
+					:src="item.contentSmallImage || this.imgUrl" 
+					style="width: 112px;height: 100px;flex-shrink: 0;" 
+					mode=""
+					@click="preImage(item.contentSmallImage)" 
+					:show-menu-by-longpress="true">
+				</image>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -20,14 +31,24 @@
 		data() {
 			return {
 				imgUrl: 'http://111.198.10.15:11604/png/rumor.png',
-				
 			}
 		},
 		
 		methods: {
 			handleClick(val) {
+				// wx.navigateTo({
+				// 	url: '/packageC/rumorDetail/rumorDetail'
+				// })
+				const url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageC/rumorDetail/rumorDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+				})
+			},
+			// 图片预览
+			preImage(src) {
+				wx.previewImage({
+					current: src, // 当前显示图片的http链接
+					urls: [src] // 需要预览的图片http链接列表
 				})
 			}
 		}
@@ -44,7 +65,7 @@
 			justify-content: space-between;
 			align-items: center;
 			width: 100%;
-			height: 240rpx;
+			height: 280rpx;
 			padding: 20rpx 32rpx;
 			background-color: #fff;
 			box-sizing: border-box;
diff --git a/packageC/notice/notice.vue b/packageC/notice/notice.vue
index ec1c858..1784152 100644
--- a/packageC/notice/notice.vue
+++ b/packageC/notice/notice.vue
@@ -1,7 +1,7 @@
 <!-- 通知公告列表页 -->
 <template>
 	<view class="notice-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
@@ -23,8 +23,7 @@
 		<view class="rumor-area">
 			<NoticeList :list="noticeList"/>
 		</view>
-		<u-loading-icon :show="loadingMore" color="#0043ac" textColor="#0043ac" text="加载中" textSize="16"></u-loading-icon>
-		<!-- <u-loadmore :status="status" loadmoreText=" "/> -->
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" "/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -65,7 +64,7 @@
 				scrollTop: 0,
 				noticeList: [] ,// 列表数据
 				pageIndex: 1, // 请求第几页
-				loadingMore: false, // 是否显示加载中
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -77,9 +76,9 @@
 		},
 		//上滑加载
 		onReachBottom() {
-			this.loadingMore = true
-			this.fetchNoticeList();
+			this.loadingMoreStatus = 'loading'
 			this.pageIndex = this.pageIndex + 1
+			this.fetchNoticeList();
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -113,6 +112,7 @@
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			// 点击搜索
 			search() {
 				
 			},
@@ -120,23 +120,26 @@
 			fetchNoticeList() {
 				const param = {
 					pageIndex: this.pageIndex, //当前页数（必传）
-					pageSize: 2, //每页数 （必传）
+					pageSize: 10, //每页数 （必传）
 					yuzhong: 'zh',//（必传）固定值
 					siteRoleCode: 'xjwljb', //（必传）固定值
 					catalogCode: 'tzgg', //（必传）固定值
 				}
 				getNoticeList(param).then(res => {
-					const list = res.map(item => {
+					let list = []
+					list = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate),
 							linkAddr: item.linkAddr
 						}
 					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
 					this.noticeList = this.noticeList.concat(list)
-					this.loadingMore = false
-					console.log('this.noticeList')
-					console.log(this.noticeList)
 				})
 			},
 		}
diff --git a/packageC/rumorInfo/rumorInfo.vue b/packageC/rumorInfo/rumorInfo.vue
index b88c945..cf81b1d 100644
--- a/packageC/rumorInfo/rumorInfo.vue
+++ b/packageC/rumorInfo/rumorInfo.vue
@@ -1,6 +1,7 @@
+<!-- 辟谣信息列表页 -->
 <template>
 	<view class="rumor-info">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
+		<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: 460rpx;"></image>
 		<view class="title">谣言曝光台</view>
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
@@ -9,7 +10,7 @@
 		<!-- 搜索框 -->
 		<view class="search-area">
 			<u-search
-				placeholder="我要查证" 
+				placeholder="请输入搜索关键字" 
 				v-model="keyword"
 				bgColor="#fff"
 				height="40"
@@ -27,7 +28,7 @@
 		<view class="rumor-area">
 			<RumorList :list="rumorList"/>
 		</view>
-		<u-loadmore :status="status" loadmoreText=" "/>
+		<u-loadmore :status="loadingMoreStatus" loadmoreText=" " :nomore-text="isEmpty ? '' : '没有更多了'"/>
 		<!-- 返回顶部 -->
 		<u-back-top 
 			:scroll-top="scrollTop" 
@@ -56,15 +57,20 @@
 
 <script>
 	import RumorList from '../components/rumorList.vue'
+	import { getPyxxList } from '@/api/index.js'
+	import { stamp2Time } from '@/common/utils.js'
 	export default {
 		components: {
 			RumorList
 		},
 		data() {
 			return {
+				keyword: '', // 搜索关键字
 				isEmpty: false,   //数据是否为空
 				scrollTop: 0,
-				rumorList: [] // 列表数据
+				rumorList: [], // 列表数据
+				pageIndex: 1, // 请求第几页
+				loadingMoreStatus: 'loadmore', // 加载更多
 			}
 		},
 		mounted() {
@@ -72,40 +78,7 @@
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
 			});
-			this.rumorList = [
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-				{
-					title: '薯片涨袋是变质了？',
-					time: '2022-12-12'
-				},
-				{
-					title: '成本是要一毛钱的鸡蛋泛滥？',
-					time: '2022-12-12'
-				},
-			]
+			this.fetchPyxxList() // 获取列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -121,13 +94,21 @@
 				title: '新疆网络举报',
 			}
 		},
+		//上滑加载
+		onReachBottom() {
+			this.loadingMoreStatus = 'loading'
+			this.pageIndex = this.pageIndex + 1
+			this.fetchPyxxList(this.keyword);
+		},
 		watch: {
 			rumorList: {
 				handler(val){
 					if(val.length) {
 						this.isEmpty = false;
 					} else {
-						this.isEmpty = true;
+						if(this.loadingMoreStatus !== 'loadmore') {
+							this.isEmpty = true;
+						}
 					}
 				},
 				deep: true,
@@ -140,7 +121,46 @@
 		},
 		methods: {
 			search() {
-				
+				this.loadingMoreStatus = 'loadmore'
+				this.rumorList = []
+				this.pageIndex = 1
+				this.fetchPyxxList(this.keyword)
+			},
+			// 获取辟谣信息---对应联合辟谣平台的权威发布
+			fetchPyxxList(title = '') {
+				let param
+				if(title === '') {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						// siteRoleCode: 'zzqwxbPortal', // 辟谣课堂
+						// catalogCode: 'yykt' // 辟谣课堂
+						siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+						catalogCode: 'qwfb', // 对应权威发布
+					}
+				} else {
+					param = {
+						pageIndex: this.pageIndex,
+						pageSize: 10,
+						title: title
+					}
+				}
+				getPyxxList(param).then(res => {
+					const list = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title, 
+							contentSmallImage: item.contentSmallImage,
+							publishTime: stamp2Time(item.publishDate), // 发布时间
+							linkAddr: item.linkAddr, // 来源
+						}
+					})
+					if(!list.length || list.length < param.pageSize) {
+						this.loadingMoreStatus = 'nomore'
+					}
+					this.rumorList = this.rumorList.concat(list)
+				})
 			},
 		}
 	}
diff --git a/packageC/rumorWebView/rumorWebView.vue b/packageC/rumorWebView/rumorWebView.vue
index be4d32c..5b21564 100644
--- a/packageC/rumorWebView/rumorWebView.vue
+++ b/packageC/rumorWebView/rumorWebView.vue
@@ -1,5 +1,5 @@
 <template>
-	<web-view :src="url" ></web-view>
+	<web-view :src="getUrl" ></web-view>
 </template>
 
 <script>
@@ -7,11 +7,11 @@
 	export default {
 		data() {
 			return {
-				url: ''
+				getUrl: ''
 			}
 		},
 		mounted() {
-			this.url = decodeURIComponent(getLocationParams('url'));
+			this.getUrl = decodeURIComponent(getLocationParams('url'));
 		},
 	}
 </script>
diff --git a/pages.json b/pages.json
index 486c1be..b51fd14 100644
--- a/pages.json
+++ b/pages.json
@@ -4,7 +4,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"navigationBarBackgroundColor": "#4390f7",
+				"navigationBarBackgroundColor": "#398ae4",
 				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false
 			}
@@ -14,7 +14,7 @@
 				"style" :                                                                                    
 				{
 					"navigationBarTitleText": "我的",
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white",
 					"enablePullDownRefresh": false
 				}      
@@ -25,7 +25,7 @@
 				{
 					"navigationBarTitleText": "侵权举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -35,7 +35,7 @@
 				{
 					"navigationBarTitleText": "谣言查证",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white",
 					"disableScroll": true
 				}
@@ -44,8 +44,8 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "新疆网络举报",
-		"navigationBarBackgroundColor": "#4390f7"
-		// "backgroundColor": "#4390f7"
+		"navigationBarBackgroundColor": "#398ae4"
+		// "backgroundColor": "#398ae4"
 	},
 	"tabBar": {
 		"color": "#424242",
@@ -88,7 +88,7 @@
 				{
 					"navigationBarTitleText": "账号信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}		
 			},
@@ -125,7 +125,7 @@
 				{
 					"navigationBarTitleText": "我的举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -135,7 +135,7 @@
 				{
 					"navigationBarTitleText": "侵权指引",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -145,11 +145,21 @@
 				{
 					"navigationBarTitleText": "案例警醒",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path" : "phones/phones",
+				"style" :                                                                                    
+				{
+					"navigationBarTitleText": "举报电话",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			}
-		]
+			]
 	},
 	{
 		"root": "packageB",//分包名
@@ -160,7 +170,7 @@
 				{
 					"navigationBarTitleText": "举报指南",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -170,7 +180,7 @@
 				{
 					"navigationBarTitleText": "举报查询",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -180,7 +190,7 @@
 				{
 					"navigationBarTitleText": "详细信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -190,7 +200,7 @@
 				{
 					"navigationBarTitleText": "我要举报",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -200,7 +210,7 @@
 					{
 						"navigationBarTitleText": "发布举报",
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#4390f7",
+						"navigationBarBackgroundColor": "#398ae4",
 						"navigationBarTextStyle": "white"
 					}
 			},
@@ -210,7 +220,7 @@
 				{
 					"navigationBarTitleText": "网信信息列表",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -229,7 +239,7 @@
 				{
 					"navigationBarTitleText": "申请流程",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			}
@@ -242,7 +252,7 @@
 				"path" : "rumorWebView/rumorWebView",
 				"style" :                                                                                    
 				{
-					"navigationBarTitleText": "辟谣信息",
+					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false
 				}
 			},
@@ -252,7 +262,7 @@
 				{
 					"navigationBarTitleText": "辟谣信息",
 					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#4390f7",
+					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
 				}
 			},
@@ -272,7 +282,7 @@
 					{
 						"navigationBarTitleText": "通知公告",
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#4390f7",
+						"navigationBarBackgroundColor": "#398ae4",
 						"navigationBarTextStyle": "white"
 					}
 				}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e40537e..42f4d21 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,7 +3,13 @@
 	<view class="index">
 		<!-- <div class='slideShine' style="position:absolute;top: 36rpx;left: 46rpx;z-index: -998;font-size: 50rpx;color: #fff;font-weight: 600;letter-spacing: 4rpx;">新疆网络举报</div> -->
 		<!-- <image style="width: 70px;height: 60px;position:absolute;top: 36rpx;left: 60rpx;z-index: -998" src="http://111.198.10.15:11604/png/share.png"></image> -->
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<view style="position:absolute;top: 36rpx;left: 20rpx;z-index: -998;">
+			<view style="color: #fff;display: flex;justify-content: center;align-items: center;font-size: 36rpx;font-weight: 600;letter-spacing: 2rpx;">
+				<image style="width: 49px;height: 42px;margin-right: 16rpx;" src="http://111.198.10.15:11604/png/share.png"/>
+				<text>新疆互联网违法和不良信息举报中心</text>
+			</view>
+		</view>
+		<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="swiper-area">
 			<swiper class="swiper-box" style="height: 300rpx;" :interval="3000" :indicator-dots="true" :autoplay="true" :circular="circular">
 				<swiper-item v-for="(item ,index) in swiperList" :key="index">
@@ -60,7 +66,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in tzggList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'tzgg')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -74,7 +80,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in pyxxList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'pyxx')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -88,7 +94,7 @@
 			</view>
 			<view class="list">
 				<view class="list-item" v-for="e in aljxList" :key="e.id">
-					<text @click="clickTitle">{{e.title}}</text>
+					<text @click="clickTitle(e, 'aljx')">{{e.title}}</text>
 				</view>
 			</view>
 		</view>
@@ -198,7 +204,7 @@
 					{
 						id: 'aljx',
 						name: '案例警醒',
-						value: 'tzggList'
+						value: 'aljxList'
 					},
 				]
 			}
@@ -210,6 +216,7 @@
 			});
 			this.fetchNoticeList() // 获取通知公告列表
 			this.fetchPyxxList() // 获取辟谣信息列表
+			this.fetchAljxList() // 案例警醒列表
 		},
 		//分享好友
 		onShareAppMessage() {
@@ -270,7 +277,7 @@
 						url: '/packageC/rumorInfo/rumorInfo'
 					})
 				} 
-				if(id === 'tzgg') {
+				if(id === 'tzgg') { // 通知公告
 					wx.navigateTo({
 						url: '/packageC/notice/notice'
 					})
@@ -288,23 +295,50 @@
 				getNoticeList(param).then(res => {
 					this.tzggList = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate)
 						}
 					})
 				})
 			},
-			// 获取辟谣信息
+			// 获取辟谣信息--对应联合辟谣平台的权威发布
 			fetchPyxxList() {
 				const param = {
 					pageIndex: 1,
 					pageSize: 2,
-					siteRoleCode: 'zzqwxbPortal',
-					catalogCode: 'yykt'
+					// siteRoleCode: 'zzqwxbPortal',
+					// catalogCode: 'yykt'
+					siteRoleCode: 'zzqwxbPortal', // 对应权威发布
+					catalogCode: 'qwfb', // 对应权威发布
 				}
 				getPyxxList(param).then(res => {
 					this.pyxxList = res.map(item => {
 						return {
+							catalogId: item.catalogId,
+							id: item.id,
+							title: item.title,
+							publishTime: stamp2Time(item.publishDate)
+						}
+					})
+				})
+			},
+			// 获取案例警醒--对应联合辟谣平台热点聚焦
+			fetchAljxList() {
+				const param = {
+					pageIndex: 1,
+					pageSize: 2,
+					// siteRoleCode: 'zzqwxbPortal',
+					// catalogCode: 'yykt'
+					siteRoleCode: 'zzqwxbPortal', // 对应热点聚焦
+					catalogCode: 'rdjj'
+				}
+				getPyxxList(param).then(res => {
+					this.aljxList = res.map(item => {
+						return {
+							catalogId: item.catalogId,
+							id: item.id,
 							title: item.title,
 							publishTime: stamp2Time(item.publishDate)
 						}
@@ -312,10 +346,17 @@
 				})
 			},
 			// 点击标题
-			clickTitle() {
-				console.log('点击标题')
+			clickTitle(val, type) {
+				let url = '';
+				if(type === 'tzgg') { // 通知公告
+					url = `https://www.xjwljb.com/advice/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				} else if(type === 'pyxx') { // 辟谣信息
+					url = `https://www.xjwljb.com/piyao/web/bulletin/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				} else { // 案例警醒
+					url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
+				}
 				wx.navigateTo({
-					url: '/packageB/messageDetail/messageDetail'
+					url: '/packageC/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
 				})
 			}
 		}
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 805fea9..53eb47e 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,9 +1,9 @@
 <!-- 我的 -->
 <template>
 	<view class="mine">
-		<image src="http://111.198.10.15:11604/png/back.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="card-wrap"> -->
-			
+		
 			<view class="info">
 				<image style="width: 80px;height: 70px;margin-bottom: 32rpx;" src="http://111.198.10.15:11604/png/share.png"></image>
 				<text style="color: #fff;">{{nickName}}</text>
@@ -12,7 +12,7 @@
 		  <view class="card-box">
 		    <view class="card-info">
 					<view class="title">
-					 	<text>举报中心</text>
+					 	<text>我的举报</text>
 					 	<view class="icon-text" @click="handleClick('0')">
 							<text class="text">全部</text>
 							<u-icon name="arrow-right-double" color="#0043ac" size="18"></u-icon>
@@ -36,7 +36,7 @@
 			<view class="account" @click="changePage">
 				<view class="title">
 					<u-icon name="account-fill" color="#408bf6" size="28"></u-icon>
-					<text class="text">平台账号</text>
+					<text class="text">个人信息</text>
 				</view>
 				
 				<u-icon name="arrow-right" color="#0043ac" size="22"></u-icon>
diff --git a/pages/rumor/rumor.vue b/pages/rumor/rumor.vue
index 8fa35d9..b9965a2 100644
--- a/pages/rumor/rumor.vue
+++ b/pages/rumor/rumor.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="rumor">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="button-area">
 			<view class="button" @click="goAnotherMiniProgranm">我来查证</view>
 			<button class="button1 button" open-type="contact" session-from="sessionFrom">线索提交</button>
diff --git a/pages/tort/tort.vue b/pages/tort/tort.vue
index 0f0af3e..9ab0ae4 100644
--- a/pages/tort/tort.vue
+++ b/pages/tort/tort.vue
@@ -1,7 +1,7 @@
 <!-- 举报中心 -->
 <template>
 	<view class="tort">
-		<image src="http://111.198.10.15:11604/png/back_complete.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 300rpx;"></image>
+		<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="center-title">侵权举报</view>
 		<view class="content">
 			<view v-for="(item,index) in tabList" :key="item.id" class="content-main"  @click="changePage(item.id, item.icon)">