diff --git a/Lighting/Class/ClientdetailsViewController.m b/Lighting/Class/ClientdetailsViewController.m index 2f31bf580d2851a586c34bbe1feb7f2f8c668930..16dd1d994ebfe6304aabba58e201ac1a3504d62e 100644 --- a/Lighting/Class/ClientdetailsViewController.m +++ b/Lighting/Class/ClientdetailsViewController.m @@ -242,13 +242,18 @@ OrderBill *allOrder = [[OrderBill alloc]init]; //分页 DataPage *page = [[DataPage alloc]init]; - page.page = 0; - page.rows = 10; + page.page = 1; + page.rows = 99999; //è®¢å• TOOrderEntity *Neworder = [[TOOrderEntity alloc]init]; Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid; allOrder.datapage = page; allOrder.order = Neworder; + //客户 + TOConsumerEntity *customer = [[TOConsumerEntity alloc]init]; + customer.fid = _model.fid; + allOrder.consumer = customer; + [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/order/query"] WithRequestType:0 WithParameter:allOrder WithReturnValueBlock:^(id returnValue) { [self RemoveMBProgressHUDLoding]; diff --git a/Lighting/Class/Login/LoginViewController.h b/Lighting/Class/Login/LoginViewController.h index f11d09f6a80f24fe2c8219730ef250ff687f2ba8..7e9ce476c5ee0f37cfa67ac6b530a5f8dba38d40 100644 --- a/Lighting/Class/Login/LoginViewController.h +++ b/Lighting/Class/Login/LoginViewController.h @@ -66,4 +66,6 @@ + + @end diff --git a/Lighting/Class/Login/LoginViewController.m b/Lighting/Class/Login/LoginViewController.m index 0aa3c30ea36effc48bc8894fba5abba2bef4e3ba..50afb65dbe548b05e59329efe0938186efb4a67c 100644 --- a/Lighting/Class/Login/LoginViewController.m +++ b/Lighting/Class/Login/LoginViewController.m @@ -38,6 +38,15 @@ */ @property (nonatomic,copy) NSString *verifyCode; +/** + * 用户å + */ +@property (nonatomic,copy) NSString *userNameString; +/** + * 密ç + */ +@property (nonatomic,copy) NSString *passWordString; + @end @@ -57,9 +66,7 @@ [super viewDidLoad]; // Do any additional setup after loading the view. - [self uiConfigAction]; - } @@ -76,9 +83,12 @@ self.userNameLoginView.layer.cornerRadius = 10; self.forgotPasswordButton.titleLabel.font = [UIFont boldSystemFontOfSize:16]; self.followHeartView=[[FollowHeartViewController alloc]init]; - self.userName.text = @"demo1"; - self.passWord.text = @"123456"; + //åŠ è½½æœ¬åœ°çš„ç”¨æˆ·å密ç + self.userNameString = [[NSUserDefaults standardUserDefaults] objectForKey:USERNAME]; + self.passWordString = [[NSUserDefaults standardUserDefaults] objectForKey:PASSWORD]; + self.userName.text = self.userNameString; + self.passWord.text = self.passWordString; } @@ -111,11 +121,33 @@ [self.drawerController setOpenDrawerGestureModeMask:MMOpenDrawerGestureModeAll]; [self.drawerController setCloseDrawerGestureModeMask:MMCloseDrawerGestureModeAll]; SHARED_APPDELEGATE.mmdrawer = self.drawerController; - SHARED_APPDELEGATE.window.rootViewController = self.drawerController; + [self restoreRootViewController:self.drawerController]; SHARED_APPDELEGATE.Mytabbar = self.customtabbar; } + +#pragma mark -切æ¢rootViewcontroller +- (void)restoreRootViewController:(UIViewController *)rootViewController +{ + typedef void (^Animation)(void); + UIWindow* window = SHARED_APPDELEGATE.window; + rootViewController.modalTransitionStyle = UIModalTransitionStyleCrossDissolve; + Animation animation = ^{ + BOOL oldState = [UIView areAnimationsEnabled]; + [UIView setAnimationsEnabled:NO]; + window.rootViewController = rootViewController; + [UIView setAnimationsEnabled:oldState]; + }; + + [UIView transitionWithView:window + duration:0.5f + options:UIViewAnimationOptionTransitionFlipFromTop + animations:animation + completion:nil]; +} + + #pragma mark -判æ–用户åå¯†ç æ˜¯å¦æ£ç¡® - (void)judgeUserNameAndPassword { @@ -135,6 +167,9 @@ [Shoppersmanager manager].Shoppers = result; [Shoppersmanager manager].userNameString = self.userName.text; [Shoppersmanager manager].passWordString = self.passWord.text; + //ä¿å˜ç”¨æˆ·å密ç + [[NSUserDefaults standardUserDefaults] setObject:self.userName.text forKey:USERNAME]; + [[NSUserDefaults standardUserDefaults] setObject:self.passWord.text forKey:PASSWORD]; [self SetTheRootViewController]; }else diff --git a/Lighting/Class/ProductLibraryViewController.m b/Lighting/Class/ProductLibraryViewController.m index 8ea40fea29a44dfa6fae91e95f2841939ba4f0a0..6a0effe07785183a9f3bb44826754c97cdadca5a 100644 --- a/Lighting/Class/ProductLibraryViewController.m +++ b/Lighting/Class/ProductLibraryViewController.m @@ -315,7 +315,7 @@ ProductCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"productcell" forIndexPath:indexPath]; NSArray *imageArray = [[[self.datasArray objectAtIndex_opple:indexPath.item] pictures] componentsSeparatedByString:@","]; [cell.productImageView sd_setImageWithURL:[NSURL URLWithString:[imageArray firstObject]] placeholderImage:REPLACEIMAGE]; - cell.productPrice.text = [NSString stringWithFormat:@"ï¿¥%@",[[[self.datasArray objectAtIndex_opple:indexPath.item] guidePrice] stringValue]]; + cell.productPrice.text = [NSString stringWithFormat:@"ï¿¥%@",[[[self.datasArray objectAtIndex_opple:indexPath.item] tagPrice] stringValue]]; cell.cellindex = indexPath.item; cell.productParameter.text = [[self.datasArray objectAtIndex_opple:indexPath.item] productProfile]; cell.specifications.text = [NSString stringWithFormat:@"%@(%@)",[[self.datasArray objectAtIndex_opple:indexPath.item] series],[[self.datasArray objectAtIndex_opple:indexPath.item] spec]]; diff --git a/Lighting/Class/SettlementViewController.xib b/Lighting/Class/SettlementViewController.xib index bcb9a134f1b2cf4f4498868f06876a0875142f7e..4a24d4054ebcbe64ce7951c32bedaf597db9f894 100644 --- a/Lighting/Class/SettlementViewController.xib +++ b/Lighting/Class/SettlementViewController.xib @@ -28,198 +28,204 @@ <rect key="frame" x="0.0" y="0.0" width="380" height="500"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数é‡:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KHc-WJ-xQd"> - <rect key="frame" x="25" y="64" width="50" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="12"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <view contentMode="scaleToFill" id="V10-sC-tjf"> - <rect key="frame" x="83" y="59" width="160" height="30"/> + <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="Zin-kL-ulL"> + <rect key="frame" x="0.0" y="0.0" width="380" height="500"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> - <textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="kfb-PC-RSU"> - <rect key="frame" x="10" y="1" width="150" height="30"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="BtK-gu-0KG"> + <rect key="frame" x="83" y="140" width="160" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <fontDescription key="fontDescription" type="system" pointSize="14"/> - <textInputTraits key="textInputTraits"/> - </textField> - </subviews> - <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> - </view> - <view contentMode="scaleToFill" id="JWa-n5-tJQ"> - <rect key="frame" x="0.0" y="0.0" width="380" height="46"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> - <subviews> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="结算信æ¯" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SoB-nK-luK"> - <rect key="frame" x="8" y="13" width="150" height="21"/> + <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" type="system" pointSize="10"/> + <inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="0.0" maxY="0.0"/> + <inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/> + <state key="normal" title="çŽ°é‡‘ã€æ”¯ç¥¨ã€è½¬è´¦ã€åˆ·å¡" image="down_arr"> + <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> + </state> + <connections> + <action selector="payTypeButtonClick:" destination="-1" eventType="touchUpInside" id="i6M-fm-Kha"/> + </connections> + </button> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="vDt-el-S5r"> + <rect key="frame" x="25" y="445" width="130" height="35"/> + <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" type="system" pointSize="16"/> + <state key="normal" title="å–æ¶ˆ"> + <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </state> + <connections> + <action selector="CancelButtonClick:" destination="-1" eventType="touchUpInside" id="6As-mE-5Ro"/> + </connections> + </button> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="wNR-jl-cxy"> + <rect key="frame" x="203" y="445" width="130" height="35"/> + <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" type="system" pointSize="16"/> + <state key="normal" title="确认"> + <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </state> + <connections> + <action selector="SureButtonClick:" destination="-1" eventType="touchUpInside" id="tue-Vx-ZkB"/> + </connections> + </button> + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="evA-uJ-YEb"> + <rect key="frame" x="255" y="143" width="100" height="100"/> + <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> + </imageView> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å‘票类型:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IOP-zc-e6A"> + <rect key="frame" x="25" y="331" width="58" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" type="system" pointSize="12"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> - </subviews> - <color key="backgroundColor" red="0.95686274510000002" green="0.95686274510000002" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> - </view> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总金é¢:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bjc-Ns-VND"> - <rect key="frame" x="25" y="103" width="50" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="12"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <view contentMode="scaleToFill" id="kRj-KI-B8x"> - <rect key="frame" x="83" y="98" width="160" height="30"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <subviews> - <textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="Wku-Nz-Jvr"> - <rect key="frame" x="10" y="0.0" width="150" height="30"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="h52-sh-k1p"> + <rect key="frame" x="83" y="327" width="160" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <fontDescription key="fontDescription" type="system" pointSize="14"/> - <textInputTraits key="textInputTraits"/> - </textField> - </subviews> - <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> - </view> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付方å¼:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fxz-0O-dsP"> - <rect key="frame" x="25" y="144" width="58" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="12"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pfa-IW-8J9"> - <rect key="frame" x="83" y="180" width="160" height="30"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <state key="normal" backgroundImage="wechat1"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="selected" backgroundImage="圆角矩形-2-副本-2"/> - <connections> - <action selector="WechatButtonClick:" destination="-1" eventType="touchUpInside" id="woS-KH-v7d"/> - </connections> - </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="u1Q-iA-oUv"> - <rect key="frame" x="83" y="219" width="160" height="30"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <state key="normal" backgroundImage="图层-1"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="selected" backgroundImage="图层-3"/> - <connections> - <action selector="ZhifubaoPayButtonClick:" destination="-1" eventType="touchUpInside" id="KqV-tt-tEq"/> - </connections> - </button> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å‘票抬头:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="58b-Vg-zBQ"> - <rect key="frame" x="25" y="376" width="58" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="12"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <view contentMode="scaleToFill" id="beF-Oa-HVo"> - <rect key="frame" x="83" y="372" width="250" height="30"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <subviews> - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="nrc-w9-AuC"> - <rect key="frame" x="10" y="0.0" width="240" height="30"/> + <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" type="system" pointSize="12"/> + <inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="50" maxY="0.0"/> + <inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/> + <state key="normal" title="个人å‘票" image="down_arr"> + <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> + </state> + <connections> + <action selector="invoiceTypeButtonClick:" destination="-1" eventType="touchUpInside" id="glI-Tn-twP"/> + </connections> + </button> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="RrC-9S-Ofh"> + <rect key="frame" x="83" y="283" width="160" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" type="system" pointSize="12"/> + <inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="86" maxY="0.0"/> + <inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/> + <state key="normal" title="是" image="down_arr"> + <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> + </state> + <connections> + <action selector="isinvoiceButtonClick:" destination="-1" eventType="touchUpInside" id="6wf-TG-crT"/> + </connections> + </button> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是å¦å¼€ç¥¨:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WiP-Ps-rLM"> + <rect key="frame" x="25" y="287" width="58" height="21"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <fontDescription key="fontDescription" type="system" pointSize="12"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <nil key="highlightedColor"/> + </label> + <view contentMode="scaleToFill" id="beF-Oa-HVo"> + <rect key="frame" x="83" y="372" width="250" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <subviews> + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="nrc-w9-AuC"> + <rect key="frame" x="10" y="0.0" width="240" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <fontDescription key="fontDescription" type="system" pointSize="14"/> + <textInputTraits key="textInputTraits"/> + </textField> + </subviews> + <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> + </view> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å‘票抬头:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="58b-Vg-zBQ"> + <rect key="frame" x="25" y="376" width="58" height="21"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <fontDescription key="fontDescription" type="system" pointSize="12"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <nil key="highlightedColor"/> + </label> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="u1Q-iA-oUv"> + <rect key="frame" x="83" y="219" width="160" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <state key="normal" backgroundImage="图层-1"> + <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> + </state> + <state key="selected" backgroundImage="图层-3"/> + <connections> + <action selector="ZhifubaoPayButtonClick:" destination="-1" eventType="touchUpInside" id="KqV-tt-tEq"/> + </connections> + </button> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pfa-IW-8J9"> + <rect key="frame" x="83" y="180" width="160" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <state key="normal" backgroundImage="wechat1"> + <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> + </state> + <state key="selected" backgroundImage="圆角矩形-2-副本-2"/> + <connections> + <action selector="WechatButtonClick:" destination="-1" eventType="touchUpInside" id="woS-KH-v7d"/> + </connections> + </button> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付方å¼:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fxz-0O-dsP"> + <rect key="frame" x="25" y="144" width="58" height="21"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <fontDescription key="fontDescription" type="system" pointSize="12"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <nil key="highlightedColor"/> + </label> + <view contentMode="scaleToFill" id="kRj-KI-B8x"> + <rect key="frame" x="83" y="98" width="160" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <subviews> + <textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="Wku-Nz-Jvr"> + <rect key="frame" x="10" y="0.0" width="150" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <fontDescription key="fontDescription" type="system" pointSize="14"/> + <textInputTraits key="textInputTraits"/> + </textField> + </subviews> + <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> + </view> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总金é¢:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bjc-Ns-VND"> + <rect key="frame" x="25" y="103" width="50" height="21"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <fontDescription key="fontDescription" type="system" pointSize="12"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <nil key="highlightedColor"/> + </label> + <view contentMode="scaleToFill" id="V10-sC-tjf"> + <rect key="frame" x="83" y="59" width="160" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <subviews> + <textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" id="kfb-PC-RSU"> + <rect key="frame" x="10" y="1" width="150" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <fontDescription key="fontDescription" type="system" pointSize="14"/> + <textInputTraits key="textInputTraits"/> + </textField> + </subviews> + <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> + </view> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数é‡:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KHc-WJ-xQd"> + <rect key="frame" x="25" y="64" width="50" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <fontDescription key="fontDescription" type="system" pointSize="14"/> - <textInputTraits key="textInputTraits"/> - </textField> + <fontDescription key="fontDescription" type="system" pointSize="12"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <nil key="highlightedColor"/> + </label> + <view contentMode="scaleToFill" id="JWa-n5-tJQ"> + <rect key="frame" x="0.0" y="0.0" width="380" height="46"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> + <subviews> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="结算信æ¯" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SoB-nK-luK"> + <rect key="frame" x="8" y="13" width="150" height="21"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <fontDescription key="fontDescription" type="system" pointSize="14"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <nil key="highlightedColor"/> + </label> + </subviews> + <color key="backgroundColor" red="0.95686274510000002" green="0.95686274510000002" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> + </view> </subviews> - <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> - </view> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是å¦å¼€ç¥¨:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WiP-Ps-rLM"> - <rect key="frame" x="25" y="287" width="58" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="12"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="RrC-9S-Ofh"> - <rect key="frame" x="83" y="283" width="160" height="30"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> - <fontDescription key="fontDescription" type="system" pointSize="12"/> - <inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="86" maxY="0.0"/> - <inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/> - <state key="normal" title="是" image="down_arr"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="isinvoiceButtonClick:" destination="-1" eventType="touchUpInside" id="6wf-TG-crT"/> - </connections> - </button> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å‘票类型:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IOP-zc-e6A"> - <rect key="frame" x="25" y="331" width="58" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="12"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="h52-sh-k1p"> - <rect key="frame" x="83" y="327" width="160" height="30"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="calibratedRGB"/> - <fontDescription key="fontDescription" type="system" pointSize="12"/> - <inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="50" maxY="0.0"/> - <inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/> - <state key="normal" title="个人å‘票" image="down_arr"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="invoiceTypeButtonClick:" destination="-1" eventType="touchUpInside" id="glI-Tn-twP"/> - </connections> - </button> - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="evA-uJ-YEb"> - <rect key="frame" x="255" y="143.5" width="100" height="100"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> - </imageView> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="wNR-jl-cxy"> - <rect key="frame" x="203" y="445" width="130" height="35"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> - <fontDescription key="fontDescription" type="system" pointSize="16"/> - <state key="normal" title="确认"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="SureButtonClick:" destination="-1" eventType="touchUpInside" id="tue-Vx-ZkB"/> - </connections> - </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="vDt-el-S5r"> - <rect key="frame" x="25" y="445" width="130" height="35"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> - <fontDescription key="fontDescription" type="system" pointSize="16"/> - <state key="normal" title="å–æ¶ˆ"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="CancelButtonClick:" destination="-1" eventType="touchUpInside" id="6As-mE-5Ro"/> - </connections> - </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="BtK-gu-0KG"> - <rect key="frame" x="83" y="140" width="160" height="30"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/> - <fontDescription key="fontDescription" type="system" pointSize="10"/> - <inset key="titleEdgeInsets" minX="-50" minY="0.0" maxX="0.0" maxY="0.0"/> - <inset key="imageEdgeInsets" minX="120" minY="6" maxX="0.0" maxY="5"/> - <state key="normal" title="çŽ°é‡‘ã€æ”¯ç¥¨ã€è½¬è´¦ã€åˆ·å¡" image="down_arr"> - <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <action selector="payTypeButtonClick:" destination="-1" eventType="touchUpInside" id="i6M-fm-Kha"/> - </connections> - </button> + </scrollView> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> diff --git a/Lighting/Class/Tabbar/CustomTabbarController.m b/Lighting/Class/Tabbar/CustomTabbarController.m index dc8ac0891a4c3513816700661ba7bf85dea0ba67..7a25b7c02a06d582e46b03bdf174f83e3702eedb 100644 --- a/Lighting/Class/Tabbar/CustomTabbarController.m +++ b/Lighting/Class/Tabbar/CustomTabbarController.m @@ -177,7 +177,6 @@ pop.barButtonItem = [[UIBarButtonItem alloc]initWithCustomView:button]; [self presentViewController:userVC animated:YES completion:nil]; } - break; //我的客户 diff --git a/Lighting/Class/UserViewController.m b/Lighting/Class/UserViewController.m index c64f0f0e57181ee54fdadbe7eab8ba2179c9be97..b42b3b9c77d59a6f3884c973e3f44a28e618d9fd 100644 --- a/Lighting/Class/UserViewController.m +++ b/Lighting/Class/UserViewController.m @@ -8,7 +8,7 @@ #import "UserViewController.h" #import "ChangePasswordViewController.h" - +#import "LoginViewController.h" @interface UserViewController () @@ -66,9 +66,58 @@ #pragma mark -注销 - (IBAction)cancellationButtonClick:(UIButton *)sender { + UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"æç¤º" message:@"注销将清空用户数æ®ï¼Œæ˜¯å¦ç»§ç»?" preferredStyle:UIAlertControllerStyleAlert]; + __weak typeof(self) weakSelf = self; + [alertVC addAction:[UIAlertAction actionWithTitle:@"å–æ¶ˆ" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { + [weakSelf dismissViewControllerAnimated:YES completion:nil]; + }]]; + [alertVC addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) { + + [weakSelf CreateMBProgressHUDLoding]; + [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/employee/logout"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) { + + [weakSelf RemoveMBProgressHUDLoding]; + if ([returnValue[@"code"] isEqualToNumber:@0]) { + + UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:nil]; + LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD]; + [weakSelf restoreRootViewController:loginVC]; + }else + { + [weakSelf promptCustomerWithString:@"注销失败"]; + } + + } WithErrorCodeBlock:^(id errorCodeValue) { + + } WithFailureBlock:^(id error) { + [weakSelf RemoveMBProgressHUDLoding]; + }]; + }]]; + [self presentViewController:alertVC animated:YES completion:nil]; +} + + +#pragma mark -切æ¢rootViewcontroller +- (void)restoreRootViewController:(UIViewController *)rootViewController +{ + typedef void (^Animation)(void); + UIWindow* window = SHARED_APPDELEGATE.window; + rootViewController.modalTransitionStyle = UIModalTransitionStyleCrossDissolve; + Animation animation = ^{ + BOOL oldState = [UIView areAnimationsEnabled]; + [UIView setAnimationsEnabled:NO]; + window.rootViewController = rootViewController; + [UIView setAnimationsEnabled:oldState]; + }; - + [UIView transitionWithView:window + duration:0.5f + options:UIViewAnimationOptionTransitionFlipFromBottom + animations:animation + completion:nil]; } @@ -101,8 +150,7 @@ LoginResult *result = [[LoginResult alloc] initWithDictionary:returnValue[@"data"] error:nil]; [Shoppersmanager manager].userNameString = self.userName.text; [Shoppersmanager manager].passWordString = self.passWord.text; - - + [Shoppersmanager manager].Shoppers = result; }else { diff --git a/Lighting/Lighting/StoryboardwithCYX.storyboard b/Lighting/Lighting/StoryboardwithCYX.storyboard index 1d1c77e6a39941b904ae5081a1e9a20ea8e6bf38..f9ab2a3d36f6190c91b03d2ed78f307b3f88646d 100644 --- a/Lighting/Lighting/StoryboardwithCYX.storyboard +++ b/Lighting/Lighting/StoryboardwithCYX.storyboard @@ -465,7 +465,6 @@ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ssg-dl-sxk"> <rect key="frame" x="184" y="22" width="143" height="21"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <nil key="highlightedColor"/> @@ -473,7 +472,6 @@ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0Ww-BX-90J"> <rect key="frame" x="198" y="56" width="143" height="21"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <nil key="highlightedColor"/> @@ -481,7 +479,6 @@ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bhI-Ns-YHq"> <rect key="frame" x="420" y="22" width="215" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <nil key="highlightedColor"/> @@ -489,7 +486,6 @@ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hLZ-vb-nAK"> <rect key="frame" x="420" y="56" width="143" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <nil key="highlightedColor"/> @@ -497,7 +493,6 @@ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mLm-o2-IUg"> <rect key="frame" x="613" y="56" width="86" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <nil key="highlightedColor"/> @@ -1160,7 +1155,7 @@ </collectionViewFlowLayout> <cells> <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell"> - <rect key="frame" x="0.0" y="64" width="300" height="300"/> + <rect key="frame" x="0.0" y="0.0" width="300" height="300"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="300" height="300"/> @@ -1242,7 +1237,7 @@ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="170" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell"> - <rect key="frame" x="0.0" y="113.5" width="768" height="170"/> + <rect key="frame" x="0.0" y="49.5" width="768" height="170"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP"> <rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/> diff --git a/Lighting/Tools/PrefixHeader.pch b/Lighting/Tools/PrefixHeader.pch index c96591356494ab13b140a28c876ae42f011c9c0a..e04e69050dcc67fb66fb60ceee1ef10b03e1f57c 100644 --- a/Lighting/Tools/PrefixHeader.pch +++ b/Lighting/Tools/PrefixHeader.pch @@ -173,9 +173,15 @@ #define REFRESHSHOPPINGCAR @"GOODSNUMBER" +/** + * ä¿å˜ç”¨æˆ·åkey + */ +#define USERNAME @"username" - - +/** + * ä¿å˜å¯†ç key + */ +#define PASSWORD @"password"