From b07d485502803e3c573ee9c3e3c86cab9bf8966d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 14 Jan 2026 18:01:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
uniapps/work-app/src/pages/work/index.vue | 526 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 500 insertions(+), 26 deletions(-)
diff --git a/uniapps/work-app/src/pages/work/index.vue b/uniapps/work-app/src/pages/work/index.vue
index 7b2d2ab..593614a 100644
--- a/uniapps/work-app/src/pages/work/index.vue
+++ b/uniapps/work-app/src/pages/work/index.vue
@@ -9,15 +9,23 @@
<up-tabs :list="tabList" @click="handleClick"></up-tabs>
</div>
- <div class="eventBox">
- <div class="eventItem" v-for="(item,index) in dataList" :key="index">
- <img :src="item.photo_url" alt="" @click="detailHandle(item)" />
- <div class="informationDisplay">
- <div class="itemTitle">{{item.event_name}}</div>
- <div class="itemContent">{{formatDate(item.create_time) }}</div>
+ <scroll-view class="eventBox" scroll-y :lower-threshold="80" @scrolltolower="loadMore">
+ <div class="eventList">
+ <div class="eventItem" v-for="(item,index) in dataList" :key="index">
+ <img :src="item.photo_url" alt="" @click="detailHandle(item)" />
+ <div class="informationDisplay">
+ <!-- <div class="itemTitle">{{item.event_name}}</div>-->
+ <div class="itemContent">{{formatDate(item.create_time) }}</div>
+ </div>
</div>
</div>
- </div>
+
+ <!-- 加载提示 -->
+ <div class="loadingMore">
+ <text v-if="loading">加载中...</text>
+
+ </div>
+ </scroll-view>
</div>
</div>
@@ -32,8 +40,408 @@
import { getStatusBarHeight } from '@/utils/common';
const userStore = useUserStore()
const userInfo = userStore.userInfo
-const dataList = ref([])
+const dataList = ref([
+ {
+ "id": 8474,
+ "wayline_job_id": "51835088-cd94-42f8-b2ec-a9069ced4e7b",
+ "event_name": "测试",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260113/f090f03fdc52499473ab9cbfcdc0876d.jpeg",
+ "file_path": "upload/20260113/f090f03fdc52499473ab9cbfcdc0876d.jpeg",
+ "longitude": "115.85649472222222",
+ "latitude": "28.624301527777778",
+ "create_time": "2026-01-13 16:51:57",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260113002",
+ "ai_types": "道路裂缝",
+ "ai_type_key_list": [
+ "DLLFSB"
+ ],
+ "work_order_type_dict_key": "ZHZLL",
+ "work_order_type": "交通运输与交管",
+ "create_user": "曾超杰",
+ "update_user": "管理员",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "2009140684346388482",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1123598821738675201",
+ "address": "江西省南昌市西湖区朝农街道抚生南路1806号南昌台湾健康产业城",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260113/f090f03fdc52499473ab9cbfcdc0876d.jpeg",
+ "content": "测试",
+ "work_type": "3",
+ "job_name": "定向拍照2",
+ "is_review": 0,
+ "job_create_time": "2026-01-13 16:51:57"
+ },
+ {
+ "id": 8472,
+ "wayline_job_id": "6beae73e-2d5d-47e5-859b-e2a1955d6e3b",
+ "event_name": "车事件",
+ "event_dict_key": "Traffic_flow",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket//6beae73e-2d5d-47e5-859b-e2a1955d6e3b/DJI_202601091336_002_6beae73e-2d5d-47e5-859b-e2a1955d6e3b/车AI20260112144421001.jpeg",
+ "file_path": "/6beae73e-2d5d-47e5-859b-e2a1955d6e3b/DJI_202601091336_002_6beae73e-2d5d-47e5-859b-e2a1955d6e3b/车AI20260112144421001.jpeg",
+ "longitude": "115.85502433333333",
+ "latitude": "28.623021472222224",
+ "create_time": "2026-01-12 14:44:25",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "AI20260112144421001",
+ "remark": "江西省南昌市西湖区朝农街道翠菊路银燕物流基地发生车事件",
+ "ai_types": "车",
+ "ai_type_key_list": [
+ "CGL_CLLTJ"
+ ],
+ "work_order_type_dict_key": "ZHZLL",
+ "work_order_type": "交通运输与交管",
+ "create_user": "曾超杰",
+ "update_user": "空间大厦管理员",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "2009140684346388482",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1979075301412524033",
+ "address": "江西省南昌市西湖区朝农街道翠菊路银燕物流基地",
+ "content": "测试",
+ "work_type": "2",
+ "job_name": "马上智飞202601091336",
+ "is_review": 0,
+ "job_create_time": "2026-01-09 13:36:42"
+ },
+ {
+ "id": 8464,
+ "wayline_job_id": "8b4b7529-13ee-4885-a7b8-4a52667444fb",
+ "event_name": "1212",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260107/5e6bc6ecedd830f2415a959667b3841a.jpeg",
+ "file_path": "upload/20260107/5e6bc6ecedd830f2415a959667b3841a.jpeg",
+ "longitude": "115.85803208048642",
+ "latitude": "28.625135341676483",
+ "create_time": "2026-01-07 11:18:35",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260107003",
+ "ai_types": "水体污染",
+ "ai_type_key_list": [
+ "STWLSB"
+ ],
+ "work_order_type_dict_key": "SLL",
+ "work_order_type": "生态环境与水务",
+ "create_user": "罗广辉",
+ "update_user": "空间大厦管理员",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "1896495271624384514",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1979075301412524033",
+ "address": "江西省南昌市西湖区朝农街道抚生南路世纪吉的堡幼儿园",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260107/5e6bc6ecedd830f2415a959667b3841a.jpeg",
+ "content": "2121",
+ "work_type": "3",
+ "job_name": "马上智飞202601051720",
+ "is_review": 0,
+ "job_create_time": "2026-01-07 11:18:35"
+ },
+ {
+ "id": 8463,
+ "wayline_job_id": "8b4b7529-13ee-4885-a7b8-4a52667444fb",
+ "event_name": "122112",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260107/a52b1adda405b94a4f9436e43e1b3185.jpeg",
+ "file_path": "upload/20260107/a52b1adda405b94a4f9436e43e1b3185.jpeg",
+ "longitude": "115.85780692063119",
+ "latitude": "28.624775436656122",
+ "create_time": "2026-01-07 11:17:47",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260107002",
+ "ai_types": "水体污染",
+ "ai_type_key_list": [
+ "STWLSB"
+ ],
+ "work_order_type_dict_key": "SLL",
+ "work_order_type": "生态环境与水务",
+ "create_user": "罗广辉",
+ "update_user": "空间大厦管理员",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "1896495271624384514",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1979075301412524033",
+ "address": "江西省南昌市西湖区朝农街道抚生南路世纪吉的堡幼儿园",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260107/a52b1adda405b94a4f9436e43e1b3185.jpeg",
+ "content": "1",
+ "work_type": "3",
+ "job_name": "马上智飞202601051720",
+ "is_review": 0,
+ "job_create_time": "2026-01-07 11:17:48"
+ },
+ {
+ "id": 8462,
+ "wayline_job_id": "8b4b7529-13ee-4885-a7b8-4a52667444fb",
+ "event_name": "1",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260107/a138491d214cc0ce7a5a3eedf6b79680.jpeg",
+ "file_path": "upload/20260107/a138491d214cc0ce7a5a3eedf6b79680.jpeg",
+ "longitude": "115.85763536212585",
+ "latitude": "28.626095211224335",
+ "create_time": "2026-01-07 11:14:41",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260107001",
+ "ai_types": "水体污染",
+ "ai_type_key_list": [
+ "STWLSB"
+ ],
+ "work_order_type_dict_key": "SLL",
+ "work_order_type": "生态环境与水务",
+ "create_user": "罗广辉",
+ "update_user": "江西融媒",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "1896495271624384514",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1993119267150655490",
+ "address": "江西省南昌市西湖区朝农街道国贸天琴湾东区",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260107/a138491d214cc0ce7a5a3eedf6b79680.jpeg",
+ "content": "1",
+ "work_type": "3",
+ "job_name": "马上智飞202601051720",
+ "is_review": 0,
+ "job_create_time": "2026-01-07 11:14:42"
+ },
+ {
+ "id": 8461,
+ "wayline_job_id": "038b8f48-1704-4adc-abb7-7deb85eba101",
+ "event_name": "测试",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/c94dca50d34e13f53fd5a5c05abfe03f.jpeg",
+ "file_path": "upload/20260106/c94dca50d34e13f53fd5a5c05abfe03f.jpeg",
+ "longitude": "115.85623975",
+ "latitude": "28.624919472222224",
+ "create_time": "2026-01-06 13:38:03",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260106018",
+ "ai_types": "水体污染",
+ "ai_type_key_list": [
+ "STWLSB"
+ ],
+ "work_order_type_dict_key": "SLL",
+ "work_order_type": "生态环境与水务",
+ "create_user": "张含笑",
+ "update_user": "张含笑",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "1909067460995813377",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1909067460995813377",
+ "address": "江西省南昌市西湖区朝农街道抚生南路1818号国贸天琴湾",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/c94dca50d34e13f53fd5a5c05abfe03f.jpeg",
+ "content": "123",
+ "work_type": "3",
+ "job_name": "定向拍照-1-5",
+ "is_review": 0,
+ "job_create_time": "2026-01-06 13:38:03"
+ },
+ {
+ "id": 8460,
+ "wayline_job_id": "8b4b7529-13ee-4885-a7b8-4a52667444fb",
+ "event_name": "11",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/6ef9355b143d4e89d83c77d18f4e312f.jpeg",
+ "file_path": "upload/20260106/6ef9355b143d4e89d83c77d18f4e312f.jpeg",
+ "longitude": "115.85763536212585",
+ "latitude": "28.626095211224335",
+ "create_time": "2026-01-06 11:08:51",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260106017",
+ "ai_types": "建筑垃圾",
+ "ai_type_key_list": [
+ "GCL_JZLJSB"
+ ],
+ "work_order_type_dict_key": "CGL",
+ "work_order_type": "城市管理与综合执法",
+ "create_user": "张含笑",
+ "update_user": "罗广辉",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "1909067460995813377",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1896495271624384514",
+ "address": "江西省南昌市西湖区朝农街道国贸天琴湾东区",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/6ef9355b143d4e89d83c77d18f4e312f.jpeg",
+ "content": "12",
+ "work_type": "3",
+ "job_name": "马上智飞202601051720",
+ "is_review": 0,
+ "job_create_time": "2026-01-06 11:08:52"
+ },
+ {
+ "id": 8459,
+ "wayline_job_id": "038b8f48-1704-4adc-abb7-7deb85eba101",
+ "event_name": "122",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/96c7769b12f2e55b7e788e8f35b0364b.jpeg",
+ "file_path": "upload/20260106/96c7769b12f2e55b7e788e8f35b0364b.jpeg",
+ "longitude": "115.85623975",
+ "latitude": "28.624919472222224",
+ "create_time": "2026-01-06 11:08:00",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260106016",
+ "ai_types": "水生植物漂浮物",
+ "ai_type_key_list": [
+ "SMPFWSB"
+ ],
+ "work_order_type_dict_key": "SLL",
+ "work_order_type": "生态环境与水务",
+ "create_user": "张含笑",
+ "update_user": "张含笑",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "1909067460995813377",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1909067460995813377",
+ "address": "江西省南昌市西湖区朝农街道抚生南路1818号国贸天琴湾",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/96c7769b12f2e55b7e788e8f35b0364b.jpeg",
+ "content": "1",
+ "work_type": "3",
+ "job_name": "定向拍照-1-5",
+ "is_review": 0,
+ "job_create_time": "2026-01-06 11:08:00"
+ },
+ {
+ "id": 8458,
+ "wayline_job_id": "8b4b7529-13ee-4885-a7b8-4a52667444fb",
+ "event_name": "12",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/2e065c4f0e78d4fa1cfdd15f65397b85.jpeg",
+ "file_path": "upload/20260106/2e065c4f0e78d4fa1cfdd15f65397b85.jpeg",
+ "longitude": "115.85677911492691",
+ "latitude": "28.62569394530331",
+ "create_time": "2026-01-06 11:00:53",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260106015",
+ "ai_types": "水体污染",
+ "ai_type_key_list": [
+ "STWLSB"
+ ],
+ "work_order_type_dict_key": "SLL",
+ "work_order_type": "生态环境与水务",
+ "create_user": "张含笑",
+ "update_user": "罗广辉",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "1909067460995813377",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1896495271624384514",
+ "address": "江西省南昌市西湖区朝农街道抚生南路1836号国贸天琴湾东区",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/2e065c4f0e78d4fa1cfdd15f65397b85.jpeg",
+ "content": "22",
+ "work_type": "3",
+ "job_name": "马上智飞202601051720",
+ "is_review": 0,
+ "job_create_time": "2026-01-06 11:00:54"
+ },
+ {
+ "id": 8457,
+ "wayline_job_id": "038b8f48-1704-4adc-abb7-7deb85eba101",
+ "event_name": "发布事件",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/ecdfe6c661dba2fa03efcc19a5863680.jpeg",
+ "file_path": "upload/20260106/ecdfe6c661dba2fa03efcc19a5863680.jpeg",
+ "longitude": "115.85623975",
+ "latitude": "28.624919472222224",
+ "create_time": "2026-01-06 10:43:29",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260106014",
+ "ai_types": "水体污染",
+ "ai_type_key_list": [
+ "STWLSB"
+ ],
+ "work_order_type_dict_key": "SLL",
+ "work_order_type": "生态环境与水务",
+ "create_user": "张含笑",
+ "update_user": "张含笑",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "1909067460995813377",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1909067460995813377",
+ "address": "江西省南昌市西湖区朝农街道抚生南路1818号国贸天琴湾",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/ecdfe6c661dba2fa03efcc19a5863680.jpeg",
+ "content": "11",
+ "work_type": "3",
+ "job_name": "定向拍照-1-5",
+ "is_review": 0,
+ "job_create_time": "2026-01-06 10:43:30"
+ },
+ {
+ "id": 8456,
+ "wayline_job_id": "038b8f48-1704-4adc-abb7-7deb85eba101",
+ "event_name": "122",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/fc9820c440da478fa5312e8647e1e311.jpeg",
+ "file_path": "upload/20260106/fc9820c440da478fa5312e8647e1e311.jpeg",
+ "longitude": "115.85623975",
+ "latitude": "28.624919472222224",
+ "create_time": "2026-01-06 10:38:20",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260106013",
+ "ai_types": "水体污染",
+ "ai_type_key_list": [
+ "STWLSB"
+ ],
+ "work_order_type_dict_key": "SLL",
+ "work_order_type": "生态环境与水务",
+ "create_user": "张含笑",
+ "update_user": "张含笑",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "1909067460995813377",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1909067460995813377",
+ "address": "江西省南昌市西湖区朝农街道抚生南路1818号国贸天琴湾",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/fc9820c440da478fa5312e8647e1e311.jpeg",
+ "content": "3",
+ "work_type": "3",
+ "job_name": "定向拍照-1-5",
+ "is_review": 0,
+ "job_create_time": "2026-01-06 10:38:20"
+ },
+ {
+ "id": 8455,
+ "wayline_job_id": "038b8f48-1704-4adc-abb7-7deb85eba101",
+ "event_name": "122",
+ "device_sn": "7CTDM5E00B3H61",
+ "status": 3,
+ "photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/d9a152ab1484348be5e126f854eca86a.jpeg",
+ "file_path": "upload/20260106/d9a152ab1484348be5e126f854eca86a.jpeg",
+ "longitude": "115.85623975",
+ "latitude": "28.624919472222224",
+ "create_time": "2026-01-06 10:38:18",
+ "media_type": "PHOTO_TYPE",
+ "event_num": "BHJC20260106012",
+ "ai_types": "水体污染",
+ "ai_type_key_list": [
+ "STWLSB"
+ ],
+ "work_order_type_dict_key": "SLL",
+ "work_order_type": "生态环境与水务",
+ "create_user": "张含笑",
+ "update_user": "张含笑",
+ "dept_name": "中图智飞（江西省）",
+ "create_user_id": "1909067460995813377",
+ "user_id": "1991745495648227330",
+ "handle_user_id": "1909067460995813377",
+ "address": "江西省南昌市西湖区朝农街道抚生南路1818号国贸天琴湾",
+ "update_photo_url": "https://wrj.shuixiongit.com/minio/cloud-bucket/upload/20260106/d9a152ab1484348be5e126f854eca86a.jpeg",
+ "content": "3",
+ "work_type": "3",
+ "job_name": "定向拍照-1-5",
+ "is_review": 0,
+ "job_create_time": "2026-01-06 10:38:18"
+ }
+])
const currentTab=ref('all')
+const loading = ref(false)
+const hasMore = ref(true)
const tabList = ref([
{
name: '全部工单',
@@ -49,7 +457,7 @@
badge: {
value: 1
}
- },
+ }
])
@@ -59,16 +467,19 @@
const listParams = ref({
status: null,
current: 1,
- size: 9999,
+ size: 12,
source: 1,
department:'',
keyword:''
})
const getDataList = () => {
+ if (loading.value || !hasMore.value) return
+
+ loading.value = true
const params = {
- current: 1,
- size: 9999,
+ current: listParams.value.current,
+ size: listParams.value.size,
source: 1,
status:listParams.value.status,
event_name:listParams.value.keyword,
@@ -76,10 +487,29 @@
}
getList(params).then(res => {
- const response = res.data.data.records
- dataList.value = response
+ const response = res.data.data
+ const records = response.records || []
+
+ // 根据当前页码决定是替换还是追加数据
+ if (listParams.value.current === 1) {
+ dataList.value = records
+ } else {
+ dataList.value = [...dataList.value, ...records]
+ }
+
+ // 判断是否还有更多数据
+ if (records.length < listParams.value.size || response.current >= response.pages) {
+ hasMore.value = false
+ } else {
+ hasMore.value = true
+ }
+ }).finally(() => {
+ loading.value = false
})
}
+
+
+
// const getstatusCountData=()=>{
// getstatusCount().then(res=>{
// const response = res.data.data
@@ -102,8 +532,17 @@
const handleClick = (item) => {
currentTab.value = item.key
listParams.value.status = item.status
+ listParams.value.current = 1
+ hasMore.value = true
+ dataList.value = []
getDataList()
}
+const loadMore = () => {
+ if (loading.value || !hasMore.value) return
+ listParams.value.current++
+ getDataList()
+}
+
const detailHandle = (val) => {
uni.navigateTo({
url: `/subPackages/workDetail/index?eventNum=${val.event_num}`,
@@ -111,8 +550,10 @@
}
const topMargin = getStatusBarHeight()
onShow(() => {
- getDataList()
-
+ // listParams.value.current = 1
+ // hasMore.value = true
+ // dataList.value = []
+ // getDataList()
})
</script>
@@ -123,6 +564,8 @@
flex-direction: column;
height: 100%;
box-sizing: border-box;
+ width: 100%;
+ overflow-x: hidden;
.searchTop {
display: flex;
align-items: center;
@@ -134,11 +577,13 @@
:deep(){
.u-tabs__wrapper__nav__line{
- width: 80rpx !important;
+ // width: 80rpx !important;
background: #1D6FE9 !important;
}
.u-badge {
background-color: #1d6fe9 !important;
+ margin-top: -17px !important;
+ margin-left: -5px !important;
}
}
@@ -153,34 +598,53 @@
display: flex;
flex-direction: column;
flex: 1;
+ width: 100%;
+ box-sizing: border-box;
}
.eventBox {
- display: flex;
- flex-wrap: wrap;
- gap: 20rpx;
padding: 20rpx 0;
overflow-y: auto;
+ overflow-x: hidden;
height: 0;
flex-grow: 1;
align-content: flex-start;
+ width: 100%;
+ box-sizing: border-box;
+ }
+
+ .eventList {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 20rpx;
+ width: 100%;
+ box-sizing: border-box;
+ justify-content: space-between;
.eventItem {
width: calc(50% - 10rpx);
background-color: #fff;
border-radius: 12rpx;
overflow: hidden;
+ position: relative;
+ box-sizing: border-box;
+ max-width: 100%;
img {
- width: 341rpx;
- height: 196rpx;
+ width: 100%;
+ height: 208rpx;
border-radius: 12rpx;
overflow: hidden;
}
.informationDisplay{
+ width: 100%;
+ position: absolute;
+ bottom: 3px;
+ background: rgba(11,11,11,0.35);
+ border-radius: 0rpx 0rpx 12rpx 12rpx;
display: flex;
align-items: center;
- justify-content: space-between;
- padding: 10rpx 20rpx 10rpx 12rpx;
+ justify-content: flex-end;
+ padding: 10rpx 0rpx 10rpx 0rpx;
.itemTitle {
width: 144rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
@@ -196,12 +660,22 @@
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 24rpx;
- color: rgba(0,0,0,0.5);
+ color: #FFFFFF;
+ padding-right: 14rpx;
}
}
-
}
}
+
+ .loadingMore {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 80rpx;
+ font-size: 28rpx;
+ color: #999;
+ width: 100%;
+ }
}
</style>
--
Gitblit v1.9.3