From 1abeb66086dedab5d687c55f574ee9bae3f3436a Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Thu, 8 Aug 2024 09:16:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E6=8A=A5=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/api/repair/distributionCase.js    |  8 ++++
 .../reportRepair/assign/detail/detail.js      | 37 ++++++++++++++-----
 .../reportRepair/assign/record/record.js      | 18 +++++----
 .../reportRepair/assign/record/record.wxml    |  6 +--
 .../pages/reportRepair/report/report.js       | 10 +++++
 .../pages/reportRepair/report/report.wxml     | 16 ++++----
 6 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/miniprogram/api/repair/distributionCase.js b/miniprogram/api/repair/distributionCase.js
index 9a0f62c..54f0e88 100644
--- a/miniprogram/api/repair/distributionCase.js
+++ b/miniprogram/api/repair/distributionCase.js
@@ -11,3 +11,11 @@ export function dispatcherListRq(data) {
         data
     });
 }
+
+// 报修详情
+export function reportDetailRq(id) {
+    return request({
+        url: `/repair/get/` + id,
+        method: "get",
+    });
+}
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/assign/detail/detail.js b/miniprogram/pages/reportRepair/assign/detail/detail.js
index eb76774..c97e778 100644
--- a/miniprogram/pages/reportRepair/assign/detail/detail.js
+++ b/miniprogram/pages/reportRepair/assign/detail/detail.js
@@ -1,5 +1,10 @@
 const app = getApp()
 
+
+import {
+    reportDetailRq
+} from "../../../../api/repair/distributionCase.js"
+
 Page({
 
     /**
@@ -7,37 +12,51 @@ Page({
      */
     data: {
         IMG_NAME: app.IMG_NAME,
+        id: '',
+        detail: {},
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-
+        console.log('onLoad', options);
+        let _this = this
+        _this.setData({
+            ...options
+        })
+        _this.getDetail(options.id)
     },
 
-    back(){
+    back() {
         wx.navigateBack()
     },
 
-    
-     // 确认损坏
-     jumpAffirm(){
+    getDetail(id) {
+        reportDetailRq(id).then(res=>{
+            console.log("reportDetailRq" , res);
+            let detail = res.data
+        })
+    },
+
+
+    // 确认损坏
+    jumpAffirm() {
         wx.navigateTo({
-          url: '/pages/reportRepair/assign/affirm/affirm',
+            url: '/pages/reportRepair/assign/affirm/affirm',
         })
     },
 
 
     // 提交反馈
-    jumpFeedback(){
+    jumpFeedback() {
         wx.navigateTo({
-          url: '/pages/reportRepair/assign/feedback/feedback',
+            url: '/pages/reportRepair/assign/feedback/feedback',
         })
     },
 
     // 无效
-    invalid(){
+    invalid() {
         wx.navigateBack()
     },
 
diff --git a/miniprogram/pages/reportRepair/assign/record/record.js b/miniprogram/pages/reportRepair/assign/record/record.js
index 09ef5bb..33e1ded 100644
--- a/miniprogram/pages/reportRepair/assign/record/record.js
+++ b/miniprogram/pages/reportRepair/assign/record/record.js
@@ -131,7 +131,7 @@ Page({
             userId,
             pageNum,
             pageSize,
-            statusValue : status
+            statusValue: status
         }
         // 查询数据        
         dispatcherListRq(param).then(res => {
@@ -179,15 +179,15 @@ Page({
         // 格式化数据
         return dataList.map(item => {
             let repairImages = item.repairImages
-            if(repairImages){
+            if (repairImages) {
                 let fileList = JSON.parse(repairImages)
-                let file = fileList.find(item=> checkIsImg(item.url))
-                if(file){
+                let file = fileList.find(item => checkIsImg(item.url))
+                if (file) {
                     item.visibleImg = file.url
-                }else{
+                } else {
                     item.visibleImg = '/profile/static/repair/index/noneImg.png'
                 }
-            }else{
+            } else {
                 item.visibleImg = '/profile/static/repair/index/noneImg.png'
             }
             return item;
@@ -204,9 +204,11 @@ Page({
     },
 
     // 跳转-详情
-    jumpDetail() {
+    jumpDetail(e) {
+        console.log('detail', e);
+        let id = e.currentTarget.dataset.obj.id
         wx.navigateTo({
-            url: '/pages/reportRepair/assign/detail/detail',
+            url: '/pages/reportRepair/assign/detail/detail?id=' + id,
         })
     },
 
diff --git a/miniprogram/pages/reportRepair/assign/record/record.wxml b/miniprogram/pages/reportRepair/assign/record/record.wxml
index 6e9dfd2..f72b3d8 100644
--- a/miniprogram/pages/reportRepair/assign/record/record.wxml
+++ b/miniprogram/pages/reportRepair/assign/record/record.wxml
@@ -24,7 +24,7 @@
         </van-tab>
 
         <van-tab title="待派单">
-            <view class="itemView" wx:for="{{pendingOrderDataList}}" wx:for-item="item" wx:key="*this" bind:tap="jumpDetail">
+            <view class="itemView" wx:for="{{pendingOrderDataList}}" wx:for-item="item" wx:key="*this" data-obj="{{item}}" bind:tap="jumpDetail">
                 <view class="topTitle">编号: T123123123</view>
                 <view class="selfLine"></view>
                 <view class="centerView">
@@ -40,11 +40,11 @@
                 <view class="bottomView">
                     <view class="name">
                         <van-icon name="manager-o" size="28rpx" color="#4e96f8"/>
-                        王军（18300011120）
+                        {{item.userName}}（18300011120）
                     </view>
                     <view class="time">
                         <van-icon name="calendar-o" size="30rpx" color="#4e96f8"/>
-                        2024-01-01 12:12:00
+                        {{item.createTime}}
                     </view>
                 </view>
             </view>
diff --git a/miniprogram/pages/reportRepair/report/report.js b/miniprogram/pages/reportRepair/report/report.js
index 445ceec..e55beeb 100644
--- a/miniprogram/pages/reportRepair/report/report.js
+++ b/miniprogram/pages/reportRepair/report/report.js
@@ -549,6 +549,16 @@ Page({
         if (!detail.area) {
             _this.showErrMsg('请输入门牌号!')
             return;
+        }
+         // 联系电话
+         if (!detail.phone) {
+            _this.showErrMsg('请输入联系电话!')
+            return;
+        }
+        // 报修人姓名
+        if (!detail.name) {
+            _this.showErrMsg('请输入报修人姓名!')
+            return;
         }
         // 故障描述
         if (!detail.content) {
diff --git a/miniprogram/pages/reportRepair/report/report.wxml b/miniprogram/pages/reportRepair/report/report.wxml
index f9dd6fa..90f22bf 100644
--- a/miniprogram/pages/reportRepair/report/report.wxml
+++ b/miniprogram/pages/reportRepair/report/report.wxml
@@ -16,14 +16,6 @@
             <view class="label must">故障类型</view>
             <van-field value="{{ typeName }}" input-class="input" is-link readonly placeholder="请选择" arrow-direction="down" border="{{ false }}" input-align="right" bind:tap="showType" />
         </view>
-        <view class="rowView">
-            <view class="label ">联系电话</view>
-            <van-field value="{{ detail.phone }}" bind:input="fieldInput" data-name="phone" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
-        </view>
-        <view class="rowView">
-            <view class="label ">报修人姓名</view>
-            <van-field value="{{ detail.name }}" bind:input="fieldInput" data-name="name" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
-        </view>
         <view class="rowView">
             <view class="label must">故障地点</view>
             <van-field value="{{ addressName }}" input-class="input" is-link readonly placeholder="请选择" arrow-direction="down" border="{{ false }}" input-align="right" bind:tap="showAddress" />
@@ -32,6 +24,14 @@
             <view class="label must">门牌号</view>
             <van-field value="{{ detail.area }}" bind:input="fieldInput" data-name="area" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
         </view>
+        <view class="rowView">
+            <view class="label must">联系电话</view>
+            <van-field value="{{ detail.phone }}" bind:input="fieldInput" data-name="phone" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
+        </view>
+        <view class="rowView">
+            <view class="label must">报修人姓名</view>
+            <van-field value="{{ detail.name }}" bind:input="fieldInput" data-name="name" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
+        </view>
         <view class="rowColumnView">
             <view class="label must">故障描述</view>
             <view class="contentView">