diff --git a/wuye-manager-uniapp/api/api.js b/wuye-manager-uniapp/api/api.js
index d6eaa5c..553e6ea 100644
--- a/wuye-manager-uniapp/api/api.js
+++ b/wuye-manager-uniapp/api/api.js
@@ -17,6 +17,8 @@ export const getLoginBySms = (data) =>{
export const getResetPassword = (data) =>{
return post('/api/butler/auth/forgetPassword',data)
}
+
+
// ======首页=====
// 获取小区列表
export const getVillageList = (data) =>{
@@ -38,6 +40,12 @@ export const getTodayInspection = () =>{
export const getNewNoticeData = () =>{
return get('/manage/notice/new')
}
+// 获取bannar图
+export const getBannarList = () =>{
+ return get('/api/manage/banner/list')
+}
+
+
// ============通知列表===========
export const getNoticeList = (data) =>{
@@ -58,7 +66,7 @@ export const addRepairList = (data) =>{
}
// 上传图片
export const uploadFile = (filePath) => {
- return upload(filePath,' /resource/oss/upload');
+ return upload(filePath,'/resource/oss/upload');
}
// 查询一键开门
@@ -75,6 +83,10 @@ export const switchOpenDoor = (data) =>{
export const getSettingInfo = () =>{
return get('/api/setting/info')
}
+// 上报记录
+export const getMyOrderList = (data) =>{
+ return get('/manage/repair/order/myorderlist',data)
+}
// =====设置=======
// 修改密码
export const changePassword = (data) =>{
diff --git a/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue b/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
index fcf4292..fb2e47c 100644
--- a/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
+++ b/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
@@ -100,14 +100,14 @@ onLoad((options) => {
repairId.value = options.projectId
}
- // ✅ 监听返回选择的项目
+ // 监听返回选择的项目
uni.$on('selectRepairProject', (data) => {
repairProject.value = `${data.category}-${data.project}`
repairId.value = data.projectId
})
})
-// ✅ 页面卸载时移除监听(必须加)
+// 页面卸载时移除监听
onUnload(() => {
uni.$off('selectRepairProject')
})
@@ -155,8 +155,8 @@ const uploadImages = async () => {
uploadedUrls.push(res.url || '')
} catch (err) {
uni.showToast({
- title:e.msg || '图片上传失败',
- icon:'error'
+ title:err.msg || '图片上传失败',
+ icon:'error'
})
}
}
diff --git a/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue b/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue
index 08b156f..4caa60b 100644
--- a/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue
+++ b/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue
@@ -42,18 +42,10 @@ import { onLoad } from '@dcloudio/uni-app'
import {getRepairOrder} from '../../api/api.js'
// 分类列表
-const categoryList = ref([
- // { id: 1, name: '基础设施' },
- // { id: 2, name: '电子设施' }
-])
+const categoryList = ref([])
// 所有项目数据
-const projectList = ref([
- // { id: 101, categoryId: 1, name: '路灯' },
- // { id: 102, categoryId: 1, name: '楼层指示灯' },
- // { id: 103, categoryId: 2, name: '应急出口灯' },
- // { id: 104, categoryId: 1, name: '草坪灯' }
-])
+const projectList = ref([])
// 选中的分类
const activeCategory = ref(1)
@@ -91,7 +83,7 @@ const fetchProjectList = async () => {
activeCategory.value = categoryList.value[0]?.id || 1
}
} catch (e) {
- uni.showToast({ title: '获取项目列表失败', icon: 'none' })
+ uni.showToast({ title: e.msg ||'获取项目列表失败', icon: 'none' })
}
}
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
index cd95b3f..5e9d5ef 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
@@ -10,7 +10,7 @@
@@ -31,7 +31,7 @@
@@ -269,7 +269,6 @@ onUnmounted(() => {
/* 页面容器 */
.login-page {
padding: 80rpx 40rpx 40rpx;
- /* background-color: #f8f9fa; */
min-height: 100vh;
background: repeating-linear-gradient(to bottom, #e2f0ff, #f6faff);
}
diff --git a/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue b/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue
index a816bfc..95676a7 100644
--- a/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue
+++ b/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue
@@ -4,7 +4,7 @@
@@ -45,7 +45,7 @@ const noticeList = ref([])
// 分页相关
const pageNum = ref(1) // 当前页
-const pageSize = ref(5) // 每页条数
+const pageSize = ref(10) // 每页条数
const total = ref(0) // 总条数
const loading = ref(false) // 加载状态
const noMore = ref(false) // 是否没有更多
diff --git a/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue b/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue
index b9f04f0..3811cbb 100644
--- a/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue
+++ b/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue
@@ -1,7 +1,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
@@ -59,6 +59,7 @@ import { getOpenDoorList, switchOpenDoor } from '../../api/api.js'
// 响应式数据:选中的门索引、开门成功提示
const selectedDoor = ref(-1) // -1表示未选中
const showSuccess = ref(false)
+const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0)
// 门列表数据
const doorList = ref([])
@@ -130,8 +131,10 @@ const openDoor = () => {
box-sizing: border-box;
}
.status_bar {
- height: 32px;
+ /* height: 32px; */
width: 100%;
+ /* height: var(--status-bar-height); */
+ flex-shrink: 0;
}
/* 顶部标题 */
.top-bar {
diff --git a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
index b6a1588..b4fb18b 100644
--- a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
+++ b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
@@ -41,56 +41,68 @@
scroll-y
:style="{ height: `calc(100vh - ${navHeight + statusTabHeight + typeTabHeight}px)` }"
>
-
-
-
- 暂无上报记录
-
+
+
+
+ 加载中...
+ 没有更多数据了
+
+
+
+
+ 暂无上报记录
+
diff --git a/wuye-manager-uniapp/static/imgs/eastDoor.png b/wuye-manager-uniapp/static/imgs/eastDoor.png
deleted file mode 100644
index 6b89e97..0000000
Binary files a/wuye-manager-uniapp/static/imgs/eastDoor.png and /dev/null differ
diff --git a/wuye-manager-uniapp/static/imgs/eastDoorWhite.png b/wuye-manager-uniapp/static/imgs/eastDoorWhite.png
deleted file mode 100644
index 57f1f7c..0000000
Binary files a/wuye-manager-uniapp/static/imgs/eastDoorWhite.png and /dev/null differ
diff --git a/wuye-manager-uniapp/static/imgs/unitDoor.png b/wuye-manager-uniapp/static/imgs/unitDoor.png
deleted file mode 100644
index b175f12..0000000
Binary files a/wuye-manager-uniapp/static/imgs/unitDoor.png and /dev/null differ
diff --git a/wuye-manager-uniapp/static/imgs/unitDoorWhite.png b/wuye-manager-uniapp/static/imgs/unitDoorWhite.png
deleted file mode 100644
index 49028b8..0000000
Binary files a/wuye-manager-uniapp/static/imgs/unitDoorWhite.png and /dev/null differ
diff --git a/wuye-manager-uniapp/static/imgs/westDoor.png b/wuye-manager-uniapp/static/imgs/westDoor.png
deleted file mode 100644
index 881bba1..0000000
Binary files a/wuye-manager-uniapp/static/imgs/westDoor.png and /dev/null differ
diff --git a/wuye-manager-uniapp/static/imgs/westDoorWhite.png b/wuye-manager-uniapp/static/imgs/westDoorWhite.png
deleted file mode 100644
index d00d749..0000000
Binary files a/wuye-manager-uniapp/static/imgs/westDoorWhite.png and /dev/null differ