Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
万
万科
Project
Project
Details
Activity
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
张杰
万科
Commits
343cac3a
Commit
343cac3a
authored
9 years ago
by
Achilles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
当前用户为商铺时, 查询账单时添加商铺code参数。
parent
61b2b1c9
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
3 deletions
+37
-3
VankeSettlementListAPI.m
vanke/controller/VankeSettlementListAPI.m
+7
-0
VankeUserLoginAPI.m
vanke/controller/VankeUserLoginAPI.m
+1
-1
VankeCommonModel.h
vanke/model/VankeCommonModel.h
+13
-0
VankeCommonModel.m
vanke/model/VankeCommonModel.m
+15
-0
VankeAppBoard_iPhone.m
vanke/view_iPhone/templates/VankeAppBoard_iPhone.m
+1
-2
No files found.
vanke/controller/VankeSettlementListAPI.m
View file @
343cac3a
...
...
@@ -9,6 +9,7 @@
#import "VankeSettlementListAPI.h"
#import "VankeConfig.h"
#import "VankeUtil.h"
#import "VankeCommonModel.h"
@implementation
VankeSettlementListAPI
...
...
@@ -34,6 +35,12 @@
if
(
!
[
VankeUtil
isBlankString
:
_shopLike
])
{
request
.
PARAM
(
@"shopLike"
,
_shopLike
);
}
if
([[
VankeCommonModel
sharedInstance
]
curUserIsTenant
])
{
User
*
curUser
=
[[
VankeCommonModel
sharedInstance
]
currentUser
];
request
.
PARAM
(
@"tenantEquals"
,
curUser
.
code
);
}
request
.
TIMEOUT
(
10
);
}
else
if
(
self
.
succeed
)
...
...
This diff is collapsed.
Click to expand it.
vanke/controller/VankeUserLoginAPI.m
View file @
343cac3a
...
...
@@ -96,7 +96,7 @@
#pragma mark LoginResponseData
NSString
*
const
USER_POSITION_HQ
=
@"hq"
;
// 用户职位: 集团
NSString
*
const
USER_POSITION_STORE
=
@"store"
;
// 用户职位:
市
场用户
NSString
*
const
USER_POSITION_STORE
=
@"store"
;
// 用户职位:
商
场用户
NSString
*
const
USER_POSITION_TENANT
=
@"tenant"
;
// 用户职位: 商户用户
@implementation
LoginResponseData
...
...
This diff is collapsed.
Click to expand it.
vanke/model/VankeCommonModel.h
View file @
343cac3a
...
...
@@ -64,7 +64,20 @@ AS_SINGLETON(VankeCommonModel)
*/
-
(
NSString
*
)
currentUserPwd
;
/**
* 是否为商铺用户
*/
-
(
BOOL
)
curUserIsTenant
;
/**
* 是否为集团用户
*/
-
(
BOOL
)
curUserIsHQ
;
/**
* 是否为商场用户
*/
-
(
BOOL
)
curUserIsStore
;
@end
...
...
This diff is collapsed.
Click to expand it.
vanke/model/VankeCommonModel.m
View file @
343cac3a
...
...
@@ -76,4 +76,19 @@ DEF_SINGLETON(VankeCommonModel)
return
[
self
keychainRead
:
KEY_CURRENT_USER_PWD
];
}
-
(
BOOL
)
curUserIsTenant
{
LoginResponseData
*
loginInfo
=
[
self
getLoginInfo
];
return
[
USER_POSITION_TENANT
eq
:
loginInfo
.
position
];
}
-
(
BOOL
)
curUserIsHQ
{
LoginResponseData
*
loginInfo
=
[
self
getLoginInfo
];
return
[
USER_POSITION_HQ
eq
:
loginInfo
.
position
];
}
-
(
BOOL
)
curUserIsStore
{
LoginResponseData
*
loginInfo
=
[
self
getLoginInfo
];
return
[
USER_POSITION_STORE
eq
:
loginInfo
.
position
];
}
@end
This diff is collapsed.
Click to expand it.
vanke/view_iPhone/templates/VankeAppBoard_iPhone.m
View file @
343cac3a
...
...
@@ -115,8 +115,7 @@ ON_NOTIFICATION3( VankeLoginBoard_iPhone, SUCC_LOGIN, notification )
[
UIView
setAnimationDelegate
:
self
];
[
UIView
commitAnimations
];
LoginResponseData
*
loginInfo
=
[[
VankeCommonModel
sharedInstance
]
getLoginInfo
];
isTenant
=
[
USER_POSITION_TENANT
eq
:
loginInfo
.
position
];
isTenant
=
[[
VankeCommonModel
sharedInstance
]
curUserIsTenant
];
if
(
isTenant
)
{
_tenantTabbar
=
[
VankeTenantTabBoard_iPhone
cell
];
[
self
.
view
addSubview
:
_tenantTabbar
];
...
...
This diff is collapsed.
Click to expand it.
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