套餐订单重建

application/admin/controller/Packageorder.php

@@ -53,7 +53,7 @@ class Packageorder extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['user','package','lesson'])
+                    ->with(['user','package'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
@@ -62,7 +62,6 @@ class Packageorder extends Backend
                 
                 $row->getRelation('user')->visible(['firstname','lastname']);
 				$row->getRelation('package')->visible(['name','name_en']);
-				$row->getRelation('lesson')->visible(['name','name_en']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

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

@@ -5,7 +5,7 @@ return [
     'Order_no'        => '订单号',
     'User_id'         => '用户id',
     'Package_id'      => '套餐id',
-    'Lesson_id'       => '课程id',
+    'Lesson_ids'      => '课程ids',
     'Sessions'        => '共计获得课程数量',
     'Starttime'       => '开始时间',
     'Days'            => '实际有效天数',
@@ -30,7 +30,5 @@ return [
     'User.firstname'  => '名',
     'User.lastname'   => '姓',
     'Package.name'    => '套餐标题',
-    'Package.name_en' => '套餐标题(en)',
-    'Lesson.name'     => '课程标题',
-    'Lesson.name_en'  => '课程标题(en)'
+    'Package.name_en' => '套餐标题(en)'
 ];

application/admin/model/Packageorder.php

@@ -121,10 +121,4 @@ class Packageorder extends Model
     {
         return $this->belongsTo('Lessonpackage', 'package_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
-
-
-    public function lesson()
-    {
-        return $this->belongsTo('Lesson', 'lesson_id', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
 }

application/admin/view/packageorder/add.html

@@ -19,9 +19,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Lesson_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Lesson_ids')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-lesson_id" data-rule="required" data-source="lesson/index" class="form-control selectpage" name="row[lesson_id]" type="text" value="">
+            <input id="c-lesson_ids" data-rule="required" data-source="lesson/index" data-multiple="true" class="form-control selectpage" name="row[lesson_ids]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -102,6 +102,12 @@
 
         </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 layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/packageorder/edit.html

@@ -19,9 +19,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Lesson_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Lesson_ids')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-lesson_id" disabled data-rule="required" data-source="lesson/index" class="form-control selectpage" name="row[lesson_id]" type="text" value="{$row.lesson_id|htmlentities}">
+            <input id="c-lesson_ids" disabled data-rule="required" data-source="lesson/index" data-multiple="true" class="form-control selectpage" name="row[lesson_ids]" type="text" value="{$row.lesson_ids|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -102,6 +102,12 @@
 
         </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 layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

public/assets/js/backend/packageorder.js

@@ -35,9 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'package_id', title: __('Package_id')},
                         {field: 'package.name', title: __('Package.name'), operate: 'LIKE'},
                         {field: 'package.name_en', title: __('Package.name_en'), operate: 'LIKE'},
-                        {field: 'lesson_id', title: __('Lesson_id')},
-                        {field: 'lesson.name', title: __('Lesson.name'), operate: 'LIKE'},
-                        {field: 'lesson.name_en', title: __('Lesson.name_en'), operate: 'LIKE'},
+                        {field: 'lesson_ids', title: __('Lesson_ids')},
                         {field: 'sessions', title: __('Sessions')},
                         {field: 'starttime', title: __('Starttime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'days', title: __('Days')},