From b552abb5e5227cdc67986f04f26d91e12b7070ae Mon Sep 17 00:00:00 2001 From: liudan <18634735655@163.com> Date: Fri, 5 Jul 2024 02:12:30 +0800 Subject: [PATCH] 1 --- pages/huitong/huitongbao/index.vue | 8 +++-- pages/order_addcart/order_addcart.vue | 36 ++++++++++++------- pages/users/user_integral/index.vue | 6 ++-- pages/users/user_integral1/fenhong.vue | 7 ++-- pages/users/user_integral1/index.vue | 6 ++-- .../users/user_integral1/user_contribute.vue | 6 ++-- 6 files changed, 41 insertions(+), 28 deletions(-) diff --git a/pages/huitong/huitongbao/index.vue b/pages/huitong/huitongbao/index.vue index e318266..d4ee080 100644 --- a/pages/huitong/huitongbao/index.vue +++ b/pages/huitong/huitongbao/index.vue @@ -66,13 +66,15 @@ {{item.create_time}} --> - + {{item.type}} {{(item.ext != null&&item.ext.from_phone)?`来自${item.ext.from_phone}`:(item.ext !== null&&item.ext.to_phone)?`转给${item.ext.to_phone}`:''}} - 昵称:{{item.user_nickname}} - 订单号:{{item.order_sn}} + + + 昵称:{{item.order?item.order.nickname:item.user_nickname}} + 订单号:{{item.order_sn}} {{item.create_time}} diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue index 7eddf0a..77835c8 100644 --- a/pages/order_addcart/order_addcart.vue +++ b/pages/order_addcart/order_addcart.vue @@ -288,6 +288,14 @@ this.cartList.valid = res.data.list; this.cartList.invalid = res.data.fail + if(res.data.list.length == 0 && res.data.list.length == 0){ + this.recommend = true; + if(!this.hostProduct.length){ + this.getHostProduct(); + } + }else{ + this.recommend = false + } }) this.getCartNum(); }else{ @@ -596,6 +604,7 @@ * */ ChangeAttr: function(res) { + let productSelect = this.productValue[res]; this.currSku = res; this.newVal = this.productValue[res]; @@ -664,6 +673,7 @@ }) }, goCat: function() { + console.log("yyyy") let that = this; changeCartNum(that.goods.cart_id, { cart_num: that.goods.cart_num, @@ -680,7 +690,7 @@ } that.onMyEvent(); that.getCartList(true); - that.isAllSelect = false + that.isAllSelect = true }).catch(error => { that.$util.Tips({ @@ -749,19 +759,19 @@ }) }) this.cartList.valid = res.data.list; - let newArr=JSON.parse(uni.getStorageSync('cartSelectedGoods')) - console.log(newArr,"报错") - this.cartList.valid.forEach(item=>{ - item.list.forEach(p=>{ - newArr.forEach(i=>{ - if(p.product_id==i){ + // let newArr=JSON.parse(uni.getStorageSync('cartSelectedGoods')) + // console.log(newArr,"报错") + // this.cartList.valid.forEach(item=>{ + // item.list.forEach(p=>{ + // newArr.forEach(i=>{ + // if(p.product_id==i){ - this.$set(p,'check',true) - } - }) - }) + // this.$set(p,'check',true) + // } + // }) + // }) - }) + // }) this.cartList.invalid = res.data.fail if(res.data.list.length == 0 && res.data.list.length == 0){ this.recommend = true; @@ -806,7 +816,7 @@ }) }) - uni.setStorageSync('cartSelectedGoods',JSON.stringify(selectedCart)) + // uni.setStorageSync('cartSelectedGoods',JSON.stringify(selectedCart)) } this.cartAllCheck('goodsCheck') diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue index b19f87d..c65fc0f 100644 --- a/pages/users/user_integral/index.vue +++ b/pages/users/user_integral/index.vue @@ -49,12 +49,12 @@ 提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！ - + {{item.type}} - 昵称:{{item.user_nickname}} - 订单号:{{item.order_sn}} + 昵称:{{item.order?item.order.nickname:item.user_nickname}} + 订单号:{{item.order_sn}} {{item.create_time}} diff --git a/pages/users/user_integral1/fenhong.vue b/pages/users/user_integral1/fenhong.vue index 08876fd..c474db4 100644 --- a/pages/users/user_integral1/fenhong.vue +++ b/pages/users/user_integral1/fenhong.vue @@ -39,11 +39,12 @@ 提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！ - + {{item.type}} - 昵称:{{item.user_nickname}} - 订单号:{{item.order_sn}} + + 昵称:{{item.order?item.order.nickname:item.user_nickname}} + 订单号:{{item.order_sn}} {{item.create_time}} diff --git a/pages/users/user_integral1/index.vue b/pages/users/user_integral1/index.vue index 0d44729..04410dd 100644 --- a/pages/users/user_integral1/index.vue +++ b/pages/users/user_integral1/index.vue @@ -43,11 +43,11 @@ 提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！ - + {{item.type}} - 昵称:{{item.user_nickname}} - 订单号:{{item.order_sn}} + 昵称:{{item.order?item.order.nickname:item.user_nickname}} + 订单号:{{item.order_sn}} {{item.create_time}} diff --git a/pages/users/user_integral1/user_contribute.vue b/pages/users/user_integral1/user_contribute.vue index 018bb61..cc81f1f 100644 --- a/pages/users/user_integral1/user_contribute.vue +++ b/pages/users/user_integral1/user_contribute.vue @@ -43,12 +43,12 @@ 提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！ - + {{item.type}} - 昵称:{{item.user_nickname}} - 订单号:{{item.order_sn}} + 昵称:{{item.order?item.order.nickname:item.user_nickname}} + 订单号:{{item.order_sn}} {{item.create_time}}