From 2715a8b23cdc36ed7a99c81d38ef838f97e98dce Mon Sep 17 00:00:00 2001
From: unknown <unknown@example.com>
Date: Tue, 27 Aug 2024 17:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

首页登录加入提示
修复：
我要报修上传图片后图片不展示
我要报修->故障描述输入框点击没反应
报修人姓名和联系电话移至故障类型上面
---
 miniprogram/pages/index/index.js              |  2 +-
 .../reportRepair/assign/detail/detail.wxml    | 16 +++++++--------
 .../pages/reportRepair/repair/case/case.wxml  | 17 ++++++++--------
 .../pages/reportRepair/report/report.js       |  7 +++++++
 .../pages/reportRepair/report/report.json     |  3 ++-
 .../pages/reportRepair/report/report.wxml     | 20 +++++++++----------
 .../pages/reportRepair/report/report.wxss     |  6 +++---
 package-lock.json                             |  2 +-
 8 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js
index 9be5001..32d60c9 100644
--- a/miniprogram/pages/index/index.js
+++ b/miniprogram/pages/index/index.js
@@ -229,7 +229,7 @@ Page({
         }
       })
     } else {
-      app.selfShowMsg('请登录账号', '/pages/login/login')
+      app.selfShowMsg('本平台为淮安市政府内部使用，为更好为您提供服务，请登录帐号', '/pages/login/login')
     }
   },
 
diff --git a/miniprogram/pages/reportRepair/assign/detail/detail.wxml b/miniprogram/pages/reportRepair/assign/detail/detail.wxml
index fbaa141..1577925 100644
--- a/miniprogram/pages/reportRepair/assign/detail/detail.wxml
+++ b/miniprogram/pages/reportRepair/assign/detail/detail.wxml
@@ -27,6 +27,14 @@
                 <view class="label">故障等级</view>
                 <view class="content">{{detail.repairLevel}}</view>
             </view>
+            <view class="itemView">
+                <view class="label">报修人姓名</view>
+                <view class="content">{{detail.name}}</view>
+            </view>
+            <view class="itemView">
+                <view class="label">联系电话</view>
+                <view class="content">{{detail.phone}}</view>
+            </view>
             <!-- <view class="selfLine"></view>
             <view class="itemView">
                 <view class="label">报修名称</view>
@@ -49,14 +57,6 @@
                 <view class="label">门牌号（地点）</view>
                 <view class="content">{{detail.room}}</view>
             </view>
-            <view class="itemView">
-                <view class="label">联系电话</view>
-                <view class="content">{{detail.phone}}</view>
-            </view>
-            <view class="itemView">
-                <view class="label">报修人姓名</view>
-                <view class="content">{{detail.name}}</view>
-            </view>
             <view class="itemView">
                 <view class="label">故障描述</view>
                 <view class="content">{{detail.explain ? detail.explain : ''}}</view>
diff --git a/miniprogram/pages/reportRepair/repair/case/case.wxml b/miniprogram/pages/reportRepair/repair/case/case.wxml
index a0a9267..65f7815 100644
--- a/miniprogram/pages/reportRepair/repair/case/case.wxml
+++ b/miniprogram/pages/reportRepair/repair/case/case.wxml
@@ -34,6 +34,14 @@
             <view class="name">故障等级</view>
             <view class="content">{{detail.repairLevel}}</view>
         </view>
+        <view class="itemView">
+            <view class="name">报修人姓名</view>
+            <view class="content">{{detail.name}}</view>
+        </view>
+        <view class="itemView">
+            <view class="name">联系电话</view>
+            <view class="content">{{detail.phone}}</view>
+        </view>
         <!-- <view class="itemView">
             <view class="name">故障时间</view>
             <view class="content">{{detail.repairTime}}</view>
@@ -50,14 +58,7 @@
             <view class="name">门牌号（地点）</view>
             <view class="content">{{detail.room}}</view>
         </view>
-        <view class="itemView">
-            <view class="name">联系电话</view>
-            <view class="content">{{detail.phone}}</view>
-        </view>
-        <view class="itemView">
-            <view class="name">报修人姓名</view>
-            <view class="content">{{detail.name}}</view>
-        </view>
+        
         <view class="itemView">
             <view class="name">故障描述</view>
             <view class="content">{{detail.explain ? detail.explain : ''}}</view>
diff --git a/miniprogram/pages/reportRepair/report/report.js b/miniprogram/pages/reportRepair/report/report.js
index 7394b2e..c68fafd 100644
--- a/miniprogram/pages/reportRepair/report/report.js
+++ b/miniprogram/pages/reportRepair/report/report.js
@@ -1,6 +1,7 @@
 let app = getApp();
 
 import Notify from '@vant/weapp/notify/notify';
+import Toast from '@vant/weapp/toast/toast';
 
 import {
     selfFormatTimeYMDHMS,
@@ -455,6 +456,11 @@ Page({
 
     // 文件-上传后
     async fileAfterRead(event) {
+      Toast.loading({
+        message: '上传中...',
+        forbidClick: true,
+        duration: 0
+      })
         let _this = this;
         console.log('fileAfterRead', event);
         // 上传完成需要更新 fileList
@@ -471,6 +477,7 @@ Page({
                 operate: 'repair'
             }).then(res => {
                 console.log('upload file ', res);
+                Toast.clear()
                 fileList.push({
                     id: res.id,
                     relativeUrl: res.url,
diff --git a/miniprogram/pages/reportRepair/report/report.json b/miniprogram/pages/reportRepair/report/report.json
index 068fd9a..5744ae9 100644
--- a/miniprogram/pages/reportRepair/report/report.json
+++ b/miniprogram/pages/reportRepair/report/report.json
@@ -9,6 +9,7 @@
         "van-action-sheet": "@vant/weapp/action-sheet/index",
         "van-dialog": "@vant/weapp/dialog/index",
         "van-icon": "@vant/weapp/icon/index",
-        "van-picker": "@vant/weapp/picker/index"
+        "van-picker": "@vant/weapp/picker/index",
+        "van-toast": "@vant/weapp/toast/index"
     }
 }
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/report/report.wxml b/miniprogram/pages/reportRepair/report/report.wxml
index 95700b7..fb3c650 100644
--- a/miniprogram/pages/reportRepair/report/report.wxml
+++ b/miniprogram/pages/reportRepair/report/report.wxml
@@ -12,6 +12,14 @@
             <view class="label must">故障时间</view>
             <van-field value="{{ detail.repairTime }}" input-class="input" is-link readonly placeholder="请选择" border="{{ false }}" arrow-direction="down" input-align="right" />
         </view>
+        <view class="rowView">
+            <view class="label must">报修人姓名</view>
+            <van-field value="{{ detail.name }}" bind:input="fieldInput" data-name="name"  clearable  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" clearable   type="number" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
+        </view>
         <view class="rowView">
             <view class="label must">故障类型</view>
             <van-field value="{{ detail.typeName ? detail.typeName + '/' + detail.deviceName : ''  }}" input-class="input" is-link readonly placeholder="请选择" arrow-direction="down" border="{{ false }}" input-align="right" bind:tap="showType" />
@@ -24,17 +32,9 @@
             <view class="label must">门牌号（地点）</view>
             <van-field value="{{ detail.room }}" bind:input="fieldInput" data-name="room" clearable  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" clearable   type="number" 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"  clearable  input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
-        </view>
         <view class="rowColumnView">
             <view class="label must">故障描述</view>
-            <van-field model:value="{{ detail.explain }}"  bind:input="fieldInput" data-name="explain"   type="textarea" clearable placeholder="请输入" maxlength="{{100}}" show-word-limit border="{{false}}" autosize  />
+            <van-field model:value="{{ detail.explain }}"  bind:input="fieldInput" data-name="explain" input-class="textarea"  type="textarea" clearable placeholder="请对故障进行描述" maxlength="{{100}}" show-word-limit border="{{false}}" autosize  />
         </view>
         <view class="rowColumnView">
             <view class="label">故障图片/视频</view>
@@ -51,7 +51,7 @@
 
 <!-- 消息通知 -->
 <van-notify id="van-notify" />
-
+<van-toast id="van-toast" />
 <!-- 选择-故障等级 -->
 <van-action-sheet description="请选择故障等级" close-on-click-overlay="{{true}}" show="{{ faultLevelShow }}" actions="{{ faultLevelList }}" bind:select="selectFaultLevel" bind:close="closeFaultLevel" />
 
diff --git a/miniprogram/pages/reportRepair/report/report.wxss b/miniprogram/pages/reportRepair/report/report.wxss
index 3da0288..a698893 100644
--- a/miniprogram/pages/reportRepair/report/report.wxss
+++ b/miniprogram/pages/reportRepair/report/report.wxss
@@ -153,9 +153,9 @@
 
 
 .textarea {
-    height: 300rpx !important;
-    border: 1px solid rgb(126, 126, 126, 0.2) !important;
-    padding: 20rpx !important;
+    height: 150rpx !important;
+    /* border: 1px solid rgb(126, 126, 126, 0.2) !important; */
+    padding: 0rpx !important;
 }
 
 .dialogBtnView {
diff --git a/package-lock.json b/package-lock.json
index c5d0505..23e5294 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "haLogistics",
+  "name": "dbd-meeting-wx-small",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {