Commit 8516177b authored by 黄奎's avatar 黄奎

页面修改

parent e6274c6f
...@@ -151,7 +151,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -151,7 +151,7 @@ namespace Mall.WebApi.Controllers.MallBase
//授权页面热区 //授权页面热区
var hotspotCancel = new object(); var hotspotCancel = new object();
var hotspotLogin = new object(); var hotspotLogin = new object();
if (miniProgram.AuthDataList != null && miniProgram.AuthDataList.Count > 0 && miniProgram.AuthDataList.Count==2) if (miniProgram.AuthDataList != null && miniProgram.AuthDataList.Count > 0 && miniProgram.AuthDataList.Count == 2)
{ {
var first = miniProgram.AuthDataList[0]; var first = miniProgram.AuthDataList[0];
var second = miniProgram.AuthDataList[1]; var second = miniProgram.AuthDataList[1];
...@@ -675,7 +675,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -675,7 +675,7 @@ namespace Mall.WebApi.Controllers.MallBase
h = 12, h = 12,
x = 10, x = 10,
y = 0, y = 0,
link =new List<rubikLinkItem>() { link = new List<rubikLinkItem>() {
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[1].Link new_link_url = blockSource.MagicDataList[1].Link
...@@ -757,7 +757,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -757,7 +757,7 @@ namespace Mall.WebApi.Controllers.MallBase
h = 6, h = 6,
x = 10, x = 10,
y = 6, y = 6,
link =new List<rubikLinkItem>() link = new List<rubikLinkItem>()
{ {
new rubikLinkItem() new rubikLinkItem()
{ {
...@@ -920,7 +920,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -920,7 +920,7 @@ namespace Mall.WebApi.Controllers.MallBase
h = 16, h = 16,
x = 25, x = 25,
y = 0, y = 0,
link =new List<rubikLinkItem>() link = new List<rubikLinkItem>()
{ {
new rubikLinkItem() new rubikLinkItem()
{ {
...@@ -977,7 +977,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -977,7 +977,7 @@ namespace Mall.WebApi.Controllers.MallBase
h = 24, h = 24,
x = 25, x = 25,
y = 0, y = 0,
link =new List<rubikLinkItem>() link = new List<rubikLinkItem>()
{ {
new rubikLinkItem() new rubikLinkItem()
{ {
...@@ -1061,7 +1061,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1061,7 +1061,7 @@ namespace Mall.WebApi.Controllers.MallBase
h = 1, h = 1,
x = 1, x = 1,
y = 0, y = 0,
link =new List<rubikLinkItem>() { link = new List<rubikLinkItem>() {
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[1].Link new_link_url = blockSource.MagicDataList[1].Link
...@@ -1112,7 +1112,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1112,7 +1112,7 @@ namespace Mall.WebApi.Controllers.MallBase
h = 1, h = 1,
x = 3, x = 3,
y = 0, y = 0,
link =new List<rubikLinkItem>() link = new List<rubikLinkItem>()
{ {
new rubikLinkItem() new rubikLinkItem()
{ {
...@@ -1144,7 +1144,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1144,7 +1144,7 @@ namespace Mall.WebApi.Controllers.MallBase
h = 62, h = 62,
x = 0, x = 0,
y = 0, y = 0,
link =new List<rubikLinkItem>() link = new List<rubikLinkItem>()
{ {
new rubikLinkItem() new rubikLinkItem()
{ {
...@@ -1222,7 +1222,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1222,7 +1222,7 @@ namespace Mall.WebApi.Controllers.MallBase
h = 62, h = 62,
x = 125, x = 125,
y = 62, y = 62,
link =new List<rubikLinkItem>() link = new List<rubikLinkItem>()
{ {
new rubikLinkItem() new rubikLinkItem()
{ {
...@@ -1364,7 +1364,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1364,7 +1364,7 @@ namespace Mall.WebApi.Controllers.MallBase
} }
} }
setting = new setting = new
{ {
contact_tel = mallBaseModel?.ContactNumber, contact_tel = mallBaseModel?.ContactNumber,
over_time = mallBaseModel?.CancelTime, over_time = mallBaseModel?.CancelTime,
...@@ -1494,7 +1494,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1494,7 +1494,7 @@ namespace Mall.WebApi.Controllers.MallBase
} }
} }
share_setting = new share_setting = new
{ {
level = distributorBasics?.DistributorTier, level = distributorBasics?.DistributorTier,
is_rebate = distributorBasics?.InPurchasing, is_rebate = distributorBasics?.InPurchasing,
...@@ -1605,7 +1605,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1605,7 +1605,7 @@ namespace Mall.WebApi.Controllers.MallBase
#region 商品分类样式 #region 商品分类样式
var productCategoryStyle = productModule.GetProductCategoryStyleInfo(miniProgram.TenantId ?? 0, miniProgram.MallBaseId); var productCategoryStyle = productModule.GetProductCategoryStyleInfo(miniProgram.TenantId ?? 0, miniProgram.MallBaseId);
cat_style = new cat_style = new
{ {
cat_style = productCategoryStyle?.Type, cat_style = productCategoryStyle?.Type,
recommend_count = productCategoryStyle?.Style, recommend_count = productCategoryStyle?.Style,
......
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