Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

src/pages/courseDetail/components/knowledge.vue

@@ -15,7 +15,7 @@
 
 		</view>
 		<view class="bottom">
-			<view class="fz-30 font_pf text">{{  item.pgrphContent }}</view>
+			<view class="fz-30 font_pf text ellipsis-text">{{  item.pgrphContent }}</view>
 		</view>
 	</view>
 </template>

src/pages/index/index.vue

@@ -372,7 +372,7 @@
 
 
 <style scoped lang="scss">
-	$bg-margin-left: 50rpx;
+	$bg-margin-left: 30rpx;
 
 	// :deep(.uni-scroll-view-content) {
 	// 	display: flex;
@@ -763,7 +763,7 @@
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
 					font-size: 25rpx;
-					color: #323E57;
+					// color: #323E57;
 					line-height: 35rpx;
 					text-align: left;
 					font-style: normal;