From f6b1d7b7990a6d65fae604dd73ea1b98702fbf89 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Mon, 8 Jul 2024 09:15:27 +0800 Subject: [PATCH] 再同步订单的时候，发现组合购订单的bug --- packageG/pages/user/order_detail/order_detail.js | 8 ++++++-- pages/user/order_list/order_list.js | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packageG/pages/user/order_detail/order_detail.js b/packageG/pages/user/order_detail/order_detail.js index 6a0adb6..82722e7 100644 --- a/packageG/pages/user/order_detail/order_detail.js +++ b/packageG/pages/user/order_detail/order_detail.js @@ -2195,8 +2195,8 @@ Page({ var err_text=""; var ok_num=0; - var zh_prom_id_err=[]; - var zh_prom_id_err_goods=[]; + var zh_prom_id_err=[]; + var zh_prom_id_err_goods=[]; for(var i in back_goods_arr){ //商品ID @@ -2298,6 +2298,10 @@ Page({ updata.prom_id = newd.prom_id; } + if(newd['zh_prom_id']){ + updata.zh_prom_id=newd['zh_prom_id']; + } + //如果购物车中商品zh_prom_id不一致的话，要进行提示 if(is_has.zh_prom_id>0 && is_has.zh_prom_id!= newd['zh_prom_id'] ){ zh_prom_id_err.push(newd.goods_name+ '已在购物车\n'); diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index dfd3d27..6e28ad6 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -2625,6 +2625,11 @@ Page({ updata.prom_id = newd.prom_id; } + if(newd['zh_prom_id']){ + updata.zh_prom_id=newd['zh_prom_id']; + } + + //如果购物车中商品zh_prom_id不一致的话，要进行提示 if(is_has.zh_prom_id>0 && is_has.zh_prom_id!= newd['zh_prom_id'] ){ zh_prom_id_err.push(newd.goods_name+ '已在购物车\n'); -- libgit2 0.21.4