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
cd2721d6
Commit
cd2721d6
authored
May 29, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
d555ccb3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
25 deletions
+22
-25
RB_Distributor_Custom.cs
Mall.Model/Entity/User/RB_Distributor_Custom.cs
+8
-7
UserCommonModule.cs
Mall.Module.User/UserCommonModule.cs
+7
-7
UserController.cs
Mall.WebApi/Controllers/User/UserController.cs
+7
-11
No files found.
Mall.Model/Entity/User/RB_Distributor_Custom.cs
View file @
cd2721d6
...
...
@@ -25,15 +25,16 @@ namespace Mall.Model.Entity.User
/// <summary>
/// 头部图片
/// </summary>
public
int
?
HeadImage
public
string
HeadImage
{
get
;
set
;
}
/// <summary>
/// 底部图片
/// </summary>
public
int
?
BottomImage
public
string
BottomImage
{
get
;
set
;
...
...
@@ -97,7 +98,7 @@ namespace Mall.Model.Entity.User
/// <summary>
/// 分销佣金图片
/// </summary>
public
int
?
DistributionCommissionImage
public
string
DistributionCommissionImage
{
get
;
set
;
...
...
@@ -113,7 +114,7 @@ namespace Mall.Model.Entity.User
/// <summary>
/// 分销订单图片
/// </summary>
public
int
?
DistributionOrderImage
public
string
DistributionOrderImage
{
get
;
set
;
...
...
@@ -129,7 +130,7 @@ namespace Mall.Model.Entity.User
/// <summary>
/// 提现明细图片
/// </summary>
public
int
?
WithdrawDetialsImage
public
string
WithdrawDetialsImage
{
get
;
set
;
...
...
@@ -145,7 +146,7 @@ namespace Mall.Model.Entity.User
/// <summary>
/// 我的团队图片
/// </summary>
public
int
?
MyTeamImage
public
string
MyTeamImage
{
get
;
set
;
...
...
@@ -161,7 +162,7 @@ namespace Mall.Model.Entity.User
/// <summary>
/// 推广二维码图片
/// </summary>
public
int
?
PromoteQRCodeImage
public
string
PromoteQRCodeImage
{
get
;
set
;
...
...
Mall.Module.User/UserCommonModule.cs
View file @
cd2721d6
...
...
@@ -111,23 +111,23 @@ namespace Mall.Module.User
{
Id
=
0
,
ApplicationAgreement
=
"分销申请协议"
,
HeadImage
=
1
,
BottomImage
=
2
,
HeadImage
=
Common
.
Config
.
GetFileUrl
(
"/Upload/Set/1587968479000.png"
)
,
BottomImage
=
Common
.
Config
.
GetFileUrl
(
"/Upload/Set/1587968716000.png"
)
,
ButtonColor
=
"#FF4544"
,
ButtonFilletPX
=
40
,
ButtonText
=
"申请成为分销商"
,
ButtonTextColor
=
"#FFFFFF"
,
DistributionApplication
=
"分销申请"
,
DistributionCommissionName
=
"分销佣金"
,
DistributionCommissionImage
=
3
,
DistributionCommissionImage
=
Common
.
Config
.
GetFileUrl
(
"/Upload/Set/1587968503000.png"
)
,
DistributionOrderName
=
"分销订单"
,
DistributionOrderImage
=
4
,
DistributionOrderImage
=
Common
.
Config
.
GetFileUrl
(
"/Upload/Set/1587968517000.png"
)
,
WithdrawDetialsName
=
"提现明细"
,
WithdrawDetialsImage
=
5
,
WithdrawDetialsImage
=
Common
.
Config
.
GetFileUrl
(
"/Upload/Set/1587968599000.png"
)
,
MyTeamName
=
"我的团队"
,
MyTeamImage
=
6
,
MyTeamImage
=
Common
.
Config
.
GetFileUrl
(
"/Upload/Set/1587968613000.png"
)
,
PromoteQRCodeName
=
"推广二维码"
,
PromoteQRCodeImage
=
7
,
PromoteQRCodeImage
=
Common
.
Config
.
GetFileUrl
(
"/Upload/Set/1587968626000.png"
)
,
ReferrerName
=
"推荐人"
,
CommissionForWithdrawalName
=
"可提现佣金"
,
WithdrawDepositName
=
"提现"
,
...
...
Mall.WebApi/Controllers/User/UserController.cs
View file @
cd2721d6
...
...
@@ -874,11 +874,11 @@ namespace Mall.WebApi.Controllers.User
{
var
requestParm
=
RequestParm
;
RB_Distributor_Custom_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Distributor_Custom_Extend
>(
requestParm
.
msg
.
ToString
());
if
(
(
demodel
.
HeadImage
??
0
)
<=
0
)
if
(
demodel
.
HeadImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
HeadImage
)
)
{
return
ApiResult
.
ParamIsNull
(
"请传递分销申请下头部图片"
);
}
if
(
(
demodel
.
BottomImage
??
0
)
<=
0
)
if
(
demodel
.
BottomImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
BottomImage
)
)
{
return
ApiResult
.
ParamIsNull
(
"请传递分销申请下底部图片"
);
}
...
...
@@ -890,10 +890,6 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销申请下分销申请协议"
);
}
if
((
demodel
.
BottomImage
??
0
)
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递分销申请下按钮圆角像素"
);
}
if
(
string
.
IsNullOrEmpty
(
demodel
.
ButtonText
))
{
return
ApiResult
.
ParamIsNull
(
"请传递分销申请下按钮文本"
);
...
...
@@ -911,7 +907,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下分销佣金"
);
}
if
(
(
demodel
.
DistributionCommissionImage
??
0
)
<=
0
)
if
(
demodel
.
DistributionCommissionImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
DistributionCommissionImage
)
)
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下分销佣金图片"
);
}
...
...
@@ -919,7 +915,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下分销订单"
);
}
if
(
(
demodel
.
DistributionOrderImage
??
0
)
<=
0
)
if
(
demodel
.
DistributionOrderImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
DistributionOrderImage
)
)
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下分销订单图片"
);
}
...
...
@@ -927,7 +923,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下提现明细"
);
}
if
(
(
demodel
.
WithdrawDetialsImage
??
0
)
<=
0
)
if
(
demodel
.
WithdrawDetialsImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
WithdrawDetialsImage
)
)
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下提现明细图片"
);
}
...
...
@@ -935,7 +931,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下我的团队"
);
}
if
(
(
demodel
.
MyTeamImage
??
0
)
<=
0
)
if
(
demodel
.
MyTeamImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
MyTeamImage
)
)
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下我的团队图片"
);
}
...
...
@@ -943,7 +939,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下推广二维码"
);
}
if
(
(
demodel
.
PromoteQRCodeImage
??
0
)
<=
0
)
if
(
demodel
.
PromoteQRCodeImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
PromoteQRCodeImage
)
)
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下推广二维码图片"
);
}
...
...
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