From 92aeaf5d9c719cc3abf7657e243bdfcde439d4bb Mon Sep 17 00:00:00 2001
From: 26947 <12@1>
Date: Sun, 2 Jun 2024 19:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/index.vue            | 169 +++++++++++++++-------------
 pages/activity/info.vue             |   2 +-
 pages/common/activityList/index.vue |  11 +-
 3 files changed, 97 insertions(+), 85 deletions(-)

diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 4b3421d..b9f5e53 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -1,6 +1,6 @@
 <template class="content">
-    <view  class="fixed-header"> 
-        
+    <view class="fixed-header">
+
         <!-- 顶部导航栏 -->
         <up-navbar leftText="" title="" :placeholder="true" :safeAreaInsetTop="true" :bgColor="bgColor">
             <template class="img1BOX" #left>
@@ -39,20 +39,22 @@
             </up-tabs>
         </view>
     </view>
-        <!-- 列表信息 -->
-        
-        <ActiInfoList v-model="actiInfoList" @scrolltolower="scrolltolower"></ActiInfoList> 
+    <!-- 列表信息 -->
+    <view >
+        <ActiInfoList v-model="actiInfoList" @scrolltolower="scrolltolower"></ActiInfoList>
+    </view>
+    
     <view>
     </view>
 </template>
 <script setup>
 import ActiInfoList from '../common/activityList/index.vue'
 import { onShow, onLoad } from '@dcloudio/uni-app'
-import {getDicts} from "@/api/system/dict/data"
+import { getDicts } from "@/api/system/dict/data"
 import { ref, reactive, getCurrentInstance } from 'vue'
 import { useStore } from 'vuex';
 const { proxy } = getCurrentInstance();
-const iconConfig =  proxy.iconConfig;
+const iconConfig = proxy.iconConfig;
 const tu21 = iconConfig.tu21;
 const tu22 = iconConfig.tu22;
 const tu51 = iconConfig.tu51;
@@ -64,92 +66,94 @@ const imgInfo = ref("")
 const bgColor = ref('');
 bgColor.value = 'rgba(170, 0, 0, 0)'
 const store = useStore()
-const list4 = reactive([  
-    { name: '全部' },  
-    { name: '未开始'},  
-    { name: '进行中' },  
-    { name: '已结束' } 
-]); 
+const list4 = reactive([
+    { name: '全部' },
+    { name: '未开始' },
+    { name: '进行中' },
+    { name: '已结束' }
+]);
 const actiInfoList = ref([
-   {
-    id:1,
-    title:'怎么评论爱德华·艾尔加这位音乐家及其他的作品,欢迎大家发表自己的看法？',
-   startTime:'2023-05-01 15:00',
-   endTime:'2023-05-01 16:00',
-   state:'1',
-   addrs:'天津电子信息职业技术学院操场东面'
-   },
-   {
-    id:2,
-    title:'怎么评论爱德华·艾尔加这位音乐家及其他的作品,欢迎大家发表自己的看法？',
-   startTime:'2023-05-01 15:00',
-   endTime:'2023-05-01 16:00',
-   state:'2',
-   addrs:'天津电子信息职业技术学院操场东面'
-   },
-   {id:3,
-    title:'怎么评论爱德华·艾尔加这位音乐家及其他的作品,欢迎大家发表自己的看法？',
-   startTime:'2023-05-01 15:00',
-   endTime:'2023-05-01 16:00',
-   state:'0',
-   addrs:'天津电子信息职业技术学院操场东面'
-   }
-   ,
-   {id:4,
-    title:'怎么评论爱德华·艾尔加这位音乐家及其他的作品,欢迎大家发表自己的看法？',
-   startTime:'2023-05-01 15:00',
-   endTime:'2023-05-01 16:00',
-   state:'0',
-   addrs:'天津电子信息职业技术学院操场东面'
-   }
+    {
+        id: 1,
+        title: '怎么评论爱德华·艾尔加这位音乐家及其他的作品,欢迎大家发表自己的看法？',
+        startTime: '2023-05-01 15:00',
+        endTime: '2023-05-01 16:00',
+        state: '1',
+        addrs: '天津电子信息职业技术学院操场东面'
+    },
+    {
+        id: 2,
+        title: '怎么评论爱德华·艾尔加这位音乐家及其他的作品,欢迎大家发表自己的看法？',
+        startTime: '2023-05-01 15:00',
+        endTime: '2023-05-01 16:00',
+        state: '2',
+        addrs: '天津电子信息职业技术学院操场东面'
+    },
+    {
+        id: 3,
+        title: '怎么评论爱德华·艾尔加这位音乐家及其他的作品,欢迎大家发表自己的看法？',
+        startTime: '2023-05-01 15:00',
+        endTime: '2023-05-01 16:00',
+        state: '0',
+        addrs: '天津电子信息职业技术学院操场东面'
+    }
+    ,
+    {
+        id: 4,
+        title: '怎么评论爱德华·艾尔加这位音乐家及其他的作品,欢迎大家发表自己的看法？',
+        startTime: '2023-05-01 15:00',
+        endTime: '2023-05-01 16:00',
+        state: '0',
+        addrs: '天津电子信息职业技术学院操场东面'
+    }
 
-]); 
+]);
 
 onLoad((options) => {
-    getDicts('activity_state').then( e=> {
-        activityState.value=e.data
+    getDicts('activity_state').then(e => {
+        activityState.value = e.data
         console.log(activityState.value);
     })
 })
 
 onShow(() => {
-  console.log('Page onShow')
+    console.log('Page onShow')
 })
 
 const scrolltolower = () => {
     console.log("scrolltolower");
-    actiInfoList.value.push( {title:'怎么评论爱德华·艾尔加这位音乐家及其他的作品,欢迎大家发表自己的看法？',
-   startTime:'2023-05-01 15:00',
-   endTime:'2023-05-01 16:00',
-   state:'2',
-   addrs:'天津电子信息职业技术学院操场东面'
-   })
+    actiInfoList.value.push({
+        title: '怎么评论爱德华·艾尔加这位音乐家及其他的作品,欢迎大家发表自己的看法？',
+        startTime: '2023-05-01 15:00',
+        endTime: '2023-05-01 16:00',
+        state: '2',
+        addrs: '天津电子信息职业技术学院操场东面'
+    })
 };
 const getDictLabelByValue = (state) => {
-  const dict = activityState.value.find((dict) => dict.dictValue === state);
-  return dict ? dict : '未知状态';
+    const dict = activityState.value.find((dict) => dict.dictValue === state);
+    return dict ? dict : '未知状态';
 };
 
-const toInfo = (item) => {
-    proxy.$tab.navigateTo(`/pages/activity/info?id=${item.id}`);
-}
-function toESearch(){
+
+function toESearch() {
     console.log("toESearch");
     proxy.$tab.navigateTo('/pages/search/activitySearch')
 }
 
 </script>
 <style lang="scss">
-  .fixed-header {
-    
-
-  }
+.fixed-header {
 
 
-    .leftinfo{
-        display: flex;
+}
+
+
+.leftinfo {
+    display: flex;
     align-items: flex-end;
-    }
+}
+
 .content {
     position: relative;
 
@@ -157,7 +161,8 @@ function toESearch(){
         padding-left: 32rpx;
         display: flex;
         align-content: center;
-            .lefttext {
+
+        .lefttext {
             font-weight: 400;
             width: 58rpx;
             height: 30rpx;
@@ -169,21 +174,24 @@ function toESearch(){
     }
 
 }
-.img2BOX{
+
+.img2BOX {
     display: flex;
     align-items: center;
 
 }
+
 .navbarcenter {
     font-weight: 400;
-width: 146rpx;
-height: 36rpx;
-font-size: 36rpx;
-text-align: left;
-color: #000000 100%;
-display: flex;
-align-items: center;
+    width: 146rpx;
+    height: 36rpx;
+    font-size: 36rpx;
+    text-align: left;
+    color: #000000 100%;
+    display: flex;
+    align-items: center;
 }
+
 .bgc {
     width: 100%;
     height: 500rpx;
@@ -210,21 +218,22 @@ align-items: center;
 .souBOx {
     margin-left: 32rpx;
 }
+
 .sousuoBox .souBOx .shuruText {
     margin-left: 20rpx;
     font-weight: 400;
     font-size: 28rpx;
-    color: #999999  !important;
+    color: #999999 !important;
 }
+
 .img3 {
     width: 38rpx;
     height: 38rpx;
 }
+
 .tabsinfo {
-    
+
     height: 80rpx;
     margin: 0 auto;
 }
-
-
 </style>
\ No newline at end of file
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index e5718a4..a6a52e5 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -177,7 +177,7 @@ function cancel () {
         .btnText {
             font-weight: 400;
             width: 120rpx;
-            height: 32rpx;
+
             font-size: 30rpx;
 
             color: #00CCBE !important;
diff --git a/pages/common/activityList/index.vue b/pages/common/activityList/index.vue
index 0a53d56..604a63d 100644
--- a/pages/common/activityList/index.vue
+++ b/pages/common/activityList/index.vue
@@ -51,18 +51,21 @@ const scrolltolower = () => {
     emit('scrolltolower'); // 如果不需要传递数据，可以省略第二个参数
 };
 
-
+const toInfo = (item) => {
+    proxy.$tab.navigateTo(`/pages/activity/info?id=${item.id}`);
+}
 </script>
 <style lang="scss" scoped>
 .scrollable-list {
 
-    overflow: auto;
-    /* 允许这个容器内部滚动 */
+    overflow-x: hidden;
+  overflow-y: auto;
+
 }
 
 .listInfo {
     position: relative;
-    
+    width: 686rpx;
     height: 328rpx;
     border-radius: 16rpx 16rpx 16rpx 16rpx;
     background: #ffffff;