shish 1 zi în urmă
părinte
comite
c92aeb49f6

+ 9 - 13
ghsApp/src/admin/billing/freeRefundList.vue

@@ -266,20 +266,16 @@ export default {
       if (Number(item.status) === 1) return '待确认'
       return '-'
     },
-    /** 原路通道:售后单 payWay 快照 */
+    /** 原路通道:与 refundDetail 一致,微信/支付宝区分线上线下 */
     payWayText(item) {
-      const map = {
-        0: '线下微信',
-        1: '线下支付宝',
-        2: '余额',
-        3: '挂账',
-        4: '现金',
-        5: '银行卡'
-      }
-      const pw = Number(item && item.payWay)
-      if (map[pw] != null) {
-        return map[pw]
-      }
+      const payWay = Number(item && item.payWay)
+      const online = Number(item && item.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 '-'
     },
     statusText(status) {

+ 1 - 3
ghsApp/src/pagesOrder/refund.vue

@@ -411,7 +411,7 @@ export default {
 		},
 		submitRefund(refundParams) {
 			const that = this
-			uni.showLoading({title: "提交中",mask:true})
+			uni.showLoading({title: "提交中"})
 			refund(refundParams).then(res => {
 				uni.hideLoading()
 				if(res.code == 1){
@@ -451,8 +451,6 @@ export default {
 					}
 					that.$util.pageTo({url: '/pagesOrder/refundSuccess?id='+(data.id||''),type:2})
 				}
-			}).catch(() => {
-				uni.hideLoading()
 			})
 		},
 		needCancelRemind(id){