Skip to content

A
ALand
Commit db21ec7f authored by Sandy's avatar Sandy
Browse files
Options

bug fix

parent 3d00ab90
Expand all Show whitespace changes
Inline Side-by-side
Showing with 596 additions and 114 deletions
ALand.xcodeproj/project.pbxproj
View file @ db21ec7f
...@@ -23,6 +23,10 @@ ...@@ -23,6 +23,10 @@
190A467A1CE064FE006037CB /* JavenOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 190A46791CE064FE006037CB /* JavenOrderModel.m */; }; 190A467A1CE064FE006037CB /* JavenOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 190A46791CE064FE006037CB /* JavenOrderModel.m */; };
190A46BE1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 190A46BD1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib */; }; 190A46BE1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 190A46BD1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib */; };
190A46C11CE1BC5D006037CB /* CustomerDetailSectionHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 190A46C01CE1BC5D006037CB /* CustomerDetailSectionHeader.m */; }; 190A46C11CE1BC5D006037CB /* CustomerDetailSectionHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 190A46C01CE1BC5D006037CB /* CustomerDetailSectionHeader.m */; };
190AFDA11CF41EE3002698FC /* ChangeUserSignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 190AFD9F1CF41EE3002698FC /* ChangeUserSignatureViewController.m */; };
190AFDA21CF41EE3002698FC /* ChangeUserSignatureViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 190AFDA01CF41EE3002698FC /* ChangeUserSignatureViewController.xib */; };
190AFDA81CF46C06002698FC /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 190AFDA61CF46C05002698FC /* AboutViewController.m */; };
190AFDA91CF46C06002698FC /* AboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 190AFDA71CF46C05002698FC /* AboutViewController.xib */; };
190C395D1CF0932B0027E26C /* NSString+OrderState.m in Sources */ = {isa = PBXBuildFile; fileRef = 190C395C1CF0932B0027E26C /* NSString+OrderState.m */; }; 190C395D1CF0932B0027E26C /* NSString+OrderState.m in Sources */ = {isa = PBXBuildFile; fileRef = 190C395C1CF0932B0027E26C /* NSString+OrderState.m */; };
1912FCD71CCDC945004CF976 /* JavenReseller.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCD61CCDC945004CF976 /* JavenReseller.m */; }; 1912FCD71CCDC945004CF976 /* JavenReseller.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCD61CCDC945004CF976 /* JavenReseller.m */; };
1912FCDA1CCDC955004CF976 /* JavenResellerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCD91CCDC955004CF976 /* JavenResellerModel.m */; }; 1912FCDA1CCDC955004CF976 /* JavenResellerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCD91CCDC955004CF976 /* JavenResellerModel.m */; };
...@@ -368,6 +372,12 @@ ...@@ -368,6 +372,12 @@
190A46BD1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CustomerDetailSectionHeader.xib; sourceTree = "<group>"; }; 190A46BD1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CustomerDetailSectionHeader.xib; sourceTree = "<group>"; };
190A46BF1CE1BC5D006037CB /* CustomerDetailSectionHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomerDetailSectionHeader.h; sourceTree = "<group>"; }; 190A46BF1CE1BC5D006037CB /* CustomerDetailSectionHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomerDetailSectionHeader.h; sourceTree = "<group>"; };
190A46C01CE1BC5D006037CB /* CustomerDetailSectionHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomerDetailSectionHeader.m; sourceTree = "<group>"; }; 190A46C01CE1BC5D006037CB /* CustomerDetailSectionHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomerDetailSectionHeader.m; sourceTree = "<group>"; };
190AFD9E1CF41EE3002698FC /* ChangeUserSignatureViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeUserSignatureViewController.h; sourceTree = "<group>"; };
190AFD9F1CF41EE3002698FC /* ChangeUserSignatureViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChangeUserSignatureViewController.m; sourceTree = "<group>"; };
190AFDA01CF41EE3002698FC /* ChangeUserSignatureViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ChangeUserSignatureViewController.xib; sourceTree = "<group>"; };
190AFDA51CF46C05002698FC /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = "<group>"; };
190AFDA61CF46C05002698FC /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = "<group>"; };
190AFDA71CF46C05002698FC /* AboutViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AboutViewController.xib; sourceTree = "<group>"; };
190C395B1CF0932B0027E26C /* NSString+OrderState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+OrderState.h"; sourceTree = "<group>"; }; 190C395B1CF0932B0027E26C /* NSString+OrderState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+OrderState.h"; sourceTree = "<group>"; };
190C395C1CF0932B0027E26C /* NSString+OrderState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+OrderState.m"; sourceTree = "<group>"; }; 190C395C1CF0932B0027E26C /* NSString+OrderState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+OrderState.m"; sourceTree = "<group>"; };
1912FCD51CCDC945004CF976 /* JavenReseller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenReseller.h; sourceTree = "<group>"; }; 1912FCD51CCDC945004CF976 /* JavenReseller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenReseller.h; sourceTree = "<group>"; };
...@@ -1584,6 +1594,12 @@ ...@@ -1584,6 +1594,12 @@
19D906B31CC86DA300CD42DC /* SettingViewController.h */, 19D906B31CC86DA300CD42DC /* SettingViewController.h */,
19D906B41CC86DA300CD42DC /* SettingViewController.m */, 19D906B41CC86DA300CD42DC /* SettingViewController.m */,
19D906B51CC86DA300CD42DC /* SettingViewController.xib */, 19D906B51CC86DA300CD42DC /* SettingViewController.xib */,
190AFDA51CF46C05002698FC /* AboutViewController.h */,
190AFDA61CF46C05002698FC /* AboutViewController.m */,
190AFDA71CF46C05002698FC /* AboutViewController.xib */,
190AFD9E1CF41EE3002698FC /* ChangeUserSignatureViewController.h */,
190AFD9F1CF41EE3002698FC /* ChangeUserSignatureViewController.m */,
190AFDA01CF41EE3002698FC /* ChangeUserSignatureViewController.xib */,
190A465E1CE045EB006037CB /* FeedBackViewController.h */, 190A465E1CE045EB006037CB /* FeedBackViewController.h */,
190A465F1CE045EB006037CB /* FeedBackViewController.m */, 190A465F1CE045EB006037CB /* FeedBackViewController.m */,
190A46601CE045EB006037CB /* FeedBackViewController.xib */, 190A46601CE045EB006037CB /* FeedBackViewController.xib */,
...@@ -2355,6 +2371,7 @@ ...@@ -2355,6 +2371,7 @@
199BC7CD1C9BA5BA00E4E0B8 /* NextResetPasswordViewController.xib in Resources */, 199BC7CD1C9BA5BA00E4E0B8 /* NextResetPasswordViewController.xib in Resources */,
1929F1861CA0EA74000E9B26 /* MoneyView.xib in Resources */, 1929F1861CA0EA74000E9B26 /* MoneyView.xib in Resources */,
1913833D1CAB9DC2005F6440 /* OrderCellView.xib in Resources */, 1913833D1CAB9DC2005F6440 /* OrderCellView.xib in Resources */,
190AFDA91CF46C06002698FC /* AboutViewController.xib in Resources */,
194FB0E01CE452EE0089A3D5 /* MessageTableViewCell.xib in Resources */, 194FB0E01CE452EE0089A3D5 /* MessageTableViewCell.xib in Resources */,
1900A3421CB6059000B2B7C4 /* introductionViewController.xib in Resources */, 1900A3421CB6059000B2B7C4 /* introductionViewController.xib in Resources */,
199B4D6A1CABBEF400451E0E /* OrderDetailTopView.xib in Resources */, 199B4D6A1CABBEF400451E0E /* OrderDetailTopView.xib in Resources */,
...@@ -2391,6 +2408,7 @@ ...@@ -2391,6 +2408,7 @@
194FB0DB1CE32EAB0089A3D5 /* ChangePasswordViewController.xib in Resources */, 194FB0DB1CE32EAB0089A3D5 /* ChangePasswordViewController.xib in Resources */,
190A46BE1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib in Resources */, 190A46BE1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib in Resources */,
1929F16F1C9FCFA6000E9B26 /* Assets.xcassets in Resources */, 1929F16F1C9FCFA6000E9B26 /* Assets.xcassets in Resources */,
190AFDA21CF41EE3002698FC /* ChangeUserSignatureViewController.xib in Resources */,
1929F17E1CA0DE32000E9B26 /* HomeTopView.xib in Resources */, 1929F17E1CA0DE32000E9B26 /* HomeTopView.xib in Resources */,
19DC6B1A1CC0B5690064A9FD /* MyTeamCollectionViewCell.xib in Resources */, 19DC6B1A1CC0B5690064A9FD /* MyTeamCollectionViewCell.xib in Resources */,
1900A33D1CB602D500B2B7C4 /* StoreNameViewController.xib in Resources */, 1900A33D1CB602D500B2B7C4 /* StoreNameViewController.xib in Resources */,
...@@ -2587,6 +2605,7 @@ ...@@ -2587,6 +2605,7 @@
194FB0E31CE472C40089A3D5 /* NavigationbarView.m in Sources */, 194FB0E31CE472C40089A3D5 /* NavigationbarView.m in Sources */,
1952C2FA1CEDC6160017E4D6 /* JavenCustomerService.m in Sources */, 1952C2FA1CEDC6160017E4D6 /* JavenCustomerService.m in Sources */,
190A46771CE064A4006037CB /* JavenTicket.m in Sources */, 190A46771CE064A4006037CB /* JavenTicket.m in Sources */,
190AFDA81CF46C06002698FC /* AboutViewController.m in Sources */,
1912FD061CD090A6004CF976 /* MoreHotBrandViewController.m in Sources */, 1912FD061CD090A6004CF976 /* MoreHotBrandViewController.m in Sources */,
19DCCB5B1C9A9EB30072C3BF /* IBTAudioServicesManager.m in Sources */, 19DCCB5B1C9A9EB30072C3BF /* IBTAudioServicesManager.m in Sources */,
199BC7C31C9B9B7700E4E0B8 /* UIButton+countDown.m in Sources */, 199BC7C31C9B9B7700E4E0B8 /* UIButton+countDown.m in Sources */,
...@@ -2678,6 +2697,7 @@ ...@@ -2678,6 +2697,7 @@
196944E51CEC7D500036E574 /* HomeAdViewController.m in Sources */, 196944E51CEC7D500036E574 /* HomeAdViewController.m in Sources */,
197BA6701CD8515D000E2087 /* JavenCreateInfo.m in Sources */, 197BA6701CD8515D000E2087 /* JavenCreateInfo.m in Sources */,
19632DB11CB39B190024A8A1 /* SelectPhotoView.m in Sources */, 19632DB11CB39B190024A8A1 /* SelectPhotoView.m in Sources */,
190AFDA11CF41EE3002698FC /* ChangeUserSignatureViewController.m in Sources */,
19DCCB621C9A9EB30072C3BF /* IBTTableViewInfo.m in Sources */, 19DCCB621C9A9EB30072C3BF /* IBTTableViewInfo.m in Sources */,
19ADD38E1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m in Sources */, 19ADD38E1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m in Sources */,
1952C2F21CED95230017E4D6 /* OrderListFooterView.m in Sources */, 1952C2F21CED95230017E4D6 /* OrderListFooterView.m in Sources */,
...@@ -2900,7 +2920,7 @@ ...@@ -2900,7 +2920,7 @@
baseConfigurationReference = AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */; baseConfigurationReference = AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
GCC_PREFIX_HEADER = Aland/PrefixHeader.pch; GCC_PREFIX_HEADER = Aland/PrefixHeader.pch;
......
ALand/Assets.xcassets/03店铺名称_03.imageset/Contents.json 0 → 100644
View file @ db21ec7f
{
"images" : [
{
"idiom" : "universal",
"filename" : "03店铺名称_03.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ALand/CodeClass/Home/View/HomeTopView.xib
View file @ db21ec7f
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imageCover" translatesAutoresizingMaskIntoConstraints="NO" id="9Ug-fV-Xv9"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imageCover" translatesAutoresizingMaskIntoConstraints="NO" id="9Ug-fV-Xv9">
<rect key="frame" x="0.0" y="0.0" width="375" height="100"/> <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="店铺名：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2oQ-Yt-HNr"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="店铺名：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2oQ-Yt-HNr">
<rect key="frame" x="96" y="21" width="72" height="22"/> <rect key="frame" x="96" y="21" width="72" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/> <fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tFZ-ia-Y0w"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tFZ-ia-Y0w">
<rect key="frame" x="169" y="32" width="0.0" height="0.0"/> <rect key="frame" x="169" y="21" width="198" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/> <fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstAttribute="trailing" secondItem="qVI-A9-Pct" secondAttribute="trailing" constant="8" id="17E-NF-vxS"/> <constraint firstAttribute="trailing" secondItem="qVI-A9-Pct" secondAttribute="trailing" constant="8" id="17E-NF-vxS"/>
<constraint firstAttribute="trailing" secondItem="tFZ-ia-Y0w" secondAttribute="trailing" constant="8" id="1uV-iu-014"/>
<constraint firstAttribute="bottom" secondItem="aQx-fx-9QQ" secondAttribute="bottom" id="595-ML-DCZ"/> <constraint firstAttribute="bottom" secondItem="aQx-fx-9QQ" secondAttribute="bottom" id="595-ML-DCZ"/>
<constraint firstItem="tFZ-ia-Y0w" firstAttribute="centerY" secondItem="2oQ-Yt-HNr" secondAttribute="centerY" id="ABv-db-gTJ"/> <constraint firstItem="tFZ-ia-Y0w" firstAttribute="centerY" secondItem="2oQ-Yt-HNr" secondAttribute="centerY" id="ABv-db-gTJ"/>
<constraint firstAttribute="bottom" secondItem="2oQ-Yt-HNr" secondAttribute="bottom" constant="57" id="Bfa-jj-fNL"/> <constraint firstAttribute="bottom" secondItem="2oQ-Yt-HNr" secondAttribute="bottom" constant="57" id="Bfa-jj-fNL"/>
......
ALand/CodeClass/Home/View/MoneyView.xib
View file @ db21ec7f
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456.00" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oE9-qL-eth" customClass="MBLabelWithFontAdapter"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oE9-qL-eth" customClass="MBLabelWithFontAdapter">
<rect key="frame" x="2" y="98" width="110" height="27"/> <rect key="frame" x="50" y="98" width="14" height="27"/>
<fontDescription key="fontDescription" type="system" pointSize="22"/> <fontDescription key="fontDescription" type="system" pointSize="22"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
......
ALand/CodeClass/Home/ViewController/Commodity/CommodityDetailViewController.m
View file @ db21ec7f
...@@ -153,14 +153,14 @@ ...@@ -153,14 +153,14 @@
- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
{ {
[MBProgressHUD showHUDAddedTo:self.view animated:YES]; [MBProgressHUD showHUDAddedTo:webView animated:YES];
} }
// 页面加载完成之后调用 // 页面加载完成之后调用
- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
{ {
self.bottomView.userInteractionEnabled = YES; self.bottomView.userInteractionEnabled = YES;
[MBProgressHUD hideHUDForView:self.view]; [MBProgressHUD hideHUDForView:webView];
} }
......
ALand/CodeClass/Home/ViewController/Commodity/CommodityListViewController.m
View file @ db21ec7f
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
}else if([self.model isKindOfClass:[CatgoryModel class]]){//分类 }else if([self.model isKindOfClass:[CatgoryModel class]]){//分类
CatgoryModel *model = self.model; CatgoryModel *model = self.model;
operation = @"goodsData category uuid equals"; operation = @"goodsData category path startWith";
parameters = model.uuid; parameters = model.path;
}else if ([self.model isKindOfClass:[JavenHotTagsModel class]]){//热门标签 }else if ([self.model isKindOfClass:[JavenHotTagsModel class]]){//热门标签
CatgoryModel *model = self.model; CatgoryModel *model = self.model;
...@@ -80,6 +80,8 @@ ...@@ -80,6 +80,8 @@
NSDictionary *myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals", NSDictionary *myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
@"parameters" : @[kDomain]}, @"parameters" : @[kDomain]},
@{@"operation" : @"online only",
@"parameters" : @[[NSNull null]]},
@{@"operation" : operation, @{@"operation" : operation,
@"parameters" : @[parameters]}], @"parameters" : @[parameters]}],
@"orders" : @[@{@"field" : self.field, @"orders" : @[@{@"field" : self.field,
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m
View file @ db21ec7f
...@@ -134,7 +134,6 @@ ...@@ -134,7 +134,6 @@
picker.delegate = self; picker.delegate = self;
picker.allowsEditing = YES; picker.allowsEditing = YES;
picker.sourceType = UIImagePickerControllerSourceTypeCamera; picker.sourceType = UIImagePickerControllerSourceTypeCamera;
// picker.modalTransitionStyle=UIModalTransitionStyleFlipHorizontal;
picker.videoQuality = UIImagePickerControllerQualityTypeLow; picker.videoQuality = UIImagePickerControllerQualityTypeLow;
[self presentViewController:picker animated:YES completion:nil]; [self presentViewController:picker animated:YES completion:nil];
} }
...@@ -261,6 +260,7 @@ ...@@ -261,6 +260,7 @@
nameVC.shopModel = self.shopModel; nameVC.shopModel = self.shopModel;
[self.navigationController pushViewController:nameVC animated:YES]; [self.navigationController pushViewController:nameVC animated:YES];
} }
- (IBAction)shopIntroduction:(id)sender { - (IBAction)shopIntroduction:(id)sender {
introductionViewController *introVC = [[introductionViewController alloc] initWithNibName:@"introductionViewController" bundle:nil]; introductionViewController *introVC = [[introductionViewController alloc] initWithNibName:@"introductionViewController" bundle:nil];
introVC.isShowNavigationBar = YES; introVC.isShowNavigationBar = YES;
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.xib
View file @ db21ec7f
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="生活如此多娇（店铺简介）" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="asy-i8-hFm"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="生活如此多娇（店铺简介）" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="asy-i8-hFm">
<rect key="frame" x="95" y="104" width="264" height="20"/> <rect key="frame" x="95" y="104" width="264" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/> <fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreNameViewController.xib
View file @ db21ec7f
...@@ -61,23 +61,46 @@ ...@@ -61,23 +61,46 @@
<action selector="saveName:" destination="-1" eventType="touchUpInside" id="mS1-h5-lZX"/> <action selector="saveName:" destination="-1" eventType="touchUpInside" id="mS1-h5-lZX"/>
</connections> </connections>
</button> </button>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="03店铺名称_03" translatesAutoresizingMaskIntoConstraints="NO" id="4gp-hl-l09">
<rect key="frame" x="0.0" y="184" width="375" height="300"/>
<constraints>
<constraint firstAttribute="height" constant="300" id="TjS-DV-YDI"/>
<constraint firstAttribute="height" constant="243" id="oSg-pT-lJZ"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="oSg-pT-lJZ"/>
</mask>
</variation>
</imageView>
</subviews> </subviews>
<color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
<constraints> <constraints>
<constraint firstItem="deL-BR-euJ" firstAttribute="leading" secondItem="TXP-n0-MIE" secondAttribute="leading" id="2n1-Ra-iso"/> <constraint firstItem="deL-BR-euJ" firstAttribute="leading" secondItem="TXP-n0-MIE" secondAttribute="leading" id="2n1-Ra-iso"/>
<constraint firstItem="6bk-SN-0aE" firstAttribute="trailing" secondItem="deL-BR-euJ" secondAttribute="trailing" id="HZL-NY-d7n"/> <constraint firstItem="6bk-SN-0aE" firstAttribute="trailing" secondItem="deL-BR-euJ" secondAttribute="trailing" id="HZL-NY-d7n"/>
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="4gp-hl-l09" secondAttribute="bottom" id="Sf7-Jt-ngR"/>
<constraint firstAttribute="trailing" secondItem="4gp-hl-l09" secondAttribute="trailing" id="URu-SB-tpf"/>
<constraint firstItem="ALc-34-26d" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="20" id="Z0V-XA-xLP"/> <constraint firstItem="ALc-34-26d" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="20" id="Z0V-XA-xLP"/>
<constraint firstItem="6bk-SN-0aE" firstAttribute="top" secondItem="TXP-n0-MIE" secondAttribute="bottom" constant="45" id="Zsv-M4-qFy"/> <constraint firstItem="6bk-SN-0aE" firstAttribute="top" secondItem="TXP-n0-MIE" secondAttribute="bottom" constant="45" id="Zsv-M4-qFy"/>
<constraint firstItem="4gp-hl-l09" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="afD-hX-2td"/>
<constraint firstItem="TXP-n0-MIE" firstAttribute="top" secondItem="ALc-34-26d" secondAttribute="bottom" constant="8" id="lZv-Ne-Q7E"/> <constraint firstItem="TXP-n0-MIE" firstAttribute="top" secondItem="ALc-34-26d" secondAttribute="bottom" constant="8" id="lZv-Ne-Q7E"/>
<constraint firstAttribute="bottom" secondItem="4gp-hl-l09" secondAttribute="bottom" id="m22-2a-Poh"/>
<constraint firstItem="6bk-SN-0aE" firstAttribute="leading" secondItem="deL-BR-euJ" secondAttribute="leading" id="oWS-mx-phF"/> <constraint firstItem="6bk-SN-0aE" firstAttribute="leading" secondItem="deL-BR-euJ" secondAttribute="leading" id="oWS-mx-phF"/>
<constraint firstItem="4gp-hl-l09" firstAttribute="top" secondItem="6bk-SN-0aE" secondAttribute="bottom" id="veb-Ew-P4c"/>
<constraint firstItem="ALc-34-26d" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="wgI-Ic-BoN"/> <constraint firstItem="ALc-34-26d" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="wgI-Ic-BoN"/>
<constraint firstAttribute="trailing" secondItem="ALc-34-26d" secondAttribute="trailing" id="xvX-LV-hC9"/> <constraint firstAttribute="trailing" secondItem="ALc-34-26d" secondAttribute="trailing" id="xvX-LV-hC9"/>
</constraints> </constraints>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/> <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
<variation key="default">
<mask key="constraints">
<exclude reference="m22-2a-Poh"/>
</mask>
</variation>
<point key="canvasLocation" x="249.5" y="353.5"/> <point key="canvasLocation" x="249.5" y="353.5"/>
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="03店铺名称_03" width="754" height="349"/>
<image name="rigist_btn_bg" width="490" height="65"/> <image name="rigist_btn_bg" width="490" height="65"/>
</resources> </resources>
</document> </document>
ALand/CodeClass/Home/ViewController/StoreManagerment/introductionViewController.xib
View file @ db21ec7f
...@@ -60,6 +60,17 @@ ...@@ -60,6 +60,17 @@
<action selector="safeIntroductionAction:" destination="-1" eventType="touchUpInside" id="vWj-n3-Pn5"/> <action selector="safeIntroductionAction:" destination="-1" eventType="touchUpInside" id="vWj-n3-Pn5"/>
</connections> </connections>
</button> </button>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" image="03店铺名称_03" translatesAutoresizingMaskIntoConstraints="NO" id="EuO-0V-j76">
<rect key="frame" x="0.0" y="330" width="375" height="337"/>
<constraints>
<constraint firstAttribute="height" constant="243" id="Apy-X7-wFa"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="Apy-X7-wFa"/>
</mask>
</variation>
</imageView>
</subviews> </subviews>
<color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<constraints> <constraints>
...@@ -68,7 +79,11 @@ ...@@ -68,7 +79,11 @@
<constraint firstItem="JdS-U6-Nfk" firstAttribute="leading" secondItem="Ggl-qk-VWW" secondAttribute="leading" id="8xL-9J-afi"/> <constraint firstItem="JdS-U6-Nfk" firstAttribute="leading" secondItem="Ggl-qk-VWW" secondAttribute="leading" id="8xL-9J-afi"/>
<constraint firstItem="JdS-U6-Nfk" firstAttribute="leading" secondItem="4nz-BE-3OY" secondAttribute="leading" id="A0c-qU-XsT"/> <constraint firstItem="JdS-U6-Nfk" firstAttribute="leading" secondItem="4nz-BE-3OY" secondAttribute="leading" id="A0c-qU-XsT"/>
<constraint firstItem="E6i-A0-uZ0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="HL0-2m-QxH"/> <constraint firstItem="E6i-A0-uZ0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="HL0-2m-QxH"/>
<constraint firstItem="EuO-0V-j76" firstAttribute="top" secondItem="4nz-BE-3OY" secondAttribute="bottom" id="HnT-Rn-3Ca"/>
<constraint firstAttribute="trailing" secondItem="EuO-0V-j76" secondAttribute="trailing" id="caL-qE-gIw"/>
<constraint firstAttribute="trailing" secondItem="E6i-A0-uZ0" secondAttribute="trailing" id="dVb-8y-jj0"/> <constraint firstAttribute="trailing" secondItem="E6i-A0-uZ0" secondAttribute="trailing" id="dVb-8y-jj0"/>
<constraint firstAttribute="bottom" secondItem="EuO-0V-j76" secondAttribute="bottom" id="ddr-v6-MoY"/>
<constraint firstItem="EuO-0V-j76" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="i05-AP-sL9"/>
<constraint firstItem="JdS-U6-Nfk" firstAttribute="trailing" secondItem="4nz-BE-3OY" secondAttribute="trailing" id="m4N-LC-Dry"/> <constraint firstItem="JdS-U6-Nfk" firstAttribute="trailing" secondItem="4nz-BE-3OY" secondAttribute="trailing" id="m4N-LC-Dry"/>
<constraint firstItem="E6i-A0-uZ0" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="20" id="oGx-fb-PYR"/> <constraint firstItem="E6i-A0-uZ0" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="20" id="oGx-fb-PYR"/>
<constraint firstAttribute="bottom" secondItem="E6i-A0-uZ0" secondAttribute="bottom" constant="452" id="ovE-Bw-nu3"/> <constraint firstAttribute="bottom" secondItem="E6i-A0-uZ0" secondAttribute="bottom" constant="452" id="ovE-Bw-nu3"/>
...@@ -83,6 +98,7 @@ ...@@ -83,6 +98,7 @@
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="03店铺名称_03" width="754" height="349"/>
<image name="rigist_btn_bg" width="490" height="65"/> <image name="rigist_btn_bg" width="490" height="65"/>
</resources> </resources>
</document> </document>
ALand/CodeClass/Login/Base.lproj/ToLoginViewController.xib
View file @ db21ec7f
...@@ -60,10 +60,10 @@ ...@@ -60,10 +60,10 @@
<constraint firstAttribute="height" constant="30" id="bqM-pK-6q9"/> <constraint firstAttribute="height" constant="30" id="bqM-pK-6q9"/>
</constraints> </constraints>
</imageView> </imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" placeholder="请输入手机号码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5eD-la-0j7"> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" placeholder="请输入手机号码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="5eD-la-0j7">
<rect key="frame" x="70" y="14" width="273" height="22"/> <rect key="frame" x="70" y="14" width="273" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/> <fontDescription key="fontDescription" type="system" pointSize="18"/>
<textInputTraits key="textInputTraits"/> <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
</textField> </textField>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mu2-3E-jKv"> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mu2-3E-jKv">
<rect key="frame" x="70" y="65" width="273" height="22"/> <rect key="frame" x="70" y="65" width="273" height="22"/>
......
ALand/CodeClass/Login/LoginViewController.xib
View file @ db21ec7f
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/> <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a5g-v2-8Qq" userLabel="bottomBg"> <view hidden="YES" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="a5g-v2-8Qq" userLabel="bottomBg">
<rect key="frame" x="0.0" y="480" width="320" height="0.0"/> <rect key="frame" x="0.0" y="480" width="320" height="0.0"/>
<color key="backgroundColor" red="0.97254901959999995" green="0.97254901959999995" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.97254901959999995" green="0.97254901959999995" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tdr-oJ-D2D"> <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Tdr-oJ-D2D">
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/> <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="login_top" translatesAutoresizingMaskIntoConstraints="NO" id="gIO-Jz-jhA"> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="login_top" translatesAutoresizingMaskIntoConstraints="NO" id="gIO-Jz-jhA">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<constraint firstAttribute="width" constant="234" id="jkq-tN-k4O"/> <constraint firstAttribute="width" constant="234" id="jkq-tN-k4O"/>
</constraints> </constraints>
</imageView> </imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Drd-sW-LYv"> <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Drd-sW-LYv">
<rect key="frame" x="32" y="252" width="256" height="44"/> <rect key="frame" x="32" y="252" width="256" height="44"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="300" id="1bQ-Cb-7AQ"/> <constraint firstAttribute="width" constant="300" id="1bQ-Cb-7AQ"/>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<action selector="rigistAction:" destination="-1" eventType="touchUpInside" id="Qaf-df-5Yo"/> <action selector="rigistAction:" destination="-1" eventType="touchUpInside" id="Qaf-df-5Yo"/>
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Te4-Rx-W0K"> <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Te4-Rx-W0K">
<rect key="frame" x="32" y="326" width="256" height="44"/> <rect key="frame" x="32" y="326" width="256" height="44"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="300" id="do6-tj-oIb"/> <constraint firstAttribute="width" constant="300" id="do6-tj-oIb"/>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</mask> </mask>
</variation> </variation>
</view> </view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="第三方帐号快速登录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A0v-gX-51g"> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="第三方帐号快速登录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A0v-gX-51g">
<rect key="frame" x="84" y="493" width="153" height="21"/> <rect key="frame" x="84" y="493" width="153" height="21"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="21" id="58L-Dk-Bgf"/> <constraint firstAttribute="height" constant="21" id="58L-Dk-Bgf"/>
...@@ -255,8 +255,6 @@ ...@@ -255,8 +255,6 @@
<simulatedScreenMetrics key="simulatedDestinationMetrics"/> <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
<variation key="default"> <variation key="default">
<mask key="constraints"> <mask key="constraints">
<exclude reference="n7u-3l-exd"/>
<exclude reference="vpe-zq-N6M"/>
<exclude reference="aMk-ck-77o"/> <exclude reference="aMk-ck-77o"/>
<exclude reference="cO6-rU-Cbm"/> <exclude reference="cO6-rU-Cbm"/>
<exclude reference="tG9-qm-96H"/> <exclude reference="tG9-qm-96H"/>
...@@ -266,13 +264,13 @@ ...@@ -266,13 +264,13 @@
<exclude reference="cU6-qJ-YEH"/> <exclude reference="cU6-qJ-YEH"/>
<exclude reference="gQE-g2-4Qi"/> <exclude reference="gQE-g2-4Qi"/>
<exclude reference="vdU-Rr-sZE"/> <exclude reference="vdU-Rr-sZE"/>
<exclude reference="HMT-LN-7NX"/>
<exclude reference="Mj3-EH-xeh"/>
<exclude reference="xjb-qf-305"/>
<exclude reference="4TN-HR-g13"/> <exclude reference="4TN-HR-g13"/>
<exclude reference="XAF-PG-VgT"/> <exclude reference="XAF-PG-VgT"/>
<exclude reference="neD-3Z-NAl"/> <exclude reference="neD-3Z-NAl"/>
<exclude reference="pMe-O0-JMD"/> <exclude reference="pMe-O0-JMD"/>
<exclude reference="HMT-LN-7NX"/>
<exclude reference="Mj3-EH-xeh"/>
<exclude reference="xjb-qf-305"/>
<exclude reference="LnC-cM-gzb"/> <exclude reference="LnC-cM-gzb"/>
<exclude reference="Nfl-d1-cFc"/> <exclude reference="Nfl-d1-cFc"/>
<exclude reference="PzI-C4-ZQN"/> <exclude reference="PzI-C4-ZQN"/>
...@@ -280,6 +278,8 @@ ...@@ -280,6 +278,8 @@
<exclude reference="Hlj-jd-0wS"/> <exclude reference="Hlj-jd-0wS"/>
<exclude reference="MdR-mL-ooB"/> <exclude reference="MdR-mL-ooB"/>
<exclude reference="ZOA-Fp-P5j"/> <exclude reference="ZOA-Fp-P5j"/>
<exclude reference="n7u-3l-exd"/>
<exclude reference="vpe-zq-N6M"/>
</mask> </mask>
</variation> </variation>
<point key="canvasLocation" x="-300" y="-93"/> <point key="canvasLocation" x="-300" y="-93"/>
......
ALand/CodeClass/Login/ResetPasswordViewController.m
View file @ db21ec7f
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
NSString *strName = [textField.text stringByReplacingCharactersInRange:range withString:string]; NSString *strName = [textField.text stringByReplacingCharactersInRange:range withString:string];
self.btnNext.enabled = strName.length > 0; self.btnNext.enabled = [strName isMobileNumber] == nil;
return YES; return YES;
} }
......
ALand/CodeClass/Login/ResetPasswordViewController.xib
View file @ db21ec7f
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<constraint firstAttribute="height" constant="22" id="xXX-ue-pI8"/> <constraint firstAttribute="height" constant="22" id="xXX-ue-pI8"/>
</constraints> </constraints>
<fontDescription key="fontDescription" type="system" pointSize="18"/> <fontDescription key="fontDescription" type="system" pointSize="18"/>
<textInputTraits key="textInputTraits"/> <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
</textField> </textField>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
......
ALand/CodeClass/Login/RigistViewController.m
View file @ db21ec7f
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#import "AFNetworking.h" #import "AFNetworking.h"
#import "ToLoginViewController.h" #import "ToLoginViewController.h"
#import "AgreementViewController.h" #import "AgreementViewController.h"
#import "NSString+Category.h"
@interface RigistViewController () @interface RigistViewController ()
@property (weak, nonatomic) IBOutlet UIButton *sendCodeBtn; @property (weak, nonatomic) IBOutlet UIButton *sendCodeBtn;
@property (weak, nonatomic) IBOutlet UIButton *setPasswordVisible; @property (weak, nonatomic) IBOutlet UIButton *setPasswordVisible;
...@@ -57,11 +58,17 @@ ...@@ -57,11 +58,17 @@
// 发送验证码 // 发送验证码
- (IBAction)sendCodeAction:(UIButton *)sender { - (IBAction)sendCodeAction:(UIButton *)sender {
if ([self.phoneNumberTextFiled.text isMobileNumber]) {
[MBProgressHUD Javen_showError:@"请输入正确的号码" onView:kWindow delay:0.5 complete:nil];
return;
}
NSDictionary *parameters = @{@"mobilephone":self.phoneNumberTextFiled.text, NSDictionary *parameters = @{@"mobilephone":self.phoneNumberTextFiled.text,
@"template":[NSNull null]}; @"template":[NSNull null]};
WS(weakSelf) WS(weakSelf)
[[HTTPCilent shareCilent] GET:@"app/sendSms" parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) { [[HTTPCilent shareCilent] GET:@"app/sendSms" parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
CLog(@"------->发送验证码");
[weakSelf.sendCodeBtn startWithTime:60 title:@"发送验证码" countDownTitle:@"s" mainColor:nil countColor:nil mainTitleColor:[UIColor colorWithHexString:@"51B2F6"] countTitleColor:[UIColor colorWithHexString:@"888888"]]; [weakSelf.sendCodeBtn startWithTime:60 title:@"发送验证码" countDownTitle:@"s" mainColor:nil countColor:nil mainTitleColor:[UIColor colorWithHexString:@"51B2F6"] countTitleColor:[UIColor colorWithHexString:@"888888"]];
} failure:^(NSURLSessionDataTask *task, NSError *error) { } failure:^(NSURLSessionDataTask *task, NSError *error) {
...@@ -73,6 +80,17 @@ ...@@ -73,6 +80,17 @@
//注册 //注册
- (IBAction)actionNext:(id)sender { - (IBAction)actionNext:(id)sender {
if ([self.phoneNumberTextFiled.text isMobileNumber]) {
[MBProgressHUD Javen_showError:@"请输入正确的号码" onView:kWindow delay:0.5 complete:nil];
return;
}
if (self.passwordTextFiled.text.length < 6 || self.passwordTextFiled.text.length > 12) {
[MBProgressHUD Javen_showError:@"密码长度6~12位" onView:kWindow delay:0.5 complete:nil];
return;
}
NSDictionary *parameters = @{@"domain":@"0001", NSDictionary *parameters = @{@"domain":@"0001",
@"invitationCode":@"", @"invitationCode":@"",
@"smsCode":self.codeTextField.text, @"smsCode":self.codeTextField.text,
......
ALand/CodeClass/Login/RigistViewController.xib
View file @ db21ec7f
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
</mask> </mask>
</variation> </variation>
</view> </view>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="F4s-Bg-80l"> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="F4s-Bg-80l">
<rect key="frame" x="70" y="14" width="273" height="22"/> <rect key="frame" x="70" y="14" width="273" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/> <fontDescription key="fontDescription" type="system" pointSize="18"/>
<textInputTraits key="textInputTraits"/> <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
</textField> </textField>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="phone_icon" translatesAutoresizingMaskIntoConstraints="NO" id="shb-AS-wJz"> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="phone_icon" translatesAutoresizingMaskIntoConstraints="NO" id="shb-AS-wJz">
<rect key="frame" x="32" y="10" width="30" height="30"/> <rect key="frame" x="32" y="10" width="30" height="30"/>
......
ALand/CodeClass/Login/ToLoginViewController.m
View file @ db21ec7f
...@@ -57,9 +57,7 @@ ...@@ -57,9 +57,7 @@
}else{ }else{
[MBProgressHUD Javen_showError:responseObject[@"message"] onView:kWindow delay:2 complete:^{ [MBProgressHUD Javen_showError:responseObject[@"message"] onView:kWindow delay:2 complete:nil];
}];
} }
} failure:^(NSURLSessionDataTask *task, NSError *error) { } failure:^(NSURLSessionDataTask *task, NSError *error) {
......
ALand/CodeClass/MIne/View/MyBandCard/MyBandBottomView.m
View file @ db21ec7f
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
- (void)awakeFromNib { - (void)awakeFromNib {
self.btnAdd.imageView.contentMode = UIViewContentModeScaleAspectFit; self.btnAdd.imageView.contentMode = UIViewContentModeScaleAspectFit;
[self.btnAdd setImage:[UIImage imageNamed:@"smallEmptyImage"] forState:UIControlStateSelected | UIControlStateHighlighted];
[self.btnAdd setTitle:@"修改" forState:UIControlStateSelected | UIControlStateHighlighted];
} }
/* /*
......
ALand/CodeClass/MIne/View/MyBandCard/MyBandBottomView.xib
View file @ db21ec7f
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="60"/> <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleAspectFit" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XEH-EO-w12"> <button opaque="NO" contentMode="scaleAspectFit" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XEH-EO-w12">
<rect key="frame" x="0.0" y="1" width="320" height="59"/> <rect key="frame" x="0.0" y="1" width="320" height="59"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="130" id="CeF-dx-cXo"/> <constraint firstAttribute="width" constant="130" id="CeF-dx-cXo"/>
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<color key="titleColor" red="0.34509803919999998" green="0.75686274509999996" blue="0.050980392159999999" alpha="1" colorSpace="calibratedRGB"/> <color key="titleColor" red="0.34509803919999998" green="0.75686274509999996" blue="0.050980392159999999" alpha="1" colorSpace="calibratedRGB"/>
</state> </state>
<state key="selected" title=" 修改" image="smallEmptyImage"/> <state key="selected" title=" 修改" image="smallEmptyImage"/>
<state key="highlighted" title=" " image="smallEmptyImage"/>
<variation key="default"> <variation key="default">
<mask key="constraints"> <mask key="constraints">
<exclude reference="CeF-dx-cXo"/> <exclude reference="CeF-dx-cXo"/>
......
ALand/CodeClass/MIne/ViewController/AboutViewController.h 0 → 100644
View file @ db21ec7f
//
// AboutViewController.h
// ALand
//
// Created by Z on 16/5/24.
// Copyright © 2016年 Z. All rights reserved.
//
#import "IBTUIViewController.h"
@interface AboutViewController : IBTUIViewController
@end
ALand/CodeClass/MIne/ViewController/AboutViewController.m 0 → 100644
View file @ db21ec7f
//
// AboutViewController.m
// ALand
//
// Created by Z on 16/5/24.
// Copyright © 2016年 Z. All rights reserved.
//
#import "AboutViewController.h"
#import "UIImage+Helper.h"
@interface AboutViewController ()
@property (weak, nonatomic) IBOutlet UIImageView *imgViewTop;
@end
@implementation AboutViewController
- (void)viewDidLoad {
[super viewDidLoad];
self.view.backgroundColor = kSysWhite;
self.imgViewTop.layer.masksToBounds = YES;
self.imgViewTop.layer.cornerRadius = 10;
self.imgViewTop.image = [UIImage appIcon];
// Do any additional setup after loading the view from its nib.
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
ALand/CodeClass/MIne/ViewController/AboutViewController.xib 0 → 100644
View file @ db21ec7f
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AboutViewController">
<connections>
<outlet property="imgViewTop" destination="GUS-nD-bR6" id="Mzq-BJ-Fmc"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="GUS-nD-bR6">
<rect key="frame" x="138" y="85" width="100" height="100"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="Dmf-vI-d4B"/>
<constraint firstAttribute="height" constant="100" id="lNW-1n-r8Y"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="版本1.0.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PIk-Fj-Tp4">
<rect key="frame" x="142" y="210" width="93" height="27"/>
<fontDescription key="fontDescription" type="system" pointSize="22"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="copyright ©2016" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9tJ-b9-1oI">
<rect key="frame" x="123" y="630" width="130" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="PIk-Fj-Tp4" firstAttribute="centerX" secondItem="GUS-nD-bR6" secondAttribute="centerX" id="3dZ-eC-Olk"/>
<constraint firstItem="GUS-nD-bR6" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="85" id="4jM-Cs-NAg"/>
<constraint firstItem="9tJ-b9-1oI" firstAttribute="centerX" secondItem="GUS-nD-bR6" secondAttribute="centerX" id="GM7-PU-rxe"/>
<constraint firstItem="PIk-Fj-Tp4" firstAttribute="top" secondItem="GUS-nD-bR6" secondAttribute="bottom" constant="25" id="JuV-sV-hU8"/>
<constraint firstItem="GUS-nD-bR6" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="Qa0-E6-8ze"/>
<constraint firstAttribute="bottom" secondItem="9tJ-b9-1oI" secondAttribute="bottom" constant="16" id="Zgr-uY-3qb"/>
</constraints>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
<point key="canvasLocation" x="355.5" y="373.5"/>
</view>
</objects>
</document>
ALand/CodeClass/MIne/ViewController/ChangeUserSignatureViewController.h 0 → 100644
View file @ db21ec7f
//
// ChangeUserSignatureViewController.h
// ALand
//
// Created by Z on 16/5/24.
// Copyright © 2016年 Z. All rights reserved.
//
#import "IBTUIViewController.h"
#import "JavenResellerBigModel.h"
@interface ChangeUserSignatureViewController : IBTUIViewController
@property (nonatomic, strong) JavenResellerBigModel *reseller;
@end
ALand/CodeClass/MIne/ViewController/ChangeUserSignatureViewController.m 0 → 100644
View file @ db21ec7f
//
// ChangeUserSignatureViewController.m
// ALand
//
// Created by Z on 16/5/24.
// Copyright © 2016年 Z. All rights reserved.
//
#import "ChangeUserSignatureViewController.h"
#import "ICRPlaceholderTextView.h"
@interface ChangeUserSignatureViewController ()<UITextViewDelegate>
@property (weak, nonatomic) IBOutlet ICRPlaceholderTextView *textViewTop;
@end
@implementation ChangeUserSignatureViewController
- (void)viewDidLoad {
[super viewDidLoad];
self.textViewTop.m_placeHolder = @"输入签名…";
self.textViewTop.text = self.reseller.internalBaseClassDescription;
self.textViewTop.delegate = self;
// Do any additional setup after loading the view from its nib.
}
- (IBAction)actionChangeSignature:(id)sender {
[self changeSignature:self.textViewTop.text];
}
- (void)changeSignature:(NSString *)signature {
[MBProgressHUD Javen_showMessage:@"修改中" onView:self.view];
self.reseller.internalBaseClassDescription = signature;
NSDictionary *params = [self getParamsWithReseller:self.reseller];
[self changeResellerInfoWithDic:params];
}
- (NSDictionary *)getParamsWithReseller:(JavenResellerBigModel *)resellerModel {
// resellerModel.ownerOrg = nil;
UserInfo *user = [UserInfo shareInstance];
NSDictionary *reseller = [resellerModel dictionaryRepresentation];
NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber],
@"domain" : kDomain,
@"operator" : @{@"id" : user.uuid,
@"fullName" : user.name}},
@"reseller" : reseller};
return params;
}
/** 把修改的信息上传到服务器 */
- (void)changeResellerInfoWithDic:(NSDictionary *)params
{
WS(weakSelf)
[[HTTPCilent shareCilent] POST:@"reseller/save" parameters:params success:^(NSURLSessionDataTask *task, id responseObject) {
[MBProgressHUD hideHUDForView:weakSelf.view];
if ([responseObject[@"code"] isEqualToNumber:@0]) {
[MBProgressHUD Javen_showSuccess:@"修改成功！" onView:weakSelf.view delay:0.7 complete:^{
[weakSelf popAction];
}];
}else{
[MBProgressHUD Javen_showError:responseObject[@"message"] onView:weakSelf.view delay:0.7 complete:nil];
}
} failure:^(NSURLSessionDataTask *task, NSError *error) {
}];
}
- (IBAction)actionSaveSignature:(id)sender {
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
ALand/CodeClass/MIne/ViewController/ChangeUserSignatureViewController.xib 0 → 100644
View file @ db21ec7f
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ChangeUserSignatureViewController">
<connections>
<outlet property="textViewTop" destination="CrZ-m0-0RR" id="cyb-aC-84h"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fh0-t5-q3K">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wcx-lp-EEk">
<rect key="frame" x="0.0" y="20" width="375" height="195"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="CrZ-m0-0RR" customClass="ICRPlaceholderTextView">
<rect key="frame" x="16" y="0.0" width="343" height="195"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="CrZ-m0-0RR" firstAttribute="leading" secondItem="Wcx-lp-EEk" secondAttribute="leading" constant="16" id="JV9-dz-Azz"/>
<constraint firstAttribute="height" constant="195" id="OGo-6g-u6K"/>
<constraint firstAttribute="trailing" secondItem="CrZ-m0-0RR" secondAttribute="trailing" constant="16" id="oQR-YG-3QH"/>
<constraint firstAttribute="bottom" secondItem="CrZ-m0-0RR" secondAttribute="bottom" id="pCE-a3-8F3"/>
<constraint firstItem="CrZ-m0-0RR" firstAttribute="top" secondItem="Wcx-lp-EEk" secondAttribute="top" id="s5U-mq-SFw"/>
</constraints>
</view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="给你的店铺来个自我介绍吧" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="glN-vA-Czn">
<rect key="frame" x="16" y="223" width="180" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.50823958329999996" green="0.50823958329999996" blue="0.50823958329999996" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JdC-lr-SgD">
<rect key="frame" x="16" y="286" width="343" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="300" id="M9a-M3-mOM"/>
<constraint firstAttribute="height" constant="44" id="cgr-kR-rN6"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<state key="normal" title="保 存" backgroundImage="rigist_btn_bg">
<color key="titleColor" red="0.97254901959999995" green="0.97254901959999995" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
</state>
<variation key="default">
<mask key="constraints">
<exclude reference="M9a-M3-mOM"/>
</mask>
</variation>
<connections>
<action selector="actionChangeSignature:" destination="-1" eventType="touchUpInside" id="zkq-oL-IEi"/>
<action selector="actionSaveSignature:" destination="-1" eventType="touchUpInside" id="QEl-RD-3Ux"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="Wcx-lp-EEk" secondAttribute="bottom" constant="452" id="9Ce-xB-oAX"/>
<constraint firstItem="JdC-lr-SgD" firstAttribute="top" secondItem="glN-vA-Czn" secondAttribute="bottom" constant="45" id="Idc-ER-hL5"/>
<constraint firstItem="CrZ-m0-0RR" firstAttribute="leading" secondItem="JdC-lr-SgD" secondAttribute="leading" id="JlO-A4-ynk"/>
<constraint firstItem="CrZ-m0-0RR" firstAttribute="leading" secondItem="glN-vA-Czn" secondAttribute="leading" id="VHv-SZ-OZI"/>
<constraint firstItem="Wcx-lp-EEk" firstAttribute="leading" secondItem="fh0-t5-q3K" secondAttribute="leading" id="YEX-6e-Nrr"/>
<constraint firstItem="Wcx-lp-EEk" firstAttribute="top" secondItem="fh0-t5-q3K" secondAttribute="top" constant="20" id="f3R-Vi-n39"/>
<constraint firstItem="CrZ-m0-0RR" firstAttribute="trailing" secondItem="JdC-lr-SgD" secondAttribute="trailing" id="n6o-UV-NcF"/>
<constraint firstAttribute="trailing" secondItem="Wcx-lp-EEk" secondAttribute="trailing" id="xTG-aL-2tQ"/>
<constraint firstItem="glN-vA-Czn" firstAttribute="top" secondItem="Wcx-lp-EEk" secondAttribute="bottom" constant="8" id="yhw-xB-ZEJ"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="9Ce-xB-oAX"/>
</mask>
</variation>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="fh0-t5-q3K" secondAttribute="bottom" id="5Qc-Xr-gmr"/>
<constraint firstItem="fh0-t5-q3K" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="Byn-1n-MAq"/>
<constraint firstItem="fh0-t5-q3K" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="d9d-20-LaL"/>
<constraint firstAttribute="trailing" secondItem="fh0-t5-q3K" secondAttribute="trailing" id="jOk-bc-fhq"/>
</constraints>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
</view>
</objects>
<resources>
<image name="rigist_btn_bg" width="490" height="65"/>
</resources>
</document>
ALand/CodeClass/MIne/ViewController/MineViewController.xib
View file @ db21ec7f
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
<constraint firstAttribute="trailing" secondItem="LWa-pB-gzY" secondAttribute="trailing" id="WeH-5N-KJ2"/> <constraint firstAttribute="trailing" secondItem="LWa-pB-gzY" secondAttribute="trailing" id="WeH-5N-KJ2"/>
<constraint firstAttribute="bottom" secondItem="LWa-pB-gzY" secondAttribute="bottom" id="erh-Ev-dhd"/> <constraint firstAttribute="bottom" secondItem="LWa-pB-gzY" secondAttribute="bottom" id="erh-Ev-dhd"/>
<constraint firstItem="dfv-GK-ZBT" firstAttribute="leading" secondItem="CXo-pe-sAN" secondAttribute="trailing" constant="16" id="g8t-G2-v1v"/> <constraint firstItem="dfv-GK-ZBT" firstAttribute="leading" secondItem="CXo-pe-sAN" secondAttribute="trailing" constant="16" id="g8t-G2-v1v"/>
<constraint firstAttribute="trailing" secondItem="hhg-by-Pl9" secondAttribute="trailing" constant="8" id="lzI-Qf-3KU"/>
<constraint firstAttribute="trailing" secondItem="yzY-82-uJN" secondAttribute="trailing" id="vRa-BC-DJY"/> <constraint firstAttribute="trailing" secondItem="yzY-82-uJN" secondAttribute="trailing" id="vRa-BC-DJY"/>
<constraint firstItem="LWa-pB-gzY" firstAttribute="leading" secondItem="CH8-Du-l6K" secondAttribute="leading" id="wsX-KN-KYe"/> <constraint firstItem="LWa-pB-gzY" firstAttribute="leading" secondItem="CH8-Du-l6K" secondAttribute="leading" id="wsX-KN-KYe"/>
</constraints> </constraints>
......
ALand/CodeClass/MIne/ViewController/MyAcountViewController.m
View file @ db21ec7f
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
weakSelf.labelUnconfirmedBalance.text = kMoneyFromIDNumber(dic[@"unconfirmedBalance"]); weakSelf.labelUnconfirmedBalance.text = kMoneyFromIDNumber(dic[@"unconfirmedBalance"]);
weakSelf.labelAccumulatedIncome.text = kMoneyFromIDNumber(dic[@"accumulatedIncome"]); weakSelf.labelAccumulatedIncome.text = kMoneyFromIDNumber(dic[@"accumulatedIncome"]);
weakSelf.labelSelfSalesIncome.text = kMoneyFromIDNumber(dic[@"selfIncome"]); weakSelf.labelSelfSalesIncome.text = kMoneyFromIDNumber(dic[@"selfIncome"]);
weakSelf.labelTeamIncome.text = kMoneyFromIDNumber(dic[@"teamIncome"]);
double unconfirmBalance = [dic[@"unconfirmedBalance"] doubleValue]; double unconfirmBalance = [dic[@"unconfirmedBalance"] doubleValue];
double balance = [dic[@"balance"] doubleValue]; double balance = [dic[@"balance"] doubleValue];
weakSelf.labelTotalBalance.text = [NSString stringWithFormat:@"%.2f", (balance + unconfirmBalance)]; weakSelf.labelTotalBalance.text = [NSString stringWithFormat:@"%.2f", (balance + unconfirmBalance)];
......
ALand/CodeClass/MIne/ViewController/MyBandCard/MyBandCardViewController.m
View file @ db21ec7f
...@@ -75,13 +75,13 @@ ...@@ -75,13 +75,13 @@
- (void)addBottomView { - (void)addBottomView {
self.bottomView = [MyBandBottomView viewWithNibName:@"MyBandBottomView"]; self.bottomView = [MyBandBottomView viewWithNibName:@"MyBandBottomView"];
self.bottomView.frame = CGRectMake(0, kHeight - 60 - 64, kWidth, 60 + 64); self.bottomView.frame = CGRectMake(0, kHeight - 60 - 64, kWidth, 60 + 64);
kButtonAddAction(self.bottomView.btnAdd, goAddBankCardID); kButtonAddAction(self.bottomView.btnAdd, goAddBankCardID:);
[self.view addSubview:self.bottomView]; [self.view addSubview:self.bottomView];
} }
- (void)goAddBankCardID { - (void)goAddBankCardID:(UIButton *)btn {
btn.highlighted = NO;
if (self.bottomView.btnAdd.isSelected) { if (self.bottomView.btnAdd.isSelected) {
//修改银行卡 //修改银行卡
ChangeMyBankCardViewController *changeVC = [[ChangeMyBankCardViewController alloc] init]; ChangeMyBankCardViewController *changeVC = [[ChangeMyBankCardViewController alloc] init];
......
ALand/CodeClass/MIne/ViewController/SettingViewController.m
View file @ db21ec7f
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
#import "SettingViewController.h" #import "SettingViewController.h"
#import "SDImageCache.h" #import "SDImageCache.h"
#import "ChangeUserSignatureViewController.h"
#import "SelectPhotoView.h" #import "SelectPhotoView.h"
#import "CoverShadowView.h" #import "CoverShadowView.h"
#import "ChangePasswordViewController.h" #import "ChangePasswordViewController.h"
@interface SettingViewController ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate, UIAlertViewDelegate> #import "AboutViewController.h"
@interface SettingViewController ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate>
@property (weak, nonatomic) IBOutlet UIImageView *imageViewIcon; @property (weak, nonatomic) IBOutlet UIImageView *imageViewIcon;
@property (weak, nonatomic) IBOutlet UILabel *signature;//个性签名 @property (weak, nonatomic) IBOutlet UILabel *signature;//个性签名
@property (weak, nonatomic) IBOutlet UILabel *phoneNumber; @property (weak, nonatomic) IBOutlet UILabel *phoneNumber;
...@@ -53,6 +54,14 @@ ...@@ -53,6 +54,14 @@
#pragma mark - action #pragma mark - action
- (IBAction)actionAbout:(id)sender {
AboutViewController *aboutVC = [[AboutViewController alloc] init];
aboutVC.isShowNavigationBar = YES;
aboutVC.title = @"关于";
[self.navigationController pushViewController:aboutVC animated:YES];
}
- (IBAction)loginOut:(id)sender - (IBAction)loginOut:(id)sender
{ {
[[HTTPCilent shareCilent] GET:@"app/resellerLogout" parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) { [[HTTPCilent shareCilent] GET:@"app/resellerLogout" parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
...@@ -94,30 +103,14 @@ ...@@ -94,30 +103,14 @@
[self show]; [self show];
} }
/** chage signature */
- (IBAction)actionSetSignature:(id)sender - (IBAction)actionSetSignature:(id)sender
{ {
if (IOS8_OR_LATER) { ChangeUserSignatureViewController *changeSignatureVC = [[ChangeUserSignatureViewController alloc] init];
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"修改签名" message:nil preferredStyle:UIAlertControllerStyleAlert]; changeSignatureVC.isShowNavigationBar = YES;
[alertController addTextFieldWithConfigurationHandler:nil]; changeSignatureVC.title = @"设置签名";
changeSignatureVC.reseller = self.reseller;
UIAlertAction *changeAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { [self PushViewController:changeSignatureVC animated:YES];
[self changeSignature:alertController.textFields.firstObject.text];
}];
UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
}];
[alertController addAction:cancelAction];
[alertController addAction:changeAction];
[self presentViewController:alertController animated:YES completion:nil];
}else{
UIAlertView *alerView = [[UIAlertView alloc] initWithTitle:@"设置签名" message:nil delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"修改", nil];
alerView.alertViewStyle = UIAlertViewStylePlainTextInput;
[alerView show];
}
} }
- (IBAction)actionChangePassword:(id)sender - (IBAction)actionChangePassword:(id)sender
...@@ -279,31 +272,6 @@ ...@@ -279,31 +272,6 @@
}]; }];
} }
#pragma mark - alerview delegate
- (void)alertView : (UIAlertView*)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
{
switch (buttonIndex) {
case 0://取消
{
[self.view endEditing:YES];
}
break;
case 1://确定
{
//得到输入框
UITextField *tf=[alertView textFieldAtIndex:0];
[self changeSignature:tf.text];
}
break;
default:
break;
}
}
- (void)changeSignature:(NSString *)signature { - (void)changeSignature:(NSString *)signature {
[MBProgressHUD Javen_showMessage:@"修改中" onView:self.view]; [MBProgressHUD Javen_showMessage:@"修改中" onView:self.view];
...@@ -317,6 +285,10 @@ ...@@ -317,6 +285,10 @@
self.signature.text = self.reseller.internalBaseClassDescription; self.signature.text = self.reseller.internalBaseClassDescription;
} }
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[self setUpdata];
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
......
ALand/General/Categories/MBProgressHUD+Javen.m
View file @ db21ec7f
...@@ -162,6 +162,7 @@ ...@@ -162,6 +162,7 @@
} }
+ (void)Javen_showError:(NSString *)error onView:(UIView *)view delay:(NSTimeInterval)time complete:(void (^)(void))complete { + (void)Javen_showError:(NSString *)error onView:(UIView *)view delay:(NSTimeInterval)time complete:(void (^)(void))complete {
[kWindow endEditing:YES];
MBProgressHUD *hud = [[MBProgressHUD alloc] initWithView:view]; MBProgressHUD *hud = [[MBProgressHUD alloc] initWithView:view];
[view addSubview:hud]; [view addSubview:hud];
......
ALand/General/Categories/NSString+Category.h
View file @ db21ec7f
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
/** /**
* 手机号有效性 * 手机号有效性
*/ */
- (BOOL)isMobileNumber; - (NSString *)isMobileNumber;
/** /**
* 邮箱的有效性 * 邮箱的有效性
*/ */
......
ALand/General/Categories/NSString+Category.m
View file @ db21ec7f
...@@ -83,19 +83,41 @@ ...@@ -83,19 +83,41 @@
} }
//手机号有效性 //手机号有效性
- (BOOL)isMobileNumber{ - (NSString *)isMobileNumber{
if (self.length < 11)
{
return @"手机号长度只能是11位";
}else{
/**
* 移动号段正则表达式
*/
NSString *CM_NUM = @"^((13[4-9])|(147)|(15[0-2,7-9])|(178)|(18[2-4,7-8]))\\d{8}|(1705)\\d{7}$";
/**
* 联通号段正则表达式
*/
NSString *CU_NUM = @"^((13[0-2])|(145)|(15[5-6])|(176)|(18[5,6]))\\d{8}|(1709)\\d{7}$";
/** /**
* 手机号以13、15、18、170开头，8个 \\d 数字字符 * 电信号段正则表达式
* 小灵通 区号：010,020,021,022,023,024,025,027,028,029 还有未设置的新区号xxx
*/ */
NSString *mobileNoRegex = @"^1((3\\\\d|5[0-35-9]|8[025-9])\\\\d|70[059])\\\\d{7}$";//除4以外的所有个位整数，不能使用[^4,\\\\d]匹配，这里是否iOS Bug? NSString *CT_NUM = @"^((133)|(153)|(177)|(18[0,1,9]))\\d{8}$";
NSString *phsRegex =@"^0(10|2[0-57-9]|\\\\d{3})\\\\d{7,8}$"; NSPredicate *pred1 = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", CM_NUM];
BOOL isMatch1 = [pred1 evaluateWithObject:self];
NSPredicate *pred2 = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", CU_NUM];
BOOL isMatch2 = [pred2 evaluateWithObject:self];
NSPredicate *pred3 = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", CT_NUM];
BOOL isMatch3 = [pred3 evaluateWithObject:self];
if (isMatch1 || isMatch2 || isMatch3) {
return nil;
}else{
return @"请输入正确的电话号码";
}
}
return nil;
}
BOOL ret = [self isValidateByRegex:mobileNoRegex];
BOOL ret1 = [self isValidateByRegex:phsRegex];
return (ret || ret1);
}
//邮箱 //邮箱
- (BOOL)isEmailAddress{ - (BOOL)isEmailAddress{
......
ALand/General/ICRPlaceholderTextView.m
View file @ db21ec7f
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
return self; return self;
} }
- (void)awakeFromNib {
[self initObserver];
}
- (void)initObserver { - (void)initObserver {
[[NSNotificationCenter defaultCenter] addObserver:self [[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(beginEditing:) selector:@selector(beginEditing:)
......
ALand/Global/JavenQNManager.m
View file @ db21ec7f
...@@ -27,9 +27,7 @@ ...@@ -27,9 +27,7 @@
static dispatch_once_t onceToken; static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{ dispatch_once(&onceToken, ^{
manager = [[JavenQNManager alloc] init]; manager = [[JavenQNManager alloc] init];
NSString *AK =@"mRX5pK-bCChgNMxeiC_VlRgSFLuz_WbLT3OyViuh";
NSString *SK = @"m8XQ8FjLiUY38pgDUzjHApdJ4YpgdlpmRT6FAwAg";
manager.token = [manager makeToken:AK secretKey:SK];
manager.option = [[QNUploadOption alloc] initWithMime:@"image/jpeg" progressHandler:nil params:nil checkCrc:NO cancellationSignal:nil]; manager.option = [[QNUploadOption alloc] initWithMime:@"image/jpeg" progressHandler:nil params:nil checkCrc:NO cancellationSignal:nil];
manager.upManager =[[QNUploadManager alloc]init]; manager.upManager =[[QNUploadManager alloc]init];
}); });
...@@ -39,9 +37,11 @@ ...@@ -39,9 +37,11 @@
- (void)upLoadImage:(UIImage *)image isMD5Name:(BOOL)isMD5Name name:(NSString *)imageName commpelete:(void(^)(NSString *key))commpelete { - (void)upLoadImage:(UIImage *)image isMD5Name:(BOOL)isMD5Name name:(NSString *)imageName commpelete:(void(^)(NSString *key))commpelete {
UIImage *imgNewWidth = [image scaledToWidth:200]; NSString *AK =@"mRX5pK-bCChgNMxeiC_VlRgSFLuz_WbLT3OyViuh";
NSString *SK = @"m8XQ8FjLiUY38pgDUzjHApdJ4YpgdlpmRT6FAwAg";
self.token = [self makeToken:AK secretKey:SK];
UIImage *imgNewWidth = [image scaledToWidth:200];
NSData *data = [imgNewWidth scaledToSpaceMaxSize:20]; NSData *data = [imgNewWidth scaledToSpaceMaxSize:20];
NSString *name; NSString *name;
......
ALand/Macro/UrlHeader.h
View file @ db21ec7f
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef UrlHeader_h #ifndef UrlHeader_h
#define UrlHeader_h #define UrlHeader_h
#define REST_BASE_URL @"http://service.bloem.cn:8080/aland-server/rest" #define REST_BASE_URL @"http://service.bloem.cn/aland-server/rest"
#define kDomain @"0001" //组织代码 #define kDomain @"0001" //组织代码
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment