diff --git a/api/base1.js b/api/base1.js
new file mode 100644
index 0000000..9ab6233
--- /dev/null
+++ b/api/base1.js
@@ -0,0 +1,6 @@
+
+const ENV_URL = 'http://111.198.10.15:11638';  
+
+const BASE_URL = ENV_URL;
+
+export default BASE_URL;

diff --git a/api/base1.js b/api/base1.js
new file mode 100644
index 0000000..9ab6233
--- /dev/null
+++ b/api/base1.js
@@ -0,0 +1,6 @@
+
+const ENV_URL = 'http://111.198.10.15:11638';  
+
+const BASE_URL = ENV_URL;
+
+export default BASE_URL;
diff --git a/api/rumor.js b/api/rumor.js
new file mode 100644
index 0000000..5910e2f
--- /dev/null
+++ b/api/rumor.js
@@ -0,0 +1,21 @@
+// 谣言相关接口
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base1.js';
+
+const LIST = BASE_URL + '/businessRumor/list'
+const Vote = BASE_URL + '/businessVoteRecord/isVote'
+const Add = BASE_URL + '/businessRumor/add'
+// 谣言列表
+export function getRumorList(data) {
+	return fetch.post(LIST, data).then(res => res);
+}
+// 用户是否投票
+export function isVote(data) {
+	return fetch.post(Vote, data).then(res => res);
+}
+// 用户投票
+export function addVote(data) {
+	return fetch.post(Add, data).then(res => res);
+}
+
+

diff --git a/api/base1.js b/api/base1.js
new file mode 100644
index 0000000..9ab6233
--- /dev/null
+++ b/api/base1.js
@@ -0,0 +1,6 @@
+
+const ENV_URL = 'http://111.198.10.15:11638';  
+
+const BASE_URL = ENV_URL;
+
+export default BASE_URL;
diff --git a/api/rumor.js b/api/rumor.js
new file mode 100644
index 0000000..5910e2f
--- /dev/null
+++ b/api/rumor.js
@@ -0,0 +1,21 @@
+// 谣言相关接口
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base1.js';
+
+const LIST = BASE_URL + '/businessRumor/list'
+const Vote = BASE_URL + '/businessVoteRecord/isVote'
+const Add = BASE_URL + '/businessRumor/add'
+// 谣言列表
+export function getRumorList(data) {
+	return fetch.post(LIST, data).then(res => res);
+}
+// 用户是否投票
+export function isVote(data) {
+	return fetch.post(Vote, data).then(res => res);
+}
+// 用户投票
+export function addVote(data) {
+	return fetch.post(Add, data).then(res => res);
+}
+
+
diff --git a/api/tort.js b/api/tort.js
index ed3eb50..934496e 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,8 +5,8 @@
 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 OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
-const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
@@ -25,14 +25,14 @@
 export function webReport(data) {
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
-// 其他类型举报
-export function otherReport(data) {
-	return fetch.get(OTHER_REPORT, data).then(res => res);
-}
-// 专项举报
-export function specialReport(data) {
-	return fetch.get(SPECIAL_REPORT, data).then(res => res);
-}
+// // 其他类型举报
+// export function otherReport(data) {
+// 	return fetch.get(OTHER_REPORT, data).then(res => res);
+// }
+// // 专项举报
+// export function specialReport(data) {
+// 	return fetch.get(SPECIAL_REPORT, data).then(res => res);
+// }
 // 获取验证码
 export function getCodeURl() {
 	const data = {

diff --git a/api/base1.js b/api/base1.js
new file mode 100644
index 0000000..9ab6233
--- /dev/null
+++ b/api/base1.js
@@ -0,0 +1,6 @@
+
+const ENV_URL = 'http://111.198.10.15:11638';  
+
+const BASE_URL = ENV_URL;
+
+export default BASE_URL;
diff --git a/api/rumor.js b/api/rumor.js
new file mode 100644
index 0000000..5910e2f
--- /dev/null
+++ b/api/rumor.js
@@ -0,0 +1,21 @@
+// 谣言相关接口
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base1.js';
+
+const LIST = BASE_URL + '/businessRumor/list'
+const Vote = BASE_URL + '/businessVoteRecord/isVote'
+const Add = BASE_URL + '/businessRumor/add'
+// 谣言列表
+export function getRumorList(data) {
+	return fetch.post(LIST, data).then(res => res);
+}
+// 用户是否投票
+export function isVote(data) {
+	return fetch.post(Vote, data).then(res => res);
+}
+// 用户投票
+export function addVote(data) {
+	return fetch.post(Add, data).then(res => res);
+}
+
+
diff --git a/api/tort.js b/api/tort.js
index ed3eb50..934496e 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,8 +5,8 @@
 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 OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
-const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
@@ -25,14 +25,14 @@
 export function webReport(data) {
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
-// 其他类型举报
-export function otherReport(data) {
-	return fetch.get(OTHER_REPORT, data).then(res => res);
-}
-// 专项举报
-export function specialReport(data) {
-	return fetch.get(SPECIAL_REPORT, data).then(res => res);
-}
+// // 其他类型举报
+// export function otherReport(data) {
+// 	return fetch.get(OTHER_REPORT, data).then(res => res);
+// }
+// // 专项举报
+// export function specialReport(data) {
+// 	return fetch.get(SPECIAL_REPORT, data).then(res => res);
+// }
 // 获取验证码
 export function getCodeURl() {
 	const data = {
diff --git a/common/fetch.js b/common/fetch.js
index 9add31a..0747653 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -34,7 +34,7 @@
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1) {
+            if (data.data.status === 1 || data.data.code === 200) {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}

diff --git a/api/base1.js b/api/base1.js
new file mode 100644
index 0000000..9ab6233
--- /dev/null
+++ b/api/base1.js
@@ -0,0 +1,6 @@
+
+const ENV_URL = 'http://111.198.10.15:11638';  
+
+const BASE_URL = ENV_URL;
+
+export default BASE_URL;
diff --git a/api/rumor.js b/api/rumor.js
new file mode 100644
index 0000000..5910e2f
--- /dev/null
+++ b/api/rumor.js
@@ -0,0 +1,21 @@
+// 谣言相关接口
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base1.js';
+
+const LIST = BASE_URL + '/businessRumor/list'
+const Vote = BASE_URL + '/businessVoteRecord/isVote'
+const Add = BASE_URL + '/businessRumor/add'
+// 谣言列表
+export function getRumorList(data) {
+	return fetch.post(LIST, data).then(res => res);
+}
+// 用户是否投票
+export function isVote(data) {
+	return fetch.post(Vote, data).then(res => res);
+}
+// 用户投票
+export function addVote(data) {
+	return fetch.post(Add, data).then(res => res);
+}
+
+
diff --git a/api/tort.js b/api/tort.js
index ed3eb50..934496e 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,8 +5,8 @@
 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 OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
-const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
@@ -25,14 +25,14 @@
 export function webReport(data) {
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
-// 其他类型举报
-export function otherReport(data) {
-	return fetch.get(OTHER_REPORT, data).then(res => res);
-}
-// 专项举报
-export function specialReport(data) {
-	return fetch.get(SPECIAL_REPORT, data).then(res => res);
-}
+// // 其他类型举报
+// export function otherReport(data) {
+// 	return fetch.get(OTHER_REPORT, data).then(res => res);
+// }
+// // 专项举报
+// export function specialReport(data) {
+// 	return fetch.get(SPECIAL_REPORT, data).then(res => res);
+// }
 // 获取验证码
 export function getCodeURl() {
 	const data = {
diff --git a/common/fetch.js b/common/fetch.js
index 9add31a..0747653 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -34,7 +34,7 @@
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1) {
+            if (data.data.status === 1 || data.data.code === 200) {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
diff --git a/components/card.vue b/components/card.vue
index bfb088b..36819f3 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -6,14 +6,15 @@
 			<view class="flipcard-item-stack-info">  
 				<view style="display: flex;justify-content: space-between;">
 					<view class="t3">一起来识谣</view>
-					<view class="t4">已投票</view> 
+					<view class="t4">{{isVoteFlag ? '已投票' : '未投票'}}</view> 
 				</view>
 				
 				<!-- 谣言 -->
 				<view class="yy-content">
 					<view class="text">谣言:</view>
 					<view class="title">
-						支持公众投票，来区分某条信息是否是谣言，支持公众投票，来区分某条众投票，言，支持公众投票，
+						<!-- 支持公众投票，来区分某条信息是否是谣言，支持公众投票，来区分某条众投票，言，支持公众投票， -->
+						{{currentShow.rumor}}
 					</view>
 					<view class="source">
 						来源：新疆网络举报
@@ -22,13 +23,13 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real">
+					<view class="real" @click="vote(true)">
 						<text>真</text>
-						<text>30%</text>
+						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail">
-						<text>70%</text>
+					<view class="fail" @click="vote(false)">
 						<text>假</text>
+						<text>{{currentShow.againstRate}}</text>
 					</view>
 				</view>
 			</view>  
@@ -38,6 +39,7 @@
   
 <script>  
     import { getTouchPoint, getElSize } from '@/common/utils.js'  
+	import { isVote, addVote } from '@/api/rumor.js'
     export default {  
 			props: {  
 				pages: {  
@@ -55,7 +57,8 @@
 					basicdata: {  
 						start: {},  
 						end: {}  
-					},  
+					}, 
+					 isVoteFlag:false, // 是否投票标识
 					temporaryData: {  
 						isStackClick: true, // 多了一个参数  
 						offsetY: '',  
@@ -93,14 +96,53 @@
 					let offsetWidth = width - Math.abs(this.temporaryData.poswidth)  
 					let ratio = 1 - offsetWidth / width || 0  
 					return ratio  
-				}  
+				},
+				// 当前展示的谣言信息
+				currentShow() {
+					return this.pages[this.temporaryData.currentPage]
+				}
 			},  
 			created() {  
 				this.$nextTick(async e => {  
 					this.el = await getElSize('flipcard', this)  
 				})  
 			},  
+			watch:{
+				'currentShow':{
+					immediate:true,
+					deep:true,
+					handler(newVal){
+						if (this.currentShow) {
+							// this.isVoteFlag = false
+							const params = {
+								rumorId:this.currentShow.id, // id
+								votePerson:'3333' // 用户唯一标识
+							}
+							// 查询用户是否投票
+							isVote(params).then(res => {
+								console.log(res, '查询用户是否投票')
+								this.isVoteFlag = res
+							})
+						}
+						
+					}
+				}
+			},
 			methods: {  
+				// 投票
+				vote(flag) {
+					const params = {
+						rumorId:this.currentShow.id,
+						votePerson:'3333', // 用户唯一标识
+						status: flag ? '1' : '0'
+					}
+					addVote(params).then(res => {
+						console.log(res, '投票结果')
+						uni.$u.toast('投票成功')
+						// 投票成功修改 投票状态
+						this.isVoteFlag = true
+					})
+				},
 				touchstart(e) {  
 					if (this.temporaryData.tracking) {  
 						return  
@@ -165,7 +207,6 @@
 					}  
 				},  
 				touchend(e, index) {  
-					console.log(this.temporaryData.isStackClick)  
 					if(this.temporaryData.isStackClick) {  
 							this.$emit('click', index) // 多了一个参数，触发上层传递事件  
 							this.temporaryData.isStackClick = false  
@@ -192,6 +233,7 @@
 						this.temporaryData.swipe = false  
 						this.temporaryData.rotate = 0  
 					}  
+					
 				},  
 				nextTick() {  
 					// 记录最终滑动距离  

diff --git a/api/base1.js b/api/base1.js
new file mode 100644
index 0000000..9ab6233
--- /dev/null
+++ b/api/base1.js
@@ -0,0 +1,6 @@
+
+const ENV_URL = 'http://111.198.10.15:11638';  
+
+const BASE_URL = ENV_URL;
+
+export default BASE_URL;
diff --git a/api/rumor.js b/api/rumor.js
new file mode 100644
index 0000000..5910e2f
--- /dev/null
+++ b/api/rumor.js
@@ -0,0 +1,21 @@
+// 谣言相关接口
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base1.js';
+
+const LIST = BASE_URL + '/businessRumor/list'
+const Vote = BASE_URL + '/businessVoteRecord/isVote'
+const Add = BASE_URL + '/businessRumor/add'
+// 谣言列表
+export function getRumorList(data) {
+	return fetch.post(LIST, data).then(res => res);
+}
+// 用户是否投票
+export function isVote(data) {
+	return fetch.post(Vote, data).then(res => res);
+}
+// 用户投票
+export function addVote(data) {
+	return fetch.post(Add, data).then(res => res);
+}
+
+
diff --git a/api/tort.js b/api/tort.js
index ed3eb50..934496e 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,8 +5,8 @@
 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 OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
-const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
@@ -25,14 +25,14 @@
 export function webReport(data) {
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
-// 其他类型举报
-export function otherReport(data) {
-	return fetch.get(OTHER_REPORT, data).then(res => res);
-}
-// 专项举报
-export function specialReport(data) {
-	return fetch.get(SPECIAL_REPORT, data).then(res => res);
-}
+// // 其他类型举报
+// export function otherReport(data) {
+// 	return fetch.get(OTHER_REPORT, data).then(res => res);
+// }
+// // 专项举报
+// export function specialReport(data) {
+// 	return fetch.get(SPECIAL_REPORT, data).then(res => res);
+// }
 // 获取验证码
 export function getCodeURl() {
 	const data = {
diff --git a/common/fetch.js b/common/fetch.js
index 9add31a..0747653 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -34,7 +34,7 @@
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1) {
+            if (data.data.status === 1 || data.data.code === 200) {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
diff --git a/components/card.vue b/components/card.vue
index bfb088b..36819f3 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -6,14 +6,15 @@
 			<view class="flipcard-item-stack-info">  
 				<view style="display: flex;justify-content: space-between;">
 					<view class="t3">一起来识谣</view>
-					<view class="t4">已投票</view> 
+					<view class="t4">{{isVoteFlag ? '已投票' : '未投票'}}</view> 
 				</view>
 				
 				<!-- 谣言 -->
 				<view class="yy-content">
 					<view class="text">谣言:</view>
 					<view class="title">
-						支持公众投票，来区分某条信息是否是谣言，支持公众投票，来区分某条众投票，言，支持公众投票，
+						<!-- 支持公众投票，来区分某条信息是否是谣言，支持公众投票，来区分某条众投票，言，支持公众投票， -->
+						{{currentShow.rumor}}
 					</view>
 					<view class="source">
 						来源：新疆网络举报
@@ -22,13 +23,13 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real">
+					<view class="real" @click="vote(true)">
 						<text>真</text>
-						<text>30%</text>
+						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail">
-						<text>70%</text>
+					<view class="fail" @click="vote(false)">
 						<text>假</text>
+						<text>{{currentShow.againstRate}}</text>
 					</view>
 				</view>
 			</view>  
@@ -38,6 +39,7 @@
   
 <script>  
     import { getTouchPoint, getElSize } from '@/common/utils.js'  
+	import { isVote, addVote } from '@/api/rumor.js'
     export default {  
 			props: {  
 				pages: {  
@@ -55,7 +57,8 @@
 					basicdata: {  
 						start: {},  
 						end: {}  
-					},  
+					}, 
+					 isVoteFlag:false, // 是否投票标识
 					temporaryData: {  
 						isStackClick: true, // 多了一个参数  
 						offsetY: '',  
@@ -93,14 +96,53 @@
 					let offsetWidth = width - Math.abs(this.temporaryData.poswidth)  
 					let ratio = 1 - offsetWidth / width || 0  
 					return ratio  
-				}  
+				},
+				// 当前展示的谣言信息
+				currentShow() {
+					return this.pages[this.temporaryData.currentPage]
+				}
 			},  
 			created() {  
 				this.$nextTick(async e => {  
 					this.el = await getElSize('flipcard', this)  
 				})  
 			},  
+			watch:{
+				'currentShow':{
+					immediate:true,
+					deep:true,
+					handler(newVal){
+						if (this.currentShow) {
+							// this.isVoteFlag = false
+							const params = {
+								rumorId:this.currentShow.id, // id
+								votePerson:'3333' // 用户唯一标识
+							}
+							// 查询用户是否投票
+							isVote(params).then(res => {
+								console.log(res, '查询用户是否投票')
+								this.isVoteFlag = res
+							})
+						}
+						
+					}
+				}
+			},
 			methods: {  
+				// 投票
+				vote(flag) {
+					const params = {
+						rumorId:this.currentShow.id,
+						votePerson:'3333', // 用户唯一标识
+						status: flag ? '1' : '0'
+					}
+					addVote(params).then(res => {
+						console.log(res, '投票结果')
+						uni.$u.toast('投票成功')
+						// 投票成功修改 投票状态
+						this.isVoteFlag = true
+					})
+				},
 				touchstart(e) {  
 					if (this.temporaryData.tracking) {  
 						return  
@@ -165,7 +207,6 @@
 					}  
 				},  
 				touchend(e, index) {  
-					console.log(this.temporaryData.isStackClick)  
 					if(this.temporaryData.isStackClick) {  
 							this.$emit('click', index) // 多了一个参数，触发上层传递事件  
 							this.temporaryData.isStackClick = false  
@@ -192,6 +233,7 @@
 						this.temporaryData.swipe = false  
 						this.temporaryData.rotate = 0  
 					}  
+					
 				},  
 				nextTick() {  
 					// 记录最终滑动距离  
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index 596e0cf..cfb29bc 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -189,10 +189,11 @@
 					reportTypeValue: reportTypeValue,
 					icon: icon,
 					label: label,
+					reportType: type
 				}
 				// this.actionSheetShow = true
 				wx.navigateTo({
-					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label) + `&reportType=${type}`
 				})
 			},
 			// 选择好
@@ -204,6 +205,7 @@
 				} else {
 					type = 'other'
 				}
+				console.log(type, 'type')
 				wx.navigateTo({
 					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label) + `&reportType=${type}`
 				})

diff --git a/api/base1.js b/api/base1.js
new file mode 100644
index 0000000..9ab6233
--- /dev/null
+++ b/api/base1.js
@@ -0,0 +1,6 @@
+
+const ENV_URL = 'http://111.198.10.15:11638';  
+
+const BASE_URL = ENV_URL;
+
+export default BASE_URL;
diff --git a/api/rumor.js b/api/rumor.js
new file mode 100644
index 0000000..5910e2f
--- /dev/null
+++ b/api/rumor.js
@@ -0,0 +1,21 @@
+// 谣言相关接口
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base1.js';
+
+const LIST = BASE_URL + '/businessRumor/list'
+const Vote = BASE_URL + '/businessVoteRecord/isVote'
+const Add = BASE_URL + '/businessRumor/add'
+// 谣言列表
+export function getRumorList(data) {
+	return fetch.post(LIST, data).then(res => res);
+}
+// 用户是否投票
+export function isVote(data) {
+	return fetch.post(Vote, data).then(res => res);
+}
+// 用户投票
+export function addVote(data) {
+	return fetch.post(Add, data).then(res => res);
+}
+
+
diff --git a/api/tort.js b/api/tort.js
index ed3eb50..934496e 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,8 +5,8 @@
 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 OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
-const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
@@ -25,14 +25,14 @@
 export function webReport(data) {
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
-// 其他类型举报
-export function otherReport(data) {
-	return fetch.get(OTHER_REPORT, data).then(res => res);
-}
-// 专项举报
-export function specialReport(data) {
-	return fetch.get(SPECIAL_REPORT, data).then(res => res);
-}
+// // 其他类型举报
+// export function otherReport(data) {
+// 	return fetch.get(OTHER_REPORT, data).then(res => res);
+// }
+// // 专项举报
+// export function specialReport(data) {
+// 	return fetch.get(SPECIAL_REPORT, data).then(res => res);
+// }
 // 获取验证码
 export function getCodeURl() {
 	const data = {
diff --git a/common/fetch.js b/common/fetch.js
index 9add31a..0747653 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -34,7 +34,7 @@
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1) {
+            if (data.data.status === 1 || data.data.code === 200) {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
diff --git a/components/card.vue b/components/card.vue
index bfb088b..36819f3 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -6,14 +6,15 @@
 			<view class="flipcard-item-stack-info">  
 				<view style="display: flex;justify-content: space-between;">
 					<view class="t3">一起来识谣</view>
-					<view class="t4">已投票</view> 
+					<view class="t4">{{isVoteFlag ? '已投票' : '未投票'}}</view> 
 				</view>
 				
 				<!-- 谣言 -->
 				<view class="yy-content">
 					<view class="text">谣言:</view>
 					<view class="title">
-						支持公众投票，来区分某条信息是否是谣言，支持公众投票，来区分某条众投票，言，支持公众投票，
+						<!-- 支持公众投票，来区分某条信息是否是谣言，支持公众投票，来区分某条众投票，言，支持公众投票， -->
+						{{currentShow.rumor}}
 					</view>
 					<view class="source">
 						来源：新疆网络举报
@@ -22,13 +23,13 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real">
+					<view class="real" @click="vote(true)">
 						<text>真</text>
-						<text>30%</text>
+						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail">
-						<text>70%</text>
+					<view class="fail" @click="vote(false)">
 						<text>假</text>
+						<text>{{currentShow.againstRate}}</text>
 					</view>
 				</view>
 			</view>  
@@ -38,6 +39,7 @@
   
 <script>  
     import { getTouchPoint, getElSize } from '@/common/utils.js'  
+	import { isVote, addVote } from '@/api/rumor.js'
     export default {  
 			props: {  
 				pages: {  
@@ -55,7 +57,8 @@
 					basicdata: {  
 						start: {},  
 						end: {}  
-					},  
+					}, 
+					 isVoteFlag:false, // 是否投票标识
 					temporaryData: {  
 						isStackClick: true, // 多了一个参数  
 						offsetY: '',  
@@ -93,14 +96,53 @@
 					let offsetWidth = width - Math.abs(this.temporaryData.poswidth)  
 					let ratio = 1 - offsetWidth / width || 0  
 					return ratio  
-				}  
+				},
+				// 当前展示的谣言信息
+				currentShow() {
+					return this.pages[this.temporaryData.currentPage]
+				}
 			},  
 			created() {  
 				this.$nextTick(async e => {  
 					this.el = await getElSize('flipcard', this)  
 				})  
 			},  
+			watch:{
+				'currentShow':{
+					immediate:true,
+					deep:true,
+					handler(newVal){
+						if (this.currentShow) {
+							// this.isVoteFlag = false
+							const params = {
+								rumorId:this.currentShow.id, // id
+								votePerson:'3333' // 用户唯一标识
+							}
+							// 查询用户是否投票
+							isVote(params).then(res => {
+								console.log(res, '查询用户是否投票')
+								this.isVoteFlag = res
+							})
+						}
+						
+					}
+				}
+			},
 			methods: {  
+				// 投票
+				vote(flag) {
+					const params = {
+						rumorId:this.currentShow.id,
+						votePerson:'3333', // 用户唯一标识
+						status: flag ? '1' : '0'
+					}
+					addVote(params).then(res => {
+						console.log(res, '投票结果')
+						uni.$u.toast('投票成功')
+						// 投票成功修改 投票状态
+						this.isVoteFlag = true
+					})
+				},
 				touchstart(e) {  
 					if (this.temporaryData.tracking) {  
 						return  
@@ -165,7 +207,6 @@
 					}  
 				},  
 				touchend(e, index) {  
-					console.log(this.temporaryData.isStackClick)  
 					if(this.temporaryData.isStackClick) {  
 							this.$emit('click', index) // 多了一个参数，触发上层传递事件  
 							this.temporaryData.isStackClick = false  
@@ -192,6 +233,7 @@
 						this.temporaryData.swipe = false  
 						this.temporaryData.rotate = 0  
 					}  
+					
 				},  
 				nextTick() {  
 					// 记录最终滑动距离  
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index 596e0cf..cfb29bc 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -189,10 +189,11 @@
 					reportTypeValue: reportTypeValue,
 					icon: icon,
 					label: label,
+					reportType: type
 				}
 				// this.actionSheetShow = true
 				wx.navigateTo({
-					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label) + `&reportType=${type}`
 				})
 			},
 			// 选择好
@@ -204,6 +205,7 @@
 				} else {
 					type = 'other'
 				}
+				console.log(type, 'type')
 				wx.navigateTo({
 					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label) + `&reportType=${type}`
 				})
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index d08fc67..9d625fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -202,7 +202,7 @@
 <script>
 	import { getLocationParams } from '../../common/utils.js';
 	import Message from '../../components/base/message.vue';
-	import { createUrl, websiteUrlRepeat, webReport, otherReport, specialReport } from '@/api/tort.js'
+	import { createUrl, websiteUrlRepeat, webReport } from '@/api/tort.js'
 	export default {
 		components: {
 			Message
@@ -224,6 +224,10 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				typeMapDict: {
+					web: 0,
+					special: 5,
+				},
 				tabList: [
 					{
 						name: '网站类型举报',
@@ -439,23 +443,28 @@
 				infoSourceColumns: [[
 					{
 						id: 'chart',
-						label: '聊天工具'
+						label: '聊天工具',
+						key: '1'
 					},
 					{
 						id: 'APP',
-						label: '移动APP'
+						label: '移动APP',
+						key: '2'
 					},
 					{
 						id: 'wp',
-						label: '网盘'
+						label: '网盘',
+						key: '3'
 					},
 					{
 						id: 'ssyq',
-						label: '搜索引擎'
+						label: '搜索引擎',
+						key: '4'
 					},
 					{
 						id: 'other',
-						label: '其他'
+						label: '其他',
+						key: '5'
 					},
 				]],
 				infoSourceShow: false, //控制举报类型显隐
@@ -515,12 +524,16 @@
 			this.reportIcon = decodeURIComponent(getLocationParams('icon'));
 			this.label = decodeURIComponent(getLocationParams('label'));
 			console.log(this.form.reportType, '-', this.form.type, 'p', this.reportType)
+			console.log(getLocationParams('reportType'), 'getLocationParams')
 			//在这里先获取举报人信息，有举报人正常，没有举报人提示去注册
 		},
 		onReady() {
 			this.showMessage = true; //显示举报须知
 			this.$refs.form.setRules(this.rules);
 		},
+		onLoad(options) {
+			console.log(options, 'options')
+		},
 		methods: {
 			// 点击tab
 			clickTab(e) {
@@ -662,6 +675,7 @@
 			},
 			//点击举报
 			async submit() {
+				console.log(this.reportType, '举报类型')
 				// if(this.form.reportName === '') {
 				// 	wx.showToast({
 				// 	  title: '请先注册',
@@ -693,6 +707,12 @@
 						console.log(item)
 						tempArr.push(JSON.parse(item.url).data[0])
 					});
+					let infoSource
+					if (this.reportType === 'other') {
+						infoSource = this.infoSourceColumns[0].filter(item => item.label == this.form.source)[0].key
+					} else {
+						infoSource = this.typeMapDict[this.reportType]
+					}
 					// ------------------------------------------------------------------------------------------
 					const submitParams = {
 						"anonymousUserInfo.name": this.form.reportName, // 举报人
@@ -701,7 +721,7 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoSource": infoSource, // 网站举报（必填固定不变）
 						"reportInfo.infoType": '1', //（三种类型举报都传递1）
 						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
@@ -737,16 +757,17 @@
 						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+							uni.$u.toast('举报成功')
+							wx.navigateTo({
+								url: '/packageA/myReport/myReport'
+							})
 						}).catch(res => {
 							console.log('oooooo', res)
 							if(res === 103) { // 验证码超时
 								this.updateImageCode() // 更新验证码
 							}
 						})
-						uni.$u.toast('举报成功')
-						wx.navigateTo({
-							url: '/packageA/pages/myReport/myReport'
-						})
+		
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})

diff --git a/api/base1.js b/api/base1.js
new file mode 100644
index 0000000..9ab6233
--- /dev/null
+++ b/api/base1.js
@@ -0,0 +1,6 @@
+
+const ENV_URL = 'http://111.198.10.15:11638';  
+
+const BASE_URL = ENV_URL;
+
+export default BASE_URL;
diff --git a/api/rumor.js b/api/rumor.js
new file mode 100644
index 0000000..5910e2f
--- /dev/null
+++ b/api/rumor.js
@@ -0,0 +1,21 @@
+// 谣言相关接口
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base1.js';
+
+const LIST = BASE_URL + '/businessRumor/list'
+const Vote = BASE_URL + '/businessVoteRecord/isVote'
+const Add = BASE_URL + '/businessRumor/add'
+// 谣言列表
+export function getRumorList(data) {
+	return fetch.post(LIST, data).then(res => res);
+}
+// 用户是否投票
+export function isVote(data) {
+	return fetch.post(Vote, data).then(res => res);
+}
+// 用户投票
+export function addVote(data) {
+	return fetch.post(Add, data).then(res => res);
+}
+
+
diff --git a/api/tort.js b/api/tort.js
index ed3eb50..934496e 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,8 +5,8 @@
 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 OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
-const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
@@ -25,14 +25,14 @@
 export function webReport(data) {
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
-// 其他类型举报
-export function otherReport(data) {
-	return fetch.get(OTHER_REPORT, data).then(res => res);
-}
-// 专项举报
-export function specialReport(data) {
-	return fetch.get(SPECIAL_REPORT, data).then(res => res);
-}
+// // 其他类型举报
+// export function otherReport(data) {
+// 	return fetch.get(OTHER_REPORT, data).then(res => res);
+// }
+// // 专项举报
+// export function specialReport(data) {
+// 	return fetch.get(SPECIAL_REPORT, data).then(res => res);
+// }
 // 获取验证码
 export function getCodeURl() {
 	const data = {
diff --git a/common/fetch.js b/common/fetch.js
index 9add31a..0747653 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -34,7 +34,7 @@
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1) {
+            if (data.data.status === 1 || data.data.code === 200) {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
diff --git a/components/card.vue b/components/card.vue
index bfb088b..36819f3 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -6,14 +6,15 @@
 			<view class="flipcard-item-stack-info">  
 				<view style="display: flex;justify-content: space-between;">
 					<view class="t3">一起来识谣</view>
-					<view class="t4">已投票</view> 
+					<view class="t4">{{isVoteFlag ? '已投票' : '未投票'}}</view> 
 				</view>
 				
 				<!-- 谣言 -->
 				<view class="yy-content">
 					<view class="text">谣言:</view>
 					<view class="title">
-						支持公众投票，来区分某条信息是否是谣言，支持公众投票，来区分某条众投票，言，支持公众投票，
+						<!-- 支持公众投票，来区分某条信息是否是谣言，支持公众投票，来区分某条众投票，言，支持公众投票， -->
+						{{currentShow.rumor}}
 					</view>
 					<view class="source">
 						来源：新疆网络举报
@@ -22,13 +23,13 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real">
+					<view class="real" @click="vote(true)">
 						<text>真</text>
-						<text>30%</text>
+						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail">
-						<text>70%</text>
+					<view class="fail" @click="vote(false)">
 						<text>假</text>
+						<text>{{currentShow.againstRate}}</text>
 					</view>
 				</view>
 			</view>  
@@ -38,6 +39,7 @@
   
 <script>  
     import { getTouchPoint, getElSize } from '@/common/utils.js'  
+	import { isVote, addVote } from '@/api/rumor.js'
     export default {  
 			props: {  
 				pages: {  
@@ -55,7 +57,8 @@
 					basicdata: {  
 						start: {},  
 						end: {}  
-					},  
+					}, 
+					 isVoteFlag:false, // 是否投票标识
 					temporaryData: {  
 						isStackClick: true, // 多了一个参数  
 						offsetY: '',  
@@ -93,14 +96,53 @@
 					let offsetWidth = width - Math.abs(this.temporaryData.poswidth)  
 					let ratio = 1 - offsetWidth / width || 0  
 					return ratio  
-				}  
+				},
+				// 当前展示的谣言信息
+				currentShow() {
+					return this.pages[this.temporaryData.currentPage]
+				}
 			},  
 			created() {  
 				this.$nextTick(async e => {  
 					this.el = await getElSize('flipcard', this)  
 				})  
 			},  
+			watch:{
+				'currentShow':{
+					immediate:true,
+					deep:true,
+					handler(newVal){
+						if (this.currentShow) {
+							// this.isVoteFlag = false
+							const params = {
+								rumorId:this.currentShow.id, // id
+								votePerson:'3333' // 用户唯一标识
+							}
+							// 查询用户是否投票
+							isVote(params).then(res => {
+								console.log(res, '查询用户是否投票')
+								this.isVoteFlag = res
+							})
+						}
+						
+					}
+				}
+			},
 			methods: {  
+				// 投票
+				vote(flag) {
+					const params = {
+						rumorId:this.currentShow.id,
+						votePerson:'3333', // 用户唯一标识
+						status: flag ? '1' : '0'
+					}
+					addVote(params).then(res => {
+						console.log(res, '投票结果')
+						uni.$u.toast('投票成功')
+						// 投票成功修改 投票状态
+						this.isVoteFlag = true
+					})
+				},
 				touchstart(e) {  
 					if (this.temporaryData.tracking) {  
 						return  
@@ -165,7 +207,6 @@
 					}  
 				},  
 				touchend(e, index) {  
-					console.log(this.temporaryData.isStackClick)  
 					if(this.temporaryData.isStackClick) {  
 							this.$emit('click', index) // 多了一个参数，触发上层传递事件  
 							this.temporaryData.isStackClick = false  
@@ -192,6 +233,7 @@
 						this.temporaryData.swipe = false  
 						this.temporaryData.rotate = 0  
 					}  
+					
 				},  
 				nextTick() {  
 					// 记录最终滑动距离  
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index 596e0cf..cfb29bc 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -189,10 +189,11 @@
 					reportTypeValue: reportTypeValue,
 					icon: icon,
 					label: label,
+					reportType: type
 				}
 				// this.actionSheetShow = true
 				wx.navigateTo({
-					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label) + `&reportType=${type}`
 				})
 			},
 			// 选择好
@@ -204,6 +205,7 @@
 				} else {
 					type = 'other'
 				}
+				console.log(type, 'type')
 				wx.navigateTo({
 					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label) + `&reportType=${type}`
 				})
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index d08fc67..9d625fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -202,7 +202,7 @@
 <script>
 	import { getLocationParams } from '../../common/utils.js';
 	import Message from '../../components/base/message.vue';
-	import { createUrl, websiteUrlRepeat, webReport, otherReport, specialReport } from '@/api/tort.js'
+	import { createUrl, websiteUrlRepeat, webReport } from '@/api/tort.js'
 	export default {
 		components: {
 			Message
@@ -224,6 +224,10 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				typeMapDict: {
+					web: 0,
+					special: 5,
+				},
 				tabList: [
 					{
 						name: '网站类型举报',
@@ -439,23 +443,28 @@
 				infoSourceColumns: [[
 					{
 						id: 'chart',
-						label: '聊天工具'
+						label: '聊天工具',
+						key: '1'
 					},
 					{
 						id: 'APP',
-						label: '移动APP'
+						label: '移动APP',
+						key: '2'
 					},
 					{
 						id: 'wp',
-						label: '网盘'
+						label: '网盘',
+						key: '3'
 					},
 					{
 						id: 'ssyq',
-						label: '搜索引擎'
+						label: '搜索引擎',
+						key: '4'
 					},
 					{
 						id: 'other',
-						label: '其他'
+						label: '其他',
+						key: '5'
 					},
 				]],
 				infoSourceShow: false, //控制举报类型显隐
@@ -515,12 +524,16 @@
 			this.reportIcon = decodeURIComponent(getLocationParams('icon'));
 			this.label = decodeURIComponent(getLocationParams('label'));
 			console.log(this.form.reportType, '-', this.form.type, 'p', this.reportType)
+			console.log(getLocationParams('reportType'), 'getLocationParams')
 			//在这里先获取举报人信息，有举报人正常，没有举报人提示去注册
 		},
 		onReady() {
 			this.showMessage = true; //显示举报须知
 			this.$refs.form.setRules(this.rules);
 		},
+		onLoad(options) {
+			console.log(options, 'options')
+		},
 		methods: {
 			// 点击tab
 			clickTab(e) {
@@ -662,6 +675,7 @@
 			},
 			//点击举报
 			async submit() {
+				console.log(this.reportType, '举报类型')
 				// if(this.form.reportName === '') {
 				// 	wx.showToast({
 				// 	  title: '请先注册',
@@ -693,6 +707,12 @@
 						console.log(item)
 						tempArr.push(JSON.parse(item.url).data[0])
 					});
+					let infoSource
+					if (this.reportType === 'other') {
+						infoSource = this.infoSourceColumns[0].filter(item => item.label == this.form.source)[0].key
+					} else {
+						infoSource = this.typeMapDict[this.reportType]
+					}
 					// ------------------------------------------------------------------------------------------
 					const submitParams = {
 						"anonymousUserInfo.name": this.form.reportName, // 举报人
@@ -701,7 +721,7 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoSource": infoSource, // 网站举报（必填固定不变）
 						"reportInfo.infoType": '1', //（三种类型举报都传递1）
 						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
@@ -737,16 +757,17 @@
 						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+							uni.$u.toast('举报成功')
+							wx.navigateTo({
+								url: '/packageA/myReport/myReport'
+							})
 						}).catch(res => {
 							console.log('oooooo', res)
 							if(res === 103) { // 验证码超时
 								this.updateImageCode() // 更新验证码
 							}
 						})
-						uni.$u.toast('举报成功')
-						wx.navigateTo({
-							url: '/packageA/pages/myReport/myReport'
-						})
+		
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ca9706e..902ba4c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -69,6 +69,7 @@
 					<text @click="clickTitle(e, 'tzgg')">{{e.title}}</text>
 				</view>
 			</view>
+			<image class="list-img" style="width: 49px;height: 42px;margin-right: 16rpx;" src="http://111.198.10.15:11404/imgs/xj/通知公告.png"/>
 		</view>
 		<view class="event-area">
 			<view class="title">
@@ -83,6 +84,7 @@
 					<text @click="clickTitle(e, 'pyxx')">{{e.title}}</text>
 				</view>
 			</view>
+			<image class="list-img" style="width: 49px;height: 42px;margin-right: 16rpx;" src="http://111.198.10.15:11404/imgs/xj/辟谣.png"/>
 		</view>
 		<view class="event-area">
 			<view class="title">
@@ -97,6 +99,7 @@
 					<text @click="clickTitle(e, 'aljx')">{{e.title}}</text>
 				</view>
 			</view>
+			<image class="list-img" style="width: 49px;height: 42px;margin-right: 16rpx;" src="http://111.198.10.15:11404/imgs/xj/案例.png"/>
 		</view>
 	</view>
 </template>
@@ -432,10 +435,26 @@
 				}
 			}
 		}
+		.event-area{
+			position: relative;
+			.list-img{
+				position: absolute;
+				right:12px;
+				bottom:0px;
+			}
+		}
 		.list {
 			.list-item {
 				margin: 32rpx 0;
 				padding: 0 40rpx;
+				width: 70%;
+				text-overflow: -o-ellipsis-lastline;
+				overflow: hidden;				//溢出内容隐藏
+				text-overflow: ellipsis;		//文本溢出部分用省略号表示
+				display: -webkit-box;			//特别显示模式
+				-webkit-line-clamp: 2;			//行数
+				line-clamp: 2;					
+				-webkit-box-orient: vertical;	//盒子中内容竖直排列
 			}
 		}
 		

diff --git a/api/base1.js b/api/base1.js
new file mode 100644
index 0000000..9ab6233
--- /dev/null
+++ b/api/base1.js
@@ -0,0 +1,6 @@
+
+const ENV_URL = 'http://111.198.10.15:11638';  
+
+const BASE_URL = ENV_URL;
+
+export default BASE_URL;
diff --git a/api/rumor.js b/api/rumor.js
new file mode 100644
index 0000000..5910e2f
--- /dev/null
+++ b/api/rumor.js
@@ -0,0 +1,21 @@
+// 谣言相关接口
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base1.js';
+
+const LIST = BASE_URL + '/businessRumor/list'
+const Vote = BASE_URL + '/businessVoteRecord/isVote'
+const Add = BASE_URL + '/businessRumor/add'
+// 谣言列表
+export function getRumorList(data) {
+	return fetch.post(LIST, data).then(res => res);
+}
+// 用户是否投票
+export function isVote(data) {
+	return fetch.post(Vote, data).then(res => res);
+}
+// 用户投票
+export function addVote(data) {
+	return fetch.post(Add, data).then(res => res);
+}
+
+
diff --git a/api/tort.js b/api/tort.js
index ed3eb50..934496e 100644
--- a/api/tort.js
+++ b/api/tort.js
@@ -5,8 +5,8 @@
 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 OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
-const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const OTHER_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
+// const SPECIAL_REPORT = BASE_URL + '/webserver/reportInfos/submitReportInfos.do'
 const GET_CODE_URL = BASE_URL + '/webserver/captchaController/generateVerifyCodeOfReport.do'
 /**
  * 生成网址、网址转换
@@ -25,14 +25,14 @@
 export function webReport(data) {
 	return fetch.get(WEB_REPORT, data).then(res => res);
 }
-// 其他类型举报
-export function otherReport(data) {
-	return fetch.get(OTHER_REPORT, data).then(res => res);
-}
-// 专项举报
-export function specialReport(data) {
-	return fetch.get(SPECIAL_REPORT, data).then(res => res);
-}
+// // 其他类型举报
+// export function otherReport(data) {
+// 	return fetch.get(OTHER_REPORT, data).then(res => res);
+// }
+// // 专项举报
+// export function specialReport(data) {
+// 	return fetch.get(SPECIAL_REPORT, data).then(res => res);
+// }
 // 获取验证码
 export function getCodeURl() {
 	const data = {
diff --git a/common/fetch.js b/common/fetch.js
index 9add31a..0747653 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -34,7 +34,7 @@
         },
         success(data) {
           if (data.statusCode === 200) {
-            if (data.data.status === 1) {
+            if (data.data.status === 1 || data.data.code === 200) {
 							if(data.data.message === '网址未重复') {
 								wx.setStorageSync('isRepeat', 'false')
 							}
diff --git a/components/card.vue b/components/card.vue
index bfb088b..36819f3 100644
--- a/components/card.vue
+++ b/components/card.vue
@@ -6,14 +6,15 @@
 			<view class="flipcard-item-stack-info">  
 				<view style="display: flex;justify-content: space-between;">
 					<view class="t3">一起来识谣</view>
-					<view class="t4">已投票</view> 
+					<view class="t4">{{isVoteFlag ? '已投票' : '未投票'}}</view> 
 				</view>
 				
 				<!-- 谣言 -->
 				<view class="yy-content">
 					<view class="text">谣言:</view>
 					<view class="title">
-						支持公众投票，来区分某条信息是否是谣言，支持公众投票，来区分某条众投票，言，支持公众投票，
+						<!-- 支持公众投票，来区分某条信息是否是谣言，支持公众投票，来区分某条众投票，言，支持公众投票， -->
+						{{currentShow.rumor}}
 					</view>
 					<view class="source">
 						来源：新疆网络举报
@@ -22,13 +23,13 @@
 				
 				<!-- 投票 -->
 				<view class="tp">
-					<view class="real">
+					<view class="real" @click="vote(true)">
 						<text>真</text>
-						<text>30%</text>
+						<text>{{currentShow.approveRate}}</text>
 					</view>
-					<view class="fail">
-						<text>70%</text>
+					<view class="fail" @click="vote(false)">
 						<text>假</text>
+						<text>{{currentShow.againstRate}}</text>
 					</view>
 				</view>
 			</view>  
@@ -38,6 +39,7 @@
   
 <script>  
     import { getTouchPoint, getElSize } from '@/common/utils.js'  
+	import { isVote, addVote } from '@/api/rumor.js'
     export default {  
 			props: {  
 				pages: {  
@@ -55,7 +57,8 @@
 					basicdata: {  
 						start: {},  
 						end: {}  
-					},  
+					}, 
+					 isVoteFlag:false, // 是否投票标识
 					temporaryData: {  
 						isStackClick: true, // 多了一个参数  
 						offsetY: '',  
@@ -93,14 +96,53 @@
 					let offsetWidth = width - Math.abs(this.temporaryData.poswidth)  
 					let ratio = 1 - offsetWidth / width || 0  
 					return ratio  
-				}  
+				},
+				// 当前展示的谣言信息
+				currentShow() {
+					return this.pages[this.temporaryData.currentPage]
+				}
 			},  
 			created() {  
 				this.$nextTick(async e => {  
 					this.el = await getElSize('flipcard', this)  
 				})  
 			},  
+			watch:{
+				'currentShow':{
+					immediate:true,
+					deep:true,
+					handler(newVal){
+						if (this.currentShow) {
+							// this.isVoteFlag = false
+							const params = {
+								rumorId:this.currentShow.id, // id
+								votePerson:'3333' // 用户唯一标识
+							}
+							// 查询用户是否投票
+							isVote(params).then(res => {
+								console.log(res, '查询用户是否投票')
+								this.isVoteFlag = res
+							})
+						}
+						
+					}
+				}
+			},
 			methods: {  
+				// 投票
+				vote(flag) {
+					const params = {
+						rumorId:this.currentShow.id,
+						votePerson:'3333', // 用户唯一标识
+						status: flag ? '1' : '0'
+					}
+					addVote(params).then(res => {
+						console.log(res, '投票结果')
+						uni.$u.toast('投票成功')
+						// 投票成功修改 投票状态
+						this.isVoteFlag = true
+					})
+				},
 				touchstart(e) {  
 					if (this.temporaryData.tracking) {  
 						return  
@@ -165,7 +207,6 @@
 					}  
 				},  
 				touchend(e, index) {  
-					console.log(this.temporaryData.isStackClick)  
 					if(this.temporaryData.isStackClick) {  
 							this.$emit('click', index) // 多了一个参数，触发上层传递事件  
 							this.temporaryData.isStackClick = false  
@@ -192,6 +233,7 @@
 						this.temporaryData.swipe = false  
 						this.temporaryData.rotate = 0  
 					}  
+					
 				},  
 				nextTick() {  
 					// 记录最终滑动距离  
diff --git a/packageB/center/center.vue b/packageB/center/center.vue
index 596e0cf..cfb29bc 100644
--- a/packageB/center/center.vue
+++ b/packageB/center/center.vue
@@ -189,10 +189,11 @@
 					reportTypeValue: reportTypeValue,
 					icon: icon,
 					label: label,
+					reportType: type
 				}
 				// this.actionSheetShow = true
 				wx.navigateTo({
-					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label)
+					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label) + `&reportType=${type}`
 				})
 			},
 			// 选择好
@@ -204,6 +205,7 @@
 				} else {
 					type = 'other'
 				}
+				console.log(type, 'type')
 				wx.navigateTo({
 					url: `/packageB/report/report?reportTypeValue=${this.tempParamForm.reportTypeValue}&icon=` + encodeURIComponent(this.tempParamForm.icon) + '&label=' + encodeURIComponent(this.tempParamForm.label) + `&reportType=${type}`
 				})
diff --git a/packageB/report/report.vue b/packageB/report/report.vue
index d08fc67..9d625fe 100644
--- a/packageB/report/report.vue
+++ b/packageB/report/report.vue
@@ -202,7 +202,7 @@
 <script>
 	import { getLocationParams } from '../../common/utils.js';
 	import Message from '../../components/base/message.vue';
-	import { createUrl, websiteUrlRepeat, webReport, otherReport, specialReport } from '@/api/tort.js'
+	import { createUrl, websiteUrlRepeat, webReport } from '@/api/tort.js'
 	export default {
 		components: {
 			Message
@@ -224,6 +224,10 @@
 					special: '专项举报',
 					other: '其他类型举报',
 				},
+				typeMapDict: {
+					web: 0,
+					special: 5,
+				},
 				tabList: [
 					{
 						name: '网站类型举报',
@@ -439,23 +443,28 @@
 				infoSourceColumns: [[
 					{
 						id: 'chart',
-						label: '聊天工具'
+						label: '聊天工具',
+						key: '1'
 					},
 					{
 						id: 'APP',
-						label: '移动APP'
+						label: '移动APP',
+						key: '2'
 					},
 					{
 						id: 'wp',
-						label: '网盘'
+						label: '网盘',
+						key: '3'
 					},
 					{
 						id: 'ssyq',
-						label: '搜索引擎'
+						label: '搜索引擎',
+						key: '4'
 					},
 					{
 						id: 'other',
-						label: '其他'
+						label: '其他',
+						key: '5'
 					},
 				]],
 				infoSourceShow: false, //控制举报类型显隐
@@ -515,12 +524,16 @@
 			this.reportIcon = decodeURIComponent(getLocationParams('icon'));
 			this.label = decodeURIComponent(getLocationParams('label'));
 			console.log(this.form.reportType, '-', this.form.type, 'p', this.reportType)
+			console.log(getLocationParams('reportType'), 'getLocationParams')
 			//在这里先获取举报人信息，有举报人正常，没有举报人提示去注册
 		},
 		onReady() {
 			this.showMessage = true; //显示举报须知
 			this.$refs.form.setRules(this.rules);
 		},
+		onLoad(options) {
+			console.log(options, 'options')
+		},
 		methods: {
 			// 点击tab
 			clickTab(e) {
@@ -662,6 +675,7 @@
 			},
 			//点击举报
 			async submit() {
+				console.log(this.reportType, '举报类型')
 				// if(this.form.reportName === '') {
 				// 	wx.showToast({
 				// 	  title: '请先注册',
@@ -693,6 +707,12 @@
 						console.log(item)
 						tempArr.push(JSON.parse(item.url).data[0])
 					});
+					let infoSource
+					if (this.reportType === 'other') {
+						infoSource = this.infoSourceColumns[0].filter(item => item.label == this.form.source)[0].key
+					} else {
+						infoSource = this.typeMapDict[this.reportType]
+					}
 					// ------------------------------------------------------------------------------------------
 					const submitParams = {
 						"anonymousUserInfo.name": this.form.reportName, // 举报人
@@ -701,7 +721,7 @@
 						"reportInfo.reportUser": this.form.reportName,//举报人
 						"reportInfo.reportName": this.form.reportName,// 举报人
 						"reportInfo.reportType": this.form.reportType,// 举报类型
-						"reportInfo.infoSource": '0', // 网站举报（必填固定不变）
+						"reportInfo.infoSource": infoSource, // 网站举报（必填固定不变）
 						"reportInfo.infoType": '1', //（三种类型举报都传递1）
 						"reportInfo.topicId": '', // 
 						"reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体
@@ -737,16 +757,17 @@
 						
 						webReport(submitParams).then(res => {
 							console.log('举报结果', res)
+							uni.$u.toast('举报成功')
+							wx.navigateTo({
+								url: '/packageA/myReport/myReport'
+							})
 						}).catch(res => {
 							console.log('oooooo', res)
 							if(res === 103) { // 验证码超时
 								this.updateImageCode() // 更新验证码
 							}
 						})
-						uni.$u.toast('举报成功')
-						wx.navigateTo({
-							url: '/packageA/pages/myReport/myReport'
-						})
+		
 					}).catch(errors => {
 						uni.$u.toast('请将信息填写完整')
 					})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ca9706e..902ba4c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -69,6 +69,7 @@
 					<text @click="clickTitle(e, 'tzgg')">{{e.title}}</text>
 				</view>
 			</view>
+			<image class="list-img" style="width: 49px;height: 42px;margin-right: 16rpx;" src="http://111.198.10.15:11404/imgs/xj/通知公告.png"/>
 		</view>
 		<view class="event-area">
 			<view class="title">
@@ -83,6 +84,7 @@
 					<text @click="clickTitle(e, 'pyxx')">{{e.title}}</text>
 				</view>
 			</view>
+			<image class="list-img" style="width: 49px;height: 42px;margin-right: 16rpx;" src="http://111.198.10.15:11404/imgs/xj/辟谣.png"/>
 		</view>
 		<view class="event-area">
 			<view class="title">
@@ -97,6 +99,7 @@
 					<text @click="clickTitle(e, 'aljx')">{{e.title}}</text>
 				</view>
 			</view>
+			<image class="list-img" style="width: 49px;height: 42px;margin-right: 16rpx;" src="http://111.198.10.15:11404/imgs/xj/案例.png"/>
 		</view>
 	</view>
 </template>
@@ -432,10 +435,26 @@
 				}
 			}
 		}
+		.event-area{
+			position: relative;
+			.list-img{
+				position: absolute;
+				right:12px;
+				bottom:0px;
+			}
+		}
 		.list {
 			.list-item {
 				margin: 32rpx 0;
 				padding: 0 40rpx;
+				width: 70%;
+				text-overflow: -o-ellipsis-lastline;
+				overflow: hidden;				//溢出内容隐藏
+				text-overflow: ellipsis;		//文本溢出部分用省略号表示
+				display: -webkit-box;			//特别显示模式
+				-webkit-line-clamp: 2;			//行数
+				line-clamp: 2;					
+				-webkit-box-orient: vertical;	//盒子中内容竖直排列
 			}
 		}
 		
diff --git a/pages/rumor/rumor.vue b/pages/rumor/rumor.vue
index b9965a2..bbdd74b 100644
--- a/pages/rumor/rumor.vue
+++ b/pages/rumor/rumor.vue
@@ -14,7 +14,9 @@
 </template>
 
 <script>
+	import fetch from '@/common/fetch.js';
 	import flipcard from '../../components/card.vue'
+	import { getRumorList } from '@/api/rumor.js'
 	export default {
 		components:{  
 			flipcard  
@@ -22,62 +24,22 @@
 	data() {  
 		return {  
 			stackList:[  
-						{  
-								title:"2021高考作文难吗11111？",  
-								tag: "最近83人提问过这个问题11111",  
-								problem: "关于陈红军壮烈牺牲的报道，陈红军的“发小”王煦辉这几天看了一遍又一遍，从小玩到大的伙伴如今已经天人相隔，让他至今也无法接受。在同学眼中，陈红军打小就是一位品学兼优的好子，就是这个家境贫寒的农村娃，考上了城里的高？",  
-								author: {  
-										id: 1,  
-										name: "一颗棒棒糖",  
-										avatar: "/static/avatar/1.jpg",  
-								},  
-								comment_num: 5160, // 评论数  
-								dig_num: 5160, // 顶数  
-								forward_num: 5160, // 转发数  
-								attention_num: 30, // 关注数  
-						},  
-						{  
-								title:"2021高考作文难吗？22222",  
-								tag: "最近83人提问过这个问题22222",  
-								problem: "关于陈红军壮烈牺牲的报道，陈红军的“发小”王煦辉这几天看了一遍又一遍，从小玩到大的伙伴如今已经天人相隔，让他至今也无法接受。在同学眼中，陈红军打小就是一位品学兼优的好子，就是这个家境贫寒的农村娃，考上了城里的高？",  
-								author: {  
-										id: 1,  
-										name: "两颗棒棒糖",  
-										avatar: "/static/avatar/2.jpg",  
-								},  
-								comment_num: 5160, // 评论数  
-								dig_num: 5160, // 顶数  
-								forward_num: 5160, // 转发数  
-								attention_num: 30, // 关注数  
-						},  
-						{  
-								title:"2021高考作文难吗？33333",  
-								tag: "最近83人提问过这个问题33333",  
-								problem: "关于陈红军壮烈牺牲的报道，陈红军的“发小”王煦辉这几天看了一遍又一遍，从小玩到大的伙伴如今已经天人相隔，让他至今也无法接受。在同学眼中，陈红军打小就是一位品学兼优的好子，就是这个家境贫寒的农村娃，考上了城里的高？",  
-								author: {  
-										id: 1,  
-										name: "三颗棒棒糖",  
-										avatar: "/static/avatar/4.jpg",  
-								},  
-								comment_num: 5160, // 评论数  
-								dig_num: 5160, // 顶数  
-								forward_num: 5160, // 转发数  
-								attention_num: 30, // 关注数  
-						},  
-						{  
-								title:"2021高考作文难吗？44444",  
-								tag: "最近83人提问过这个问题44444",  
-								problem: "关于陈红军壮烈牺牲的报道，陈红军的“发小”王煦辉这几天看了一遍又一遍，从小玩到大的伙伴如今已经天人相隔，让他至今也无法接受。在同学眼中，陈红军打小就是一位品学兼优的好子，就是这个家境贫寒的农村娃，考上了城里的高？",  
-								author: {  
-										id: 1,  
-										name: "四颗棒棒糖",  
-										avatar: "/static/avatar/5.jpg",  
-								},  
-								comment_num: 5160, // 评论数  
-								dig_num: 5160, // 顶数  
-								forward_num: 5160, // 转发数  
-								attention_num: 30, // 关注数  
-						}  
+						// {  
+						// 		title:"2021高考作文难吗11111？",  
+						// 		tag: "最近83人提问过这个问题11111",  
+						// 		rumor: "关于陈红军壮烈牺牲的报道，陈红军的“发小”王煦辉这几天看了一遍又一遍，从小玩到大的伙伴如今已经天人相隔，让他至今也无法接受。在同学眼中，陈红军打小就是一位品学兼优的好子，就是这个家境贫寒的农村娃，考上了城里的高？",  
+						// 		author: {  
+						// 				id: 1,  
+						// 				name: "一颗棒棒糖",  
+						// 				avatar: "/static/avatar/1.jpg",  
+						// 		},  
+						// 		comment_num: 5160, // 评论数  
+						// 		dig_num: 5160, // 顶数  
+						// 		forward_num: 5160, // 转发数  
+						// 		attention_num: 30, // 关注数  
+						// 		approveRate:20,
+						// 		againstRate:80
+						// },  
 				],  
 			stackInit: {  
 				currentPage:0,  
@@ -106,8 +68,22 @@
 			wx.navigateToMiniProgram({
 			  appId: 'wx52552ed6726aaa0b',
 			})
+		},
+		handleStackClicked() {
+			
+		},
+		// 获取谣言列表
+		fetchData() {
+			getRumorList({rumor:''}).then(res => {
+				this.stackList = res
+			}).catch(error => {
+				console.log(error, 'error')
+			})
 		}
-	}  
+	},
+	mounted() {
+		this.fetchData()
+	}
 }
 </script>