diff --git a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js index c68a839..3a84aaf 100644 --- a/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js +++ b/miniprogram/pages/approvalWarning/approvalForm/approvalForm.js @@ -1,6 +1,6 @@ // pages/approvalWarning/approvalForm/approvalForm.js import {base_url} from '../../../utils/http'; -import {API} from "../../../utils/api"; +import {API as $api, API} from "../../../utils/api"; Page({ /** @@ -23,9 +23,8 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - if(options && JSON.parse(options.data)){ - let _data = JSON.parse(options.data); - let _fileData = _data.files?_data.files.split(","):[]; + if(options && JSON.stringify(options) !== '{}'){ + let _fileData = options.files?options.files.split(","):[]; let _newFileData = []; _fileData.forEach(item => { let _lastNum = item.lastIndexOf('/')+1; @@ -34,8 +33,13 @@ Page({ url:base_url+item }) }) + this.loadDetailData({ + pageNum:1, + pageSize:10, + type:options.type, + id:options.id + }) this.setData({ - fData:_data, fileList:_newFileData }) } @@ -165,6 +169,21 @@ Page({ } }) }, + //加载详情数据 + loadDetailData(param){ + let _this = this; + $api.queryList(param).then(res => { + if(res.code === 0){ + let _data = null; + if(res.rows.length>0){ + _data = res.rows[0]; + } + _this.setData({ + fData:_data + }) + } + }) + }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/miniprogram/pages/approvalWarning/approvalWarning.js b/miniprogram/pages/approvalWarning/approvalWarning.js index 88fe566..72ef20a 100644 --- a/miniprogram/pages/approvalWarning/approvalWarning.js +++ b/miniprogram/pages/approvalWarning/approvalWarning.js @@ -37,7 +37,7 @@ Page({ handleSwitchItem(e){ let _data = e.currentTarget.dataset.item; wx.navigateTo({ - url:'./approvalForm/approvalForm?data='+JSON.stringify(_data) + url:'./approvalForm/approvalForm?files='+_data.files+'&type='+_data.type+'&id='+_data.id }) }, diff --git a/miniprogram/pages/workReport/workReport.js b/miniprogram/pages/workReport/workReport.js index e1320df..4b70069 100644 --- a/miniprogram/pages/workReport/workReport.js +++ b/miniprogram/pages/workReport/workReport.js @@ -34,7 +34,6 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - console.log(options,'option'); if(options && JSON.stringify(options) !== '{}'){ this.setData({ "searchForm.type":options.type,