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

1.修改NPD Model Detail索引指示器颜色。
2.修改NPD OrderDetail Delivery,增加超链接。
3.修改Cart Action背景颜色。

Pen Li 8 лет назад
Родитель
Сommit
8563622805

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

@@ -2091,7 +2091,7 @@
         
     }];
     
-    deleteRowAction.backgroundColor = UIColorFromRGB(0x336699);
+    deleteRowAction.backgroundColor = [UIColor redColor];
     
     UITableViewRowAction *notifyMeAction = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"Notify Me" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
         
@@ -2560,7 +2560,7 @@
         
     }];
     
-    
+    move2BackAction.backgroundColor = UIColorFromRGB(0x336699);
     
     if(appDelegate.user_type==USER_ROLE_EMPLOYEE)
     {

+ 1 - 1
RedAnt ERP Mobile/common/Functions/order/OrderDetailPickInfoCell.h

@@ -12,6 +12,6 @@
 @property (strong, nonatomic) IBOutlet UILabel *track_number_lb;
 @property (strong, nonatomic) IBOutlet UILabel *status_lb;
 @property (strong, nonatomic) IBOutlet UILabel *carrier_lb;
-@property (strong, nonatomic) IBOutlet UILabel *url_lb;
+@property (strong, nonatomic) IBOutlet UITextView *url_lb;
 
 @end

+ 11 - 10
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -991,7 +991,7 @@
                                                 <pageControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" id="dlZ-DL-v21">
                                                     <rect key="frame" x="49" y="467" width="320" height="37"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                                                    <color key="pageIndicatorTintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <color key="pageIndicatorTintColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                     <color key="currentPageIndicatorTintColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </pageControl>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="FwX-9Z-HgC">
@@ -6148,20 +6148,21 @@ Email: redantsupport@united-us.net</string>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="URL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XTK-u0-iEi">
-                                                    <rect key="frame" x="162" y="164" width="598" height="44"/>
+                                                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" editable="NO" text="URL" textAlignment="natural" id="yQ6-pJ-x9g">
+                                                    <rect key="frame" x="162" y="168" width="598" height="40"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
+                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                    <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                                    <dataDetectorType key="dataDetectorTypes" phoneNumber="YES" link="YES" address="YES"/>
+                                                </textView>
                                             </subviews>
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="carrier_lb" destination="bm0-he-gum" id="ceH-Zh-QAb"/>
                                             <outlet property="status_lb" destination="oZN-Pi-f7I" id="1a6-Bb-kUq"/>
                                             <outlet property="track_number_lb" destination="ZT5-dJ-sVI" id="iqg-9F-O1U"/>
-                                            <outlet property="url_lb" destination="XTK-u0-iEi" id="gL9-sf-GZN"/>
+                                            <outlet property="url_lb" destination="yQ6-pJ-x9g" id="bs1-1o-pyU"/>
                                         </connections>
                                     </tableViewCell>
                                 </prototypes>
@@ -9294,13 +9295,13 @@ Email: redantsupport@united-us.net</string>
                                 <rect key="frame" x="0.0" y="984" width="768" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <items>
-                                    <barButtonItem title="front" id="T8q-zY-eKv">
+                                    <barButtonItem title="Back" id="T8q-zY-eKv">
                                         <connections>
                                             <action selector="frontBarItemClick:" destination="2yF-9m-ljQ" id="zGa-FK-0GE"/>
                                         </connections>
                                     </barButtonItem>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="THY-cD-jRi"/>
-                                    <barButtonItem title="next" id="GdK-aF-hGe">
+                                    <barButtonItem title="Next" id="GdK-aF-hGe">
                                         <connections>
                                             <action selector="nextBarItemClick:" destination="2yF-9m-ljQ" id="903-NL-cK1"/>
                                         </connections>