Skip to content

M
mall.oytour.com
Commit 92b9199c authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent ac98a2c9
Show whitespace changes
Inline Side-by-side
Showing with 573 additions and 12 deletions
Mall.WebApi/Controllers/Mall/MallController.cs
View file @ 92b9199c
......@@ -95,7 +95,7 @@ namespace Mall.WebApi.Controllers.MallBase
}, isGetHome: true);
List<object> list = new List<object>();
//测试使用
// selfHomePage.Id = 0;
selfHomePage.Id = 0;
//自定义首页
if (selfHomePage != null && selfHomePage.Id > 0)
{
......@@ -175,6 +175,15 @@ namespace Mall.WebApi.Controllers.MallBase
textPosition = "left" //文字位置
}
});
templateData.data.Add(new
{
id = "empty",
data = new emptyItem()
{
background = "#ffffff",
height = 10
}
});
break;
//轮播图
......@@ -203,6 +212,15 @@ namespace Mall.WebApi.Controllers.MallBase
banners = detailsBannerList
}
});
templateData.data.Add(new
{
id = "empty",
data = new emptyItem()
{
background = "#ffffff",
height = 10
}
});
break;
//导航图标
case "home_nav":
......@@ -244,6 +262,15 @@ namespace Mall.WebApi.Controllers.MallBase
navs = navs, //导航图标
}
});
templateData.data.Add(new
{
id = "empty",
data = new emptyItem()
{
background = "#ffffff",
height = 10
}
});
break;
//视频插件
......@@ -257,6 +284,15 @@ namespace Mall.WebApi.Controllers.MallBase
url = subitem.video_url,
}
});
templateData.data.Add(new
{
id = "empty",
data = new emptyItem()
{
background = "#ffffff",
height = 10
}
});
break;
//公告
case "notice":
......@@ -279,6 +315,15 @@ namespace Mall.WebApi.Controllers.MallBase
btnTextColor = "#ffffff" //按钮文本颜色
}
});
templateData.data.Add(new
{
id = "empty",
data = new emptyItem()
{
background = "#ffffff",
height = 10
}
});
break;
//专题
case "topic":
......@@ -302,7 +347,6 @@ namespace Mall.WebApi.Controllers.MallBase
});
}
}
templateData.data.Add(new
{
id = subitem.key,
......@@ -318,6 +362,15 @@ namespace Mall.WebApi.Controllers.MallBase
topic_list = topic_list
}
});
templateData.data.Add(new
{
id = "empty",
data = new emptyItem()
{
background = "#ffffff",
height = 10
}
});
break;
//领劵中心
case "coupon":
......@@ -371,11 +424,11 @@ namespace Mall.WebApi.Controllers.MallBase
}
templateData.data.Add(new
{
id = subitem.key,
id = "goods",
data = new goodsItem()
{
showCat = false,
catPosition = "",
catPosition = "top",
catStyle = 0,
addGoodsType = 0,
goodsLength = 6,
......@@ -404,17 +457,23 @@ namespace Mall.WebApi.Controllers.MallBase
list = tempGoodsList
}
});
templateData.data.Add(new
{
id = "empty",
data = new emptyItem()
{
background = "#ffffff",
height = 10
}
});
break;
//图片魔方
case "block":
var blockSource = programModule.GetMallMagicListModule(new Model.Entity.User.RB_Mall_Magic_Extend()
{
MallBaseId = miniProgram.MallBaseId,
TenantId = Convert.ToInt32(miniProgram.TenantId)
}).FirstOrDefault();
if (blockSource!=null && blockSource.Id>0)
{
var rubikData = new rubikItem()
......@@ -423,7 +482,6 @@ namespace Mall.WebApi.Controllers.MallBase
space=0,
list = new List<rubikDetailItem>(),
};
switch (rubikData.style)
{
//1张图
......@@ -482,7 +540,6 @@ namespace Mall.WebApi.Controllers.MallBase
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
......@@ -507,15 +564,519 @@ namespace Mall.WebApi.Controllers.MallBase
backgroundPosition = "center"
});
break;
}
//三张图
case 2:
rubikData.height = "360";
rubikData.w = "25";
rubikData.h = 12;
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 10,
h = 12,
x = 0,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
},
width = "calc(40%)",
height = "calc(100%)",
left = "0%",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[0].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 15,
h = 6,
x = 10,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
},
width = "calc(60%)",
height = "calc(50%)",
left = "calc(40%)",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[1].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 15,
h = 6,
x = 10,
y = 6,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
},
width = "calc(60%)",
height = "calc(50%)",
left = "calc(40%)",
top = "calc(50%)",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[2].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
break;
//四张图
case 3:
rubikData.height = "360";
rubikData.w = "50";
rubikData.h = 24;
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 20,
h = 24,
x = 0,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
},
width = "calc(40%)",
height = "calc(100%)",
left = "0%",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[0].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 30,
h = 12,
x = 20,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
},
width = "calc(60%)",
height = "calc(50%)",
left = "calc(40%)",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[1].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 15,
h = 12,
x = 20,
y = 12,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
},
width = "calc(30%)",
height = "calc(50%)",
left = "calc(40%)",
top = "calc(50%)",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[2].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 15,
h = 12,
x = 35,
y = 12,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[3].Link
},
width = "calc(30%)",
height = "calc(50%)",
left = "calc(70%)",
top = "calc(50%)",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[3].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
break;
//两张平分图
case 4:
rubikData.height = "240";
rubikData.w = "50";
rubikData.h = 16;
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 25,
h = 16,
x = 0,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
},
width = "calc(50%)",
height = "calc(100%)",
left = "0%",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[0].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 25,
h = 16,
x = 25,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
},
width = "calc(50%)",
height = "calc(100%)",
left = "0%",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[1].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
break;
//三张平分图
case 5:
rubikData.height = "240";
rubikData.w = "75";
rubikData.h = 24;
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 25,
h = 24,
x = 0,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
},
width = "calc(33.33%)",
height = "calc(100%)",
left = "0%",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[0].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 25,
h = 24,
x = 25,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
},
width = "calc(33.33%)",
height = "calc(100%)",
left = "calc(33.33%)",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[1].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 25,
h = 24,
x = 50,
y = 6,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
},
width = "calc(33.34%)",
height = "calc(100%)",
left = "calc(66.66%)",
top = "calc(0%)",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[2].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
break;
//四张平分
case 6:
rubikData.height = "186";
rubikData.w = "4";
rubikData.h = 1;
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 1,
h = 1,
x = 0,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
},
width = "calc(25%)",
height = "calc(100%)",
left = "0%",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[0].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 1,
h = 1,
x = 1,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
},
width = "calc(25%)",
height = "calc(100%)",
left = "calc(25%)",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[1].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 1,
h = 1,
x = 2,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
},
width = "calc(25%)",
height = "calc(100%)",
left = "calc(50%)",
top = "calc(0%)",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[2].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 1,
h = 1,
x = 3,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[3].Link
},
width = "calc(25%)",
height = "calc(100%)",
left = "calc(75%)",
top = "calc(0%)",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[3].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
break;
//四张上下平分
case 7:
rubikData.height = "372";
rubikData.w = "250";
rubikData.h = 124;
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 125,
h = 62,
x = 0,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
},
width = "calc(50%)",
height = "calc(50%)",
left = "0%",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[0].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 125,
h = 62,
x = 125,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
},
width = "calc(50%)",
height = "calc(50%)",
left = "calc(50%)",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[1].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 125,
h = 62,
x = 0,
y = 62,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
},
width = "calc(50%)",
height = "calc(50%)",
left = "calc(0%)",
top = "calc(50%)",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[2].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 125,
h = 62,
x = 125,
y = 62,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[3].Link
},
width = "calc(50%)",
height = "calc(50%)",
left = "calc(05%)",
top = "calc(50%)",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[3].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
break;
}
templateData.data.Add(new
{
id = "rubik",
data = rubikData
}); ;
});
templateData.data.Add(new
{
id = "empty",
data = new emptyItem()
{
background = "#ffffff",
height = 10
}
});
}
break;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment