后台，订单

application/admin/controller/Order.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\common\controller\Backend;
 
 /**
- * 报名记录
+ * 订单
  *
  * @icon fa fa-circle-o
  */
@@ -51,20 +51,15 @@ class Order extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['active','user','student','school','grade','classes'])
+                    ->with(['product','user'])
                     ->where($where)
-                    ->where('order.status',1)
                     ->order($sort, $order)
                     ->paginate($limit);
 
             foreach ($list as $row) {
                 
-                $row->getRelation('active')->visible(['name']);
-				$row->getRelation('user')->visible(['username','nickname']);
-				$row->getRelation('student')->visible(['realname']);
-				$row->getRelation('school')->visible(['schoolname']);
-				$row->getRelation('grade')->visible(['gradename']);
-				$row->getRelation('classes')->visible(['classname']);
+                $row->getRelation('product')->visible(['title']);
+				$row->getRelation('user')->visible(['nickname','mobile']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

application/admin/lang/zh-cn/order.php

@@ -1,25 +1,17 @@
 <?php
 
 return [
-    'Id'                => 'ID',
-    'Order_no'          => '订单号',
-    'Active_id'         => '活动ID',
-    'User_id'           => '用户ID',
-    'Student_id'        => '学生ID',
-    'Createtime'        => '报名时间',
-    'Pay_fee'           => '报名费',
-    'Status'            => '支付状态',
-    'Status 0'          => '待支付',
-    'Status 1'          => '已支付',
-    'Remark'            => '下单备注',
-    'Paytime'           => '支付时间',
-    'Pay_type'          => '支付方式',
-    'Pay_out_trade_no'  => '支付订单号',
-    'Active.name'       => '活动标题',
-    'User.username'     => '用户名',
-    'User.nickname'     => '用户昵称',
-    'Student.realname'  => '姓名',
-    'School.schoolname' => '学校名',
-    'Grade.gradename'   => '年级名',
-    'Classes.classname' => '班级名'
+    'Id'            => 'ID',
+    'Order_no'      => '订单号',
+    'Product_id'    => '商品ID',
+    'User_id'       => '用户ID',
+    'Createtime'    => '报名时间',
+    'Pay_fee'       => '积分价格',
+    'Remark'        => '下单备注',
+    'Status'        => '核销状态',
+    'Status 0'      => '未核销',
+    'Status 1'      => '已核销',
+    'Product.title' => '商品名',
+    'User.nickname' => '昵称',
+    'User.mobile'   => '手机号'
 ];

application/admin/model/Order.php

@@ -25,8 +25,7 @@ class Order extends Model
 
     // 追加属性
     protected $append = [
-        'status_text',
-        'paytime_text'
+        'status_text'
     ];
     
 
@@ -45,21 +44,11 @@ class Order extends Model
     }
 
 
-    public function getPaytimeTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['paytime']) ? $data['paytime'] : '');
-        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
-    }
-
-    protected function setPaytimeAttr($value)
-    {
-        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
-    }
 
 
-    public function active()
+    public function product()
     {
-        return $this->belongsTo('Active', 'active_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('Product', 'product_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 
 
@@ -67,28 +56,4 @@ class Order extends Model
     {
         return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
-
-
-    public function student()
-    {
-        return $this->belongsTo('Userstudent', 'student_id', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
-
-
-    public function school()
-    {
-        return $this->belongsTo('School', 'student.school_id', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
-
-
-    public function grade()
-    {
-        return $this->belongsTo('Grade', 'student.grade_id', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
-
-
-    public function classes()
-    {
-        return $this->belongsTo('Classes', 'student.classes_id', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
 }

application/admin/view/article/edit.html

@@ -21,13 +21,6 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
-                {foreach name="typeList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
             <div class="radio">
                 {foreach name="typeList" item="vo"}
                 <label for="row[type]-{$key}"><input id="row[type]-{$key}" name="row[type]" type="radio" value="{$key}" {in name="key" value="$row.type"}checked{/in} /> {$vo}</label>

application/admin/view/order/add.html

@@ -7,9 +7,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Active_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Product_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-active_id" data-rule="required" data-source="active/index" class="form-control selectpage" name="row[active_id]" type="text" value="">
+            <input id="c-product_id" data-rule="required" data-source="product/index" class="form-control selectpage" name="row[product_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -19,15 +19,15 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Student_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_fee')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-student_id" data-rule="required" data-source="student/index" class="form-control selectpage" name="row[student_id]" type="text" value="">
+            <input id="c-pay_fee" data-rule="required" class="form-control" step="0.01" name="row[pay_fee]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_fee')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_fee" data-rule="required" class="form-control" step="0.01" name="row[pay_fee]" type="number" value="0.00">
+            <input id="c-remark" data-rule="required" class="form-control" name="row[remark]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -42,30 +42,6 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-paytime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_type')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_type" class="form-control" name="row[pay_type]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_out_trade_no')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_out_trade_no" class="form-control" name="row[pay_out_trade_no]" type="text" value="">
-        </div>
-    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/order/edit.html

@@ -3,13 +3,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-order_no" data-rule="required" class="form-control" name="row[order_no]" type="text" value="{$row.order_no|htmlentities}">
+            <input id="c-order_no" data-rule="required" disabled class="form-control" name="row[order_no]" type="text" value="{$row.order_no|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Active_id')}:</label>
+   <!-- <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Product_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-active_id" data-rule="required" data-source="active/index" class="form-control selectpage" name="row[active_id]" type="text" value="{$row.active_id|htmlentities}">
+            <input id="c-product_id" data-rule="required" data-source="product/index" class="form-control selectpage" name="row[product_id]" type="text" value="{$row.product_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -17,17 +17,17 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Student_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_fee')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-student_id" data-rule="required" data-source="student/index" class="form-control selectpage" name="row[student_id]" type="text" value="{$row.student_id|htmlentities}">
+            <input id="c-pay_fee" data-rule="required" disabled class="form-control" step="0.01" name="row[pay_fee]" type="number" value="{$row.pay_fee|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_fee')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_fee" data-rule="required" class="form-control" step="0.01" name="row[pay_fee]" type="number" value="{$row.pay_fee|htmlentities}">
+            <input id="c-remark" data-rule="required" disabled class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -42,30 +42,6 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-paytime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:$row.paytime?datetime($row.paytime):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_type')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_type" class="form-control" name="row[pay_type]" type="text" value="{$row.pay_type|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_out_trade_no')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_out_trade_no" class="form-control" name="row[pay_out_trade_no]" type="text" value="{$row.pay_out_trade_no|htmlentities}">
-        </div>
-    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/order/index.html

@@ -1,6 +1,6 @@
 <div class="panel panel-default panel-intro">
     
-    <!--<div class="panel-heading">
+    <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
             <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
@@ -8,7 +8,7 @@
             <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
             {/foreach}
         </ul>
-    </div>-->
+    </div>
 
 
     <div class="panel-body">
@@ -17,7 +17,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                       <!-- <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         

public/assets/js/backend/order.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'order/index' + location.search,
                     add_url: 'order/add',
                     edit_url: 'order/edit',
-                    del_url: 'order/del',
+//                    del_url: 'order/del',
                     multi_url: 'order/multi',
                     import_url: 'order/import',
                     table: 'order',
@@ -22,32 +22,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
-                fixedColumns: true,
-                fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-//                        {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
-//                        {field: 'active_id', title: __('Active_id')},
-                        {field: 'active.name', title: __('Active.name'), operate: 'LIKE'},
-//                        {field: 'user_id', title: __('User_id')},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
+                        {field: 'product_id', title: __('Product_id')},
+                        {field: 'product.title', title: __('Product.title'), operate: 'LIKE'},
+                        {field: 'user_id', title: __('User_id')},
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-//                        {field: 'student_id', title: __('Student_id')},
-                        {field: 'student.realname', title: __('Student.realname'), operate: 'LIKE'},
-                        {field: 'school.schoolname', title: __('School.schoolname'), operate: 'LIKE'},
-                        {field: 'grade.gradename', title: __('Grade.gradename'), operate: 'LIKE'},
-                        {field: 'classes.classname', title: __('Classes.classname'), operate: 'LIKE'},
+                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'pay_fee', title: __('Pay_fee'), operate:'BETWEEN'},
-                        {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE'},
-                        {field: 'paytime', title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'pay_type', title: __('Pay_type'), operate: 'LIKE'},
-//                        {field: 'pay_out_trade_no', title: __('Pay_out_trade_no'), operate: 'LIKE'},
-
-//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });