From 38903e8a456dd34702ec34b3a9a6cfacf11e110c Mon Sep 17 00:00:00 2001 From: Devil Date: Sat, 16 Jan 2021 22:04:02 +0800 Subject: [PATCH] dev --- .../view/default/order/module/goods.html | 95 ++++++++++- .../default/orderaftersale/module/goods.html | 69 ++++++++ application/index/view/default/buy/index.html | 69 +++++++- .../index/view/default/order/detail.html | 156 ++++++++++++++++- .../view/default/order/module/goods.html | 95 ++++++++++- .../view/default/orderaftersale/detail.html | 158 +++++++++++++++++- .../default/orderaftersale/module/goods.html | 69 ++++++++ .../common/lib/ueditor/dialogs/map/map.html | 2 +- .../common/lib/ueditor/dialogs/map/show.html | 2 +- .../user-order-detail/user-order-detail.js | 2 +- .../user-orderaftersale.axml | 11 +- .../user-order-detail/user-order-detail.js | 2 +- .../user-orderaftersale.swan | 11 +- .../user-order-detail/user-order-detail.js | 2 +- .../user-orderaftersale.qml | 11 +- .../user-order-detail/user-order-detail.js | 2 +- .../user-orderaftersale.ttml | 11 +- .../user-order-detail/user-order-detail.js | 2 +- .../user-orderaftersale.wxml | 11 +- 19 files changed, 753 insertions(+), 27 deletions(-) diff --git a/application/admin/view/default/order/module/goods.html b/application/admin/view/default/order/module/goods.html index ea59810f6..4b70aa833 100644 --- a/application/admin/view/default/order/module/goods.html +++ b/application/admin/view/default/order/module/goods.html @@ -1,5 +1,28 @@ {{if !empty($module_data) and !empty($module_data['items'])}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_order_list_base_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_order_list_base_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + + {{if $module_data['pay_status'] eq 1 and $module_data['pay_price'] lt $module_data['total_price']}}

@@ -11,9 +34,33 @@ {{$module_data.order_no}} {{$module_data.id}} {{if !empty($module_data['warehouse_name'])}} - {{$module_data.warehouse_name}} + {{$module_data.warehouse_name}} {{/if}}

+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_order_list_base_goods_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_order_list_base_goods_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + +
{{foreach $module_data.items as $item}}
@@ -39,5 +86,51 @@
{{/foreach}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_order_list_base_goods_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_order_list_base_goods_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + +
{{$module_data.describe}}
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_order_list_base_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_order_list_base_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + {{/if}} \ No newline at end of file diff --git a/application/admin/view/default/orderaftersale/module/goods.html b/application/admin/view/default/orderaftersale/module/goods.html index 762992373..a51050c5a 100644 --- a/application/admin/view/default/orderaftersale/module/goods.html +++ b/application/admin/view/default/orderaftersale/module/goods.html @@ -1,8 +1,55 @@ {{if !empty($module_data) and !empty($module_data['order_data'])}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_orderaftersale_list_base_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_orderaftersale_list_base_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + +

{{$module_data.order_no}}

+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_orderaftersale_list_base_goods_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_orderaftersale_list_base_goods_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + +
@@ -25,4 +72,26 @@ {{/if}} {{$module_data.order_data.currency_data.currency_symbol}}{{$module_data.order_data.items.price}}x{{$module_data.order_data.items.buy_number}}
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_orderaftersale_list_base_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_orderaftersale_list_base_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + {{/if}} \ No newline at end of file diff --git a/application/index/view/default/buy/index.html b/application/index/view/default/buy/index.html index 3b2e73ea8..a8b47461d 100755 --- a/application/index/view/default/buy/index.html +++ b/application/index/view/default/buy/index.html @@ -271,12 +271,79 @@ {{foreach $buy_goods as $v}}
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_group_nav_inside_begin +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_buy_group_nav_inside_begin'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$v]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + {{$v.name}}{{if !empty($v['alias'])}}{{$v.alias}}{{/if}} - {{if isset($v['lng']) and isset($v['lat'])}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_group_nav_inside_middle +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_buy_group_nav_inside_middle'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$v]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + + {{if isset($v['lng']) and isset($v['lat']) and $v['lng'] neq 0 and $v['lat'] neq 0}}
查看地图
{{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_buy_group_nav_inside_end +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_buy_group_nav_inside_end'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$v]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} +
diff --git a/application/index/view/default/order/detail.html b/application/index/view/default/order/detail.html index 403084320..122bfe81e 100755 --- a/application/index/view/default/order/detail.html +++ b/application/index/view/default/order/detail.html @@ -22,6 +22,28 @@
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_detail_progress_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_detail_progress_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + {{if !in_array($data['status'], [5,6])}}
    @@ -87,6 +109,28 @@
{{/if}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_detail_base_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_detail_base_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + +
@@ -95,7 +139,7 @@
{{if !empty($data['warehouse_name'])}}
-
出货仓库：
+
出货服务：
{{$data.warehouse_name}}
{{/if}} @@ -311,6 +355,28 @@
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_detail_base_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_detail_base_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + {{if in_array($data['order_model'], [0, 2])}}
@@ -333,6 +399,28 @@
{{/if}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_detail_address_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_detail_address_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + {{if $data['order_model'] eq 3 and $data['pay_status'] eq 1 and in_array($data['status'], [3,4])}}
@@ -367,6 +455,28 @@
{{/if}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_detail_fictitious_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_detail_fictitious_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + {{if !empty($data.items)}}
@@ -435,6 +545,28 @@
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_detail_goods_inside_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_detail_goods_inside_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + {{if !empty($data['extension_data'])}}
{{foreach $data.extension_data as $ertk=>$ext}} @@ -489,6 +621,28 @@ {{/if}}
{{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_detail_goods_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_detail_goods_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} +
diff --git a/application/index/view/default/order/module/goods.html b/application/index/view/default/order/module/goods.html index 6b8f9053b..93cb21c5a 100644 --- a/application/index/view/default/order/module/goods.html +++ b/application/index/view/default/order/module/goods.html @@ -1,11 +1,58 @@ {{if !empty($module_data) and !empty($module_data['items'])}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_list_base_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_list_base_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + +

{{$module_data.order_no}} {{if !empty($module_data['warehouse_name'])}} - {{$module_data.warehouse_name}} + {{$module_data.warehouse_name}} {{/if}}

+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_list_base_goods_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_list_base_goods_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + +
{{foreach $module_data.items as $item}}
@@ -46,5 +93,51 @@
{{/foreach}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_list_base_goods_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_list_base_goods_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + +
{{$module_data.describe}}
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_order_list_base_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_order_list_base_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + {{/if}} \ No newline at end of file diff --git a/application/index/view/default/orderaftersale/detail.html b/application/index/view/default/orderaftersale/detail.html index 5ebc2d9f3..3e2b63839 100644 --- a/application/index/view/default/orderaftersale/detail.html +++ b/application/index/view/default/orderaftersale/detail.html @@ -22,10 +22,55 @@
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_orderaftersale_detail_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_orderaftersale_detail_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'goods'=>$goods, 'order'=>$order, 'new_aftersale_data'=>$new_aftersale_data, 'step_data'=>$step_data, 'returned_data'=>$returned_data, 'params'=>$params]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + {{if !empty($goods)}}
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_orderaftersale_detail_goods_inside_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_orderaftersale_detail_goods_inside_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'goods'=>$goods, 'order'=>$order, 'new_aftersale_data'=>$new_aftersale_data, 'step_data'=>$step_data, 'returned_data'=>$returned_data, 'params'=>$params]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + + @@ -62,6 +107,29 @@
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_orderaftersale_detail_goods_inside_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_orderaftersale_detail_goods_inside_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'goods'=>$goods, 'order'=>$order, 'new_aftersale_data'=>$new_aftersale_data, 'step_data'=>$step_data, 'returned_data'=>$returned_data, 'params'=>$params]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + +
{{if !empty($order.price)}}
@@ -104,9 +172,53 @@
{{/if}}
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_orderaftersale_detail_goods_inside_base_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_orderaftersale_detail_goods_inside_base_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'goods'=>$goods, 'order'=>$order, 'new_aftersale_data'=>$new_aftersale_data, 'step_data'=>$step_data, 'returned_data'=>$returned_data, 'params'=>$params]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} +
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_orderaftersale_detail_goods_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_orderaftersale_detail_goods_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'goods'=>$goods, 'order'=>$order, 'new_aftersale_data'=>$new_aftersale_data, 'step_data'=>$step_data, 'returned_data'=>$returned_data, 'params'=>$params]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + {{if empty($new_aftersale_data) or (isset($new_aftersale_data['status']) and $new_aftersale_data['status'] eq 5)}} @@ -172,9 +284,31 @@ {{/switch}} {{/if}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_orderaftersale_detail_base_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_orderaftersale_detail_base_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'goods'=>$goods, 'order'=>$order, 'new_aftersale_data'=>$new_aftersale_data, 'step_data'=>$step_data, 'returned_data'=>$returned_data, 'params'=>$params]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + {{if !empty($new_aftersale_data) and $new_aftersale_data['status'] neq 5}} -
+
申请信息
@@ -283,6 +417,28 @@
{{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_orderaftersale_detail_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_orderaftersale_detail_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'goods'=>$goods, 'order'=>$order, 'new_aftersale_data'=>$new_aftersale_data, 'step_data'=>$step_data, 'returned_data'=>$returned_data, 'params'=>$params]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + {{/if}}
diff --git a/application/index/view/default/orderaftersale/module/goods.html b/application/index/view/default/orderaftersale/module/goods.html index e2155efaf..6b940961a 100644 --- a/application/index/view/default/orderaftersale/module/goods.html +++ b/application/index/view/default/orderaftersale/module/goods.html @@ -1,8 +1,55 @@ {{if !empty($module_data) and !empty($module_data['order_data'])}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_orderaftersale_list_base_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_orderaftersale_list_base_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + +

{{$module_data.order_no}}

+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_orderaftersale_list_base_goods_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_orderaftersale_list_base_goods_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + + +
@@ -25,4 +72,26 @@ {{/if}} {{$module_data.order_data.currency_data.currency_symbol}}{{$module_data.order_data.items.price}} x {{$module_data.order_data.items.buy_number}}
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_user_orderaftersale_list_base_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_user_orderaftersale_list_base_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'data'=>$module_data]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + {{/if}} \ No newline at end of file diff --git a/public/static/common/lib/ueditor/dialogs/map/map.html b/public/static/common/lib/ueditor/dialogs/map/map.html index 58f416bac..8a6259b1c 100755 --- a/public/static/common/lib/ueditor/dialogs/map/map.html +++ b/public/static/common/lib/ueditor/dialogs/map/map.html @@ -4,7 +4,7 @@ - + - + diff --git a/sourcecode/alipay/default/pages/user-order-detail/user-order-detail.js b/sourcecode/alipay/default/pages/user-order-detail/user-order-detail.js index c8bfa74f9..7a774b03a 100644 --- a/sourcecode/alipay/default/pages/user-order-detail/user-order-detail.js +++ b/sourcecode/alipay/default/pages/user-order-detail/user-order-detail.js @@ -49,7 +49,7 @@ Page({ self.setData({ detail: data.data, detail_list:[ - {name: "出货仓库", value: data.data.warehouse_name || ''}, + {name: "出货服务", value: data.data.warehouse_name || ''}, {name: "订单模式", value: data.data.order_model_name || '' }, {name: "订单编号", value: data.data.order_no || ''}, {name: "订单状态", value: data.data.status_name || ''}, diff --git a/sourcecode/alipay/default/pages/user-orderaftersale/user-orderaftersale.axml b/sourcecode/alipay/default/pages/user-orderaftersale/user-orderaftersale.axml index 80b64f964..33eda371d 100644 --- a/sourcecode/alipay/default/pages/user-orderaftersale/user-orderaftersale.axml +++ b/sourcecode/alipay/default/pages/user-orderaftersale/user-orderaftersale.axml @@ -37,9 +37,14 @@ {{item.type_text}} / {{item.reason}} - / - {{item.order_data.currency_data.currency_symbol}}{{item.price}} - x{{item.number}} + + / + {{item.order_data.currency_data.currency_symbol}}{{item.price}} + + + / + {{item.number}} +