Просмотр исходного кода

1.修改USAI Cart按钮对齐。

Pen Li 7 лет назад
Родитель
Сommit
3127c3ba0e

+ 6 - 6
RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -512,11 +512,11 @@
             frame0.origin.x = x;
             self.cancelOrderButton.frame = frame0;
             
-            x -= 19 + CGRectGetWidth(frame2);
+            x -= 20 + CGRectGetWidth(frame2);
             frame2.origin.x = x;
             self.emailButton.frame = frame2;
             
-            x -= 13 + CGRectGetWidth(frame3);
+            x -= 20 + CGRectGetWidth(frame3);
             frame3.origin.x = x;
             self.printButton.frame = frame3;
             
@@ -529,12 +529,12 @@
             self.cancelOrderButton.frame = CGRectMake(x, y, size.width, size.height);
             
             CGRect frame2 = self.emailButton.frame;
-            x -= 19 + CGRectGetWidth(frame2);
+            x -= 20 + CGRectGetWidth(frame2);
             frame2.origin.x = x;
             self.emailButton.frame = frame2;
             
             CGRect frame3 = self.printButton.frame;
-            x -= 13 + CGRectGetWidth(frame3);
+            x -= 20 + CGRectGetWidth(frame3);
             frame3.origin.x = x;
             self.printButton.frame = frame3;
         }
@@ -547,12 +547,12 @@
         self.cancelOrderButton.frame = CGRectMake(x, y, size.width, size.height);
         
         CGRect frame2 = self.emailButton.frame;
-        x -= 19 + CGRectGetWidth(frame2);
+        x -= 20 + CGRectGetWidth(frame2);
         frame2.origin.x = x;
         self.emailButton.frame = frame2;
         
         CGRect frame3 = self.printButton.frame;
-        x -= 13 + CGRectGetWidth(frame3);
+        x -= 20 + CGRectGetWidth(frame3);
         frame3.origin.x = x;
         self.printButton.frame = frame3;
     }

+ 8 - 4
RedAnt ERP Mobile/common/Functions/signature/SignatureViewController.m

@@ -94,10 +94,14 @@
     
     //  self.navigationItem.rightBarButtonItem = searchButton;
     
-    
-    UIBarButtonItem * settingBtn =[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCompose
-                                                                 target:self
-                                                                 action:@selector( onSetting:)];
+    UIBarButtonItem * settingBtn =[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"signature_setting"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
+                                                                   style:UIBarButtonItemStylePlain
+                                                                  target:self
+                                                                  action:@selector( onSetting:)];
+    
+//    UIBarButtonItem * settingBtn =[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCompose
+//                                                                 target:self
+//                                                                 action:@selector( onSetting:)];
     
     self.navigationItem.rightBarButtonItems=[NSArray arrayWithObjects:doneBtn,clearBtn,settingBtn , nil];
     

+ 8 - 6
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -2790,17 +2790,17 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="1k1-dx-91p">
-                                        <rect key="frame" x="505" y="85" width="46" height="30"/>
+                                        <rect key="frame" x="513" y="85" width="30" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" title="Email"/>
+                                        <state key="normal" backgroundImage="btn_email_order"/>
                                         <connections>
                                             <action selector="emailButtonClick:" destination="Cwo-Rn-ZMW" eventType="touchUpInside" id="LPb-ex-p8b"/>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="xdj-ay-aU1">
-                                        <rect key="frame" x="446" y="85" width="46" height="30"/>
+                                        <rect key="frame" x="454" y="85" width="30" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" title="Print"/>
+                                        <state key="normal" backgroundImage="btn_print_order"/>
                                         <connections>
                                             <action selector="printCartButtonClick:" destination="Cwo-Rn-ZMW" eventType="touchUpInside" id="dRI-Id-WiZ"/>
                                         </connections>
@@ -9805,7 +9805,9 @@ Email: redantsupport@united-us.net</string>
         <image name="btn_addtowish" width="124" height="39"/>
         <image name="btn_cancel" width="102" height="30"/>
         <image name="btn_cancelorder" width="30" height="30"/>
+        <image name="btn_email_order" width="30" height="30"/>
         <image name="btn_ok" width="102" height="30"/>
+        <image name="btn_print_order" width="30" height="30"/>
         <image name="btn_reset" width="102" height="30"/>
         <image name="btn_retrieve" width="102" height="30"/>
         <image name="btn_save" width="102" height="30"/>
@@ -9817,9 +9819,9 @@ Email: redantsupport@united-us.net</string>
         <image name="check_0_24" width="24" height="24"/>
         <image name="check_1_24" width="24" height="24"/>
         <image name="checkbox" width="16" height="16"/>
-        <image name="close" width="40" height="40"/>
+        <image name="close" width="32" height="32"/>
         <image name="contact" width="72" height="72"/>
-        <image name="continue" width="131" height="30"/>
+        <image name="continue" width="130" height="30"/>
         <image name="filter" width="32" height="32"/>
         <image name="layout_list" width="40" height="40"/>
         <image name="layout_small" width="40" height="40"/>