配套也区分普通和私教课了

application/admin/controller/Lessonpackage.php

@@ -31,6 +31,8 @@ class Lessonpackage extends Backend
         $this->view->assign("buytimesList", $this->model->getBuytimesList());
         $this->view->assign("newuserList", $this->model->getNewuserList());
         $this->view->assign("olduserList", $this->model->getOlduserList());
+        $this->view->assign("typeList", $this->model->getTypeList());
+        $this->view->assign("giftTypeList", $this->model->getGiftTypeList());
     }
 
 

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

@@ -5,6 +5,9 @@ return [
     'Image'           => '图片',
     'Name'            => '配套标题',
     'Name_en'         => '配套标题(en)',
+    'Type'             => '配套类型',
+    'Type 1'           => '普通课',
+    'Type 2'           => '私教课',
     'Lesson_ids'      => '选择课程',
     'Sessions'        => '课时数量(小时)',
     'Sessions_first'        => '课时数量(小时),初次购买赠送',
@@ -14,6 +17,9 @@ return [
     'Price'           => '价格',
     'Activeremark'    => '显示活动备注',
     'Activeremark_en' => '显示活动备注(en)',
+    'Gift_type'             => '赠送配套类型',
+    'Gift_type 1'           => '普通课',
+    'Gift_type 2'           => '私教课',
     'Gift_lesson_id'  => '选择赠送课程',
     'Gift_sessions'   => '赠送课时数量(小时)',
     'Is_show'         => '客人可以预约?',

application/admin/model/Lessonpackage.php

@@ -61,6 +61,16 @@ class Lessonpackage extends Model
         return ['0' => __('Olduser 0'), '1' => __('Olduser 1')];
     }
 
+    public function getTypeList()
+    {
+        return ['1' => __('Type 1'), '2' => __('Type 2')];
+    }
+
+    public function getGiftTypeList()
+    {
+        return ['1' => __('Type 1'), '2' => __('Type 2')];
+    }
+
 
     public function getIsShowTextAttr($value, $data)
     {
@@ -94,6 +104,23 @@ class Lessonpackage extends Model
     }
 
 
+    public function getTypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['type']) ? $data['type'] : '');
+        $list = $this->getTypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getGiftTypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['gift_type']) ? $data['gift_type'] : '');
+        $list = $this->getGiftTypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+
 
     /*public function lessona()
     {

application/admin/view/lessonpackage/add.html

@@ -27,6 +27,18 @@
         </div>
     </div>
     <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="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </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="">
@@ -117,6 +129,18 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Gift_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+
+            <select  id="c-gift_type" data-rule="required" class="form-control selectpicker" name="row[gift_type]">
+                {foreach name="giftTypeList" item="vo"}
+                <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gift_lesson_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-gift_lesson_id"  data-source="lesson/index" class="form-control selectpage" name="row[gift_lesson_id]" type="text" value="">

application/admin/view/lessonpackage/edit.html

@@ -27,6 +27,18 @@
         </div>
     </div>
     <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>
+    </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}">
@@ -117,6 +129,19 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Gift_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+
+            <select  id="c-gift_type" data-rule="required" class="form-control selectpicker" name="row[gift_type]">
+                {foreach name="giftTypeList" item="vo"}
+                <option value="{$key}" {in name="key" value="$row.gift_type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gift_lesson_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-gift_lesson_id"  data-source="lesson/index" class="form-control selectpage" name="row[gift_lesson_id]" type="text" value="{$row.gift_lesson_id|htmlentities}">

public/assets/js/backend/lessonpackage.js

@@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'name_en', title: __('Name_en'), operate: 'LIKE'},
+                        {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
 //                        {field: 'lesson_ids', title: __('Lesson_ids'), operate: 'LIKE'},
 //                        {field: 'lessona.name', title: __('Lessona.name'), operate: 'LIKE'},
 //                        {field: 'lessona.name_en', title: __('Lessona.name_en'), operate: 'LIKE'},
@@ -48,6 +49,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter: Table.api.formatter.normal,operate:false},
                         {field: 'weigh', title: __('Weigh'), operate: false},
 //                        {field: 'gift_lesson_id', title: __('Gift_lesson_id')},
+                        {field: 'gift_type', title: __('Gift_type'), searchList: {"1":__('Gift_type 1'),"2":__('Gift_type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'lessonb.name', title: __('Lessonb.name'),operate:false},
                         {field: 'lessonb.name_en', title: __('Lessonb.name_en'),operate:false},
                         {field: 'gift_sessions', title: __('Gift_sessions'),operate:false},
@@ -86,3 +88,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
     };
     return Controller;
 });
+$("#c-lesson_ids").data("params", function (obj) {
+    return {
+        custom: {type: $("#c-type").val()}
+    };
+});
+$(document).on("change","#c-type",function(){
+    $("#c-lesson_ids").selectPageClear();
+});
+
+$("#c-gift_lesson_id").data("params", function (obj) {
+    return {
+        custom: {type: $("#c-gift_type").val()}
+    };
+});
+$(document).on("change","#c-gift_type",function(){
+    $("#c-gift_lesson_id").selectPageClear();
+})