From 4eab5ef1384d0024a605109e558b703014f8496c Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 11 Feb 2026 17:22:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
uniapps/work-wx/src/pages/equipmentManagement/index.vue | 6 +++++-
uniapps/work-wx/src/static/images/lbt.png | 0
uniapps/work-wx/src/static/images/user/password.png | 0
uniapps/work-wx/src/static/images/user/rightBtn.png | 0
uniapps/work-wx/src/static/images/lb_bottom.png | 0
uniapps/work-wx/src/static/images/user/department.png | 0
uniapps/work-wx/src/static/images/logo1.png | 0
uniapps/work-wx/src/static/images/user/info.png | 0
uniapps/work-wx/src/pages/page/index.vue | 4 ++--
uniapps/work-wx/src/subPackages/flightApplication/index.vue | 9 +++++++--
10 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/uniapps/work-wx/src/pages/equipmentManagement/index.vue b/uniapps/work-wx/src/pages/equipmentManagement/index.vue
index 4c0b578..5e6e9df 100644
--- a/uniapps/work-wx/src/pages/equipmentManagement/index.vue
+++ b/uniapps/work-wx/src/pages/equipmentManagement/index.vue
@@ -4,7 +4,11 @@
<view class="content">
<view class="title">飞行设备</view>
<u-list :style="{ height: 'calc(100vh - 160rpx)' }" @scrolltolower="scrolltolower" :lower-threshold="50">
- <view class="card" v-for="(item, index) in equipmentList" :key="index" @click="handleClick(item)">
+ <u-empty v-if="equipmentList.length === 0"
+ text="暂无数据"
+ icon="http://cdn.uviewui.com/uview/empty/car.png">
+ </u-empty>
+ <view v-else class="card" v-for="(item, index) in equipmentList" :key="index" @click="handleClick(item)">
<view class="left">
<u-image :src="droneSvg" mode="aspectFill" :width="70" :height="90"></u-image>
</view>
diff --git a/uniapps/work-wx/src/pages/page/index.vue b/uniapps/work-wx/src/pages/page/index.vue
index 64ec0ea..e6e31ca 100644
--- a/uniapps/work-wx/src/pages/page/index.vue
+++ b/uniapps/work-wx/src/pages/page/index.vue
@@ -147,8 +147,8 @@
// 获取轮播图
async function getLBListTest() {
const res = await getLBList({})
- console.log(res, '8898')
- lbList.value = res.data.data.map(item => ({
+ // 排除annexUrl为空的项
+ lbList.value = res.data.data.filter(item => item.annexUrl).map(item => ({
...item,
image: item.annexUrl,
title: item.bannerTitle,
diff --git a/uniapps/work-wx/src/static/images/lb_bottom.png b/uniapps/work-wx/src/static/images/lb_bottom.png
new file mode 100644
index 0000000..8775fa3
--- /dev/null
+++ b/uniapps/work-wx/src/static/images/lb_bottom.png
Binary files differ
diff --git a/uniapps/work-wx/src/static/images/lbt.png b/uniapps/work-wx/src/static/images/lbt.png
new file mode 100644
index 0000000..eebf8d6
--- /dev/null
+++ b/uniapps/work-wx/src/static/images/lbt.png
Binary files differ
diff --git a/uniapps/work-wx/src/static/images/logo1.png b/uniapps/work-wx/src/static/images/logo1.png
new file mode 100644
index 0000000..fad3549
--- /dev/null
+++ b/uniapps/work-wx/src/static/images/logo1.png
Binary files differ
diff --git a/uniapps/work-wx/src/static/images/user/department.png b/uniapps/work-wx/src/static/images/user/department.png
new file mode 100644
index 0000000..8ea0456
--- /dev/null
+++ b/uniapps/work-wx/src/static/images/user/department.png
Binary files differ
diff --git a/uniapps/work-wx/src/static/images/user/info.png b/uniapps/work-wx/src/static/images/user/info.png
new file mode 100644
index 0000000..18ab1f7
--- /dev/null
+++ b/uniapps/work-wx/src/static/images/user/info.png
Binary files differ
diff --git a/uniapps/work-wx/src/static/images/user/password.png b/uniapps/work-wx/src/static/images/user/password.png
new file mode 100644
index 0000000..eb63256
--- /dev/null
+++ b/uniapps/work-wx/src/static/images/user/password.png
Binary files differ
diff --git a/uniapps/work-wx/src/static/images/user/rightBtn.png b/uniapps/work-wx/src/static/images/user/rightBtn.png
new file mode 100644
index 0000000..db90c73
--- /dev/null
+++ b/uniapps/work-wx/src/static/images/user/rightBtn.png
Binary files differ
diff --git a/uniapps/work-wx/src/subPackages/flightApplication/index.vue b/uniapps/work-wx/src/subPackages/flightApplication/index.vue
index 89584d5..d80c0be 100644
--- a/uniapps/work-wx/src/subPackages/flightApplication/index.vue
+++ b/uniapps/work-wx/src/subPackages/flightApplication/index.vue
@@ -18,8 +18,13 @@
<view class="sp-title">
审批记录
</view>
+
<u-list :style="{ height: 'calc(100vh - 240rpx)' }" @scrolltolower="scrolltolower" :lower-threshold="50">
- <view class="approvalRecord" v-for="(approvalRecord,approvalRecordIndex) in approvalRecords" :key="approvalRecordIndex" @click="handleClick(approvalRecord)">
+ <u-empty v-if="approvalRecords.length === 0"
+ text="暂无数据"
+ icon="http://cdn.uviewui.com/uview/empty/car.png">
+ </u-empty>
+ <view v-else class="approvalRecord" v-for="(approvalRecord,approvalRecordIndex) in approvalRecords" :key="approvalRecordIndex" @click="handleClick(approvalRecord)">
<view class="name-status">
<view class="name-image">
<u-image :src="spSvg" class="icon" width="16" height="16"></u-image>
@@ -297,7 +302,7 @@
color: #FFFFFF;
padding: 0 6rpx;
-
+
}
}
--
Gitblit v1.9.3