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
bdcfd79d
Commit
bdcfd79d
authored
Jun 12, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
33191bb6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
5 deletions
+25
-5
MallController.cs
Mall.WebApi/Controllers/Mall/MallController.cs
+25
-5
No files found.
Mall.WebApi/Controllers/Mall/MallController.cs
View file @
bdcfd79d
...
...
@@ -60,7 +60,7 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
private
readonly
ProductModule
productModule
=
new
ProductModule
();
/// <summary>
/// 用户处理类
/// </summary>
...
...
@@ -117,13 +117,15 @@ namespace Mall.WebApi.Controllers.MallBase
var
auth_page
=
new
object
();
//用户信息
var
user_info
=
new
object
();
//小程序
var
mall
=
new
object
();
if
(
page_id
>
0
)
{
var
targetPage
=
miniprogramPageTemplModule
.
GetMiniprogramPageTemplModule
(
new
RB_Miniprogram_Page_Templ_Extend
()
{
MallBaseId
=
miniProgram
.
MallBaseId
,
TenantId
=
miniProgram
.
TenantId
,
Id
=
page_id
Id
=
page_id
},
isGetHome
:
false
);
List
<
object
>
list
=
new
List
<
object
>();
//自定义首页
...
...
@@ -179,6 +181,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
if
(
miniProgram
!=
null
&&
miniProgram
.
MallBaseId
>
0
)
{
//底部导航
navbar
=
new
{
...
...
@@ -356,22 +359,39 @@ namespace Mall.WebApi.Controllers.MallBase
cat_goods_cols
=
productCategoryStyle
?.
RowNum
};
#
endregion
mall
=
new
{
id
=
miniProgram
.
MallBaseId
,
name
=
miniProgram
.
MallName
,
user_id
=
0
,
created_at
=
miniProgram
.
CreateDate
.
HasValue
?
miniProgram
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
updated_at
=
miniProgram
.
CreateDate
.
HasValue
?
miniProgram
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
deleted_at
=
"0000-00-00 00:00:00"
,
is_delete
=
miniProgram
.
Status
,
is_recycle
=
0
,
is_disable
=
miniProgram
.
Status
,
expired_at
=
"0000-00-00 00:00:00"
,
option
=
new
List
<
object
>(),
setting
,
};
}
if
(
RequestParm
.
OpenId
!=
null
&&
!
string
.
IsNullOrWhiteSpace
(
RequestParm
.
OpenId
))
{
var
memberModel
=
userModule
.
GetAppletUserCenterStatistics
(
RequestParm
.
OpenId
);
user_info
=
memberModel
;
}
}
var
miniPageList
=
programPageModule
.
GetMiniprogram_Page_ListExtModule
(
new
RB_MiniProgram_Page_Extend
()
{
MallBaseId
=
RequestParm
.
MallBaseId
});
var
objResult
=
new
{
mall
,
home_pages
=
homePage
,
navbar
,
user_info
,
setting
,
share_setting
,
share_setting_custom
,
cat_style
,
...
...
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