Merge branch 'master' of https://gitee.com/wjl2008_admin/sociology_app

2024-10-16 13:31:04 +08:00
parent 4e4c60aa24 95365adddc
commit c1f78fe598
905 changed files with 5055 additions and 64064 deletions
--- a/pages/curriculum/cate/index.vue
+++ b/pages/curriculum/cate/index.vue
@@ -49,7 +49,8 @@
                  font-size: 26rpx;
                  font-weight: 700;
                ">
-								<text style="font-size: 20rpx">免费</text>
+								<text style="font-size: 20rpx" v-if="slotProps.row.courseCatalogueEntityList[0].type==2">超 V 专享</text>
+								<text style="font-size: 20rpx" v-else>免费</text>
 							</view>
 						</view>
 						<view class="curriculum_tag_info_box price_box" v-else>
--- a/pages/mine/aboutUs/agreement.vue
+++ b/pages/mine/aboutUs/agreement.vue
@@ -137,4 +137,4 @@
 		// 		margin-bottom: 10rpx;
 		// 	}
 	}
-</style>
+</style>
--- a/pages/mine/vip/order.vue
+++ b/pages/mine/vip/order.vue
@@ -1735,4 +1735,4 @@
 	.highlight {
 		color: $uni-color-primary;
 	}
-</style>
+</style>