From c3d33843536727c9b485355c8f8d739911022f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 24 Apr 2023 14:24:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Learningtraining/Learningtraining.vue | 148 +++++++++++++++++---
 pages/Videolearning/Videolearning.vue       |  14 +-
 2 files changed, 133 insertions(+), 29 deletions(-)

diff --git a/pages/Learningtraining/Learningtraining.vue b/pages/Learningtraining/Learningtraining.vue
index 87a94b6..276f667 100644
--- a/pages/Learningtraining/Learningtraining.vue
+++ b/pages/Learningtraining/Learningtraining.vue
@@ -3,14 +3,34 @@
 		<view class="text">
 			参加知识技能培训，通过考试获得护理资格
 		</view>
-		<view class="items" v-for="(item,index) in list" :key="index" @tap='gographicvideo(item)'>
+		<view class="card">
+			<view class="item" v-for='(item,index) in list' :key="index" @click.stop='gographicvideo(item)'>
+				<image :src="baseurl + item.trainingItemCoverUrl" mode=""></image>
+				<view class="title">
+					{{item.trainingItemTitle}}
+				</view>
+				<view class="price" v-if="item.trainingItemPrice">
+					￥{{item.trainingItemPrice}}
+				</view>
+				<view class="price" v-else>
+					￥0
+				</view>
+				<view class="buy" v-if='!item.trainingOrderStatus' @click.stop='buy(item)'>
+					购买
+				</view>
+				<view class="havebuy" v-else>
+					已购
+				</view>
+			</view>
+		</view>
+		<!-- 		<view class="items" v-for="(item,index) in list" :key="index" @tap='gographicvideo(item)'>
 			<view class="item">
 				<image :src="baseurl+item.trainingItemCoverUrl" mode=""></image>
 				<view class="title">
 					{{item.trainingItemTitle}}
 				</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 <script>
@@ -52,11 +72,11 @@
 			gographicvideo(item) {
 				if (item.trainingItemTitle == '图文学习') {
 					uni.navigateTo({
-						url: `/pages/Graphiclearning/Graphiclearning?trainingItemId=${item.id}`
+						url: `/pages/Graphiclearning/Graphiclearning?trainingItemId=${item.trainingItemId}`
 					})
 				} else if (item.trainingItemTitle == '视频学习') {
 					uni.navigateTo({
-						url: `/pages/Videolearning/Videolearning?trainingItemId=${item.id}`
+						url: `/pages/Videolearning/Videolearning?trainingItemId=${item.trainingItemId}`
 					})
 				}
 			}
@@ -86,39 +106,123 @@
 		color: #333333;
 		padding: 0;
 
-		.items {
+		.card {
 			width: 96%;
 			margin: 25rpx auto;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 
 			.item {
 				width: 100%;
-				height: 132rpx;
-				background: #FFFFFF;
-				box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
-				border-radius: 5rpx;
-				margin-bottom: 20rpx;
+				border-bottom: 1rpx solid #E6E6E6;
 				position: relative;
-
-				.title {
-					display: inline-block;
-					font-size: 32rpx;
-					position: absolute;
-					top: 50%;
-					left: 120rpx;
-					transform: translateY(-50%);
-				}
+				height: 200rpx;
+				margin-bottom: 20rpx;
+				background: #FFFFFF;
+				border-radius: 5rpx;
 
 				image {
-					width: 60rpx;
-					height: 60rpx;
 					position: absolute;
 					top: 50%;
-					left: 41rpx;
 					transform: translateY(-50%);
+					left: 15rpx;
+					width: 216rpx;
+					height: 136rpx;
+				}
+
+				.havebuy {
+					width: 125rpx;
+					height: 55rpx;
+					background: #CDCDCD;
+					border-radius: 5rpx;
+					text-align: center;
+					line-height: 55rpx;
+					color: #FFFFFF;
+					position: absolute;
+					right: 15rpx;
+					bottom: 30rpx;
+				}
+
+				.buy {
+					width: 125rpx;
+					height: 55rpx;
+					background: #4271B9;
+					border-radius: 5rpx;
+					text-align: center;
+					line-height: 55rpx;
+					color: #FFFFFF;
+					position: absolute;
+					right: 15rpx;
+					bottom: 30rpx;
+				}
+
+				.time {
+					font-size: 24rpx;
+					color: #666666;
+					position: absolute;
+					top: 120rpx;
+					left: 250rpx;
+				}
+
+				.price {
+					position: absolute;
+					top: 120rpx;
+					left: 250rpx;
+					font-size: 28rpx;
+					font-weight: 500;
+					color: #EA706A;
+				}
+
+				.title {
+					width: 281rpx;
+					position: absolute;
+					top: 35rpx;
+					left: 250rpx;
+					font-weight: 500;
+					font-size: 30rpx;
+					text-overflow: -o-ellipsis-lastline;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2; //行数需设置
+					line-clamp: 2;
+					-webkit-box-orient: vertical;
 				}
 			}
 		}
 
+		// .items {
+		// 	width: 96%;
+		// 	margin: 25rpx auto;
+
+		// 	.item {
+		// 		width: 100%;
+		// 		height: 132rpx;
+		// 		background: #FFFFFF;
+		// 		box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+		// 		border-radius: 5rpx;
+		// 		margin-bottom: 20rpx;
+		// 		position: relative;
+
+		// 		.title {
+		// 			display: inline-block;
+		// 			font-size: 32rpx;
+		// 			position: absolute;
+		// 			top: 50%;
+		// 			left: 120rpx;
+		// 			transform: translateY(-50%);
+		// 		}
+
+		// 		image {
+		// 			width: 60rpx;
+		// 			height: 60rpx;
+		// 			position: absolute;
+		// 			top: 50%;
+		// 			left: 41rpx;
+		// 			transform: translateY(-50%);
+		// 		}
+		// 	}
+		// }
+
 		.text {
 			margin: 40rpx 0 0 23rpx;
 			font-size: 24rpx;
diff --git a/pages/Videolearning/Videolearning.vue b/pages/Videolearning/Videolearning.vue
index f3f83f2..55cdb46 100644
--- a/pages/Videolearning/Videolearning.vue
+++ b/pages/Videolearning/Videolearning.vue
@@ -6,10 +6,10 @@
 				<view class="title">
 					{{item.trainingItemTitle}}
 				</view>
-				<view class="price" v-if="item.trainingItemPrice">
+				<!-- 	<view class="price" v-if="item.trainingItemPrice">
 					￥{{item.trainingItemPrice}}
 				</view>
-				<view class="price" v-else>
+					<view class="price" v-else>
 					￥0
 				</view>
 				<view class="buy" v-if='!item.trainingOrderStatus' @click.stop='buy(item)'>
@@ -17,10 +17,10 @@
 				</view>
 				<view class="havebuy" v-else>
 					已购
-				</view>
+				</view> -->
 			</view>
 		</view>
-		<u-popup v-model="buyshow" mode='bottom' height='500' class='popup' safe-area-inset-bottom>
+		<!-- 	<u-popup v-model="buyshow" mode='bottom' height='500' class='popup' safe-area-inset-bottom>
 			<view class="popuptitle">请选择支付方式</view>
 			<view class="buyselect">
 				<image src="../../static/wechat.png" mode=""></image>
@@ -31,7 +31,7 @@
 			<view class="buybtn" @tap='tobuy'>
 				确认支付￥{{buylist.trainingItemPrice}}
 			</view>
-		</u-popup>
+		</u-popup> -->
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -58,8 +58,8 @@
 		},
 		onLoad(options) {
 			const that = this
-			// this.trainingItemId = options.trainingItemId
-			this.trainingItemId = 2
+			this.trainingItemId = options.trainingItemId
+			// this.trainingItemId = 2
 			this.baseurl = baseurl
 			const value = uni.getStorageSync('nursePersonId');
 			if (value) {