diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml index dbb3706..c23f9b3 100644 --- a/pages/info/postProductInfo/index.wxml +++ b/pages/info/postProductInfo/index.wxml @@ -302,7 +302,7 @@ - + 配送方式 diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js index 2e795bb..f0879f7 100644 --- a/pages/order/postOrder/index.js +++ b/pages/order/postOrder/index.js @@ -301,13 +301,14 @@ Page({ supplier_id: info.product.supplier_id, } if (info.user_select_type == 0) { - param.use_type = 1 + param.use_type = 0 param.post = this.data.address.id } if (info.user_select_type == 1) { - param.use_type = 2 + param.use_type = 1 param.pickup_shop_id = info.pickupAddress.id param.pickup_shop_info = info.pickupAddress + param.phone = info.phone } product_list.push(param) diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js index d9aae1a..c9d5806 100644 --- a/pages/user/cartlist/list.js +++ b/pages/user/cartlist/list.js @@ -218,11 +218,13 @@ Page({ return; } - let postSkuIds = product.map(x=>x.sku.id) - if(postSkuIds.some(x=>postSkuIds.filter(v=>v==x).length>1)) { - wx.showToast({ - title: '相同规格产品不可重复购买', - icon: "none" + let repeatSku = product.find(x=>product.filter(v=>v.sku.id == x.sku.id).length>1) + if(repeatSku) { + let str = `${repeatSku.product.title}-${repeatSku.sku.sku_name}邮寄和自提只能选择一种` + wx.showModal({ + content: str, + showCancel: false, + complete: (res) => {} }) return } diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js index 995f4b0..48cdd2e 100644 --- a/subPackages/techanNew/index.js +++ b/subPackages/techanNew/index.js @@ -298,11 +298,13 @@ Page({ // }) return; } - let postSkuIds = product.map(x=>x.sku.id) - if(postSkuIds.some(x=>postSkuIds.filter(v=>v==x).length>1)) { - wx.showToast({ - title: '相同规格产品不可重复购买', - icon: "none" + let repeatSku = product.find(x=>product.filter(v=>v.sku.id == x.sku.id).length>1) + if(repeatSku) { + let str = `${repeatSku.product.title}-${repeatSku.sku.sku_name}邮寄和自提只能选择一种` + wx.showModal({ + content: str, + showCancel: false, + complete: (res) => {} }) return }