Merge branch '20221121' into dev

components/courseItem/courseItem.vue

@@ -15,8 +15,14 @@
 				<strong>￥{{dataList.coursePrice}}</strong>
 				<text>{{dataList.salesNumber}}人购买</text>
 			</view>
-			<view class="tagListBox" v-if="tagList">
-				<view class="tagItem" v-for="tagItem in tagConcat(tagList.v1,tagList.v2)">{{tagItem}}</view>
+			<view class="tagListBox" v-if="tagList || fileLecturerId">
+				<template v-if="tagList">
+					<view class="tagItem" v-for="tagItem in tagConcat(tagList.v1,tagList.v2)">{{tagItem}}</view>
+				</template>
+				<template v-else-if="_tagList">
+					<view class="tagItem" v-for="tagItem in tagConcat(_tagList.v1,_tagList.v2)">{{tagItem}}</view>
+				</template>
+				
 			</view>
 		</view>
 	</view>
@@ -27,11 +33,8 @@
 	export default {
 		name:"courseItem",
 		props:{
-			courseInfoItem:{
-				type:Object
-			},
 			fileLecturerId:{
-				type:String
+				type:Number
 			},
 			thumbnailPath:{
 				type:String
@@ -54,11 +57,10 @@
 			tagList:{
 				type:Object
 			}
-			
 		},
 		data() {
 			return {
-				
+				_tagList:{}
 			};
 		},
 		methods:{
@@ -80,15 +82,20 @@
 			},
 			lecturerQuery(){
 				api.lecturerQuery({id:this.fileLecturerId}).then(res=>{
-					console.log(res);
+					if(res['success']){
+						this._tagList['v1'] = res['data']['lecturerInfos'][0]['lecturerRankNames'];
+						this._tagList['v2'] = res['data']['lecturerInfos'][0]['lecturerName'];
+					}
 				})
 			}
 			
 		},
-		mounted() {
-			console.log(this.fileLecturerId,66666)
-			console.log(this.courseInfoItem)
-		}
+		updated() {
+			if(this.fileLecturerId){
+				this.lecturerQuery()
+			}
+		},
+		mounted() {}
 	}
 </script>
 

pages/orderConfirm/orderConfirm.vue

@@ -3,7 +3,7 @@
 		<!-- 课程详情 -->
 		<template v-if="courseInfoItem">
 			<view class="courseItemBox">
-				<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :fileLecturerId="courseInfoItem.fileLecturerId" :courseInfoItem="courseInfoItem"></course-item>
+				<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle" :summaryBox="courseInfoItem.fileSynopsis" :dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}" :fileLecturerId="courseInfoItem.fileLecturerId"></course-item>
 			</view>
 		</template>
 		<!-- 价格明细 -->
@@ -197,9 +197,7 @@
 				api.courseDetail({fileId:this.fileId,userId:1}).then(res=>{
 					console.log('课程详情',res);
 					if(res['success']){
-						console.log(res, 4567)
 						this.courseInfoItem =  res['data']['data'];
-						console.log(this.courseInfoItem,55555)
 					}
 				})
 			},