diff --git a/Class/Reseller/Cell/ResellerTableViewCell.h b/Class/Reseller/Cell/ResellerTableViewCell.h
deleted file mode 100644
index 82b6e5672bc509052068fae8f01d856e1367677a..0000000000000000000000000000000000000000
--- a/Class/Reseller/Cell/ResellerTableViewCell.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// ResellerTableViewCell.h
-// Lighting
-//
-// Created by 曹云霄 on 2017/3/6.
-// Copyright © 2017å¹´ 上海勾芒科技有é™å…¬å¸. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface ResellerTableViewCell : UITableViewCell
-
-
-/**
- 门店编å·
- */
-@property (weak, nonatomic) IBOutlet UITextField *resellerTextField;
-
-/**
- 查看门店编å·å¸®åŠ©
- */
-@property (nonatomic,copy) void(^storeNumberHelpBlock)();
-
-@end
diff --git a/Class/Reseller/Cell/ResellerTableViewCell.m b/Class/Reseller/Cell/ResellerTableViewCell.m
deleted file mode 100644
index 1821a66289207b486bbcac6c1e2465064216e5f1..0000000000000000000000000000000000000000
--- a/Class/Reseller/Cell/ResellerTableViewCell.m
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// ResellerTableViewCell.m
-// Lighting
-//
-// Created by 曹云霄 on 2017/3/6.
-// Copyright © 2017å¹´ 上海勾芒科技有é™å…¬å¸. All rights reserved.
-//
-
-#import "ResellerTableViewCell.h"
-
-@implementation ResellerTableViewCell
-
-- (void)awakeFromNib {
- [super awakeFromNib];
- // Initialization code
-}
-
-
-/**
- 获å–查看门店编å·å¸®åŠ©
-
- */
-- (IBAction)storeNumberButtonClick:(UIButton *)sender {
-
- if (self.storeNumberHelpBlock) {
- self.storeNumberHelpBlock();
- }
-}
-
-@end
diff --git a/Class/Reseller/Controller/ResellerViewController.h b/Class/Reseller/Controller/ResellerViewController.h
index 42de8da157c8f2c71e0a723fc67803477d14dfcb..e6f5f3cf68c07ed1bece775f5151324038068664 100644
--- a/Class/Reseller/Controller/ResellerViewController.h
+++ b/Class/Reseller/Controller/ResellerViewController.h
@@ -11,8 +11,17 @@
@interface ResellerViewController : BaseViewController
+
+
+
+
/**
- ç»é”€å•†èµ„æ–™
+ 门店编å·
*/
-@property (weak, nonatomic) IBOutlet UITableView *resellerTableView;
+@property (weak, nonatomic) IBOutlet UITextField *storeNumberTextField;
+
+
+
+
+
@end
diff --git a/Class/Reseller/Controller/ResellerViewController.m b/Class/Reseller/Controller/ResellerViewController.m
index 9bafd70e96389b3836fc937b3f785a5b29db4faa..56f514e1b656c0dc03d8dc14bdb2eb048a1ed23a 100644
--- a/Class/Reseller/Controller/ResellerViewController.m
+++ b/Class/Reseller/Controller/ResellerViewController.m
@@ -7,10 +7,10 @@
//
#import "ResellerViewController.h"
-#import "ResellerTableViewCell.h"
+#import "CustomWKWebViewController.h"
-@interface ResellerViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
+@interface ResellerViewController ()<UITextFieldDelegate>
@end
@@ -19,27 +19,20 @@
- (void)viewDidLoad {
[super viewDidLoad];
- [self uiConfigAction];
-}
-
-#pragma mark -UI
-- (void)uiConfigAction
-{
- self.resellerTableView.tableFooterView = [UIView new];
- self.title = @"欧普到家门店编å·";
- self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"完æˆ" style:UIBarButtonItemStyleDone target:self action:@selector(modifyResellerInformation)];
- self.navigationItem.rightBarButtonItem.enabled = [Shoppersmanager manager].Shoppers.validate;
}
#pragma mark -ä¿å˜ç»é”€å•†ID ->验è¯
- (void)modifyResellerInformation
{
- ResellerTableViewCell *cell = [self.resellerTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
- if ([cell.resellerTextField.text isEqualToString:@"æ— "]) {
- [self saveResellerInformation:cell.resellerTextField.text];return;
+ NSString *storeNumber = self.storeNumberTextField.text;
+ if ([[self class] isBlankString:storeNumber]) {
+ [XBLoadingView showHUDViewWithText:@"è¾“å…¥æ— æ•ˆ"];return;
+ }
+ if ([storeNumber isEqualToString:@"æ— "]) {
+ [self saveResellerInformation:storeNumber];return;
}
//验è¯
- NSDictionary *dict = @{@"mfcode":cell.resellerTextField.text};
+ NSDictionary *dict = @{@"mfcode":storeNumber};
[XBLoadingView showHUDViewWithDefault];
WS(weakSelf);
[HTTP networkWithDictionaryRequestWithURL:RESELLER withRequestType:NetworkRequestWithGET withParameter:dict withReturnValueBlock:^(id returnValue) {
@@ -47,7 +40,7 @@
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToString:@"1"]) {
[XBLoadingView showHUDViewWithSuccessText:@"验è¯æˆåŠŸ" completeBlock:^{
- [weakSelf saveResellerInformation:cell.resellerTextField.text];
+ [weakSelf saveResellerInformation:storeNumber];
}];
}else {
[XBLoadingView showHUDViewWithText:returnValue[@"msg"]];
@@ -84,38 +77,40 @@
}];
}
-#pragma mark -<UITableViewDelegate,UITableViewDataSource>
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return 1;
-}
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- ResellerTableViewCell *resellerCell = [tableView dequeueReusableCellWithIdentifier:@"ResellerTableViewCell" forIndexPath:indexPath];
- resellerCell.resellerTextField.delegate = self;
- WS(weakSelf);
- [resellerCell setStoreNumberHelpBlock:^{
- NSLog(@"获å–帮助");
- }];
- return resellerCell;
+#pragma mark -帮助按钮
+- (IBAction)helpButtonClickAction:(UIButton *)sender {
+
+ CustomWKWebViewController *webView = [[CustomWKWebViewController alloc] init];
+ webView.type = Image;
+ webView.urlString = [[NSBundle mainBundle] pathForResource:@"reference" ofType:@"png"];
+ [self presentViewController:webView animated:YES completion:nil];
}
-#pragma mark -结æŸç¼–辑
-- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
-{
- if ([[self class] isBlankString:textField.text]) {
- return NO;
- }
- self.navigationItem.rightBarButtonItem.enabled = YES;
- return YES;
-}
-#pragma mark -结æŸç¼–辑
-- (void)textFieldDidEndEditing:(UITextField *)textField
-{
- BOOL boolValue = ![[self class] isBlankString:textField.text];
- self.navigationItem.rightBarButtonItem.enabled = boolValue;
+#pragma mark -确认按钮
+- (IBAction)sureButtonClickAction:(UIButton *)sender {
+
+ [self.storeNumberTextField resignFirstResponder];
+ [self modifyResellerInformation];
}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@end
diff --git a/Lighting.xcodeproj/project.pbxproj b/Lighting.xcodeproj/project.pbxproj
index 1b431e2c4091574d7741144ab28b96997330771f..99f650d1c79ad3cc7af399119feeb606c489b592 100644
--- a/Lighting.xcodeproj/project.pbxproj
+++ b/Lighting.xcodeproj/project.pbxproj
@@ -55,6 +55,8 @@
293163FA1DCE3CBA0075129D /* LuckyDrawDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 293163F91DCE3CBA0075129D /* LuckyDrawDetailsViewController.m */; };
293164001DCE3F6D0075129D /* NotDrawTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 293163FF1DCE3F6D0075129D /* NotDrawTableViewCell.m */; };
293164031DCE3F780075129D /* UsedDrawTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 293164021DCE3F780075129D /* UsedDrawTableViewCell.m */; };
+ 293221501E6F9F1B00DD4980 /* XYTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 2932214F1E6F9F1B00DD4980 /* XYTextField.m */; };
+ 293221531E6FA20D00DD4980 /* reference.png in Resources */ = {isa = PBXBuildFile; fileRef = 293221521E6FA20D00DD4980 /* reference.png */; };
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */ = {isa = PBXBuildFile; fileRef = 2933934E1CD3158B000D997B /* instructionsLabe.m */; };
293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 293393541CD3379E000D997B /* ShoppingTableViewCell.m */; };
29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29360C2E1CDDC47E002A5D89 /* ScreeningView.m */; };
@@ -83,7 +85,6 @@
2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */; };
2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */; };
294B86D11E6D2B04004E2D0F /* ResellerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 294B86D01E6D2B04004E2D0F /* ResellerViewController.m */; };
- 294B86D41E6D2B17004E2D0F /* ResellerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 294B86D31E6D2B17004E2D0F /* ResellerTableViewCell.m */; };
294B86D71E6D46EA004E2D0F /* CommentTagTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 294B86D61E6D46E9004E2D0F /* CommentTagTableViewCell.m */; };
294B86DA1E6D5828004E2D0F /* ThroughHistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 294B86D91E6D5828004E2D0F /* ThroughHistoryViewController.m */; };
294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 294BFDD01D47225A00BFD53F /* OppleMain.storyboard */; };
@@ -399,6 +400,9 @@
293163FF1DCE3F6D0075129D /* NotDrawTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotDrawTableViewCell.m; sourceTree = "<group>"; };
293164011DCE3F780075129D /* UsedDrawTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UsedDrawTableViewCell.h; sourceTree = "<group>"; };
293164021DCE3F780075129D /* UsedDrawTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UsedDrawTableViewCell.m; sourceTree = "<group>"; };
+ 2932214E1E6F9F1B00DD4980 /* XYTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XYTextField.h; sourceTree = "<group>"; };
+ 2932214F1E6F9F1B00DD4980 /* XYTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XYTextField.m; sourceTree = "<group>"; };
+ 293221521E6FA20D00DD4980 /* reference.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = reference.png; sourceTree = "<group>"; };
2933934D1CD3158B000D997B /* instructionsLabe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = instructionsLabe.h; sourceTree = "<group>"; };
2933934E1CD3158B000D997B /* instructionsLabe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = instructionsLabe.m; sourceTree = "<group>"; };
293393531CD3379E000D997B /* ShoppingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingTableViewCell.h; sourceTree = "<group>"; };
@@ -453,8 +457,6 @@
2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMExampleDrawerVisualStateManager.m; sourceTree = "<group>"; };
294B86CF1E6D2B04004E2D0F /* ResellerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResellerViewController.h; sourceTree = "<group>"; };
294B86D01E6D2B04004E2D0F /* ResellerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResellerViewController.m; sourceTree = "<group>"; };
- 294B86D21E6D2B17004E2D0F /* ResellerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResellerTableViewCell.h; sourceTree = "<group>"; };
- 294B86D31E6D2B17004E2D0F /* ResellerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResellerTableViewCell.m; sourceTree = "<group>"; };
294B86D51E6D46E9004E2D0F /* CommentTagTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommentTagTableViewCell.h; sourceTree = "<group>"; };
294B86D61E6D46E9004E2D0F /* CommentTagTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommentTagTableViewCell.m; sourceTree = "<group>"; };
294B86D81E6D5828004E2D0F /* ThroughHistoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThroughHistoryViewController.h; sourceTree = "<group>"; };
@@ -1101,6 +1103,7 @@
2928F7DE1CD085430036D761 /* Tools */ = {
isa = PBXGroup;
children = (
+ 293221511E6FA1F900DD4980 /* Resource */,
2985345D1DD4B0100023BBAE /* AirPrint */,
29C4C2471E14BFA20093B100 /* AnaimationImageView */,
2972312F1E0948BE00D8CA9B /* Bank */,
@@ -1149,6 +1152,8 @@
children = (
2928F7E51CD087FE0036D761 /* BaseViewController.h */,
2928F7E61CD087FE0036D761 /* BaseViewController.m */,
+ 2932214E1E6F9F1B00DD4980 /* XYTextField.h */,
+ 2932214F1E6F9F1B00DD4980 /* XYTextField.m */,
);
path = parentclass;
sourceTree = "<group>";
@@ -1204,6 +1209,14 @@
path = Cells;
sourceTree = "<group>";
};
+ 293221511E6FA1F900DD4980 /* Resource */ = {
+ isa = PBXGroup;
+ children = (
+ 293221521E6FA20D00DD4980 /* reference.png */,
+ );
+ path = Resource;
+ sourceTree = "<group>";
+ };
293393501CD329EC000D997B /* controller */ = {
isa = PBXGroup;
children = (
@@ -1314,21 +1327,11 @@
294B86C91E6D2AA2004E2D0F /* Reseller */ = {
isa = PBXGroup;
children = (
- 294B86CD1E6D2AF9004E2D0F /* Cell */,
294B86CE1E6D2AF9004E2D0F /* Controller */,
);
path = Reseller;
sourceTree = "<group>";
};
- 294B86CD1E6D2AF9004E2D0F /* Cell */ = {
- isa = PBXGroup;
- children = (
- 294B86D21E6D2B17004E2D0F /* ResellerTableViewCell.h */,
- 294B86D31E6D2B17004E2D0F /* ResellerTableViewCell.m */,
- );
- path = Cell;
- sourceTree = "<group>";
- };
294B86CE1E6D2AF9004E2D0F /* Controller */ = {
isa = PBXGroup;
children = (
@@ -2738,6 +2741,7 @@
29EAAEAC1CDCA28300C4DBA2 /* city.json in Resources */,
29834EC61CDF76C1001A484F /* UserViewController.xib in Resources */,
299C7F5B1CE21FA800E7D7CB /* AddressViewController.xib in Resources */,
+ 293221531E6FA20D00DD4980 /* reference.png in Resources */,
29706DB41CD082990003C412 /* Assets.xcassets in Resources */,
291A37791DBA58D700299F0D /* GetJDCardView.xib in Resources */,
29EC331B1CE023D5005F0C13 /* ChangePasswordViewController.xib in Resources */,
@@ -2915,6 +2919,7 @@
29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */,
29498C5D1D053B2C004FA79B /* ShoppingBagViewController.m in Sources */,
291D6A5C1CFFDCCA007891AE /* SceneListModel.m in Sources */,
+ 293221501E6F9F1B00DD4980 /* XYTextField.m in Sources */,
299876331CD997DF00C90D0A /* OrderInformationTableViewCell.m in Sources */,
29837B5E1DE5A3D3009CF614 /* ScreeningButton.m in Sources */,
29E9443D1DE3E0D0007CD26C /* prizeDetailsTableViewCell.m in Sources */,
@@ -3078,7 +3083,6 @@
29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */,
299249441CDB51B100786B1E /* ModifyShippingAddressView.m in Sources */,
29E9445F1DE455AC007CD26C /* PrizeExchangeInformationTableViewCell.m in Sources */,
- 294B86D41E6D2B17004E2D0F /* ResellerTableViewCell.m in Sources */,
298111161DFE6E5000F7EAFF /* NSDate+Formatting.m in Sources */,
29B78C0F1DFA8B3700C7C6D8 /* ContentTableViewCell.m in Sources */,
29B78C181DFA982000C7C6D8 /* PhotoManagerCollectionViewCell.m in Sources */,
diff --git a/Lighting/OppleMain.storyboard b/Lighting/OppleMain.storyboard
index 05fbce4caa70adbca6e3a5045f2eea387a1a94a7..0d4b84cd7b214071e584358485bfda3eb0f513fb 100755
--- a/Lighting/OppleMain.storyboard
+++ b/Lighting/OppleMain.storyboard
@@ -219,7 +219,7 @@
<rect key="frame" x="0.0" y="28" width="984" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NV8-I4-ig4" id="E0m-wU-1b5">
- <rect key="frame" x="0.0" y="0.0" width="984" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="984" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="F66-vh-va3">
@@ -611,10 +611,10 @@
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
- <rect key="frame" x="0.0" y="56" width="1024" height="84"/>
+ <rect key="frame" x="0.0" y="55.5" width="1024" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="83"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="83.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订å•ç¼–å·ï¼š" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KGm-XJ-NyV">
@@ -694,10 +694,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
- <rect key="frame" x="0.0" y="140" width="1024" height="110"/>
+ <rect key="frame" x="0.0" y="139.5" width="1024" height="110"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="109"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="109.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="Zdg-s0-xfD">
@@ -786,10 +786,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="84" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
- <rect key="frame" x="0.0" y="250" width="1024" height="84"/>
+ <rect key="frame" x="0.0" y="249.5" width="1024" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="83"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="83.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tiK-JC-Jy4">
@@ -851,10 +851,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
- <rect key="frame" x="0.0" y="334" width="1024" height="80"/>
+ <rect key="frame" x="0.0" y="333.5" width="1024" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="79"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="6MS-gq-TMk">
@@ -937,10 +937,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
- <rect key="frame" x="0.0" y="414" width="1024" height="50"/>
+ <rect key="frame" x="0.0" y="413.5" width="1024" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="49"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总计：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ywx-T1-GlW">
@@ -985,10 +985,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrderDetailsSectionHeaderView" rowHeight="60" id="93R-pm-DiM" customClass="OrderDetailsSectionHeaderView">
- <rect key="frame" x="0.0" y="464" width="1024" height="60"/>
+ <rect key="frame" x="0.0" y="463.5" width="1024" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="93R-pm-DiM" id="ps4-EA-igT">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="59"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7rk-Gz-d7W">
@@ -1022,10 +1022,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="checkmark" indentationWidth="10" reuseIdentifier="PromotionalTableViewCell" rowHeight="44" id="R0y-9Q-NEJ" customClass="PromotionalTableViewCell">
- <rect key="frame" x="0.0" y="524" width="1024" height="44"/>
+ <rect key="frame" x="0.0" y="523.5" width="1024" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R0y-9Q-NEJ" id="tLA-TB-cwT">
- <rect key="frame" x="0.0" y="0.0" width="824" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="824" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="折扣金é¢" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iOu-WG-fyV">
@@ -1286,10 +1286,10 @@
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="182" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
- <rect key="frame" x="0.0" y="56" width="1024" height="182"/>
+ <rect key="frame" x="0.0" y="55.5" width="1024" height="182"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="181"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="181.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2bG-Ip-ptr" userLabel="View1">
@@ -1683,7 +1683,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EPc-Ii-VaY" id="e8t-Pc-QPv">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="S6q-gC-tBB">
@@ -1848,7 +1848,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="200"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0Oq-z4-T96" id="GEp-Hp-EdS">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="199"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="199.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下å•æ—¶é—´ï¼š" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wXj-VY-jlJ">
@@ -2226,7 +2226,7 @@
<rect key="frame" x="0.0" y="28" width="984" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZT1-XJ-ObI" id="GWp-Jl-7br">
- <rect key="frame" x="0.0" y="0.0" width="984" height="79"/>
+ <rect key="frame" x="0.0" y="0.0" width="984" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PkJ-eJ-ksY">
@@ -2552,7 +2552,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="110"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LsY-i0-h5H" id="dPG-p9-V2i">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="109"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="109.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="qWT-p0-Gta">
@@ -2644,7 +2644,7 @@
<rect key="frame" x="0.0" y="138" width="1024" height="56"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gfQ-UE-mXV" id="za6-HU-VEw">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="55"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="55.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机å·ç ：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X0Z-8j-BdI">
@@ -2725,7 +2725,7 @@
<rect key="frame" x="0.0" y="194" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="69"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="69.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m0f-EW-LM5">
@@ -2777,7 +2777,7 @@
<rect key="frame" x="0.0" y="264" width="1024" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="79"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="Un4-g0-sG6">
@@ -2863,7 +2863,7 @@
<rect key="frame" x="0.0" y="344" width="1024" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="49"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数é‡ï¼š" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULe-0J-pCd">
@@ -3751,7 +3751,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="X3v-Ll-1MC" id="900-Pd-b1F">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="69"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="69.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订å•ç¼–å·:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TMg-8t-PNg">
@@ -3797,7 +3797,7 @@
<rect key="frame" x="0.0" y="98" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7NE-I0-E9m" id="6dy-h1-Du5">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="69"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="69.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订å•ç¼–å·:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mCP-hd-n1N">
@@ -4177,7 +4177,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ycT-hi-XMt" id="kgy-QA-YB7">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="69"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="69.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="撒大声地" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IgV-UM-cUZ">
@@ -4252,7 +4252,7 @@
<rect key="frame" x="0.0" y="0.0" width="1024" height="126"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hkV-sz-e6I" id="376-dL-SGZ">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="125"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="125.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="交易æˆåŠŸ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bj2-3f-d1N">
@@ -4280,7 +4280,7 @@
<rect key="frame" x="0.0" y="126" width="1024" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="omi-89-fSM" id="kHX-8W-6YZ">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="149"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="149.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="类型" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WvF-Vp-w7I">
@@ -4392,7 +4392,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jHf-PW-bB3" id="GzY-E9-F2n">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="69"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="69.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="进度:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ssz-VZ-85R">
@@ -4476,7 +4476,7 @@
<rect key="frame" x="0.0" y="0.0" width="1024" height="216"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Gh-Ht-hTc" id="uun-nY-hTG">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="215"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="215.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="progress" translatesAutoresizingMaskIntoConstraints="NO" id="mQZ-vP-Ej3">
@@ -4538,7 +4538,7 @@
<rect key="frame" x="0.0" y="216" width="1024" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="odb-Qv-xvv" id="vVJ-L8-CP8">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="金é¢" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cQu-pj-zGP">
@@ -5316,24 +5316,6 @@
</objects>
<point key="canvasLocation" x="1784" y="6328"/>
</scene>
- <!--View Controller-->
- <scene sceneID="wMg-Rs-wGE">
- <objects>
- <viewController id="eUU-Qm-djh" sceneMemberID="viewController">
- <layoutGuides>
- <viewControllerLayoutGuide type="top" id="GLH-eU-WUE"/>
- <viewControllerLayoutGuide type="bottom" id="HAi-e2-khf"/>
- </layoutGuides>
- <view key="view" contentMode="scaleToFill" id="iSr-lQ-Wmo">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- </view>
- </viewController>
- <placeholder placeholderIdentifier="IBFirstResponder" id="GN3-M4-Hr7" userLabel="First Responder" sceneMemberID="firstResponder"/>
- </objects>
- <point key="canvasLocation" x="1769" y="7177"/>
- </scene>
<!--Customer Order View Controller-->
<scene sceneID="G7U-2L-CVg">
<objects>
@@ -6473,10 +6455,10 @@
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="RightControlTableViewCell" rowHeight="60" id="0wm-zc-Jqc" customClass="RightControlTableViewCell">
- <rect key="frame" x="0.0" y="56" width="200" height="60"/>
+ <rect key="frame" x="0.0" y="55.5" width="200" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0wm-zc-Jqc" id="p9s-UH-PIl">
- <rect key="frame" x="0.0" y="0.0" width="200" height="59"/>
+ <rect key="frame" x="0.0" y="0.0" width="200" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="体验ä¸å¿ƒ" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ima-L1-WqA">
@@ -6738,7 +6720,7 @@
<rect key="frame" x="0.0" y="28" width="754" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="g2L-9g-KsS" id="XPi-Zc-aGh">
- <rect key="frame" x="0.0" y="0.0" width="754" height="79"/>
+ <rect key="frame" x="0.0" y="0.0" width="754" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="34f-aR-0gw">
@@ -7131,7 +7113,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5vC-JB-WSk" id="XVj-PN-Pxx">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
@@ -7205,10 +7187,10 @@
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PerfectInformationTableViewCell" id="NgP-vL-jeV" customClass="PerfectInformationTableViewCell">
- <rect key="frame" x="0.0" y="56" width="500" height="44"/>
+ <rect key="frame" x="0.0" y="55.5" width="500" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NgP-vL-jeV" id="yrV-b3-w7O">
- <rect key="frame" x="0.0" y="0.0" width="500" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="500" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="姓å:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5g0-KC-KrO">
@@ -7274,80 +7256,97 @@
<viewControllerLayoutGuide type="bottom" id="ddp-cU-kfu"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="UZp-SQ-miZ">
- <rect key="frame" x="0.0" y="0.0" width="500" height="400"/>
+ <rect key="frame" x="0.0" y="0.0" width="400" height="400"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="aQu-8I-Tue">
- <rect key="frame" x="0.0" y="20" width="500" height="380"/>
- <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
- <prototypes>
- <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ResellerTableViewCell" id="t8E-4H-iqe" customClass="ResellerTableViewCell">
- <rect key="frame" x="0.0" y="56" width="500" height="44"/>
- <autoresizingMask key="autoresizingMask"/>
- <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="t8E-4H-iqe" id="1Ni-4R-0nU">
- <rect key="frame" x="0.0" y="0.0" width="500" height="43"/>
- <autoresizingMask key="autoresizingMask"/>
- <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="欧普到家门店编å·:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VZV-5Y-0yw">
- <rect key="frame" x="20" y="11" width="143.5" height="21"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <nil key="textColor"/>
- <nil key="highlightedColor"/>
- </label>
- <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="RQ3-3m-EfX">
- <rect key="frame" x="183.5" y="7" width="267.5" height="30"/>
- <constraints>
- <constraint firstAttribute="height" constant="30" id="Fep-JC-nSi"/>
- </constraints>
- <nil key="textColor"/>
- <fontDescription key="fontDescription" type="system" pointSize="14"/>
- <textInputTraits key="textInputTraits"/>
- </textField>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rsv-5B-b70">
- <rect key="frame" x="466" y="10" width="24" height="24"/>
- <constraints>
- <constraint firstAttribute="width" constant="24" id="fkg-dF-wBM"/>
- <constraint firstAttribute="height" constant="24" id="jNy-B0-DLa"/>
- </constraints>
- <state key="normal" backgroundImage="question"/>
- <connections>
- <action selector="storeNumberButtonClick:" destination="t8E-4H-iqe" eventType="touchUpInside" id="wQr-nF-uau"/>
- </connections>
- </button>
- </subviews>
- <constraints>
- <constraint firstItem="RQ3-3m-EfX" firstAttribute="centerY" secondItem="1Ni-4R-0nU" secondAttribute="centerY" id="2vx-HV-uOT"/>
- <constraint firstItem="VZV-5Y-0yw" firstAttribute="leading" secondItem="1Ni-4R-0nU" secondAttribute="leading" constant="20" id="JCz-fu-fEt"/>
- <constraint firstItem="RQ3-3m-EfX" firstAttribute="leading" secondItem="VZV-5Y-0yw" secondAttribute="trailing" constant="20" id="OcO-6N-E8W"/>
- <constraint firstAttribute="trailing" secondItem="Rsv-5B-b70" secondAttribute="trailing" constant="10" id="Uha-zF-zkA"/>
- <constraint firstItem="Rsv-5B-b70" firstAttribute="leading" secondItem="RQ3-3m-EfX" secondAttribute="trailing" constant="15" id="WvK-Zu-x61"/>
- <constraint firstItem="VZV-5Y-0yw" firstAttribute="centerY" secondItem="1Ni-4R-0nU" secondAttribute="centerY" id="a6P-mL-IUv"/>
- <constraint firstItem="Rsv-5B-b70" firstAttribute="centerY" secondItem="VZV-5Y-0yw" secondAttribute="centerY" id="evS-qE-qjk"/>
- </constraints>
- </tableViewCellContentView>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="oppledj" translatesAutoresizingMaskIntoConstraints="NO" id="9lY-hV-E9Y">
+ <rect key="frame" x="0.0" y="0.0" width="400" height="400"/>
+ </imageView>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UZ7-Dj-VcO">
+ <rect key="frame" x="0.0" y="300" width="400" height="100"/>
+ <subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sureButtonBack" translatesAutoresizingMaskIntoConstraints="NO" id="mkH-dx-MHA">
+ <rect key="frame" x="0.0" y="0.0" width="400" height="100"/>
+ </imageView>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="naJ-f3-gYi">
+ <rect key="frame" x="110" y="28" width="180" height="45"/>
+ <color key="backgroundColor" red="0.99607843137254903" green="0.81176470588235294" blue="0.18431372549019609" alpha="1" colorSpace="calibratedRGB"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="45" id="Bgi-QE-lYc"/>
+ <constraint firstAttribute="width" constant="180" id="v7V-k0-B6t"/>
+ </constraints>
+ <state key="normal" title="确认">
+ <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+ <real key="value" value="20"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
<connections>
- <outlet property="resellerTextField" destination="RQ3-3m-EfX" id="pQW-IS-Ou1"/>
+ <action selector="sureButtonClickAction:" destination="fSJ-iu-dAI" eventType="touchUpInside" id="c9A-ng-bst"/>
</connections>
- </tableViewCell>
- </prototypes>
+ </button>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstAttribute="bottom" secondItem="mkH-dx-MHA" secondAttribute="bottom" id="2AO-LB-pVs"/>
+ <constraint firstItem="naJ-f3-gYi" firstAttribute="centerX" secondItem="UZ7-Dj-VcO" secondAttribute="centerX" id="MTO-HU-XuI"/>
+ <constraint firstItem="naJ-f3-gYi" firstAttribute="centerY" secondItem="UZ7-Dj-VcO" secondAttribute="centerY" id="XwC-5M-Kn2"/>
+ <constraint firstItem="mkH-dx-MHA" firstAttribute="top" secondItem="UZ7-Dj-VcO" secondAttribute="top" id="aUm-mn-HlL"/>
+ <constraint firstAttribute="trailing" secondItem="mkH-dx-MHA" secondAttribute="trailing" id="ny9-1c-I5c"/>
+ <constraint firstAttribute="height" constant="100" id="qmI-Ul-8yE"/>
+ <constraint firstItem="mkH-dx-MHA" firstAttribute="leading" secondItem="UZ7-Dj-VcO" secondAttribute="leading" id="x5W-3F-uzU"/>
+ </constraints>
+ </view>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="门店编å·" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fUE-bY-b0A">
+ <rect key="frame" x="30" y="171" width="62" height="18"/>
+ <fontDescription key="fontDescription" type="system" pointSize="15"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您的欧普到家门店编ç " textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8zq-am-Lgl" customClass="XYTextField">
+ <rect key="frame" x="102" y="162" width="268" height="35"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="35" id="XbP-oP-nfD"/>
+ </constraints>
+ <nil key="textColor"/>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <textInputTraits key="textInputTraits"/>
<connections>
- <outlet property="dataSource" destination="fSJ-iu-dAI" id="oNV-Sx-pSE"/>
- <outlet property="delegate" destination="fSJ-iu-dAI" id="JT9-fn-Ypg"/>
+ <outlet property="delegate" destination="fSJ-iu-dAI" id="foj-9e-i2M"/>
</connections>
- </tableView>
+ </textField>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cec-Eh-HKn">
+ <rect key="frame" x="255" y="207" width="115" height="22"/>
+ <state key="normal" image="ç¼–å·åœ¨å“ªé‡Œï¼Ÿç‚¹å‡»è¿™é‡Œ"/>
+ <connections>
+ <action selector="helpButtonClickAction:" destination="fSJ-iu-dAI" eventType="touchUpInside" id="2gd-Ng-H6p"/>
+ </connections>
+ </button>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstItem="aQu-8I-Tue" firstAttribute="leading" secondItem="UZp-SQ-miZ" secondAttribute="leading" id="3P3-Ny-rDX"/>
- <constraint firstAttribute="trailing" secondItem="aQu-8I-Tue" secondAttribute="trailing" id="EBJ-pj-2R8"/>
- <constraint firstItem="aQu-8I-Tue" firstAttribute="top" secondItem="UZp-SQ-miZ" secondAttribute="top" constant="20" id="VXE-gO-qYa"/>
- <constraint firstItem="ddp-cU-kfu" firstAttribute="top" secondItem="aQu-8I-Tue" secondAttribute="bottom" id="kHM-Zb-8HI"/>
+ <constraint firstItem="cec-Eh-HKn" firstAttribute="top" secondItem="8zq-am-Lgl" secondAttribute="bottom" constant="10" id="88c-yb-yiw"/>
+ <constraint firstAttribute="trailing" secondItem="8zq-am-Lgl" secondAttribute="trailing" constant="30" id="8ll-7X-OPU"/>
+ <constraint firstItem="ddp-cU-kfu" firstAttribute="top" secondItem="UZ7-Dj-VcO" secondAttribute="bottom" id="EJE-fS-ae3"/>
+ <constraint firstItem="cec-Eh-HKn" firstAttribute="trailing" secondItem="8zq-am-Lgl" secondAttribute="trailing" id="JeZ-FO-op7"/>
+ <constraint firstItem="UZ7-Dj-VcO" firstAttribute="leading" secondItem="UZp-SQ-miZ" secondAttribute="leading" id="KUJ-4X-nHy"/>
+ <constraint firstAttribute="trailing" secondItem="UZ7-Dj-VcO" secondAttribute="trailing" id="U0B-oq-BZT"/>
+ <constraint firstItem="9lY-hV-E9Y" firstAttribute="top" secondItem="UZp-SQ-miZ" secondAttribute="top" id="URt-wC-iLM"/>
+ <constraint firstItem="8zq-am-Lgl" firstAttribute="centerY" secondItem="fUE-bY-b0A" secondAttribute="centerY" id="UuD-an-qKf"/>
+ <constraint firstItem="ddp-cU-kfu" firstAttribute="top" secondItem="9lY-hV-E9Y" secondAttribute="bottom" id="dql-nJ-fzq"/>
+ <constraint firstItem="9lY-hV-E9Y" firstAttribute="leading" secondItem="UZp-SQ-miZ" secondAttribute="leading" id="h3B-lt-jBh"/>
+ <constraint firstAttribute="trailing" secondItem="9lY-hV-E9Y" secondAttribute="trailing" id="hur-E0-807"/>
+ <constraint firstItem="fUE-bY-b0A" firstAttribute="leading" secondItem="UZp-SQ-miZ" secondAttribute="leading" constant="30" id="lKq-2g-Bz5"/>
+ <constraint firstItem="fUE-bY-b0A" firstAttribute="centerY" secondItem="UZp-SQ-miZ" secondAttribute="centerY" multiplier="0.9" id="nNU-2L-EcF"/>
+ <constraint firstItem="8zq-am-Lgl" firstAttribute="leading" secondItem="fUE-bY-b0A" secondAttribute="trailing" constant="10" id="yBL-6y-GIu"/>
</constraints>
</view>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
- <size key="freeformSize" width="500" height="400"/>
+ <size key="freeformSize" width="400" height="400"/>
<connections>
- <outlet property="resellerTableView" destination="aQu-8I-Tue" id="cJ0-6c-WHq"/>
+ <outlet property="storeNumberTextField" destination="8zq-am-Lgl" id="eky-Un-4FD"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="17e-cf-fgJ" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -7383,7 +7382,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oPa-eM-dSd" id="GU3-wN-YE4">
- <rect key="frame" x="0.0" y="0.0" width="1024" height="43"/>
+ <rect key="frame" x="0.0" y="0.0" width="1024" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="身份è¯å·ç " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D2u-XX-tUW">
@@ -7748,14 +7747,15 @@
<image name="mask" width="290" height="72"/>
<image name="now" width="110" height="110"/>
<image name="onehundred" width="290" height="143"/>
+ <image name="oppledj" width="308" height="304"/>
<image name="progress" width="403" height="34"/>
<image name="quanping" width="45" height="45"/>
- <image name="question" width="24" height="24"/>
<image name="reduce" width="49" height="45"/>
<image name="selectCamer" width="45" height="45"/>
<image name="selectHelp" width="45" height="45"/>
<image name="selectShare" width="45" height="45"/>
<image name="selectshoping" width="45" height="45"/>
+ <image name="sureButtonBack" width="308" height="87"/>
<image name="trunoff" width="45" height="45"/>
<image name="trunon" width="45" height="45"/>
<image name="used" width="51" height="51"/>
@@ -7770,6 +7770,7 @@
<image name="已完æˆ" width="87" height="87"/>
<image name="欧New" width="516" height="201"/>
<image name="登录" width="1024" height="768"/>
+ <image name="ç¼–å·åœ¨å“ªé‡Œï¼Ÿç‚¹å‡»è¿™é‡Œ" width="115" height="11"/>
<image name="视角" width="27" height="28"/>
<image name="默认场景" width="1500" height="1125"/>
</resources>
diff --git a/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/Contents.json b/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..9d907d9429c1a21c11284347609a1c20cf969bb0
--- /dev/null
+++ b/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "oppledj.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "oppledj@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "oppledj@3x.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/oppledj.png b/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/oppledj.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9c08424fb777b61021ed07fe04c82ea0718660d
Binary files /dev/null and b/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/oppledj.png differ
diff --git a/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/oppledj@2x.png b/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/oppledj@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..06e8c6b986e51c2d0cbfebc0be258c248c672cfa
Binary files /dev/null and b/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/oppledj@2x.png differ
diff --git a/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/oppledj@3x.png b/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/oppledj@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..da71f1deab0c1d43547bde8f8a47dbca015ac4ea
Binary files /dev/null and b/Lighting/Supporting Files/Images.xcassets/Home/oppledj.imageset/oppledj@3x.png differ
diff --git a/Lighting/Supporting Files/Images.xcassets/Home/reference.imageset/Contents.json b/Lighting/Supporting Files/Images.xcassets/Home/reference.imageset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..362a83584abc959758490acc0972471b148ea544
--- /dev/null
+++ b/Lighting/Supporting Files/Images.xcassets/Home/reference.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "reference.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/Lighting/Supporting Files/Images.xcassets/Home/reference.imageset/reference.png b/Lighting/Supporting Files/Images.xcassets/Home/reference.imageset/reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..22d3b9bc88e183c58d0ee4b934100bc192a27db0
Binary files /dev/null and b/Lighting/Supporting Files/Images.xcassets/Home/reference.imageset/reference.png differ
diff --git a/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/Contents.json b/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..bc16d3613cdf595b93b1a0afcf6fc10900a2c485
--- /dev/null
+++ b/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "sureButtonBack.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "sureButtonBack@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "sureButtonBack@3x.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/sureButtonBack.png b/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/sureButtonBack.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ff0ee15543d302b0e07f0a791ceaa6aa340182d
Binary files /dev/null and b/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/sureButtonBack.png differ
diff --git a/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/sureButtonBack@2x.png b/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/sureButtonBack@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f225675383ad3b09f7a1a633e140b83cb845aa2e
Binary files /dev/null and b/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/sureButtonBack@2x.png differ
diff --git a/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/sureButtonBack@3x.png b/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/sureButtonBack@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a6e0b40ba360d0c0fda15cd9dd8c48e0e9d01a9
Binary files /dev/null and b/Lighting/Supporting Files/Images.xcassets/Home/sureButtonBack.imageset/sureButtonBack@3x.png differ
diff --git "a/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/Contents.json" "b/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/Contents.json"
new file mode 100644
index 0000000000000000000000000000000000000000..cf425e5c63e75455c32c2b1d939039c7d516b5f9
--- /dev/null
+++ "b/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/Contents.json"
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "ç¼–å·åœ¨å“ªé‡Œï¼Ÿç‚¹å‡»è¿™é‡Œ.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "ç¼–å·åœ¨å“ªé‡Œï¼Ÿç‚¹å‡»è¿™é‡Œ@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "ç¼–å·åœ¨å“ªé‡Œï¼Ÿç‚¹å‡»è¿™é‡Œ@3x.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git "a/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.png" "b/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.png"
new file mode 100644
index 0000000000000000000000000000000000000000..c6f34aef18494d5e5e9e42606683bfbbc636fc14
Binary files /dev/null and "b/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.png" differ
diff --git "a/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214@2x.png" "b/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214@2x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..2c9711de8556ac17e52df8c452c9e43bd0beaace
Binary files /dev/null and "b/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214@2x.png" differ
diff --git "a/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214@3x.png" "b/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214@3x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..51500973968822b873f328ad8cebcea5c2f9d7e6
Binary files /dev/null and "b/Lighting/Supporting Files/Images.xcassets/Home/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214.imageset/\347\274\226\345\217\267\345\234\250\345\223\252\351\207\214\357\274\237\347\202\271\345\207\273\350\277\231\351\207\214@3x.png" differ
diff --git a/Tools/PreviewPDF/CustomWKWebViewController.h b/Tools/PreviewPDF/CustomWKWebViewController.h
index 2e46b5b561abdf478564928259b2b77c920e0fa3..4c29632472152e892c3ca59ab101dc693efeb6d3 100755
--- a/Tools/PreviewPDF/CustomWKWebViewController.h
+++ b/Tools/PreviewPDF/CustomWKWebViewController.h
@@ -14,10 +14,12 @@
- Announcement: 公告
- Study: å¦ä¹
+ - Image: 本地图片
*/
typedef NS_ENUM(NSInteger,CALL_TYPE) {
Announcement = 0,
- Study
+ Study,
+ Image
};
@interface CustomWKWebViewController : BaseViewController
diff --git a/Tools/PreviewPDF/CustomWKWebViewController.m b/Tools/PreviewPDF/CustomWKWebViewController.m
index 6df39961b02e5963ce8e81689de60a617613d31c..a905fa47ea24d6a3e9f976ba5f27d66eab1f1db7 100755
--- a/Tools/PreviewPDF/CustomWKWebViewController.m
+++ b/Tools/PreviewPDF/CustomWKWebViewController.m
@@ -51,7 +51,7 @@
}
#pragma mark - åœæ¢æ’放
--(void) viewDidDisappear:(BOOL)animated{
+-(void)viewDidDisappear:(BOOL)animated{
[super viewDidDisappear:animated];
[self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
}
@@ -84,7 +84,11 @@
- (void)setUrlString:(NSString *)urlString
{
_urlString = urlString;
- [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:_urlString]]];
+ if (self.type == Image) {
+ [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL fileURLWithPath:urlString]]];
+ }else {
+ [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:urlString]]];
+ }
}
#pragma mark - æ·»åŠ åˆ é™¤æŒ‰é’®
diff --git a/Tools/Resource/reference.png b/Tools/Resource/reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..22d3b9bc88e183c58d0ee4b934100bc192a27db0
Binary files /dev/null and b/Tools/Resource/reference.png differ
diff --git a/Tools/parentclass/BaseViewController.m b/Tools/parentclass/BaseViewController.m
index d4d74d6c3d735a8a95dac79b936c394289525bf9..49ca3c81dd1626b84f506aabe201707fd85ef24d 100644
--- a/Tools/parentclass/BaseViewController.m
+++ b/Tools/parentclass/BaseViewController.m
@@ -91,13 +91,12 @@
- (void)perfectResellerInformation
{
ResellerViewController *resellerVc = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ResellerViewController"];
- UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:resellerVc];
- nav.preferredContentSize = CGSizeMake(ScreenHeight-300, 100);
- nav.modalPresentationStyle = UIModalPresentationFormSheet;
- UIPopoverPresentationController *pop = nav.popoverPresentationController;
+ resellerVc.preferredContentSize = CGSizeMake(400, 400);
+ resellerVc.modalPresentationStyle = UIModalPresentationFormSheet;
+ UIPopoverPresentationController *pop = resellerVc.popoverPresentationController;
pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
- pop.sourceView = nav.view;
- [self presentViewController:nav animated:YES completion:nil];
+ pop.sourceView = resellerVc.view;
+ [self presentViewController:resellerVc animated:YES completion:nil];
}
diff --git a/Tools/parentclass/XYTextField.h b/Tools/parentclass/XYTextField.h
new file mode 100644
index 0000000000000000000000000000000000000000..b8a750aa57f11ef60b49ca990709c124f2d78c76
--- /dev/null
+++ b/Tools/parentclass/XYTextField.h
@@ -0,0 +1,17 @@
+//
+// XYTextField.h
+// SaleHelper
+//
+// Created by 曹云霄 on 2017/1/11.
+// Copyright © 2017å¹´ 上海勾芒信æ¯ç§‘技. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//é‡å†™çˆ¶ç±»æ–¹æ³•ï¼ŒæŽ§åˆ¶ç¼©è¿›
+@interface XYTextField : UITextField
+
+
+- (CGRect)textRectForBounds:(CGRect)bounds;
+- (CGRect)editingRectForBounds:(CGRect)bounds;
+@end
diff --git a/Tools/parentclass/XYTextField.m b/Tools/parentclass/XYTextField.m
new file mode 100644
index 0000000000000000000000000000000000000000..04b6b8cffa9fbf3376881aa6dc3eeaafd3c2fc4a
--- /dev/null
+++ b/Tools/parentclass/XYTextField.m
@@ -0,0 +1,22 @@
+//
+// XYTextField.m
+// SaleHelper
+//
+// Created by 曹云霄 on 2017/1/11.
+// Copyright © 2017å¹´ 上海勾芒信æ¯ç§‘技. All rights reserved.
+//
+
+#import "XYTextField.h"
+
+@implementation XYTextField
+
+- (CGRect)textRectForBounds:(CGRect)bounds {
+ return CGRectInset( bounds , 20 , 0 );
+}
+
+//控制编辑文本时所在的ä½ç½®ï¼Œå·¦å³ç¼© 30
+- (CGRect)editingRectForBounds:(CGRect)bounds {
+ return CGRectInset( bounds , 20 , 0 );
+}
+
+@end