-
-
-
- {:build_heading()}
-
-
-
-
diff --git a/public/assets/js/backend/school/classes/classes_lib.js b/public/assets/js/backend/school/classes/classes_lib.js
index 90f7c4e..850586a 100644
--- a/public/assets/js/backend/school/classes/classes_lib.js
+++ b/public/assets/js/backend/school/classes/classes_lib.js
@@ -87,6 +87,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
{field: 'price', title: __('Price'),sortable:true, operate:'BETWEEN'},
{field: 'underline_price', title: __('Underline_price'),sortable:true, operate:'BETWEEN'},
{field: 'admin_id', title: __('Admin_id'),visible:false},
+ {field: 'teacher_id', title: __('老师id'),visible:false},
{field: 'weigh', title: __('Weigh'),sortable:true, operate: false},
{field: 'recommend', title: __('Recommend'),sortable:true, searchList: {"0":__('Recommend 0'),"1":__('Recommend 1')}, formatter: Table.api.formatter.normal},
{field: 'hot', title: __('Hot'),sortable:true, searchList: {"0":__('Hot 0'),"1":__('Hot 1')}, formatter: Table.api.formatter.normal},
diff --git a/public/assets/js/backend/school/classes/visit.js b/public/assets/js/backend/school/classes/visit.js
index ed1e49d..81ca3f2 100644
--- a/public/assets/js/backend/school/classes/visit.js
+++ b/public/assets/js/backend/school/classes/visit.js
@@ -32,17 +32,21 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
{field: 'user_id', title: __('用户id'),visible:false},
{field: 'classes_lib_id', title: __('Classes_lib_id')},
{field: 'classes_activity_id', title: __('Classes_activity_id')},
+ {field: 'help_article_id', title: __('帮助文章id')},
{field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
{field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
{field: 'user.realname', title: __('User.realname'),visible:false, operate: 'LIKE'},
{field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
{field: 'user.avatar', title: __('User.avatar'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'lib.title', title: __('Lib.title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'lib.headimage', title: __('Lib.headimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
{field: 'activity.title', title: __('Activity.title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'activity.headimage', title: __('Activity.headimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+ {field: 'helparticle.title', title: __('帮助文章'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
diff --git a/public/assets/js/backend/school/help/cate.js b/public/assets/js/backend/school/help/cate.js
index 2d90a65..d364e87 100644
--- a/public/assets/js/backend/school/help/cate.js
+++ b/public/assets/js/backend/school/help/cate.js
@@ -66,7 +66,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
});
-
+ $("#myTabContent .btn-toggle-all").trigger("click");
},
columns: [
@@ -99,9 +99,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
callback: function (data) {
},
- // visible: function (row) {
- // return row.status == '2'||row.status == '3';
- // }
+ visible: function (row) {
+ return row.level_num == 1;
+ }
},
// {
// name: 'article',
@@ -125,9 +125,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
callback: function (data) {
},
- // visible: function (row) {
- // return row.status == '2'||row.status == '3';
- // }
+ visible: function (row) {
+ return row.level_num == 2&&row.haschild == 0;
+ }
},
], events: Table.api.events.operate, formatter: Table.api.formatter.operate},
@@ -275,7 +275,27 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
{field: 'weigh', title: __('Weigh'), operate: false},
{field: 'views', title: __('Views')},
{field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
- {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+ // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+ {field: 'operate', title: __('Operate'), table: table , buttons: [
+ {
+ name: 'visit',
+ text: __('查看用户访问记录'),
+ title: __('查看用户访问记录'),
+ classname: 'btn btn-dialog',
+ icon: 'fa fa-handshake-o',
+ dropdown : '更多',
+ url: visit_url,
+ callback: function (data) {
+
+ },
+ // visible: function (row) {
+ // return row.classes_evaluate_id;
+ // }
+ },
+
+ ], events: Table.api.events.operate, formatter: Table.api.formatter.operate},
+
+
]
]
});
@@ -370,6 +390,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
},
bindevent: function () {
Form.api.bindevent($("form[role=form]"));
+ $("#myTabContent .btn-toggle-all").trigger("click");
}
}
};
@@ -388,5 +409,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
return 'school/help/article/add?help_cate_ids='+row.id;
}
+ var visit_url = function (row,dom) {
+ return 'school/classes/visit/index?help_article_id='+row.id;
+ }
+
return Controller;
});
diff --git a/public/assets/js/manystore/school/classes/classes_lib.js b/public/assets/js/manystore/school/classes/classes_lib.js
index 3501ac8..8da0adc 100644
--- a/public/assets/js/manystore/school/classes/classes_lib.js
+++ b/public/assets/js/manystore/school/classes/classes_lib.js
@@ -68,7 +68,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
{field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-
+ {field: 'teacher_id', title: __('老师id'),visible:false},
{field: 'reason', title: __('Reason'), operate: 'LIKE' },
{field: 'auth_time', title: __('Auth_time'), operate:'RANGE',visible:false, addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},