教师课程列表bug修复

application/wap/controller/Merchant.php

@@ -161,12 +161,13 @@ class Merchant extends AuthController
      */
     public function lecturer_special_list()
     {
-        list($mer_id, $page, $limit) = UtilService::postMore([
+        list($mer_id, $id, $page, $limit) = UtilService::postMore([
             ['mer_id', 0],
+            ['id', 0],
             ['page', 1],
             ['limit', 10]
         ], $this->request, true);
-        $list = SpecialModel::getLecturerSpecialList($mer_id, $page, $limit);
+        $list = SpecialModel::getLecturerSpecialList($mer_id, $page, $limit, $id);
         return JsonService::successful($list);
     }
 

application/wap/model/special/Special.php

@@ -402,12 +402,16 @@ class Special extends ModelBasic
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getLecturerSpecialList($mer_id = 0, $page = 1, $limit = 10)
+    public static function getLecturerSpecialList($mer_id = 0, $page = 1, $limit = 10, $id= 0)
     {
-        if ($mer_id) {
+        if ($mer_id || $id) {
             $field = ['browse_count', 'image', 'title', 'type', 'money', 'pink_money', 'is_light', 'light_type', 'is_mer_visible', 'is_pink', 'subject_id', 'label', 'id', 'is_show', 'is_del', 'lecturer_id', 'mer_id'];
             $model = self::PreWhere();
-            $model = $model->where(['mer_id' => $mer_id])->order('sort desc,id desc');
+            if ($id) {
+                $model = $model->where(['lecturer_id' => $id])->order('sort desc,id desc');
+            } else {
+                $model = $model->where(['mer_id' => $mer_id])->order('sort desc,id desc');
+            }
             $list = $model->field($field)->page($page, $limit)->select();
             $list = count($list) ? $list->toArray() : [];
         } else {

application/wap/view/first/merchant/teacher_detail.html

@@ -346,19 +346,19 @@
                             this.lecturer_special_list();
                             break;
                         case 3:
-                            this.lecturer_download_list();
+                            //this.lecturer_download_list();
                             break;
                         case 4:
-                            this.lecturer_event_list();
+                            ///this.lecturer_event_list();
                             break;
                         case 5:
-                            this.lecturer_store_list();
+                            //this.lecturer_store_list();
                             break;
                         case 6:
-                            this.getProblemList();
+                            //this.getProblemList();
                             break;
                         case 7:
-                            this.getQuestionList();
+                            //this.getQuestionList();
                             break;
                     }
                 }
@@ -382,19 +382,19 @@
                             vm.lecturer_special_list();
                             break;
                         case 3:
-                            vm.lecturer_download_list();
+                            //vm.lecturer_download_list();
                             break;
                         case 4:
-                            vm.lecturer_event_list();
+                            //vm.lecturer_event_list();
                             break;
                         case 5:
-                            vm.lecturer_store_list();
+                            //vm.lecturer_store_list();
                             break;
                         case 6:
-                            vm.getProblemList();
+                            //vm.getProblemList();
                             break;
                         case 7:
-                            vm.getQuestionList();
+                           // vm.getQuestionList();
                             break;
                     }
                 });
@@ -434,6 +434,7 @@
                         a: 'lecturer_special_list',
                         q: {
                             mer_id: this.lecturer.mer_id,
+                            id: this.lecturer.id,
                             page: this.page,
                             limit: this.limit
                         }