From 57c4e421d2926819c05a1291bc83fb50d4dde82b Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Tue, 30 Jul 2024 11:17:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/app.json                          |  9 +--
 miniprogram/app.wxss                          |  5 ++
 miniprogram/pages/index/index.js              |  2 +-
 .../{repairIndex => index}/index.js           | 12 ++--
 .../detail.json => index/index.json}          |  0
 .../{repairIndex => index}/index.wxml         |  4 ++
 .../{repairIndex => index}/index.wxss         |  9 +++
 .../{repairDetail => query/detail}/detail.js  | 10 +++
 .../reportRepair/query/detail/detail.json     |  6 ++
 .../detail}/detail.wxml                       |  4 +-
 .../detail}/detail.wxss                       |  0
 .../reportRepair/query/evaluate/evaluate.js   | 66 +++++++++++++++++++
 .../reportRepair/query/evaluate/evaluate.json |  8 +++
 .../reportRepair/query/evaluate/evaluate.wxml | 22 +++++++
 .../reportRepair/query/evaluate/evaluate.wxss | 44 +++++++++++++
 .../reportPerson => query/record}/record.js   |  2 +-
 .../reportPerson => query/record}/record.json |  0
 .../reportPerson => query/record}/record.wxml |  0
 .../reportPerson => query/record}/record.wxss |  0
 .../pages/reportRepair/repairIndex/index.json |  4 --
 .../{repairAdd/add.js => report/report.js}    |  0
 .../add.json => report/report.json}           |  0
 .../add.wxml => report/report.wxml}           |  0
 .../add.wxss => report/report.wxss}           |  0
 24 files changed, 191 insertions(+), 16 deletions(-)
 rename miniprogram/pages/reportRepair/{repairIndex => index}/index.js (84%)
 rename miniprogram/pages/reportRepair/{repairDetail/detail.json => index/index.json} (100%)
 rename miniprogram/pages/reportRepair/{repairIndex => index}/index.wxml (87%)
 rename miniprogram/pages/reportRepair/{repairIndex => index}/index.wxss (93%)
 rename miniprogram/pages/reportRepair/{repairDetail => query/detail}/detail.js (83%)
 create mode 100644 miniprogram/pages/reportRepair/query/detail/detail.json
 rename miniprogram/pages/reportRepair/{repairDetail => query/detail}/detail.wxml (96%)
 rename miniprogram/pages/reportRepair/{repairDetail => query/detail}/detail.wxss (100%)
 create mode 100644 miniprogram/pages/reportRepair/query/evaluate/evaluate.js
 create mode 100644 miniprogram/pages/reportRepair/query/evaluate/evaluate.json
 create mode 100644 miniprogram/pages/reportRepair/query/evaluate/evaluate.wxml
 create mode 100644 miniprogram/pages/reportRepair/query/evaluate/evaluate.wxss
 rename miniprogram/pages/reportRepair/{repairRecord/reportPerson => query/record}/record.js (99%)
 rename miniprogram/pages/reportRepair/{repairRecord/reportPerson => query/record}/record.json (100%)
 rename miniprogram/pages/reportRepair/{repairRecord/reportPerson => query/record}/record.wxml (100%)
 rename miniprogram/pages/reportRepair/{repairRecord/reportPerson => query/record}/record.wxss (100%)
 delete mode 100644 miniprogram/pages/reportRepair/repairIndex/index.json
 rename miniprogram/pages/reportRepair/{repairAdd/add.js => report/report.js} (100%)
 rename miniprogram/pages/reportRepair/{repairAdd/add.json => report/report.json} (100%)
 rename miniprogram/pages/reportRepair/{repairAdd/add.wxml => report/report.wxml} (100%)
 rename miniprogram/pages/reportRepair/{repairAdd/add.wxss => report/report.wxss} (100%)

diff --git a/miniprogram/app.json b/miniprogram/app.json
index 12a7464..e6ac8c1 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -73,10 +73,11 @@
     "pages/meeting/reservationRecord/exhibitionRecord/list/list",
     "pages/meeting/reservationRecord/exhibitionRecord/detail/detail",
     "pages/meeting/meetingRoom/meetingService/meetingService",
-    "pages/reportRepair/repairIndex/index",
-    "pages/reportRepair/repairAdd/add",
-    "pages/reportRepair/repairRecord/reportPerson/record",
-    "pages/reportRepair/repairDetail/detail"
+    "pages/reportRepair/index/index",
+    "pages/reportRepair/report/report",
+    "pages/reportRepair/query/record/record",
+    "pages/reportRepair/query/detail/detail",
+    "pages/reportRepair/query/evaluate/evaluate"
   ],
   "window": {
     "backgroundTextStyle": "light",
diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss
index a2e1acb..69d4ba9 100644
--- a/miniprogram/app.wxss
+++ b/miniprogram/app.wxss
@@ -385,4 +385,9 @@ image {
     overflow: hidden;
     word-break: break-all;
     white-space: nowrap;
+}
+
+.selfLine {
+    height: 2rpx;
+    background: rgb(126, 126, 126, 0.2);
 }
\ No newline at end of file
diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js
index caf162c..00cd86d 100644
--- a/miniprogram/pages/index/index.js
+++ b/miniprogram/pages/index/index.js
@@ -111,7 +111,7 @@ Page({
             {
                 name: "随手拍",
                 img: "/profile/static/index/menu-bxfw.png",
-                path: "/pages/reportRepair/repairIndex/index"
+                path: "/pages/reportRepair/index/index"
             },
             // {
             //     name: "展厅预约",
diff --git a/miniprogram/pages/reportRepair/repairIndex/index.js b/miniprogram/pages/reportRepair/index/index.js
similarity index 84%
rename from miniprogram/pages/reportRepair/repairIndex/index.js
rename to miniprogram/pages/reportRepair/index/index.js
index 656ec41..0d306bb 100644
--- a/miniprogram/pages/reportRepair/repairIndex/index.js
+++ b/miniprogram/pages/reportRepair/index/index.js
@@ -10,19 +10,19 @@ Page({
         menuList: [{
             name: "我要报修",
             img: "/profile/static/index/menu-bxfw.png",
-            path: "/pages/reportRepair/repairAdd/add"
+            path: "/pages/reportRepair/report/report"
         }, {
             name: "报修查询",
             img: "/profile/static/index/menu-ztyy.png",
-            path: "/pages/reportRepair/repairRecord/reportPerson/record"
+            path: "/pages/reportRepair/query/record/record"
         }, {
             name: "维修入口",
             img: "/profile/static/index/menu-bxfw.png",
-            path: "/pages/reportRepair/reportRepair"
+            // path: "/pages/reportRepair/reportRepair"
         }, {
             name: "派单入口",
             img: "/profile/static/index/menu-bxfw.png",
-            path: "/pages/reportRepair/reportRepair"
+            // path: "/pages/reportRepair/reportRepair"
         }]
     },
 
@@ -42,6 +42,10 @@ Page({
         })
     },
 
+    back(){
+        wx.navigateBack()
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
diff --git a/miniprogram/pages/reportRepair/repairDetail/detail.json b/miniprogram/pages/reportRepair/index/index.json
similarity index 100%
rename from miniprogram/pages/reportRepair/repairDetail/detail.json
rename to miniprogram/pages/reportRepair/index/index.json
diff --git a/miniprogram/pages/reportRepair/repairIndex/index.wxml b/miniprogram/pages/reportRepair/index/index.wxml
similarity index 87%
rename from miniprogram/pages/reportRepair/repairIndex/index.wxml
rename to miniprogram/pages/reportRepair/index/index.wxml
index 2cd1421..e7d0eae 100644
--- a/miniprogram/pages/reportRepair/repairIndex/index.wxml
+++ b/miniprogram/pages/reportRepair/index/index.wxml
@@ -5,6 +5,10 @@
         <view class="maskView2"></view>
         <view class="maskView3"></view>
 
+        <view class="homeView" bind:tap="back">
+            <van-icon name="revoke" size="30rpx" color="#ffffff"/>
+        </view>
+
         <view class="title">随手拍</view>
         <view class="contentView">
             <view class="label1">欢迎进入</view>
diff --git a/miniprogram/pages/reportRepair/repairIndex/index.wxss b/miniprogram/pages/reportRepair/index/index.wxss
similarity index 93%
rename from miniprogram/pages/reportRepair/repairIndex/index.wxss
rename to miniprogram/pages/reportRepair/index/index.wxss
index 6e4ad48..f5e954d 100644
--- a/miniprogram/pages/reportRepair/repairIndex/index.wxss
+++ b/miniprogram/pages/reportRepair/index/index.wxss
@@ -40,6 +40,15 @@
     border-bottom-right-radius: 96rpx;
 }
 
+.topHead .homeView{
+    position: absolute;
+    z-index: 4;
+    left: 40rpx;
+    top: 100rpx;
+    padding: 10rpx;
+    border-radius: 50rpx;
+    background: #4b71be;
+}
 
 .topHead .title {
     position: absolute;
diff --git a/miniprogram/pages/reportRepair/repairDetail/detail.js b/miniprogram/pages/reportRepair/query/detail/detail.js
similarity index 83%
rename from miniprogram/pages/reportRepair/repairDetail/detail.js
rename to miniprogram/pages/reportRepair/query/detail/detail.js
index ba92a53..657ab19 100644
--- a/miniprogram/pages/reportRepair/repairDetail/detail.js
+++ b/miniprogram/pages/reportRepair/query/detail/detail.js
@@ -16,6 +16,16 @@ Page({
 
     },
 
+    back(){
+        wx.navigateBack()
+    },
+
+    jumpEvaluate(){
+        wx.navigateTo({
+          url: '/pages/reportRepair/query/evaluate/evaluate',
+        })
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
diff --git a/miniprogram/pages/reportRepair/query/detail/detail.json b/miniprogram/pages/reportRepair/query/detail/detail.json
new file mode 100644
index 0000000..02854d6
--- /dev/null
+++ b/miniprogram/pages/reportRepair/query/detail/detail.json
@@ -0,0 +1,6 @@
+{
+    "navigationStyle": "custom",
+    "usingComponents": {
+        "van-icon": "@vant/weapp/icon/index"
+    }
+}
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/repairDetail/detail.wxml b/miniprogram/pages/reportRepair/query/detail/detail.wxml
similarity index 96%
rename from miniprogram/pages/reportRepair/repairDetail/detail.wxml
rename to miniprogram/pages/reportRepair/query/detail/detail.wxml
index 976ea2e..c2d34b6 100644
--- a/miniprogram/pages/reportRepair/repairDetail/detail.wxml
+++ b/miniprogram/pages/reportRepair/query/detail/detail.wxml
@@ -2,7 +2,7 @@
 
     <view class="topHead">
         <view class="navigatorView">
-            <view class="backView">
+            <view class="backView" bind:tap="back">
                 <van-icon name="arrow-left" color="#ffffff"  size="30rpx"/>
                 <view class="label">返回</view>
             </view>
@@ -79,7 +79,7 @@
 
     <view class="bottomFixView">
         <view class="contactBtn">联系维修人员</view>
-        <view class="evaluateBtn">评价</view>
+        <view class="evaluateBtn" bind:tap="jumpEvaluate">评价</view>
     </view>
 
 </view>
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/repairDetail/detail.wxss b/miniprogram/pages/reportRepair/query/detail/detail.wxss
similarity index 100%
rename from miniprogram/pages/reportRepair/repairDetail/detail.wxss
rename to miniprogram/pages/reportRepair/query/detail/detail.wxss
diff --git a/miniprogram/pages/reportRepair/query/evaluate/evaluate.js b/miniprogram/pages/reportRepair/query/evaluate/evaluate.js
new file mode 100644
index 0000000..b869e2f
--- /dev/null
+++ b/miniprogram/pages/reportRepair/query/evaluate/evaluate.js
@@ -0,0 +1,66 @@
+// pages/reportRepair/reportEvaluate/evaluate.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/query/evaluate/evaluate.json b/miniprogram/pages/reportRepair/query/evaluate/evaluate.json
new file mode 100644
index 0000000..04ba22f
--- /dev/null
+++ b/miniprogram/pages/reportRepair/query/evaluate/evaluate.json
@@ -0,0 +1,8 @@
+{
+    "navigationBarTitleText": "评价",
+    "usingComponents": {
+        "van-icon": "@vant/weapp/icon/index",
+        "van-field": "@vant/weapp/field/index",
+        "van-uploader": "@vant/weapp/uploader/index"
+    }
+}
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/query/evaluate/evaluate.wxml b/miniprogram/pages/reportRepair/query/evaluate/evaluate.wxml
new file mode 100644
index 0000000..e8a7606
--- /dev/null
+++ b/miniprogram/pages/reportRepair/query/evaluate/evaluate.wxml
@@ -0,0 +1,22 @@
+<view class="containerView public">
+
+    <view class="regionView">
+        <view class="topTitle">服务评价</view>
+        <view class="itemView" wx:for="{{3}}">
+            <view class="label">维修速度</view>
+            <van-icon class="star" wx:for="{{5}}" wx:for-item="index" wx:key="*this" name="{{index < 3 ? 'star' : 'star-o'}}" color="{{index < 3 ? '#f9d24e' : '#c9c9c9'}}" size="50rpx" />
+        </view>
+    </view>
+
+    <view class="regionView">
+        <view class="topTitle">留言反馈</view>
+        <van-field model:value="{{ value }}" type="textarea" placeholder="请输入用户名" maxlength="{{100}}" show-word-limit border="{{false}}" autosize input-class="selfTextarea" />
+        <!-- 上传图片 -->
+        <view class="uploadImgView">
+            <van-uploader file-list="{{ fileList }}" upload-text="点击上传照片" use-before-read bind:before-read="beforeRead" bind:after-read="afterRead" deletable="{{ true }}" bind:delete="deleteImg" max-count="1" />
+        </view>
+    </view>
+
+    <view class="submitBtn">提交</view>
+
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/query/evaluate/evaluate.wxss b/miniprogram/pages/reportRepair/query/evaluate/evaluate.wxss
new file mode 100644
index 0000000..792c018
--- /dev/null
+++ b/miniprogram/pages/reportRepair/query/evaluate/evaluate.wxss
@@ -0,0 +1,44 @@
+.containerView.public {
+    background: none;
+}
+
+.regionView {
+    margin-top: 2rpx;
+    padding: 30rpx 40rpx 40rpx;
+    background: white;
+}
+
+.regionView .topTitle {
+    font-size: 30rpx;
+    font-weight: bold;
+    margin-bottom: 30rpx;
+}
+
+.regionView .itemView {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    margin-top: 20rpx;
+}
+
+.regionView .itemView .label {
+    margin: 0 60rpx 0 20rpx;
+    font-size: 28rpx;
+    color: gray;
+}
+
+.regionView .itemView .star {
+    margin-right: 10rpx;
+}
+
+.selfTextarea{
+    min-height: 200rpx !important;
+    max-height: 200rpx !important;
+}
+
+.uploadImgView {
+    border: 1rpx dashed #c9c9c9;
+    margin-top: 10rpx;
+    padding: 10rpx 40rpx;
+    background-color: #ffffff;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.js b/miniprogram/pages/reportRepair/query/record/record.js
similarity index 99%
rename from miniprogram/pages/reportRepair/repairRecord/reportPerson/record.js
rename to miniprogram/pages/reportRepair/query/record/record.js
index 1d04fa8..ea47f9f 100644
--- a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.js
+++ b/miniprogram/pages/reportRepair/query/record/record.js
@@ -325,7 +325,7 @@ Page({
 
     jumpDetail(){
         wx.navigateTo({
-          url: '/pages/reportRepair/repairDetail/detail',
+          url: '/pages/reportRepair/query/detail/detail',
         })
     },
 
diff --git a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.json b/miniprogram/pages/reportRepair/query/record/record.json
similarity index 100%
rename from miniprogram/pages/reportRepair/repairRecord/reportPerson/record.json
rename to miniprogram/pages/reportRepair/query/record/record.json
diff --git a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxml b/miniprogram/pages/reportRepair/query/record/record.wxml
similarity index 100%
rename from miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxml
rename to miniprogram/pages/reportRepair/query/record/record.wxml
diff --git a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxss b/miniprogram/pages/reportRepair/query/record/record.wxss
similarity index 100%
rename from miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxss
rename to miniprogram/pages/reportRepair/query/record/record.wxss
diff --git a/miniprogram/pages/reportRepair/repairIndex/index.json b/miniprogram/pages/reportRepair/repairIndex/index.json
deleted file mode 100644
index cf3facb..0000000
--- a/miniprogram/pages/reportRepair/repairIndex/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "navigationStyle": "custom",
-    "usingComponents": {}
-}
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/repairAdd/add.js b/miniprogram/pages/reportRepair/report/report.js
similarity index 100%
rename from miniprogram/pages/reportRepair/repairAdd/add.js
rename to miniprogram/pages/reportRepair/report/report.js
diff --git a/miniprogram/pages/reportRepair/repairAdd/add.json b/miniprogram/pages/reportRepair/report/report.json
similarity index 100%
rename from miniprogram/pages/reportRepair/repairAdd/add.json
rename to miniprogram/pages/reportRepair/report/report.json
diff --git a/miniprogram/pages/reportRepair/repairAdd/add.wxml b/miniprogram/pages/reportRepair/report/report.wxml
similarity index 100%
rename from miniprogram/pages/reportRepair/repairAdd/add.wxml
rename to miniprogram/pages/reportRepair/report/report.wxml
diff --git a/miniprogram/pages/reportRepair/repairAdd/add.wxss b/miniprogram/pages/reportRepair/report/report.wxss
similarity index 100%
rename from miniprogram/pages/reportRepair/repairAdd/add.wxss
rename to miniprogram/pages/reportRepair/report/report.wxss