diff --git a/miniprogram/pages/reportRepair/assign/record/record.js b/miniprogram/pages/reportRepair/assign/record/record.js index a0c523b..1e2e6d4 100644 --- a/miniprogram/pages/reportRepair/assign/record/record.js +++ b/miniprogram/pages/reportRepair/assign/record/record.js @@ -68,8 +68,7 @@ Page({ _this.setData({ userData: wx.getStorageSync('user'), }) - // 获取数据 - let userId = _this.data.userData.id + // 数据 // 角色id let dataType = _this.data.userData.dataType // 是否展示 @@ -78,12 +77,7 @@ Page({ tabTitle: '重新派单', // tab 标题 resendOrderVisible: true, // 重新派单显示 }) - _this.getDataList('重新派单') } - // 数据 - _this.getDataList('待派单') - _this.getDataList('已派单') - _this.getDataList('已关闭') }, // 获取数据 @@ -154,8 +148,7 @@ Page({ console.log('repairListRq', res); let dataList = res.rows let isDataAll = false - if (!(dataList && dataList.length > 0)) { - dataList = [] + if (pageNum * pageSize >= res.total) { isDataAll = true } // @@ -198,15 +191,9 @@ Page({ formartData(dataList) { // 格式化数据 return dataList.map(item => { - let repairImages = item.repairImages - if (repairImages) { - let fileList = JSON.parse(repairImages) - let file = fileList.find(item => checkIsImg(item.url)) - if (file) { - item.visibleImg = file.url - } else { - item.visibleImg = '/profile/static/repair/index/noneImg.png' - } + let ext1 = item.ext1 + if (ext1) { + item.visibleImg = ext1 } else { item.visibleImg = '/profile/static/repair/index/noneImg.png' } diff --git a/miniprogram/pages/reportRepair/assign/record/record.wxml b/miniprogram/pages/reportRepair/assign/record/record.wxml index efd5b56..a1ad937 100644 --- a/miniprogram/pages/reportRepair/assign/record/record.wxml +++ b/miniprogram/pages/reportRepair/assign/record/record.wxml @@ -5,7 +5,7 @@ 编号: {{item.sn}} - + {{item.repairName}} 类型: {{item.typeName + '/' + item.deviceName}} @@ -35,7 +35,7 @@ 编号: {{item.sn}} - + {{item.repairName}} 类型: {{item.typeName + '/' + item.deviceName}} @@ -65,7 +65,7 @@ 编号: {{item.sn}} - + {{item.repairName}} 类型: {{item.typeName + '/' + item.deviceName}} @@ -94,7 +94,7 @@ 编号: {{item.sn}} - + {{item.repairName}} 类型: {{item.typeName + '/' + item.deviceName}}