Merge remote-tracking branch 'origin/master'

“mitao”

2026-05-12 d53b108787855b88816cb9f2f531fb342516131d

Merge remote-tracking branch 'origin/master'

 traditionalApp/manifest.json

@@ -3,8 +3,8 @@
    "name" : "海诊康道",
    "appid" : "__UNI__1A90541",
    "description" : "",
    "versionName" : "1.0.9",
    "versionCode" : 109,
    "versionName" : "1.0.10",
    "versionCode" : 110,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
@@ -364,3 +364,4 @@
    }
}
/* 快应用特有相关 *//* 小程序特有相关 */


 traditionalApp/pages/courseDetail/courseDetail.vue

@@ -161,9 +161,9 @@
                    </view>

                    <template v-if="freeVideos.length > 0">
                        <image class="free-divider"
                        <!-- <image class="free-divider"
                            src="http://obs.haizhentong.com/file/free-172b4e6b23924752a06c7c13cf93237f.png"
                            mode="widthFix"></image>
                            mode="widthFix"></image> -->

                        <view class="list-items">
                            <view class="list-item" :class="{ 'list-item--active': isPlayingVideo(item.id) }"
@@ -176,10 +176,10 @@
                    </template>

                    <template v-if="paidVideos.length > 0">
                        <image class="pay-divider"
                        <!-- <image class="pay-divider"
                            src="http://obs.haizhentong.com/file/payToUnlock-b05a6aa76d9c42e6a9c532938180588b.png"
                            mode="widthFix">
                        </image>
                        </image> -->

                        <view class="list-items">
                            <view class="list-item" :class="{ 'list-item--active': isPlayingVideo(item.id) }"
@@ -1381,10 +1381,12 @@

<style lang="scss" scoped>
    .container {
        height: 100vh;
        min-height: 100vh;
        background-color: #f6f8fa;
        display: flex;
        flex-direction: column;
        overflow: hidden;
    }

    .nav-bar {
@@ -1428,6 +1430,7 @@
        height: 600rpx;
        position: relative;
        margin-top: calc(var(--status-bar-height, 0px) + 88rpx);
        flex-shrink: 0;

        .swiper-container,
        .swiper {
@@ -1507,6 +1510,7 @@
        background-color: #fff;
        height: 88rpx;
        border-bottom: 1px solid #f0f0f0;
        flex-shrink: 0;

        .tab-item {
            flex: 1;
@@ -1527,7 +1531,9 @@
    .scroll-content {
        flex: 1;
        height: 0;
        min-height: 0;
        padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
        box-sizing: border-box;
    }

    .info-section {