Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
红
红星美凯龙管理在线APP IOS
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
张杰
红星美凯龙管理在线APP IOS
Commits
a1f3aa0c
Commit
a1f3aa0c
authored
9 years ago
by
admin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复bug 添加问题分组
parent
5dfefa2c
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
96 additions
and
16 deletions
+96
-16
UserInterfaceState.xcuserstate
...userdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
Breakpoints_v2.xcbkptlist
...ta/admin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+48
-0
Url.h
redstar/Classes/Macro/Url.h
+2
-2
AddQuestionViewController.m
...on/AddQuestion/ViewController/AddQuestionViewController.m
+42
-12
QuestionViewController.m
...tion/QuestionList/ViewController/QuestionViewController.m
+1
-1
RankingListViewController.m
...ng/RankingList/ViewController/RankingListViewController.m
+2
-1
HomeViewController.m
...r/Classes/Module/Home/ViewController/HomeViewController.m
+1
-0
No files found.
redstar.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
View file @
a1f3aa0c
No preview for this file type
This diff is collapsed.
Click to expand it.
redstar.xcworkspace/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @
a1f3aa0c
...
@@ -13,5 +13,53 @@
...
@@ -13,5 +13,53 @@
stopOnStyle =
"0"
>
stopOnStyle =
"0"
>
</BreakpointContent>
</BreakpointContent>
</BreakpointProxy>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID =
"Xcode.Breakpoint.FileBreakpoint"
>
<BreakpointContent
shouldBeEnabled =
"No"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
filePath =
"redstar/Classes/Module/Function/Question/AddQuestion/ViewController/AddQuestionViewController.m"
timestampString =
"473677271.6783"
startingColumnNumber =
"9223372036854775807"
endingColumnNumber =
"9223372036854775807"
startingLineNumber =
"315"
endingLineNumber =
"315"
landmarkName =
"-alertView:clickedButtonAtIndex:"
landmarkType =
"5"
>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID =
"Xcode.Breakpoint.FileBreakpoint"
>
<BreakpointContent
shouldBeEnabled =
"No"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
filePath =
"redstar/Classes/Module/Function/Question/AddQuestion/ViewController/AddQuestionViewController.m"
timestampString =
"473677272.558419"
startingColumnNumber =
"9223372036854775807"
endingColumnNumber =
"9223372036854775807"
startingLineNumber =
"312"
endingLineNumber =
"312"
landmarkName =
"-alertView:clickedButtonAtIndex:"
landmarkType =
"5"
>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID =
"Xcode.Breakpoint.FileBreakpoint"
>
<BreakpointContent
shouldBeEnabled =
"Yes"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
filePath =
"redstar/Classes/Module/Function/Question/QuestionList/View/MoreScreenView.m"
timestampString =
"473679011.613156"
startingColumnNumber =
"9223372036854775807"
endingColumnNumber =
"9223372036854775807"
startingLineNumber =
"225"
endingLineNumber =
"225"
landmarkName =
"-textView:shouldChangeTextInRange:replacementText:"
landmarkType =
"5"
>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Breakpoints>
</Bucket>
</Bucket>
This diff is collapsed.
Click to expand it.
redstar/Classes/Macro/Url.h
View file @
a1f3aa0c
...
@@ -10,10 +10,10 @@
...
@@ -10,10 +10,10 @@
#define Url_h
#define Url_h
// url 测试环境
// url 测试环境
#define kRedStarURL @"http://218.244.151.129:7580/"
//
#define kRedStarURL @"http://218.244.151.129:7580/"
// 正式环境
// 正式环境
//
#define kRedStarURL @"http://219.235.234.225:7580/"
#define kRedStarURL @"http://219.235.234.225:7580/"
// 最新正式环境
// 最新正式环境
// #define kRedStarURL @"http://219.235.234.212:7580/"
// #define kRedStarURL @"http://219.235.234.212:7580/"
...
...
This diff is collapsed.
Click to expand it.
redstar/Classes/Module/Function/Question/AddQuestion/ViewController/AddQuestionViewController.m
View file @
a1f3aa0c
...
@@ -50,6 +50,9 @@
...
@@ -50,6 +50,9 @@
@property
(
nonatomic
,
strong
)
NSMutableArray
*
categoryArray
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
categoryArray
;
@property
(
nonatomic
,
strong
)
NSMutableDictionary
*
questionDict
;
@property
(
nonatomic
,
strong
)
NSMutableDictionary
*
questionDict
;
@property
(
nonatomic
,
assign
)
NSInteger
categoryNum
;
@property
(
nonatomic
,
assign
)
NSInteger
questionNum
;
@end
@end
...
@@ -85,11 +88,13 @@
...
@@ -85,11 +88,13 @@
// takePhoto代理
// takePhoto代理
[
self
.
footerView
.
reportBtn
addTarget
:
self
action
:
@selector
(
upLoadQuestionPic
:
)
forControlEvents
:
UIControlEventTouchUpInside
];
[
self
.
footerView
.
reportBtn
addTarget
:
self
action
:
@selector
(
upLoadQuestionPic
:
)
forControlEvents
:
UIControlEventTouchUpInside
];
self
.
saveDict
=
[
NSMutableDictionary
dictionary
];
//
self.saveDict = [NSMutableDictionary dictionary];
[
_saveDict
setObject
:
@"请选择"
forKey
:
@"selectLabel"
];
//
[_saveDict setObject:@"请选择" forKey:@"selectLabel"];
[
_saveDict
setObject
:
@"请选择"
forKey
:
@"selectLabel1"
];
//
[_saveDict setObject:@"请选择" forKey:@"selectLabel1"];
_rowNumber
=
4
;
_rowNumber
=
4
;
_categoryNum
=
0
;
_questionNum
=
0
;
}
}
...
@@ -98,6 +103,17 @@
...
@@ -98,6 +103,17 @@
{
{
self
.
categoryArray
=
[
NSMutableArray
arrayWithObjects
:
@"服务"
,
@"环境企划"
,
@"环境物业"
,
@"价格"
,
@"质量"
,
@"商户信用分类"
,
@"审批比价采购"
,
@"送货跟单"
,
@"指标"
,
@"其他"
,
nil
];
self
.
categoryArray
=
[
NSMutableArray
arrayWithObjects
:
@"服务"
,
@"环境企划"
,
@"环境物业"
,
@"价格"
,
@"质量"
,
@"商户信用分类"
,
@"审批比价采购"
,
@"送货跟单"
,
@"指标"
,
@"其他"
,
nil
];
self
.
questionDict
=
[
NSMutableDictionary
dictionary
];
self
.
questionDict
=
[
NSMutableDictionary
dictionary
];
[
_questionDict
setObject
:[
NSArray
arrayWithObjects
:
@"15分钟退单"
,
@"便民服务"
,
@"基础管理"
,
@"轻松购系统"
,
@"营运物料"
,
@"服务承诺"
,
@"人员形象"
,
@"全员服务"
,
@"其他"
,
nil
]
forKey
:
@"服务"
];
[
_questionDict
setObject
:[
NSArray
arrayWithObjects
:
@"导视系统"
,
@"背景音乐"
,
@"物料规范"
,
@"儿童区"
,
@"休息区"
,
@"其他"
,
nil
]
forKey
:
@"环境企划"
];
[
_questionDict
setObject
:[
NSArray
arrayWithObjects
:
@"基础环境"
,
@"物料标识"
,
@"停车场"
,
@"卫生间"
,
@"硬件改造"
,
@"人员"
,
@"其他"
,
nil
]
forKey
:
@"环境物业"
];
[
_questionDict
setObject
:[
NSArray
arrayWithObjects
:
@"七折管理"
,
@"价签物料"
,
@"其他"
,
nil
]
forKey
:
@"价格"
];
[
_questionDict
setObject
:[
NSArray
arrayWithObjects
:
@"绿色陈展"
,
@"三年质保"
,
@"其他"
,
nil
]
forKey
:
@"质量"
];
[
_questionDict
setObject
:[
NSArray
arrayWithObjects
:
@"商户信用分类"
,
nil
]
forKey
:
@"商户信用分类"
];
[
_questionDict
setObject
:[
NSArray
arrayWithObjects
:
@"审批、比价、采购"
,
nil
]
forKey
:
@"审批比价采购"
];
[
_questionDict
setObject
:[
NSArray
arrayWithObjects
:
@"送货跟单"
,
nil
]
forKey
:
@"送货跟单"
];
[
_questionDict
setObject
:[
NSArray
arrayWithObjects
:
@"指标"
,
nil
]
forKey
:
@"指标"
];
[
_questionDict
setObject
:[
NSArray
arrayWithObjects
:
@"其他"
,
nil
]
forKey
:
@"其他"
];
}
}
-
(
void
)
didReceiveMemoryWarning
{
-
(
void
)
didReceiveMemoryWarning
{
...
@@ -351,11 +367,13 @@
...
@@ -351,11 +367,13 @@
line
.
backgroundColor
=
kSeparateLineColor
;
line
.
backgroundColor
=
kSeparateLineColor
;
[
cell
.
contentView
addSubview
:
line
];
[
cell
.
contentView
addSubview
:
line
];
NSString
*
cateStr
=
_categoryArray
[
_categoryNum
];
if
(
indexPath
.
row
==
0
)
{
if
(
indexPath
.
row
==
0
)
{
if
(
!
self
.
selectLabel
)
{
if
(
!
self
.
selectLabel
)
{
_selectLabel
=
[[
UILabel
alloc
]
init
];
_selectLabel
=
[[
UILabel
alloc
]
init
];
}
}
_selectLabel
.
text
=
_saveDict
[
@"selectLabel"
]
;
_selectLabel
.
text
=
cateStr
;
_selectLabel
.
translatesAutoresizingMaskIntoConstraints
=
NO
;
_selectLabel
.
translatesAutoresizingMaskIntoConstraints
=
NO
;
_selectLabel
.
textColor
=
kOnLineCellDetailColor
;
_selectLabel
.
textColor
=
kOnLineCellDetailColor
;
_selectLabel
.
textAlignment
=
NSTextAlignmentRight
;
_selectLabel
.
textAlignment
=
NSTextAlignmentRight
;
...
@@ -382,7 +400,8 @@
...
@@ -382,7 +400,8 @@
if
(
!
self
.
selectLabel1
)
{
if
(
!
self
.
selectLabel1
)
{
self
.
selectLabel1
=
[[
UILabel
alloc
]
init
];
self
.
selectLabel1
=
[[
UILabel
alloc
]
init
];
}
}
_selectLabel1
.
text
=
_saveDict
[
@"selectLabel1"
];
NSArray
*
seleArray
=
[
_questionDict
objectForKey
:
cateStr
];
_selectLabel1
.
text
=
seleArray
[
_questionNum
];
_selectLabel1
.
translatesAutoresizingMaskIntoConstraints
=
NO
;
_selectLabel1
.
translatesAutoresizingMaskIntoConstraints
=
NO
;
_selectLabel1
.
textColor
=
kOnLineCellDetailColor
;
_selectLabel1
.
textColor
=
kOnLineCellDetailColor
;
_selectLabel1
.
textAlignment
=
NSTextAlignmentRight
;
_selectLabel1
.
textAlignment
=
NSTextAlignmentRight
;
...
@@ -492,7 +511,13 @@
...
@@ -492,7 +511,13 @@
[
_categoryActionSheet
showInView
:
self
.
view
];
[
_categoryActionSheet
showInView
:
self
.
view
];
}
else
if
(
indexPath
.
row
==
1
)
{
}
else
if
(
indexPath
.
row
==
1
)
{
self
.
questionActionSheet
=
[[
UIActionSheet
alloc
]
initWithTitle
:
nil
delegate
:
self
cancelButtonTitle
:
@"取消"
destructiveButtonTitle
:
nil
otherButtonTitles
:
QUESTIONLIST
];
self
.
questionActionSheet
=
[[
UIActionSheet
alloc
]
initWithTitle
:
nil
delegate
:
self
cancelButtonTitle
:
@"取消"
destructiveButtonTitle
:
nil
otherButtonTitles
:
nil
];
NSString
*
cateStr
=
_categoryArray
[
_categoryNum
];
NSArray
*
seleArray
=
[
_questionDict
objectForKey
:
cateStr
];
for
(
NSString
*
selectStr
in
seleArray
)
{
[
_questionActionSheet
addButtonWithTitle
:
selectStr
];
}
_questionActionSheet
.
delegate
=
self
;
_questionActionSheet
.
delegate
=
self
;
[
_questionActionSheet
showInView
:
self
.
view
];
[
_questionActionSheet
showInView
:
self
.
view
];
}
else
{
}
else
{
...
@@ -530,14 +555,19 @@
...
@@ -530,14 +555,19 @@
if
(
actionSheet
==
_categoryActionSheet
)
{
if
(
actionSheet
==
_categoryActionSheet
)
{
if
(
buttonIndex
<
[
NSArray
arrayWithObjects
:
CATEGORYLIST
].
count
)
{
if
(
buttonIndex
<
_categoryArray
.
count
)
{
_selectLabel
.
text
=
[[
NSArray
arrayWithObjects
:
CATEGORYLIST
]
objectAtIndex
:
buttonIndex
];
_selectLabel
.
text
=
[
_categoryArray
objectAtIndex
:
buttonIndex
];
[
_saveDict
setObject
:[[
NSArray
arrayWithObjects
:
CATEGORYLIST
]
objectAtIndex
:
buttonIndex
]
forKey
:
@"selectLabel"
];
_categoryNum
=
buttonIndex
;
_questionNum
=
0
;
[
self
.
tableView
reloadData
];
}
}
}
else
if
(
actionSheet
==
_questionActionSheet
){
}
else
if
(
actionSheet
==
_questionActionSheet
){
if
(
buttonIndex
<
[
NSArray
arrayWithObjects
:
QUESTIONLIST
].
count
)
{
_selectLabel1
.
text
=
[[
NSArray
arrayWithObjects
:
QUESTIONLIST
]
objectAtIndex
:
buttonIndex
];
NSString
*
cateStr
=
_categoryArray
[
_categoryNum
];
[
_saveDict
setObject
:[[
NSArray
arrayWithObjects
:
QUESTIONLIST
]
objectAtIndex
:
buttonIndex
]
forKey
:
@"selectLabel1"
];
NSArray
*
seleArray
=
[
_questionDict
objectForKey
:
cateStr
];
if
((
buttonIndex
-
1
)
<
seleArray
.
count
)
{
_selectLabel1
.
text
=
[
seleArray
objectAtIndex
:(
buttonIndex
-
1
)];
_questionNum
=
buttonIndex
-
1
;
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
redstar/Classes/Module/Function/Question/QuestionList/ViewController/QuestionViewController.m
View file @
a1f3aa0c
...
@@ -145,7 +145,7 @@
...
@@ -145,7 +145,7 @@
[
self
.
tableView
reloadData
];
[
self
.
tableView
reloadData
];
[
MBProgressHUD
hideHUDForView
:
self
.
view
animated
:
YES
];
[
MBProgressHUD
hideHUDForView
:
self
.
view
animated
:
YES
];
}
}
[
MBProgressHUD
hideHUDForView
:
self
.
view
animated
:
YES
];
}];
}];
}
}
...
...
This diff is collapsed.
Click to expand it.
redstar/Classes/Module/Function/WordOfMouth/Ranking/RankingList/ViewController/RankingListViewController.m
View file @
a1f3aa0c
...
@@ -102,7 +102,6 @@
...
@@ -102,7 +102,6 @@
_pickRow
=
0
;
_pickRow
=
0
;
[
self
requestShortPraise
];
self
.
shoppingLabel
.
text
=
@"商场名称"
;
self
.
shoppingLabel
.
text
=
@"商场名称"
;
self
.
scoreLabel
.
text
=
@"总分"
;
self
.
scoreLabel
.
text
=
@"总分"
;
...
@@ -124,6 +123,8 @@
...
@@ -124,6 +123,8 @@
{
{
[
super
viewWillAppear
:
animated
];
[
super
viewWillAppear
:
animated
];
[
self
requestShortPraise
];
self
.
tabBarController
.
tabBar
.
hidden
=
YES
;
self
.
tabBarController
.
tabBar
.
hidden
=
YES
;
}
}
...
...
This diff is collapsed.
Click to expand it.
redstar/Classes/Module/Home/ViewController/HomeViewController.m
View file @
a1f3aa0c
...
@@ -806,6 +806,7 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
...
@@ -806,6 +806,7 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
rankDetailVC
.
store_uuid
=
rankList
.
store_uuid
;
rankDetailVC
.
store_uuid
=
rankList
.
store_uuid
;
rankDetailVC
.
storeAddress
=
rankList
.
storeAddress
;
rankDetailVC
.
storeAddress
=
rankList
.
storeAddress
;
rankDetailVC
.
storePictures
=
rankList
.
storePictures
;
rankDetailVC
.
storePictures
=
rankList
.
storePictures
;
rankDetailVC
.
commentId
=
rankList
.
commentId
;
self
.
hidesBottomBarWhenPushed
=
YES
;
self
.
hidesBottomBarWhenPushed
=
YES
;
[
self
.
navigationController
pushViewController
:
rankDetailVC
animated
:
YES
];
[
self
.
navigationController
pushViewController
:
rankDetailVC
animated
:
YES
];
}
else
if
([
_sectionArray
[
indexPath
.
section
]
isEqualToString
:
@"问题知识"
]
&&
indexPath
.
section
==
s3
)
{
}
else
if
([
_sectionArray
[
indexPath
.
section
]
isEqualToString
:
@"问题知识"
]
&&
indexPath
.
section
==
s3
)
{
...
...
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