zhuce
/
lilishop-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp

master
lemon橪 2021-12-29 09:23:06 +08:00
parent 198bd6c322 7fb96f1eac
commit 2abc8ff9d8
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/order/orderDetail.vue
View File

@ -324,7 +324,7 @@ export default {
}, },
gotoGoodsDetail(sku) { gotoGoodsDetail(sku) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/product/goods?id=${sku.id}&goodsId=${sku.goodsId}`, url: `/pages/product/goods?id=${sku.skuId}&goodsId=${sku.goodsId}`,
}); });
}, },
onCopy(sn) { onCopy(sn) {

12
pages/tabbar/cart/cartList.vue
View File

@ -204,7 +204,7 @@ export default {
cartDetail: "", //购物车详情 cartDetail: "", //购物车详情
goodsVal: "", //单个商品详情 goodsVal: "", //单个商品详情
isEdit: false, // 是否是编辑 isEdit: false, // 是否是编辑
checkout: true, //全选按钮 checkout: false, //全选按钮
WEIXIN_num: "", //购物车兼容微信步进器 WEIXIN_num: "", //购物车兼容微信步进器
}; };
}, },
@ -516,16 +516,20 @@ export default {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
if (result.data.success) { if (result.data.success) {
this.cartDetail = result.data.result; this.cartDetail = result.data.result;
this.checkout = true; let checkouted = true;
for (let i = 0; i < this.cartDetail.cartList.length; i++) { for (let i = 0; i < this.cartDetail.cartList.length; i++) {
let item = this.cartDetail.cartList[i]; let item = this.cartDetail.cartList[i];
console.log(item);
// 循环出当前商品是否全选 // 循环出当前商品是否全选
if (item.checked == 0) { if (item.checked == 0) {
this.checkout = false; checkouted = false;
} }
// 如果有拼团活动顺便删除 // 如果有拼团活动顺便删除
item.skuList && item.skuList &&
item.skuList.forEach((sku) => { item.skuList.forEach((sku) => {
if (sku.checked == 0) {
checkouted = false;
}
if(Object.keys(sku.promotionMap).length != 0) if(Object.keys(sku.promotionMap).length != 0)
{ {
Object.keys(sku.promotionMap).forEach((pro, proIndex) => { Object.keys(sku.promotionMap).forEach((pro, proIndex) => {
@ -538,6 +542,7 @@ export default {
}); });
} }
this.checkout = checkouted;
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
} }
}) })
@ -574,6 +579,7 @@ page {
box-shadow: 0 4rpx 12rpx 0 rgba(0, 0, 0, 0.05); box-shadow: 0 4rpx 12rpx 0 rgba(0, 0, 0, 0.05);
} }
.promotion-notice { .promotion-notice {
margin-top: 10px;
margin-left: 68rpx; margin-left: 68rpx;
font-size: 24rpx; font-size: 24rpx;
color: #333; color: #333;