Skip to content

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

修改bug

parent 041c3ee6
Show whitespace changes
Inline Side-by-side
Showing with 419 additions and 44 deletions
ALand.xcodeproj/project.pbxproj
View file @ 1c201bb3
......@@ -35,7 +35,6 @@
1912FCFD1CD08166004CF976 /* CommotityListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCFA1CD08166004CF976 /* CommotityListModel.m */; };
1912FD031CD0907D004CF976 /* MoreHotTagViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FD021CD0907D004CF976 /* MoreHotTagViewController.m */; };
1912FD061CD090A6004CF976 /* MoreHotBrandViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FD051CD090A6004CF976 /* MoreHotBrandViewController.m */; };
191383351CAB95F5005F6440 /* NoPaymentTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 191383341CAB95F5005F6440 /* NoPaymentTableViewController.m */; };
1913833A1CAB96D4005F6440 /* OrderTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 191383381CAB96D4005F6440 /* OrderTableViewCell.m */; };
1913833B1CAB96D4005F6440 /* OrderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 191383391CAB96D4005F6440 /* OrderTableViewCell.xib */; };
1913833D1CAB9DC2005F6440 /* OrderCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1913833C1CAB9DC2005F6440 /* OrderCellView.xib */; };
......@@ -330,6 +329,9 @@
19DCCBFB1C9AA2180072C3BF /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCBF81C9AA2180072C3BF /* UIAlertView+Blocks.m */; };
19DCCBFE1C9AA2A90072C3BF /* ICRDataBaseController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCBFD1C9AA2A90072C3BF /* ICRDataBaseController.m */; };
2729456D08033910EB3A7F89 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F32A640135BB4E1F47CB0E21 /* libPods.a */; };
8F59F0241D6D725500C9A564 /* NoPaymentTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F59F0231D6D725500C9A564 /* NoPaymentTableViewController.m */; };
8F8D99431D6706E50080ECC1 /* PayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8F8D99421D6706E50080ECC1 /* PayView.xib */; };
8F8D994B1D670F3B0080ECC1 /* PayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8D994A1D670F3B0080ECC1 /* PayView.m */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -400,8 +402,6 @@
1912FD021CD0907D004CF976 /* MoreHotTagViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoreHotTagViewController.m; sourceTree = "<group>"; };
1912FD041CD090A6004CF976 /* MoreHotBrandViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoreHotBrandViewController.h; sourceTree = "<group>"; };
1912FD051CD090A6004CF976 /* MoreHotBrandViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoreHotBrandViewController.m; sourceTree = "<group>"; };
191383331CAB95F5005F6440 /* NoPaymentTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NoPaymentTableViewController.h; path = ../NoPaymentTableViewController.h; sourceTree = "<group>"; };
191383341CAB95F5005F6440 /* NoPaymentTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NoPaymentTableViewController.m; path = ../NoPaymentTableViewController.m; sourceTree = "<group>"; };
191383371CAB96D4005F6440 /* OrderTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderTableViewCell.h; sourceTree = "<group>"; };
191383381CAB96D4005F6440 /* OrderTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderTableViewCell.m; sourceTree = "<group>"; };
191383391CAB96D4005F6440 /* OrderTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OrderTableViewCell.xib; sourceTree = "<group>"; };
......@@ -949,6 +949,11 @@
19DCCBF81C9AA2180072C3BF /* UIAlertView+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIAlertView+Blocks.m"; sourceTree = "<group>"; };
19DCCBFC1C9AA2A90072C3BF /* ICRDataBaseController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICRDataBaseController.h; sourceTree = "<group>"; };
19DCCBFD1C9AA2A90072C3BF /* ICRDataBaseController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRDataBaseController.m; sourceTree = "<group>"; };
8F59F0221D6D725500C9A564 /* NoPaymentTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoPaymentTableViewController.h; sourceTree = "<group>"; };
8F59F0231D6D725500C9A564 /* NoPaymentTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoPaymentTableViewController.m; sourceTree = "<group>"; };
8F8D99421D6706E50080ECC1 /* PayView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PayView.xib; sourceTree = "<group>"; };
8F8D99491D670F3B0080ECC1 /* PayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PayView.h; sourceTree = "<group>"; };
8F8D994A1D670F3B0080ECC1 /* PayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PayView.m; sourceTree = "<group>"; };
AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
C86730AE81FB01EAF9005535 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
F32A640135BB4E1F47CB0E21 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -1287,13 +1292,13 @@
1940D2E91C9A56730080678C /* ALand */ = {
isa = PBXGroup;
children = (
19DCCB7A1C9A9F0A0072C3BF /* Macro */,
19DCCB081C9A9EB30072C3BF /* IBTUtilites */,
19DC6B1B1CC0CEDD0064A9FD /* Third */,
19A1C83E1CA27403003E5DD9 /* Global */,
1929F16E1C9FCFA6000E9B26 /* Assets.xcassets */,
19DCCBE71C9AA1D50072C3BF /* UserUtil */,
19DCCB7E1C9AA0450072C3BF /* General */,
19DCCB7A1C9A9F0A0072C3BF /* Macro */,
1940D31A1C9A57400080678C /* Application */,
1940D3181C9A57070080678C /* BaseClass */,
1940D3191C9A57070080678C /* CodeClass */,
......@@ -1487,7 +1492,8 @@
1979754E1CAB6F4700407E3F /* Order（订单） */ = {
isa = PBXGroup;
children = (
199B4D651CABBCA700451E0E /* OrderViewcontrollerSubviews */,
8F59F0221D6D725500C9A564 /* NoPaymentTableViewController.h */,
8F59F0231D6D725500C9A564 /* NoPaymentTableViewController.m */,
1979754F1CAB6F5D00407E3F /* OrderViewController.h */,
197975501CAB6F5D00407E3F /* OrderViewController.m */,
199B4D661CABBCF600451E0E /* OrderDetailViewController.h */,
......@@ -1497,15 +1503,6 @@
path = Order;
sourceTree = "<group>";
};
199B4D651CABBCA700451E0E /* OrderViewcontrollerSubviews */ = {
isa = PBXGroup;
children = (
191383331CAB95F5005F6440 /* NoPaymentTableViewController.h */,
191383341CAB95F5005F6440 /* NoPaymentTableViewController.m */,
);
path = OrderViewcontrollerSubviews;
sourceTree = "<group>";
};
199B4D901CAE6F3500451E0E /* StoreManagerment（店铺管理） */ = {
isa = PBXGroup;
children = (
......@@ -1708,6 +1705,7 @@
19A1C83E1CA27403003E5DD9 /* Global */ = {
isa = PBXGroup;
children = (
8F8D99411D6706A50080ECC1 /* pay */,
192900691CD0A86500D226E7 /* ShareView */,
191AEE651CBCEB7B00F5E535 /* ModelsFiles */,
191AEE481CBCC6D100F5E535 /* RequestModels */,
......@@ -2278,6 +2276,16 @@
path = "../../UIAlertView-Blocks";
sourceTree = "<group>";
};
8F8D99411D6706A50080ECC1 /* pay */ = {
isa = PBXGroup;
children = (
8F8D99421D6706E50080ECC1 /* PayView.xib */,
8F8D99491D670F3B0080ECC1 /* PayView.h */,
8F8D994A1D670F3B0080ECC1 /* PayView.m */,
);
path = pay;
sourceTree = "<group>";
};
B32FA766BD69319D8C8FAB16 /* Frameworks */ = {
isa = PBXGroup;
children = (
......@@ -2394,6 +2402,7 @@
buildActionMask = 2147483647;
files = (
19632DA51CB350F80024A8A1 /* StoreQRCodeViewController.xib in Resources */,
8F8D99431D6706E50080ECC1 /* PayView.xib in Resources */,
199B4D871CAE43F800451E0E /* OrderDetailTableViewCell.xib in Resources */,
19ADD3871CA4E21100EE6E5A /* AddCommodityHeaderView.xib in Resources */,
19563C4C1CDAEA4500AFD0E0 /* MyBandBottomView.xib in Resources */,
......@@ -2663,6 +2672,7 @@
192118F31D41CE75000A56EA /* UserInfoBaseClass.m in Sources */,
190A465C1CE04265006037CB /* AgreementViewController.m in Sources */,
1912FCDA1CCDC955004CF976 /* JavenResellerModel.m in Sources */,
8F59F0241D6D725500C9A564 /* NoPaymentTableViewController.m in Sources */,
194CB5391CD8AA4A0050E59F /* JavenQNManager.m in Sources */,
191AEE5E1CBCC6D100F5E535 /* Conditions.m in Sources */,
19563C4A1CDAEA3800AFD0E0 /* MyBandBottomView.m in Sources */,
......@@ -2699,6 +2709,7 @@
19D906BB1CC87F3B00CD42DC /* OrderExpressTableViewCell.m in Sources */,
191AEE621CBCC6D100F5E535 /* Orders.m in Sources */,
195EB1DB1CA516CE00E298BB /* HotCommodityCell.m in Sources */,
8F8D994B1D670F3B0080ECC1 /* PayView.m in Sources */,
191AEE841CBCEE8C00F5E535 /* JavenHotTagsModel.m in Sources */,
19DCCB711C9A9EB30072C3BF /* IBTUILabel.m in Sources */,
19DCCB651C9A9EB30072C3BF /* IBTBadgeView.m in Sources */,
......@@ -2738,7 +2749,6 @@
19ADD38E1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m in Sources */,
1952C2F21CED95230017E4D6 /* OrderListFooterView.m in Sources */,
194FB0BE1CE2F8400089A3D5 /* JavenBankCards.m in Sources */,
191383351CAB95F5005F6440 /* NoPaymentTableViewController.m in Sources */,
19DCCB6B1C9A9EB30072C3BF /* IBTSegmentedControl.m in Sources */,
1912FCFD1CD08166004CF976 /* CommotityListModel.m in Sources */,
19ADD3841CA4D3C400EE6E5A /* AddCommodityCollectionViewCell.m in Sources */,
......@@ -2945,7 +2955,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.aland;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "58fbd91c-bd71-4896-9f69-a42d78c6dcd2";
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
......@@ -2975,7 +2985,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.aland;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "58fbd91c-bd71-4896-9f69-a42d78c6dcd2";
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
......
ALand/Application/AppDelegate.m
View file @ 1c201bb3
......@@ -15,6 +15,7 @@
#import "IQKeyboardManager.h"
#import "ZCUIBaseController.h"
#import "MobClick.h"
#import "Pingpp.h"
@interface AppDelegate ()
@end
......@@ -66,6 +67,21 @@
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}
- (BOOL)application:(UIApplication *)application
openURL:(NSURL *)url
sourceApplication:(NSString *)sourceApplication
annotation:(id)annotation {
BOOL canHandleURL = [Pingpp handleOpenURL:url withCompletion:nil];
return canHandleURL;
}
- (BOOL)application:(UIApplication *)app
openURL:(NSURL *)url
options:(NSDictionary *)options {
BOOL canHandleURL = [Pingpp handleOpenURL:url withCompletion:nil];
return canHandleURL;
}
- (void)applicationWillEnterForeground:(UIApplication *)application {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
}
......
ALand/Assets.xcassets/pingpp_alipay.imageset/Contents.json 0 → 100644
View file @ 1c201bb3
{
"images" : [
{
"idiom" : "universal",
"filename" : "pingpp_alipay.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ALand/Assets.xcassets/pingpp_wepay.imageset/Contents.json 0 → 100644
View file @ 1c201bb3
{
"images" : [
{
"idiom" : "universal",
"filename" : "pingpp_wepay.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/ViewController/HomeCollectionViewController.m
View file @ 1c201bb3
......@@ -113,7 +113,6 @@
- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath {
HomeCollectionFooterReusableView *footer = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionFooter withReuseIdentifier:@"footer" forIndexPath:indexPath];
return footer;
......
ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.m
View file @ 1c201bb3
......@@ -56,7 +56,7 @@
self.tableView.tableFooterView = self.bottomView;
//底部查看物流按钮
if ([self.orderType isEqualToString:@"待支付"]) {
if ([[self.model.state getOrderStateString] isEqualToString:@"待支付"]) {
SeeLogistics *viewBottom = [SeeLogistics viewWithNibName:@"SeeLogistics"];
[viewBottom.btn addTarget:self action:@selector(actionPay) forControlEvents:UIControlEventTouchUpInside];
viewBottom.frame = CGRectMake(0, kHeight - 64 - 65, kWidth, 64 + 65);
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.xib
View file @ 1c201bb3
<?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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<capability name="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
......@@ -441,7 +441,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Pg9-CX-6W2" customClass="CommodityManagementTopView">
<rect key="frame" x="0.0" y="149" width="375" height="120"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="btn_share_shop" translatesAutoresizingMaskIntoConstraints="NO" id="yIe-a5-tja">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="btn_share_shop" translatesAutoresizingMaskIntoConstraints="NO" id="yIe-a5-tja">
<rect key="frame" x="128" y="16" width="119" height="86"/>
<constraints>
<constraint firstAttribute="height" constant="86" id="Zet-JI-aB2"/>
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreNameViewController.xib
View file @ 1c201bb3
<?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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="StoreNameViewController">
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreQRCodeViewController.xib
View file @ 1c201bb3
<?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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="StoreQRCodeViewController">
......@@ -17,10 +17,10 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RFH-hd-LUV">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RFH-hd-LUV">
<rect key="frame" x="0.0" y="0.0" width="375" height="349"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="erweima_结果" translatesAutoresizingMaskIntoConstraints="NO" id="bLf-3W-zks">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="erweima_结果" translatesAutoresizingMaskIntoConstraints="NO" id="bLf-3W-zks">
<rect key="frame" x="50" y="50" width="275" height="249"/>
</imageView>
</subviews>
......
ALand/CodeClass/Home/ViewController/StoreManagerment/introductionViewController.xib
View file @ 1c201bb3
<?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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="introductionViewController">
......
ALand/CodeClass/Home/WebViewController.m
View file @ 1c201bb3
......@@ -8,10 +8,17 @@
#import "WebViewController.h"
#import <WebKit/WebKit.h>
#import <ifaddrs.h>
#import <arpa/inet.h>
#import "Pingpp.h"
#import "PayView.h"
#import "OrderViewController.h"
@interface WebViewController ()<WKNavigationDelegate, WKUIDelegate, WKScriptMessageHandler>
@property (nonatomic, weak) WKWebView * webView;
@property (nonatomic, weak) UIButton * backItem;
@property (nonatomic, weak) UIButton * closeItem;
@property (nonatomic, strong) PayView *payView;
@end
@implementation WebViewController
......@@ -58,7 +65,52 @@
/**
* body = 000100012016080100012;
*/
NSString *orderUuid = message.body;
NSString *billNumber = message.body;
NSDictionary *dic = billNumber.mj_keyValues;
self.payView = [PayView viewWithNibName:@"PayView"];
self.payView.ownerBillNumber = dic[@"body"];
WS(weakSelf);
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"订单提交成功" message:@"是否立即支付？\n如稍后支付，可在订单管理中继续支付" preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *yes = [UIAlertAction actionWithTitle:@"立即支付" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
[weakSelf.payView show];
}];
[alertVC addAction:yes];
UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"稍后支付" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[weakSelf.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.URL]]];
}];
[alertVC addAction:cancel];
[self.navigationController PresentModalViewController:alertVC animated:YES];
self.payView.completion = ^(NSString *result, PingppError *error) {
if (result) {
[weakSelf.payView hide];
NSString *info;
if ([result isEqualToString:@"cancel"]) {
info = @"支付未完成";
}else if ([result isEqualToString:@"success"]){
info = @"支付成功";
}else if ([result isEqualToString:@"fail"]){
info = @"支付失败";
}
UIAlertController *alert = [UIAlertController alertControllerWithTitle:info message:@"订单可在订单管理中查看" preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *toOrders = [UIAlertAction actionWithTitle:@"查看订单" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
OrderViewController *orderVC = [[OrderViewController alloc] init];
orderVC.isShowNavigationBar = YES;
[weakSelf.navigationController pushViewController:orderVC animated:YES];
}];
[alert addAction:toOrders];
UIAlertAction *continueBuy = [UIAlertAction actionWithTitle:@"继续购买" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[weakSelf.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:weakSelf.URL]]];
}];
[alert addAction:continueBuy];
[weakSelf.navigationController PresentModalViewController:alert animated:YES];
}
};
NSLog(@"%@", message.body);
}
}
......
ALand/CodeClass/MIne/ViewController/ChangeUserSignatureViewController.m
View file @ 1c201bb3
......@@ -17,7 +17,7 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.textViewTop.m_placeHolder = @"输入签名…";
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.
......
ALand/CodeClass/MIne/ViewController/ChangeUserSignatureViewController.xib
View file @ 1c201bb3
<?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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ChangeUserSignatureViewController">
......@@ -38,8 +38,8 @@
<constraint firstItem="CrZ-m0-0RR" firstAttribute="top" secondItem="Wcx-lp-EEk" secondAttribute="top" id="s5U-mq-SFw"/>
</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="glN-vA-Czn">
<rect key="frame" x="16" y="223" width="165" height="18"/>
<label 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"/>
......
ALand/CodeClass/MIne/ViewController/MineViewController.m
View file @ 1c201bb3
......@@ -90,7 +90,6 @@
[self.navigationController pushViewController:feedbackVC animated:YES];
}
//设置
- (IBAction)actionSetting:(id)sender {
SettingViewController *settingVC = [[SettingViewController alloc] init];
......
ALand/CodeClass/MIne/ViewController/SettingViewController.m
View file @ 1c201bb3
......@@ -108,7 +108,7 @@
{
ChangeUserSignatureViewController *changeSignatureVC = [[ChangeUserSignatureViewController alloc] init];
changeSignatureVC.isShowNavigationBar = YES;
changeSignatureVC.title = @"设置签名";
changeSignatureVC.title = @"个性签名";
changeSignatureVC.reseller = self.reseller;
[self PushViewController:changeSignatureVC animated:YES];
}
......
ALand/CodeClass/MIne/ViewController/SettingViewController.xib
View file @ 1c201bb3
<?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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SettingViewController">
......
ALand/Global/CoverShadowView.m
View file @ 1c201bb3
......@@ -54,6 +54,8 @@
WS(weakSelf)
[UIView animateWithDuration:0.2 animations:^{
weakSelf.alpha = 0;
}completion:^(BOOL finished) {
}];
}
......
ALand/Global/NavigationbarView.xib
View file @ 1c201bb3
<?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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
......
ALand/Global/ShareView/ShareContentView.xib
View file @ 1c201bb3
<?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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
......
ALand/Global/pay/PayView.h 0 → 100644
View file @ 1c201bb3
//
// PayView.h
// ALand
//
// Created by Javen on 16/8/19.
// Copyright © 2016年 Z. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "Pingpp.h"
@interface PayView : UIView
@property (nonatomic, copy) NSString *billUuid;
@property (nonatomic, copy) NSString *ownerBillNumber;
@property (nonatomic, copy) PingppCompletion completion;
- (void)show;
- (void)hide;
@end
ALand/Global/pay/PayView.m 0 → 100644
View file @ 1c201bb3
//
// PayView.m
// ALand
//
// Created by Javen on 16/8/19.
// Copyright © 2016年 Z. All rights reserved.
//
#import "PayView.h"
#import "CoverShadowView.h"
#import <ifaddrs.h>
#import <arpa/inet.h>
/**
* 目前仅支持微信和支付宝 = ['weixin', 'alipay', 'unionpay', 'applePay', 'pingplus', 'deposit'],
*/
static CGFloat const H = 100;
static NSString *const chanelWX = @"weixin";
static NSString *const chanelAlipay = @"alipay";
typedef NS_ENUM(NSInteger, payType) {
payTypeAlipay = 0,
payTypeWepay,
};
@interface PayView ()
@property (nonatomic, strong) CoverShadowView *cover;
@end
@implementation PayView
- (void)awakeFromNib {
}
- (void)hide
{
[self.cover hide];
[UIView animateWithDuration:0.3 animations:^{
self.frame = CGRectMake(0, kHeight, kWidth, H);
}];
}
- (void)show {
[self.cover show];
[UIView animateWithDuration:0.3 animations:^{
self.frame = CGRectMake(0, kHeight - H, kWidth, H);
}];
WS(weakSelf)
self.cover.tapAction = ^{
[weakSelf hide];
};
}
- (IBAction)payWithWX:(id)sender {
[self payWithChannel:chanelWX];
}
- (IBAction)payWithAlipay:(id)sender {
[self payWithChannel:chanelAlipay];
}
- (void)payWithChannel:(NSString *)chanel {
NSDictionary *params = @{@"operCtx" : [[UserInfo shareInstance] getOperCtx],
@"pingppReq" : @{@"billUuid": self.billUuid ? self.billUuid : [NSNull null] ,
@"ownerBillNumber" : self.ownerBillNumber ? self.ownerBillNumber : [NSNull null],
@"payMethod" : chanel,
@"clientIp" : [self getIPAddress],
@"alipayExtra" : [NSNull null],
@"wxpayExtra" : [NSNull null]}};
[[HTTPCilent shareCilent] POST:@"order/prepay" parameters:params success:^(NSURLSessionDataTask *task, id responseObject) {
NSString *charge = responseObject[@"pingppCharge"];
[Pingpp createPayment:charge appURLScheme:@"wxb7c76f3ffc6b6e5e" withCompletion:self.completion];
} failure:^(NSURLSessionDataTask *task, NSError *error) {
}];
}
- (NSString *)getIPAddress {
NSString *address = @"error";
struct ifaddrs *interfaces = NULL;
struct ifaddrs *temp_addr = NULL;
int success = 0;
// retrieve the current interfaces - returns 0 on success
success = getifaddrs(&interfaces);
if (success == 0) {
// Loop through linked list of interfaces
temp_addr = interfaces;
while(temp_addr != NULL) {
if(temp_addr->ifa_addr->sa_family == AF_INET) {
// Check if interface is en0 which is the wifi connection on the iPhone
if([[NSString stringWithUTF8String:temp_addr->ifa_name] isEqualToString:@"en0"]) {
// Get NSString from C String
address = [NSString stringWithUTF8String:inet_ntoa(((struct sockaddr_in *)temp_addr->ifa_addr)->sin_addr)];
}
}
temp_addr = temp_addr->ifa_next;
}
}
// Free memory
freeifaddrs(interfaces);
return address;
}
- (CoverShadowView *)cover
{
if (!_cover) {
_cover = [[CoverShadowView alloc] initOnTopWithHeight:kHeight];
[kWindow addSubview:_cover];
self.top = kHeight;
[kWindow addSubview:self];
}
return _cover;
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
ALand/Global/pay/PayView.xib 0 → 100644
View file @ 1c201bb3
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="PayView">
<rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YBD-X8-xoO">
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QR4-Pc-gWC">
<rect key="frame" x="0.0" y="49" width="375" height="1"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="waN-Wr-CKo"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MWK-hV-3Wc">
<rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
<inset key="titleEdgeInsets" minX="30" minY="0.0" maxX="0.0" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="30" maxY="0.0"/>
<state key="normal" title="支付宝" image="pingpp_alipay">
<color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="payWithAlipay:" destination="iN0-l3-epB" eventType="touchUpInside" id="zTv-4E-qvE"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="QR4-Pc-gWC" firstAttribute="top" secondItem="MWK-hV-3Wc" secondAttribute="bottom" id="1kV-WQ-9M4"/>
<constraint firstItem="MWK-hV-3Wc" firstAttribute="leading" secondItem="YBD-X8-xoO" secondAttribute="leading" id="4cz-y6-ieN"/>
<constraint firstItem="QR4-Pc-gWC" firstAttribute="leading" secondItem="YBD-X8-xoO" secondAttribute="leading" id="684-cp-5V4"/>
<constraint firstAttribute="bottom" secondItem="QR4-Pc-gWC" secondAttribute="bottom" id="BiJ-hh-Rlp"/>
<constraint firstAttribute="height" constant="50" id="Dcb-6A-9rB"/>
<constraint firstItem="MWK-hV-3Wc" firstAttribute="top" secondItem="YBD-X8-xoO" secondAttribute="top" id="iuc-t0-117"/>
<constraint firstAttribute="trailing" secondItem="QR4-Pc-gWC" secondAttribute="trailing" id="kLb-g6-Knj"/>
<constraint firstAttribute="trailing" secondItem="MWK-hV-3Wc" secondAttribute="trailing" id="nZK-SX-VvI"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3s7-wp-kL8">
<rect key="frame" x="0.0" y="50" width="375" height="50"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="X2o-9b-WwM">
<rect key="frame" x="0.0" y="49" width="375" height="1"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ZUp-N0-82K"/>
</constraints>
</view>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="k9F-6d-7hC">
<rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
<inset key="titleEdgeInsets" minX="30" minY="0.0" maxX="0.0" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="30" maxY="0.0"/>
<state key="normal" title=" 微信 " image="pingpp_wepay">
<color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="payWithWX:" destination="iN0-l3-epB" eventType="touchUpInside" id="1rO-nw-5Fh"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="7Eb-Ni-h3i"/>
<constraint firstAttribute="trailing" secondItem="k9F-6d-7hC" secondAttribute="trailing" id="Cwc-MG-kvO"/>
<constraint firstItem="k9F-6d-7hC" firstAttribute="leading" secondItem="3s7-wp-kL8" secondAttribute="leading" id="Nuy-hQ-rvB"/>
<constraint firstItem="k9F-6d-7hC" firstAttribute="top" secondItem="3s7-wp-kL8" secondAttribute="top" id="eqQ-rU-v2R"/>
<constraint firstAttribute="bottom" secondItem="X2o-9b-WwM" secondAttribute="bottom" id="hHe-Jf-AAp"/>
<constraint firstItem="X2o-9b-WwM" firstAttribute="top" secondItem="k9F-6d-7hC" secondAttribute="bottom" id="osd-vq-USC"/>
<constraint firstAttribute="trailing" secondItem="X2o-9b-WwM" secondAttribute="trailing" id="sU7-so-YS5"/>
<constraint firstItem="X2o-9b-WwM" firstAttribute="leading" secondItem="3s7-wp-kL8" secondAttribute="leading" id="uos-ZA-0le"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="YBD-X8-xoO" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="9hY-kZ-36m"/>
<constraint firstAttribute="trailing" secondItem="YBD-X8-xoO" secondAttribute="trailing" id="DGd-wm-a2a"/>
<constraint firstAttribute="trailing" secondItem="3s7-wp-kL8" secondAttribute="trailing" id="HAR-vz-WGj"/>
<constraint firstItem="3s7-wp-kL8" firstAttribute="top" secondItem="YBD-X8-xoO" secondAttribute="bottom" id="L78-Zc-hDn"/>
<constraint firstItem="YBD-X8-xoO" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Lea-z9-8i7"/>
<constraint firstItem="3s7-wp-kL8" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="XSJ-af-gWs"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="248.5" y="308"/>
</view>
</objects>
<resources>
<image name="pingpp_alipay" width="34" height="34"/>
<image name="pingpp_wepay" width="36" height="30"/>
</resources>
</document>
ALand/Info.plist
View file @ 1c201bb3
......@@ -32,6 +32,14 @@
<string>tencent100424468</string>
</array>
</dict>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>wxb7c76f3ffc6b6e5e</string>
</array>
</dict>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
......
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