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
3b90d7be
Commit
3b90d7be
authored
Nov 04, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
b6b0e740
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
1 deletion
+28
-1
MallController.cs
Mall.WebApi/Controllers/Mall/MallController.cs
+6
-1
MallHelper.cs
Mall.WebApi/Controllers/Mall/MallHelper.cs
+22
-0
No files found.
Mall.WebApi/Controllers/Mall/MallController.cs
View file @
3b90d7be
...
...
@@ -119,6 +119,9 @@ namespace Mall.WebApi.Controllers.MallBase
//小程序
var
mall
=
new
object
();
//线下服务小程序配置接口
var
offlineServiceSetting
=
new
object
();
//直播海报配置
var
liveConfig
=
new
object
();
...
...
@@ -129,11 +132,12 @@ namespace Mall.WebApi.Controllers.MallBase
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
);
//线下服务配置
offlineServiceSetting
=
MallHelper
.
GetOfflineServiceConfig
(
miniProgram
);
}
#
region
首页页面数据解析
...
...
@@ -390,6 +394,7 @@ namespace Mall.WebApi.Controllers.MallBase
expired_at
=
"0000-00-00 00:00:00"
,
option
=
new
List
<
object
>(),
setting
,
offlineServiceSetting
,
};
#
region
授权页面热区
...
...
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @
3b90d7be
...
...
@@ -8,6 +8,7 @@ using Mall.Model.Extend.User;
using
Mall.Module.BaseSetUp
;
using
Mall.Module.MarketingCenter
;
using
Mall.Module.Product
;
using
Mall.Module.Reserve
;
using
Mall.Module.User
;
using
Mall.Repository.Product
;
using
Mall.Repository.User
;
...
...
@@ -82,6 +83,11 @@ namespace Mall.WebApi.Controllers
/// </summary>
private
static
Module
.
Education
.
EducationModule
educationModule
=
new
Module
.
Education
.
EducationModule
();
/// <summary>
/// 线下服务配置处理类
/// </summary>
private
static
ReserveModule
reserveModule
=
new
ReserveModule
();
/// <summary>
/// 解析插件数据为对象
...
...
@@ -2631,6 +2637,22 @@ namespace Mall.WebApi.Controllers
#
endregion
return
share_setting_custom
;
}
/// <summary>
/// 获取线下服务小程序配置
/// </summary>
/// <param name="miniProgram"></param>
/// <returns></returns>
public
static
object
GetOfflineServiceConfig
(
RB_MiniProgram_Extend
miniProgram
)
{
var
model
=
reserveModule
.
GetReserveBaseInfo
(
Convert
.
ToInt32
(
miniProgram
.
TenantId
),
miniProgram
.
MallBaseId
);
var
obj
=
new
{
offlineServicePayType
=
model
?.
PayTypeList
,
offlineServiceOrderStateList
=
model
?.
OrderStateList
};
return
obj
;
}
}
/// <summary>
...
...
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