diff --git a/miniprogram/app.json b/miniprogram/app.json
index 4629ef0..12a7464 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -75,7 +75,8 @@
"pages/meeting/meetingRoom/meetingService/meetingService",
"pages/reportRepair/repairIndex/index",
"pages/reportRepair/repairAdd/add",
- "pages/reportRepair/repairRecord/reportPerson/record"
+ "pages/reportRepair/repairRecord/reportPerson/record",
+ "pages/reportRepair/repairDetail/detail"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/miniprogram/pages/reportRepair/repairDetail/detail.js b/miniprogram/pages/reportRepair/repairDetail/detail.js
new file mode 100644
index 0000000..ba92a53
--- /dev/null
+++ b/miniprogram/pages/reportRepair/repairDetail/detail.js
@@ -0,0 +1,67 @@
+const app = getApp()
+
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ IMG_NAME: app.IMG_NAME,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/repairDetail/detail.json b/miniprogram/pages/reportRepair/repairDetail/detail.json
new file mode 100644
index 0000000..02854d6
--- /dev/null
+++ b/miniprogram/pages/reportRepair/repairDetail/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/repairDetail/detail.wxml
new file mode 100644
index 0000000..976ea2e
--- /dev/null
+++ b/miniprogram/pages/reportRepair/repairDetail/detail.wxml
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+ 返回
+
+ 详情
+
+
+
+ 处理完成
+ 您的报修工单已经处理完成
+
+
+
+
+
+
+ 处理完成:
+ 王帅
+ 工单流转
+
+ 2024-10-10 12:12:00
+
+
+
+
+ 报修信息
+
+
+ 设备名称
+ 320828282828320828282828320828282828320828282828v
+
+
+ 设备地址
+ 302会议室
+
+
+ 维修描述
+ 电脑蓝屏
+
+
+ 损坏凭证
+
+
+
+
+
+ 报修人
+ 13652025563
+
+
+ 报修时间
+ 2024-06-10 23:59:59
+
+
+
+
+ 维修反馈
+
+
+ 维修人
+ 王强
+
+
+ 维修说明
+ 已更换部件，维修完成
+
+
+ 维修凭证
+
+
+
+
+
+
+
+
+ 联系维修人员
+ 评价
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/repairDetail/detail.wxss b/miniprogram/pages/reportRepair/repairDetail/detail.wxss
new file mode 100644
index 0000000..82a49be
--- /dev/null
+++ b/miniprogram/pages/reportRepair/repairDetail/detail.wxss
@@ -0,0 +1,213 @@
+.containerView.public {
+ background: none;
+}
+
+.elHidden {
+ visibility: hidden;
+}
+
+.selfLine {
+ height: 2rpx;
+ background: rgb(126, 126, 126, 0.2);
+}
+
+.topHead {
+ position: relative;
+ height: 400rpx;
+ background: #2b2d3d;
+}
+
+.topHead .navigatorView {
+ position: absolute;
+ left: 0;
+ top: 120rpx;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 0 30rpx;
+
+}
+
+.topHead .navigatorView .backView {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+}
+
+.topHead .navigatorView .backView .label {
+ color: white;
+ font-size: 28rpx;
+ line-height: 1;
+ margin-left: 8rpx;
+}
+
+.topHead .navigatorView .title {
+ position: absolute;
+ top: 14rpx;
+ left: 50%;
+ transform: translateX(-50%);
+
+ font-size: 32rpx;
+ color: #FFFFFF;
+ line-height: 1rpx;
+}
+
+.topHead .contentView {
+ position: absolute;
+ left: 30rpx;
+ bottom: 80rpx;
+}
+
+.topHead .contentView .label1 {
+ font-size: 28rpx;
+ color: white;
+ line-height: 1;
+}
+
+.topHead .contentView .label2 {
+ font-size: 24rpx;
+ color: white;
+ line-height: 1;
+ margin-top: 20rpx;
+}
+
+.mainView {
+ position: relative;
+ box-sizing: border-box;
+
+ margin: -20rpx 20rpx 20rpx;
+ z-index: 999;
+}
+
+.mainView .statusView {
+ box-sizing: border-box;
+ padding: 30rpx 20rpx 40rpx 100rpx;
+ background: white;
+ border-radius: 8rpx;
+ line-height: 1;
+}
+
+.mainView .statusView .view1 {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+}
+
+.mainView .statusView .view1 .label {
+ font-size: 28rpx;
+ font-weight: bold;
+}
+
+.mainView .statusView .view1 .name {
+ font-size: 28rpx;
+ margin-left: 20rpx;
+}
+
+.mainView .statusView .view1 .tag {
+ margin-left: auto;
+ font-size: 24rpx;
+ color: gray;
+}
+
+.mainView .statusView .time {
+ margin-top: 20rpx;
+}
+
+.mainView .statusView .leftImg {
+ position: absolute;
+ top: 26rpx;
+ left: 20rpx;
+
+ width: 60rpx;
+ height: 60rpx;
+ border-radius: 8rpx;
+}
+
+.mainView .reportView {
+ margin-top: 20rpx;
+ padding-bottom: 60rpx;
+
+ border-radius: 8rpx;
+ background: white;
+}
+
+.mainView .reportView .topTitle {
+ padding: 30rpx;
+ font-size: 28rpx;
+ font-weight: bold;
+}
+
+.mainView .reportView .itemView {
+ display: flex;
+ justify-content: flex-start;
+ align-items: flex-start;
+ margin-top: 30rpx;
+ padding: 0 30rpx;
+
+}
+
+.mainView .reportView .itemView .label{
+ flex-shrink: 0;
+ width: 200rpx;
+ font-size: 30rpx;
+ color: gray;
+}
+
+.mainView .reportView .itemView .content{
+ font-size: 30rpx;
+ word-break: break-all;
+}
+
+.mainView .reportView .itemView .content .imgView{
+ width: 100rpx;
+ height: 100rpx;
+ margin-right: 10rpx;
+ margin-bottom: 10rpx;
+ display: inline-block;
+ vertical-align: middle;
+}
+
+.bottomFixView{
+ position: fixed;
+ z-index: 999;
+ left: 0;
+ bottom: 0;
+ height: 140rpx;
+ width: 100vw;
+ border-top: 1rpx solid rgb(126, 126, 126, 0.2);
+ background: white;
+
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+}
+
+.bottomFixView .evaluateBtn{
+ box-sizing: border-box;
+ border-radius: 6rpx;
+ width: 160rpx;
+ height: 70rpx;
+ margin-right: 30rpx;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: #579ff8;
+ font-size: 30rpx;
+ color: white;
+}
+
+.bottomFixView .contactBtn{
+ box-sizing: border-box;
+ border-radius: 6rpx;
+ border: 2rpx solid rgb(126, 126, 126, 0.2);
+ width: 220rpx;
+ height: 70rpx;
+ margin-right: 30rpx;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: white;
+ font-size: 28rpx;
+ color: gray;
+}
diff --git a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.js b/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.js
index 714c019..1d04fa8 100644
--- a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.js
+++ b/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.js
@@ -323,6 +323,12 @@ Page({
});
},
+ jumpDetail(){
+ wx.navigateTo({
+ url: '/pages/reportRepair/repairDetail/detail',
+ })
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxml b/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxml
index 1ec6343..4e5e1b7 100644
--- a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxml
+++ b/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxml
@@ -1,33 +1,20 @@
-
-
- {{item.title}}
- {{item.statusName}}
-
-
-
-
- {{item.roomContent.capacityNum}}人间 | {{item.roomContent.roomName}} | {{item.roomContent.buildingName}}
- 预约人: {{item.createBy}}
- {{item.timeSlot}}
+
+ 301空调坏了
+
+
+
+ 维修单号：20111101001002011110100100201111
+ 维修单号：2011110100100
+ 维修单号：2011110100100
-
- 取消原因: {{item.cancelResaon}}
-
-
-
-
- 去邀请
-
-
- 取消预约
- 查看详情
+
+
+ 已完成
+ 评价
@@ -36,23 +23,7 @@
-
-
- {{item.title}}
- {{item.statusName}}
-
-
-
-
- {{item.roomContent.capacityNum}}人间 | {{item.roomContent.roomName}} | {{item.roomContent.buildingName}}
- 预约人: {{item.createBy}}
- {{item.timeSlot}}
-
-
-
-
- 数据已全部加载
-
+
diff --git a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxss b/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxss
index 5e9f80e..607c1a0 100644
--- a/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxss
+++ b/miniprogram/pages/reportRepair/repairRecord/reportPerson/record.wxss
@@ -5,130 +5,75 @@
.itemView {
background: white;
- margin: 30rpx 20rpx;
+ margin: 20rpx 20rpx;
padding: 30rpx 20rpx;
- /* box-shadow: rgba(210,210,210,0.5) 0px 3.752px 3.752px 0px; */
+ border-radius: 8rpx;
+ box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 0px 0.5px inset;
+ box-sizing: border-box;
}
-.itemView .headView {
+.itemView .topTitle {
+ font-size: 28rpx;
+ font-weight: bold;
+}
+
+.itemView .centerView {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ margin-top: 20rpx;
+}
+
+.itemView .centerView .showImg {
+ width: 200rpx;
+ height: 120rpx;
+ border-radius: 8rpx;
+ flex-shrink: 0;
+}
+
+.itemView .centerView .rightView {
+ margin-left: 20rpx;
+ flex: 1;
+ overflow: hidden;
+}
+
+
+.itemView .centerView .rightView .labelContent {
+ line-height: 1;
+ margin-top: 10rpx;
+
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ word-break: break-all;
+}
+
+.itemView .centerView .rightView .labelContent:first-of-type {
+ margin-top: 0;
+}
+
+.itemView .bottomLine {
+ height: 2rpx;
+ background: rgb(126, 126, 126, 0.2);
+ margin: 30rpx 0;
+}
+
+.bottomView {
display: flex;
justify-content: space-between;
align-items: center;
}
-.itemView .headView .number {
- flex: 1;
- margin-right: 30rpx;
- font-size: 26rpx;
-
- text-overflow: ellipsis;
- overflow: hidden;
- word-break: break-all;
- white-space: nowrap;
-}
-
-.itemView .headView .status {
- font-size: 26rpx;
- color: #4e96f8;
- margin-right: 20rpx;
-}
-
-.itemView .contentView {
- box-sizing: border-box;
- border-radius: 10rpx;
- width: 100%;
- margin-top: 20rpx;
- padding: 30rpx 20rpx;
- display: flex;
- justify-content: flex-start;
- align-items: center;
- background: #f2f2f2;
-}
-
-.itemView .contentView .img {
- border-radius: 10rpx;
- width: 200rpx;
- height: 110rpx;
-}
-
-.itemView .contentView .msgView {
- flex: 1;
- margin-left: 20rpx;
- word-break: break-all;
-}
-
-.itemView .contentView .msgView .title {
+.bottomView .status {
font-size: 28rpx;
+ line-height: 1;
}
-.itemView .contentView .msgView .name,
-.itemView .contentView .msgView .time {
+.bottomView .evaluate {
font-size: 24rpx;
- color: gray;
- margin-top: 6rpx;
-}
-
-.itemView .priceView {
- display: flex;
- justify-content: flex-end;
- align-items: center;
- margin: 30rpx 0;
-}
-
-.itemView .priceView .cancelContent {
- flex: 1;
- margin-right: 40rpx;
- font-size: 26rpx;
- color: #7F7F7F;
-
- text-overflow: ellipsis;
- overflow: hidden;
- word-break: break-all;
- white-space: nowrap;
-}
-
-.itemView .priceView .priceContent {
- display: flex;
- justify-content: flex-start;
- align-items: center;
-}
-
-.itemView .priceView .priceContent .name {
- font-size: 26rpx;
-}
-
-.itemView .priceView .priceContent .price {
- font-size: 28rpx;
- font-weight: bold;
- color: red;
- margin-left: 10rpx;
-}
-
-.itemView .btnView {
- display: flex;
- justify-content: flex-end;
- align-items: center;
-
-}
-
-.itemView .btnView .btn {
- border: 1px solid #4e96f8;
- position: relative;
- border-radius: 10rpx;
- margin-left: 16rpx;
- padding: 10rpx 24rpx;
- font-size: 24rpx;
- color: #4e96f8;
-}
-
-.shareBtn {
- position: absolute;
- z-index: 1;
- width: 100%;
- height: 100%;
- left: 0;
- top: 0;
- opacity: 0;
+ color: #ffffff;
+ padding: 10rpx 36rpx;
+ background: #ee6f2e;
}
.loadAllLine {