Skip to content

H
HDMall-iOS
Commit 5572cc93 authored by Sandy's avatar Sandy
Browse files
Options

bug fix

parent bc1e4887
Show whitespace changes
Inline Side-by-side
Showing with 600 additions and 48 deletions
HDMall.xcodeproj/project.pbxproj
View file @ 5572cc93
......@@ -81,6 +81,7 @@
8F973C271F21FD54003D3ADB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F973BF01F21F6DD003D3ADB /* Main.storyboard */; };
8F973C321F21FE32003D3ADB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F973C2F1F21FE32003D3ADB /* AppDelegate.m */; };
8F973C341F21FE32003D3ADB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F973C301F21FE32003D3ADB /* main.m */; };
8FED0FB41F38602F004916CC /* AboutTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED0FB31F38602F004916CC /* AboutTableViewController.m */; };
8FEF5E641F285E56001496E3 /* CALayer+Addtions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FEF5E481F285E56001496E3 /* CALayer+Addtions.m */; };
8FEF5E661F285E56001496E3 /* ChineseLogHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FEF5E4A1F285E56001496E3 /* ChineseLogHelper.m */; };
8FEF5E6A1F285E56001496E3 /* MBProgressHUD+Addtions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FEF5E4E1F285E56001496E3 /* MBProgressHUD+Addtions.m */; };
......@@ -266,6 +267,8 @@
8F973C2E1F21FE32003D3ADB /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
8F973C2F1F21FE32003D3ADB /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
8F973C301F21FE32003D3ADB /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
8FED0FB21F38602F004916CC /* AboutTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutTableViewController.h; sourceTree = "<group>"; };
8FED0FB31F38602F004916CC /* AboutTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutTableViewController.m; sourceTree = "<group>"; };
8FEF5E471F285E56001496E3 /* CALayer+Addtions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CALayer+Addtions.h"; sourceTree = "<group>"; };
8FEF5E481F285E56001496E3 /* CALayer+Addtions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CALayer+Addtions.m"; sourceTree = "<group>"; };
8FEF5E491F285E56001496E3 /* ChineseLogHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChineseLogHelper.h; sourceTree = "<group>"; };
......@@ -929,6 +932,8 @@
8F973C171F21FB77003D3ADB /* ViewControllers */ = {
isa = PBXGroup;
children = (
8FED0FB21F38602F004916CC /* AboutTableViewController.h */,
8FED0FB31F38602F004916CC /* AboutTableViewController.m */,
8F1040B61F25C8A000B4C16E /* MineTableViewController.h */,
8F1040B71F25C8A000B4C16E /* MineTableViewController.m */,
);
......@@ -1231,6 +1236,7 @@
8F4BFCD31F2EF543003EA16B /* SaleInputListViewController.m in Sources */,
8F250D311F297DA80031B4BC /* XWCircleSpreadAnimator.m in Sources */,
8F1040C71F25CA1800B4C16E /* BusinessCollectionViewController.m in Sources */,
8FED0FB41F38602F004916CC /* AboutTableViewController.m in Sources */,
8F250D411F297DA80031B4BC /* XWCoolAnimator.m in Sources */,
8F4BFCE21F2F02CB003EA16B /* SaleInputTopView.m in Sources */,
8FEF5E721F285E56001496E3 /* NSString+Additions.m in Sources */,
......@@ -1420,9 +1426,9 @@
"$(inherited)",
);
INFOPLIST_FILE = "$(SRCROOT)/HDMall/HDMall_TEST.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomoretech.HDMall.zj;
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.hdmall;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "\"${PODS_ROOT}/**";
};
......@@ -1441,9 +1447,9 @@
"$(inherited)",
);
INFOPLIST_FILE = "$(SRCROOT)/HDMall/HDMall_TEST.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomoretech.HDMall.zj;
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.hdmall;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "\"${PODS_ROOT}/**";
};
......
HDMall/Base.lproj/Main.storyboard
View file @ 5572cc93
......@@ -7,6 +7,7 @@
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
......@@ -188,7 +189,7 @@
<scene sceneID="Bw6-UP-TFt">
<objects>
<collectionViewController id="fbF-Q7-lha" customClass="BusinessCollectionViewController" sceneMemberID="viewController">
<collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="9cJ-BI-aDH">
<collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" dataMode="prototypes" id="9cJ-BI-aDH">
<rect key="frame" x="0.0" y="64" width="375" height="603"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.96030700209999997" green="0.95052659510000004" blue="0.95075631140000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -436,6 +437,9 @@
</label>
</subviews>
</tableViewCellContentView>
<connections>
<segue destination="w1O-ec-rNW" kind="push" id="5Du-AE-J1e"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="XOq-Zt-2iE" style="IBUITableViewCellStyleDefault" id="TdA-qB-XCP">
<rect key="frame" x="0.0" y="236" width="375" height="44"/>
......@@ -709,9 +713,324 @@
</objects>
<point key="canvasLocation" x="-20" y="-421"/>
</scene>
<!--修改密码-->
<scene sceneID="jMm-r8-RZg">
<objects>
<tableViewController storyboardIdentifier="ChagePWDTableViewController" hidesBottomBarWhenPushed="YES" id="Nh5-oM-fGN" customClass="ChagePWDTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="ig3-Kr-BJ2">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.95564913750000002" green="0.95562052730000002" blue="0.95563679930000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<view key="tableFooterView" contentMode="scaleToFill" id="VnX-FN-bB7">
<rect key="frame" x="0.0" y="261" width="375" height="216"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="38N-UD-YUN">
<rect key="frame" x="16" y="80" width="343" height="50"/>
<color key="backgroundColor" red="0.87514257429999998" green="0.076527714730000002" blue="0.16509020329999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="ed9-9D-6cx"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<state key="normal" title="确认修改">
<color key="titleColor" red="1" green="0.99997437" blue="0.99999129769999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="disabled" backgroundImage="login_button_disable_bg">
<color key="titleColor" red="0.40657809379999998" green="0.4065659344" blue="0.40657281880000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="highlighted" backgroundImage="login_button_disable_bg">
<color key="titleColor" red="0.40657809379999998" green="0.4065659344" blue="0.40657281880000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="focused" backgroundImage="login_button_disable_bg"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="5"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="actionSubmit:" destination="Nh5-oM-fGN" eventType="touchUpInside" id="LXX-Fx-KQf"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="38N-UD-YUN" secondAttribute="trailing" constant="16" id="dej-jF-Mg5"/>
<constraint firstItem="38N-UD-YUN" firstAttribute="leading" secondItem="VnX-FN-bB7" secondAttribute="leading" constant="16" id="w6V-Ti-sIv"/>
<constraint firstItem="38N-UD-YUN" firstAttribute="top" secondItem="VnX-FN-bB7" secondAttribute="top" constant="80" id="xTS-IP-hcB"/>
</constraints>
</view>
<sections>
<tableViewSection id="1Lr-xo-cg1">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="87" id="EXB-x4-mjV">
<rect key="frame" x="0.0" y="0.0" width="375" height="87"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EXB-x4-mjV" id="lGT-JW-Gx7">
<rect key="frame" x="0.0" y="0.0" width="375" height="86.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="E5D-2f-D8K">
<rect key="frame" x="0.0" y="0.0" width="375" height="36"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="当前密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VPd-e5-dLQ">
<rect key="frame" x="16" y="8" width="69.5" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.26379796859999999" green="0.26379007100000001" blue="0.2637945116" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.96055269239999996" green="0.96052390340000005" blue="0.96054017540000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="VPd-e5-dLQ" firstAttribute="centerY" secondItem="E5D-2f-D8K" secondAttribute="centerY" id="IeN-SU-7hs"/>
<constraint firstAttribute="height" constant="36" id="Z1e-Iu-bKu"/>
<constraint firstItem="VPd-e5-dLQ" firstAttribute="leading" secondItem="E5D-2f-D8K" secondAttribute="leading" constant="16" id="ipi-6O-Rzz"/>
</constraints>
</view>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="JlD-e1-E8r">
<rect key="frame" x="16" y="36" width="343" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<constraints>
<constraint firstItem="E5D-2f-D8K" firstAttribute="leading" secondItem="lGT-JW-Gx7" secondAttribute="leading" id="8Nb-oo-UJo"/>
<constraint firstItem="E5D-2f-D8K" firstAttribute="top" secondItem="lGT-JW-Gx7" secondAttribute="top" id="CHZ-ah-AtD"/>
<constraint firstAttribute="trailing" secondItem="E5D-2f-D8K" secondAttribute="trailing" id="Cv8-d3-1XB"/>
<constraint firstAttribute="bottom" secondItem="JlD-e1-E8r" secondAttribute="bottom" id="RKm-bp-Hbj"/>
<constraint firstItem="JlD-e1-E8r" firstAttribute="top" secondItem="E5D-2f-D8K" secondAttribute="bottom" id="ZcE-dm-iln"/>
<constraint firstAttribute="trailing" secondItem="JlD-e1-E8r" secondAttribute="trailing" constant="16" id="d8Q-Gg-JXQ"/>
<constraint firstItem="JlD-e1-E8r" firstAttribute="leading" secondItem="lGT-JW-Gx7" secondAttribute="leading" constant="16" id="xr0-oD-MCi"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="87" id="IIf-mt-oxt">
<rect key="frame" x="0.0" y="87" width="375" height="87"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="IIf-mt-oxt" id="tUh-oU-FeG">
<rect key="frame" x="0.0" y="0.0" width="375" height="86.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jE1-hI-b9y">
<rect key="frame" x="0.0" y="0.0" width="375" height="36"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l07-Kr-TmB">
<rect key="frame" x="16" y="8" width="52" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.26379796859999999" green="0.26379007100000001" blue="0.2637945116" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.96055269239999996" green="0.96052390340000005" blue="0.96054017540000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="l07-Kr-TmB" firstAttribute="leading" secondItem="jE1-hI-b9y" secondAttribute="leading" constant="16" id="9dH-ye-Zch"/>
<constraint firstItem="l07-Kr-TmB" firstAttribute="centerY" secondItem="jE1-hI-b9y" secondAttribute="centerY" id="iKz-9E-WpD"/>
<constraint firstAttribute="height" constant="36" id="m1A-iY-NJr"/>
</constraints>
</view>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iXT-B1-whe">
<rect key="frame" x="16" y="36" width="343" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<constraints>
<constraint firstItem="iXT-B1-whe" firstAttribute="leading" secondItem="tUh-oU-FeG" secondAttribute="leading" constant="16" id="0UZ-gQ-eOg"/>
<constraint firstAttribute="bottom" secondItem="iXT-B1-whe" secondAttribute="bottom" id="5mk-os-jXV"/>
<constraint firstAttribute="trailing" secondItem="iXT-B1-whe" secondAttribute="trailing" constant="16" id="Fc2-W9-Kii"/>
<constraint firstItem="jE1-hI-b9y" firstAttribute="top" secondItem="tUh-oU-FeG" secondAttribute="top" id="Gwg-9R-6F0"/>
<constraint firstItem="jE1-hI-b9y" firstAttribute="leading" secondItem="tUh-oU-FeG" secondAttribute="leading" id="XHY-gc-8cq"/>
<constraint firstAttribute="trailing" secondItem="jE1-hI-b9y" secondAttribute="trailing" id="iPL-et-zdK"/>
<constraint firstItem="iXT-B1-whe" firstAttribute="top" secondItem="jE1-hI-b9y" secondAttribute="bottom" id="nGX-L0-YDd"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="87" id="bjx-6N-n9L">
<rect key="frame" x="0.0" y="174" width="375" height="87"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bjx-6N-n9L" id="FSB-ED-AuH">
<rect key="frame" x="0.0" y="0.0" width="375" height="86.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BjR-IA-QDJ">
<rect key="frame" x="0.0" y="0.0" width="375" height="36"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认新密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QsN-gb-l0r">
<rect key="frame" x="16" y="8" width="87" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.26379796859999999" green="0.26379007100000001" blue="0.2637945116" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.96055269239999996" green="0.96052390340000005" blue="0.96054017540000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="QsN-gb-l0r" firstAttribute="centerY" secondItem="BjR-IA-QDJ" secondAttribute="centerY" id="12y-Db-vAc"/>
<constraint firstAttribute="height" constant="36" id="3ve-7B-2pK"/>
<constraint firstItem="QsN-gb-l0r" firstAttribute="leading" secondItem="BjR-IA-QDJ" secondAttribute="leading" constant="16" id="kAD-gX-WWZ"/>
</constraints>
</view>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="osv-YB-4pr">
<rect key="frame" x="16" y="36" width="343" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<constraints>
<constraint firstItem="osv-YB-4pr" firstAttribute="leading" secondItem="FSB-ED-AuH" secondAttribute="leading" constant="16" id="2GG-El-rPf"/>
<constraint firstAttribute="trailing" secondItem="osv-YB-4pr" secondAttribute="trailing" constant="16" id="2mO-ef-ZTB"/>
<constraint firstAttribute="trailing" secondItem="BjR-IA-QDJ" secondAttribute="trailing" id="LIH-93-NV5"/>
<constraint firstItem="BjR-IA-QDJ" firstAttribute="top" secondItem="FSB-ED-AuH" secondAttribute="top" id="MU3-eL-bTw"/>
<constraint firstItem="BjR-IA-QDJ" firstAttribute="leading" secondItem="FSB-ED-AuH" secondAttribute="leading" id="eSE-M3-0GP"/>
<constraint firstItem="osv-YB-4pr" firstAttribute="top" secondItem="BjR-IA-QDJ" secondAttribute="bottom" id="xdr-SN-mqn"/>
<constraint firstAttribute="bottom" secondItem="osv-YB-4pr" secondAttribute="bottom" id="zQQ-r8-iVK"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
</cells>
</tableViewSection>
</sections>
<connections>
<outlet property="dataSource" destination="Nh5-oM-fGN" id="RRB-Mi-4LR"/>
<outlet property="delegate" destination="Nh5-oM-fGN" id="b9n-YA-FmI"/>
</connections>
</tableView>
<navigationItem key="navigationItem" title="修改密码" id="vMB-UK-0An"/>
<connections>
<outlet property="textFieldConfirmPWD" destination="osv-YB-4pr" id="RsO-f1-US5"/>
<outlet property="textFieldNewPWD" destination="iXT-B1-whe" id="hnI-Jf-0iI"/>
<outlet property="textFieldOldPWD" destination="JlD-e1-E8r" id="GgK-0g-Nqh"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="7Vf-dQ-QxX" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1081" y="2409"/>
</scene>
<!--关于我们-->
<scene sceneID="LNZ-lY-zHZ">
<objects>
<tableViewController storyboardIdentifier="AboutTableViewController" hidesBottomBarWhenPushed="YES" id="w1O-ec-rNW" customClass="AboutTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="6EY-6l-g5D">
<rect key="frame" x="0.0" y="64" width="375" height="603"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.95564913750000002" green="0.95562052730000002" blue="0.95563679930000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<view key="tableHeaderView" contentMode="scaleToFill" id="oPB-5F-k5g">
<rect key="frame" x="0.0" y="0.0" width="375" height="155"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="tyb-8Q-fWn">
<rect key="frame" x="148" y="23" width="80" height="80"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="Jab-Ga-nc4"/>
<constraint firstAttribute="height" constant="80" id="kn9-Zk-goi"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="20"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="商地移动平台" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WoS-Vj-Bg0">
<rect key="frame" x="0.0" y="116" width="375" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.023130035029999999" green="0.26133602859999999" blue="0.81017971040000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="WoS-Vj-Bg0" firstAttribute="leading" secondItem="oPB-5F-k5g" secondAttribute="leading" id="csw-qo-wqe"/>
<constraint firstAttribute="trailing" secondItem="WoS-Vj-Bg0" secondAttribute="trailing" id="jXV-Pd-6tt"/>
<constraint firstItem="tyb-8Q-fWn" firstAttribute="centerX" secondItem="oPB-5F-k5g" secondAttribute="centerX" id="jae-2W-nW0"/>
<constraint firstItem="tyb-8Q-fWn" firstAttribute="top" secondItem="oPB-5F-k5g" secondAttribute="top" constant="23" id="kwV-Al-zmn"/>
<constraint firstItem="WoS-Vj-Bg0" firstAttribute="top" secondItem="tyb-8Q-fWn" secondAttribute="bottom" constant="13" id="vl2-LT-n73"/>
</constraints>
</view>
<view key="tableFooterView" contentMode="scaleToFill" id="DrT-Lj-Dwo">
<rect key="frame" x="0.0" y="243" width="375" height="184"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.67807614800000005" green="0.67805588250000004" blue="0.67806732650000001" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<sections>
<tableViewSection id="CK5-5F-hBS">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="mhv-xE-R1h">
<rect key="frame" x="0.0" y="155" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mhv-xE-R1h" id="BLh-pJ-hqz">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="版本" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KxN-SB-jJc">
<rect key="frame" x="16" y="11" width="35" height="21"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r62-tR-U5L">
<rect key="frame" x="317" y="11" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.26379796859999999" green="0.26379007100000001" blue="0.2637945116" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="r62-tR-U5L" firstAttribute="centerY" secondItem="BLh-pJ-hqz" secondAttribute="centerY" id="AOC-2f-ZCC"/>
<constraint firstAttribute="trailingMargin" secondItem="r62-tR-U5L" secondAttribute="trailing" constant="8" id="EoL-7K-oF7"/>
<constraint firstItem="KxN-SB-jJc" firstAttribute="centerY" secondItem="BLh-pJ-hqz" secondAttribute="centerY" id="IQq-S1-BL8"/>
<constraint firstItem="KxN-SB-jJc" firstAttribute="leading" secondItem="BLh-pJ-hqz" secondAttribute="leadingMargin" constant="8" id="LCz-FK-ouO"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="VUb-Hc-Q8a">
<rect key="frame" x="0.0" y="199" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VUb-Hc-Q8a" id="Vha-dj-koK">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系电话" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ePG-uT-pIo">
<rect key="frame" x="16" y="11" width="70" height="21"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oOb-Hr-HY0">
<rect key="frame" x="317" y="11" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.26379796859999999" green="0.26379007100000001" blue="0.2637945116" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="ePG-uT-pIo" firstAttribute="leading" secondItem="Vha-dj-koK" secondAttribute="leadingMargin" constant="8" id="4I9-Kv-7gC"/>
<constraint firstItem="ePG-uT-pIo" firstAttribute="centerY" secondItem="Vha-dj-koK" secondAttribute="centerY" id="C1x-1N-dPl"/>
<constraint firstAttribute="trailingMargin" secondItem="oOb-Hr-HY0" secondAttribute="trailing" constant="8" id="CKB-aT-A80"/>
<constraint firstItem="oOb-Hr-HY0" firstAttribute="centerY" secondItem="Vha-dj-koK" secondAttribute="centerY" id="gaG-mN-wZ6"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
</cells>
</tableViewSection>
</sections>
<connections>
<outlet property="dataSource" destination="w1O-ec-rNW" id="NSv-fA-f09"/>
<outlet property="delegate" destination="w1O-ec-rNW" id="lwX-Ge-WFP"/>
</connections>
</tableView>
<navigationItem key="navigationItem" title="关于我们" id="G8h-rR-kzr"/>
<connections>
<outlet property="imgTop" destination="tyb-8Q-fWn" id="WpG-yc-APi"/>
<outlet property="labelAppName" destination="WoS-Vj-Bg0" id="Iei-Kb-d1Y"/>
<outlet property="labelMobile" destination="oOb-Hr-HY0" id="YO7-NF-dPd"/>
<outlet property="labelVersion" destination="r62-tR-U5L" id="EGl-SR-ls5"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="N6j-lW-mag" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1100" y="1998"/>
</scene>
</scenes>
<resources>
<image name="SystemImage" width="16" height="16"/>
<image name="SystemImage" width="320" height="147"/>
<image name="business" width="25" height="39"/>
<image name="business_checked" width="25" height="38"/>
<image name="business_header_bg" width="86" height="25"/>
......
HDMall/CodeClass/Business/SaleInput/SaleInput.storyboard
View file @ 5572cc93
......@@ -301,7 +301,7 @@
<constraint firstAttribute="width" constant="10" id="lkK-6z-8HF"/>
</constraints>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NOi-wj-KWg">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NOi-wj-KWg" customClass="DatePickerTextField">
<rect key="frame" x="114" y="0.0" width="237" height="40"/>
<color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="1" green="0.9999405146" blue="0.99998033050000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -829,7 +829,7 @@
<constraint firstAttribute="width" constant="10" id="vXO-2s-MFG"/>
</constraints>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wjM-gK-Lex">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wjM-gK-Lex" customClass="DatePickerTextField">
<rect key="frame" x="114" y="0.0" width="237" height="40"/>
<color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="1" green="0.9999405146" blue="0.99998033050000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
HDMall/CodeClass/Business/SaleInput/ViewControllers/SaleInputAddViewController.h
View file @ 5572cc93
......@@ -21,4 +21,7 @@
@property (weak, nonatomic) IBOutlet UIButton *btnBottom;
@property (strong, nonatomic) SaleInputViewModel *viewModel;
@property (weak, nonatomic) IBOutlet SaleInputTopView *topView;
- (void)httpPayments;
- (void)allInputMoney;
@end
HDMall/CodeClass/Business/SaleInput/ViewControllers/SaleInputAddViewController.m
View file @ 5572cc93
......@@ -21,10 +21,7 @@
UIBarButtonItem *rightBtn = [[UIBarButtonItem alloc] initWithTitle:@"历史查询" style:UIBarButtonItemStylePlain target:self action:@selector(actionGoHistory)];
self.navigationItem.rightBarButtonItem = rightBtn;
WS(weakSelf);
[self.viewModel httpAllPayments:^(BOOL isSuccess) {
[weakSelf.tableView reloadData];
}];
[self httpPayments];
}
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
......@@ -95,7 +92,11 @@
}
- (void)httpPayments {
WS(weakSelf);
[self.viewModel httpAllPayments:^(BOOL isSuccess) {
[weakSelf.tableView reloadData];
[weakSelf.topView httpToDayData];
}];
}
#pragma mark - actions
......@@ -104,11 +105,17 @@
self.viewModel.request.saleCount = @(self.totalView.textFieldBillCount.text.integerValue);
self.viewModel.request.contract = self.topView.contract;
WS(weakSelf);
[self.viewModel httpSubmit:^(BOOL isSuccess) {
//赋值
kCanNotBeNil(self.viewModel.request.contract, @"请选择合同");
[self alertTitle:@"温馨提示" msg:@"确认提交？" okAction:^(UIAlertAction * _Nullable action) {
[weakSelf.viewModel httpSubmit:^(BOOL isSuccess) {
if (isSuccess) {
[weakSelf.navigationController popViewControllerAnimated:YES];
}
}];
} cancelAction:nil];
}
/**
......
HDMall/CodeClass/Business/SaleInput/ViewControllers/SaleInputDetailViewController.m
View file @ 5572cc93
......@@ -36,10 +36,16 @@
self.totalView.textFieldBillCount.text = self.viewModel.detail.saleCount.stringValue;
[self.topView.btnStore setTitle:self.viewModel.detail.contract.name forState:UIControlStateNormal];
self.topView.textFieldDate.text = [self.viewModel.detail.saleDate substringToIndex:11];
self.topView.textFieldDate.text = self.viewModel.detail.saleDate;
[self allInputMoney];
[self.topView httpToDayData];
[self.tableView reloadData];
}
- (void)httpPayments {
CLog(@"空实现父类httpPayments方法");
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
......
HDMall/CodeClass/Business/SaleInput/ViewModels/SaleInputViewModel.h
View file @ 5572cc93
......@@ -32,8 +32,6 @@ typedef NS_ENUM(NSInteger, SaleInputType) {
*/
- (void)httpAllPayments:(blockCallBack)callBack;
- (void)httpUpload;
- (void)httpSubmit:(blockCallBack)callBack;
- (void)httpDetailWithUuid:(NSString *)uuid callBack:(blockCallBack)callBack;
......
HDMall/CodeClass/Business/SaleInput/ViewModels/SaleInputViewModel.m
View file @ 5572cc93
......@@ -37,12 +37,8 @@
}
- (void)httpSubmit:(blockCallBack)callBack {
//赋值
kCanNotBeNil(self.request.contract, @"请选择合同");
self.request.oper = AppGlobal.user.code;
self.request.store = [HMSaleInputDetail_store modelWithDic:AppGlobal.user.store.toDictionary];
// self.request.tenant = [HMSaleInputDetail_tenant modelWithDic:AppGlobal.user.tenant.toDictionary];
self.request.receiver = @"contract";
self.request.balance = false;
self.request.saleDate = [[NSDate date] yearMonthDayString];
......@@ -88,7 +84,18 @@
[ZJHttpManager GET:url parameters:nil complete:^(id responseObject, NSError *error) {
if (kIsResponse) {
self.detail = [HMSaleInputDetail modelWithDic:responseObject[@"data"]];
//支付方式列表
self.arrPayments = self.detail.payments;
//附件列表
[self.picVM.arrPics removeAllObjects];
for (NSString *name in self.detail.mediaFiles) {
NSString *url = [NSString stringWithFormat:@"%@/hdmall/media/download?moduleName=sale&num=%@&fileName=%@",REST_BASE_URL, self.detail.billNumber, name];
ZJBaseFileModel *file = [ZJBaseFileModel new];
file.fileUrl = url;
[self.picVM.arrPics addObject:file];
}
callBack(true);
}else{
callBack(false);
......
HDMall/CodeClass/Business/SaleInput/Views/SaleInputTopView.h
View file @ 5572cc93
......@@ -7,12 +7,13 @@
//
#import <UIKit/UIKit.h>
#import "DatePickerTextField.h"
#import "HMSaleInputDetail.h"
@interface SaleInputTopView : UIView
/** 选择商铺 */
@property (weak, nonatomic) IBOutlet UIButton *btnStore;
/** 销售日期 */
@property (weak, nonatomic) IBOutlet UITextField *textFieldDate;
@property (weak, nonatomic) IBOutlet DatePickerTextField *textFieldDate;
/** 今日累计 */
@property (weak, nonatomic) IBOutlet UILabel *labelTodayTotal;
//两个三角
......@@ -20,4 +21,6 @@
@property (weak, nonatomic) IBOutlet UIImageView *right2;
@property (strong, nonatomic) HMSaleInputDetail_contract *contract;
@property (nonatomic, copy) void (^blockDidChooseDate)(void);
- (void)httpToDayData;
@end
HDMall/CodeClass/Business/SaleInput/Views/SaleInputTopView.m
View file @ 5572cc93
......@@ -7,29 +7,26 @@
//
#import "SaleInputTopView.h"
#import "CalculateHelper.h"
@interface SaleInputTopView ()<UITextFieldDelegate>
@property (strong, nonatomic) UIDatePicker *datePicker;
@end
@implementation SaleInputTopView
- (void)awakeFromNib {
[super awakeFromNib];
// if (kUser.isTenant) {
// self.btnStore.userInteractionEnabled = NO;
// self.right1.hidden = YES;
// }
self.datePicker = [[UIDatePicker alloc] initWithFrame:CGRectMake(0, 0, kWidth, 216)];
self.datePicker.maximumDate = [NSDate date];
self.textFieldDate.inputView = self.datePicker;
self.textFieldDate.delegate = self;
self.datePicker.datePickerMode = UIDatePickerModeDate;
self.textFieldDate.text = [self.datePicker.date yearMonthDayString];
}
- (void)textFieldDidEndEditing:(UITextField *)textField {
self.textFieldDate.text = [self.datePicker.date yearMonthDayString];
self.blockDidChooseDate();
if (!AppGlobal.isMall) {
self.btnStore.userInteractionEnabled = NO;
self.right1.hidden = YES;
UserInfo_contracts *contract = AppGlobal.user.contracts[0];
self.contract = [HMSaleInputDetail_contract modelWithDic:contract.toDictionary];
[self.btnStore setTitle:contract.name forState:UIControlStateNormal];
}
self.textFieldDate.type = DateTextFieldYearMonthDay;
self.textFieldDate.rangeType = DateTextFieldRangeBefore;
WS(weakSelf);
self.textFieldDate.blockEndEdit = ^{
[weakSelf httpToDayData];
};
}
- (IBAction)actionContract:(id)sender {
......@@ -37,6 +34,7 @@
UserInfo_contracts *contract = AppGlobal.user.contracts[0];
self.contract = [HMSaleInputDetail_contract modelWithDic:contract.toDictionary];
[self.btnStore setTitle:contract.name forState:UIControlStateNormal];
[self httpToDayData];
}else{
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"选择合同" message:nil preferredStyle:(UIAlertControllerStyleAlert)];
......@@ -44,6 +42,7 @@
UIAlertAction *action = [UIAlertAction actionWithTitle:contract.name style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
self.contract = [HMSaleInputDetail_contract modelWithDic:contract.toDictionary];
[self.btnStore setTitle:contract.name forState:UIControlStateNormal];
[self httpToDayData];
}];
[alert addAction:action];
}
......@@ -55,5 +54,31 @@
}
}
/**
* 获取今日的销售录入数据
*/
- (void)httpToDayData {
kCanNotBeNil(self.contract.uuid, @"请选择合同！");
NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys:self.contract.uuid, @"contract", [NSDictionary dictionaryWithObjectsAndKeys:[self.textFieldDate.text stringByAppendingString:@" 00:00:00"], @"beginDate", [self.textFieldDate.text stringByAppendingString:@" 23:59:59"], @"endDate", nil], @"dateRange", nil];
[MBProgressHUD j_loading];
WS(weakSelf);
[ZJHttpManager POST:@"hdmall/salesinput/getSalesTotal" parameters:params complete:^(id responseObject, NSError *error) {
[MBProgressHUD j_hideLoadingView];
if (kIsResponse) {
NSArray *data = responseObject[@"data"];
if (IsNotNullObject(data) && data.count > 0) {
NSDictionary *record = data[0];
weakSelf.labelTodayTotal.text = [CalculateHelper getMoneyStringFrom:record[@"total"]];
} else {
//没有查到数据，默认显示0
weakSelf.labelTodayTotal.text = @"0";
}
} else {
kFalseHttpTips;
}
}];
}
@end
HDMall/CodeClass/Login/ViewControllers/LoginViewController.m
View file @ 5572cc93
......@@ -63,7 +63,10 @@
self.viewModel.loginRequest.type = AppGlobal.isMall ? LoginTypeMall : LoginTypeTenant;
WS(weakSelf);
[self.viewModel login:^(id responseObject, NSError *error) {
[MBProgressHUD j_hideLoadingView];
// [MBProgressHUD j_hideLoadingView];
[MBProgressHUD j_success:@"登录成功！" complete:^{
[weakSelf.viewModel openMain];
}];
AppGlobal.savedPWD = weakSelf.textFieldPWD.text;
AppGlobal.savedName = weakSelf.textFieldName.text;
[AppGlobal saveBaseInfo];
......
HDMall/CodeClass/Login/ViewModels/LoginViewModel.h
View file @ 5572cc93
......@@ -15,5 +15,8 @@
- (void)login:(void (^)(id responseObject, NSError *error))complete;
- (void)open:(UIViewController *)viewController;
/** 到登录界面 */
- (void)openLogin;
/** 到主界面 */
- (void)openMain;
@end
HDMall/CodeClass/Login/ViewModels/LoginViewModel.m
View file @ 5572cc93
......@@ -18,7 +18,6 @@
AppGlobal.user = [UserInfo modelWithDic:responseObject[@"data"]];
complete(responseObject, error);
[weakSelf openMain];
}else{
kFalseHttpTips;
}
......
HDMall/CodeClass/Mine/ViewControllers/AboutTableViewController.h 0 → 100644
View file @ 5572cc93
//
// AboutTableViewController.h
// RealEstateManagement
//
// Created by Z on 16/6/29.
// Copyright © 2016年 上海勾芒信息科技. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface AboutTableViewController : UITableViewController
@end
HDMall/CodeClass/Mine/ViewControllers/AboutTableViewController.m 0 → 100644
View file @ 5572cc93
//
// AboutTableViewController.m
// RealEstateManagement
//
// Created by Z on 16/6/29.
// Copyright © 2016年 上海勾芒信息科技. All rights reserved.
//
#import "AboutTableViewController.h"
@interface AboutTableViewController ()
@property (weak, nonatomic) IBOutlet UILabel *labelAppName;
@property (weak, nonatomic) IBOutlet UILabel *labelVersion;
@property (weak, nonatomic) IBOutlet UILabel *labelMobile;
@property (weak, nonatomic) IBOutlet UIImageView *imgTop;
@end
@implementation AboutTableViewController
- (void)viewDidLoad {
[super viewDidLoad];
self.imgTop.image = APP_ICON;
self.labelAppName.text = APP_NAME;
self.labelVersion.text = APP_VERSION;
self.labelMobile.text = APP_MOBILE;
CLog(@"%@",APP_NAME);
//版权信息
UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, kHeight - 50 - 64, kWidth, 30)];
label.font = [UIFont systemFontOfSize:15];
label.textAlignment = NSTextAlignmentCenter;
label.text = APP_COPYRIGHT;
[self.tableView addSubview:label];
}
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[tableView deselectRowAtIndexPath:indexPath animated:YES];
if (indexPath.row == 1) {
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"拨打电话？" message:APP_MOBILE preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *okActtion= [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"tel://%@", APP_MOBILE]]];
}];
UIAlertAction *cancelACtion = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil];
[alertVC addAction:okActtion];
[alertVC addAction:cancelACtion];
[self presentViewController:alertVC animated:YES completion:nil];
}
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
// Override to support editing the table view.
- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
if (editingStyle == UITableViewCellEditingStyleDelete) {
// Delete the row from the data source
[tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
} else if (editingStyle == UITableViewCellEditingStyleInsert) {
// Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
}
}
*/
/*
// Override to support rearranging the table view.
- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
}
*/
/*
// Override to support conditional rearranging of the table view.
- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
// Return NO if you do not want the item to be re-orderable.
return YES;
}
*/
/*
#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
HDMall/Supporting Files/Assets.xcassets/progressHud/Checkmark.imageset/Contents.json 0 → 100644
View file @ 5572cc93
{
"images" : [
{
"idiom" : "universal",
"filename" : "Checkmark.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Checkmark@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Checkmark@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
HDMall/Supporting Files/Assets.xcassets/progressHud/Contents.json 0 → 100644
View file @ 5572cc93
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
HDMall/Supporting Files/Assets.xcassets/progressHud/cross.imageset/Contents.json 0 → 100644
View file @ 5572cc93
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "图层-0.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "图层-0@2x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
HDMall/Tools/BaseClass/ZJBaseFileModel.h
View file @ 5572cc93
......@@ -22,6 +22,8 @@
@property (nonatomic, strong) NSString <Ignore> * localPath;
@property (nonatomic, strong) NSString <Ignore> * fileUrl;
@property (strong, nonatomic) UIImage <Ignore> * image;
@property (strong, nonatomic) NSData <Ignore> * data;
......
HDMall/Tools/BaseClass/ZJBaseFileModel.m
View file @ 5572cc93
......@@ -42,9 +42,11 @@
cache = [NSCache new];
});
NSString *url = [cache objectForKey:self.idField];
if (url) {
NSString *url = [cache objectForKey:self.idField];
if (self.fileUrl) {
fileUrl(self.fileUrl);
}else if (url) {
fileUrl(url);
}else {
// [kHttp getAttachmentWithId:self.idField
......
HDMall/Tools/PictureTableViewCell/RepairAddPicCollectionViewCell.m
View file @ 5572cc93
......@@ -10,6 +10,7 @@
#import "ZJBaseFileModel.h"
@implementation RepairAddPicCollectionViewCell
- (void)awakeFromNib {
[super awakeFromNib];
self.layer.borderColor = [UIColor colorWithWhite:0.902 alpha:1.000].CGColor;
self.layer.borderWidth = 1;
UILongPressGestureRecognizer *longPress =
......
Podfile
View file @ 5572cc93
......@@ -16,6 +16,7 @@ abstract_target 'hdmall_base' do
pod 'JSONKit-NoWarning', '~> 1.2'
pod 'RadioButton'
pod 'TZImagePickerController', '~> 1.8.4'
pod 'DatePickerTextField', '~> 1.0.2'
# target 'HDMall' do
# end
target 'HDMall_TEST' do
......
Podfile.lock
View file @ 5572cc93
......@@ -14,6 +14,7 @@ PODS:
- AFNetworking/Serialization (3.0.4)
- AFNetworking/UIKit (3.0.4):
- AFNetworking/NSURLSession
- DatePickerTextField (1.0.2)
- DZNEmptyDataSet (1.8.1)
- FDFullscreenPopGesture (1.1)
- IQKeyboardManager (4.0.10)
......@@ -30,6 +31,7 @@ PODS:
DEPENDENCIES:
- AFNetworking (~> 3.0.4)
- DatePickerTextField (~> 1.0.2)
- DZNEmptyDataSet
- FDFullscreenPopGesture (= 1.1)
- IQKeyboardManager (~> 4.0.6)
......@@ -44,6 +46,7 @@ DEPENDENCIES:
SPEC CHECKSUMS:
AFNetworking: a0075feb321559dc78d9d85b55d11caa19eabb93
DatePickerTextField: e04e071ba02d0ee3ce61b74e1a38456e7d186f4b
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
IQKeyboardManager: 593ee99b88381f4b9ccb22bd680f22606351bd41
......@@ -56,6 +59,6 @@ SPEC CHECKSUMS:
TZImagePickerController: 612c79b572efd0363c7a966daad7a974c2d6b458
UMengAnalytics-NO-IDFA: 16666e32edce5be44ae5b14aaaa7f3582e09d6ab
PODFILE CHECKSUM: c017ac8a85d92e34ba60fa747d2d9eca3dd63550
PODFILE CHECKSUM: 73b43da2a716dd5e9a55324f12be10d233ee9633
COCOAPODS: 1.2.1
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