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 @@
+
+
+
+
随手拍
欢迎进入
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 @@
-
+
返回
@@ -79,7 +79,7 @@
联系维修人员
- 评价
+ 评价
\ 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 @@
+
+
+
+ 服务评价
+
+ 维修速度
+
+
+
+
+
+ 留言反馈
+
+
+
+
+
+
+
+ 提交
+
+
\ 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