货拉拉下单联系人信息UI完善

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -554,6 +554,8 @@
 		F9A0E1DF246D1B1E00D7F26F /* GetGoodsInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A0E1DE246D1B1E00D7F26F /* GetGoodsInfoModel.swift */; };
 		F9A4AB6E24C927E900094BD1 /* LogisticsCostDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A4AB6C24C927E900094BD1 /* LogisticsCostDetailViewController.swift */; };
 		F9A4AB6F24C927E900094BD1 /* LogisticsCostDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9A4AB6D24C927E900094BD1 /* LogisticsCostDetailViewController.xib */; };
+		F9A4AB7324C933A700094BD1 /* XiaDanUserInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A4AB7124C933A700094BD1 /* XiaDanUserInfoViewController.swift */; };
+		F9A4AB7424C933A700094BD1 /* XiaDanUserInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9A4AB7224C933A700094BD1 /* XiaDanUserInfoViewController.xib */; };
 		F9B6D9E12486890D00111698 /* MoreAndTimeSelectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9B6D9E02486890D00111698 /* MoreAndTimeSelectView.swift */; };
 		F9B6D9E32486891C00111698 /* MoreAndTimeSelectView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9B6D9E22486891C00111698 /* MoreAndTimeSelectView.xib */; };
 		F9DDBE922457BFEC00A32CB2 /* HUDEXT.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9DDBE912457BFEC00A32CB2 /* HUDEXT.swift */; };
@@ -1194,6 +1196,8 @@
 		F9A0E1DE246D1B1E00D7F26F /* GetGoodsInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetGoodsInfoModel.swift; sourceTree = "<group>"; };
 		F9A4AB6C24C927E900094BD1 /* LogisticsCostDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogisticsCostDetailViewController.swift; sourceTree = "<group>"; };
 		F9A4AB6D24C927E900094BD1 /* LogisticsCostDetailViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LogisticsCostDetailViewController.xib; sourceTree = "<group>"; };
+		F9A4AB7124C933A700094BD1 /* XiaDanUserInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XiaDanUserInfoViewController.swift; sourceTree = "<group>"; };
+		F9A4AB7224C933A700094BD1 /* XiaDanUserInfoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XiaDanUserInfoViewController.xib; sourceTree = "<group>"; };
 		F9B6D9E02486890D00111698 /* MoreAndTimeSelectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreAndTimeSelectView.swift; sourceTree = "<group>"; };
 		F9B6D9E22486891C00111698 /* MoreAndTimeSelectView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreAndTimeSelectView.xib; sourceTree = "<group>"; };
 		F9DDBE912457BFEC00A32CB2 /* HUDEXT.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUDEXT.swift; sourceTree = "<group>"; };
@@ -2861,6 +2865,7 @@
 		F9A4AB6A24C9220C00094BD1 /* 货拉拉 */ = {
 			isa = PBXGroup;
 			children = (
+				F9A4AB7024C9337600094BD1 /* 下单联系人信息 */,
 				F9A4AB6B24C9278200094BD1 /* 费用明细 */,
 			);
 			path = "货拉拉";
@@ -2875,6 +2880,15 @@
 			path = "费用明细";
 			sourceTree = "<group>";
 		};
+		F9A4AB7024C9337600094BD1 /* 下单联系人信息 */ = {
+			isa = PBXGroup;
+			children = (
+				F9A4AB7124C933A700094BD1 /* XiaDanUserInfoViewController.swift */,
+				F9A4AB7224C933A700094BD1 /* XiaDanUserInfoViewController.xib */,
+			);
+			path = "下单联系人信息";
+			sourceTree = "<group>";
+		};
 		F9DDBE932457D3CB00A32CB2 /* Web */ = {
 			isa = PBXGroup;
 			children = (
@@ -3025,6 +3039,7 @@
 				F9A4AB6F24C927E900094BD1 /* LogisticsCostDetailViewController.xib in Resources */,
 				E0B5307F247266F400FFCC15 /* DKXDAdrCell.xib in Resources */,
 				E0A409D12464041200CFF109 /* ThirdCell.xib in Resources */,
+				F9A4AB7424C933A700094BD1 /* XiaDanUserInfoViewController.xib in Resources */,
 				E09B03C12445B96500211A51 /* FgPassViewController.xib in Resources */,
 				E06524EE2458008900CA22E2 /* RuKuViewController.xib in Resources */,
 				E06524F624580BB600CA22E2 /* BaoZhiQiCell.xib in Resources */,
@@ -3559,6 +3574,7 @@
 				E01EA1A4245A60E000F019D5 /* XiaDanChengGongViewController.swift in Sources */,
 				F94A314D2462582F00FEC38E /* GeneralInfoModel.swift in Sources */,
 				E02DDD8D244FE43900ABB707 /* NewCreateFooter.swift in Sources */,
+				F9A4AB7324C933A700094BD1 /* XiaDanUserInfoViewController.swift in Sources */,
 				E0D197CF24485649002B080C /* BluetoothConnectViewController.swift in Sources */,
 				E0AA3A87248F3C5E00CBFC27 /* StatisticsModel.swif.swift in Sources */,
 				F93E31F724721C4200524DFC /* EditOGPAdModel.swift in Sources */,

GeliBusinessPlatform/Assets.xcassets/货拉拉/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/货拉拉/编组-下单联系人信息.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "编组-下单联系人信息.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "编组-下单联系人信息@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "编组-下单联系人信息@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/ViewController/新增、编辑品牌/XinZengPinPaiViewController.xib

@@ -42,6 +42,9 @@
                             <color key="value" name="按钮渐变色下,字体颜色"/>
                         </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
+                        <userDefinedRuntimeAttribute type="number" keyPath="gradientRotation">
+                            <real key="value" value="0.0"/>
+                        </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                     <connections>
                         <action selector="btnAction:" destination="-1" eventType="touchUpInside" id="BWZ-rA-lPV"/>

GeliBusinessPlatform/ViewController/货拉拉/下单联系人信息/XiaDanUserInfoViewController.swift

+//
+//  XiaDanUserInfoViewController.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/7/23.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+import LGButton
+import ContactsUI
+
+class XiaDanUserInfoViewController: BaseViewController , CNContactPickerDelegate{
+
+    @IBOutlet weak var messageCountLbl: UILabel!
+    @IBOutlet weak var messageTV: UITextView!
+    @IBOutlet weak var userPhoneTF: UITextField!
+    @IBOutlet weak var userNameTF: UITextField!
+    @IBOutlet weak var orderTimeLbl: UILabel!
+    @IBOutlet weak var contentV: UIView!
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navbar.title = "下单联系人信息"
+        self.view.addSubview(navbar)
+    
+        SetTopFrame(view: contentV, height: 370)
+     }
+    @IBAction func gotoPhoneAccoutAction(_ sender: UIButton) {
+        print("gotoPhoneAccoutAction-获取通讯录")
+        //联系人选择控制器
+        let contactPicker = CNContactPickerViewController()
+        //设置代理
+        contactPicker.delegate = self
+        //弹出控制器
+        self.present(contactPicker, animated: true, completion: nil)
+    }
+    //单选联系人
+    func contactPicker(_ picker: CNContactPickerViewController,
+                       didSelect contact: CNContact) {
+        //获取联系人的姓名
+        let lastName = contact.familyName
+        let firstName = contact.givenName
+        //获取联系人电话号码
+        let phones = contact.phoneNumbers
+        userNameTF.text = lastName + firstName
+        if phones.count > 0 {
+            var phone = phones[0].value.stringValue
+            if phone.contains("-") {
+                let phonestr = phone
+                let strarr = phonestr.components(separatedBy: "-")
+                phone = ""
+                for str in strarr {
+                    phone = phone + str
+                }
+             }
+            userPhoneTF.text = phone
+        }
+        
+    }
+    @IBAction func sureUserInfoAction(_ sender: LGButton) {
+        print("sureUserInfoAction-确定")
+
+    }
+    
+}