瀏覽代碼

解决冲突

master
zhangli 3 年之前
父節點
當前提交
9e7fc451dd
共有 2 個檔案被更改,包括 1 行新增2 行删除
  1. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml
  2. +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 查看文件

@@ -50,7 +50,6 @@
dataType: "json", dataType: "json",
async: false, async: false,
success: function (data) { success: function (data) {
console.log(data);
var content = ""; var content = "";
if (data.length > 0) { if (data.length > 0) {
content += "<ul id='uldata'>"; content += "<ul id='uldata'>";


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-layer.js 查看文件

@@ -70,7 +70,7 @@
dfop.width = dfop.width > $(window).width() ? $(window).width() - 10 : dfop.width; dfop.width = dfop.width > $(window).width() ? $(window).width() - 10 : dfop.width;
dfop.height = dfop.height > $(window).height() ? $(window).height() - 10 : dfop.height; dfop.height = dfop.height > $(window).height() ? $(window).height() - 10 : dfop.height;
var r = 0; var r = 0;
r=top.layer.open({
r = top.layer.open({
id: dfop.id, id: dfop.id,
maxmin: dfop.maxmin, maxmin: dfop.maxmin,
type: 2, //0(信息框,默认)1(页面层)2(iframe层)3(加载层)4(tips层) type: 2, //0(信息框,默认)1(页面层)2(iframe层)3(加载层)4(tips层)


Loading…
取消
儲存