优化

ghsApp/src/admin/billing/forwardResult.vue

@@ -1,10 +1,10 @@
 <!--
   退款结果页 / 资金落地 / 返充凭证海报
   用途：
-    1) 无原单退款成功后：选手选「我已线下转账」或「返充到客户余额」
+    1) 无原单退款、线下原单售后成功后：选手选「已线下转账」或「返充到客户余额」
     2) 已返充余额：绘制退款凭证海报
     3) 已原路退回：简单成功提示
-  谁用：freeRefundConfirm、售后详情/列表补发、隔天售后待落地资金。
+  谁用：freeRefundConfirm、refund.vue 线下售后、售后详情/列表补发。
 -->
 <template>
   <view class="forward-result-page">
@@ -100,6 +100,7 @@ export default {
       orderId: 0,
       mode: '',
       payWay: -1,
+      onlinePay: 1,
       hasReturn: 0,
       couldReturn: 1,
       returnBalance: 0,
@@ -135,15 +136,15 @@ export default {
       return `退款成功，金额 ¥${amt}`
     },
     payWayLabel() {
-      const map = {
-        0: '线下微信',
-        1: '线下支付宝',
-        2: '余额',
-        3: '挂账',
-        4: '现金',
-        5: '银行卡'
-      }
-      return map[Number(this.payWay)] || '线下转账'
+      const payWay = Number(this.payWay)
+      const online = Number(this.onlinePay) === 2 ? '线上' : '线下'
+      if (payWay === 0) return online + '微信'
+      if (payWay === 1) return online + '支付宝'
+      if (payWay === 2) return '余额'
+      if (payWay === 3) return '挂账'
+      if (payWay === 4) return '现金'
+      if (payWay === 5) return '银行卡'
+      return '线下转账'
     }
   },
   onLoad(option) {
@@ -175,6 +176,8 @@ export default {
       this.orderId = Number(payload.orderId || 0)
       this.mode = payload.mode || ''
       this.payWay = Number(payload.payWay != null ? payload.payWay : -1)
+      // 1线下 / 2线上，用于微信支付宝通道文案
+      this.onlinePay = Number(payload.onlinePay != null ? payload.onlinePay : 1)
       this.hasReturn = Number(payload.hasReturn || 0)
       this.couldReturn = payload.couldReturn != null ? Number(payload.couldReturn) : 1
       this.returnBalance = Number(payload.returnBalance || 0)
@@ -204,6 +207,7 @@ export default {
         orderId: this.orderId,
         mode: this.mode,
         payWay: this.payWay,
+        onlinePay: this.onlinePay,
         hasReturn: this.hasReturn,
         couldReturn: this.couldReturn,
         returnBalance: this.returnBalance,

ghsApp/src/admin/billing/freeRefundConfirm.vue

@@ -293,6 +293,7 @@ export default {
           forwardId: data.id || 0,
           orderId: 0,
           payWay: data.payWay != null ? data.payWay : that.form.payWay,
+          onlinePay: data.onlinePay != null ? data.onlinePay : 1,
           hasReturn: data.hasReturn != null ? data.hasReturn : 0,
           couldReturn: data.couldReturn != null ? data.couldReturn : 1,
           returnBalance: data.returnBalance != null ? data.returnBalance : 0,
@@ -311,6 +312,7 @@ export default {
             forwardId: payload.forwardId,
             orderId: 0,
             payWay: payload.payWay,
+            onlinePay: payload.onlinePay,
             hasReturn: payload.hasReturn,
             couldReturn: payload.couldReturn,
             returnBalance: payload.returnBalance,

ghsApp/src/admin/billing/freeRefundList.vue

@@ -419,6 +419,7 @@ export default {
         forwardId: item.id || 0,
         orderId: 0,
         payWay: item.payWay,
+        onlinePay: item.onlinePay != null ? item.onlinePay : 1,
         hasReturn: item.hasReturn || 0,
         couldReturn: item.couldReturn != null ? item.couldReturn : 1,
         returnBalance: item.returnBalance || 1,
@@ -449,6 +450,7 @@ export default {
         forwardId: item.id || 0,
         orderId: 0,
         payWay: item.payWay,
+        onlinePay: item.onlinePay != null ? item.onlinePay : 1,
         hasReturn: item.hasReturn || 0,
         couldReturn: item.couldReturn != null ? item.couldReturn : 1,
         returnBalance: item.returnBalance || 0,

ghsApp/src/pagesOrder/refund.vue

@@ -190,10 +190,8 @@
 		<view class="tip-section">
 			<text v-if="orderInfo.onlinePay == 2" class="tip-text online-tip">此单线上付款，提交后，钱会原路自动退回给客户</text>
 			<text v-else-if="orderInfo.payWay == 2" class="tip-text online-tip">此单余额付款，提交后，钱会原路自动退回到客户余额</text>
-			<block v-else>
-				<text v-if="Number(orderInfo.debtPrice)>0" class="tip-text debt-tip">此单为欠款单，提交后，欠款金额会自动减少</text>
-				<text v-else class="tip-text offline-tip">此单线下付款，提交后钱不会原路退回，请线下转账给客户</text>
-			</block>
+			<text v-else-if="orderInfo.payWay == 3 || Number(orderInfo.debtPrice)>0" class="tip-text debt-tip">此单为欠款单，提交后，欠款金额会自动减少</text>
+			<text v-else class="tip-text offline-tip">此单线下付款，提交后请按原支付方式退给客户，并在成功页确认退回方式</text>
 		</view>
 
 		<!-- 底部操作按钮 -->
@@ -363,8 +361,8 @@ export default {
 			if(this.orderInfo.payWay == 2){
 				title = '此单余额付款，提交后钱会原路退回客户余额，确认退款？'
 			}else if(this.orderInfo.onlinePay == 1 && Number(this.orderInfo.debtPrice)<=0){
-				title = '此单线下付款，钱没有原路退回，还要线下转钱给客户，确认知道了？'
-				topTitle = '特别注意！！！'
+				title = '此单线下付款，提交后需按原路线下退给客户，并确认退回方式，确认退款？'
+				topTitle = '确认退款'
 			}
 			that.$util.confirmModal({title:topTitle,content:title},() => {
 				that.submitRefund(that._pendingRefundParams)
@@ -420,8 +418,11 @@ export default {
 						return
 					}
 					const data = res.data || {}
+					// 待确认退回方式：当天/隔天线下等 hasReturn=0 且 couldReturn=1
 					const needFund = Number(data.needFundAction) === 1
-						|| (Number(data.hasReturn) === 0 && Number(data.returnBalance) === 0 && Number(data.sameDay) === 0 && Number(data.couldReturn) === 1)
+						|| (Number(data.hasReturn) === 0
+							&& Number(data.returnBalance) === 0
+							&& Number(data.couldReturn) === 1)
 					const showPoster = Number(data.returnBalance) === 1
 					// 待资金落地或已返充：进结果页
 					if (needFund || showPoster) {
@@ -434,6 +435,7 @@ export default {
 							forwardId: data.id || 0,
 							orderId: data.orderId || that.option.id,
 							payWay: data.payWay != null ? data.payWay : that.orderInfo.payWay,
+							onlinePay: data.onlinePay != null ? data.onlinePay : that.orderInfo.onlinePay,
 							hasReturn: data.hasReturn || 0,
 							couldReturn: data.couldReturn != null ? data.couldReturn : 1,
 							returnBalance: data.returnBalance || 0,

ghsApp/src/pagesOrder/refundAllList.vue

@@ -196,6 +196,7 @@ export default {
         forwardId: refundInfo.id || 0,
         orderId: 0,
         payWay: refundInfo.payWay,
+        onlinePay: refundInfo.onlinePay != null ? refundInfo.onlinePay : 1,
         hasReturn: refundInfo.hasReturn || 0,
         couldReturn: refundInfo.couldReturn != null ? refundInfo.couldReturn : 1,
         returnBalance: refundInfo.returnBalance || 1,

ghsApp/src/pagesOrder/refundDetail.vue

@@ -392,6 +392,7 @@ export default {
 				forwardId: info.id || 0,
 				orderId: orderId,
 				payWay: info.payWay,
+				onlinePay: info.onlinePay != null ? info.onlinePay : 1,
 				hasReturn: info.hasReturn || 0,
 				couldReturn: info.couldReturn != null ? info.couldReturn : 1,
 				returnBalance: info.returnBalance || 0,