From 7c5497d22960057be623c886bfebd4781972c96b Mon Sep 17 00:00:00 2001
From: Zy <1448159279@qq.com>
Date: Tue, 16 Jun 2026 14:11:17 +0800
Subject: [PATCH] =?UTF-8?q?6/16,=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
wuye-manager-uniapp/api/api.js | 85 ++++++------
.../components/filePicker/filePicker.vue | 6 +-
.../pageSubPack/complaint/Details.vue | 21 +--
.../pageSubPack/complaint/Details_handle.vue | 51 ++++---
.../inspection/inspection_main.vue | 12 +-
.../inspection/inspection_record.vue | 4 +-
.../inspection/toDays_inscpection.vue | 2 +-
.../pageSubPack/instrument/checkouthouse.vue | 6 +-
.../pageSubPack/ticket/hall.vue | 126 ++++++++----------
.../pageSubPack/ticket/myticket.vue | 49 ++++---
.../pageSubPack/ticket/repairCompleted.vue | 36 +++--
.../pageSubPack/ticket/repairMain.vue | 18 ++-
wuye-manager-uniapp/pages/index/index.vue | 2 +-
13 files changed, 230 insertions(+), 188 deletions(-)
diff --git a/wuye-manager-uniapp/api/api.js b/wuye-manager-uniapp/api/api.js
index 8c78c1a..ae6c10b 100644
--- a/wuye-manager-uniapp/api/api.js
+++ b/wuye-manager-uniapp/api/api.js
@@ -1,55 +1,59 @@
-import request,{get,post,upload} from "./request.js"
+import request, {
+ get,
+ post,
+ upload
+} from "./request.js"
// =======账号密码登录========
-export const getLoginPassword = (data) =>{
- return post('/api/butler/auth/loginByPassword',data)
+export const getLoginPassword = (data) => {
+ return post('/api/butler/auth/loginByPassword', data)
}
// 获取验证码
-export const getSendCode = (data) =>{
- return post('/api/butler/auth/sendSmsCode',data)
+export const getSendCode = (data) => {
+ return post('/api/butler/auth/sendSmsCode', data)
}
// 手机验证码登录
-export const getLoginBySms = (data) =>{
- return post('/api/butler/auth/loginBySms',data)
+export const getLoginBySms = (data) => {
+ return post('/api/butler/auth/loginBySms', data)
}
// 忘记密码接口
-export const getResetPassword = (data) =>{
- return post('/api/butler/auth/forgetPassword',data)
+export const getResetPassword = (data) => {
+ return post('/api/butler/auth/forgetPassword', data)
}
// ======首页=====
// 获取小区列表
-export const getVillageList = (data) =>{
- return get('/api/inspection/today/villageList',data)
+export const getVillageList = (data) => {
+ return get('/api/inspection/today/villageList', data)
}
// 切换小区
-export const switchVillage = (data) =>{
- return post('/api/inspection/today/switchVillage',data)
+export const switchVillage = (data) => {
+ return post('/api/inspection/today/switchVillage', data)
}
// 获取当前小区
-export const getCurrentVillage = () =>{
+export const getCurrentVillage = () => {
return get('/api/butler/auth/today/village')
}
// 获取首页今日巡检
-export const getTodayInspection = () =>{
+export const getTodayInspection = () => {
return get('/api/inspection/today/inspection')
}
// 首页最新消息通知
-export const getNewNoticeData = () =>{
+export const getNewNoticeData = () => {
return get('/manage/notice/new')
}
// 获取bannar图
-export const getBannarList = () =>{
+export const getBannarList = () => {
return get('/api/manage/banner/list')
}
// ============通知列表===========
-export const getNoticeList = (data) =>{
- return get('/manage/notice/repair',data)
+export const getNoticeList = (data) => {
+ return get('/manage/notice/repair', data)
}
@@ -57,46 +61,49 @@ export const getNoticeList = (data) =>{
// ======故障上报=====
// 获取报修项目
-export const getRepairOrder = () =>{
- return get('/manage/repair/order/list')
+export const getRepairOrder = () => {
+ return get('/manage/repair/order/list')
}
// 提交维修信息
-export const addRepairList = (data) =>{
- return post('/manage/repair/order',data)
+export const addRepairList = (data) => {
+ return post('/manage/repair/order', data)
}
// 上传图片
export const uploadFile = (filePath, fileName) => {
- return upload(filePath, '/api/butler/file/uploadImage', fileName);
+ return upload(filePath, '/api/butler/file/uploadImage', fileName);
}
// 查询一键开门
-export const getOpenDoorList = () =>{
- return get('/manage/remote/open/accessdevice')
+export const getOpenDoorList = () => {
+ return get('/manage/remote/open/accessdevice')
}
// 一键开门
-export const switchOpenDoor = (data) =>{
- return post('/manage/remote/open',data)
+export const switchOpenDoor = (data) => {
+ return post('/manage/remote/open', data)
}
-
// ===========我的========
// 获取管家信息
-export const getSettingInfo = () =>{
- return get('/api/setting/info')
+export const getSettingInfo = () => {
+ return get('/api/setting/info')
}
+
+// Zy ------------
// 上报记录
-export const getMyOrderList = (data) =>{
- return get('/manage/repair/order/myorderlist',data)
+export const getMyOrderList = (data) => {
+ return get('/manage/repair/order/reportlist', data)
}
+// Zy ------------
+
// =====设置=======
// 修改密码
-export const changePassword = (data) =>{
- return post('/api/setting/changePassword',data)
+export const changePassword = (data) => {
+ return post('/api/setting/changePassword', data)
}
// 退出登录
-export const logout = () =>{
- return post('/api/butler/auth/logout')
+export const logout = () => {
+ return post('/api/butler/auth/logout')
}
// 修改手机号
-export const changePhone = (data) =>{
- return post('/api/setting/changePhone',data)
+export const changePhone = (data) => {
+ return post('/api/setting/changePhone', data)
}
diff --git a/wuye-manager-uniapp/components/filePicker/filePicker.vue b/wuye-manager-uniapp/components/filePicker/filePicker.vue
index 7f3e100..1bcb2aa 100644
--- a/wuye-manager-uniapp/components/filePicker/filePicker.vue
+++ b/wuye-manager-uniapp/components/filePicker/filePicker.vue
@@ -15,7 +15,7 @@
-
+
@@ -194,7 +194,9 @@ function remove(index) {
// 4. 预览图片
function preview(index) {
- const urls = innerList.value.map(i => i.url)
+ console.log(innerList)
+ const urls = innerList.value.map(i => i.url).filter(Boolean)
+ if (urls.length <= 0) return
uni.previewImage({
urls: urls,
current: index
diff --git a/wuye-manager-uniapp/pageSubPack/complaint/Details.vue b/wuye-manager-uniapp/pageSubPack/complaint/Details.vue
index 576895a..dd24e76 100644
--- a/wuye-manager-uniapp/pageSubPack/complaint/Details.vue
+++ b/wuye-manager-uniapp/pageSubPack/complaint/Details.vue
@@ -1,6 +1,6 @@
-
+
-
+
{
list.value = []
init()
}
-//
-
-const total = ref(0) //
+const total = ref(0) // 总量
const isLoading = ref(false) // 加载锁
const hasMore = ref(true) // 是否还有更多数据
const list = ref([])
@@ -153,7 +151,7 @@ function handleComplaint(id) {
}
function scrolltolower() {
- // 必须加这两个判断!
+ console.log('触发')
if (isLoading.value || !hasMore.value) {
return
}
@@ -167,13 +165,18 @@ function scrolltolower() {
background: #f9f9f9;
}
.detailsbox {
+ height: 100%;
flex: 1;
background: #f9f9f9;
padding: 20rpx 40rpx;
- justify-content: flex-start;
- align-items: stretch;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
.detail_list {
margin-top: 20rpx;
+ display: flex;
+ flex: 1;
+ overflow: hidden;
.item {
background: #ffffff;
border-radius: 16rpx;
diff --git a/wuye-manager-uniapp/pageSubPack/complaint/Details_handle.vue b/wuye-manager-uniapp/pageSubPack/complaint/Details_handle.vue
index 7571b2b..16358d2 100644
--- a/wuye-manager-uniapp/pageSubPack/complaint/Details_handle.vue
+++ b/wuye-manager-uniapp/pageSubPack/complaint/Details_handle.vue
@@ -1,6 +1,6 @@
-
+
@@ -61,6 +61,7 @@
:key="index"
:src="item"
class="img"
+ @tap="handlePrivew(showImages, index)"
mode="scaleToFill"
>
@@ -84,17 +85,6 @@ import { onMounted, ref } from 'vue'
import { onLoad, onShow } from '@dcloudio/uni-app'
import { getComplainMain } from '@/api/complain.js'
-const info = ref({
- status: 0, //0待解决 1已完成
- imgs: [
- 'https://picsum.photos/61',
- 'https://picsum.photos/61',
- 'https://picsum.photos/61',
- 'https://picsum.photos/61',
- 'https://picsum.photos/61'
- ]
-})
-
/** 投诉详情id */
const complainId = ref('')
/** 投诉详情内容 */
@@ -126,10 +116,12 @@ function init() {
if (complainId.value) {
getComplainMain(complainId.value).then(res => {
complainInfo.value = res.data
- showImages.value = res.data.problemImageUrl
- .split(',')
- .filter(item => item.includes('http'))
- .map(item => item.split('?')[0])
+ if (res.data.problemImageUrl) {
+ showImages.value = res.data.problemImageUrl
+ .split(',')
+ .filter(item => item.includes('http'))
+ .map(item => item && item.split('?')[0])
+ }
})
}
}
@@ -144,6 +136,15 @@ function handleSelecthouse() {
})
}
}
+
+/** 预览图片 */
+function handlePrivew(items, index) {
+ if (items.length <= 0) return
+ uni.previewImage({
+ current: index,
+ urls: items
+ })
+}
diff --git a/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue b/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue
index f0f873f..99e277a 100644
--- a/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue
+++ b/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue
@@ -80,6 +80,7 @@
v-for="(it, ind) in ite.files"
:key="ind"
:src="it"
+ @tap="handlePrivew(ite.files, index)"
mode="scaleToFill"
>
@@ -94,7 +95,7 @@
-
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue b/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue
index cef41f5..4cfbdc4 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue
@@ -29,12 +29,13 @@
class="record-list flex-1"
scroll-y
lower-threshold="60"
+ enable-flex="true"
@scrolltolower="scrolltolower"
>
- 暂无上报记录
+ 暂无记录
{{ record.problem }}
-
-
-