mirror of https://gitee.com/karson/fastadmin.git
Merge remote-tracking branch 'karson/master'
commit
14c78fe3c4
|
|
@ -278,10 +278,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else if (ret && ret.code === -2) {
|
} else if (ret && ret.code === -2) {
|
||||||
Fast.api.open(ret.data.payurl, __('Pay now'), {
|
top.Fast.api.open(ret.data.payurl, __('Pay now'), {
|
||||||
area: ["650px", "700px"],
|
area: ["650px", "700px"],
|
||||||
end: function () {
|
end: function () {
|
||||||
Layer.alert(__('Pay tips'));
|
top.Layer.alert(__('Pay tips'));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else if (ret && ret.code === -3) {
|
} else if (ret && ret.code === -3) {
|
||||||
|
|
@ -486,7 +486,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
|
||||||
formatter: {
|
formatter: {
|
||||||
title: function (value, row, index) {
|
title: function (value, row, index) {
|
||||||
var title = '<a class="title" href="' + row.url + '" data-toggle="tooltip" title="' + __('View addon home page') + '" target="_blank">' + value + '</a>';
|
var title = '<a class="title" href="' + row.url + '" data-toggle="tooltip" title="' + __('View addon home page') + '" target="_blank">' + value + '</a>';
|
||||||
if (row.screenshots.length > 0) {
|
if (row.screenshots && row.screenshots.length > 0) {
|
||||||
title += ' <a href="javascript:;" data-index="' + index + '" class="view-screenshots text-success" title="' + __('View addon screenshots') + '" data-toggle="tooltip"><i class="fa fa-image"></i></a>';
|
title += ' <a href="javascript:;" data-index="' + index + '" class="view-screenshots text-success" title="' + __('View addon screenshots') + '" data-toggle="tooltip"><i class="fa fa-image"></i></a>';
|
||||||
}
|
}
|
||||||
return title;
|
return title;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue