diff --git a/miniprogram/app.js b/miniprogram/app.js
index 17a48b5..34c1389 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -6,13 +6,13 @@ App({
// parkId : '26', // 园区id
// parkName : '长阳智会云控', // 园区名称
// 本地测试
- DOMAIN_NAME_PREFIX: 'http://192.168.0.30:9227',
- DOMAIN_NAME: 'http://192.168.0.30:9227', //接口域名
- IMG_NAME: 'http://192.168.0.30:9227',
+ // DOMAIN_NAME_PREFIX: 'http://192.168.0.30:9227',
+ // DOMAIN_NAME: 'http://192.168.0.30:9227', //接口域名
+ // IMG_NAME: 'http://192.168.0.30:9227',
// 生产
- // DOMAIN_NAME_PREFIX: 'https://company.haxy.com.cn:4443/shoot-hand',
- // DOMAIN_NAME: 'https://company.haxy.com.cn:4443/shoot-hand', //接口域名
- // IMG_NAME: 'https://company.haxy.com.cn:4443/shoot-hand',
+ DOMAIN_NAME_PREFIX: 'https://company.haxy.com.cn:4443/shoot-hand',
+ DOMAIN_NAME: 'https://company.haxy.com.cn:4443/shoot-hand', //接口域名
+ IMG_NAME: 'https://company.haxy.com.cn:4443/shoot-hand',
globals: {
refreshMyPages: false,
homedata: {},
diff --git a/miniprogram/pages/reportRepair/assign/detail/detail.js b/miniprogram/pages/reportRepair/assign/detail/detail.js
index 0eb3985..92e03c9 100644
--- a/miniprogram/pages/reportRepair/assign/detail/detail.js
+++ b/miniprogram/pages/reportRepair/assign/detail/detail.js
@@ -21,7 +21,10 @@ Page({
id: '',
detail: {},
files: {},
- currentLog: {},
+ log: {
+ feedback: {}, //反馈
+ invalid: {}, // 无效原因
+ },
innerAudioContext: null, // 音频对象
innerAudioContextIsPlay: false, // 音频对象-是否播放
operatorBtn: {
@@ -79,15 +82,19 @@ Page({
return item
})
// 日志
- if (detail.logId) {
- let firstLog = res.log.find(item => item.id == detail.logId)
- if (firstLog) {
- let preLog = res.log.find(item => item.id == firstLog.pid)
- _this.setData({
- currentLog: preLog
- })
- }
+ let log = _this.data.log
+ // 派单反馈
+ if (detail.status == 3) {
+ log.feedback = _this.findLog(res.log, detail.logId, 1)
}
+ // 无效原因
+ if (detail.status == 11) {
+ log.invalid = _this.findLog(res.log, detail.logId, 1)
+ }
+ _this.setData({
+ log
+ })
+
// 第一张图片
let firstImg = files.repair.find(item => checkIsImg(item.url))
if (firstImg) {
@@ -105,6 +112,21 @@ Page({
})
},
+ findLog(logs, logId, step) {
+ let log = logs.find(item => item.id == logId)
+ if (log) {
+ for (let i = 0; i < step; i++) {
+ log = logs.find(item => item.id == log.pid)
+ if (!log) {
+ return {}
+ }
+ }
+ return log
+ } else {
+ return {}
+ }
+ },
+
// 初始化按钮
initOperatorBtn() {
console.log('initOperatorBtn', 111);
diff --git a/miniprogram/pages/reportRepair/assign/detail/detail.wxml b/miniprogram/pages/reportRepair/assign/detail/detail.wxml
index 6324993..bd4d541 100644
--- a/miniprogram/pages/reportRepair/assign/detail/detail.wxml
+++ b/miniprogram/pages/reportRepair/assign/detail/detail.wxml
@@ -84,11 +84,11 @@
反馈人员
- {{currentLog.recUserName}}
+ {{log.feedback.recUserName}}
反馈描述
- {{currentLog.content}}
+ {{log.feedback.content}}
@@ -131,6 +131,16 @@
+
+ 无效原因
+
+
+
+ 原因
+ {{log.invalid.content}}
+
+
+
服务评价