修复当支付金额为0时，抵扣券选中后会变不可用

pagesOrder/index/compoents/order-item.vue

@@ -48,7 +48,7 @@
 										</view>
 									</view>
 								</template>
-								<template v-else-if="data.isMember&&data.memberId&&item.memberPrice&&item.memberPrice!=item.price">
+								<template v-else-if="item.isMember&&data.memberId&&item.memberPrice&&item.memberPrice!=item.price">
 									<view class="u-text-right u-relative" :style="computedPriceStyle()">
 										<text class="line-th">￥{{goodsPriceAmount(item)}}</text>
 										<view class="u-absolute" style="bottom: 100%;right: 0;">
@@ -164,7 +164,7 @@
 	}
 
 	function goodsVipPriceAmount(item) {
-		const price = (props.data.memberId&&item.isMember) ? item.memberPrice : item.price
+		const price = item.memberPrice ? item.memberPrice : item.price
 		return (price * item.num).toFixed(2)
 	}
 	// const packeFee=computed(()=>{

pagesOrder/pay-order/pay-order.vue

@@ -46,9 +46,16 @@
 								<view class="u-m-l-18">{{item.name}}</view>
 								<view class="u-m-l-18 color-999">x{{item.num}}</view>
 							</view>
-							<view class="color-red">
-								-￥{{item.discountAmount}}
+							<view class="u-flex">
+								<view class="color-red">
+									-￥{{item.discountAmount}}
+								</view>
+								<view class="u-m-l-12" @click="delQuan(index)">
+									<up-icon :size="16" name="minus-circle-fill" color="rgb(255, 0, 0)"></up-icon>
+								</view>
 							</view>
+
+
 						</view>
 					</view>
 
@@ -196,7 +203,8 @@
 		<edit-discount @confirm="editDiscountConfirm" title="优惠金额" :ref="setModel" name="editMoney"
 			:price="order.amount"></edit-discount>
 
-		<edit-accountPoints @confirm="pointsConfirm" :price="accountPoints.num" :accountPoints="accountPoints" ref="refPoints"></edit-accountPoints>
+		<edit-accountPoints @confirm="pointsConfirm" :price="accountPoints.num" :accountPoints="accountPoints"
+			ref="refPoints"></edit-accountPoints>
 	</view>
 </template>
 
@@ -227,13 +235,19 @@
 	import editDiscount from '@/components/my-components/edit-discount.vue'
 	import editAccountPoints from './components/edit-accountPoints.vue'
 	import {
-		returnGoodsPayPriceMap,returnProCoupStartIndex ,returnProductCoupAllPrice,returnProductCanUseNum
+		returnGoodsPayPriceMap,
+		returnProCoupStartIndex,
+		returnProductCoupAllPrice,
+		returnProductCanUseNum
 	} from '../quan_util.js'
 	//商品数量从0到n每一个对应的价格
-	let $goodsPayPriceMap={}
-	
-	const refPoints = ref(null)
+	let $goodsPayPriceMap = {}
 
+	const refPoints = ref(null)
+	
+	function delQuan(i){
+		pays.quan.splice(i,1)
+	}
 	function refPointsOpen() {
 		if (!accountPoints.calcRes.usable && accountPoints.sel) {
 			return
@@ -251,8 +265,9 @@
 		},
 		price: 0
 	})
-	function pointsConfirm(e){
-		accountPoints.num=e
+
+	function pointsConfirm(e) {
+		accountPoints.num = e
 	}
 	async function calcUsablePoints() {
 		if (!order.memberId) {
@@ -308,7 +323,7 @@
 		go.to('PAGES_ORDER_QUAN', {
 			orderId: order.id,
 			memberId: order.memberId,
-			orderPrice: payPrice.value*1+coupAllPrice.value*1
+			orderPrice: payPrice.value * 1 + coupAllPrice.value * 1
 		})
 	}
 	async function discountShow() {
@@ -395,33 +410,35 @@
 		uni.$off('choose-quan')
 		uni.$on('choose-quan', (arr) => {
 			console.log(arr);
-			const manjianCoup = arr.filter(v => v.type == 1&&v.num>=1)
+			const manjianCoup = arr.filter(v => v.type == 1 && v.num >= 1)
 			let productCoup = arr.filter(v => v.type == 2)
 			console.log(productCoup);
 			//商品券分组
-			let coupMap={}
-			for(let i in productCoup){
-				const coup=productCoup[i]
-				if(coupMap.hasOwnProperty(coup.proId)){
+			let coupMap = {}
+			for (let i in productCoup) {
+				const coup = productCoup[i]
+				if (coupMap.hasOwnProperty(coup.proId)) {
 					coupMap[coup.proId].push(coup)
-				}else{
-					coupMap[coup.proId]=[coup]
+				} else {
+					coupMap[coup.proId] = [coup]
 				}
 			}
 			console.log(coupMap);
-			for(let key in coupMap){
-				const arr=coupMap[key]
-				for(let i in arr){
-					const coup=arr[i]
-					const proCoupStartIndex=returnProCoupStartIndex(arr,i)
+			for (let key in coupMap) {
+				const arr = coupMap[key]
+				for (let i in arr) {
+					const coup = arr[i]
+					const proCoupStartIndex = returnProCoupStartIndex(arr, i)
 					console.log(proCoupStartIndex);
-					const coupUseNum=returnProductCanUseNum($goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num)
-					const num=Math.min($goodsPayPriceMap[coup.proId].length,coupUseNum)
-					coup.num=num
-					coup.discountAmount=returnProductCoupAllPrice($goodsPayPriceMap[coup.proId],proCoupStartIndex,num).toFixed(2)
+					const coupUseNum = returnProductCanUseNum($goodsPayPriceMap[coup.proId], proCoupStartIndex,
+						coup.num)
+					const num = Math.min($goodsPayPriceMap[coup.proId].length, coupUseNum)
+					coup.num = num
+					coup.discountAmount = returnProductCoupAllPrice($goodsPayPriceMap[coup.proId],
+						proCoupStartIndex, num).toFixed(2)
 				}
 			}
-			productCoup=productCoup.filter(v=>v.num>=1)
+			productCoup = productCoup.filter(v => v.num >= 1)
 			console.log(productCoup);
 			pays.quan = [...manjianCoup, ...productCoup]
 		})
@@ -588,7 +605,7 @@
 	async function init() {
 		const orderRes = await orderApi.tbOrderInfoDetail(order.orderId)
 		Object.assign(order, orderRes)
-		$goodsPayPriceMap=returnGoodsPayPriceMap(order.detailList)
+		$goodsPayPriceMap = returnGoodsPayPriceMap(order.detailList)
 		console.log($goodsPayPriceMap);
 		if (orderRes.memberId) {
 			calcUsablePoints()

pagesOrder/quan/quan.vue

@@ -315,13 +315,21 @@
 			memberId: option.memberId
 		})
 		canDikouGoodsArr = returnNewGoodsList(order.value.detailList || [])
-		res.fullReductionCoupon = res.fullReductionCoupon.filter((v) => v.use && option.orderPrice * 1 >= v
-			.fullAmount * 1)
+		res.fullReductionCoupon = res.fullReductionCoupon.filter((v) => {
+			if(option.orderPrice<=0){
+				return false
+			}else{
+				return v.use && option.orderPrice * 1 >= v
+				.fullAmount * 1
+			}
+			
+		})
 		res.productCoupon = res.productCoupon.map(v => {
 			const calcCoup = returnProductCoupon(v, canDikouGoodsArr, user.value)
 			return {
 				...calcCoup,
-				checked: false
+				checked: false,
+				use:option.orderPrice<=0?false:v.use
 			}
 		}).filter((v) => v.use);
 		$fullReductionCoupon = res.fullReductionCoupon

pagesOrder/quan_util.js

@@ -230,4 +230,20 @@ export function returnCanUseFullReductionCoupon(coupArr, payPrice, selCoup) {
 			use: v.use && isfullAmount
 		}
 	})
+}
+
+//根据商品数量还有商品券数量返回优惠券可以使用的数量数组
+export function  returnCanUseNumProductCoup(coupArr,){
+	let productCoup = coupArr.filter(v => v.type == 2)
+	//商品券分组
+	let coupMap={}
+	for(let i in productCoup){
+		const coup=productCoup[i]
+		if(coupMap.hasOwnProperty(coup.proId)){
+			coupMap[coup.proId].push(coup)
+		}else{
+			coupMap[coup.proId]=[coup]
+		}
+	}
+	return arr
 }