Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_2.0.0

pagesOrder/detail/components/list.vue

@@ -390,17 +390,6 @@
 	})
 	function returnCanTuiMoney(item) {
 		return props.orderInfo.status == 'unpaid'? item.priceAmount: item.canReturnAmount
-		if (props.orderInfo.status == 'unpaid') {
-			return returnTotalMoney(item)
-		} else {
-			if(props.orderInfo.pointsDiscountAmount>0||props.orderInfo.fullCouponDiscountAmount>0){
-				return item.canReturnAmount
-				// const bili=Math.floor((item.priceAmount/canTuiKuanPrice.value )*100)/100
-				// return Math.floor((allPrice.value)*bili*100)/100
-			}else{
-				return item.priceAmount
-			}
-		}
 	}
 
 	function to2(n) {

pagesOrder/pay-order/pay-order.vue

@@ -482,7 +482,12 @@
 		discount.discount = 100
 		discount.value = 0
 		discount.currentPrice = order.amount
-		const manjianCoup = arr.filter(v => v.type == 1 && v.num >= 1)
+		//强制将满减券数量定为1
+		const manjianCoup = arr.filter(v => v.type == 1 && v.num >= 1).map(v=>{
+			return {
+				...v,num:1
+			}
+		})
 		let productCoup = arr.filter(v => v.type == 2)
 		console.log(productCoup);
 		//商品券分组