会员修复

pages/order/components/orderInfo.vue

@@ -474,7 +474,9 @@
 		})
 		Object.assign(pointsRes, res)
 		maxPointDiscount.value = res.maxDeductionAmount
+		if(usePoints.value){
 			cartStore.setUserPoints(res.maxUsablePoints || 0)
+		}
 		console.log('getMaxPointsDiscount:cartStore.orderCostSummary.pointUsed', cartStore.orderCostSummary.pointUsed);
 	}
 	watch(() => maxMoney.value, (newval) => {

pages/order/confirm-order.vue

@@ -221,10 +221,9 @@
 		if (newval && newval.id) {
 			disablePayType.value = ['余额支付']
 			paymentMethodref.value.groupChanges(2)
-		} else {
+			return
-			disablePayType.value = []
 		} 
-		
+		console.log('orderVIP.value.amount',orderVIP.value.amount);
 		if (!orderVIP.value.amount) {
 			disablePayType.value = ['余额支付']
 			if (paymentMethodref.value) {

user/vip/buy-vip.vue

@@ -146,7 +146,8 @@
 	import {
 		ref,
 		reactive,
-		computed
+		computed,
+		watch
 	} from "vue"
 	import {
 		joinMember,
@@ -195,14 +196,14 @@
 		openType: 'CONDITION'
 	})
 	
-	const pay_menus = ref([{
+	const $pay_menus=[{
 			name: '赠送成长值',
 			desc: '赠送成长值',
 			icon: '/user/static/buy-vip/Frame_220.png',
 		},
 		{
 			name: '优惠券',
-			desc: '每月赠送2张优惠券',
+			desc: '',
 			icon: '/user/static/buy-vip/Frame_221.png'
 		},
 		{
@@ -212,7 +213,7 @@
 		},
 		{
 			name: '会员折扣',
-			desc: '全店折扣98折',
+			desc: '',
 			icon: '/user/static/buy-vip/Frame_223.png'
 		},
 		{
@@ -225,7 +226,9 @@
 			desc: '',
 			icon: '/user/static/buy-vip/Frame_225.png'
 		}
-	])
+	]
+	
+	const pay_menus = ref($pay_menus)
 
 	let tiaojian_menus =ref( [{
 			name: '享会员价',
@@ -295,7 +298,7 @@
 		if (res) {
 			if(!res.memberConfig.isMemberPrice){
 				tiaojian_menus.value=tiaojian_menus.value.filter(v=>v.name!='享会员价')
-				pay_menus.value=pay_menus.value.filter(v=>v.name!='享会员价')
+				pay_menus.value=$pay_menus.filter(v=>v.name!='享会员价')
 			}
 			if (res.memberConfig.isSubmitInfo && (shopUserInfo.value.sex === null || shopUserInfo.value.sex ===
 					undefined || !shopUserInfo.value.nickName || !shopUserInfo.value.birthDay || !shopUserInfo.value
@@ -319,8 +322,9 @@
 			configList.value = res.memberConfig.configList
 
 			Object.assign(state, res.memberConfig)
-			memberLevel.value = res.memberLevel
+			const first_lv=(res.memberLevelList||[])[0]
-
+			memberLevel.value = res.memberLevel||first_lv
+			filterPay_menus()
 		}
 	}
 	const returnReward = computed(() => {
@@ -389,6 +393,36 @@
 			},1000)
 		}
 	}
+	//过滤掉部分未开启的菜单相
+	function filterPay_menus(){
+		pay_menus.value=$pay_menus.filter(v=>{
+			if(!state.isMemberPrice&&v.name=='享会员价'){
+				return false
+			}
+			if (state.isSubmitInfo && (shopUserInfo.value.sex === null || shopUserInfo.value.sex ===
+					undefined || !shopUserInfo.value.nickName || !shopUserInfo.value.birthDay || !shopUserInfo.value
+					.phone)) {
+				memberOpen.value = true;
+			}
+			const viplv= configList.value[vipSel.value]
+			if(viplv.couponList.length==0&&v.name=='优惠券'){
+				return false
+			}
+			if((!memberLevel.value||!memberLevel.value.isCostRewardPoints)&&v.name=='消费送积分'){
+				return false
+			}
+			if((!memberLevel.value||!memberLevel.value.isCycleReward)&&v.name=='周期福利'){
+				return false
+			}
+			return true
+		})
+	}
+	watch(()=>vipSel.value,(newval,oldval)=>{
+		console.log('vipSel.value',newval);
+		filterPay_menus()
+		
+	})
+	
 </script>
 
 

user/vip/vip.vue

@@ -47,7 +47,8 @@
 						</view>
 						<view class="font-14 color-333 text-center u-m-t-4 u-flex u-flex-center">
 							<text class="no-wrap u-m-r-4">{{ item.name }}</text>
-							<up-icon @click="modelShow(item.name)" size="12" name="question-circle" color="#333" v-if="showQuestion(index)"></up-icon>
+							<up-icon @click="modelShow(item.name)" size="12" name="question-circle" color="#333"
+								v-if="showQuestion(index)"></up-icon>
 						</view>
 						<view class="font-12 color-666 text-center">{{ item.desc }}</view>
 					</view>
@@ -78,34 +79,44 @@
 </template>
 
 <script setup>
-import dayjs from 'dayjs';
+	import dayjs from 'dayjs';
-import { onLoad } from '@dcloudio/uni-app';
+	import {
-import * as vipApi from '@/common/api/market/vip.js';
+		onLoad
-import { APIusershopInfodetail, APIshopUserInfo } from '@/common/api/member.js';
+	} from '@dcloudio/uni-app';
-import { ref, reactive, computed } from 'vue';
+	import * as vipApi from '@/common/api/market/vip.js';
-const model = reactive({
+	import {
+		APIusershopInfodetail,
+		APIshopUserInfo
+	} from '@/common/api/member.js';
+	import {
+		ref,
+		reactive,
+		computed
+	} from 'vue';
+	const model = reactive({
 		show: false,
 		title: ''
-});
+	});
 
-function modelHide() {
+	function modelHide() {
 		model.show = false;
-}
+	}
 
-function toXufei() {
+	function toXufei() {
 		uni.navigateTo({
 			url: '/user/vip/buy-vip?shopId=' + option.shopId
 		});
-}
+	}
 
-function modelShow(name) {
+	function modelShow(name) {
 		if (name == '消费送积分') {
 			model.title = '消费送积分';
 			modelContent.value = `每消耗1元赠送${memberLevel.value.costRewardPoints}积分`;
 		}
 		if (name == '周期福利') {
 			model.title = '周期福利';
-		modelContent.value = `每${memberLevel.value.cycleUnit}赠送${memberLevel.value.cycleRewardPoints}积分,${memberLevel.value.cycleRewardCouponList.length}张优惠券`;
+			modelContent.value =
+				`每${memberLevel.value.cycleUnit}赠送${memberLevel.value.cycleRewardPoints}积分,${memberLevel.value.cycleRewardCouponList.length}张优惠券`;
 		}
 		if (name == '会员说明') {
 			model.title = '会员说明';
@@ -116,21 +127,20 @@ function modelShow(name) {
 			modelContent.value = memberLevel.value.remark || '';
 		}
 		model.show = true;
-}
+	}
-const modelContent = ref(``);
+	const modelContent = ref(``);
-const state = reactive({
+	const state = reactive({
 		openType: 'CONDITION'
-});
+	});
 
-let pay_menus = [
+	let pay_menus = [{
-	{
 			name: '赠送成长值',
 			desc: '',
 			icon: '/user/static/Frame_220.png'
 		},
 		{
 			name: '优惠券',
-		desc: '每月赠送2张优惠券',
+			desc: '',
 			icon: '/user/static/Frame_221.png'
 		},
 		{
@@ -153,10 +163,9 @@ let pay_menus = [
 			desc: '',
 			icon: '/user/static/Frame_225.png'
 		}
-];
+	];
 
-let tiaojian_menus = [
+	let tiaojian_menus = [{
-	{
 			name: '享会员价',
 			desc: '全店会员价',
 			icon: '/user/static/Frame_222.png'
@@ -176,38 +185,38 @@ let tiaojian_menus = [
 			desc: '',
 			icon: '/user/static/Frame_225.png'
 		}
-];
+	];
 
-const menus = ref([]);
+	const menus = ref([]);
 
-function showQuestion(index) {
+	function showQuestion(index) {
 		const len = menus.value.length;
 		if (index >= len - 2) {
 			return true;
 		}
 		return false;
-}
+	}
 
-function back() {
+	function back() {
 		uni.navigateBack();
-}
+	}
 
-const option = reactive({
+	const option = reactive({
 		shopId: ''
-});
+	});
 
-const memberLevel = ref(null);
+	const memberLevel = ref(null);
-const shopInfo = reactive({});
+	const shopInfo = reactive({});
-const shopUserInfo = ref({});
+	const shopUserInfo = ref({});
-const memberLevelList = ref([]);
+	const memberLevelList = ref([]);
-onLoad((opt) => {
+	onLoad((opt) => {
 		Object.assign(option, opt);
 		console.log(option);
 		let shopId = option.shopId;
 		init(shopId);
-});
+	});
-const expProgress = ref(0);
+	const expProgress = ref(0);
-async function init(shopId) {
+	async function init(shopId) {
 		const userRes = await APIshopUserInfo({
 			shopId
 		});
@@ -224,12 +233,30 @@ async function init(shopId) {
 			shopId: shopId
 		});
 		if (res) {
+			res.memberLevel.cycleRewardCouponList = res.memberLevel.cycleRewardCouponList || []
+			res.memberLevel = res.memberLevel || {}
 			Object.assign(state, res.memberConfig);
 			memberLevelList.value = res.memberLevelList;
-		pay_menus = pay_menus.map((v) => {
+			pay_menus = pay_menus.filter(v => {
+				if (!res.memberLevel.isCostRewardPoints && v.name == '消费送积分') {
+					return false
+				}
+				if (!res.memberLevel.isCycleReward && v.name == '周期福利') {
+					return false
+				}
+				if (!res.memberLevel.cycleRewardCouponList || res.memberLevel.cycleRewardCouponList.length <=
+					0 && v.name == '优惠券') {
+					return false
+				}
+				return true
+			}).map((v) => {
+				if (v.name == '赠送成长值' && res.memberLevel) {
+					v.desc = `赠送${res.memberLevel.experienceValue}成长值`
+				}
 				if (v.name == '优惠券') {
 					if (res.memberLevel.cycleRewardCouponList.length) {
-					v.desc = `每${res.memberLevel.cycleUnit}赠送${res.memberLevel.cycleRewardCouponList.length}张优惠券`;
+						v.desc =
+							`每${res.memberLevel.cycleUnit}赠送${res.memberLevel.cycleRewardCouponList.length}张优惠券`;
 					} else {
 						v.desc = '';
 					}
@@ -239,10 +266,23 @@ async function init(shopId) {
 				}
 				return v;
 			});
-		tiaojian_menus = tiaojian_menus.map((v) => {
+			tiaojian_menus = tiaojian_menus.filter(v => {
+				if (!state.isCostRewardPoints && v.name == '消费送积分') {
+					return false
+				}
+				if (!state.isCycleReward && v.name == '周期福利') {
+					return false
+				}
+				if (!res.memberLevel.cycleRewardCouponList || res.memberLevel.cycleRewardCouponList.length <=
+					0 && v.name == '优惠券') {
+					return false
+				}
+				return true
+			}).map((v) => {
 				if (v.name == '优惠券') {
 					if (res.memberLevel.cycleRewardCouponList.length) {
-					v.desc = `每${res.memberLevel.cycleUnit}赠送${res.memberLevel.cycleRewardCouponList.length}张优惠券`;
+						v.desc =
+							`每${res.memberLevel.cycleUnit}赠送${res.memberLevel.cycleRewardCouponList.length}张优惠券`;
 					} else {
 						v.desc = '';
 					}
@@ -276,9 +316,9 @@ async function init(shopId) {
 			}
 			expProgress.value = percent;
 		}
-}
+	}
 
-const nextName = computed(() => {
+	const nextName = computed(() => {
 		if (memberLevelList.value.length <= 0 || !memberLevel.value) {
 			return null;
 		}
@@ -289,37 +329,37 @@ const nextName = computed(() => {
 		}
 		const next = memberLevelList.value[index + 1];
 		return next.name;
-});
+	});
 </script>
 
 <style>
-page {
+	page {
 		background: #f9f9f9;
-}
+	}
 </style>
 
 <style lang="scss" scoped>
-.font-700 {
+	.font-700 {
 		font-weight: 700;
-}
+	}
 
-.color-one {
+	.color-one {
 		color: #558abf;
-}
+	}
 
-.color-2 {
+	.color-2 {
 		color: #273d7a;
-}
+	}
 
-.top {
+	.top {
 		background: linear-gradient(283deg, #a9cbf8 11.62%, #e5e7eb 74.58%);
-}
+	}
 
-.top {
+	.top {
 		padding: 208rpx 30rpx 78rpx 30rpx;
-}
+	}
 
-.vip-box {
+	.vip-box {
 		background-size: cover;
 		position: relative;
 		border-radius: 12px;
@@ -328,6 +368,7 @@ page {
 		padding-right: 64rpx;
 		padding-bottom: 24rpx;
 		position: relative;
+
 		.bg {
 			width: 100%;
 			height: 100%;
@@ -378,8 +419,7 @@ page {
 		}
 
 		.rule {
-		.exp {
+			.exp {}
-		}
 
 			.desc {
 				color: #273d7a;
@@ -393,9 +433,9 @@ page {
 			font-size: 24rpx;
 			font-weight: 400;
 		}
-}
+	}
 
-.progress {
+	.progress {
 		margin-top: 8rpx;
 		background-color: #bdd5e9;
 		height: 10rpx;
@@ -406,16 +446,16 @@ page {
 			border-radius: 10rpx;
 			background: linear-gradient(90deg, #f9fbfa 0.03%, #334783 115.59%);
 		}
-}
+	}
 
-.vip-quanyi {
+	.vip-quanyi {
 		background-color: #fff;
 		padding: 36rpx 18rpx 42rpx 38rpx;
 		border-radius: 40rpx 40rpx 0 0;
 		transform: translateY(-40rpx);
-}
+	}
 
-.menus-pays {
+	.menus-pays {
 		display: grid;
 		/* 每行显示3列，每列宽度相等 */
 		grid-template-columns: repeat(3, 1fr);
@@ -424,9 +464,9 @@ page {
 		/* 行间距 */
 		row-gap: 10px;
 		/* 可以添加容器的内边距 */
-}
+	}
 
-.menus-tiaojian {
+	.menus-tiaojian {
 		display: grid;
 		/* 每行显示3列，每列宽度相等 */
 		grid-template-columns: repeat(4, 1fr);
@@ -435,18 +475,19 @@ page {
 		/* 行间距 */
 		row-gap: 32rpx;
 		/* 可以添加容器的内边距 */
-}
+	}
 
-.model-box {
+	.model-box {
 		padding: 32rpx 56rpx;
 		width: 702rpx;
-}
+	}
 
-.up-content {
+	.up-content {
 		color: #999;
 		font-size: 12px;
-}
+	}
-.buy-btn {
+
+	.buy-btn {
 		margin: 98rpx 48rpx 48rpx 48rpx;
 		padding: 32rpx 32rpx;
 		color: #fff;
@@ -456,5 +497,5 @@ page {
 		line-height: 1;
 		background: linear-gradient(98deg, #fe6d1100 40.64%, #ffd1b4 105.2%), linear-gradient(259deg, #fe6d11 50.14%, #ffd1b4 114.93%);
 		box-shadow: 0 14rpx 30.4rpx 0 #fe8b435e;
-}
+	}
 </style>

utils/goods-utils.js

@@ -12,13 +12,13 @@ import _ from "lodash";
  * @param {Object} shopInfo
  */
 export function returnGoodsPrice(goods, user, shopInfo) {
-	if(!goods){
+	if (!goods) {
 		return 0
 	}
 	if (goods.discount_sale_amount * 1 > 0) {
 		return goods.discount_sale_amount;
 	}
-	if(shopInfo&&!shopInfo.isMemberPrice){
+	if (shopInfo && !shopInfo.isMemberPrice) {
 		return goods.salePrice;
 	}
 	if (user.isVip && goods.memberPrice * 1 <= goods.salePrice * 1 && goods.memberPrice * 1 > 0) {
@@ -81,7 +81,6 @@ export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
 			prev.push(...goodsWithType);
 			return prev;
 		}, []);
-
 	const arr = _.cloneDeep(canDikouGoodsArr)
 		.map((v) => {
 			const findCart = goodsCouponGoods.find((carts) => carts.id == v.id);
@@ -138,17 +137,16 @@ export function returnCouponCanUse(args) {
 
 	// 计算门槛金额
 	let fullAmount = goodsOrderPrice;
-	canDikouGoodsArr = returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user,shopInfo);
+	canDikouGoodsArr = returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user, shopInfo);
-	
 	//优惠券指定门槛商品列表
-	let canCalcGoodsArr=[...canDikouGoodsArr]
+	let canCalcGoodsArr = [...canDikouGoodsArr]
 	//部分商品参与门槛计算
-	if(coupon.thresholdFoods.length){
+	if (coupon.thresholdFoods.length) {
 		canCalcGoodsArr = canDikouGoodsArr.filter((v) => {
 			return coupon.thresholdFoods.find((food) => food.id == v.productId);
 		});
 		fullAmount = canCalcGoodsArr.reduce((pre, cur) => {
-			return pre + returnGoodsPrice(cur, user,shopInfo) * cur.num;
+			return pre + returnGoodsPrice(cur, user, shopInfo) * cur.num;
 		}, 0);
 	}
 
@@ -163,27 +161,27 @@ export function returnCouponCanUse(args) {
 			return coupon.useFoods.find((food) => food.id == v.productId);
 		});
 	}
-	if(user.isVip&&!coupon.vipPriceShare){
+	if (user.isVip && !coupon.vipPriceShare) {
 		return {
 			canUse: false,
 			reason: "非会员可用"
 		};
 	}
-	if(selCoupon.length>0&&!selCoupon[0].otherCouponShare){
+	if (selCoupon.length > 0 && !selCoupon[0].otherCouponShare) {
 		return {
 			canUse: false,
 			reason: "当前选中的券不可与其他券同享"
 		};
 	}
-	if(selCoupon.length>0&&!coupon.otherCouponShare){
+	if (selCoupon.length > 0 && !coupon.otherCouponShare) {
 		return {
 			canUse: false,
 			reason: "当前选中的券不可与其他券同享"
 		};
 	}
 	// 满减券和折扣券计算门槛金额是否满足
-	if([1,3].includes(coupon.type)){
+	if ([1, 3].includes(coupon.type)) {
-		if(canCalcGoodsArr.length<=0){
+		if (canCalcGoodsArr.length <= 0) {
 			return {
 				canUse: false,
 				reason: "没有可参与计算门槛的商品"
@@ -198,9 +196,15 @@ export function returnCouponCanUse(args) {
 		}
 	}
 	// 商品兑换券，第二件半价和买一送一判断是否有可用商品
-	if([2,4,5].includes(coupon.type)){
+	if ([2, 4, 5].includes(coupon.type)) {
 		// 没有符合条件的商品
-		if (!isDikouAll && canCalcGoodsArr.length === 0) {
+		if (isDikouAll && canDikouGoodsArr.length === 0) {
+			return {
+				canUse: false,
+				reason: "没有符合条件的商品"
+			};
+		}
+		if (!isDikouAll && canUseGoodsArr.length === 0) {
 			return {
 				canUse: false,
 				reason: "没有符合条件的商品"
@@ -208,7 +212,7 @@ export function returnCouponCanUse(args) {
 		}
 	}
 	//商品兑换券是否达到门槛金额
-	if(coupon.type==2&&goodsOrderPrice<coupon.fullAmount){
+	if (coupon.type == 2 && goodsOrderPrice < coupon.fullAmount) {
 		return {
 			canUse: false,
 			reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`
@@ -264,7 +268,7 @@ export function returnCouponCanUse(args) {
  * @param user 用户信息
  * @param {Object} shopInfo 店铺信息 
  */
-export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user,shopInfo) {
+export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, shopInfo) {
 	let hasCountNum = 0;
 	let discountPrice = 0;
 	let hasDiscountGoodsArr = [];
@@ -275,7 +279,7 @@ export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user,sh
 		const goods = discountGoodsArr[i];
 		const shengyuNum = discountNum - hasCountNum;
 		const num = Math.min(goods.num, shengyuNum);
-		discountPrice += returnGoodsPrice(goods, user,shopInfo) * num;
+		discountPrice += returnGoodsPrice(goods, user, shopInfo) * num;
 		hasCountNum += num;
 		hasDiscountGoodsArr.push({
 			...goods,
@@ -297,14 +301,14 @@ export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user,sh
  * @param selCoupon 已选择的优惠券列表
  * @param shopInfo 店铺信息
  */
-export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoupon,shopInfo) {
+export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoupon, shopInfo) {
 	const canDikouGoodsArr = returnCanDikouGoodsArr(arr, selCoupon, user);
-	console.log('canDikouGoodsArr', canDikouGoodsArr);
 	if (coupon.type == 2) {
 		return returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shopInfo);
 	}
 	if (coupon.type == 6) {
-		return returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopInfo);
+		const result = returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopInfo);
+		return result
 	}
 	if (coupon.type == 4) {
 		return returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo);
@@ -372,7 +376,7 @@ export function returnCouponZhekouDiscount(
  * @param user 用户信息
  * @param shopInfo 店铺信息
  */
-export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user,shopInfo) {
+export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
 	const {
 		useFoods,
 		discountNum,
@@ -402,7 +406,7 @@ export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user,shopI
 			discountGoodsArr = discountSelGoodsArr.slice(0, discountNum);
 		}
 	}
-	const result = calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user,shopInfo);
+	const result = calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, shopInfo);
 	return result;
 }
 
@@ -413,7 +417,7 @@ export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user,shopI
  * @param user 用户信息
  * @param shopInfo 店铺信息
  */
-function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user,shopInfo) {
+function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
 	const {
 		useFoods,
 		useRule
@@ -425,23 +429,28 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user,shopIn
 	//抵扣全部商品
 	if (useFoods.length === 0) {
 		if (useRule == "price_asc") {
-			discountGoods = canUseGoods[canUseGoods.length - 1];
+			discountGoods = canUseGoods[canUseGoods.length - 1]
 		} else {
-			discountGoods = canUseGoods.slice(0, 1);
+			discountGoods = canUseGoods[0];
 		}
 	} else {
 		//符合抵扣条件的商品
 		const canUseGoods1 = canUseGoods.filter((v) => useFoods.find((food) => food.id == v.productId));
 		if (useRule == "price_asc") {
-			discountGoods = canUseGoods1[canUseGoods1.length - 1];
+			discountGoods = canUseGoods1[canUseGoods1.length - 1]
 		} else {
-			discountGoods = canUseGoods1.slice(0, 1);
+			discountGoods = canUseGoods1[0]
 		}
 	}
-	const discountPrice = returnGoodsPrice(discountGoods, user,shopInfo);
+	let discountPrice = 0;
-	const hasDiscountGoodsArr = [discountGoods];
+	let hasDiscountGoodsArr = []
+	console.log('returnCouponBuyOneGiveOneDiscount:discountGoods',discountGoods);
+	if (discountGoods) {
+		discountPrice = returnGoodsPrice(discountGoods, user, shopInfo);
+		hasDiscountGoodsArr = [discountGoods];
+	}
 	return {
-		discountPrice,
+		discountPrice:discountPrice<=0?0:discountPrice,
 		hasDiscountGoodsArr
 	};
 }
@@ -453,38 +462,40 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user,shopIn
  * @param user 用户信息
  * @param shopInfo 店铺信息
  */
-function returnSecoendDiscount(canDikouGoodsArr, coupon, user,shopInfo) {
+function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
 	const {
 		useFoods,
 		useRule
 	} = coupon;
 	//抵扣商品
 	let discountGoods = undefined;
-	//符合买一送一条件的商品
+	//符合条件的商品
 	const canUseGoods = canDikouGoodsArr.filter((v) => v.num >= 2);
 	//抵扣全部商品
 	if (useFoods.length === 0) {
 		if (useRule == "price_asc") {
-			discountGoods = canUseGoods[canUseGoods.length - 1];
+			discountGoods = canUseGoods[canUseGoods.length - 1]
 		} else {
-			discountGoods = canUseGoods.slice(0, 1);
+			discountGoods = canUseGoods[0]
 		}
 	} else {
 		//符合抵扣条件的商品
 		const canUseGoods1 = canUseGoods.filter((v) => useFoods.find((food) => food.id == v.productId));
 		if (useRule == "price_asc") {
-			discountGoods = canUseGoods1[canUseGoods1.length - 1];
+			discountGoods = canUseGoods1[canUseGoods1.length - 1]
 		} else {
-			discountGoods = canUseGoods1.slice(0, 1);
+			discountGoods = canUseGoods1[0]
 		}
 	}
-	console.log('returnSecoendDiscount:discountGoods',discountGoods);
+	let discountPrice = 0;
-	const discountPrice = returnGoodsPrice(discountGoods[0], user,shopInfo);
+	let hasDiscountGoodsArr = []
-	console.log('returnSecoendDiscount:discountPrice',discountPrice);
+	if (discountGoods) {
-	const hasDiscountGoodsArr = [discountGoods];
+		discountPrice = returnGoodsPrice(discountGoods, user, shopInfo);
+		hasDiscountGoodsArr = [discountGoods];
+	}
 	//返回半价价格
 	return {
-		discountPrice: new BigNumber(discountPrice).dividedBy(2).toNumber(),
+		discountPrice: discountPrice <= 0 ? 0 : new BigNumber(discountPrice).dividedBy(2).toNumber(),
 		hasDiscountGoodsArr,
 	};
 }