Commit 14b3048b authored by 黄奎's avatar 黄奎

页面修改

parent b22dc6fe
......@@ -42,7 +42,7 @@ namespace Mall.Common
}
}
}
return new String(temp);
return new String(temp).Replace(@"\","");
}
/// <summary>
......
......@@ -894,6 +894,7 @@ namespace Mall.Model.Extend.MarketingCenter
/// <summary>
/// 商品名称
/// </summary>
public string name { get; set; }
/// <summary>
......
......@@ -344,6 +344,7 @@ namespace Mall.WebApi.Controllers.MallBase
}
//基础配置
setting = MallHelper.GetBasicSetting(miniProgram);
//分销基础信息
share_setting = MallHelper.GetDistributorBasicsInfo(miniProgram);
//分销商设置
......
using Mall.Model.Entity.BaseSetUp;
using Mall.Common.Enum.MallBase;
using Mall.Model.Entity.BaseSetUp;
using Mall.Model.Entity.MarketingCenter;
using Mall.Model.Extend.BaseSetUp;
using Mall.Model.Extend.MarketingCenter;
......@@ -1591,9 +1592,54 @@ namespace Mall.WebApi.Controllers
}
}
}
//商城风格
var mallStyle = new object();
if (miniProgram?.MallShopStyle > 0)
{
ResultMallShopStyle resultMallShopStyle = new ResultMallShopStyle();
switch (miniProgram.MallShopStyle)
{
case MallShopStyleEnum.Default:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#f39800" };
break;
case MallShopStyleEnum.VibrantYellow:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#f39800" };
break;
case MallShopStyleEnum.RomanticPowder:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff547b", secondary = "#ffe6e8" };
break;
case MallShopStyleEnum.StreamerGold:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ddb766", secondary = "#f0ebd8" };
break;
case MallShopStyleEnum.ElegantPurple:
resultMallShopStyle = new ResultMallShopStyle() { main = "#7783ea", secondary = "#e9ebff" };
break;
case MallShopStyleEnum.TasteRed:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#555555" };
break;
case MallShopStyleEnum.FreshGreen:
resultMallShopStyle = new ResultMallShopStyle() { main = "#63be72", secondary = "#e1f4e3" };
break;
case MallShopStyleEnum.BusinessBlue:
resultMallShopStyle = new ResultMallShopStyle() { main = "#4a90e2", secondary = "#dbe9f9" };
break;
case MallShopStyleEnum.PureBlack:
resultMallShopStyle = new ResultMallShopStyle() { main = "#333333", secondary = "#dedede" };
break;
case MallShopStyleEnum.PassionateRed:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#ffdada" };
break;
}
mallStyle = new
{
resultMallShopStyle?.main,
resultMallShopStyle?.secondary,
};
}
var setting = new
var setting = new
{
mallStyle,
contact_tel = mallBaseModel?.ContactNumber,
over_time = mallBaseModel?.CancelTime,
delivery_time = mallBaseModel?.AutoReceiving,
......@@ -1847,4 +1893,20 @@ namespace Mall.WebApi.Controllers
return share_setting_custom;
}
}
/// <summary>
/// 商城风格
/// </summary>
public class ResultMallShopStyle
{
/// <summary>
/// 主色
/// </summary>
public string main { get; set; }
/// <summary>
/// 辅色
/// </summary>
public string secondary { get; set; }
}
}
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