diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue index 484ac6e..a6aa9ba 100644 --- a/packageIndex/report/report.vue +++ b/packageIndex/report/report.vue @@ -63,10 +63,10 @@ - + - + @@ -1130,9 +1130,10 @@ infoSource = this.typeMapDict[this.reportType] } // 登录的用户使用 - const userinfo = wx.getStorageSync('userInfoxj') + let userinfo = wx.getStorageSync('userInfoxj') const account = wx.getStorageSync('userAccount') const phone = wx.getStorageSync('userPhone') + console.log("==++当前登陆用户的信息: ", userinfo); // 解密用户信息----------------------------------------------------------------------------- const submitParams = { "anonymousUserInfo.name": account ? account : this.form.reportName, // 举报人 @@ -1141,11 +1142,12 @@ "reportInfo.reportUser": account ? account : '',//举报人 "reportInfo.reportName": account ? account : '',// 举报人 "reportInfo.reportType": this.form.reportType,// 举报类型 - "reportInfo.infoSource": infoSource, // 网站举报(必填固定不变) + // "reportInfo.infoSource": infoSource, // 网站举报(必填固定不变) + "reportInfo.infoSource": '2', // 网站举报(必填固定不变)App传1 小程序传2 "reportInfo.infoType": '1', //(三种类型举报都传递1) "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.reportUserType": userinfo.accountType + '' === '1' ? '1' : userinfo.accountType + '' === '2' ? '2' : '3', // //1普通用户2, "监督员"2, "匿名用户"(未注册情况为3) "reportInfo.directReport": '', // "reportInfo.infoDescribe": this.form.desc, // 描述 "reportInfo.publishUser": this.form.publishName, // 发布人 diff --git a/packageIndex/report/report.vue b/packageIndex/report/report.vue index 484ac6e..a6aa9ba 100644 --- a/packageIndex/report/report.vue +++ b/packageIndex/report/report.vue @@ -63,10 +63,10 @@ - + - + @@ -1130,9 +1130,10 @@ infoSource = this.typeMapDict[this.reportType] } // 登录的用户使用 - const userinfo = wx.getStorageSync('userInfoxj') + let userinfo = wx.getStorageSync('userInfoxj') const account = wx.getStorageSync('userAccount') const phone = wx.getStorageSync('userPhone') + console.log("==++当前登陆用户的信息: ", userinfo); // 解密用户信息----------------------------------------------------------------------------- const submitParams = { "anonymousUserInfo.name": account ? account : this.form.reportName, // 举报人 @@ -1141,11 +1142,12 @@ "reportInfo.reportUser": account ? account : '',//举报人 "reportInfo.reportName": account ? account : '',// 举报人 "reportInfo.reportType": this.form.reportType,// 举报类型 - "reportInfo.infoSource": infoSource, // 网站举报(必填固定不变) + // "reportInfo.infoSource": infoSource, // 网站举报(必填固定不变) + "reportInfo.infoSource": '2', // 网站举报(必填固定不变)App传1 小程序传2 "reportInfo.infoType": '1', //(三种类型举报都传递1) "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.reportUserType": userinfo.accountType + '' === '1' ? '1' : userinfo.accountType + '' === '2' ? '2' : '3', // //1普通用户2, "监督员"2, "匿名用户"(未注册情况为3) "reportInfo.directReport": '', // "reportInfo.infoDescribe": this.form.desc, // 描述 "reportInfo.publishUser": this.form.publishName, // 发布人 diff --git a/packageMine/myReport/myReport.vue b/packageMine/myReport/myReport.vue index cddfacb..216c3cb 100644 --- a/packageMine/myReport/myReport.vue +++ b/packageMine/myReport/myReport.vue @@ -165,7 +165,7 @@ 'userInfoVo.endTime':stamp2Time(new Date().getTime()), //结束时间 (Date) 'userInfoVo.pageIndex':this.pageIndex, //页码 'userInfoVo.count':'10', //页数 - 'userInfoVo.attributeTable': '', //用户为监督员传“jdy” + 'userInfoVo.attributeTable': userinfo.accountType + '' === '2' ? 'jdy' : '', //用户为监督员传“jdy” 'token':'', } getReportList(data).then(res => {