diff --git a/addon/cardservice/model/order/MembercardOrderCreate.php b/addon/cardservice/model/order/MembercardOrderCreate.php index 75b7a9b3..c6552271 100644 --- a/addon/cardservice/model/order/MembercardOrderCreate.php +++ b/addon/cardservice/model/order/MembercardOrderCreate.php @@ -228,7 +228,7 @@ class MembercardOrderCreate extends OrderCreate } } //生成整体支付单据 - $pay->addPay($shop_goods_list[ 'site_id' ], $out_trade_no, $this->pay_type, $this->order_name, $this->order_name, $this->pay_money, '', 'OrderPayNotify', '/pages/order/detail?order_id=' . $order_id); + $pay->addPay($shop_goods_list[ 'site_id' ], $out_trade_no, $this->pay_type, $this->order_name, $this->order_name, $this->pay_money, '', 'OrderPayNotify', '/pages_rush/order/detail?order_id=' . $order_id); $this->addOrderCronClose($order_id, $shop_goods_list[ 'site_id' ]);//增加关闭订单自动事件 model('order')->commit(); return $this->success($out_trade_no); diff --git a/addon/cashier/source/os/common/menu/store.js b/addon/cashier/source/os/common/menu/store.js index dcb0d118..aedb409c 100644 --- a/addon/cashier/source/os/common/menu/store.js +++ b/addon/cashier/source/os/common/menu/store.js @@ -19,7 +19,7 @@ export default [{ { title: '订单', icon: 'icondingdan', - path: '/pages/order/orderlist', + path: '/pages_rush/order/orderlist', name: 'order_list' }, { @@ -101,13 +101,13 @@ export default [{ { title: '订单管理', icon: 'icondingdan', - path: '/pages/order/orderlist', + path: '/pages_rush/order/orderlist', name: 'order_list' }, { title: '退款维权', icon: 'iconjishi', - path: '/pages/order/orderrefund', + path: '/pages_rush/order/orderrefund', name: 'order_refund_list' }, { diff --git a/addon/diy_default1/config/diy_view.php b/addon/diy_default1/config/diy_view.php index 7bf7dde4..e00604b9 100644 --- a/addon/diy_default1/config/diy_view.php +++ b/addon/diy_default1/config/diy_view.php @@ -1352,7 +1352,7 @@ return [ "link" => [ "name" => "ALL_ORDER", "title" => "全部订单", - "wap_url" => "/pages/order/list", + "wap_url" => "/pages_rush/order/list", "parent" => "MALL_LINK" ], "isShow" => true, diff --git a/addon/diy_default1/event/UseTemplate.php b/addon/diy_default1/event/UseTemplate.php index 17e156f8..e995dec4 100644 --- a/addon/diy_default1/event/UseTemplate.php +++ b/addon/diy_default1/event/UseTemplate.php @@ -1269,7 +1269,7 @@ class UseTemplate "link" => [ "name" => "ALL_ORDER", "title" => "全部订单", - "wap_url" => "/pages/order/list", + "wap_url" => "/pages_rush/order/list", "parent" => "MALL_LINK" ], "isShow" => true, diff --git a/addon/fenxiao/shop/view/config/basics.html b/addon/fenxiao/shop/view/config/basics.html index 894628fb..b3627426 100644 --- a/addon/fenxiao/shop/view/config/basics.html +++ b/addon/fenxiao/shop/view/config/basics.html @@ -2,6 +2,9 @@ {block name="resources"} {/block} {block name="main"} @@ -31,7 +34,7 @@