Merge remote-tracking branch 'origin/dev' into dev

zxl

2025-06-26 3bff34c3aa7ad412042272ea6a37b7d5b49b8d9b

 pages/mine/activity/reportActivity.vue

@@ -1,6 +1,6 @@
<template>
   <view class="wrapper">
		
      <top-bar selectedTitleIndex="activity" textColor="black" @changeTab="topBarChange" class="topBar"></top-bar>
      
      <view style="height: 100rpx"></view>
      <!-- 内容区域 -->
@@ -47,9 +47,11 @@
</template>

<script>
   import TopBar from "@/components/TopBar.vue";
   import '@/components/uview-components/uview-ui';
   import {getActivityReportList} from '@/api/activity.js';
   export default {
      components: {TopBar},
      data() {
         return {
            columns: [
@@ -75,6 +77,17 @@
         this.getActivityList();
      },
      methods: {
         topBarChange(titleObj) {
            if (titleObj.index === 'home') {
               uni.switchTab({
                  url: titleObj.pagePath
               });
            } else {
               uni.redirectTo({
                  url: titleObj.pagePath
               });
            }
         },
         /**
          * 下拉刷新时
          */
@@ -367,4 +380,10 @@
         font-size: 28rpx;
      }
   }
   .topBar {
      position: fixed;
      top: 20rpx;
      left: 20rpx;
      z-index: 1000
   }
</style>