diff --git a/packageA/pages/distribution/shop/shop.js b/packageA/pages/distribution/shop/shop.js index a3693b0..3c79dc1 100644 --- a/packageA/pages/distribution/shop/shop.js +++ b/packageA/pages/distribution/shop/shop.js @@ -79,14 +79,14 @@ Page({ } - if (options?.brand_id) { + if (options && options.brand_id) { this.setData({ brand_id: options.brand_id, is_router:true }) // this.getData(true, '/api/weshop/users/distribut/pagemyshop', this.data.currentQuery); } - if (options?.nation_id) { + if (options && options.nation_id) { this.setData({ nation_id: options.nation_id, is_router:true diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js index 75e4396..31cd6c0 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js @@ -1105,12 +1105,17 @@ Page({ click_contact:function () { getApp().globalData.no_clear=1; + }, + + //-- 查看物流 -- + go_wuliu:function (e) { + getApp().go_wuliu(e); } - - - - - + + + + + diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml index 5d11ee4..f831071 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml @@ -185,7 +185,9 @@ 删除订单 - + diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index f0c3277..7553b06 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -2836,6 +2836,12 @@ Page({ }, + //-- 查看物流 -- + go_wuliu:function (e) { + getApp().go_wuliu(e); + } + + diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 75c3025..f338b31 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -245,8 +245,11 @@ 重新退款 退款详情 - - + + + 订单详情 订单详情