diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index ebfb681..a6e75de 100644
--- a/order/editCourse/editCourse.vue
+++ b/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 {
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index 390083b..738e5bc 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/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 {
diff --git a/order/productDetail/productDetail.vue b/order/productDetail/productDetail.vue
index 92d82f1..d1b4e4d 100644
--- a/order/productDetail/productDetail.vue
+++ b/order/productDetail/productDetail.vue
@@ -48,9 +48,10 @@
详情介绍：
-
-
- {{ form.mall.detailedIntroduction }}
+
+
+
+
@@ -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%;
diff --git a/order/products/products.vue b/order/products/products.vue
index 52bc295..7377ac3 100644
--- a/order/products/products.vue
+++ b/order/products/products.vue
@@ -4,12 +4,17 @@
-
- -
- {{ tab.name }}
-
-
+
+
+
+ - 全部
+
+
+
+ - {{ tab.title }}
+
+
{{ 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 @@