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
6e17e6c3
Commit
6e17e6c3
authored
Nov 26, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
9acfd90b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
16 deletions
+27
-16
MiniProgramModule.cs
Mall.Module.User/MiniProgramModule.cs
+10
-7
UserModule.cs
Mall.Module.User/UserModule.cs
+16
-7
MallController.cs
Mall.WebApi/Controllers/Mall/MallController.cs
+1
-2
No files found.
Mall.Module.User/MiniProgramModule.cs
View file @
6e17e6c3
...
...
@@ -484,14 +484,17 @@ namespace Mall.Module.User
{
extModel
.
NavMoreList
=
JsonConvert
.
DeserializeObject
<
List
<
MenuNavMoreModel
>>(
extModel
.
MenuNavJson
);
}
else
{
extModel
.
NavMoreList
=
new
List
<
MenuNavMoreModel
>()
{
new
MenuNavMoreModel
(){
else
{
extModel
.
NavMoreList
=
new
List
<
MenuNavMoreModel
>()
{
new
MenuNavMoreModel
()
{
Sort
=
1
,
MenuNavTitle
=
""
,
MenuNavStyle
=
0
,
TitleStyle
=
1
,
MeunList
=
new
List
<
RB_MiniProgram_UserCenterMenu
>()
MenuNavTitle
=
""
,
MenuNavStyle
=
0
,
TitleStyle
=
1
,
MeunList
=
new
List
<
RB_MiniProgram_UserCenterMenu
>()
}
};
}
...
...
Mall.Module.User/UserModule.cs
View file @
6e17e6c3
...
...
@@ -4472,7 +4472,7 @@ namespace Mall.Module.User
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public
object
GetAppletUserCenterStatistics
(
string
openId
)
public
object
GetAppletUserCenterStatistics
(
string
openId
,
RB_MiniProgram_Extend
miniConfig
=
null
)
{
var
objData
=
new
object
();
var
umodel
=
member_UserRepository
.
GetMemberUserEntityRepository
(
new
RB_Member_User_Extend
()
{
OpenId
=
openId
});
...
...
@@ -4537,19 +4537,28 @@ namespace Mall.Module.User
var
couponList
=
memberCouponRepository
.
GetAllMemberCouponPageList
(
new
RB_Member_DiscountCoupon_Extend
{
TenantId
=
umodel
.
TenantId
,
MallBaseId
=
umodel
.
MallBaseId
,
UseState
=
0
,
UserId
=
umodel
.
Id
});
var
MemberGrade
=
"普通用户"
;
string
MemberGradeIcon
=
""
;
if
(
umodel
.
MemberGrade
>
0
)
if
(
IsHpFX
==
1
)
{
var
mgModel
=
member_GradeRepository
.
GetEntity
(
umodel
.
MemberGrade
);
if
(
mgModel
!=
null
)
if
(
umodel
.
MemberGrade
>
0
)
{
MemberGrade
=
mgModel
.
Name
;
if
(
mgModel
.
Icon
>
0
)
var
mgModel
=
member_GradeRepository
.
GetEntity
(
umodel
.
MemberGrade
)
;
if
(
mgModel
!=
null
)
{
MemberGradeIcon
=
material_InfoRepository
.
GetEntity
(
mgModel
.
Icon
)?.
Path
??
""
;
MemberGrade
=
mgModel
.
Name
;
if
(
mgModel
.
Icon
>
0
)
{
MemberGradeIcon
=
material_InfoRepository
.
GetEntity
(
mgModel
.
Icon
)?.
Path
??
""
;
}
}
}
}
else
{
MemberGradeIcon
=
miniConfig
?.
MemberBgImg
??
""
;
}
objData
=
new
{
//昵称
...
...
Mall.WebApi/Controllers/Mall/MallController.cs
View file @
6e17e6c3
...
...
@@ -535,7 +535,7 @@ namespace Mall.WebApi.Controllers.MallBase
var
user_info
=
new
object
();
if
(
RequestParm
.
OpenId
!=
null
&&
!
string
.
IsNullOrWhiteSpace
(
RequestParm
.
OpenId
))
{
var
memberModel
=
userModule
.
GetAppletUserCenterStatistics
(
RequestParm
.
OpenId
);
var
memberModel
=
userModule
.
GetAppletUserCenterStatistics
(
RequestParm
.
OpenId
,
miniProgram
);
user_info
=
memberModel
;
}
...
...
@@ -595,7 +595,6 @@ namespace Mall.WebApi.Controllers.MallBase
link_url
=
qitem
.
MenuUrl
.
Trim
(),
open_type
=
"navigate"
,
@params
=
""
,
}),
nar_menus
=
miniProgram
?.
NavMoreList
?.
Select
(
x
=>
new
{
x
.
Sort
,
...
...
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