优化支付方式选择UI

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -3685,7 +3685,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.3;
+				CURRENT_PROJECT_VERSION = 1.4;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -3733,7 +3733,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.5.1;
+				MARKETING_VERSION = 1.5.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -3814,7 +3814,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.3;
+				CURRENT_PROJECT_VERSION = 1.4;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -3862,7 +3862,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.5.1;
+				MARKETING_VERSION = 1.5.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

GeliBusinessPlatform/Info.plist

@@ -35,6 +35,12 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>wechat</string>
+		<string>weixin</string>
+		<string>weixinULAPI</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MOBAppKey</key>
@@ -85,11 +91,5 @@
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>wechat</string>
-		<string>weixin</string>
-		<string>weixinULAPI</string>
-	</array>
 </dict>
 </plist>

GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift

@@ -31,7 +31,25 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
         delegate?.GLAlertSelectViewFinish?(sender:sender,title: ysyfTitle,cellTag: cellTag!)
     }
     
-    var isNonSelect = false
+    var isNonSelect = false {
+        didSet {
+            var tbvH:CGFloat = 0
+            if isNonSelect {
+                tbvH = CGFloat((dataArr.count - 1) * 49)
+            }else{
+                tbvH = CGFloat(dataArr.count * 49)
+            }
+            if tbvH > fullScreenHeight*0.6 {
+                tbvH = fullScreenHeight*0.6
+                selectTbv.isScrollEnabled = true
+            }
+            
+            UIView.animate(withDuration: 0.5) {
+                self.btmVHeight.constant = 51+tbvH
+            }
+            
+        }
+    }
     
     var cellTag:Int?
     var isYsYf = false
@@ -70,6 +88,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
     var dataArr = Array<String>(){
         didSet{
             var tbvH = CGFloat(dataArr.count * 49)
+        
             if tbvH > fullScreenHeight*0.6 {
                 tbvH = fullScreenHeight*0.6
                 selectTbv.isScrollEnabled = true
@@ -165,6 +184,11 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
     
     //MARK: - cell delegate
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if isNonSelect {
+            if indexPath.row == 0{
+                return 0.001
+            }
+        }
         return 49
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -156,7 +156,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         
         switch sender.titleLabel?.text {
         case "先货后款":
-            
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
@@ -183,8 +182,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 vc.delegate = self
                 vc.wlPrice = self.dataMdoel?.order_res?.logistics_price as! String
                 vc.qtPrice = self.dataMdoel?.order_res?.other_price! as! String
-                
-                
                 self.navigationController?.pushViewController(vc,animated: true)
             }
             break
@@ -1100,22 +1097,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         switch indexPath.section {
         case 1:
             return 120
-        case 3:
-            switch indexPath.row {
-                //            case 5:
-                //
-            //            case 9:
-            default:
-                break
-            }
-        case 4:
-            switch indexPath.row {
-                //            case 5:
-                //
-            //            case 9:
-            default:
-                break
-            }
         default:
             break
         }