diff --git a/application/admin/controller/Pluginsadmin.php b/application/admin/controller/Pluginsadmin.php index 44540479cc116e5f1a12f13396ea9a7f0ea3be79..79eaa5d569d43c0b45eda78955abee2c11d7f555 100755 --- a/application/admin/controller/Pluginsadmin.php +++ b/application/admin/controller/Pluginsadmin.php @@ -112,6 +112,7 @@ class Pluginsadmin extends Common $this->assign('params', $params); // 获取数据 + $data = []; if(!empty($params['id'])) { // 获取数据 @@ -120,10 +121,11 @@ class Pluginsadmin extends Common 'n' => 1, 'where' => ['id' => intval($params['id'])], ); - $data = PluginsAdminService::PluginsList($data_params); - $this->assign('data', $data['data'][0]); - $params['plugins'] = $data['data'][0]['plugins']; + $ret = PluginsAdminService::PluginsList($data_params); + $data = $ret['data'][0]; + $params['plugins'] = $ret['data'][0]['plugins']; } + $this->assign('data', $data); // 标记为空或等于view 并且 编辑数据为空则走第一步 if((empty($params['plugins']) || $params['plugins'] == 'view') && empty($data['data'][0])) diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index d3806cca0112b0ac5c93d9ae407459541842257c..79d5195ac34865f4e6c6c59d623b7249a3f5efce 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -100,7 +100,19 @@ class Common extends Controller $this->assign('plugins_view_common_bottom_data', Hook::listen('plugins_view_common_bottom', ['hook_name'=>'plugins_view_common_bottom', 'is_backend'=>false, 'user'=>$this->user])); // 公共顶部小导航钩子-左侧 - $this->assign('plugins_service_header_navigation_top_left_data', Hook::listen('plugins_service_header_navigation_top_left', ['hook_name'=>'plugins_service_header_navigation_top_left', 'is_backend'=>false, 'user'=>$this->user])); + $this->assign('plugins_view_header_navigation_top_left_data', Hook::listen('plugins_view_header_navigation_top_left', ['hook_name'=>'plugins_view_header_navigation_top_left', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户登录页面顶部钩子 + $this->assign('plugins_view_user_login_info_top_data', Hook::listen('plugins_view_user_login_info_top', ['hook_name'=>'plugins_view_user_login_info_top', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户注册页面钩子 + $this->assign('plugins_view_user_reg_info_data', Hook::listen('plugins_view_user_reg_info', ['hook_name'=>'plugins_view_user_reg_info', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户注册短信页面钩子 + $this->assign('plugins_view_user_sms_reg_info_data', Hook::listen('plugins_view_user_sms_reg_info', ['hook_name'=>'plugins_view_user_sms_reg_info', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户注册邮箱页面钩子 + $this->assign('plugins_view_user_email_reg_info_data', Hook::listen('plugins_view_user_email_reg_info', ['hook_name'=>'plugins_view_user_email_reg_info', 'is_backend'=>false, 'user'=>$this->user])); } /** diff --git a/application/index/controller/Order.php b/application/index/controller/Order.php index d403f79d71f674517a5723530e2fe5fe1fff67e8..b0f1ff923fd4880beaaab997aaed50cb06f2fe0d 100755 --- a/application/index/controller/Order.php +++ b/application/index/controller/Order.php @@ -137,7 +137,7 @@ class Order extends Common } else { $this->assign('msg', '没有相关数据'); return $this->fetch('public/tips_error'); - } + } } /** diff --git a/application/index/view/default/order/index.html b/application/index/view/default/order/index.html index d971298d57433fe7adcb517d87852d43db7b3853..5482557b47445b57b139bb532ac07a7fd61574b7 100755 --- a/application/index/view/default/order/index.html +++ b/application/index/view/default/order/index.html @@ -41,21 +41,21 @@
+ +
+拍下商品
+ {{if !empty($data.add_time)}} +{{$data.add_time}}
+ {{/if}} ++ {{if $data['status'] GT 1}}{{else /}}2{{/if}} +
+付款
+ {{if !empty($data.pay_time)}} +{{$data.pay_time}}
+ {{/if}} ++ {{if $data['status'] GT 2}}{{else /}}3{{/if}} +
+卖家发货
+ {{if !empty($data.delivery_time)}} +{{$data.delivery_time}}
+ {{/if}} ++ {{if $data['status'] GT 3}}{{else /}}4{{/if}} +
+确认收货
+ {{if !empty($data.collect_time)}} +{{$data.collect_time}}
+ {{/if}} ++ {{if $data['user_is_comments'] GT 0}}{{else /}}5{{/if}} +
+评价
+ {{if !empty($data.user_is_comments_time)}} +{{$data.user_is_comments_time}}
+ {{/if}} +{{$data.status_name}}
+商品信息 | + + + +
---|
+
+
+
+
+
+
+ {{$goods.title}}
+ {{if !empty($goods.spec)}}
+
+
+ {{if $goods['original_price'] gt 0}}
+ ¥{{$goods.original_price}}
+ {{/if}}
+ ¥{{$goods.price}}
+ x{{$goods.buy_number}}
+
+ |
+
+
+
+
请输入订单号,收件人姓名,收件人电话即可查看订单详情
+