diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue index ca4109c..f24ea8c 100644 --- a/packageIndex/center/center.vue +++ b/packageIndex/center/center.vue @@ -144,7 +144,7 @@ TypeList4: [ { id: '10', - type: 'others', + type: 'other', label: '其他类', icon: 'http://111.198.10.15:11404/imgs/xj/其他.png' }, diff --git a/packageIndex/center/center.vue b/packageIndex/center/center.vue index ca4109c..f24ea8c 100644 --- a/packageIndex/center/center.vue +++ b/packageIndex/center/center.vue @@ -144,7 +144,7 @@ TypeList4: [ { id: '10', - type: 'others', + type: 'other', label: '其他类', icon: 'http://111.198.10.15:11404/imgs/xj/其他.png' }, diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue index 80c4629..21a4abd 100644 --- a/packageIndex/report/report.vue +++ b/packageIndex/report/report.vue @@ -344,12 +344,12 @@ typeMap: { web: '网站类型举报', special: '专项举报', - others: '其他类型举报', + // others: '其他类型举报', }, typeMapDict: { web: 0, special: 5, - others: 1, + // others: 1, }, tabList: [ { @@ -643,7 +643,7 @@ this.fetchSpecial() // 获取专题 this.fetchCodeURl() // 获取验证码 this.form.reportType = getLocationParams('reportTypeValue'); // 举报类型接口传参 - this.reportType = getLocationParams('reportType'); // 前端控制举报类型 web special other + this.reportType = 'web' // 前端控制举报类型 web special other this.form.type = getLocationParams('reportType'); // this.typeLabel = this.typeMap[ this.form.type ] this.reportIcon = decodeURIComponent(getLocationParams('icon')); @@ -701,7 +701,7 @@ const val = data[this.specialIndex] this.form.topicId = val.id this.form.zt = val.label - console.log(this.form.zt, 'this.form.zt') + } }) }, @@ -893,7 +893,6 @@ let infoSource if (this.reportType === 'other') { infoSource = this.infoSourceColumns[0].filter(item => item.label == this.form.source)[0].key - // infoSource = 1 } else { infoSource = this.typeMapDict[this.reportType] } @@ -911,7 +910,7 @@ "reportInfo.reportType": this.form.reportType,// 举报类型 "reportInfo.infoSource": infoSource, // 网站举报(必填固定不变) "reportInfo.infoType": '1', //(三种类型举报都传递1) - "reportInfo.topicId": this.form.topicId, // 专题id + "reportInfo.topicId": this.reportType === 'special' ? this.form.topicId : '', // 专题id "reportInfo.isMedia": this.form.isNewMedia, //是否是新媒体 "reportInfo.reportUserType": userinfo.id ? '1' : '3', // //1普通用户2, "监督员"3, "匿名用户"(未注册情况为3) "reportInfo.directReport": '', // @@ -961,8 +960,8 @@ console.log('举报结果', res) uni.$u.toast('举报成功') setTimeout(() => { - wx.navigateTo({ - url: '/packageMine/myReport/myReport' + wx.switchTab({ + url: '/pages/index/index' }) }, 1500) }).catch(res => {