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
5f743836
Commit
5f743836
authored
Jun 12, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
0cbbbf68
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
15 deletions
+14
-15
MallController.cs
Mall.WebApi/Controllers/Mall/MallController.cs
+14
-15
No files found.
Mall.WebApi/Controllers/Mall/MallController.cs
View file @
5f743836
...
...
@@ -94,12 +94,6 @@ namespace Mall.WebApi.Controllers.MallBase
Common
.
Plugin
.
LogHelper
.
Error
(
"MallController_GetHome"
,
ex
);
}
//获取小程序信息
var
miniProgram
=
new
RB_MiniProgram_Extend
();
if
(
MiniAppId
!=
null
&&
!
string
.
IsNullOrEmpty
(
MiniAppId
))
{
miniProgram
=
programModule
.
GetMiniProgramModule
(
new
Model
.
Extend
.
User
.
RB_MiniProgram_Extend
()
{
MiniAppId
=
MiniAppId
},
isGetHomeData
:
true
,
isGetNav
:
1
);
}
int
page_id
=
parms
.
GetInt
(
"page_id"
);
//首页数据
var
homePage
=
new
object
();
...
...
@@ -119,6 +113,20 @@ namespace Mall.WebApi.Controllers.MallBase
var
user_info
=
new
object
();
//小程序
var
mall
=
new
object
();
//获取小程序信息
var
miniProgram
=
new
RB_MiniProgram_Extend
();
if
(
MiniAppId
!=
null
&&
!
string
.
IsNullOrEmpty
(
MiniAppId
))
{
miniProgram
=
programModule
.
GetMiniProgramModule
(
new
Model
.
Extend
.
User
.
RB_MiniProgram_Extend
()
{
MiniAppId
=
MiniAppId
},
isGetHomeData
:
true
,
isGetNav
:
1
);
//基础配置
setting
=
MallHelper
.
GetBasicSetting
(
miniProgram
);
//分销基础信息
share_setting
=
MallHelper
.
GetDistributorBasicsInfo
(
miniProgram
);
//分销商设置
share_setting_custom
=
MallHelper
.
GetDistributorCustomInfo
(
miniProgram
);
}
if
(
page_id
>
0
)
{
var
targetPage
=
miniprogramPageTemplModule
.
GetMiniprogramPageTemplModule
(
new
RB_Miniprogram_Page_Templ_Extend
()
...
...
@@ -350,15 +358,6 @@ namespace Mall.WebApi.Controllers.MallBase
user_info
=
memberModel
;
}
}
//基础配置
setting
=
MallHelper
.
GetBasicSetting
(
miniProgram
);
//分销基础信息
share_setting
=
MallHelper
.
GetDistributorBasicsInfo
(
miniProgram
);
//分销商设置
share_setting_custom
=
MallHelper
.
GetDistributorCustomInfo
(
miniProgram
);
#
region
商品分类样式
var
productCategoryStyle
=
productModule
.
GetProductCategoryStyleInfo
(
miniProgram
.
TenantId
??
0
,
miniProgram
.
MallBaseId
);
cat_style
=
new
...
...
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