优化

ghsApp/src/admin/billing/freeRefund.vue

@@ -165,6 +165,7 @@ export default {
 		this.initData()
 	},
 	methods: {
+		init(){},
 		selectFlowerNumFn() {
 			this.$refs.globalClassImgRef.open('top')
 		},

ghsApp/src/admin/billing/freeRefundConfirm.vue

@@ -195,6 +195,7 @@ export default {
       if (item.userPrice > 0) return parseFloat(item.userPrice).toFixed(2)
       return parseFloat(item.bigPrice || item.price || 0).toFixed(2)
     },
+    init(){},
     getLineAmount(item) {
       const unit = Number(this.getUnitPrice(item))
       const big = Number(item.bigCount) || 0

ghsApp/src/admin/billing/freeRefundDetail.vue

@@ -92,6 +92,7 @@ export default {
     formatMoney(v) {
       return v != null ? parseFloat(v) : 0
     },
+    init(){},
     loadDetail() {
       const id = this.option.id
       if (!id) {

ghsApp/src/admin/billing/freeRefundList.vue

@@ -197,6 +197,7 @@ export default {
     formatMoney(v) {
       return v != null ? parseFloat(v) : 0
     },
+    init(){},
     fundText(item) {
       if (Number(item.sameDay) !== 0) {
         return '常规售后'

ghsApp/src/pagesOrder/detail.vue

@@ -233,9 +233,10 @@
 					<view>过期时间：</view>
 					<view>{{detailInfo.deadline?detailInfo.deadline.substr(5,11):''}}</view>
 				</view>
-				<view v-if="detailInfo.refundLog == 1" class="order-info_box" style="margin-top:40upx;">
+				<!-- 累计退款 = tkPrice + nextDayTkPrice；不单独展示隔天冲销 -->
+				<view v-if="detailInfo.refundLog == 1 || Number(detailInfo.nextDayTkPrice) > 0" class="order-info_box" style="margin-top:40upx;">
 					<view>累计退款：</view>
-					<view style="color:red;font-weight:bold;font-size:30upx;">{{parseFloat(detailInfo.tkPrice)}}</view>
+					<view style="color:red;font-weight:bold;font-size:30upx;">{{ totalTkPrice }}</view>
 					<view class="price" v-if="detailInfo.refundLog==1">
 						<button @click="pageTo({url: '/pagesOrder/refundList',query: {orderSn: detailInfo.orderSn}})" style="color:red;border: 1upx solid red;" class="admin-button-com">售后记录</button>
 					</view>
@@ -386,7 +387,7 @@
 						<div class="detail-price_box" style="font-size: 28upx">¥{{ parseFloat(detailInfo.orderPrice) }}</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.tkPrice > 0" class="line-cell" :hover="false">
-						<div class="tui-title">退款金额</div>
+						<div class="tui-title">当天退款</div>
 						<div class="detail-price_box" style="font-size: 28upx">
 							<text v-if="Number(detailInfo.refundSendCost)>0">（含运费{{detailInfo.refundSendCost?parseFloat(detailInfo.refundSendCost):0}}元）</text>
 							<text v-if="Number(detailInfo.refundPackCost)>0">（含打包费{{detailInfo.refundPackCost?parseFloat(detailInfo.refundPackCost):0}}元）</text>
@@ -442,7 +443,7 @@
 							<view class="detail-price_box" style="font-size: 28upx;" v-else>0</view>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.tkPrice > 0" class="line-cell" :hover="false">
-						<div class="tui-title">退款金额</div>
+						<div class="tui-title">当天退款</div>
 						<div class="detail-price_box" style="font-size: 28upx">
 							<text v-if="Number(detailInfo.refundSendCost)>0">（含运费{{detailInfo.refundSendCost?parseFloat(detailInfo.refundSendCost):0}}元）</text>
 							<text v-if="Number(detailInfo.refundPackCost)>0">（含打包费{{detailInfo.refundPackCost?parseFloat(detailInfo.refundPackCost):0}}元）</text>
@@ -792,6 +793,12 @@ export default {
 	},
 	computed: {
 		...mapGetters({ loginInfo: "getLoginInfo",dictInfo:"getDictionariesInfo" }),
+		/** 累计退款展示：tkPrice + nextDayTkPrice（价格明细「当天退款」只用 tkPrice，因影响 actPrice） */
+		totalTkPrice() {
+			const day = Number(this.detailInfo.tkPrice) || 0
+			const next = Number(this.detailInfo.nextDayTkPrice) || 0
+			return parseFloat((day + next).toFixed(2))
+		},
 	},
 	onShareAppMessage(res) {
 		const purchaseId = this.detailInfo.purchaseId || 0

ghsApp/src/pagesOrder/refundList.vue

@@ -9,6 +9,10 @@
               <text>操作：{{item.shopAdminName}}</text>
               <text>原因：{{ item.cause==0?'质量问题' : item.cause==1 ?'多开错开': item.cause==2 ? '打包原因' : item.cause==3 ? '物流原因' : '其它'}}</text>
               <text>类型：{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
+              <!-- sameDay=0 隔天售后，否则当天售后 -->
+              <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
+                售后类型：{{ Number(item.sameDay) === 0 ? '隔天售后' : '当天售后' }}
+              </text>
               <text v-if="!$util.isEmpty(item.remark)">备注：{{item.remark}}</text>
 
               <text style="position:absolute;right:-425upx;top:0upx;">{{ item.status==0?'待审核':item.status==1?'已通过':item.status==2?'已驳回':item.status==3 ? '已取消':'' }}</text>    

hdApp/src/pagesPurchase/purDetails.vue

@@ -122,18 +122,14 @@
           <view>{{ getSendStatusText(detailInfo.sendStatus) }}</view>
         </view>
 
-        <view v-if="detailInfo.refundLog && detailInfo.refundLog == 1" class="order-info_box">
-          <view>当天退款：</view>
-          <view style="color:red;font-weight:bold;font-size:30upx;">¥{{detailInfo.tkPrice?parseFloat(detailInfo.tkPrice):0}}</view>
+        <!-- 累计退款 = tkPrice + nextDayTkPrice；不单独展示隔天冲销 -->
+        <view v-if="(detailInfo.refundLog && detailInfo.refundLog == 1) || Number(detailInfo.nextDayTkPrice) > 0" class="order-info_box">
+          <view>累计退款：</view>
+          <view style="color:red;font-weight:bold;font-size:30upx;">¥{{ totalTkPrice }}</view>
             <view class="price" v-if="detailInfo.refundLog && detailInfo.refundLog == 1">
               <button @click="pageTo({url: '/pagesPurchase/refundList?id='+detailInfo.id})" class="admin-button-com">售后记录</button>
             </view>
         </view>
-        <!-- 隔天冲销累计（不影响实付） -->
-        <view v-if="Number(detailInfo.nextDayTkPrice) > 0" class="order-info_box">
-          <view>隔天冲销：</view>
-          <view style="color:#e67e22;font-weight:bold;font-size:30upx;">¥{{parseFloat(detailInfo.nextDayTkPrice)}}</view>
-        </view>
         <view v-if="detailInfo.refundLog && detailInfo.refundLog == 1" class="order-info_box">
           <view>退款方式：</view>
           <view style="color:red;font-weight:bold;font-size:30upx;">{{detailInfo.tkExplain||''}}</view>
@@ -252,7 +248,7 @@
             <div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.orderPrice?parseFloat(detailInfo.orderPrice):0}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.tkPrice > 0">
-            <div class="tui-title">退款金额</div>
+            <div class="tui-title">当天退款</div>
             <div class="detail-price_box" style="font-size: 28upx;">-¥{{ detailInfo.tkPrice?parseFloat(detailInfo.tkPrice):0}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.orderReachDiscountPrice > 0">
@@ -404,7 +400,13 @@ export default {
 			})
 	},
   computed: {
-    ...mapGetters({loginInfo:"getLoginInfo"})
+    ...mapGetters({loginInfo:"getLoginInfo"}),
+    /** 累计退款展示：tkPrice + nextDayTkPrice（价格明细「当天退款」只用 tkPrice，因影响 actPrice） */
+    totalTkPrice() {
+      const day = Number(this.detailInfo.tkPrice) || 0
+      const next = Number(this.detailInfo.nextDayTkPrice) || 0
+      return parseFloat((day + next).toFixed(2))
+    }
   },
 	watch: {
 		loginInfo(newVal) {

hdApp/src/pagesPurchase/refundList.vue

@@ -8,6 +8,10 @@
               <text>单号：{{item.orderSn}}</text>
               <text>操作：{{item.shopAdminName}}</text>
               <text>类型：{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
+              <!-- sameDay=0 隔天售后，否则当天售后 -->
+              <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
+                售后类型：{{ Number(item.sameDay) === 0 ? '隔天售后' : '当天售后' }}
+              </text>
               <text style="position:absolute;right:-425upx;top:0upx;">{{ item.status==0?'待审核':item.status==1?'已通过':item.status==2?'已驳回':item.status==3?'已取消':'' }}</text>    
           </view>
           <view class="flex val">{{parseFloat(item.refundPrice)}} <view class="iconfont iconxiangyou"></view> </view>