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

pagesOrder/detail/components/list.vue

@@ -389,7 +389,7 @@
 		return seatFee
 	})
 	function returnCanTuiMoney(item) {
-		return item.canReturnAmount
+		return props.orderInfo.status == 'unpaid'? item.priceAmount: item.canReturnAmount
 		if (props.orderInfo.status == 'unpaid') {
 			return returnTotalMoney(item)
 		} else {
@@ -528,10 +528,12 @@
 
 	})
 	const allPrice = computed(() => {
+		
+		
 		const goodsPrice = props.data.reduce((prve, cur) => {
 			const curTotal = cur.info.reduce((a,
 				b) => {
-				return a + b.canReturnAmount*1
+				return a +(props.orderInfo.status == 'unpaid'?b.priceAmount:b.canReturnAmount*1) 
 			}, 0)
 			return prve + curTotal
 		}, 0)