From 598377d733f736c0d21d4c99d2731e8acebfc69b Mon Sep 17 00:00:00 2001
From: ylj20011123 <YLJ>
Date: Wed, 7 May 2025 14:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20feat(=E6=A8=A1=E5=9D=97):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=AA=E5=BE=88=E6=A3=92=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mbwa/mbwa.vue                | 16 +++++++--------
 pages/walkAroundManager/detail.vue | 32 +++++++++++++++++-------------
 util/apiPath.js                    |  4 ++--
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/pages/mbwa/mbwa.vue b/pages/mbwa/mbwa.vue
index 57aa1fb..1e327f1 100644
--- a/pages/mbwa/mbwa.vue
+++ b/pages/mbwa/mbwa.vue
@@ -25,8 +25,8 @@
         <view class="dataItem" v-for="(item, index) in dataList" :key="index" @click="handleGoDetail(item)">
           <div class="content-index">{{ index + 1 }}</div>
           <view class="itemRow">
-            <view class="projectName">{{ item.template.title || "-" }}</view>
-            <view class="stateName" :style="{
+            <view class="projectName">{{ item.placeName || "-" }}</view>
+            <view v-if="item.situation !== 0" class="stateName" :style="{
               color:
                 item.errorStatus === 0
                   ? 'red'
@@ -93,7 +93,7 @@
           <view class="dataTop">
             <view class="topLeft">
               <image class="itemIcon" src="/static/images/mbwa/fixed.svg" />
-              <span class="itemTitle">{{ item.template.title || "-" }}</span>
+              <span class="itemTitle">{{ item.title || "-" }}</span>
             </view>
             <view class="topRight" :style="{
               color:
@@ -352,11 +352,11 @@ export default {
         }
 
         // list.forEach((item) => {
-          // let extendObj = {};
-          // if (item.extend) {
-          //   extendObj = JSON.parse(item.extend);
-          // }
-          // item.extendObj = extendObj;
+        // let extendObj = {};
+        // if (item.extend) {
+        //   extendObj = JSON.parse(item.extend);
+        // }
+        // item.extendObj = extendObj;
         // });
       } else {
         this.isEnd = true;
diff --git a/pages/walkAroundManager/detail.vue b/pages/walkAroundManager/detail.vue
index 923b302..bfe6372 100644
--- a/pages/walkAroundManager/detail.vue
+++ b/pages/walkAroundManager/detail.vue
@@ -2,14 +2,14 @@
   <view class="main">
     <scroll-view class="pageScroll" :style="{
       height:
-        extendObj.errorStatus === 0 || extendObj.errorStatus === 1
+        extendObj.situation !== 0 && (extendObj.errorStatus === 0 || extendObj.errorStatus === 1)
           ? 'calc(100% - 120rpx)'
           : '100%',
     }" :scroll-y="true">
       <view class="topContent">
         <view class="placeBox">
           <image class="itemIcon" src="/static/images/mbwa/fixed.svg" />
-          <view class="placeName">{{ detailObj.template.title || "-" }}</view>
+          <view class="placeName">{{ detailObj.placeName || "-" }}</view>
           <view class="statusBox" :style="{
             color:
               extendObj.situation === 0
@@ -263,10 +263,13 @@
     </scroll-view>
 
     <view class="bottomBtnBox" v-if="
-      (extendObj.errorStatus === 0 && isManager) ||
-      (extendObj.errorStatus === 1 && isFeedback) ||
-      (feedbackStatus === 1 && isManager) ||
-      (feedbackStatus === 2 && isFeedback)
+      extendObj.situation !== 0 &&
+      (
+        (extendObj.errorStatus === 0 && isManager) ||
+        (extendObj.errorStatus === 1 && isFeedback) ||
+        (feedbackStatus === 1 && isManager) ||
+        (feedbackStatus === 2 && isFeedback)
+      )
     ">
       <view class="bottomBtn" @click="handleAssign">{{
         extendObj.errorStatus === 0 || feedbackStatus === 1
@@ -480,7 +483,7 @@
         <div class="contentBox">
           <image src="/static/images/publicity/dingwei.png" mode="aspectFit" class="addressIcon"></image>
           <div>
-            <p class="xuncha address">{{ detailObj.template.title || "-" }}</p>
+            <p class="xuncha address">{{ detailObj.placeName || "-" }}</p>
             <div>
               <span>巡查时间：</span><span>{{
                 detailObj.createdAt
@@ -796,8 +799,8 @@ export default {
       this.feedbackStatus = value;
       // 里面的 suggestTime  就是上一次选择处理人的时间 
       // 选择判断一下 当前时间 跟 这个时间 是否在天数上已经不是同一天了 那么就可以重新选择人 
-      // let nowTime = this.$util.cutDate(new Date(), "YYYY-MM-DD")
-      let nowTime = '2025-04-23'
+      let nowTime = this.$util.cutDate(new Date(), "YYYY-MM-DD")
+      // let nowTime = '2025-04-23'
       let suggestTime = this.$util.cutDate(this.extendObj.suggestTime, "YYYY-MM-DD")
 
       // 因为上面都转成了 年月日格式 当对不上的时候 就说明天数不是同一天 即第二天或以后 那么这个时候就可以显示更换指派人
@@ -980,11 +983,12 @@ export default {
         feedbackImgList: obj.feedbackImgList,
         newFeedbackImgList: obj.newFeedbackImgList
       }
+
+      this.uploadResult = extend.uploadResult;
+      this.current = extend.situation;
+      this.extendObj = extend;
+      this.imgsList = extend.imgsList;
       if (extend.situation === 1) {
-        this.uploadResult = extend.uploadResult;
-        this.imgsList = extend.imgsList;
-        this.current = extend.situation;
-        this.extendObj = extend;
         console.log("this.extendObj", this.extendObj);
         if (extend.errorStatus === 1) {
           this.suggestion = {
@@ -1387,7 +1391,7 @@ export default {
 
   .pageScroll {
     width: 100%;
-    height: calc(100% - 120rpx);
+    // height: calc(100% - 120rpx); 
     background-color: #f6f7f9;
     box-sizing: border-box;
     padding-bottom: 32rpx;
diff --git a/util/apiPath.js b/util/apiPath.js
index b7391df..15e8596 100644
--- a/util/apiPath.js
+++ b/util/apiPath.js
@@ -28,6 +28,6 @@ export default {
 
 
 
-    // JavaApiurl: 'http://10.104.1.161:8070/platform/', // web api测试接口地址
-    JavaApiurl: 'http://10.104.1.175:8070/platform/', // web api测试接口地址
+    JavaApiurl: 'https://admin.es.eshangtech.com/platform/', // web api测试接口地址
+    // JavaApiurl: 'http://10.104.1.175:8070/platform/', // web api测试接口地址
 }
\ No newline at end of file