asdfasdfasdf

GeliBusinessPlatform/AppDelegate.swift

@@ -282,8 +282,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont
         
         let v2 = GoodsManageListVC()
         
-//        let v3 = WorkCViewController()
-        let v3 = PPH_SUC_VC()
+        let v3 = WorkCViewController()
         
         let v4 = WarehoseMangementListVC()
         

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -16,7 +16,15 @@ import IQKeyboardManagerSwift
 
 
 class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate, GLAlertSelectViewDelegate,CLLocationManagerDelegate, CityListViewControllerDelegate,ToAndFormSelectViewControllerDelegate,WayBillAddressCanDelItemCellDelegate,HLLTopCellDelegate,OtherDemandViewControllerDelegate,OnlyViewCellDelegate, XiaDanUserInfoViewControllerDelegate{
+    //MARK: - 拼拼货
     
+    @IBAction func check_contract_action(_ sender: Any) {
+        print("查看条款")
+    }
+    @IBAction func click_action(_ sender: Any) {
+        apply_btn.isSelected = !apply_btn.isSelected
+    }
+    @IBOutlet weak var apply_btn: UIButton!
     @IBOutlet weak var p_p_view: UIView!
     var isLoadingTime = true
     let nonce_str = String.randomStr(len: 30)
@@ -1032,6 +1040,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             make.height.equalTo(30)
             make.width.equalTo(self.locBtn.bounds.size.width)
         })
+        
+        
+        //MARK: - 拼拼货
+        
     }
     
     //MARK:--//冷运请求期望上门时间

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.xib

@@ -13,6 +13,7 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="XiaYunDanViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="YuGuPriceLbl" destination="b3u-F0-etc" id="F8r-lf-53O"/>
+                <outlet property="apply_btn" destination="0MA-Wj-rzD" id="erV-Zn-nzy"/>
                 <outlet property="bottomView" destination="BXb-QP-ceT" id="mix-bc-FvQ"/>
                 <outlet property="hBtnViewH" destination="udi-Jp-eUF" id="lD6-tv-X0U"/>
                 <outlet property="hListView" destination="IhS-vZ-6YK" id="8cK-6U-GmQ"/>
@@ -230,7 +231,7 @@
                             <state key="normal" title="拼拼货">
                                 <color key="titleColor" name="9A9A9A"/>
                             </state>
-                            <state key="selected" title="货拉拉">
+                            <state key="selected" title="拼拼货">
                                 <color key="titleColor" name="蓝色字体颜色"/>
                             </state>
                             <connections>
@@ -371,7 +372,7 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vf0-aT-43t">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vf0-aT-43t">
                     <rect key="frame" x="0.0" y="88" width="414" height="808"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dYD-zk-l4l">
@@ -429,9 +430,77 @@
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ROc-Ae-TTC">
                             <rect key="frame" x="0.0" y="680" width="414" height="37"/>
+                            <subviews>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0MA-Wj-rzD">
+                                    <rect key="frame" x="15" y="12.666666666666629" width="12" height="12"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="12" id="Dzc-ky-bua"/>
+                                        <constraint firstAttribute="height" constant="12" id="wKV-jC-JoY"/>
+                                    </constraints>
+                                    <state key="normal" image="lmn_accessory_checkbox"/>
+                                    <state key="selected" image="lmn_accessory_checkbox_"/>
+                                </button>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我已阅读并同意" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cWz-wM-O4T">
+                                    <rect key="frame" x="32" y="11.666666666666629" width="70" height="14"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="70" id="86i-11-gHk"/>
+                                        <constraint firstAttribute="height" constant="14" id="H59-df-1AD"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="10"/>
+                                    <color key="textColor" name="标题字颜色"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="《电子运单契约条款》" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhY-dv-EoW">
+                                    <rect key="frame" x="102" y="11.666666666666629" width="100" height="14"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="100" id="7Yg-XU-BLd"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="10"/>
+                                    <color key="textColor" name="蓝色字体颜色"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HXw-Y2-NEV">
+                                    <rect key="frame" x="107" y="23.666666666666629" width="90" height="1"/>
+                                    <color key="backgroundColor" name="蓝色字体颜色"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="kj7-IR-ESo"/>
+                                    </constraints>
+                                </view>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XYp-wb-Gsc">
+                                    <rect key="frame" x="0.0" y="0.0" width="50" height="37"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="50" id="m6y-9i-pKb"/>
+                                    </constraints>
+                                    <connections>
+                                        <action selector="click_action:" destination="-1" eventType="touchUpInside" id="cJq-CW-vc2"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jf5-8T-bTq">
+                                    <rect key="frame" x="102" y="0.0" width="100" height="37"/>
+                                    <connections>
+                                        <action selector="check_contract_action:" destination="-1" eventType="touchUpInside" id="CNa-pI-t1d"/>
+                                    </connections>
+                                </button>
+                            </subviews>
                             <color key="backgroundColor" name="app底色"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="37" id="1J3-M4-BE8"/>
+                                <constraint firstItem="HXw-Y2-NEV" firstAttribute="top" secondItem="cWz-wM-O4T" secondAttribute="bottom" constant="-2" id="1bz-fA-lik"/>
+                                <constraint firstItem="cWz-wM-O4T" firstAttribute="centerY" secondItem="0MA-Wj-rzD" secondAttribute="centerY" id="2gl-iL-ZJ6"/>
+                                <constraint firstItem="XYp-wb-Gsc" firstAttribute="leading" secondItem="ROc-Ae-TTC" secondAttribute="leading" id="7j3-Xv-i2y"/>
+                                <constraint firstItem="0MA-Wj-rzD" firstAttribute="leading" secondItem="ROc-Ae-TTC" secondAttribute="leading" constant="15" id="LkU-Ez-by4"/>
+                                <constraint firstItem="Jf5-8T-bTq" firstAttribute="centerX" secondItem="yhY-dv-EoW" secondAttribute="centerX" id="UEE-qF-mCY"/>
+                                <constraint firstItem="Jf5-8T-bTq" firstAttribute="width" secondItem="yhY-dv-EoW" secondAttribute="width" id="UiK-gk-Knm"/>
+                                <constraint firstItem="HXw-Y2-NEV" firstAttribute="width" secondItem="yhY-dv-EoW" secondAttribute="width" multiplier="0.9" id="VCn-T5-Y9m"/>
+                                <constraint firstItem="yhY-dv-EoW" firstAttribute="centerY" secondItem="cWz-wM-O4T" secondAttribute="centerY" id="XdL-CP-1Tj"/>
+                                <constraint firstItem="0MA-Wj-rzD" firstAttribute="centerY" secondItem="ROc-Ae-TTC" secondAttribute="centerY" id="Xsa-Ba-zZu"/>
+                                <constraint firstAttribute="bottom" secondItem="Jf5-8T-bTq" secondAttribute="bottom" id="YN6-yB-kIR"/>
+                                <constraint firstItem="HXw-Y2-NEV" firstAttribute="centerX" secondItem="yhY-dv-EoW" secondAttribute="centerX" id="hDM-iq-Joe"/>
+                                <constraint firstItem="Jf5-8T-bTq" firstAttribute="top" secondItem="ROc-Ae-TTC" secondAttribute="top" id="nmx-vL-bNH"/>
+                                <constraint firstItem="XYp-wb-Gsc" firstAttribute="top" secondItem="ROc-Ae-TTC" secondAttribute="top" id="qPl-Eo-9zd"/>
+                                <constraint firstItem="yhY-dv-EoW" firstAttribute="leading" secondItem="cWz-wM-O4T" secondAttribute="trailing" id="wKs-YH-40L"/>
+                                <constraint firstAttribute="bottom" secondItem="XYp-wb-Gsc" secondAttribute="bottom" id="ySI-6N-wCq"/>
+                                <constraint firstItem="cWz-wM-O4T" firstAttribute="leading" secondItem="0MA-Wj-rzD" secondAttribute="trailing" constant="5" id="yje-yo-1FB"/>
                             </constraints>
                         </view>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="lrw-DF-qzM">
@@ -511,6 +580,8 @@
     </designables>
     <resources>
         <image name="jinru" width="13" height="23"/>
+        <image name="lmn_accessory_checkbox" width="60" height="60"/>
+        <image name="lmn_accessory_checkbox_" width="60" height="60"/>
         <namedColor name="#E37847">
             <color red="0.88999998569488525" green="0.47099998593330383" blue="0.27799999713897705" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
@@ -521,7 +592,7 @@
             <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="green">
-            <color red="0.27843137254901962" green="0.71764705882352942" blue="0.58039215686274503" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23499999940395355" green="0.67799997329711914" blue="0.54100000858306885" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="个人中心灰色字体">
             <color red="0.38823529411764707" green="0.38823529411764707" blue="0.38823529411764707" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

GeliBusinessPlatform/ViewController/拼拼货group/P_P_H_YDLB_VC.swift

@@ -10,9 +10,6 @@ import UIKit
 
 class P_P_H_YDLB_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource {
    
-    
-
-   
     @IBOutlet weak var line_view: UIView!
     @IBAction func click_action(_ sender: UIButton) {
         line_view.center.x = sender.center.x