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
ddeb81df
Commit
ddeb81df
authored
Oct 22, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
b26fe25d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
RB_Miniprogram_Template_Extend.cs
.../Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
+6
-0
MallHelper.cs
Mall.WebApi/Controllers/Mall/MallHelper.cs
+11
-5
No files found.
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @
ddeb81df
...
...
@@ -2368,6 +2368,12 @@ namespace Mall.Model.Extend.MarketingCenter
public
string
lableName
{
get
;
set
;
}
/// <summary>
/// 副标题
/// </summary>
public
List
<
string
>
lableNameList
{
get
;
set
;
}
/// <summary>
/// 商品图片
/// </summary>
...
...
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @
ddeb81df
...
...
@@ -781,6 +781,10 @@ namespace Mall.WebApi.Controllers
lastItem
.
name
=
tempGood
.
Name
;
lastItem
.
lableName
=
tempGood
.
LableName
;
lastItem
.
picUrl
=
tempGood
.
ArticlePic
;
if
(!
string
.
IsNullOrWhiteSpace
(
lastItem
.
lableName
))
{
lastItem
.
lableNameList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
lastItem
.
lableName
);
}
newGoodsList
.
Add
(
lastItem
);
}
}
...
...
@@ -796,7 +800,7 @@ namespace Mall.WebApi.Controllers
TenantId
=
TenantId
,
MallBaseId
=
MallBaseId
,
ArticleStatus
=
1
,
OrderBy
=
1
OrderBy
=
1
});
if
(
articleList
!=
null
&&
articleList
.
Count
>
0
)
{
...
...
@@ -807,8 +811,10 @@ namespace Mall.WebApi.Controllers
id
=
gItem
.
ID
,
name
=
gItem
.
Name
,
lableName
=
gItem
.
LableName
,
picUrl
=
gItem
.
ArticlePic
});
picUrl
=
gItem
.
ArticlePic
,
lableNameList
=
string
.
IsNullOrWhiteSpace
(
gItem
.
LableName
)
?
new
List
<
string
>()
:
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
gItem
.
LableName
)
});
;
}
}
}
...
...
@@ -1997,7 +2003,7 @@ namespace Mall.WebApi.Controllers
resultMallShopStyle
=
new
ResultMallShopStyle
()
{
main
=
"#ff4544"
,
secondary
=
"#ffdada"
,
IsEducation
=
0
};
break
;
case
MallShopStyleEnum
.
Education
:
resultMallShopStyle
=
new
ResultMallShopStyle
()
{
main
=
"#00d6a6"
,
secondary
=
"#ffc86d"
,
IsEducation
=
1
};
resultMallShopStyle
=
new
ResultMallShopStyle
()
{
main
=
"#00d6a6"
,
secondary
=
"#ffc86d"
,
IsEducation
=
1
};
break
;
}
mallStyle
=
new
...
...
@@ -2285,7 +2291,7 @@ namespace Mall.WebApi.Controllers
/// <summary>
/// 0-商品,1-是
/// </summary>
public
int
IsEducation
{
get
;
set
;
}
public
int
IsEducation
{
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