dabeng 3 週間 前
コミット
95cae9f3a4

+ 4 - 1
pages/merchantDish/orders/refund-details.vue

@@ -41,7 +41,7 @@
 						<text class="refund-label">退款金额</text>
 						<text class="refund-currency">¥</text>
 						<text class="refund-value">{{ formatMoney(refundAmount) }}</text>
-						<text class="refund-note">不包含餐盒费</text>
+						<text v-if="containerFeeExcluded" class="refund-note">不包含餐盒费</text>
 					</view>
 				</view>
 			</view>
@@ -175,6 +175,9 @@ export default {
 			if (this.product.boxFee != null) return this.product.boxFee
 			return Number(this.product.boxPrice || 0) * this.quantity
 		},
+		containerFeeExcluded() {
+			return this.product.containerFeeExcluded === true
+		},
 		userPhone() {
 			return this.product.phone || this.product.maskedPhone || this.product.mobile || ''
 		},

+ 5 - 2
pages/merchantDish/orders/refund-record.vue

@@ -36,7 +36,7 @@
 						<text class="refund-label">退款金额</text>
 						<text class="refund-currency">¥</text>
 						<text class="refund-value">{{ formatMoney(refundAmount) }}</text>
-						<text class="refund-note">不包含餐盒费</text>
+						<text v-if="containerFeeExcluded" class="refund-note">不包含餐盒费</text>
 					</view>
 				</view>
 			</view>
@@ -189,11 +189,14 @@ export default {
 			if (this.data.boxFee != null) return this.data.boxFee
 			return Number(this.data.boxPrice || 0) * this.quantity
 		},
+		containerFeeExcluded() {
+			return this.data.containerFeeExcluded === true
+		},
 		userPhone() {
 			return this.data.phone || this.data.maskedPhone || this.data.mobile || ''
 		},
 		showActions() {
-			return this.data.orderStatusName === '售后申请中' || Number(this.data.fundStatus) === 2
+			return this.data.merchantReviewable === true
 		}
 	},
 	onLoad(query) {