bug修复

pagesGood/auctionDetail.vue

@@ -99,7 +99,7 @@
 					this.auctionBaseList[2].payTime = '竞拍于 '+res.data.auctionStartTime +' 正式开始!'
 					this.auctionList = res.data.userPriceResVOs.concat(this.auctionBaseList)
 					if (this.price <= this.goodData.currentPrice + this.goodData.auctionMinAddPrice) {
-						this.price = this.goodData.currentPrice + this.goodData.auctionMinAddPrice
+						this.price = (this.goodData.currentPrice + this.goodData.auctionMinAddPrice).toFixed(2)
 					}
 				}).catch(error => {
 					this.$refs.uTips.show({

pagesMain/orderDetail.vue

@@ -173,7 +173,7 @@
 					tenantCode: '',
 					evaluateReplyStatus: 1,
 				},
-				goodType: 1,
+				goodType: 1, // 1是普通商品类型；2是包含自助采摘+普通商品的类型；3是拍卖、共享种植
 				buttonGroup: [],
 				modalShow: false,
 				handleType: '',
@@ -205,7 +205,7 @@
 				}
 				if (this.orderData.merchantInfoResVO.products.length && this.orderData.merchantInfoResVO.products[0].productType !=
 					2 && this.orderData.merchantInfoResVO.products[0].productType != 4) {
-				    if (this.orderData.merchantInfoResVO.products[0].productType != 3) {
+				    if (this.orderData.merchantInfoResVO.products.every(v=>{v.productType != 3})) {
 						this.goodType = 1
 					} else {
 						this.goodType = 3