diff --git a/api/index.js b/api/index.js index ab28aab..2102dfc 100644 --- a/api/index.js +++ b/api/index.js @@ -51,7 +51,19 @@ export function paySuccess(pamars) { export function message(pamars) { return fly.get(`/bysmp/message/page`,pamars) } -// 提报 +// 提报报修 export function repairSubmit(data) { return fly.post(`/bysmp/repair/submit`,data) } +// 提报报事 +export function incidentsSubmit(data) { + return fly.post(`/bysmp/incidents/submit`,data) +} +// 报修记录 +export function repairList(pamars) { + return fly.get(`/bysmp/repair/list`,pamars) +} +// 报事记录 +export function incidentsList(pamars) { + return fly.get(`/bysmp/incidents/list`,pamars) +} diff --git a/app.json b/app.json index 5d1286e..0a7d904 100644 --- a/app.json +++ b/app.json @@ -26,7 +26,9 @@ "editUser/editUser", "checkInRecord/checkInRecord", "evaluate/evaluate", - "checkInEvaluate/checkInEvaluate" + "checkInEvaluate/checkInEvaluate", + "repairList/repairList", + "eventList/eventList" ] }, { diff --git a/images/icon/event.png b/images/icon/event.png new file mode 100644 index 0000000..35ad2d4 Binary files /dev/null and b/images/icon/event.png differ diff --git a/images/icon/repair.png b/images/icon/repair.png new file mode 100644 index 0000000..1ffd493 Binary files /dev/null and b/images/icon/repair.png differ diff --git a/images/icon_2.png b/images/icon_2.png new file mode 100644 index 0000000..823eadd Binary files /dev/null and b/images/icon_2.png differ diff --git a/pages/mine/mine.js b/pages/mine/mine.js index 0d6db71..9e3b9f8 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -23,11 +23,11 @@ Page({ }, { label:'我的报修', - url:'' + url:'/subpages/mine/repairList/repairList' }, { label:'我的报事', - url:'' + url:'/subpages/mine/eventList/eventList' }, { label:'共享空间', diff --git a/subpages/bsPage/bsPage/bsPage.js b/subpages/bsPage/bsPage/bsPage.js index e462b1d..33709be 100644 --- a/subpages/bsPage/bsPage/bsPage.js +++ b/subpages/bsPage/bsPage/bsPage.js @@ -2,6 +2,9 @@ const options = [ '安全问题','卫生问题','服务问题','噪音问题','体验问题','其它' ]; +var config = require('../../../utils/config') +import {incidentsSubmit} from "../../../api/index" +const app = getApp() Page({ /** @@ -11,22 +14,11 @@ Page({ show: false, options, fieldValue: '', - cascaderValue: '', - questionText: '', - fileList: [ - // { - // url: 'https://img.yzcdn.cn/vant/leaf.jpg', - // name: '图片1', - // }, - // // Uploader 根据文件后缀来判断是否为图片文件 - // // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明 - // { - // url: 'http://iph.href.lu/60x60?text=default', - // name: '图片2', - // isImage: true, - // // deletable: true, - // }, - ], + faultDescribe: '', + fileList: [], + feedbackType:'', + positionType:null, + position:'' }, onButtonTap() { @@ -35,6 +27,11 @@ Page({ icon: 'none' }); }, + onInputP(e){ + this.setData({ + position:e.detail.value + }) + }, deleteData(event) { // 删除 console.log(event.detail.index) @@ -48,26 +45,20 @@ Page({ const { file } = event.detail; - console.log(file, 66) + const _this = this // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式 wx.uploadFile({ - url: 'https://example.weixin.qq.com/upload', // 仅为示例，非真实的接口地址 + url: `${config.BASEURL()}/common/upload`, // 仅为示例，非真实的接口地址 filePath: file.url, name: 'file', - formData: { - user: 'test' + header: { + "Content-type": "multipart/form-data", + 'Authorization': wx.getStorageSync('token') }, success(res) { - // 上传完成需要更新 fileList - const { - fileList = [] - } = this.data; - fileList.push({ - ...file, - url: res.data - }); - this.setData({ - fileList + const res1 = JSON.parse(res.data) + _this.setData({ + fileList:_this.data.fileList.concat([{url:res1.url,name:new Date().getTime()}]) }); }, }); @@ -81,9 +72,15 @@ Page({ }, onInput(e) { this.setData({ - questionText: e.detail.value, + faultDescribe: e.detail.value, }); - // console.log(this.data.questionText, 666) + // console.log(this.data.faultDescribe, 666) + }, + onChangeRadio(e){ + this.setData({ + positionType:e.detail, + position:'' + }) }, onClick() { this.setData({ @@ -96,17 +93,51 @@ Page({ }); }, - onFinish(e) { - const { - selectedOptions, - value - } = e.detail; - const fieldValue = selectedOptions - .map((option) => option.text || option.name) - .join('/'); - this.setData({ - fieldValue, - cascaderValue: value, + + submit(){ + const {position,positionType,feedbackType,faultDescribe,fileList} = this.data + if(!feedbackType){ + wx.showToast({ + title: '反馈类型不能为空', + icon:'none' + }) + return + } + if(!faultDescribe){ + wx.showToast({ + title: '问题描述不能为空', + icon:'none' + }) + return + } + if(positionType === null){ + wx.showToast({ + title: '位置不能为空', + icon:'none' + }) + return + } + let parms = { + position, + images:fileList, + positionType, + faultDescribe, + graduateName: app.globalData.userInfo.name, + telephone: app.globalData.userInfo.phone, + feedbackType + } + incidentsSubmit(parms).then(res=>{ + if(res.code === 200){ + wx.showToast({ + title: '上报成功', + duration:2000, + success:()=>{ + setTimeout(()=>{ + wx.navigateBack() + },2000) + } + }) + } }) }, /** @@ -167,11 +198,16 @@ Page({ }, onconfirm(e){ + const { + index, + value + } = e.detail; + console.log(index); this.setData({ - show:false, - fieldValue:e.detail.value + fieldValue:value, + feedbackType: (index + 1).toString(), + show:false }) - console.log(e); }, oncancel(){ this.setData({ diff --git a/subpages/bsPage/bsPage/bsPage.wxml b/subpages/bsPage/bsPage/bsPage.wxml index ac34e58..04d28db 100644 --- a/subpages/bsPage/bsPage/bsPage.wxml +++ b/subpages/bsPage/bsPage/bsPage.wxml @@ -3,24 +3,27 @@ - + - 问题描述 -