代码更新

pagesCreateOrder/index/util.js

@@ -1,7 +1,7 @@
 //根据店铺信息返回是否是后付款
 export function $trturnPayAfter(shop) {
-	//munchies 先付  restaurant 后付
-	const payAfter = shop.registerType == "munchies" ? false : true;
+	//before 先付  after 后付
+	const payAfter = shop.registerType == "before" ? false : true;
 	return payAfter
 }
 //根据店铺信息返回就餐类型
@@ -19,12 +19,12 @@ export function $returnUseType(shop, useType) {
 }
 //判断商品是否可以下单
 export function isCanBuy(skuGoods,goods) {
-    if(goods.typeEnum=='normal'){
+    if(goods.type!='sku'){
         //单规格
-        return goods.isGrounding&&goods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
+        return goods.isSale&&goods.isSoldStock==0&&(goods.isStock?goods.stockNumber>0:true);
     }else{
         //多规格
-        return  goods.isGrounding&&goods.isPauseSale==0&&skuGoods.isGrounding&&skuGoods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
+        return  goods.isSale&&goods.isSoldStock==0&&skuGoods.isGrounding&&skuGoods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
 
     }
 }
@@ -43,7 +43,7 @@ function arrayContainsAll(arr1, arr2) {
 //n项 n-1项组合，生成全部结果
 function generateCombinations(arr, k) {
 	let result = [];
-
+		console.log("current.length === k",arr)
 	function helper(index, current) {
 		if (current.length === k) {
 			result.push(current.slice()); // 使用slice()来避免直接修改原始数组
@@ -53,6 +53,7 @@ function generateCombinations(arr, k) {
 				helper(i + 1, current); // 递归调用，索引增加以避免重复选择相同的元素
 				current.pop(); // 回溯，移除当前元素以便尝试其他组合
 			}
+			console.log(current)
 		}
 	}