diff --git a/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue b/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue new file mode 100644 index 0000000..93b02d0 --- /dev/null +++ b/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue @@ -0,0 +1,242 @@ + + + + + diff --git a/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue b/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue new file mode 100644 index 0000000..abdb544 --- /dev/null +++ b/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue index bc70665..f0dc929 100644 --- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue +++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue @@ -1,359 +1,370 @@ diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue b/wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue new file mode 100644 index 0000000..b09608a --- /dev/null +++ b/wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue @@ -0,0 +1,169 @@ + + + + + \ No newline at end of file diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue index 0a8c2b4..ebe0a32 100644 --- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue +++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue @@ -1,263 +1,282 @@ \ No newline at end of file + } + + /* 禁用按钮边框 */ + button:after { + border-radius: 50px; + } + + .bottom-link { + display: flex; + justify-content: space-between; + padding: 0 20rpx; + } + + .link-item { + font-size: 28rpx; + color: #4D5DFA; + text-decoration: none; + } + diff --git a/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue b/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue index fd49ca7..b78cc70 100644 --- a/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue +++ b/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue @@ -36,7 +36,7 @@ import { ref } from 'vue' // 跳转到详情页方法 const goToDetail = () => { uni.navigateTo({ - url: '/pageSubPack/notice-list/noticeListDetails' + url: '/pageSubPack/notice-list/noticeListDetails' }) } @@ -81,9 +81,9 @@ const goToDetail = () => { // 右上角未读红点 .unread-dot { - width: 8rpx; - height: 8rpx; - background-color: #ff3b30; + width: 16rpx; + height: 16rpx; + background-color: #E34D59; border-radius: 50%; margin-top: 6rpx; } @@ -130,4 +130,4 @@ const goToDetail = () => { color: #4D5DFA; margin-right: 8rpx; } - \ No newline at end of file + diff --git a/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue b/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue index 846962b..2784236 100644 --- a/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue +++ b/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue @@ -4,13 +4,8 @@ - + @@ -19,35 +14,21 @@ - - + + - - + {{ item.name }} - - - - + - + @@ -60,18 +41,18 @@ - + 没有更多数据了 - + 暂无小区数据 - + @@ -82,12 +63,8 @@ - @@ -95,435 +72,490 @@ diff --git a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue index 4bd1673..13410ed 100644 --- a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue +++ b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue @@ -2,17 +2,17 @@ - - - - @@ -48,8 +48,8 @@ - @@ -211,14 +211,17 @@ onReady(() => { .status-tabs { display: flex; /* background-color: #fff; */ - padding: 0 20rpx; + padding: 0 40rpx; height: 88rpx; align-items: center; } .status-tab-item { - flex: 1; - text-align: center; + /* flex: 1; */ + display: flex; + justify-content: flex-start; + margin-right: 60rpx; + text-align: left; font-size: 32rpx; color: #666; height: 100%; @@ -247,7 +250,7 @@ onReady(() => { .type-tabs { display: flex; /* background-color: #fff; */ - padding: 20rpx 30rpx; + padding: 20rpx 0rpx; margin-top: 10rpx; justify-content: flex-start; gap: 20rpx; @@ -259,13 +262,13 @@ onReady(() => { font-size: 28rpx; color: #999; border: 2rpx solid #999; - border-radius: 25rpx; + border-radius: 198rpx; } .type-tab-item.active { color: #4D5DFA; border: 2rpx solid #4D5DFA; - border-radius: 25rpx; + border-radius: 198rpx; /* background-color: #007AFF; */ } @@ -317,7 +320,7 @@ onReady(() => { /* 状态标签 */ .status-tag { padding: 6rpx 16rpx; - font-size: 24rpx; + font-size: 20rpx; border-radius: 12rpx; color: #fff; border-radius: 198rpx; @@ -370,4 +373,4 @@ onReady(() => { .repairman { color: #999; } - \ No newline at end of file + diff --git a/wuye-manager-uniapp/pageSubPack/setting/change -password.vue b/wuye-manager-uniapp/pageSubPack/setting/change -password.vue index a05a9c8..badbd5a 100644 --- a/wuye-manager-uniapp/pageSubPack/setting/change -password.vue +++ b/wuye-manager-uniapp/pageSubPack/setting/change -password.vue @@ -9,26 +9,26 @@ - - + - @@ -37,12 +37,12 @@ - @@ -55,8 +55,8 @@ - - - + diff --git a/wuye-manager-uniapp/pages.json b/wuye-manager-uniapp/pages.json index 8e80e4b..5ad0c11 100644 --- a/wuye-manager-uniapp/pages.json +++ b/wuye-manager-uniapp/pages.json @@ -37,6 +37,12 @@ "navigationStyle": "custom" } }, + { + "path": "privacy", + "style": { + "navigationBarTitleText": "用户隐私协议" + } + }, { "path": "register-new-user", "style": { @@ -142,6 +148,22 @@ } }] }, + { + "root": "pageSubPack/fault-reporting", + "pages": [{ + "path": "fault-reporting", + "style": { + "navigationBarTitleText": "填写维修信息" + } + }, + { + "path": "repairSelect", + "style": { + "navigationBarTitleText": "选择维修项目" + } + } + ] + }, { "root": "pageSubPack/report-record", "pages": [{ diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue index 4fe440b..51e8dfd 100644 --- a/wuye-manager-uniapp/pages/index/index.vue +++ b/wuye-manager-uniapp/pages/index/index.vue @@ -29,22 +29,17 @@ - - + + - + + @@ -55,17 +50,8 @@ - + @@ -86,11 +72,12 @@ + - + 故障上报 @@ -107,7 +94,7 @@ 我的工单 - + @@ -124,15 +111,9 @@ import { onLoad, onUnload } from '@dcloudio/uni-app' // 列表数据状态 const current = ref(0) - const currentCommunity = ref('碧桂园小区') const bannerList = ref([ - { - img: '/static/imgs/banner1.png' - }, - { - img: '/static/bannar2.png' - } + { img: '/static/imgs/banner1.png' }, ]) const noticeText = ref('公告公告本小区今天安装了摄像头') @@ -155,7 +136,6 @@ const goToOneOpenDoor = () => { url: '/pageSubPack/oneClickOpen/oneClickOpen' }) } - // 跳转到 今日巡检 const goToDaysInspection = () => { uni.navigateTo({ @@ -168,40 +148,41 @@ const goToInspectionRecord = () => { url: '/pageSubPack/inspection/inspection_record' }) } - +// 故障上报 +const goToReport = () => { + uni.navigateTo({ + url: "/pageSubPack/fault-reporting/fault-reporting" + }) +} // 接收选择小区返回的参数 -const slelctHomeData = data => { - // console.log('收到B页面返回的数据:', data) +const slelctHomeData = (data) => { currentCommunity.value = data.name } + onLoad(() => { - // 绑定全局事件监听 uni.$on('confirm', slelctHomeData) }) -// 页面销毁时移除监听(防止内存泄漏) onUnload(() => { uni.$off('confirm', slelctHomeData) }) -// 方法逻辑 +const clickItem = (index) => { + current.value = index +}