diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',
diff --git a/packageIndex/supervisor/supervisor.vue b/packageIndex/supervisor/supervisor.vue
index 55e23a9..ae85c3d 100644
--- a/packageIndex/supervisor/supervisor.vue
+++ b/packageIndex/supervisor/supervisor.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="supervisor">
 		<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="title">申请流程</view>
 		
 		<!-- 1 -->
 		<view class="first">
@@ -22,7 +22,8 @@
 				<text>当地组织报备</text>
 			</view>
 			<view class="content">
-				请将申报表提交所在组织（所在地网信办或所属组织）报备、审查
+				<!-- 请将申报表提交所在组织（所在地网信办或所属组织）报备、审查 -->
+				请将申报表提交所在组织报备、审查
 			</view>
 		</view>
 		<!-- 3 -->
@@ -32,7 +33,8 @@
 				<text>组织审核</text>
 			</view>
 			<view class="content">
-				等待自治区网信办审核通过
+				<!-- 等待自治区网信办审核通过 -->
+				等待审核通过
 			</view>
 		</view>
 	</view>

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',
diff --git a/packageIndex/supervisor/supervisor.vue b/packageIndex/supervisor/supervisor.vue
index 55e23a9..ae85c3d 100644
--- a/packageIndex/supervisor/supervisor.vue
+++ b/packageIndex/supervisor/supervisor.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="supervisor">
 		<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="title">申请流程</view>
 		
 		<!-- 1 -->
 		<view class="first">
@@ -22,7 +22,8 @@
 				<text>当地组织报备</text>
 			</view>
 			<view class="content">
-				请将申报表提交所在组织（所在地网信办或所属组织）报备、审查
+				<!-- 请将申报表提交所在组织（所在地网信办或所属组织）报备、审查 -->
+				请将申报表提交所在组织报备、审查
 			</view>
 		</view>
 		<!-- 3 -->
@@ -32,7 +33,8 @@
 				<text>组织审核</text>
 			</view>
 			<view class="content">
-				等待自治区网信办审核通过
+				<!-- 等待自治区网信办审核通过 -->
+				等待审核通过
 			</view>
 		</view>
 	</view>
diff --git a/packageMine/accountInfo/accountInfo.vue b/packageMine/accountInfo/accountInfo.vue
index 85ae8e8..44e1fd1 100644
--- a/packageMine/accountInfo/accountInfo.vue
+++ b/packageMine/accountInfo/accountInfo.vue
@@ -14,9 +14,12 @@
 		</view>
 		
 		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
-		<view class="button-bottom">
+		<!-- <view class="button-bottom">
 			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
-			<view class="button" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button" @click="changePage('changePassword')">修改密码</view> -->
+		<!-- </view> --> 
+		<view  class="button-bottom">
+			<view class="button" @click="logout">退出登录</view>
 		</view>
 	</view>
 </template>
@@ -139,6 +142,16 @@
 				wx.navigateTo({
 					url: url
 				})
+			},
+			// 退出登录
+			logout() {
+				// 清空存储信息
+				wx.clearStorage()
+				uni.$u.toast('退出成功')
+				// 跳转首页
+				wx.switchTab({
+					url:'/pages/index/index'
+				})
 			}
 		}
 	}

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',
diff --git a/packageIndex/supervisor/supervisor.vue b/packageIndex/supervisor/supervisor.vue
index 55e23a9..ae85c3d 100644
--- a/packageIndex/supervisor/supervisor.vue
+++ b/packageIndex/supervisor/supervisor.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="supervisor">
 		<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="title">申请流程</view>
 		
 		<!-- 1 -->
 		<view class="first">
@@ -22,7 +22,8 @@
 				<text>当地组织报备</text>
 			</view>
 			<view class="content">
-				请将申报表提交所在组织（所在地网信办或所属组织）报备、审查
+				<!-- 请将申报表提交所在组织（所在地网信办或所属组织）报备、审查 -->
+				请将申报表提交所在组织报备、审查
 			</view>
 		</view>
 		<!-- 3 -->
@@ -32,7 +33,8 @@
 				<text>组织审核</text>
 			</view>
 			<view class="content">
-				等待自治区网信办审核通过
+				<!-- 等待自治区网信办审核通过 -->
+				等待审核通过
 			</view>
 		</view>
 	</view>
diff --git a/packageMine/accountInfo/accountInfo.vue b/packageMine/accountInfo/accountInfo.vue
index 85ae8e8..44e1fd1 100644
--- a/packageMine/accountInfo/accountInfo.vue
+++ b/packageMine/accountInfo/accountInfo.vue
@@ -14,9 +14,12 @@
 		</view>
 		
 		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
-		<view class="button-bottom">
+		<!-- <view class="button-bottom">
 			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
-			<view class="button" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button" @click="changePage('changePassword')">修改密码</view> -->
+		<!-- </view> --> 
+		<view  class="button-bottom">
+			<view class="button" @click="logout">退出登录</view>
 		</view>
 	</view>
 </template>
@@ -139,6 +142,16 @@
 				wx.navigateTo({
 					url: url
 				})
+			},
+			// 退出登录
+			logout() {
+				// 清空存储信息
+				wx.clearStorage()
+				uni.$u.toast('退出成功')
+				// 跳转首页
+				wx.switchTab({
+					url:'/pages/index/index'
+				})
 			}
 		}
 	}
diff --git a/packageMine/changePassword/changePassword.vue b/packageMine/changePassword/changePassword.vue
index 5211012..765c168 100644
--- a/packageMine/changePassword/changePassword.vue
+++ b/packageMine/changePassword/changePassword.vue
@@ -122,8 +122,8 @@
 					const userinfo = wx.getStorageSync('userInfoxj')
 					const data = {
 						'userPasswordVo.userId':userinfo.id, // 用户id
-						'userPasswordVo.newPassword':hexMD5(this.form.oldPassword), // 新密码
-						'userPasswordVo.oldPassword':hexMD5(this.form.newPassword), // 旧密码
+						'userPasswordVo.newPassword':hexMD5(this.form.newPassword), // 新密码
+						'userPasswordVo.oldPassword':hexMD5(this.form.oldPassword), // 旧密码
 						'token':''
 					}
 					updateUser(data).then(res => {

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',
diff --git a/packageIndex/supervisor/supervisor.vue b/packageIndex/supervisor/supervisor.vue
index 55e23a9..ae85c3d 100644
--- a/packageIndex/supervisor/supervisor.vue
+++ b/packageIndex/supervisor/supervisor.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="supervisor">
 		<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="title">申请流程</view>
 		
 		<!-- 1 -->
 		<view class="first">
@@ -22,7 +22,8 @@
 				<text>当地组织报备</text>
 			</view>
 			<view class="content">
-				请将申报表提交所在组织（所在地网信办或所属组织）报备、审查
+				<!-- 请将申报表提交所在组织（所在地网信办或所属组织）报备、审查 -->
+				请将申报表提交所在组织报备、审查
 			</view>
 		</view>
 		<!-- 3 -->
@@ -32,7 +33,8 @@
 				<text>组织审核</text>
 			</view>
 			<view class="content">
-				等待自治区网信办审核通过
+				<!-- 等待自治区网信办审核通过 -->
+				等待审核通过
 			</view>
 		</view>
 	</view>
diff --git a/packageMine/accountInfo/accountInfo.vue b/packageMine/accountInfo/accountInfo.vue
index 85ae8e8..44e1fd1 100644
--- a/packageMine/accountInfo/accountInfo.vue
+++ b/packageMine/accountInfo/accountInfo.vue
@@ -14,9 +14,12 @@
 		</view>
 		
 		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
-		<view class="button-bottom">
+		<!-- <view class="button-bottom">
 			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
-			<view class="button" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button" @click="changePage('changePassword')">修改密码</view> -->
+		<!-- </view> --> 
+		<view  class="button-bottom">
+			<view class="button" @click="logout">退出登录</view>
 		</view>
 	</view>
 </template>
@@ -139,6 +142,16 @@
 				wx.navigateTo({
 					url: url
 				})
+			},
+			// 退出登录
+			logout() {
+				// 清空存储信息
+				wx.clearStorage()
+				uni.$u.toast('退出成功')
+				// 跳转首页
+				wx.switchTab({
+					url:'/pages/index/index'
+				})
 			}
 		}
 	}
diff --git a/packageMine/changePassword/changePassword.vue b/packageMine/changePassword/changePassword.vue
index 5211012..765c168 100644
--- a/packageMine/changePassword/changePassword.vue
+++ b/packageMine/changePassword/changePassword.vue
@@ -122,8 +122,8 @@
 					const userinfo = wx.getStorageSync('userInfoxj')
 					const data = {
 						'userPasswordVo.userId':userinfo.id, // 用户id
-						'userPasswordVo.newPassword':hexMD5(this.form.oldPassword), // 新密码
-						'userPasswordVo.oldPassword':hexMD5(this.form.newPassword), // 旧密码
+						'userPasswordVo.newPassword':hexMD5(this.form.newPassword), // 新密码
+						'userPasswordVo.oldPassword':hexMD5(this.form.oldPassword), // 旧密码
 						'token':''
 					}
 					updateUser(data).then(res => {
diff --git a/packageMine/phones/phones.vue b/packageMine/phones/phones.vue
index 1db4f56..95957ae 100644
--- a/packageMine/phones/phones.vue
+++ b/packageMine/phones/phones.vue
@@ -7,7 +7,8 @@
 		<view class="main">
 			<view class="box">
 				<i class="top"></i><i class="bottom"></i>
-				<text>地、州、市</text>
+				<!-- <text>地、州、市</text> -->
+				<text> </text>
 				<text>举报电话</text>
 			</view>
 			<view class="list-item" v-for="(item, index) in phonesList" :key="index">

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',
diff --git a/packageIndex/supervisor/supervisor.vue b/packageIndex/supervisor/supervisor.vue
index 55e23a9..ae85c3d 100644
--- a/packageIndex/supervisor/supervisor.vue
+++ b/packageIndex/supervisor/supervisor.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="supervisor">
 		<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="title">申请流程</view>
 		
 		<!-- 1 -->
 		<view class="first">
@@ -22,7 +22,8 @@
 				<text>当地组织报备</text>
 			</view>
 			<view class="content">
-				请将申报表提交所在组织（所在地网信办或所属组织）报备、审查
+				<!-- 请将申报表提交所在组织（所在地网信办或所属组织）报备、审查 -->
+				请将申报表提交所在组织报备、审查
 			</view>
 		</view>
 		<!-- 3 -->
@@ -32,7 +33,8 @@
 				<text>组织审核</text>
 			</view>
 			<view class="content">
-				等待自治区网信办审核通过
+				<!-- 等待自治区网信办审核通过 -->
+				等待审核通过
 			</view>
 		</view>
 	</view>
diff --git a/packageMine/accountInfo/accountInfo.vue b/packageMine/accountInfo/accountInfo.vue
index 85ae8e8..44e1fd1 100644
--- a/packageMine/accountInfo/accountInfo.vue
+++ b/packageMine/accountInfo/accountInfo.vue
@@ -14,9 +14,12 @@
 		</view>
 		
 		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
-		<view class="button-bottom">
+		<!-- <view class="button-bottom">
 			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
-			<view class="button" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button" @click="changePage('changePassword')">修改密码</view> -->
+		<!-- </view> --> 
+		<view  class="button-bottom">
+			<view class="button" @click="logout">退出登录</view>
 		</view>
 	</view>
 </template>
@@ -139,6 +142,16 @@
 				wx.navigateTo({
 					url: url
 				})
+			},
+			// 退出登录
+			logout() {
+				// 清空存储信息
+				wx.clearStorage()
+				uni.$u.toast('退出成功')
+				// 跳转首页
+				wx.switchTab({
+					url:'/pages/index/index'
+				})
 			}
 		}
 	}
diff --git a/packageMine/changePassword/changePassword.vue b/packageMine/changePassword/changePassword.vue
index 5211012..765c168 100644
--- a/packageMine/changePassword/changePassword.vue
+++ b/packageMine/changePassword/changePassword.vue
@@ -122,8 +122,8 @@
 					const userinfo = wx.getStorageSync('userInfoxj')
 					const data = {
 						'userPasswordVo.userId':userinfo.id, // 用户id
-						'userPasswordVo.newPassword':hexMD5(this.form.oldPassword), // 新密码
-						'userPasswordVo.oldPassword':hexMD5(this.form.newPassword), // 旧密码
+						'userPasswordVo.newPassword':hexMD5(this.form.newPassword), // 新密码
+						'userPasswordVo.oldPassword':hexMD5(this.form.oldPassword), // 旧密码
 						'token':''
 					}
 					updateUser(data).then(res => {
diff --git a/packageMine/phones/phones.vue b/packageMine/phones/phones.vue
index 1db4f56..95957ae 100644
--- a/packageMine/phones/phones.vue
+++ b/packageMine/phones/phones.vue
@@ -7,7 +7,8 @@
 		<view class="main">
 			<view class="box">
 				<i class="top"></i><i class="bottom"></i>
-				<text>地、州、市</text>
+				<!-- <text>地、州、市</text> -->
+				<text> </text>
 				<text>举报电话</text>
 			</view>
 			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
diff --git a/packageToolList/components/noticeList.vue b/packageToolList/components/noticeList.vue
index c69241e..05eb6bd 100644
--- a/packageToolList/components/noticeList.vue
+++ b/packageToolList/components/noticeList.vue
@@ -40,7 +40,7 @@
 				// const url = 'https://www.xjwljb.com/mobile/#/newsDetail?categoryId=9455f9a51c4160d6a9cc30c698a7d383&id=07a151458a1d7df15f843758ab029461'
 				const url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&categoryId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+					url: '/packageToolList/rumorWebView/rumorWebView?type=tzgg&url=' + encodeURIComponent(url)
 				})
 			},
 		}

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',
diff --git a/packageIndex/supervisor/supervisor.vue b/packageIndex/supervisor/supervisor.vue
index 55e23a9..ae85c3d 100644
--- a/packageIndex/supervisor/supervisor.vue
+++ b/packageIndex/supervisor/supervisor.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="supervisor">
 		<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="title">申请流程</view>
 		
 		<!-- 1 -->
 		<view class="first">
@@ -22,7 +22,8 @@
 				<text>当地组织报备</text>
 			</view>
 			<view class="content">
-				请将申报表提交所在组织（所在地网信办或所属组织）报备、审查
+				<!-- 请将申报表提交所在组织（所在地网信办或所属组织）报备、审查 -->
+				请将申报表提交所在组织报备、审查
 			</view>
 		</view>
 		<!-- 3 -->
@@ -32,7 +33,8 @@
 				<text>组织审核</text>
 			</view>
 			<view class="content">
-				等待自治区网信办审核通过
+				<!-- 等待自治区网信办审核通过 -->
+				等待审核通过
 			</view>
 		</view>
 	</view>
diff --git a/packageMine/accountInfo/accountInfo.vue b/packageMine/accountInfo/accountInfo.vue
index 85ae8e8..44e1fd1 100644
--- a/packageMine/accountInfo/accountInfo.vue
+++ b/packageMine/accountInfo/accountInfo.vue
@@ -14,9 +14,12 @@
 		</view>
 		
 		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
-		<view class="button-bottom">
+		<!-- <view class="button-bottom">
 			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
-			<view class="button" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button" @click="changePage('changePassword')">修改密码</view> -->
+		<!-- </view> --> 
+		<view  class="button-bottom">
+			<view class="button" @click="logout">退出登录</view>
 		</view>
 	</view>
 </template>
@@ -139,6 +142,16 @@
 				wx.navigateTo({
 					url: url
 				})
+			},
+			// 退出登录
+			logout() {
+				// 清空存储信息
+				wx.clearStorage()
+				uni.$u.toast('退出成功')
+				// 跳转首页
+				wx.switchTab({
+					url:'/pages/index/index'
+				})
 			}
 		}
 	}
diff --git a/packageMine/changePassword/changePassword.vue b/packageMine/changePassword/changePassword.vue
index 5211012..765c168 100644
--- a/packageMine/changePassword/changePassword.vue
+++ b/packageMine/changePassword/changePassword.vue
@@ -122,8 +122,8 @@
 					const userinfo = wx.getStorageSync('userInfoxj')
 					const data = {
 						'userPasswordVo.userId':userinfo.id, // 用户id
-						'userPasswordVo.newPassword':hexMD5(this.form.oldPassword), // 新密码
-						'userPasswordVo.oldPassword':hexMD5(this.form.newPassword), // 旧密码
+						'userPasswordVo.newPassword':hexMD5(this.form.newPassword), // 新密码
+						'userPasswordVo.oldPassword':hexMD5(this.form.oldPassword), // 旧密码
 						'token':''
 					}
 					updateUser(data).then(res => {
diff --git a/packageMine/phones/phones.vue b/packageMine/phones/phones.vue
index 1db4f56..95957ae 100644
--- a/packageMine/phones/phones.vue
+++ b/packageMine/phones/phones.vue
@@ -7,7 +7,8 @@
 		<view class="main">
 			<view class="box">
 				<i class="top"></i><i class="bottom"></i>
-				<text>地、州、市</text>
+				<!-- <text>地、州、市</text> -->
+				<text> </text>
 				<text>举报电话</text>
 			</view>
 			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
diff --git a/packageToolList/components/noticeList.vue b/packageToolList/components/noticeList.vue
index c69241e..05eb6bd 100644
--- a/packageToolList/components/noticeList.vue
+++ b/packageToolList/components/noticeList.vue
@@ -40,7 +40,7 @@
 				// const url = 'https://www.xjwljb.com/mobile/#/newsDetail?categoryId=9455f9a51c4160d6a9cc30c698a7d383&id=07a151458a1d7df15f843758ab029461'
 				const url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&categoryId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+					url: '/packageToolList/rumorWebView/rumorWebView?type=tzgg&url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageToolList/rumorInfo/rumorInfo.vue b/packageToolList/rumorInfo/rumorInfo.vue
index 04586d4..6806a02 100644
--- a/packageToolList/rumorInfo/rumorInfo.vue
+++ b/packageToolList/rumorInfo/rumorInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="rumor-info">
 		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
-		<view class="title">谣言曝光台</view>
+		<!-- <view class="title">谣言曝光台</view> -->
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
 			<text style="margin-left: 32rpx;">共建清朗网络空间</text>
@@ -202,7 +202,7 @@
 			width: 100%;
 			height: 130rpx;
 			box-sizing: border-box;
-			margin-top: 106rpx;
+			margin-top: 50rpx;
 		}
 	}
  

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',
diff --git a/packageIndex/supervisor/supervisor.vue b/packageIndex/supervisor/supervisor.vue
index 55e23a9..ae85c3d 100644
--- a/packageIndex/supervisor/supervisor.vue
+++ b/packageIndex/supervisor/supervisor.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="supervisor">
 		<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="title">申请流程</view>
 		
 		<!-- 1 -->
 		<view class="first">
@@ -22,7 +22,8 @@
 				<text>当地组织报备</text>
 			</view>
 			<view class="content">
-				请将申报表提交所在组织（所在地网信办或所属组织）报备、审查
+				<!-- 请将申报表提交所在组织（所在地网信办或所属组织）报备、审查 -->
+				请将申报表提交所在组织报备、审查
 			</view>
 		</view>
 		<!-- 3 -->
@@ -32,7 +33,8 @@
 				<text>组织审核</text>
 			</view>
 			<view class="content">
-				等待自治区网信办审核通过
+				<!-- 等待自治区网信办审核通过 -->
+				等待审核通过
 			</view>
 		</view>
 	</view>
diff --git a/packageMine/accountInfo/accountInfo.vue b/packageMine/accountInfo/accountInfo.vue
index 85ae8e8..44e1fd1 100644
--- a/packageMine/accountInfo/accountInfo.vue
+++ b/packageMine/accountInfo/accountInfo.vue
@@ -14,9 +14,12 @@
 		</view>
 		
 		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
-		<view class="button-bottom">
+		<!-- <view class="button-bottom">
 			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
-			<view class="button" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button" @click="changePage('changePassword')">修改密码</view> -->
+		<!-- </view> --> 
+		<view  class="button-bottom">
+			<view class="button" @click="logout">退出登录</view>
 		</view>
 	</view>
 </template>
@@ -139,6 +142,16 @@
 				wx.navigateTo({
 					url: url
 				})
+			},
+			// 退出登录
+			logout() {
+				// 清空存储信息
+				wx.clearStorage()
+				uni.$u.toast('退出成功')
+				// 跳转首页
+				wx.switchTab({
+					url:'/pages/index/index'
+				})
 			}
 		}
 	}
diff --git a/packageMine/changePassword/changePassword.vue b/packageMine/changePassword/changePassword.vue
index 5211012..765c168 100644
--- a/packageMine/changePassword/changePassword.vue
+++ b/packageMine/changePassword/changePassword.vue
@@ -122,8 +122,8 @@
 					const userinfo = wx.getStorageSync('userInfoxj')
 					const data = {
 						'userPasswordVo.userId':userinfo.id, // 用户id
-						'userPasswordVo.newPassword':hexMD5(this.form.oldPassword), // 新密码
-						'userPasswordVo.oldPassword':hexMD5(this.form.newPassword), // 旧密码
+						'userPasswordVo.newPassword':hexMD5(this.form.newPassword), // 新密码
+						'userPasswordVo.oldPassword':hexMD5(this.form.oldPassword), // 旧密码
 						'token':''
 					}
 					updateUser(data).then(res => {
diff --git a/packageMine/phones/phones.vue b/packageMine/phones/phones.vue
index 1db4f56..95957ae 100644
--- a/packageMine/phones/phones.vue
+++ b/packageMine/phones/phones.vue
@@ -7,7 +7,8 @@
 		<view class="main">
 			<view class="box">
 				<i class="top"></i><i class="bottom"></i>
-				<text>地、州、市</text>
+				<!-- <text>地、州、市</text> -->
+				<text> </text>
 				<text>举报电话</text>
 			</view>
 			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
diff --git a/packageToolList/components/noticeList.vue b/packageToolList/components/noticeList.vue
index c69241e..05eb6bd 100644
--- a/packageToolList/components/noticeList.vue
+++ b/packageToolList/components/noticeList.vue
@@ -40,7 +40,7 @@
 				// const url = 'https://www.xjwljb.com/mobile/#/newsDetail?categoryId=9455f9a51c4160d6a9cc30c698a7d383&id=07a151458a1d7df15f843758ab029461'
 				const url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&categoryId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+					url: '/packageToolList/rumorWebView/rumorWebView?type=tzgg&url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageToolList/rumorInfo/rumorInfo.vue b/packageToolList/rumorInfo/rumorInfo.vue
index 04586d4..6806a02 100644
--- a/packageToolList/rumorInfo/rumorInfo.vue
+++ b/packageToolList/rumorInfo/rumorInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="rumor-info">
 		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
-		<view class="title">谣言曝光台</view>
+		<!-- <view class="title">谣言曝光台</view> -->
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
 			<text style="margin-left: 32rpx;">共建清朗网络空间</text>
@@ -202,7 +202,7 @@
 			width: 100%;
 			height: 130rpx;
 			box-sizing: border-box;
-			margin-top: 106rpx;
+			margin-top: 50rpx;
 		}
 	}
  
diff --git a/packageToolList/rumorWebView/rumorWebView.vue b/packageToolList/rumorWebView/rumorWebView.vue
index 4acfeba..b3dfd83 100644
--- a/packageToolList/rumorWebView/rumorWebView.vue
+++ b/packageToolList/rumorWebView/rumorWebView.vue
@@ -13,6 +13,16 @@
 		},
 		mounted() {
 			this.getUrl = decodeURIComponent(getLocationParams('url'));
+			// 通知公告的h5显示 -> 通知公告
+			// if (getLocationParams('type') === 'tzgg') {
+			// 	setTimeout(() => {
+			// 		wx.setNavigationBarTitle({
+			// 		  title: "111",
+			// 		});
+			// 	},2000)
+			// }
+			
+			
 		},
 	}
 </script>

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',
diff --git a/packageIndex/supervisor/supervisor.vue b/packageIndex/supervisor/supervisor.vue
index 55e23a9..ae85c3d 100644
--- a/packageIndex/supervisor/supervisor.vue
+++ b/packageIndex/supervisor/supervisor.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="supervisor">
 		<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="title">申请流程</view>
 		
 		<!-- 1 -->
 		<view class="first">
@@ -22,7 +22,8 @@
 				<text>当地组织报备</text>
 			</view>
 			<view class="content">
-				请将申报表提交所在组织（所在地网信办或所属组织）报备、审查
+				<!-- 请将申报表提交所在组织（所在地网信办或所属组织）报备、审查 -->
+				请将申报表提交所在组织报备、审查
 			</view>
 		</view>
 		<!-- 3 -->
@@ -32,7 +33,8 @@
 				<text>组织审核</text>
 			</view>
 			<view class="content">
-				等待自治区网信办审核通过
+				<!-- 等待自治区网信办审核通过 -->
+				等待审核通过
 			</view>
 		</view>
 	</view>
diff --git a/packageMine/accountInfo/accountInfo.vue b/packageMine/accountInfo/accountInfo.vue
index 85ae8e8..44e1fd1 100644
--- a/packageMine/accountInfo/accountInfo.vue
+++ b/packageMine/accountInfo/accountInfo.vue
@@ -14,9 +14,12 @@
 		</view>
 		
 		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
-		<view class="button-bottom">
+		<!-- <view class="button-bottom">
 			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
-			<view class="button" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button" @click="changePage('changePassword')">修改密码</view> -->
+		<!-- </view> --> 
+		<view  class="button-bottom">
+			<view class="button" @click="logout">退出登录</view>
 		</view>
 	</view>
 </template>
@@ -139,6 +142,16 @@
 				wx.navigateTo({
 					url: url
 				})
+			},
+			// 退出登录
+			logout() {
+				// 清空存储信息
+				wx.clearStorage()
+				uni.$u.toast('退出成功')
+				// 跳转首页
+				wx.switchTab({
+					url:'/pages/index/index'
+				})
 			}
 		}
 	}
diff --git a/packageMine/changePassword/changePassword.vue b/packageMine/changePassword/changePassword.vue
index 5211012..765c168 100644
--- a/packageMine/changePassword/changePassword.vue
+++ b/packageMine/changePassword/changePassword.vue
@@ -122,8 +122,8 @@
 					const userinfo = wx.getStorageSync('userInfoxj')
 					const data = {
 						'userPasswordVo.userId':userinfo.id, // 用户id
-						'userPasswordVo.newPassword':hexMD5(this.form.oldPassword), // 新密码
-						'userPasswordVo.oldPassword':hexMD5(this.form.newPassword), // 旧密码
+						'userPasswordVo.newPassword':hexMD5(this.form.newPassword), // 新密码
+						'userPasswordVo.oldPassword':hexMD5(this.form.oldPassword), // 旧密码
 						'token':''
 					}
 					updateUser(data).then(res => {
diff --git a/packageMine/phones/phones.vue b/packageMine/phones/phones.vue
index 1db4f56..95957ae 100644
--- a/packageMine/phones/phones.vue
+++ b/packageMine/phones/phones.vue
@@ -7,7 +7,8 @@
 		<view class="main">
 			<view class="box">
 				<i class="top"></i><i class="bottom"></i>
-				<text>地、州、市</text>
+				<!-- <text>地、州、市</text> -->
+				<text> </text>
 				<text>举报电话</text>
 			</view>
 			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
diff --git a/packageToolList/components/noticeList.vue b/packageToolList/components/noticeList.vue
index c69241e..05eb6bd 100644
--- a/packageToolList/components/noticeList.vue
+++ b/packageToolList/components/noticeList.vue
@@ -40,7 +40,7 @@
 				// const url = 'https://www.xjwljb.com/mobile/#/newsDetail?categoryId=9455f9a51c4160d6a9cc30c698a7d383&id=07a151458a1d7df15f843758ab029461'
 				const url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&categoryId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+					url: '/packageToolList/rumorWebView/rumorWebView?type=tzgg&url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageToolList/rumorInfo/rumorInfo.vue b/packageToolList/rumorInfo/rumorInfo.vue
index 04586d4..6806a02 100644
--- a/packageToolList/rumorInfo/rumorInfo.vue
+++ b/packageToolList/rumorInfo/rumorInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="rumor-info">
 		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
-		<view class="title">谣言曝光台</view>
+		<!-- <view class="title">谣言曝光台</view> -->
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
 			<text style="margin-left: 32rpx;">共建清朗网络空间</text>
@@ -202,7 +202,7 @@
 			width: 100%;
 			height: 130rpx;
 			box-sizing: border-box;
-			margin-top: 106rpx;
+			margin-top: 50rpx;
 		}
 	}
  
diff --git a/packageToolList/rumorWebView/rumorWebView.vue b/packageToolList/rumorWebView/rumorWebView.vue
index 4acfeba..b3dfd83 100644
--- a/packageToolList/rumorWebView/rumorWebView.vue
+++ b/packageToolList/rumorWebView/rumorWebView.vue
@@ -13,6 +13,16 @@
 		},
 		mounted() {
 			this.getUrl = decodeURIComponent(getLocationParams('url'));
+			// 通知公告的h5显示 -> 通知公告
+			// if (getLocationParams('type') === 'tzgg') {
+			// 	setTimeout(() => {
+			// 		wx.setNavigationBarTitle({
+			// 		  title: "111",
+			// 		});
+			// 	},2000)
+			// }
+			
+			
 		},
 	}
 </script>
diff --git a/pages.json b/pages.json
index e475694..c06d303 100644
--- a/pages.json
+++ b/pages.json
@@ -238,7 +238,7 @@
 				"path" : "supervisor/supervisor",
 				"style" :                                                                                    
 				{
-					"navigationBarTitleText": "申请流程",
+					"navigationBarTitleText": "加入我们",
 					"enablePullDownRefresh": false,
 					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',
diff --git a/packageIndex/supervisor/supervisor.vue b/packageIndex/supervisor/supervisor.vue
index 55e23a9..ae85c3d 100644
--- a/packageIndex/supervisor/supervisor.vue
+++ b/packageIndex/supervisor/supervisor.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="supervisor">
 		<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="title">申请流程</view>
 		
 		<!-- 1 -->
 		<view class="first">
@@ -22,7 +22,8 @@
 				<text>当地组织报备</text>
 			</view>
 			<view class="content">
-				请将申报表提交所在组织（所在地网信办或所属组织）报备、审查
+				<!-- 请将申报表提交所在组织（所在地网信办或所属组织）报备、审查 -->
+				请将申报表提交所在组织报备、审查
 			</view>
 		</view>
 		<!-- 3 -->
@@ -32,7 +33,8 @@
 				<text>组织审核</text>
 			</view>
 			<view class="content">
-				等待自治区网信办审核通过
+				<!-- 等待自治区网信办审核通过 -->
+				等待审核通过
 			</view>
 		</view>
 	</view>
diff --git a/packageMine/accountInfo/accountInfo.vue b/packageMine/accountInfo/accountInfo.vue
index 85ae8e8..44e1fd1 100644
--- a/packageMine/accountInfo/accountInfo.vue
+++ b/packageMine/accountInfo/accountInfo.vue
@@ -14,9 +14,12 @@
 		</view>
 		
 		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
-		<view class="button-bottom">
+		<!-- <view class="button-bottom">
 			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
-			<view class="button" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button" @click="changePage('changePassword')">修改密码</view> -->
+		<!-- </view> --> 
+		<view  class="button-bottom">
+			<view class="button" @click="logout">退出登录</view>
 		</view>
 	</view>
 </template>
@@ -139,6 +142,16 @@
 				wx.navigateTo({
 					url: url
 				})
+			},
+			// 退出登录
+			logout() {
+				// 清空存储信息
+				wx.clearStorage()
+				uni.$u.toast('退出成功')
+				// 跳转首页
+				wx.switchTab({
+					url:'/pages/index/index'
+				})
 			}
 		}
 	}
diff --git a/packageMine/changePassword/changePassword.vue b/packageMine/changePassword/changePassword.vue
index 5211012..765c168 100644
--- a/packageMine/changePassword/changePassword.vue
+++ b/packageMine/changePassword/changePassword.vue
@@ -122,8 +122,8 @@
 					const userinfo = wx.getStorageSync('userInfoxj')
 					const data = {
 						'userPasswordVo.userId':userinfo.id, // 用户id
-						'userPasswordVo.newPassword':hexMD5(this.form.oldPassword), // 新密码
-						'userPasswordVo.oldPassword':hexMD5(this.form.newPassword), // 旧密码
+						'userPasswordVo.newPassword':hexMD5(this.form.newPassword), // 新密码
+						'userPasswordVo.oldPassword':hexMD5(this.form.oldPassword), // 旧密码
 						'token':''
 					}
 					updateUser(data).then(res => {
diff --git a/packageMine/phones/phones.vue b/packageMine/phones/phones.vue
index 1db4f56..95957ae 100644
--- a/packageMine/phones/phones.vue
+++ b/packageMine/phones/phones.vue
@@ -7,7 +7,8 @@
 		<view class="main">
 			<view class="box">
 				<i class="top"></i><i class="bottom"></i>
-				<text>地、州、市</text>
+				<!-- <text>地、州、市</text> -->
+				<text> </text>
 				<text>举报电话</text>
 			</view>
 			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
diff --git a/packageToolList/components/noticeList.vue b/packageToolList/components/noticeList.vue
index c69241e..05eb6bd 100644
--- a/packageToolList/components/noticeList.vue
+++ b/packageToolList/components/noticeList.vue
@@ -40,7 +40,7 @@
 				// const url = 'https://www.xjwljb.com/mobile/#/newsDetail?categoryId=9455f9a51c4160d6a9cc30c698a7d383&id=07a151458a1d7df15f843758ab029461'
 				const url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&categoryId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+					url: '/packageToolList/rumorWebView/rumorWebView?type=tzgg&url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageToolList/rumorInfo/rumorInfo.vue b/packageToolList/rumorInfo/rumorInfo.vue
index 04586d4..6806a02 100644
--- a/packageToolList/rumorInfo/rumorInfo.vue
+++ b/packageToolList/rumorInfo/rumorInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="rumor-info">
 		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
-		<view class="title">谣言曝光台</view>
+		<!-- <view class="title">谣言曝光台</view> -->
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
 			<text style="margin-left: 32rpx;">共建清朗网络空间</text>
@@ -202,7 +202,7 @@
 			width: 100%;
 			height: 130rpx;
 			box-sizing: border-box;
-			margin-top: 106rpx;
+			margin-top: 50rpx;
 		}
 	}
  
diff --git a/packageToolList/rumorWebView/rumorWebView.vue b/packageToolList/rumorWebView/rumorWebView.vue
index 4acfeba..b3dfd83 100644
--- a/packageToolList/rumorWebView/rumorWebView.vue
+++ b/packageToolList/rumorWebView/rumorWebView.vue
@@ -13,6 +13,16 @@
 		},
 		mounted() {
 			this.getUrl = decodeURIComponent(getLocationParams('url'));
+			// 通知公告的h5显示 -> 通知公告
+			// if (getLocationParams('type') === 'tzgg') {
+			// 	setTimeout(() => {
+			// 		wx.setNavigationBarTitle({
+			// 		  title: "111",
+			// 		});
+			// 	},2000)
+			// }
+			
+			
 		},
 	}
 </script>
diff --git a/pages.json b/pages.json
index e475694..c06d303 100644
--- a/pages.json
+++ b/pages.json
@@ -238,7 +238,7 @@
 				"path" : "supervisor/supervisor",
 				"style" :                                                                                    
 				{
-					"navigationBarTitleText": "申请流程",
+					"navigationBarTitleText": "加入我们",
 					"enablePullDownRefresh": false,
 					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0c634d8..2c8b96c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -346,9 +346,16 @@
 				} else { // 案例警醒
 					url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				}
-				wx.navigateTo({
-					url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				})
+				if (type === 'tzgg') {
+					wx.navigateTo({
+						url: '/packageToolList/rumorWebView/rumorWebView?type=tzgg&url=' + encodeURIComponent(url)
+					})
+				} else {
+					wx.navigateTo({
+						url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+					})
+				}
+				
 			}
 		}
 	}

diff --git a/components/card.vue b/components/card.vue
index 1022aa1..350785b 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -29,11 +29,11 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real" @click="vote(true)">
+					<view class="real"  v-if="Number.parseFloat(currentShow.approveRate) > 0" :style="{width: Number.parseFloat(currentShow.approveRate) + '%' }" @click="vote(true)">
 						<text>真</text>
 						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail" @click="vote(false)">
+					<view class="fail" v-if="Number.parseFloat(currentShow.againstRate) > 0" :style="{width: Number.parseFloat(currentShow.againstRate) + '%' }" @click="vote(false)">
 						<text>假</text>
 						<text>{{currentShow.againstRate}}</text>
 					</view>
@@ -46,6 +46,7 @@
 <script>  
   import { getTouchPoint, getElSize } from '@/common/utils.js'  
 	import { isVote, addVote } from '@/api/rumor.js'
+	import { decryption } from '../api/mine.js'
     export default {  
 			props: {  
 				pages: {  
@@ -141,13 +142,16 @@
 				'currentShow':{
 					immediate:true,
 					deep:true,
-					handler(newVal){
+					async handler(newVal){
 						if (this.currentShow) {
 							const userinfo = wx.getStorageSync('userInfoxj')
-							// this.isVoteFlag = false
+							let phone = ''
+							if (userinfo?.phone) {
+							   phone = await decryption(userinfo.phone)
+							}
 							const params = {
 								rumorId:this.currentShow.id, // id
-								votePerson:userinfo.phone ?userinfo.phone  : this.id // 用户唯一标识
+								votePerson:phone ? phone  : this.id // 用户唯一标识
 							}
 							// 查询用户是否投票
 							isVote(params).then(res => {
@@ -161,7 +165,7 @@
 			},
 			methods: {  
 				// 点击真假进行投票
-				vote(flag) {
+				async vote(flag) {
 					// 已经投票
 					if(this.isVoteFlag) {
 						uni.$u.toast('您已投过票，自动跳转下一个')
@@ -170,9 +174,13 @@
 					}
 					// 未投票
 					const userinfo = wx.getStorageSync('userInfoxj')
+					let phone = ''
+					if (userinfo?.phone) {
+					   phone = await decryption(userinfo.phone)
+					}
 					const params = {
 						rumorId:this.currentShow.id,
-						votePerson:userinfo.phone ?userinfo.phone  : this.id, // 用户唯一标识
+						votePerson:phone ? phone  : this.id, // 用户唯一标识
 						status: flag ? '1' : '0'
 					}
 					addVote(params).then(res => {
@@ -491,7 +499,7 @@
 						.real {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							padding: 0 10rpx;
 							// border: 2rpx solid green;
 							border-right: none;
@@ -500,7 +508,7 @@
 						.fail {
 							display: flex;
 							justify-content: space-between;
-							flex: 1;
+							// flex: 1;
 							text-align: right;
 							background-color: #cc463d;
 							padding: 0 10rpx;
diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue
index c775a25..c6ebc20 100644
--- a/packageIndex/center/center.vue
+++ b/packageIndex/center/center.vue
@@ -84,7 +84,7 @@
 					{
 						id: '1',
 						type: 'web',
-						label: '涉领导人类',
+						label: '政治安全类',
 						icon: 'http://111.198.10.15:11404/imgs/xj/涉领导人类.png'
 					},
 					{
diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index ad10202..1151356 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -399,7 +399,7 @@
 				reportTypeColumns: [[  //举报类型
 					{
 						id: '1',
-						label: '涉领导人类'
+						label: '政治安全类'
 					},
 					{
 						id: '2',
diff --git a/packageIndex/supervisor/supervisor.vue b/packageIndex/supervisor/supervisor.vue
index 55e23a9..ae85c3d 100644
--- a/packageIndex/supervisor/supervisor.vue
+++ b/packageIndex/supervisor/supervisor.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="supervisor">
 		<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="title">申请流程</view>
 		
 		<!-- 1 -->
 		<view class="first">
@@ -22,7 +22,8 @@
 				<text>当地组织报备</text>
 			</view>
 			<view class="content">
-				请将申报表提交所在组织（所在地网信办或所属组织）报备、审查
+				<!-- 请将申报表提交所在组织（所在地网信办或所属组织）报备、审查 -->
+				请将申报表提交所在组织报备、审查
 			</view>
 		</view>
 		<!-- 3 -->
@@ -32,7 +33,8 @@
 				<text>组织审核</text>
 			</view>
 			<view class="content">
-				等待自治区网信办审核通过
+				<!-- 等待自治区网信办审核通过 -->
+				等待审核通过
 			</view>
 		</view>
 	</view>
diff --git a/packageMine/accountInfo/accountInfo.vue b/packageMine/accountInfo/accountInfo.vue
index 85ae8e8..44e1fd1 100644
--- a/packageMine/accountInfo/accountInfo.vue
+++ b/packageMine/accountInfo/accountInfo.vue
@@ -14,9 +14,12 @@
 		</view>
 		
 		<!-- <view class="button" @click="changePage('accountBound')">{{isShowInfo ? '绑定' : '重新绑定'}}</view> -->
-		<view class="button-bottom">
+		<!-- <view class="button-bottom">
 			<!-- <view class="button button-left" @click="changePage('register')">用户注册</view> -->
-			<view class="button" @click="changePage('changePassword')">修改密码</view>
+			<!-- <view class="button" @click="changePage('changePassword')">修改密码</view> -->
+		<!-- </view> --> 
+		<view  class="button-bottom">
+			<view class="button" @click="logout">退出登录</view>
 		</view>
 	</view>
 </template>
@@ -139,6 +142,16 @@
 				wx.navigateTo({
 					url: url
 				})
+			},
+			// 退出登录
+			logout() {
+				// 清空存储信息
+				wx.clearStorage()
+				uni.$u.toast('退出成功')
+				// 跳转首页
+				wx.switchTab({
+					url:'/pages/index/index'
+				})
 			}
 		}
 	}
diff --git a/packageMine/changePassword/changePassword.vue b/packageMine/changePassword/changePassword.vue
index 5211012..765c168 100644
--- a/packageMine/changePassword/changePassword.vue
+++ b/packageMine/changePassword/changePassword.vue
@@ -122,8 +122,8 @@
 					const userinfo = wx.getStorageSync('userInfoxj')
 					const data = {
 						'userPasswordVo.userId':userinfo.id, // 用户id
-						'userPasswordVo.newPassword':hexMD5(this.form.oldPassword), // 新密码
-						'userPasswordVo.oldPassword':hexMD5(this.form.newPassword), // 旧密码
+						'userPasswordVo.newPassword':hexMD5(this.form.newPassword), // 新密码
+						'userPasswordVo.oldPassword':hexMD5(this.form.oldPassword), // 旧密码
 						'token':''
 					}
 					updateUser(data).then(res => {
diff --git a/packageMine/phones/phones.vue b/packageMine/phones/phones.vue
index 1db4f56..95957ae 100644
--- a/packageMine/phones/phones.vue
+++ b/packageMine/phones/phones.vue
@@ -7,7 +7,8 @@
 		<view class="main">
 			<view class="box">
 				<i class="top"></i><i class="bottom"></i>
-				<text>地、州、市</text>
+				<!-- <text>地、州、市</text> -->
+				<text> </text>
 				<text>举报电话</text>
 			</view>
 			<view class="list-item" v-for="(item, index) in phonesList" :key="index">
diff --git a/packageToolList/components/noticeList.vue b/packageToolList/components/noticeList.vue
index c69241e..05eb6bd 100644
--- a/packageToolList/components/noticeList.vue
+++ b/packageToolList/components/noticeList.vue
@@ -40,7 +40,7 @@
 				// const url = 'https://www.xjwljb.com/mobile/#/newsDetail?categoryId=9455f9a51c4160d6a9cc30c698a7d383&id=07a151458a1d7df15f843758ab029461'
 				const url = `https://www.xjwljb.com/mobile/#/newsDetail?id=${val.id}&categoryId=${val.catalogId}`
 				wx.navigateTo({
-					url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+					url: '/packageToolList/rumorWebView/rumorWebView?type=tzgg&url=' + encodeURIComponent(url)
 				})
 			},
 		}
diff --git a/packageToolList/rumorInfo/rumorInfo.vue b/packageToolList/rumorInfo/rumorInfo.vue
index 04586d4..6806a02 100644
--- a/packageToolList/rumorInfo/rumorInfo.vue
+++ b/packageToolList/rumorInfo/rumorInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="rumor-info">
 		<image src="http://111.198.10.15:11604/png/back_ts.png" style="position:absolute;top: -4rpx;left: 0;z-index: -999; width:100%;height: 460rpx;"></image>
-		<view class="title">谣言曝光台</view>
+		<!-- <view class="title">谣言曝光台</view> -->
 		<view class="little-title">
 			<text>自觉抵制网络谣言</text>
 			<text style="margin-left: 32rpx;">共建清朗网络空间</text>
@@ -202,7 +202,7 @@
 			width: 100%;
 			height: 130rpx;
 			box-sizing: border-box;
-			margin-top: 106rpx;
+			margin-top: 50rpx;
 		}
 	}
  
diff --git a/packageToolList/rumorWebView/rumorWebView.vue b/packageToolList/rumorWebView/rumorWebView.vue
index 4acfeba..b3dfd83 100644
--- a/packageToolList/rumorWebView/rumorWebView.vue
+++ b/packageToolList/rumorWebView/rumorWebView.vue
@@ -13,6 +13,16 @@
 		},
 		mounted() {
 			this.getUrl = decodeURIComponent(getLocationParams('url'));
+			// 通知公告的h5显示 -> 通知公告
+			// if (getLocationParams('type') === 'tzgg') {
+			// 	setTimeout(() => {
+			// 		wx.setNavigationBarTitle({
+			// 		  title: "111",
+			// 		});
+			// 	},2000)
+			// }
+			
+			
 		},
 	}
 </script>
diff --git a/pages.json b/pages.json
index e475694..c06d303 100644
--- a/pages.json
+++ b/pages.json
@@ -238,7 +238,7 @@
 				"path" : "supervisor/supervisor",
 				"style" :                                                                                    
 				{
-					"navigationBarTitleText": "申请流程",
+					"navigationBarTitleText": "加入我们",
 					"enablePullDownRefresh": false,
 					"navigationBarBackgroundColor": "#398ae4",
 					"navigationBarTextStyle": "white"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0c634d8..2c8b96c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -346,9 +346,16 @@
 				} else { // 案例警醒
 					url = `https://www.xjwljb.com/piyao/web/hotSpotFocus/newInfo?id=${val.id}&catalogId=${val.catalogId}`
 				}
-				wx.navigateTo({
-					url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
-				})
+				if (type === 'tzgg') {
+					wx.navigateTo({
+						url: '/packageToolList/rumorWebView/rumorWebView?type=tzgg&url=' + encodeURIComponent(url)
+					})
+				} else {
+					wx.navigateTo({
+						url: '/packageToolList/rumorWebView/rumorWebView?url=' + encodeURIComponent(url)
+					})
+				}
+				
 			}
 		}
 	}
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 2e53bce..b42c399 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -6,7 +6,7 @@
 		
 			<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>
+				<!-- <text style="color: #fff;">{{nickName}}</text> -->
 			</view>
 			
 		  <view class="card-box">
@@ -41,6 +41,14 @@
 				
 				<u-icon name="arrow-right" color="#0043ac" size="22"></u-icon>
 			</view>
+			<view class="account" @click="changePassword">
+				<view class="title">
+					<u-icon name="setting-fill" color="#408bf6" size="28"></u-icon>
+					<text class="text">修改密码</text>
+				</view>
+				
+				<u-icon name="arrow-right" color="#0043ac" size="22"></u-icon>
+			</view>
 			
 			<!-- 举报电话 -->
 			<view class="account" @click="call">
@@ -103,7 +111,6 @@
 		onReady() {
 		},
 		mounted(){
-			console.log('我的页面挂载')
 			uni.showShareMenu({
 				withShareTicket: true,
 				menus: ["shareAppMessage", "shareTimeline"]
@@ -136,9 +143,10 @@
 				// wx.navigateTo({
 				// 	url: '/packageMine/accountBound/accountBound'
 				// })
-				wx.redirectTo({
+				wx.navigateTo({
 				   url:'/packageMine/accountBound/accountBound'
 				 })
+				 this.showMessage = false
 			},
 			// 点击举报电话
 			call() {
@@ -149,8 +157,23 @@
 					url: '/packageMine/phones/phones'
 				})
 			},
+			changePassword() {
+				if (wx.getStorageSync('userInfoxj')) {
+					// 已经登陆
+					this.showMessage = false
+						// 修改密码页面
+						let url = `/packageMine/changePassword/changePassword`
+						wx.navigateTo({
+							url: url
+						})
+					
+				} else {
+					// 未登录
+					this.showMessage = true
+				}
+			},
 			// 跳转账号信息页面
-			changePage() {
+			changePage(val) {
 				// 同步存储
 				// wx.setStorageSync('list1', {name:"name",age:5})
 				// 读取本地数据
@@ -159,9 +182,11 @@
 				if (wx.getStorageSync('userInfoxj')) {
 					// 已经登陆
 					this.showMessage = false
+					// 个人信息
 					wx.navigateTo({
 						url: '/packageMine/accountInfo/accountInfo'
 					})
+					
 				} else {
 					// 未登录
 					this.showMessage = true