+
{:__('Prevtime')}:
+
+
+ {:build_heading()}
+
+
+
+
diff --git a/extend/traits/ModelTrait.php b/extend/traits/ModelTrait.php
index 9abf71f..f9572ee 100644
--- a/extend/traits/ModelTrait.php
+++ b/extend/traits/ModelTrait.php
@@ -16,7 +16,7 @@ trait ModelTrait
public static $url_enpity = null;
public static $url_lock = false;
public static $url_lock_key = "";
- public static $url_lock_suffix = "test-lock-suffix";
+ public static $url_lock_suffix = "";
public static $url_lock_timeout = 120;
@@ -27,9 +27,15 @@ trait ModelTrait
*/
public static function beginTrans()
{
- if (self::$url_lock) {
- self::$url_enpity = new \bw\UrlLock(self::$url_lock_key, self::$url_lock_suffix, self::$url_lock_timeout, self::$url_error_msg);
- self::$url_enpity->lock();
+ if (static::$url_lock) {
+// var_dump(static::$url_lock);
+ if(!static::$url_lock_suffix){
+ //用继承的类名当锁的key
+ static::$url_lock_suffix = get_called_class()."-lock-suffix";
+ }
+
+ static::$url_enpity = new \bw\UrlLock(static::$url_lock_key, static::$url_lock_suffix, static::$url_lock_timeout, static::$url_error_msg);
+ static::$url_enpity->lock();
}
Db::startTrans();
}
@@ -39,7 +45,7 @@ trait ModelTrait
*/
public static function commitTrans()
{
- if(self::$url_enpity)self::$url_enpity->free();
+ if(static::$url_enpity)static::$url_enpity->free();
Db::commit();
}
@@ -48,7 +54,10 @@ trait ModelTrait
*/
public static function rollbackTrans()
{
- if(self::$url_enpity)self::$url_enpity->free();
+ if(static::$url_enpity){
+// var_dump(22222222);
+ static::$url_enpity->free();
+ };
Db::rollback();
}
@@ -59,9 +68,9 @@ trait ModelTrait
public static function checkTrans($res)
{
if ($res) {
- self::commitTrans();
+ static::commitTrans();
} else {
- self::rollbackTrans();
+ static::rollbackTrans();
}
}
diff --git a/public/assets/js/backend/manystore/apirule.js b/public/assets/js/backend/manystore/apirule.js
new file mode 100644
index 0000000..2c93161
--- /dev/null
+++ b/public/assets/js/backend/manystore/apirule.js
@@ -0,0 +1,176 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function ($, undefined, Backend, Table, Form, Template) {
+
+ var Controller = {
+ index: function () {
+ // 初始化表格参数配置
+ Table.api.init({
+ extend: {
+ "index_url": "manystore/apirule/index",
+ "add_url": "manystore/apirule/add",
+ "edit_url": "manystore/apirule/edit",
+ "del_url": "manystore/apirule/del",
+ "multi_url": "manystore/apirule/multi",
+ "table": "manystore_auth_apirule"
+ }
+ });
+
+ var table = $("#table");
+
+ // 初始化表格
+ table.bootstrapTable({
+ url: $.fn.bootstrapTable.defaults.extend.index_url,
+ sortName: 'weigh',
+ escape: false,
+ columns: [
+ [
+ {field: 'state', checkbox: true,},
+ {field: 'id', title: 'ID'},
+ {field: 'title', title: __('Title'), align: 'left', formatter: Controller.api.formatter.title},
+ {field: 'icon', title: __('Icon'), formatter: Controller.api.formatter.icon},
+ {field: 'name', title: __('Name'), align: 'left', formatter: Controller.api.formatter.name},
+ {field: 'weigh', title: __('Weigh')},
+ {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
+ {
+ field: 'ismenu',
+ title: __('Ismenu'),
+ align: 'center',
+ formatter: Table.api.formatter.toggle
+ },
+ {
+ field: 'id',
+ title: '
',
+ operate: false,
+ formatter: Controller.api.formatter.subnode
+ },
+ {
+ field: 'operate',
+ title: __('Operate'),
+ table: table,
+ events: Table.api.events.operate,
+ formatter: Table.api.formatter.operate
+ }
+ ]
+ ],
+ pagination: false,
+ search: false,
+ commonSearch: false,
+ });
+
+ // 为表格绑定事件
+ Table.api.bindevent(table);
+
+ //当内容渲染完成后
+ table.on('post-body.bs.table', function (e, settings, json, xhr) {
+ //默认隐藏所有子节点
+ //$("a.btn[data-id][data-pid][data-pid!=0]").closest("tr").hide();
+ $(".btn-node-sub.disabled").closest("tr").hide();
+
+ //显示隐藏子节点
+ $(".btn-node-sub").off("click").on("click", function (e) {
+ var status = $(this).data("shown") ? true : false;
+ $("a.btn[data-pid='" + $(this).data("id") + "']").each(function () {
+ $(this).closest("tr").toggle(!status);
+ });
+ $(this).data("shown", !status);
+ return false;
+ });
+ //点击切换/排序/删除操作后刷新左侧菜单
+ $(".btn-change[data-id],.btn-delone,.btn-dragsort").data("success", function (data, ret) {
+ Fast.api.refreshmenu();
+ return false;
+ });
+
+ });
+ //批量删除后的回调
+ $(".toolbar > .btn-del,.toolbar .btn-more~ul>li>a").data("success", function (e) {
+ Fast.api.refreshmenu();
+ });
+ //展开隐藏一级
+ $(document.body).on("click", ".btn-toggle", function (e) {
+ $("a.btn[data-id][data-pid][data-pid!=0].disabled").closest("tr").hide();
+ var that = this;
+ var show = $("i", that).hasClass("fa-chevron-down");
+ $("i", that).toggleClass("fa-chevron-down", !show);
+ $("i", that).toggleClass("fa-chevron-up", show);
+ $("a.btn[data-id][data-pid][data-pid!=0]").not('.disabled').closest("tr").toggle(show);
+ $(".btn-node-sub[data-pid=0]").data("shown", show);
+ });
+ //展开隐藏全部
+ $(document.body).on("click", ".btn-toggle-all", function (e) {
+ var that = this;
+ var show = $("i", that).hasClass("fa-plus");
+ $("i", that).toggleClass("fa-plus", !show);
+ $("i", that).toggleClass("fa-minus", show);
+ $(".btn-node-sub.disabled").closest("tr").toggle(show);
+ $(".btn-node-sub").data("shown", show);
+ });
+ },
+ add: function () {
+ Controller.api.bindevent();
+ },
+ edit: function () {
+ Controller.api.bindevent();
+ },
+ api: {
+ formatter: {
+ title: function (value, row, index) {
+ return !row.ismenu || row.status == 'hidden' ? "
" + value + " " : value;
+ },
+ name: function (value, row, index) {
+ return !row.ismenu || row.status == 'hidden' ? "
" + value + " " : value;
+ },
+ icon: function (value, row, index) {
+ return '';
+ },
+ subnode: function (value, row, index) {
+ return '';
+ }
+ },
+ bindevent: function () {
+ $(document).on('click', "input[name='row[ismenu]']", function () {
+ var name = $("input[name='row[name]']");
+ name.prop("placeholder", $(this).val() == 1 ? name.data("placeholder-menu") : name.data("placeholder-node"));
+ });
+ $("input[name='row[ismenu]']:checked").trigger("click");
+
+ var iconlist = [];
+ var iconfunc = function () {
+ Layer.open({
+ type: 1,
+ area: ['99%', '98%'], //宽高
+ content: Template('chooseicontpl', {iconlist: iconlist})
+ });
+ };
+ Form.api.bindevent($("form[role=form]"), function (data) {
+ Fast.api.refreshmenu();
+ });
+ $(document).on('click', ".btn-search-icon", function () {
+ if (iconlist.length == 0) {
+ $.get(Config.site.cdnurl + "/assets/libs/font-awesome/less/variables.less", function (ret) {
+ var exp = /fa-var-(.*):/ig;
+ var result;
+ while ((result = exp.exec(ret)) != null) {
+ iconlist.push(result[1]);
+ }
+ iconfunc();
+ });
+ } else {
+ iconfunc();
+ }
+ });
+ $(document).on('click', '#chooseicon ul li', function () {
+ $("input[name='row[icon]']").val('fa fa-' + $(this).data("font"));
+ Layer.closeAll();
+ });
+ $(document).on('keyup', 'input.js-icon-search', function () {
+ $("#chooseicon ul li").show();
+ if ($(this).val() != '') {
+ $("#chooseicon ul li:not([data-font*='" + $(this).val() + "'])").hide();
+ }
+ });
+ }
+ }
+ };
+ return Controller;
+});
diff --git a/public/assets/js/backend/manystore/index.js b/public/assets/js/backend/manystore/index.js
index fe0036f..1a7754d 100644
--- a/public/assets/js/backend/manystore/index.js
+++ b/public/assets/js/backend/manystore/index.js
@@ -12,7 +12,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
url_url: 'manystore/index/url',
lookminiqrcode_url: 'manystore/index/lookminiqrcode',
miniqrcode_url: 'manystore/index/miniqrcode',
-
+ freeapi_url: 'manystore/index/freeapi',
free_url: 'manystore/index/free',
multi_url: 'manystore/index/multi',
}
@@ -120,11 +120,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
},
{name: 'free',
- text: '免登录进入机构后台',
+ text: '免登录进入机构专业版后台',
icon: 'fa fa-sign-in',
classname: 'btn btn-ajax',
url: $.fn.bootstrapTable.defaults.extend.free_url,
- confirm: '确认免登录进入机构后台？如果已登录其他机构，对方账号将被强制退出。',
+ confirm: '确认免登录进入机构专业版后台？（专业版为老版本后台比API版本功能更多更全，但操作稍多一些）如果已登录其他机构，对方账号将被强制退出。',
dropdown : '更多',
success: function (data, ret) {
Layer.alert(ret.msg );
@@ -145,6 +145,32 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
// }
// return false;
}},
+ {name: 'freeapi',
+ text: '免登录进入机构API版后台',
+ icon: 'fa fa-sign-in',
+ classname: 'btn btn-ajax',
+ url: $.fn.bootstrapTable.defaults.extend.freeapi_url,
+ confirm: '确认免登录进入机构API版后台？（API版本操作更简洁明了，但功能没有【专业版|老版本】后台的多）',
+ dropdown : '更多',
+ success: function (data, ret) {
+ Layer.alert(ret.msg );
+ $(".btn-refresh").trigger("click");
+ //js获取当前域名
+
+
+ window.open(shop_api_backend_url, '_blank');
+ },
+ error: function (data, ret) {
+ Layer.alert(ret.msg);
+ return false;
+ },
+ visible: function (row) {
+ //显示条件 只能待入住订单
+ // if((row.status == 2 || row.status == 3) && row.mock_type == "base" && row.add_mock_status == "1" ){
+ return true;
+ // }
+ // return false;
+ }},
{
name: 'classes_spec',
text: __('机构课程'),
diff --git a/public/assets/js/backend/school/classes/activity/activity.js b/public/assets/js/backend/school/classes/activity/activity.js
index af86bf8..43dfb90 100644
--- a/public/assets/js/backend/school/classes/activity/activity.js
+++ b/public/assets/js/backend/school/classes/activity/activity.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -30,6 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'weigh',
fixedColumns: true,
fixedRightNumber: 2,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/backend/school/classes/activity/order/order.js b/public/assets/js/backend/school/classes/activity/order/order.js
index 6728f37..e4c1307 100644
--- a/public/assets/js/backend/school/classes/activity/order/order.js
+++ b/public/assets/js/backend/school/classes/activity/order/order.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
fixedColumns: true,
fixedRightNumber: 1,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/backend/school/classes/evaluate.js b/public/assets/js/backend/school/classes/evaluate.js
index c93f5f7..3fc1c9a 100644
--- a/public/assets/js/backend/school/classes/evaluate.js
+++ b/public/assets/js/backend/school/classes/evaluate.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -24,6 +24,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'weigh',
fixedColumns: true,
fixedRightNumber: 1,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/backend/school/classes/order/service_order.js b/public/assets/js/backend/school/classes/order/service_order.js
index f4c8425..e5b397f 100644
--- a/public/assets/js/backend/school/classes/order/service_order.js
+++ b/public/assets/js/backend/school/classes/order/service_order.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -30,6 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
fixedColumns: true,
fixedRightNumber: 1,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/backend/school/help/cate.js b/public/assets/js/backend/school/help/cate.js
index 1bed1c7..2d90a65 100644
--- a/public/assets/js/backend/school/help/cate.js
+++ b/public/assets/js/backend/school/help/cate.js
@@ -76,8 +76,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
{field: 'pid', title: __('Pid'),visible:false},
{field: 'name', title: __('Name') ,width:180, align: 'left', formatter: Controller.api.formatter.name, clickToSelect: !false},
{field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.toggle},
- {field: 'weigh', title: __('Weigh'), operate: false},
- {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+ {field: 'weigh', title: __('Weigh'),visible:false, operate: false},
+ {field: 'createtime', title: __('Createtime'),visible:false, operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'updatetime', title: __('Updatetime'),visible:false, operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{
diff --git a/public/assets/js/backend/third.js b/public/assets/js/backend/third.js
index a3c2d70..8c5e3ec 100644
--- a/public/assets/js/backend/third.js
+++ b/public/assets/js/backend/third.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -23,6 +23,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
fixedColumns: true,
fixedRightNumber: 1,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/manystore/school/classes/activity/activity.js b/public/assets/js/manystore/school/classes/activity/activity.js
index d581948..d30e5b4 100644
--- a/public/assets/js/manystore/school/classes/activity/activity.js
+++ b/public/assets/js/manystore/school/classes/activity/activity.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'weigh',
fixedColumns: true,
fixedRightNumber: 2,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/manystore/school/classes/activity/order/order.js b/public/assets/js/manystore/school/classes/activity/order/order.js
index cf3c428..a9960e9 100644
--- a/public/assets/js/manystore/school/classes/activity/order/order.js
+++ b/public/assets/js/manystore/school/classes/activity/order/order.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
fixedColumns: true,
fixedRightNumber: 1,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/manystore/school/classes/classes_lib.js b/public/assets/js/manystore/school/classes/classes_lib.js
index ba28db4..3501ac8 100644
--- a/public/assets/js/manystore/school/classes/classes_lib.js
+++ b/public/assets/js/manystore/school/classes/classes_lib.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'weigh',
fixedColumns: true,
fixedRightNumber: 2,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/manystore/school/classes/evaluate.js b/public/assets/js/manystore/school/classes/evaluate.js
index 8032567..4de9863 100644
--- a/public/assets/js/manystore/school/classes/evaluate.js
+++ b/public/assets/js/manystore/school/classes/evaluate.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -24,6 +24,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'weigh',
fixedColumns: true,
fixedRightNumber: 1,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/manystore/school/classes/hourorder/order.js b/public/assets/js/manystore/school/classes/hourorder/order.js
index ca9a8ec..2e72eb1 100644
--- a/public/assets/js/manystore/school/classes/hourorder/order.js
+++ b/public/assets/js/manystore/school/classes/hourorder/order.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
fixedColumns: true,
fixedRightNumber: 1,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/manystore/school/classes/order/order.js b/public/assets/js/manystore/school/classes/order/order.js
index a2e0e66..0aaf3fc 100644
--- a/public/assets/js/manystore/school/classes/order/order.js
+++ b/public/assets/js/manystore/school/classes/order/order.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
fixedColumns: true,
fixedRightNumber: 1,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/manystore/school/classes/order/service_order.js b/public/assets/js/manystore/school/classes/order/service_order.js
index 58cb556..1dff083 100644
--- a/public/assets/js/manystore/school/classes/order/service_order.js
+++ b/public/assets/js/manystore/school/classes/order/service_order.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -29,6 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
fixedColumns: true,
fixedRightNumber: 1,
+ asyndownload: true,
columns: [
[
{checkbox: true},
diff --git a/public/assets/js/manystore/user/user.js b/public/assets/js/manystore/user/user.js
index 512db13..ea8d87b 100644
--- a/public/assets/js/manystore/user/user.js
+++ b/public/assets/js/manystore/user/user.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
@@ -24,6 +24,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
fixedColumns: true,
fixedRightNumber: 1,
+ asyndownload: true,
columns: [
[
{checkbox: true},