结账流程

hdApp/src/admin/billing/toPay.vue

@@ -90,11 +90,6 @@ export default {
         }
       })
     }
-
-    //在微信端，主动发起扫码
-    // #ifdef MP-WEIXIN
-    this.beginScan()
-    // #endif
   },
   methods: {
     gotoOrderDetail() {

hdApp/src/admin/order/refund.vue

@@ -2,9 +2,13 @@
 	<view class="refund-page">
 
 		<!-- 红色提示信息 -->
-		<view class="warning-tip" v-if="addMinusOrder==1">
+		<view class="warning-tip" v-if="minusOrderRefund == 1">
 			<view class="warning-icon">⚠</view>
-			<text class="warning-text">订单已结账，只能开负数订单进行售后</text>
+			<text class="warning-text" v-if="minusOrderReason == 1">已过可售后时间，只能开负数订单售后</text>
+			<text class="warning-text"v-else>
+				<block v-if="Number(orderInfo.remainDebtPrice)<=0">订单已结账，只能开负数订单售后</block>
+				<block v-else>订单已部分结账，只能开负数订单售后</block>
+			</text>
 		</view>
 
 		<!-- 退款方式选择卡片 -->
@@ -167,7 +171,7 @@
 		<!-- 底部操作按钮 -->
 		<view class="bottom-actions">
 			<button class="action-btn cancel-btn" @tap="cancelRefund">取消</button>
-			<button class="action-btn confirm-btn" @tap="confirmRefund">退款</button>
+			<button class="action-btn confirm-btn" @tap="askRefund">退款</button>
 		</view>
 
 		<!-- 退款确认弹框 -->
@@ -187,13 +191,13 @@
 						<text class="amount-value">¥{{refundMoney}}</text>
 					</view>
 					<view class="confirm-text">
-						<text v-if="addMinusOrder == 0">确认要退款吗？</text>
-						<text v-else>确认要开负数订单退款吗？</text>
+						<text v-if="minusOrderRefund == 0">确认要退款吗？</text>
+						<text v-else>确认开负数订单退款吗？</text>
 					</view>
 				</view>
 				<view class="modal-actions">
 					<button class="modal-btn cancel-modal-btn" @tap="cancelRefundModal">取消</button>
-					<button class="modal-btn confirm-modal-btn" @tap="executeRefund" v-if="addMinusOrder == 0">确认退款</button>
+					<button class="modal-btn confirm-modal-btn" @tap="executeRefund" v-if="minusOrderRefund == 0">确认退款</button>
 					<button class="modal-btn confirm-modal-btn" @tap="executeRefund" v-else>确认开单退款</button>
 				</view>
 			</view>
@@ -216,7 +220,8 @@ export default {
 			orderInfo:{},
 			coundRefundPrice:0,
 			showRefundModal: false,
-			addMinusOrder:0,//开负数订单售后 0不是 1是
+			minusOrderRefund:0,//0表示按正常流程售后，1表示开负数订单售后
+			minusOrderReason:0,//只能开负数订单的几种情况：0、开的欠款单，并且已经全部或者部分结清，1、可售后时间到了
 		};
 	},
 
@@ -266,6 +271,18 @@ export default {
 		cancelRefund(){
 			uni.navigateBack({delta: 1});
 		},
+		askRefund(){
+			this.minusOrderRefund = 0
+			if(this.orderInfo.payWay == 3 && Number(this.refundMoney)>Number(this.orderInfo.remainDebtPrice)){
+				//如果退款金额大于剩余欠款，则提醒走开负数订单方式退款
+				this.$util.confirmModal({content:'售后金额超过剩余欠款，只能开负数订单方式售后'},() => {
+					this.minusOrderRefund = 1
+					this.confirmRefund()
+				})
+			}else{
+				this.confirmRefund()
+			}
+		},
 		confirmRefund(){
 			let hasError = false
 			let selectProduct = []
@@ -372,9 +389,9 @@ export default {
 			const res = await getDetail({ id: this.option.id})
 			this.orderInfo = res.data
 			
-			if(this.orderInfo.payWay == 3 && Number(this.orderInfo.remainDebtPrice)<=0){
-				this.addMinusOrder = 1
-			}
+
+			this.minusOrderRefund = this.orderInfo.minusOrderRefund?this.orderInfo.minusOrderRefund:0
+			this.minusOrderReason = this.orderInfo.minusOrderReason?this.orderInfo.minusOrderReason:0
 
 			this.coundRefundPrice = Number(res.data.orderPrice) - Number(res.data.tkPrice)
 			this.coundRefundPrice = this.coundRefundPrice.toFixed(2)