shish 16 часов назад
Родитель
Сommit
a5d86eccdc
2 измененных файлов с 20 добавлено и 3 удалено
  1. 2 2
      ghsApp/src/components/forward-options-popup.vue
  2. 18 1
      ghsApp/src/pagesArrears/detailsItem.vue

+ 2 - 2
ghsApp/src/components/forward-options-popup.vue

@@ -84,8 +84,8 @@ export default {
 .tip {
 .tip {
 	font-size: 38upx;
 	font-size: 38upx;
 	color: #666;
 	color: #666;
-	line-height: 1.5;
-	margin-bottom: 40upx;
+	line-height: 1.6;
+	margin-bottom: 60upx;
 }
 }
 .btns {
 .btns {
 	display: flex;
 	display: flex;

+ 18 - 1
ghsApp/src/pagesArrears/detailsItem.vue

@@ -16,10 +16,17 @@
 			<view class="item-row">
 			<view class="item-row">
 				<view :class="[Number(info.debtPrice)>Number(info.remainDebtPrice) ? 'price-del' : 'price']">¥{{ parseFloat(info.debtPrice || info.remainDebtPrice) }}</view>
 				<view :class="[Number(info.debtPrice)>Number(info.remainDebtPrice) ? 'price-del' : 'price']">¥{{ parseFloat(info.debtPrice || info.remainDebtPrice) }}</view>
 			</view>
 			</view>
+			<!-- 售后退款单独成行:当天 / 隔天,对齐 pagesGys/detailsItem -->
+			<view class="item-row" v-if="Number(info.tkPrice)>0">
+				<view class="refund-tip refund-tip-same">当天售后已退¥{{info.tkPrice?parseFloat(info.tkPrice):0}}</view>
+			</view>
+			<view class="item-row" v-if="Number(info.nextDayTkPrice)>0">
+				<view class="refund-tip refund-tip-next">隔天售后已退¥{{parseFloat(info.nextDayTkPrice)}}</view>
+			</view>
 			<view class="item-row" v-if="!$util.isEmpty(info.remark)">
 			<view class="item-row" v-if="!$util.isEmpty(info.remark)">
 				<view class="remark">{{ info.remark }}</view>
 				<view class="remark">{{ info.remark }}</view>
 			</view>
 			</view>
-			<view class="item-row" v-if="Number(info.debtPrice)>Number(info.remainDebtPrice)">
+			<view class="item-row" v-if="Number(info.debtPrice)>Number(info.remainDebtPrice) && Number(info.clearId)>0">
 				<view class="price" style="color:red;">已清 ¥{{ info.hasPayDebt }},剩余待结 ¥{{ parseFloat(info.remainDebtPrice) }}</view>
 				<view class="price" style="color:red;">已清 ¥{{ info.hasPayDebt }},剩余待结 ¥{{ parseFloat(info.remainDebtPrice) }}</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -146,6 +153,16 @@ export default {
 			color: #333333;
 			color: #333333;
 			text-decoration: line-through;
 			text-decoration: line-through;
 		}
 		}
+		.refund-tip {
+			font-size: 26upx;
+			font-weight: normal;
+		}
+		.refund-tip-same {
+			color: red;
+		}
+		.refund-tip-next {
+			color: #e67e22;
+		}
 	}
 	}
 }
 }
 </style>
 </style>