试课课程重建

application/admin/controller/Trylesson.php

@@ -51,14 +51,15 @@ class Trylesson extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['cate'])
+                    ->with(['lesson','cate'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
 
             foreach ($list as $row) {
                 
-                $row->getRelation('cate')->visible(['name','name_en']);
+                $row->getRelation('lesson')->visible(['name','name_en']);
+				$row->getRelation('cate')->visible(['name','name_en']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

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

@@ -1,19 +1,22 @@
 <?php
 
 return [
-    'Id'            => 'id',
-    'Name'          => '标题',
-    'Name_en'       => '标题(en)',
-    'Image'         => '主图',
-    'Price'         => '价格',
-    'Oldprice'      => '原价格',
-    'Content'       => '信息内容',
-    'Content_en'    => '信息内容(en)',
-    'Lessoncate_id' => '课程分类id',
-    'Is_show'       => '是否显示',
-    'Is_show 1'     => '上架',
-    'Is_show 0'     => '下架',
-    'Weigh'         => '排序',
-    'Cate.name'     => '课程分类',
-    'Cate.name_en'  => '课程分类en'
+    'Id'             => 'id',
+    'Name'           => '标题',
+    'Name_en'        => '标题(en)',
+    'Lesson_ids'     => '课程ids',
+    'Image'          => '主图',
+    'Price'          => '价格',
+    'Oldprice'       => '原价格',
+    'Content'        => '信息内容',
+    'Content_en'     => '信息内容(en)',
+    'Lessoncate_id'  => '课程分类id',
+    'Is_show'        => '是否显示',
+    'Is_show 1'      => '上架',
+    'Is_show 0'      => '下架',
+    'Weigh'          => '排序',
+    'Lesson.name'    => '课程标题',
+    'Lesson.name_en' => '课程标题(en)',
+    'Cate.name'      => '课程分类',
+    'Cate.name_en'   => '课程分类en'
 ];

application/admin/model/Trylesson.php

@@ -54,6 +54,12 @@ class Trylesson extends Model
 
 
 
+    public function lesson()
+    {
+        return $this->belongsTo('Lesson', 'lesson_ids', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+
     public function cate()
     {
         return $this->belongsTo('app\admin\model\Lessoncate', 'lessoncate_id', 'id', [], 'LEFT')->setEagerlyType(0);

application/admin/view/trylesson/add.html

@@ -13,6 +13,12 @@
         </div>
     </div>
     <div class="form-group">
+        <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_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">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">

application/admin/view/trylesson/edit.html

@@ -13,6 +13,12 @@
         </div>
     </div>
     <div class="form-group">
+        <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_ids" 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">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">

public/assets/js/backend/trylesson.js

@@ -30,6 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'name_en', title: __('Name_en'), operate: 'LIKE'},
+                        {field: 'lesson_ids', title: __('Lesson_ids'), operate: 'LIKE'},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'price', title: __('Price'), operate:'BETWEEN'},
                         {field: 'oldprice', title: __('Oldprice'), operate:'BETWEEN'},
@@ -38,6 +39,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'lessoncate_id', title: __('Lessoncate_id')},
                         {field: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter: Table.api.formatter.normal},
                         {field: 'weigh', title: __('Weigh'), operate: false},
+//                        {field: 'lesson.name', title: __('Lesson.name'), operate: 'LIKE'},
+//                        {field: 'lesson.name_en', title: __('Lesson.name_en'), operate: 'LIKE'},
                         {field: 'cate.name', title: __('Cate.name'), operate: 'LIKE'},
                         {field: 'cate.name_en', title: __('Cate.name_en'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}