Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
FastService
Overview
Overview
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
AppWaiBao
FastService
Commits
3bf1397e
Commit
3bf1397e
authored
Feb 28, 2024
by
xuning
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单弹窗
parent
7c757c81
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
629 additions
and
0 deletions
+629
-0
project.pbxproj
FastService.xcodeproj/project.pbxproj
+32
-0
UserInterfaceState.xcuserstate
...serdata/xuning.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
AppDelegate.m
FastService/AppDelegate.m
+3
-0
XVDispatchOrderAlter.h
FastService/Main/View/OrderAlter/XVDispatchOrderAlter.h
+19
-0
XVDispatchOrderAlter.m
FastService/Main/View/OrderAlter/XVDispatchOrderAlter.m
+349
-0
XVGetOrderAlterButtonView.h
FastService/Main/View/OrderAlter/XVGetOrderAlterButtonView.h
+17
-0
XVGetOrderAlterButtonView.m
FastService/Main/View/OrderAlter/XVGetOrderAlterButtonView.m
+93
-0
XVGetOrderAlterSliderView.h
FastService/Main/View/OrderAlter/XVGetOrderAlterSliderView.h
+17
-0
XVGetOrderAlterSliderView.m
FastService/Main/View/OrderAlter/XVGetOrderAlterSliderView.m
+54
-0
XVNewOrderAlter.h
FastService/Main/View/OrderAlter/XVNewOrderAlter.h
+17
-0
XVNewOrderAlter.m
FastService/Main/View/OrderAlter/XVNewOrderAlter.m
+21
-0
XVOrderSettingViewController.m
...ervice/Personal/Controller/XVOrderSettingViewController.m
+7
-0
No files found.
FastService.xcodeproj/project.pbxproj
View file @
3bf1397e
...
...
@@ -48,6 +48,10 @@
79DC8B842B8CD5DF00DBD8EA
/* XVOrderSettiingTitleView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
79DC8B832B8CD5DF00DBD8EA
/* XVOrderSettiingTitleView.m */
;
};
79DC8B872B8CD5F000DBD8EA
/* XVOrderSettingView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
79DC8B862B8CD5F000DBD8EA
/* XVOrderSettingView.m */
;
};
79DC8B8A2B8D818000DBD8EA
/* XVVerticalButton.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
79DC8B892B8D818000DBD8EA
/* XVVerticalButton.m */
;
};
79DC8B8D2B8D887000DBD8EA
/* XVDispatchOrderAlter.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
79DC8B8C2B8D887000DBD8EA
/* XVDispatchOrderAlter.m */
;
};
79DC8B902B8DABF900DBD8EA
/* XVNewOrderAlter.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
79DC8B8F2B8DABF800DBD8EA
/* XVNewOrderAlter.m */
;
};
79DC8B962B8DB05900DBD8EA
/* XVGetOrderAlterButtonView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
79DC8B952B8DB05900DBD8EA
/* XVGetOrderAlterButtonView.m */
;
};
79DC8B992B8DB07A00DBD8EA
/* XVGetOrderAlterSliderView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
79DC8B982B8DB07A00DBD8EA
/* XVGetOrderAlterSliderView.m */
;
};
FA5E55D5A48FDC04BA4CCD08
/* Pods_fastservice.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
08D109EE60B32403F3655A70
/* Pods_fastservice.framework */
;
};
/* End PBXBuildFile section */
...
...
@@ -137,6 +141,14 @@
79DC8B862B8CD5F000DBD8EA
/* XVOrderSettingView.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
XVOrderSettingView.m
;
sourceTree
=
"<group>"
;
};
79DC8B882B8D818000DBD8EA
/* XVVerticalButton.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
XVVerticalButton.h
;
sourceTree
=
"<group>"
;
};
79DC8B892B8D818000DBD8EA
/* XVVerticalButton.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
XVVerticalButton.m
;
sourceTree
=
"<group>"
;
};
79DC8B8B2B8D887000DBD8EA
/* XVDispatchOrderAlter.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
XVDispatchOrderAlter.h
;
sourceTree
=
"<group>"
;
};
79DC8B8C2B8D887000DBD8EA
/* XVDispatchOrderAlter.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
XVDispatchOrderAlter.m
;
sourceTree
=
"<group>"
;
};
79DC8B8E2B8DABF800DBD8EA
/* XVNewOrderAlter.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
XVNewOrderAlter.h
;
sourceTree
=
"<group>"
;
};
79DC8B8F2B8DABF800DBD8EA
/* XVNewOrderAlter.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
XVNewOrderAlter.m
;
sourceTree
=
"<group>"
;
};
79DC8B942B8DB05900DBD8EA
/* XVGetOrderAlterButtonView.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
XVGetOrderAlterButtonView.h
;
sourceTree
=
"<group>"
;
};
79DC8B952B8DB05900DBD8EA
/* XVGetOrderAlterButtonView.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
XVGetOrderAlterButtonView.m
;
sourceTree
=
"<group>"
;
};
79DC8B972B8DB07A00DBD8EA
/* XVGetOrderAlterSliderView.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
XVGetOrderAlterSliderView.h
;
sourceTree
=
"<group>"
;
};
79DC8B982B8DB07A00DBD8EA
/* XVGetOrderAlterSliderView.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
XVGetOrderAlterSliderView.m
;
sourceTree
=
"<group>"
;
};
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
...
...
@@ -197,6 +209,7 @@
7981EAD02B6F655500F357E7
/* View */
=
{
isa
=
PBXGroup
;
children
=
(
79DC8B9A2B8DB0E700DBD8EA
/* OrderAlter */
,
7981EAFD2B712CC700F357E7
/* HBLockSliderView.h */
,
7981EAFE2B712CC700F357E7
/* HBLockSliderView.m */
,
7981EAD12B6F656900F357E7
/* XVCustomBarView.h */
,
...
...
@@ -418,6 +431,21 @@
path
=
Controller
;
sourceTree
=
"<group>"
;
};
79DC8B9A2B8DB0E700DBD8EA
/* OrderAlter */
=
{
isa
=
PBXGroup
;
children
=
(
79DC8B8B2B8D887000DBD8EA
/* XVDispatchOrderAlter.h */
,
79DC8B8C2B8D887000DBD8EA
/* XVDispatchOrderAlter.m */
,
79DC8B8E2B8DABF800DBD8EA
/* XVNewOrderAlter.h */
,
79DC8B8F2B8DABF800DBD8EA
/* XVNewOrderAlter.m */
,
79DC8B942B8DB05900DBD8EA
/* XVGetOrderAlterButtonView.h */
,
79DC8B952B8DB05900DBD8EA
/* XVGetOrderAlterButtonView.m */
,
79DC8B972B8DB07A00DBD8EA
/* XVGetOrderAlterSliderView.h */
,
79DC8B982B8DB07A00DBD8EA
/* XVGetOrderAlterSliderView.m */
,
);
path
=
OrderAlter
;
sourceTree
=
"<group>"
;
};
C642CCEC71A6009B069B11C8
/* Frameworks */
=
{
isa
=
PBXGroup
;
children
=
(
...
...
@@ -561,6 +589,7 @@
files
=
(
79DC8B6F2B74A8E600DBD8EA
/* XVPersonalFooterView.m in Sources */
,
79DC8B752B74B69600DBD8EA
/* XVOrderDetailsViewController.m in Sources */
,
79DC8B962B8DB05900DBD8EA
/* XVGetOrderAlterButtonView.m in Sources */
,
79DC8B872B8CD5F000DBD8EA
/* XVOrderSettingView.m in Sources */
,
7981EAB72B6E669000F357E7
/* UIScrollView+XVAdd.m in Sources */
,
7981EACF2B6F63CF00F357E7
/* XVMainJobViewController.m in Sources */
,
...
...
@@ -585,7 +614,9 @@
7981EAFF2B712CC700F357E7
/* HBLockSliderView.m in Sources */
,
7981EAF92B71205A00F357E7
/* XVJobStatusToolView.m in Sources */
,
799DF0D72B6BD8B100680907
/* main.m in Sources */
,
79DC8B902B8DABF900DBD8EA
/* XVNewOrderAlter.m in Sources */
,
7981EB042B7273B500F357E7
/* XVPersonalViewController.m in Sources */
,
79DC8B992B8DB07A00DBD8EA
/* XVGetOrderAlterSliderView.m in Sources */
,
7981EAF32B6FC08F00F357E7
/* XVCategoryTitleCell.m in Sources */
,
7981EAF62B6FD62200F357E7
/* XVOrderSortView.m in Sources */
,
7981EAC42B6E800900F357E7
/* XVInputFieldView.m in Sources */
,
...
...
@@ -594,6 +625,7 @@
799DF11A2B6D2B3200680907
/* XVLoginViewController.m in Sources */
,
7981EAED2B6FC05B00F357E7
/* XVCategoryTitleView.m in Sources */
,
799DF1102B6D25B400680907
/* UIBarButtonItem+SXCreate.m in Sources */
,
79DC8B8D2B8D887000DBD8EA
/* XVDispatchOrderAlter.m in Sources */
,
799DF10F2B6D25B400680907
/* UINavigation+SXFixSpace.m in Sources */
,
7981EB0B2B73BC1500F357E7
/* XVPersonalViewCell.m in Sources */
,
799DF0F92B6BDA1400680907
/* UINavigationController+FDFullscreenPopGesture.m in Sources */
,
...
...
FastService.xcworkspace/xcuserdata/xuning.xcuserdatad/UserInterfaceState.xcuserstate
View file @
3bf1397e
No preview for this file type
FastService/AppDelegate.m
View file @
3bf1397e
...
...
@@ -12,6 +12,7 @@
#import "XVNaviViewController.h"
#import "XVMainJobViewController.h"
@interface
AppDelegate
()
...
...
@@ -43,6 +44,8 @@
[
self
setupIQKeyboard
];
return
YES
;
}
...
...
FastService/Main/View/OrderAlter/XVDispatchOrderAlter.h
0 → 100644
View file @
3bf1397e
//
// XVDispatchOrderAlter.h
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface
XVDispatchOrderAlter
:
UIView
+
(
void
)
show
;
@end
NS_ASSUME_NONNULL_END
FastService/Main/View/OrderAlter/XVDispatchOrderAlter.m
0 → 100644
View file @
3bf1397e
//
// XVDispatchOrderAlter.m
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import "XVDispatchOrderAlter.h"
#import "XVGetOrderAlterSliderView.h"
#import "XVGetOrderAlterButtonView.h"
@interface
XVDispatchOrderAlter
()
@property
(
nonatomic
,
strong
)
UIView
*
topView
;
@property
(
nonatomic
,
strong
)
UILabel
*
priceLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
orderTypeLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
goodsTypeLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
distanceLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
timeLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
pickupLabel
;
// 取货距离
@property
(
nonatomic
,
strong
)
UILabel
*
pickupDistanceLabel
;
// 取货地址
@property
(
nonatomic
,
strong
)
UILabel
*
pickupAddressLabel
;
// 取货详细地址
@property
(
nonatomic
,
strong
)
UILabel
*
pickupDetailAddressLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
deliveryLabel
;
// 送货距离
@property
(
nonatomic
,
strong
)
UILabel
*
deliveryDistanceLabel
;
// 送货地址
@property
(
nonatomic
,
strong
)
UILabel
*
deliveryAddressLabel
;
// 收货人
@property
(
nonatomic
,
strong
)
UILabel
*
deliveryNameLabel
;
// 备注
@property
(
nonatomic
,
strong
)
YYLabel
*
remarkLabel
;
@property
(
nonatomic
,
strong
)
XVGetOrderAlterSliderView
*
silderToolView
;
@property
(
nonatomic
,
strong
)
XVGetOrderAlterButtonView
*
buttonToolView
;
@end
@implementation
XVDispatchOrderAlter
+
(
void
)
show
{
XVDispatchOrderAlter
*
view
=
[[
XVDispatchOrderAlter
alloc
]
init
];
// 计算alter的高度
UIView
*
bgView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
SCREEN_WIDTH
-
16
,
SCREEN_HEIGHT
)];
bgView
.
backgroundColor
=
[
UIColor
whiteColor
];
[
bgView
addSubview
:
view
];
[
view
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
right
.
top
.
mas_equalTo
(
bgView
);
}];
[
bgView
layoutIfNeeded
];
bgView
.
height
=
view
.
height
;
[
LEEAlert
alert
].
config
.
LeeCustomView
(
bgView
)
.
LeeMaxWidth
(
SCREEN_WIDTH
-
16
)
.
LeeMaxHeight
(
SCREEN_HEIGHT
)
.
LeeHeaderInsets
(
UIEdgeInsetsMake
(
0
,
0
,
0
,
0
))
.
LeeItemInsets
(
UIEdgeInsetsMake
(
0
,
0
,
0
,
0
))
.
LeeClickBackgroundClose
(
NO
)
.
LeeShow
();
}
-
(
instancetype
)
initWithFrame
:
(
CGRect
)
frame
{
if
(
self
=
[
super
initWithFrame
:
frame
])
{
[
self
setupUI
];
}
return
self
;
}
-
(
void
)
setupUI
{
[
self
addSubview
:
self
.
topView
];
[
self
.
topView
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
top
.
left
.
right
.
mas_equalTo
(
self
);
}];
[
self
.
topView
addSubview
:
self
.
priceLabel
];
[
self
.
priceLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
top
.
left
.
mas_equalTo
(
self
.
topView
).
mas_offset
(
33
);
}];
[
self
.
topView
addSubview
:
self
.
orderTypeLabel
];
[
self
.
orderTypeLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
bottom
.
mas_equalTo
(
self
.
priceLabel
);
make
.
right
.
mas_equalTo
(
self
.
topView
).
mas_offset
(
-
28
);
}];
[
self
.
topView
addSubview
:
self
.
distanceLabel
];
[
self
.
distanceLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
mas_equalTo
(
self
.
priceLabel
);
make
.
top
.
mas_equalTo
(
self
.
priceLabel
.
mas_bottom
).
mas_offset
(
15
);
}];
[
self
.
topView
addSubview
:
self
.
timeLabel
];
[
self
.
timeLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
mas_equalTo
(
self
.
priceLabel
);
make
.
top
.
mas_equalTo
(
self
.
distanceLabel
.
mas_bottom
).
mas_offset
(
15
);
make
.
bottom
.
mas_equalTo
(
self
.
topView
).
mas_offset
(
-
15
);
}];
[
self
addSubview
:
self
.
pickupLabel
];
[
self
.
pickupLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
top
.
mas_equalTo
(
self
.
topView
.
mas_bottom
).
mas_offset
(
25
);
make
.
left
.
mas_equalTo
(
self
).
mas_offset
(
14
);
make
.
size
.
mas_equalTo
(
CGSizeMake
(
28
,
28
));
}];
kViewBorderRadius
(
self
.
pickupLabel
,
14
,
1
,
COLOR_THEMEGRENN
);
[
self
addSubview
:
self
.
pickupDistanceLabel
];
[
self
.
pickupDistanceLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
centerY
.
mas_equalTo
(
self
.
pickupLabel
);
make
.
left
.
mas_equalTo
(
self
.
pickupLabel
.
mas_right
);
make
.
width
.
mas_equalTo
(
45
);
}];
[
self
addSubview
:
self
.
pickupAddressLabel
];
[
self
.
pickupAddressLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
mas_equalTo
(
self
.
pickupDistanceLabel
.
mas_right
);
make
.
top
.
mas_equalTo
(
self
.
pickupLabel
);
make
.
right
.
mas_equalTo
(
self
).
mas_offset
(
-
14
);
}];
[
self
addSubview
:
self
.
pickupDetailAddressLabel
];
[
self
.
pickupDetailAddressLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
top
.
mas_equalTo
(
self
.
pickupAddressLabel
.
mas_bottom
);
make
.
right
.
left
.
mas_equalTo
(
self
.
pickupAddressLabel
);
}];
[
self
addSubview
:
self
.
deliveryLabel
];
[
self
.
deliveryLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
top
.
mas_equalTo
(
self
.
pickupDetailAddressLabel
.
mas_bottom
).
mas_offset
(
32
);
make
.
left
.
mas_equalTo
(
self
).
mas_offset
(
14
);
make
.
size
.
mas_equalTo
(
CGSizeMake
(
28
,
28
));
}];
kViewBorderRadius
(
self
.
deliveryLabel
,
14
,
0
,
[
UIColor
clearColor
]);
[
self
addSubview
:
self
.
deliveryDistanceLabel
];
[
self
.
deliveryDistanceLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
centerY
.
mas_equalTo
(
self
.
deliveryLabel
);
make
.
left
.
mas_equalTo
(
self
.
deliveryLabel
.
mas_right
);
make
.
width
.
mas_equalTo
(
45
);
}];
[
self
addSubview
:
self
.
deliveryAddressLabel
];
[
self
.
deliveryAddressLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
right
.
left
.
mas_equalTo
(
self
.
pickupAddressLabel
);
make
.
top
.
mas_equalTo
(
self
.
deliveryLabel
);
}];
[
self
addSubview
:
self
.
deliveryNameLabel
];
[
self
.
deliveryNameLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
top
.
mas_equalTo
(
self
.
deliveryAddressLabel
.
mas_bottom
);
make
.
right
.
left
.
mas_equalTo
(
self
.
pickupAddressLabel
);
}];
[
self
addSubview
:
self
.
remarkLabel
];
[
self
.
remarkLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
mas_equalTo
(
self
).
mas_offset
(
12
);
make
.
right
.
mas_equalTo
(
self
).
mas_offset
(
-
12
);
make
.
top
.
mas_equalTo
(
self
.
deliveryNameLabel
.
mas_bottom
).
mas_offset
(
52
);
}];
// [self addSubview:self.buttonToolView];
// [self.buttonToolView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.bottom.mas_equalTo(self).mas_offset(-15);
// make.width.mas_equalTo(SCREEN_WIDTH-16);
// make.centerX.mas_equalTo(self);
// make.top.mas_equalTo(self.remarkLabel.mas_bottom).mas_offset(45);
// make.height.mas_equalTo(75);
//
// }];
[
self
addSubview
:
self
.
silderToolView
];
[
self
.
silderToolView
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
bottom
.
mas_equalTo
(
self
);
make
.
width
.
mas_equalTo
(
SCREEN_WIDTH
-
16
);
make
.
centerX
.
mas_equalTo
(
self
);
make
.
top
.
mas_equalTo
(
self
.
remarkLabel
.
mas_bottom
).
mas_offset
(
45
);
make
.
height
.
mas_equalTo
(
51
);
}];
}
-
(
UIView
*
)
topView
{
if
(
_topView
==
nil
)
{
_topView
=
[[
UIView
alloc
]
init
];
_topView
.
backgroundColor
=
COLOR_THEMEGRENN
;
}
return
_topView
;
}
-
(
UILabel
*
)
priceLabel
{
if
(
_priceLabel
==
nil
)
{
_priceLabel
=
[[
UILabel
alloc
]
init
];
NSMutableAttributedString
*
text
=
[
NSMutableAttributedString
new
];
UIFont
*
font
=
[
UIFont
systemFontOfSize
:
36
];
UIColor
*
color
=
[
UIColor
colorWithHexString
:
@"#F0EFEF"
];
[
text
appendAttributedString
:[[
NSAttributedString
alloc
]
initWithString
:
@"8.65"
attributes
:@{
NSFontAttributeName
:
font
,
NSForegroundColorAttributeName
:
color
}]];
[
text
appendAttributedString
:[[
NSAttributedString
alloc
]
initWithString
:
@"(指派单)"
attributes
:@{
NSFontAttributeName
:
[
UIFont
systemFontOfSize
:
14
],
NSForegroundColorAttributeName
:
color
}]];
_priceLabel
.
attributedText
=
text
;
}
return
_priceLabel
;
}
-
(
UILabel
*
)
orderTypeLabel
{
if
(
_orderTypeLabel
==
nil
)
{
_orderTypeLabel
=
[[
UILabel
alloc
]
initWithText
:
@"文件"
textColor
:[
UIColor
colorWithHexString
:
@"#F0EFEF"
]
textAlignment
:
(
NSTextAlignmentCenter
)
fontSize
:
14
];
}
return
_orderTypeLabel
;
}
-
(
UILabel
*
)
distanceLabel
{
if
(
_distanceLabel
==
nil
)
{
_distanceLabel
=
[[
UILabel
alloc
]
initWithText
:
@"3.45公里/距你1.71公里"
textColor
:[
UIColor
whiteColor
]
textAlignment
:
(
NSTextAlignmentCenter
)
fontSize
:
14
];
}
return
_distanceLabel
;
}
-
(
UILabel
*
)
timeLabel
{
if
(
_timeLabel
==
nil
)
{
_timeLabel
=
[[
UILabel
alloc
]
initWithText
:
@"17:00前送达"
textColor
:[
UIColor
whiteColor
]
textAlignment
:
(
NSTextAlignmentCenter
)
fontSize
:
14
];
}
return
_timeLabel
;
}
-
(
UILabel
*
)
pickupLabel
{
if
(
_pickupLabel
==
nil
)
{
_pickupLabel
=
[[
UILabel
alloc
]
initWithText
:
@"取"
textColor
:[
UIColor
whiteColor
]
textAlignment
:
(
NSTextAlignmentCenter
)
fontSize
:
14
];
_pickupLabel
.
backgroundColor
=
COLOR_THEMEGRENN
;
}
return
_pickupLabel
;
}
-
(
UILabel
*
)
pickupDistanceLabel
{
if
(
_pickupDistanceLabel
==
nil
)
{
_pickupDistanceLabel
=
[[
UILabel
alloc
]
initWithText
:
@"1.9"
textColor
:
F_101010_COLOR
textAlignment
:
(
NSTextAlignmentCenter
)
fontSize
:
12
];
_pickupDistanceLabel
.
numberOfLines
=
0
;
}
return
_pickupDistanceLabel
;
}
-
(
UILabel
*
)
deliveryLabel
{
if
(
_deliveryLabel
==
nil
)
{
_deliveryLabel
=
[[
UILabel
alloc
]
initWithText
:
@"收"
textColor
:[
UIColor
whiteColor
]
textAlignment
:
(
NSTextAlignmentCenter
)
fontSize
:
14
];
_deliveryLabel
.
backgroundColor
=
[
UIColor
colorWithHexString
:
@"#FF7C61"
];
}
return
_deliveryLabel
;
}
-
(
UILabel
*
)
deliveryDistanceLabel
{
if
(
_deliveryDistanceLabel
==
nil
)
{
_deliveryDistanceLabel
=
[[
UILabel
alloc
]
initWithText
:
@"3.9"
textColor
:
F_101010_COLOR
textAlignment
:
(
NSTextAlignmentCenter
)
fontSize
:
12
];
_deliveryDistanceLabel
.
numberOfLines
=
0
;
}
return
_deliveryDistanceLabel
;
}
-
(
UILabel
*
)
pickupAddressLabel
{
if
(
_pickupAddressLabel
==
nil
)
{
_pickupAddressLabel
=
[[
UILabel
alloc
]
initWithText
:
@"小鱼的测试店铺(花园桥店) "
textColor
:
F_101010_COLOR
textAlignment
:
(
NSTextAlignmentLeft
)
fontSize
:
20
];
_pickupAddressLabel
.
numberOfLines
=
0
;
_pickupAddressLabel
.
font
=
[
UIFont
boldSystemFontOfSize
:
20
];
}
return
_pickupAddressLabel
;
}
-
(
UILabel
*
)
pickupDetailAddressLabel
{
if
(
_pickupDetailAddressLabel
==
nil
)
{
_pickupDetailAddressLabel
=
[[
UILabel
alloc
]
initWithText
:
@"北京动物园大猩猩馆000000000"
textColor
:
F_101010_COLOR
textAlignment
:
(
NSTextAlignmentLeft
)
fontSize
:
12
];
_pickupDetailAddressLabel
.
numberOfLines
=
0
;
}
return
_pickupDetailAddressLabel
;
}
-
(
UILabel
*
)
deliveryAddressLabel
{
if
(
_deliveryAddressLabel
==
nil
)
{
_deliveryAddressLabel
=
[[
UILabel
alloc
]
initWithText
:
@"白石桥南地铁站"
textColor
:
F_101010_COLOR
textAlignment
:
(
NSTextAlignmentLeft
)
fontSize
:
18
];
_deliveryAddressLabel
.
numberOfLines
=
0
;
_deliveryAddressLabel
.
font
=
[
UIFont
boldSystemFontOfSize
:
20
];
}
return
_deliveryAddressLabel
;
}
-
(
UILabel
*
)
deliveryNameLabel
{
if
(
_deliveryNameLabel
==
nil
)
{
_deliveryNameLabel
=
[[
UILabel
alloc
]
initWithText
:
@"收货人:嫦娥仙子"
textColor
:
F_101010_COLOR
textAlignment
:
(
NSTextAlignmentLeft
)
fontSize
:
14
];
_deliveryNameLabel
.
numberOfLines
=
0
;
}
return
_deliveryNameLabel
;
}
-
(
YYLabel
*
)
remarkLabel
{
if
(
_remarkLabel
==
nil
)
{
_remarkLabel
=
[[
YYLabel
alloc
]
init
];
_remarkLabel
.
text
=
@"这里是备注"
;
_remarkLabel
.
font
=
[
UIFont
systemFontOfSize
:
14
];
_remarkLabel
.
backgroundColor
=
[
UIColor
whiteColor
];
_remarkLabel
.
textColor
=
kHexRGB
(
0x808080
);
_remarkLabel
.
preferredMaxLayoutWidth
=
SCREEN_WIDTH
-
84
;
_remarkLabel
.
textTapAction
=
^
(
UIView
*
_Nonnull
containerView
,
NSAttributedString
*
_Nonnull
text
,
NSRange
range
,
CGRect
rect
)
{
//点击展开
};
}
return
_remarkLabel
;
}
-
(
XVGetOrderAlterSliderView
*
)
silderToolView
{
if
(
_silderToolView
==
nil
)
{
_silderToolView
=
[[
XVGetOrderAlterSliderView
alloc
]
init
];
}
return
_silderToolView
;
}
-
(
XVGetOrderAlterButtonView
*
)
buttonToolView
{
if
(
_buttonToolView
==
nil
)
{
_buttonToolView
=
[[
XVGetOrderAlterButtonView
alloc
]
init
];
}
return
_buttonToolView
;
}
@end
FastService/Main/View/OrderAlter/XVGetOrderAlterButtonView.h
0 → 100644
View file @
3bf1397e
//
// XVGetOrderAlterButtonView.h
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface
XVGetOrderAlterButtonView
:
UIView
@end
NS_ASSUME_NONNULL_END
FastService/Main/View/OrderAlter/XVGetOrderAlterButtonView.m
0 → 100644
View file @
3bf1397e
//
// XVGetOrderAlterButtonView.m
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import "XVGetOrderAlterButtonView.h"
@interface
XVGetOrderAlterButtonView
()
@property
(
nonatomic
,
strong
)
UIButton
*
leftRefuseButton
;
// 抢单
@property
(
nonatomic
,
strong
)
UIButton
*
orderButton
;
@property
(
nonatomic
,
strong
)
UIButton
*
rightRefuseButton
;
@end
@implementation
XVGetOrderAlterButtonView
-
(
instancetype
)
initWithFrame
:(
CGRect
)
frame
{
if
(
self
=
[
super
initWithFrame
:
frame
])
{
[
self
setupUI
];
}
return
self
;
}
-
(
void
)
setupUI
{
CGFloat
x
=
(
SCREEN_WIDTH
-
16
)
/
4
;
[
self
addSubview
:
self
.
orderButton
];
[
self
.
orderButton
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
center
.
mas_equalTo
(
self
);
make
.
size
.
mas_equalTo
(
CGSizeMake
(
75
,
75
));
}];
[
self
addSubview
:
self
.
leftRefuseButton
];
[
self
.
leftRefuseButton
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
centerY
.
mas_equalTo
(
self
);
make
.
centerX
.
mas_equalTo
(
self
).
mas_offset
(
-
x
);
make
.
size
.
mas_equalTo
(
CGSizeMake
(
44
,
44
));
}];
[
self
addSubview
:
self
.
rightRefuseButton
];
[
self
.
rightRefuseButton
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
centerY
.
mas_equalTo
(
self
);
make
.
centerX
.
mas_equalTo
(
self
).
mas_offset
(
x
);
make
.
size
.
mas_equalTo
(
CGSizeMake
(
44
,
44
));
}];
self
.
orderButton
.
layer
.
shadowColor
=
RGBAColor
(
0
,
0
,
0
,
0
.
4
).
CGColor
;
self
.
orderButton
.
layer
.
shadowOffset
=
CGSizeMake
(
0
,
0
);
self
.
orderButton
.
layer
.
shadowOpacity
=
0
.
8
f
;
kViewBorderRadius
(
self
.
orderButton
,
75
/
2
,
1
,
F_BBBBBB_COLOR
);
self
.
rightRefuseButton
.
layer
.
shadowColor
=
RGBAColor
(
0
,
0
,
0
,
0
.
4
).
CGColor
;
self
.
rightRefuseButton
.
layer
.
shadowOffset
=
CGSizeMake
(
0
,
0
);
self
.
rightRefuseButton
.
layer
.
shadowOpacity
=
0
.
8
f
;
kViewBorderRadius
(
self
.
rightRefuseButton
,
22
,
1
,
F_BBBBBB_COLOR
);
self
.
leftRefuseButton
.
layer
.
shadowColor
=
RGBAColor
(
0
,
0
,
0
,
0
.
4
).
CGColor
;
self
.
leftRefuseButton
.
layer
.
shadowOffset
=
CGSizeMake
(
0
,
0
);
self
.
leftRefuseButton
.
layer
.
shadowOpacity
=
0
.
8
f
;
kViewBorderRadius
(
self
.
leftRefuseButton
,
22
,
1
,
F_BBBBBB_COLOR
);
}
-
(
UIButton
*
)
leftRefuseButton
{
if
(
_leftRefuseButton
==
nil
)
{
_leftRefuseButton
=
[[
UIButton
alloc
]
initWithTitle
:
@"拒绝"
fontSize
:
14
titleColor
:
F_101010_COLOR
bgColor
:
[
UIColor
whiteColor
]];
}
return
_leftRefuseButton
;
}
-
(
UIButton
*
)
orderButton
{
if
(
_orderButton
==
nil
)
{
_orderButton
=
[[
UIButton
alloc
]
initWithTitle
:
@"接受
\n
10S"
fontSize
:
14
titleColor
:
[
UIColor
whiteColor
]
bgColor
:
COLOR_THEMEGRENN
];
}
return
_orderButton
;
}
-
(
UIButton
*
)
rightRefuseButton
{
if
(
_rightRefuseButton
==
nil
)
{
_rightRefuseButton
=
[[
UIButton
alloc
]
initWithTitle
:
@"拒绝"
fontSize
:
14
titleColor
:
F_101010_COLOR
bgColor
:
[
UIColor
whiteColor
]];
}
return
_rightRefuseButton
;
}
@end
FastService/Main/View/OrderAlter/XVGetOrderAlterSliderView.h
0 → 100644
View file @
3bf1397e
//
// XVGetOrderAlterSliderView.h
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface
XVGetOrderAlterSliderView
:
UIView
@end
NS_ASSUME_NONNULL_END
FastService/Main/View/OrderAlter/XVGetOrderAlterSliderView.m
0 → 100644
View file @
3bf1397e
//
// XVGetOrderAlterSliderView.m
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import "XVGetOrderAlterSliderView.h"
#import "HBLockSliderView.h"
@interface
XVGetOrderAlterSliderView
()
<
HBLockSliderDelegate
>
// 拒绝
@property
(
nonatomic
,
strong
)
UIButton
*
refuseButton
;
// 滑动
@property
(
nonatomic
,
strong
)
HBLockSliderView
*
sliderView
;
@end
@implementation
XVGetOrderAlterSliderView
-
(
instancetype
)
initWithFrame
:(
CGRect
)
frame
{
if
(
self
=
[
super
initWithFrame
:
frame
])
{
[
self
addSubview
:
self
.
refuseButton
];
self
.
refuseButton
.
frame
=
CGRectMake
(
0
,
0
,
84
,
51
);
[
self
addSubview
:
self
.
sliderView
];
}
return
self
;
}
-
(
UIButton
*
)
refuseButton
{
if
(
_refuseButton
==
nil
)
{
_refuseButton
=
[[
UIButton
alloc
]
initWithTitle
:
@"拒绝"
fontSize
:
14
titleColor
:
F_101010_COLOR
bgColor
:
[
UIColor
colorWithHexString
:
@"#E4E1E1"
]];
}
return
_refuseButton
;
}
-
(
HBLockSliderView
*
)
sliderView
{
if
(
_sliderView
==
nil
)
{
_sliderView
=
[[
HBLockSliderView
alloc
]
initWithFrame
:
CGRectMake
(
84
,
0
,
SCREEN_WIDTH
-
100
,
51
)];
_sliderView
.
text
=
@"滑动接受派单"
;
[
_sliderView
setColorForBackgroud
:
COLOR_THEMEGRENN
foreground
:
COLOR_THEMEGRENN
thumb
:
COLOR_THEMEGRENN
border
:
[
UIColor
clearColor
]
textColor
:
[
UIColor
whiteColor
]];
_sliderView
.
thumbBack
=
YES
;
[
_sliderView
setThumbBeginImage
:[
UIImage
imageNamed
:
@"huadong"
]
finishImage
:[
UIImage
imageNamed
:
@"huadong"
]];
[
_sliderView
setRoundCorners
:
0
];
_sliderView
.
delegate
=
self
;
}
return
_sliderView
;
}
@end
FastService/Main/View/OrderAlter/XVNewOrderAlter.h
0 → 100644
View file @
3bf1397e
//
// XVNewOrderAlter.h
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface
XVNewOrderAlter
:
UIView
@end
NS_ASSUME_NONNULL_END
FastService/Main/View/OrderAlter/XVNewOrderAlter.m
0 → 100644
View file @
3bf1397e
//
// XVNewOrderAlter.m
// fastservice
//
// Created by xuning on 2/27/24.
// Copyright © 2024 FastService. All rights reserved.
//
#import "XVNewOrderAlter.h"
@implementation
XVNewOrderAlter
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
FastService/Personal/Controller/XVOrderSettingViewController.m
View file @
3bf1397e
...
...
@@ -10,6 +10,7 @@
#import "XVOrderSettiingTitleView.h"
#import "XVOrderSettingView.h"
#import "XVVerticalButton.h"
#import "XVDispatchOrderAlter.h"
@interface
XVOrderSettingViewController
()
...
...
@@ -44,6 +45,12 @@
[
self
setupUI
];
}
-
(
void
)
setupUI
{
XVDispatchOrderAlter
*
view
=
[[
XVDispatchOrderAlter
alloc
]
init
];
[
self
.
view
addSubview
:
view
];
[
view
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
right
.
top
.
mas_equalTo
(
self
.
view
);
}];
return
;
[
self
.
view
addSubview
:
self
.
scrollView
];
[
self
.
scrollView
addSubview
:
self
.
title1View
];
...
...
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