绿满眶商城微信小程序-uniapp
peng
2025-06-27 7673b8272cfd9fc21161b70e35c263e455b59966
Merge remote-tracking branch 'origin/dev' into dev
7个文件已修改
60 ■■■■■ 已修改文件
components/TopBar.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/health/healthVideo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/kitchen/KitchenVideo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mine/activity/detail.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mine/activity/reportActivity.vue 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tabbar/index/home.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/video/video-play.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/TopBar.vue
@@ -1,5 +1,5 @@
<template>
    <view class="top-bar" :style="{paddingTop: statusBarHeight + 'px'}">
    <view class="top-bar" :style="{paddingTop: statusBarHeight + 'rpx'}">
        <view class="top-bar-content">
            <!-- 标题列表 -->
            <scroll-view class="title-scroll" scroll-x="true" scroll-with-animation :scroll-left="scrollLeft">
pages/health/healthVideo.vue
@@ -36,7 +36,7 @@
                :autoplay="index === currentIndex"
                :controls="false"
                :loop="true"
                :object-fit="item.objectFit"
                :object-fit="item.videoFit"
                :enable-progress-gesture="false"
                :show-center-play-btn="false"
                class="video-item"
pages/kitchen/KitchenVideo.vue
@@ -39,7 +39,7 @@
              :autoplay="index === currentIndex"
              :controls="false"
              :loop="true"
              :object-fit="item.objectFit"
              :object-fit="item.videoFit"
              :enable-progress-gesture="false"
              :show-center-play-btn="false"
              class="video-item"
pages/mine/activity/detail.vue
@@ -7,11 +7,11 @@
            <block v-if="activityInfo.coverType === 'image'">
                <image :src="activityInfo.url" class="activity-cover" />
            </block>
            <block v-if=" activityInfo.coverType === 'video'">
            <block v-else-if=" activityInfo.coverType === 'video'">
                <video :src="activityInfo.url" @play="handleVideoPlay" class="activity-cover"></video>
            </block>
            <!-- 文字类型 -->
            <block v-if="activityInfo.coverType === 'text'">
            <block v-else-if="activityInfo.coverType === 'text'">
                <view class="text-cover">
                    <text class="cover-text">{{ activityInfo.cover }}</text>
                </view>
@@ -55,8 +55,8 @@
            <rich-text :nodes="activityInfo.activityContent" class="rich-text-content"></rich-text>
        </view>
        <!-- 报名状态 -->
        <view class="status-bar" :style="{ backgroundColor: statusBarColor }">
            <u-button class="signup-btn" @click.stop="activityReport()"
        <view class="status-bar">
            <u-button type="success" class="signup-btn" @click.stop="activityReport()"
                :disabled="reportBtn">{{ reportBtn ? '已报名': '立即报名'}}</u-button>
            <view class="collect-icon" @click.stop="collect()">
                <u-icon :name="isCollect ? 'star-fill' : 'star'" size="52"
@@ -208,7 +208,6 @@
        width: 100%;
        height: 400rpx;
        overflow: hidden;
        background-color: #f5f5f5;
    }
    /* 图片/视频封面样式 */
@@ -226,12 +225,12 @@
        display: flex;
        align-items: center;
        justify-content: center;
        background: linear-gradient(135deg, #6a11cb 0%, #2575fc 100%);
        // background: linear-gradient(135deg, #38a169 0%, #48bb78 100%);
        padding: 40rpx;
    }
    .cover-text {
        color: #fff;
        color: #0c6343;
        font-size: 36rpx;
        font-weight: bold;
        text-align: center;
@@ -283,6 +282,9 @@
    }
    .status-bar {
        position: absolute;
        bottom: 40rpx;
        width: 100%;
        display: flex;
        align-items: center;
        padding: 10px 15px;
@@ -347,7 +349,7 @@
    .rich-text-content {
        line-height: 1.6;
        color: #333;
        font-size: 16px;
        font-size: 28rpx;
    }
    .rich-text-content img {
pages/mine/activity/reportActivity.vue
@@ -108,7 +108,10 @@
                }, 300);
            },
            async getActivityList() {
                if (this.noMore) {
                    this.loading = false;
                    return
                }
                try {
                    const res = await getActivityReportList(this.query);
@@ -218,7 +221,7 @@
        text-align: center;
        color: #999;
        font-size: 26rpx;
        background-color: #f7f8fa;
        background-color: #f8f9fa;
    }
    .btn-container {
@@ -234,7 +237,7 @@
        height: 100vh;
        display: flex;
        flex-direction: column;
        background-color: #f7f8fa;
        background-color: #f8f9fa;
    }
    /* 导航栏优化 */
@@ -266,17 +269,19 @@
        gap: 20rpx;
    }
    /* 卡片项优化 */
    /* 卡片项优化 - 使用绿色主题 */
    .item {
        background: #fff;
        background: #ffffff;
        border-radius: 16rpx;
        overflow: hidden;
        box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.08);
        transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
        border: 1px solid #e0f2e9;
        &:active {
            transform: scale(0.98);
            box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.12);
            background-color: #f0faf5;
        }
    }
@@ -285,7 +290,7 @@
        width: 100%;
        display: block;
        border-radius: 16rpx 16rpx 0 0;
        background-color: #f5f5f5;
        background-color: #f0faf5;
        &[mode="widthFix"] {
            height: auto;
@@ -297,17 +302,16 @@
        object-fit: cover;
    }
    /* 文字内容样式 */
    /* 文字内容样式 - 使用绿色渐变 */
    .text-content {
        padding: 24rpx;
        background: linear-gradient(135deg, #6a11cb 0%, #2575fc 100%);
        // background: linear-gradient(135deg, #38a169 0%, #48bb78 100%);
        min-height: 160rpx;
        display: flex;
        align-items: center;
        justify-content: center;
        .title {
            color: #fff;
            font-size: 32rpx;
            font-weight: 500;
            line-height: 1.4;
@@ -319,11 +323,11 @@
        }
    }
    /* 标题样式优化 */
    /* 标题样式优化 - 使用深绿色 */
    .title {
        padding: 20rpx 24rpx;
        font-size: 28rpx;
        color: #333;
        color: #2c7a7b;
        line-height: 1.5;
        display: -webkit-box;
        -webkit-box-orient: vertical;
@@ -332,7 +336,7 @@
        font-weight: 500;
        &:not(.text-content .title) {
            border-top: 1rpx solid #f0f0f0;
            border-top: 1rpx solid #e0f2e9;
        }
    }
@@ -380,10 +384,12 @@
            font-size: 28rpx;
        }
    }
    .topBar {
        position: fixed;
        top: 20rpx;
        left: 20rpx;
        z-index: 1000
        z-index: 1000;
        background-color: #ffffff;
    }
</style>
pages/tabbar/index/home.vue
@@ -36,7 +36,7 @@
                :autoplay="index === currentIndex"
                :controls="false"
                :loop="true"
                :object-fit="item.objectFit"
                :object-fit="item.videoFit"
                :enable-progress-gesture="false"
                :show-center-play-btn="false"
                class="video-item"
pages/video/video-play.vue
@@ -35,7 +35,7 @@
                  :autoplay="index === currentIndex"
                  :controls="false"
                  :loop="true"
                  :object-fit="item.objectFit"
                  :object-fit="item.videoFit"
                  :enable-progress-gesture="false"
                :show-center-play-btn="false"
                  class="video-item"