Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
14b3048b
Commit
14b3048b
authored
Jun 12, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
b22dc6fe
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
67 additions
and
3 deletions
+67
-3
ConvertHelper.cs
Mall.Common/Plugin/ConvertHelper.cs
+1
-1
RB_Miniprogram_Template_Extend.cs
.../Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
+1
-0
MallController.cs
Mall.WebApi/Controllers/Mall/MallController.cs
+1
-0
MallHelper.cs
Mall.WebApi/Controllers/Mall/MallHelper.cs
+64
-2
No files found.
Mall.Common/Plugin/ConvertHelper.cs
View file @
14b3048b
...
...
@@ -42,7 +42,7 @@ namespace Mall.Common
}
}
}
return
new
String
(
temp
);
return
new
String
(
temp
)
.
Replace
(
@"\"
,
""
)
;
}
/// <summary>
...
...
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @
14b3048b
...
...
@@ -894,6 +894,7 @@ namespace Mall.Model.Extend.MarketingCenter
/// <summary>
/// 商品名称
/// </summary>
public
string
name
{
get
;
set
;
}
/// <summary>
...
...
Mall.WebApi/Controllers/Mall/MallController.cs
View file @
14b3048b
...
...
@@ -344,6 +344,7 @@ namespace Mall.WebApi.Controllers.MallBase
}
//基础配置
setting
=
MallHelper
.
GetBasicSetting
(
miniProgram
);
//分销基础信息
share_setting
=
MallHelper
.
GetDistributorBasicsInfo
(
miniProgram
);
//分销商设置
...
...
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @
14b3048b
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
;
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment