From 15d03cac073f50fe58cdc2a62360349acc2a6997 Mon Sep 17 00:00:00 2001
From: wangchenguang <728837162@qq.com>
Date: Thu, 13 Apr 2023 17:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 order/editCourse/editCourse.vue   | 3 +++
 order/orderDetail/orderDetail.vue | 8 ++++++--
 team/article/article.vue          | 5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index e717109..684ef5b 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -253,6 +253,7 @@
 			// 计算结算价及平台服务费
 			dealSettlePrice(row) {
 				// 如果是试用，结算价和平台服务费都是0
+				console.log('row=>', row)
 				if (this.orderType == 2) {
 					row.settlementPrice = 0
 					row.serviceFee = 0
@@ -286,6 +287,7 @@
 				getPartnerTeamRates({
 					teamId: uni.getStorageSync('team').teamId
 				}).then(({ teamRates }) => {
+					console.log('teamRates=>',teamRates)
 					this.rate = teamRates.annualMarketingFee || 0
 				}).catch(res => {})
 			},
@@ -306,6 +308,7 @@
 					}
 					// 折扣率
 					this.calcDiscount(row)
+					//市场服务费
 					this.dealSettlePrice(row)
 				}, 500)
 			},
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index 8414a25..b5cb1f5 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -289,7 +289,11 @@
 				}
 				// 3个分类的课程分别push到不同数组(0->理论 1-实训 2 数据产品) 
 				list.map(e => {
-					e.serviceFee = (e.settlementPrice * (this.rate / 100)).toFixed(2) // 服务费 != 0 && 才需要算
+					console.log('e.=>',e)
+					console.log('this.rate=>',this.rate)
+					e.serviceFee = (e.finalPrice * (this.rate / 100)).toFixed(2) // 服务费 != 0 && 才需要算
+					
+					console.log('e.serviceFee=>',e.serviceFee)
 					const type = e.productType
 					!type ?
 						courses.theory.list.push(e) :
@@ -415,7 +419,6 @@
 				
 					总成本和总利润为单个产品的采购成本价和利润的和
 				 */
-				console.log('list=>',list)
 				list.map(e => {
 					// out=1 && 试用，则把结算价等重置为0
 					if (out && isTrial) {
@@ -445,6 +448,7 @@
 			},
 			// 计算结算价及平台服务费
 			dealSettlePrice(row) {
+				console.log('row==>',row)
 				// 如果是试用，结算价和平台服务费都是0
 				if (this.form.orderType == 2) {
 					row.settlementPrice = 0
diff --git a/team/article/article.vue b/team/article/article.vue
index 6e43435..eb15b1d 100644
--- a/team/article/article.vue
+++ b/team/article/article.vue
@@ -65,8 +65,8 @@
 					const newStyle = 'width: 85% !important; height: auto;';
 					const regex = /(<img[^>]*?\s+style=")([^"]*)("[^>]*?>)/g;
 					const newStr = str.replace(regex, `$1${newStyle}$3`);
-					const brStr = str.replace(/\r\n/g,"<br />")
-					const videoStr = this.replaceAllVideoTagStyles(brStr, "width: 95%; height: 450rpx;display: block;margin:0 auto")
+					// const brStr = str.replace(/\r\n/g,"<br />")
+					const videoStr = this.replaceAllVideoTagStyles(newStr, "width: 95%; height: 450rpx;display: block;margin:0 auto")
 					const imgStr = videoStr.replace(regex, `$1${newStyle}$3`);
 					message.mainBody = imgStr
 					this.form = message
@@ -183,6 +183,7 @@
 	line-height: 1.6;
 	p{
 		width: 100%;
+		
 	}
 	img,image{
 		width: 100% !important;