diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue
index 21a4abd..25a265c 100644
--- a/packageIndex/report/report.vue
+++ b/packageIndex/report/report.vue
@@ -62,6 +62,38 @@
 					<u-form-item v-if="reportType === 'other'" label="信息来源" prop="source" borderBottom :required="true" @click="infoSourceShow=true">
 						<u--input placeholder="请选择信息来源" suffixIcon="arrow-right" disabled v-model="form.source" border="none"></u--input>
 					</u-form-item>
+					<!-- 聊天工具 -->
+					<u-form-item v-if="reportType === 'other' && form.source=== '聊天工具'" prop="toolname" label="工具名称"  borderBottom :required="false" @click="infoToolShow=true">
+						<u--input placeholder="请选择聊天工具" suffixIcon="arrow-right" disabled v-model="form.toolname" border="none"></u--input>
+					</u-form-item>
+					<u-form-item v-if="reportType === 'other' && form.source=== '聊天工具'" prop="toolcount" label="对应账号"  borderBottom :required="false">
+						<u--input placeholder="请输入对应账号" v-model="form.toolcount" ></u--input>
+					</u-form-item>
+					<!-- app -->
+					<u-form-item v-if="reportType === 'other' && form.source=== '移动APP'" label="App名称" prop="toolname"  borderBottom :required="false">
+						<u--input placeholder="请输入App名称" v-model="form.toolname" ></u--input>
+					</u-form-item>
+					<u-form-item v-if="reportType === 'other' && form.source=== '移动APP'" label="下载源" prop="toolcount"  borderBottom :required="false" @click="infoDownloadShow=true">
+						<u--input placeholder="请选择下载源" suffixIcon="arrow-right" disabled v-model="form.toolcount" border="none"></u--input>
+					</u-form-item>
+					<!-- 网盘 -->
+					<u-form-item v-if="reportType === 'other' && form.source=== '网盘'" label="网盘" prop="toolcount"  borderBottom :required="false" @click="infoNetworkShow=true">
+						<u--input placeholder="请选择网盘" suffixIcon="arrow-right" disabled v-model="form.toolcount" border="none"></u--input>
+					</u-form-item>
+					<u-form-item v-if="reportType === 'other' && form.source=== '网盘'" label="网盘账号" prop="toolname"  borderBottom :required="false">
+						<u--input placeholder="请输入网盘账号" v-model="form.toolname" ></u--input>
+					</u-form-item>
+					<u-form-item v-if="reportType === 'other' && form.source=== '网盘'" label="网盘地址" prop="tooldesc"  borderBottom :required="false">
+						<u--input placeholder="请输入网盘地址"  v-model="form.tooldesc" ></u--input>
+					</u-form-item>
+					<!-- 搜索引擎 -->
+					<u-form-item v-if="reportType === 'other' && form.source=== '搜索引擎'" label="搜索引擎" prop="tooldesc"  borderBottom :required="false">
+						<u--input placeholder="请输入搜索引擎"  v-model="form.tooldesc" ></u--input>
+					</u-form-item>
+					<u-form-item v-if="reportType === 'other' && form.source=== '搜索引擎'" label="关键字" prop="toolcount"  borderBottom :required="false">
+						<u--input placeholder="请输入关键字"  v-model="form.toolcount"></u--input>
+					</u-form-item>
+					
 					
 					<u-form-item v-if="reportType !== 'other'" label="网站网址" prop="url" borderBottom :required="true">
 						<u--input
@@ -234,7 +266,30 @@
 			@cancel	="cancle"
 			@confirm="confirmInfoSource"
 		></u-picker>
-		
+		<!-- 网盘 -->
+		<u-picker
+			:show="infoNetworkShow" 
+			:columns="infoNetworkColumns"
+			keyName="label"
+			@cancel	="cancle"
+			@confirm="confirmNetworkSource"
+		></u-picker>
+		<!-- 聊天工具 -->
+		<u-picker
+			:show="infoToolShow" 
+			:columns="infoToolColumns"
+			keyName="label"
+			@cancel	="cancle"
+			@confirm="confirmToolSource"
+		></u-picker>
+		<!-- 下载源 -->
+		<u-picker
+			:show="infoDownloadShow" 
+			:columns="infoDownloadColumns"
+			keyName="label"
+			@cancel	="cancle"
+			@confirm="confirmDownloadSource"
+		></u-picker>
 		<!-- 举报须知 -->
 		<Message
 			:show="showMessage" 
@@ -254,10 +309,22 @@
 		components: {
 			Message
 		},
+		watch: {
+			'form.source':{
+				handler(newVal) {
+					this.form.toolcount = ''
+					this.form.toolname = ''
+					this.form.tooldesc = ''
+				},
+			},
+		},
 		data() {
 			return {
 				specialType:'3',
 				specialTypeNetwork: '',
+				infoToolShow: false,
+				infoDownloadShow: false,
+				infoNetworkShow: false,
 				listStr:'',
 				specialTypeNetworkList: [
 					{
@@ -401,6 +468,30 @@
 							trigger: ['blur', 'change']
 						},
 					],
+					// 'toolcount': [
+					// 	{
+					// 		type: 'string',
+					// 		required: true,
+					// 		message: '必填项',
+					// 		trigger: ['blur', 'change']
+					// 	},
+					// ],
+					// 'toolname': [
+					// 	{
+					// 		type: 'string',
+					// 		required: true,
+					// 		message: '必填项',
+					// 		trigger: ['blur', 'change']
+					// 	},
+					// ],
+					// 'tooldesc': [
+					// 	{
+					// 		type: 'string',
+					// 		required: true,
+					// 		message: '必填项',
+					// 		trigger: ['blur', 'change']
+					// 	},
+					// ],
 					//信息来源
 					'source': [
 						{
@@ -505,6 +596,9 @@
 					publishPlat: '', // 发布平台上传字段
 					sendPicture: [], //内容截图上传数据
 					code: '', // 验证码
+					toolname:'',
+					toolcount: '',
+					tooldes: '',
 				},
 				typeShow: false, //控制举报类型显隐
 				reportTypeColumns: [[  //举报类型
@@ -591,6 +685,120 @@
 						key: '5'
 					},
 				]],
+				infoToolColumns: [[
+					{
+						label: 'QQ',
+						key: '1'
+					},
+					{
+						label: '陌陌',
+						key: '2'
+					},
+					{
+						label: '微信',
+						key: '3'
+					},
+					{
+						label: 'YY',
+						key: '4'
+					},
+					{
+						label: 'MSN',
+						key: '5'
+					},
+					{
+						label: '其他',
+						key: '6'
+					},
+				]],
+				infoDownloadColumns: [[
+					{
+						label: '安卓市场',
+						key: '1'
+					},
+					{
+						label: '安智市场',
+						key: '2'
+					},
+					{
+						label: '应用宝',
+						key: '3'
+					},
+					{
+						label: '360手机助手',
+						key: '4'
+					},
+					{
+						label: '小米市场',
+						key: '5'
+					},
+					{
+						label: '华为市场',
+						key: '6'
+					},
+					{
+						label: '百度手机助手',
+						key: '7'
+					},
+					{
+						label: '91助手',
+						key: '8'
+					},
+					{
+						label: '豌豆荚',
+						key: '9'
+					},
+					{
+						label: '历趣',
+						key: '10'
+					},
+					{
+						label: '沃商店',
+						key: '11'
+					},
+					{
+						label: '其他',
+						key: '12'
+					},
+				]],
+				infoNetworkColumns: [[
+					{
+						label: '金山',
+						key: '1'
+					},
+					{
+						label: '115',
+						key: '2'
+					},
+					{
+						label: '淘云盘',
+						key: '3'
+					},
+					{
+						label: '华为',
+						key: '4'
+					},
+					{
+						label: '百度云',
+						key: '5'
+					},
+					{
+						label: '360网盘',
+						key: '6'
+					},
+					{
+						label: '新浪',
+						key: '7'
+					},
+					{
+						label: '腾讯',
+						key: '8'
+					},
+					{
+						label: '其他',
+						key: '12'
+					},
+				]],
 				infoSourceShow: false, //控制举报类型显隐
 				// 发布平台字典
 				map: {
@@ -771,6 +979,9 @@
 				this.typeShow = false;
 				this.placeShow = false;
 				this.infoSourceShow = false;
+				this.infoToolShow = false;
+				this.infoDownloadShow = false;
+				this.infoNetworkShow = false;
 				this.ztShow = false
 			},
 			//多列联动
@@ -809,6 +1020,21 @@
 				this.cancle();
 				this.form.source = val.value[0].label;
 			},
+			// 确定下载源
+			confirmDownloadSource(val) {
+				this.cancle();
+				this.form.toolcount = val.value[0].label;
+			},
+			// 确定网盘
+			confirmNetworkSource(val) {
+				this.cancle();
+				this.form.toolcount = val.value[0].label;
+			},
+			// 确定聊天工具
+			confirmToolSource(val) {
+				this.cancle();
+				this.form.toolname = val.value[0].label;
+			},
 			// 删除图片
 			deletePic(event) {
 				this.form.picture.splice(event.index, 1)
@@ -859,6 +1085,7 @@
 			//点击举报
 			async submit() {
 				console.log(this.reportType, '举报类型')
+				
 				// if(this.form.reportName === '') {
 				// 	wx.showToast({
 				// 	  title: '请先注册',
@@ -960,10 +1187,14 @@
 							console.log('举报结果', res)
 							uni.$u.toast('举报成功')
 							setTimeout(() => {
-								wx.switchTab({
-									url: '/pages/index/index'
+								// wx.switchTab({
+								// 	url: '/pages/index/index'
+								// })
+								wx.reLaunch({
+									url: '/packageMine/myReport/myReport'
 								})
-							}, 1500)
+							}, 1000)
+							
 						}).catch(res => {
 							if(res === 103) { // 验证码超时
 								this.updateImageCode() // 更新验证码