Browse Source

课程套餐

lizhen_gitee 1 year ago
parent
commit
e9f50ba5a4

+ 2 - 2
application/admin/controller/Lessonpackage.php

@@ -58,8 +58,8 @@ class Lessonpackage extends Backend
 
             foreach ($list as $row) {
                 
-                $row->getRelation('lessona')->visible(['name']);
-				$row->getRelation('lessonb')->visible(['name']);
+                $row->getRelation('lessona')->visible(['name','name_en']);
+				$row->getRelation('lessonb')->visible(['name','name_en']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

+ 5 - 3
application/admin/lang/zh-cn/lessonpackage.php

@@ -14,10 +14,12 @@ return [
     'Activeremark_en' => '显示活动备注(en)',
     'Gift_lesson_id'  => '赠送课程id',
     'Gift_sessions'   => '赠送课程数量',
-    'Is_show'         => '是否显示',
+    'Is_show'         => '是否上架',
     'Is_show 1'       => '上架',
     'Is_show 0'       => '下架',
     'Weigh'           => '排序',
-    'Lessona.name'     => '标题',
-    'Lessonb.name'     => '标题'
+    'Lessona.name'     => '课程标题',
+    'Lessona.name_en'  => '课程标题(en)',
+    'Lessonb.name'     => '赠送课程标题',
+    'Lessonb.name_en'  => '赠送课程标题(en)'
 ];

+ 5 - 3
public/assets/js/backend/lessonpackage.js

@@ -31,6 +31,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'name_en', title: __('Name_en'), operate: 'LIKE'},
                         {field: 'lesson_id', title: __('Lesson_id')},
+                        {field: 'lessona.name', title: __('Lessona.name'), operate: 'LIKE'},
+                        {field: 'lessona.name_en', title: __('Lessona.name_en'), operate: 'LIKE'},
                         {field: 'sessions', title: __('Sessions')},
                         {field: 'validity', title: __('Validity'), operate: 'LIKE'},
                         {field: 'validity_en', title: __('Validity_en'), operate: 'LIKE'},
@@ -38,12 +40,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'price', title: __('Price'), operate:'BETWEEN'},
                         {field: 'activeremark', title: __('Activeremark'), operate: 'LIKE'},
                         {field: 'activeremark_en', title: __('Activeremark_en'), operate: 'LIKE'},
-                        {field: 'gift_lesson_id', title: __('Gift_lesson_id')},
-                        {field: 'gift_sessions', title: __('Gift_sessions')},
                         {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: 'lessona.name', title: __('Lessona.name'), operate: 'LIKE'},
+                        {field: 'gift_lesson_id', title: __('Gift_lesson_id')},
                         {field: 'lessonb.name', title: __('Lessonb.name'), operate: 'LIKE'},
+                        {field: 'lessonb.name_en', title: __('Lessonb.name_en'), operate: 'LIKE'},
+                        {field: 'gift_sessions', title: __('Gift_sessions')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]