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
d95e23cf
Commit
d95e23cf
authored
Feb 23, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
a3ff3c25
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
1 deletion
+36
-1
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+33
-0
TenantController.cs
Mall.WebApi/Controllers/User/TenantController.cs
+3
-1
No files found.
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @
d95e23cf
...
@@ -207,5 +207,38 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -207,5 +207,38 @@ namespace Mall.WebApi.Controllers.TradePavilion
return
ApiResult
.
Success
(
data
:
extModel
);
return
ApiResult
.
Success
(
data
:
extModel
);
}
}
/// <summary>
/// 获取投资采购分页列表
/// </summary>
/// <returns></returns>
public
ApiResult
GetInvestmentProcurementPage
()
{
ResultPageModel
pageModel
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
query
=
new
RB_InvestmentProcurement_Extend
()
{
CompanyName
=
parms
.
GetStringValue
(
"CompanyName"
),
Type
=
parms
.
GetInt
(
"Type"
),
};
var
userInfo
=
AppletUserInfo
;
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
TenantId
=
userInfo
?.
TenantId
??
0
;
var
list
=
procurementModule
.
GetInvestmentProcurementPageListModule
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
pageModel
.
pageData
=
list
;
return
ApiResult
.
Success
(
data
:
pageModel
);
}
/// <summary>
/// 获取投资采购详情
/// </summary>
/// <returns></returns>
public
ApiResult
GetInvestmentProcurement
()
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
Id
=
parms
.
GetInt
(
"Id"
,
0
);
var
extModel
=
procurementModule
.
GetInvestmentProcurementModule
(
Id
);
return
ApiResult
.
Success
(
data
:
extModel
);
}
}
}
}
}
Mall.WebApi/Controllers/User/TenantController.cs
View file @
d95e23cf
...
@@ -1592,7 +1592,9 @@ namespace Mall.WebApi.Controllers.User
...
@@ -1592,7 +1592,9 @@ namespace Mall.WebApi.Controllers.User
//是否隐藏商品【1-隐藏】
//是否隐藏商品【1-隐藏】
int
IsHiddenGoods
=
parms
.
GetInt
(
"IsHiddenGoods"
);
int
IsHiddenGoods
=
parms
.
GetInt
(
"IsHiddenGoods"
);
List
<
object
>
resultList
=
new
List
<
object
>();
List
<
object
>
resultList
=
new
List
<
object
>();
var
pageList
=
programPageModule
.
GetMiniprogram_Page_ListExtModule
(
new
RB_MiniProgram_Page_Extend
()
{
MallBaseId
=
RequestParm
.
MallBaseId
});
var
query
=
new
RB_MiniProgram_Page_Extend
()
{
MallBaseId
=
RequestParm
.
MallBaseId
};
var
pageList
=
programPageModule
.
GetMiniprogram_Page_ListExtModule
(
query
);
var
pageTypeList
=
Common
.
Plugin
.
EnumHelper
.
EnumToList
(
typeof
(
PageTypeEnum
));
var
pageTypeList
=
Common
.
Plugin
.
EnumHelper
.
EnumToList
(
typeof
(
PageTypeEnum
));
foreach
(
var
item
in
pageTypeList
)
foreach
(
var
item
in
pageTypeList
)
{
{
...
...
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