fix

order/editCourse/editCourse.vue

@@ -240,9 +240,9 @@
 			},
 			// 计算结算价及平台服务费
 			dealSettlePrice(row) {
-				// 如果是试用，结算价和平台服务费都是0
+				// 如果是试用或者没选择，结算价和平台服务费都是0
 				console.log('dealSettlePrice=>', row, this.orderType)
-				if (this.orderType == 2) {
+				if (this.orderType != 1) {
 					row.settlementPrice = 0
 					row.serviceFee = 0
 				} else {

order/orderDetail/orderDetail.vue

@@ -478,8 +478,8 @@
 			// 计算结算价及平台服务费
 			dealSettlePrice(row) {
 				console.log('row==>',row)
-				// 如果是试用，结算价和平台服务费都是0
-				if (this.form.orderType == 2) {
+				// 如果是试用或者没选择，结算价和平台服务费都是0
+				if (this.form.orderType != 1) {
 					row.settlementPrice = 0
 					row.serviceFee = 0
 				} else {

order/productDetail/productDetail.vue

@@ -48,9 +48,10 @@
 				</view>
 				<view class="line">
 					<text class="name">详情介绍：</text>
-					<!-- <view class="val" v-html="form.mall.detailedIntroduction"></view> -->
-					<!-- <mp-html class="val" :content="form.mall.detailedIntroduction"/> -->
-					<text class="val">{{ form.mall.detailedIntroduction }}</text>
+					<!-- <view class="des-html" v-html="form.mall.detailedIntroduction"></view> -->
+					<mp-html class="des-html" :tag-style="mpStyle" :content="form.mall.detailedIntroduction"/>
+					<!-- <rich-text class="des-html" :nodes="form.mall.detailedIntroduction"></rich-text> -->
+					<!-- <text class="val">{{ form.mall.detailedIntroduction }}</text> -->
 				</view>
 			</view>
 		</view>
@@ -138,6 +139,10 @@
 					color: '#fff',
 					selectedBackgroundColor: 'rgba(83, 200, 249,0.9)',
 					selectedBorder: '1px rgba(83, 200, 249,0.9) solid'
+				},
+				mpStyle: {
+					p: 'font-size: 26rpx !important;font-family: Microsoft Yahei !important;',
+					span: 'font-size: 26rpx !important;font-family: Microsoft Yahei !important;'
 				}
 			}
 		},
@@ -164,7 +169,7 @@
 				detailsOfGoods(this.id).then(res => {
 					const e = res.orderDetails
 					e.mall.productIntroduction = this.$util.removeTag(e.mall.productIntroduction)
-					e.mall.detailedIntroduction = this.$util.removeTag(e.mall.detailedIntroduction)
+					// e.mall.detailedIntroduction = this.$util.removeTag(e.mall.detailedIntroduction)
 					this.form = e
 					const pics = this.form.mall.interfaceDiagram
 					if (pics) {
@@ -398,6 +403,14 @@
 			font-weight: 600;
 			white-space: nowrap;
 		}
+		.des-html {
+			width: 100%;;
+			font-size: 28rpx !important;
+		}
+		.rich-text-content span {
+			font-size: 28rpx;
+			color: #f00;
+		}
 	}
 	.pic {
 		width: 100%;

order/products/products.vue

@@ -4,12 +4,17 @@
 			<uni-search-bar class="search" radius="30" placeholder="请输入产品名称" v-model="keyword" clearButton="auto" cancelButton="none" />
 			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
 		</view>
-		<ul class="tab">
-			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">
-				{{ tab.name }}
-				<view v-if="i == 2" :class="['sort', {desc: sort == 2, asc: sort == 5}]"></view>
-			</li>
+		
+		<ul class="tab-wrap">
+			<view class="tab">
+				<li :class="{active: curTab === ''}" @click="tabChange('')">全部</li>
+			</view>
+			
+			<scroll-view scroll-x :scroll-left="scrollLeft" class="tab tab-scroll">
+				<li v-for="(tab, i) in tabs" :key="i" :class="{active: curTab === tab.value}" @click="tabChange(tab.value)">{{ tab.title }}</li>
+			</scroll-view>
 		</ul>
+		
 		<view class="tags">
 			<view v-if="categoryName" class="tag" @click="delCategory">
 				{{ categoryName }}
@@ -119,21 +124,9 @@
 					tagId: ''
 				},
 				tagId: '',
-				curTab: 0,
-				tabs: [
-					{
-						name: '综合排序',
-						id: 0
-					},
-					{
-						name: '热销排行',
-						id: 1
-					},
-					{
-						name: '发布时间',
-						id: 2
-					}
-				],
+				curTab: '',
+				tabs: [],
+				scrollLeft: 0,
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
 				status: 'more', // 上拉加载状态 more|loading|noMore
 				searchTimer: null,
@@ -193,11 +186,12 @@
 				listOfGoods({
 					pageNum: this.page,
 					pageSize: this.pageSize,
-					sort: this.curTab == 2 ? this.sort : this.curTab,
+					sort: 0,
 					isShelves: 0,
 					hotTag: this.form.tagId ? 2 : 1,
 					...this.form,
 					productName: this.keyword,
+					productType: this.curTab
 				}).then(({ page }) => {
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
 					const list = page.records
@@ -233,6 +227,7 @@
 						e.value = e.typeId
 						e.title = e.typeName
 					})
+					this.tabs = res.typeList
 					this.filters[0].data = res.typeList
 				}).catch(e => {})
 				
@@ -295,10 +290,7 @@
 				this.initList()
 			},
 			// tab切换
-			tabChange({ id }) {
-				this.sort = id == 2 ?
-					this.sort == 2 ? 5 : 2
-					: ''
+			tabChange(id) {
 				this.curTab = id
 				this.initList()
 			},
@@ -312,10 +304,14 @@
 </script>
 
 <style scoped lang="scss">
-.tab {
-	li {
-		display: inline-flex;
-		align-items: center;
+.tab-wrap {
+	display: flex;
+	.tab-scroll {
+		width: calc(100% - 100rpx);
+		white-space: nowrap;
+		li {
+			display: inline-block;
+		}
 	}
 }
 .tags {

pages/index/index.vue

@@ -5,7 +5,9 @@
 		<view class="page">
 			<view class="search-wrap">
 				<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="searchConfirm" />
-				<view class="all" @click="toProduct">全部产品</view>
+				<view>
+					<button class="all" type="primary" @click.stop="toProduct">全部产品</button>
+				</view>
 			</view>
 			
 			<view class="block" style="margin-top: 0">
@@ -25,14 +27,16 @@
 			<view class="block">
 				<view class="title-wrap">
 					<view class="title">热销产品</view>
-					<view class="all" @click="toProduct">全部产品</view>
+					<view>
+						<button class="all" type="primary" @click.stop="toProduct">全部产品</button>
+					</view>
 				</view>
 				<view class="list">
 					<view v-for="(item, i) in hotProducts" :key="i" class="item" @click="toDetail(item)">
 						<image class="pic" :src="$util.getIcon(item)"></image>
 						<view class="texts">
 							<view class="name ell">{{ item.productName }}</view>
-							<view class="des ell">{{ item.typeName }}</view>
+							<view class="des ell">{{ item.tagsName }}</view>
 							<view class="meta">{{ item.marketUnitPrice }}元/年</view>
 						</view>
 					</view>
@@ -43,14 +47,16 @@
 			<view class="block" style="margin-top: 40rpx">
 				<view class="title-wrap">
 					<view class="title">官方推荐</view>
-					<view class="all" @click="toProduct">全部产品</view>
+					<view>
+						<button class="all" type="primary" @click.stop="toProduct">全部产品</button>
+					</view>
 				</view>
 				<view class="list">
 					<view v-for="(item, i) in offcialProducts" :key="i" class="item" @click="toDetail(item)">
 						<image class="pic" :src="$util.getIcon(item)"></image>
 						<view class="texts">
 							<view class="name ell">{{ item.productName }}</view>
-							<view class="des ell">{{ item.typeName }}</view>
+							<view class="des ell">{{ item.tagsName }}</view>
 							<view class="meta">{{ item.marketUnitPrice }}元/年</view>
 						</view>
 					</view>
@@ -250,7 +256,7 @@
 }
 .all {
 	font-size: 24rpx;
-	color: #666;
+	border-radius: 20px;
 }
 .block {
 	margin: 20rpx 0;