This website works better with JavaScript.
Home
Explore
Help
Register
Sign In
bjquanjiang
/
DigitalScholl
Watch
1
Star
0
Fork
0
Code
Issues
0
Pull Requests
0
Releases
0
Wiki
Activity
Browse Source
解决冲突
master
zhangli
3 years ago
parent
6ccfe9cea6
7cb95f7ef8
commit
9e7fc451dd
2 changed files
with
1 additions
and
2 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+0
-1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml
+1
-1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-layer.js
+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml
View File
@@ -50,7 +50,6 @@
dataType: "json",
async: false,
success: function (data) {
console.log(data);
var content = "";
if (data.length > 0) {
content += "<ul id='uldata'>";
+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-layer.js
View File
@@ -70,7 +70,7 @@
dfop.width = dfop.width > $(window).width() ? $(window).width() - 10 : dfop.width;
dfop.height = dfop.height > $(window).height() ? $(window).height() - 10 : dfop.height;
var r = 0;
r=top.layer.open({
r
=
top.layer.open({
id: dfop.id,
maxmin: dfop.maxmin,
type: 2, //0(信息框,默认)1(页面层)2(iframe层)3(加载层)4(tips层)
Write
Preview
Loading…
Cancel
Save