diff --git a/components/foot-tabs/foot-tab-one.vue b/components/foot-tabs/foot-tab-one.vue index f4e6e96..9d24fd6 100644 --- a/components/foot-tabs/foot-tab-one.vue +++ b/components/foot-tabs/foot-tab-one.vue @@ -116,13 +116,13 @@ // 已授权 switch (index){ case 1: - uni.reLaunch({url:'/pages/tabbar/project-list/project-list'}) + uni.reLaunch({url:'/pages/project/projectList'}) break; case 2: // uni.reLaunch({url:'/pages/tabbar/project-list/project-list'}) break; case 3: - uni.reLaunch({url:'/pages/tabbar/feedback/feedback'}) + uni.reLaunch({url:'/pages/feedback/feedback'}) break; case 4: uni.reLaunch({url:'/pages/tabbar/my/my'}) diff --git a/pages.json b/pages.json index 80d8449..e283cb9 100644 --- a/pages.json +++ b/pages.json @@ -78,7 +78,8 @@ "path": "pages/project/projectList", "style": { "navigationBarTitleText": "", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" //禁用原生导航栏，微信小程序可用 } }, { @@ -96,6 +97,15 @@ } } + ,{ + "path" : "pages/feedback/feedback", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } ], "subPackages": [{ //A包 "root": "pagesA", diff --git a/pages/feedback/feedback.vue b/pages/feedback/feedback.vue new file mode 100644 index 0000000..9ee0427 --- /dev/null +++ b/pages/feedback/feedback.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/pages/project/details.vue b/pages/project/details.vue index 3afe9bb..b9fb30d 100644 --- a/pages/project/details.vue +++ b/pages/project/details.vue @@ -44,10 +44,177 @@ - + + + 最近一次故障时间：2021-11-18 17：00：16 + + + + + + + 项目概况 + + + + + + + + 品 + 牌 + + + ：海康威视 + + + + + 型 + 品 + + + + ：DS-CK25FI/H + + + + + + 尺 + 寸 + + + ：3.94*2.02m + + + + + 安装位置 + + + ：xx综合楼2楼会议室403 + + + + + 竣工日期 + + + ：2022/01/08 + + + + + + + {{item.title}} + + + + + + 维修追踪 + + + + + + + + + + + “黑屏”故障 【某某】已处理。 + + + 2020-05-15 16:00 + + + + + + + + + + “黑屏”故障 【某某】已处理。 + + + 2020-05-15 16:00 + + + + + + + + + + “黑屏”故障 【某某】已处理。 + + + 2020-05-15 16:00 + + + + + + + + + + “黑屏”故障 【某某】已处理。 + + + 2020-05-15 16:00 + + + + + + + + + + “黑屏”故障 【某某】已处理。 + + + 2020-05-15 16:00 + + + + + + + + + + “黑屏”故障 【某某】已处理。 + + + 2020-05-15 16:00 + + + + + + + + + + “黑屏”故障 【某某】已处理。 + + + 2020-05-15 16:00 + + + + + @@ -58,12 +225,31 @@ autoplay: true, interval: 3000, index: 1, + recordState: [{ + title: '维修记录', + state: true + }, + { + title: '保养记录', + state: false + }, + { + title: '巡检记录', + state: false + }, + ] } }, methods: { changeAutoplay(data) { console.log() this.index = data.detail.current - 0 + 1 + }, + recordNav(index) { + for (var i = 0; i < this.recordState.length; i++) { + this.recordState[i].state = false + } + this.recordState[index].state = true } } } @@ -87,7 +273,7 @@ height: 500rpx; width: 100%; } - + .details-head { width: 725rpx; margin: auto; @@ -95,7 +281,7 @@ box-sizing: border-box; height: 682rpx; background-color: #FFFFFF; - + border-radius: 20rpx; } @@ -142,16 +328,201 @@ font-size: 24rpx; color: #666666; } - .last-date{ + + .last-date { width: 100%; - padding: 10rpx 13rpx 10rpx; - box-shadow: 0rpx 10rpx 10rpx rgba(0,0,0,0.1); + padding: 10rpx 13rpx 10rpx; + box-shadow: 0rpx 5rpx 3rpx rgba(0, 0, 0, 0.1); } - - .last-date-content{ - width: 100%; - height: 57rpx; - border-radius: 10rpx; - background: linear-gradient(to right,#FFEBEB,#F7F7F7); + + .last-date-content { + width: 100%; + height: 57rpx; + display: flex; + padding-left: 20rpx; + align-items: center; + border-radius: 10rpx; + background: linear-gradient(to right, #FFEBEB, #F7F7F7); } + + .last-date-content .icon { + width: 30rpx; + height: 30rpx; + margin-right: 20rpx; + } + + .last-date-content .text { + font-size: 22rpx; + color: #333333; + } + + .project-message-title { + display: flex; + padding: 0 33rpx; + align-items: center; + border-bottom: 2rpx solid #ebebeb; + margin-top: 23rpx; + padding-bottom: 21rpx; + } + + .project-message-title .icon { + width: 8rpx; + height: 27rpx; + margin-right: 15rpx; + border-radius: 50rpx; + background: linear-gradient(#00A2e9, #bbe6f9); + } + + .project-message-title .text { + font-size: 13rpx + } + + .project-message-content { + display: flex; + box-shadow: 0rpx 5rpx 5rpx rgba(0, 0, 0, 0.1); + padding: 30rpx 25rpx 0rpx; + flex-wrap: wrap; + justify-content: space-between; + } + + .project-message-content .title-one { + color: #4d4c4c; + font-size: 24rpx; + font-weight: bold; + width: 93rpx; + display: flex; + justify-content: space-between; + + } + + .project-message-content .li { + display: flex; + margin-bottom: 31rpx; + } + + .project-message-content .title { + color: #4d4c4c; + font-weight: bold; + font-size: 24rpx + } + + .project-message-content .text { + color: #4d4c4c; + font-size: 24rpx + } + + .record-nav { + padding: 55rpx 50rpx 33rpx; + display: flex; + justify-content: space-between; + border-bottom: 2rpx solid #D5D4D4; + } + + .record-nav .li { + font-size: 24rpx; + width: 128rpx; + text-align: center; + font-weight: bold; + position: relative; + } + + .record-nav .on { + color: #00b1ff; + } + + .record-nav .on::after { + content: ""; + width: 100%; + height: 2rpx; + position: absolute; + background-color: #00B1FF; + top: 65rpx; + left: 0rpx; + } + + .record-content { + margin-top: 33rpx; + padding: 0 52rpx; + } + + .record-content .title { + color: #333333; + margin-left: 12rpx; + font-size: 24rpx; + margin-bottom: 33rpx; + } + + .record-content .list .li { + display: flex; + align-items: center; + margin-bottom: 40rpx; + } + + .record-content .list .li .icon { + width: 14rpx; + height: 14rpx; + margin-right: 50rpx; + border-radius: 50%; + background-color: #999999; + margin-left: 5rpx; + position: relative; + } + + .record-content .list .li .icon::after { + content: ""; + width: 1rpx; + position: absolute; + left: 7rpx; + height: 64rpx; + background-color: #999999; + top: 14rpx; + } + + .record-content .list .li .con { + display: flex; + align-items: center; + font-size: 26rpx; + color: #999999; + } + + .record-content .list .on .icon { + background-color: #5caefb; + width: 21rpx; + height: 21rpx; + margin-left: 1rpx; + display: flex; + align-items: center; + justify-content: center; + position: relative; + z-index: 1; + } + .record-content .list .on .icon .icon-con{ + background-color: #0084ff; + width: 13rpx; + height: 13rpx; + border-radius: 50%; + } + .record-content .list .on .icon::after { + content: ""; + width: 1rpx; + position: absolute; + left: 9rpx; + height: 167rpx; + z-index: -1; + background-color: #0084ff; + top: 20rpx; + } + .record-content .list .on .con{ + display: block; + color: #0084ff; + } + .record-content .list .on .con .text{ + margin-bottom: 35rpx; + } + .record-content .list .on .con .date{ + margin-bottom: 35rpx; + } + .record-content .list .on{ + align-items: flex-start; + } diff --git a/pages/project/projectList.vue b/pages/project/projectList.vue index 058185c..058c571 100644 --- a/pages/project/projectList.vue +++ b/pages/project/projectList.vue @@ -1,5 +1,6 @@