订单显示补全

application/admin/controller/Order.php

@@ -102,7 +102,7 @@ class Order extends AuthBase
         //导出到excel之前数据处理
         $mulit_arr = [];
         $mulit_arr['data'] = [];
-        $cont = [['订单标题', '订单号', '订单来源', '用户名', '电话', '微信号', '地址', 'vip购买信息', '活动名称', '活动价格', '家庭组数', '大人数量', '孩子数量', '孩子年龄', '订单总价', '下单时间', '订单状态']];
+        $cont = [['订单标题', '订单号', '订单来源', '用户名', '电话', '微信号', '地址', 'vip购买信息', '活动名称', '详情', '订单总价', '下单时间', '订单状态']];
         foreach ($order_list as $vo) {
             $arr = [];
             $arr[] = $vo['title'];
@@ -115,18 +115,18 @@ class Order extends AuthBase
             $arr[] = $vo->user_info['phone'];
             $arr[] = $vo->user_info['wx_number'];
             $arr[] = $vo->user_info['address'];
-            $arr[] = $vo->user_info['phone'];
             $arr[] = isset($vo['extras']['vip_endtime']) ? $vo['extras']['vip_endtime'] . '到期' : '';
             $arr[] = $vo->project['title'];
-            $arr[] = $vo->project['price'];
-            $arr[] = isset($vo['extras']['sign_limits']) ? $vo['extras']['sign_limits'] : '';
-            $arr[] = isset($vo['extras']['adult_number']) ? $vo['extras']['adult_number'] : '';
-            $arr[] = isset($vo['extras']['children_number']) ? $vo['extras']['children_number'] : '';
-            $arr[] = isset($vo['extras']['children_age']) ? $vo['extras']['children_age'] : '';
+            if($vo->type ==1 ){
+                //活动
+                $arr[] = "价格:{$vo->extras['price']},数量:{$vo->extras['sign_limits']},地址:{$vo->extras['address']},描述:{$vo->extras['remark']}";
+            }else{
+                //会员卡
+                $arr[] = "价格:{$vo->extras['price']},时长:{$vo->extras['year']},备注:{$vo->extras['remark']}";
+            }
             $arr[] = $vo['total_fee'];
             $arr[] = $vo['created_at'];
             $arr[] = $vo->StatusAdminText;
-
             $cont[] = $arr;
         }
         $mulit_arr['data'][] = $cont;

application/admin/view/order/index.html

@@ -25,10 +25,8 @@
                 <div class="form-group margin-right">
                     <select name="type" class="form-control" id="type">
                         <option value="">全部订单类型</option>
-                        <option value="1" {if condition="input('type')=='1'" }selected{
-                        /if}>活动报名订单</option>
-                        <option value="2" {if condition="input('type')=='2'" }selected{
-                        /if}>购买会员卡订单</option>
+                        <option value="1" {if condition="input('type')=='1'" }selected{/if}>活动报名订单</option>
+                        <option value="2" {if condition="input('type')=='2'" }selected{/if}>购买会员卡订单</option>
                     </select>
                 </div>
                 <div class="form-group margin-right">
@@ -85,6 +83,14 @@
                                 <img src="{$vo.project_poster}" width='100'>
                             </a>
                             <p style="padding:0;margin:0;">{$vo.project_title}</p>
+                            <p style="padding:0;margin:0;">价格:{$vo.extras['price']}</p>
+                            <p style="padding:0;margin:0;">数量:{$vo.extras['sign_limits']}</p>
+                            <p style="padding:0;margin:0;">地址:{$vo.extras['address']}</p>
+                            <p style="padding:0;margin:0;">备注:{$vo.extras['remark']}</p>
+                            {else /}
+                            <p style="padding:0;margin:0;">价格:{$vo.extras['price']}</p>
+                            <p style="padding:0;margin:0;">时长(单位/年):{$vo.extras['year']}</p>
+                            <p style="padding:0;margin:0;">备注:{$vo.extras['remark']}</p>
                             {/if}
                         </td>
                         <td>