4月修改

ADHTuanCan.xcodeproj/project.pbxproj

@@ -88,7 +88,6 @@
 		C42FF7AE2B15DF7A00B591F4 /* ShoppingCarDetailView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C42FF7B02B15DF7A00B591F4 /* ShoppingCarDetailView.xib */; };
 		C438E3C82AF795A700F671AE /* OrderTypeEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = C438E3C72AF795A700F671AE /* OrderTypeEnum.swift */; };
 		C438E3CA2AF7B4F300F671AE /* OrderViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C438E3C92AF7B4F300F671AE /* OrderViewModel.swift */; };
-		C438E3D42AF7E80300F671AE /* OrderManagerVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = C438E3D62AF7E80300F671AE /* OrderManagerVC.xib */; };
 		C44301F52AF5DC830098C854 /* selectAddressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44301F42AF5DC830098C854 /* selectAddressView.swift */; };
 		C44301FA2AF5DEBA0098C854 /* OrderAddressCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44301F82AF5DEBA0098C854 /* OrderAddressCell.swift */; };
 		C44301FC2AF5E1860098C854 /* OrderAddressCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C44301FE2AF5E1860098C854 /* OrderAddressCell.xib */; };
@@ -174,6 +173,9 @@
 		C45C8A192AD18D41009D6C3A /* timeManageSheetView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C45C8A1B2AD18D41009D6C3A /* timeManageSheetView.xib */; };
 		C45C8A292AD240B9009D6C3A /* OrderManagerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45C8A272AD240B9009D6C3A /* OrderManagerVC.swift */; };
 		C45C8A362AD24932009D6C3A /* OrderListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45C8A342AD24932009D6C3A /* OrderListCell.swift */; };
+		C45CE0762BC4748C0087A769 /* OrderManagerVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = C45CE0782BC4748C0087A769 /* OrderManagerVC.xib */; };
+		C45CE07F2BC476440087A769 /* ShareQRcodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45CE07E2BC476440087A769 /* ShareQRcodeView.swift */; };
+		C45CE0812BC4764F0087A769 /* ShareQRcodeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C45CE0802BC4764F0087A769 /* ShareQRcodeView.xib */; };
 		C45DC1202AE90D230066BD93 /* LanguagesUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45DC11F2AE90D230066BD93 /* LanguagesUtil.swift */; };
 		C45DC1222AE91AB70066BD93 /* ImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45DC1212AE91AB70066BD93 /* ImageView.swift */; };
 		C45E1EC62AF9DC91005C9210 /* MyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45E1EC42AF9DC91005C9210 /* MyViewController.swift */; };
@@ -520,9 +522,6 @@
 		C42FF7B42B15DF7C00B591F4 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/ShoppingCarDetailView.strings"; sourceTree = "<group>"; };
 		C438E3C72AF795A700F671AE /* OrderTypeEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderTypeEnum.swift; sourceTree = "<group>"; };
 		C438E3C92AF7B4F300F671AE /* OrderViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderViewModel.swift; sourceTree = "<group>"; };
-		C438E3D52AF7E80300F671AE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/OrderManagerVC.xib; sourceTree = "<group>"; };
-		C438E3D72AF7E80500F671AE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/OrderManagerVC.strings; sourceTree = "<group>"; };
-		C438E3D82AF7E80700F671AE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/OrderManagerVC.strings"; sourceTree = "<group>"; };
 		C44301F42AF5DC830098C854 /* selectAddressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = selectAddressView.swift; sourceTree = "<group>"; };
 		C44301F82AF5DEBA0098C854 /* OrderAddressCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderAddressCell.swift; sourceTree = "<group>"; };
 		C44301FD2AF5E1860098C854 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/OrderAddressCell.xib; sourceTree = "<group>"; };
@@ -656,6 +655,11 @@
 		C45C8A1F2AD18D45009D6C3A /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/timeManageSheetView.strings"; sourceTree = "<group>"; };
 		C45C8A272AD240B9009D6C3A /* OrderManagerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderManagerVC.swift; sourceTree = "<group>"; };
 		C45C8A342AD24932009D6C3A /* OrderListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderListCell.swift; sourceTree = "<group>"; };
+		C45CE0772BC4748C0087A769 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/OrderManagerVC.xib; sourceTree = "<group>"; };
+		C45CE07A2BC474900087A769 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/OrderManagerVC.strings; sourceTree = "<group>"; };
+		C45CE07C2BC474910087A769 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/OrderManagerVC.strings"; sourceTree = "<group>"; };
+		C45CE07E2BC476440087A769 /* ShareQRcodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareQRcodeView.swift; sourceTree = "<group>"; };
+		C45CE0802BC4764F0087A769 /* ShareQRcodeView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShareQRcodeView.xib; sourceTree = "<group>"; };
 		C45DC11F2AE90D230066BD93 /* LanguagesUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguagesUtil.swift; sourceTree = "<group>"; };
 		C45DC1212AE91AB70066BD93 /* ImageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageView.swift; sourceTree = "<group>"; };
 		C45E1EC42AF9DC91005C9210 /* MyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyViewController.swift; sourceTree = "<group>"; };
@@ -1503,6 +1507,15 @@
 			path = "确认订单";
 			sourceTree = "<group>";
 		};
+		C45CE07D2BC475FB0087A769 /* 分享View */ = {
+			isa = PBXGroup;
+			children = (
+				C45CE07E2BC476440087A769 /* ShareQRcodeView.swift */,
+				C45CE0802BC4764F0087A769 /* ShareQRcodeView.xib */,
+			);
+			path = "分享View";
+			sourceTree = "<group>";
+		};
 		C45F7AEC2B3463F1004D944F /* 优惠 */ = {
 			isa = PBXGroup;
 			children = (
@@ -1727,6 +1740,7 @@
 		C4836A262AC3F80E00E3FA1B /* Class */ = {
 			isa = PBXGroup;
 			children = (
+				C45CE07D2BC475FB0087A769 /* 分享View */,
 				C45F7AEC2B3463F1004D944F /* 优惠 */,
 				C45654622B0CFF8700F3E628 /* 图片管理 */,
 				C4836AA12AC51BDC00E3FA1B /* Libs */,
@@ -2058,7 +2072,7 @@
 				C45001682AD677FC00F96CFA /* view */,
 				C4CF5F562ACD502200B6B2D9 /* 已选菜品 */,
 				C45C8A272AD240B9009D6C3A /* OrderManagerVC.swift */,
-				C438E3D62AF7E80300F671AE /* OrderManagerVC.xib */,
+				C45CE0782BC4748C0087A769 /* OrderManagerVC.xib */,
 			);
 			path = "订单";
 			sourceTree = "<group>";
@@ -2562,6 +2576,7 @@
 				C4CF5F4A2ACD468000B6B2D9 /* StartView.xib in Resources */,
 				C44CFA672AFB81FF000D592D /* BrokerageCell.xib in Resources */,
 				C456545A2B0CA94E00F3E628 /* EditPersonSheetView.xib in Resources */,
+				C45CE0812BC4764F0087A769 /* ShareQRcodeView.xib in Resources */,
 				C45654462B0A628800F3E628 /* WriteOffResonCell.xib in Resources */,
 				C45F7AF52B347532004D944F /* SaleDetailView.xib in Resources */,
 				C4EDDA0C2AF28B0D00BE8EFF /* icon_refresh_3@2x.png in Resources */,
@@ -2588,7 +2603,7 @@
 				C4577CBD2AEA8FFD004D9439 /* SetMealCollectionItem.xib in Resources */,
 				C42AEE222B037BD40045EF66 /* AddEvaluateCell.xib in Resources */,
 				C42AEDE82B03727E0045EF66 /* HomeViewController.xib in Resources */,
-				C438E3D42AF7E80300F671AE /* OrderManagerVC.xib in Resources */,
+				C45CE0762BC4748C0087A769 /* OrderManagerVC.xib in Resources */,
 				C41DA4B52AFF22DD00707C5D /* IntegralHeadView.xib in Resources */,
 				C42AEDEF2B0372D70045EF66 /* HomeSecondViewController.xib in Resources */,
 				C4C6D84B2AFCD22800E1AFB5 /* PswPayView.xib in Resources */,
@@ -2745,6 +2760,7 @@
 				C44301F52AF5DC830098C854 /* selectAddressView.swift in Sources */,
 				C40690F22B07A2FE002688FD /* MonthModel.m in Sources */,
 				C448CD122AFE4FA900B3B068 /* textView.swift in Sources */,
+				C45CE07F2BC476440087A769 /* ShareQRcodeView.swift in Sources */,
 				C4836A8D2AC5180B00E3FA1B /* StringUtil.swift in Sources */,
 				C4CF5F0D2AC9801300B6B2D9 /* MCHud.swift in Sources */,
 				C4836B3D2AC5784900E3FA1B /* HomeViewController.swift in Sources */,
@@ -3199,16 +3215,6 @@
 			name = ShoppingCarDetailView.xib;
 			sourceTree = "<group>";
 		};
-		C438E3D62AF7E80300F671AE /* OrderManagerVC.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				C438E3D52AF7E80300F671AE /* Base */,
-				C438E3D72AF7E80500F671AE /* en */,
-				C438E3D82AF7E80700F671AE /* zh-Hans */,
-			);
-			name = OrderManagerVC.xib;
-			sourceTree = "<group>";
-		};
 		C44301FE2AF5E1860098C854 /* OrderAddressCell.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -3438,6 +3444,16 @@
 			name = timeManageSheetView.xib;
 			sourceTree = "<group>";
 		};
+		C45CE0782BC4748C0087A769 /* OrderManagerVC.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				C45CE0772BC4748C0087A769 /* Base */,
+				C45CE07A2BC474900087A769 /* en */,
+				C45CE07C2BC474910087A769 /* zh-Hans */,
+			);
+			name = OrderManagerVC.xib;
+			sourceTree = "<group>";
+		};
 		C45E1ECA2AF9E412005C9210 /* MyViewController.xib */ = {
 			isa = PBXVariantGroup;
 			children = (

ADHTuanCan.xcworkspace/xcuserdata/aodeheng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -94,13 +94,13 @@
             filePath = "ADHTuanCan/Class/订单/订单详情/view/OderDetailHeadView.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "578"
-            endingLineNumber = "578"
+            startingLineNumber = "619"
+            endingLineNumber = "619"
             landmarkName = "codeCountdown(isCodeTimer:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "A69BE914-7BB1-45C5-93C9-D53ED4B20C77 - 5348c03367c703c5"
+                  uuid = "A69BE914-7BB1-45C5-93C9-D53ED4B20C77 - 5348c03367c4fe3d"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -110,12 +110,12 @@
                   urlString = "file:///Users/aodeheng/Desktop/TuanCanAPP_iOS/ADHTuanCan/Class/%E8%AE%A2%E5%8D%95/%E8%AE%A2%E5%8D%95%E8%AF%A6%E6%83%85/view/OderDetailHeadView.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "579"
-                  endingLineNumber = "579"
-                  offsetFromSymbolStart = "1924">
+                  startingLineNumber = "619"
+                  endingLineNumber = "619"
+                  offsetFromSymbolStart = "2348">
                </Location>
                <Location
-                  uuid = "A69BE914-7BB1-45C5-93C9-D53ED4B20C77 - 5348c03367c703e4"
+                  uuid = "A69BE914-7BB1-45C5-93C9-D53ED4B20C77 - 5348c03367c4fe3d"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -125,25 +125,10 @@
                   urlString = "file:///Users/aodeheng/Desktop/TuanCanAPP_iOS/ADHTuanCan/Class/%E8%AE%A2%E5%8D%95/%E8%AE%A2%E5%8D%95%E8%AF%A6%E6%83%85/view/OderDetailHeadView.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "578"
-                  endingLineNumber = "578"
+                  startingLineNumber = "619"
+                  endingLineNumber = "619"
                   offsetFromSymbolStart = "1948">
                </Location>
-               <Location
-                  uuid = "A69BE914-7BB1-45C5-93C9-D53ED4B20C77 - 5348c03367c703e4"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "ADHTuanCan.OderDetailHeadView.codeCountdown(isCodeTimer: Swift.Bool) -&gt; ()"
-                  moduleName = "ADHTuanCan"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/aodeheng/Desktop/TuanCanAPP_iOS/ADHTuanCan/Class/%E8%AE%A2%E5%8D%95/%E8%AE%A2%E5%8D%95%E8%AF%A6%E6%83%85/view/OderDetailHeadView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "578"
-                  endingLineNumber = "578"
-                  offsetFromSymbolStart = "2160">
-               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>

ADHTuanCan/Assets.xcassets/首页/shareBackImg.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "60491712546862_.pic.jpg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ADHTuanCan/Class/分享View/ShareQRcodeView.swift

@@ -0,0 +1,109 @@
+//
+//  ShareQRcodeView.swift
+//  ADHTuanCan
+//
+//  Created by 敖德亨 on 2024/4/9.
+//
+
+import UIKit
+import CoreImage
+import SwiftyUserDefaults
+
+class ShareQRcodeView: UIView {
+
+    @IBOutlet weak var blackView: UIView!
+ 
+    @IBOutlet weak var QRImgView: UIImageView!
+
+    
+    @IBAction func backAction(_ sender: UIButton) {
+        self.hidden()
+    }
+    
+    @IBAction func shareAction(_ sender: UIButton) {
+        self.takeScreenshot()
+        
+        self.hidden()
+    }
+    
+    /// hud 提示
+    lazy var hud : MCHud! = {
+        return MCHud()
+    }()
+    
+    func takeScreenshot() {
+        // 1. 获取当前窗口
+        guard let window = UIApplication.shared.windows.first else { return }
+     
+        // 2. 开始图形上下文
+        UIGraphicsBeginImageContextWithOptions(window.frame.size, false, 0.0)
+        guard let context = UIGraphicsGetCurrentContext() else { return }
+     
+        // 3. 将当前窗口渲染到图形上下文
+        window.layer.render(in: context)
+     
+        // 4. 从图形上下文获取图片
+        guard let screenshot = UIGraphicsGetImageFromCurrentImageContext() else { return }
+     
+        // 5. 结束图形上下文
+        UIGraphicsEndImageContext()
+     
+        // 6. 将图片保存到相册
+        UIImageWriteToSavedPhotosAlbum(screenshot, nil, nil, nil)
+        
+        self.hud.showSuccess()
+    }
+    
+    /// 展示
+    public func show(vc : ADHBaseVC , QRString : String){
+        
+        let context = CIContext()
+        
+        // 创建一个 CIFilter 对象，并设置其属性：
+        if let filter = CIFilter(name: "CIQRCodeGenerator") {
+            // 设置输入数据
+            let data = QRString.data(using: .isoLatin1)
+            filter.setValue(data, forKey: "inputMessage")
+            
+            // 设置纠错级别，可选值：L(7%), M(15%), Q(25%), H(30%)
+            filter.setValue("M", forKey: "inputCorrectionLevel")
+            
+            // 获取生成的二维码图像
+            if let outputImage = filter.outputImage {
+                // 将图像转换为可显示的 CGImage
+                if let cgImage = context.createCGImage(outputImage, from: outputImage.extent) {
+                    // 创建 UIImage 并显示
+                    let qrCodeImage = UIImage(cgImage: cgImage)
+                    // 在这里使用 qrCodeImage，可以将其显示到 UIImageView 或者保存到文件中
+                    self.QRImgView.image = qrCodeImage
+                }
+            }
+        }
+
+
+        
+        kAppDelegateWindow.addSubview(self)
+        self.blackView.alpha = 0
+        self.frame = CGRect.init(x: 0, y: kSCREEN_HEIGHT, width: kSCREEN_WIDTH, height: kSCREEN_HEIGHT)
+        UIView.animate(withDuration: 0.5) {
+            self.frame = CGRect.init(x: 0, y: 0, width: kSCREEN_WIDTH, height: kSCREEN_HEIGHT)
+            self.layoutIfNeeded()
+        }
+        DELAY(0.5) {
+            self.blackView.alpha = 0.3
+        }
+       
+    }
+    
+    /// 隐藏
+    public func hidden(){
+        self.blackView.alpha = 0
+        UIView.animate(withDuration: 0.5) {
+            self.frame = CGRect.init(x: 0, y: kSCREEN_HEIGHT, width: kSCREEN_WIDTH, height: kSCREEN_HEIGHT)
+            self.layoutIfNeeded()
+        }
+        DELAY(0.5) {
+            self.removeFromSuperview()
+        }
+    }
+}

ADHTuanCan/Class/分享View/ShareQRcodeView.xib

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="w9v-FI-dhb" customClass="ShareQRcodeView" customModule="ADHTuanCan" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <view alpha="0.29999999999999999" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xdm-rN-ZUz">
+                    <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dz7-ME-c65">
+                            <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <connections>
+                                <action selector="backAction:" destination="w9v-FI-dhb" eventType="touchUpInside" id="hYp-wh-DZo"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="dz7-ME-c65" firstAttribute="leading" secondItem="xdm-rN-ZUz" secondAttribute="leading" id="8Ua-TZ-WPz"/>
+                        <constraint firstAttribute="bottom" secondItem="dz7-ME-c65" secondAttribute="bottom" id="hHP-eJ-c9C"/>
+                        <constraint firstAttribute="trailing" secondItem="dz7-ME-c65" secondAttribute="trailing" id="hMc-G6-4zi"/>
+                        <constraint firstItem="dz7-ME-c65" firstAttribute="top" secondItem="xdm-rN-ZUz" secondAttribute="top" id="pY0-aI-Iak"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uVu-Ej-wFD">
+                    <rect key="frame" x="30" y="226" width="333" height="400"/>
+                    <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="shareBackImg" translatesAutoresizingMaskIntoConstraints="NO" id="XEk-93-0Bz">
+                            <rect key="frame" x="0.0" y="0.0" width="333" height="400"/>
+                        </imageView>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="SqM-LQ-7vY">
+                            <rect key="frame" x="35" y="35" width="262" height="245"/>
+                        </imageView>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <constraints>
+                        <constraint firstItem="XEk-93-0Bz" firstAttribute="top" secondItem="uVu-Ej-wFD" secondAttribute="top" id="4Vg-dj-pSq"/>
+                        <constraint firstItem="SqM-LQ-7vY" firstAttribute="leading" secondItem="uVu-Ej-wFD" secondAttribute="leading" constant="35" id="8Ea-ij-d5Q"/>
+                        <constraint firstItem="XEk-93-0Bz" firstAttribute="leading" secondItem="uVu-Ej-wFD" secondAttribute="leading" id="E5L-mm-2D7"/>
+                        <constraint firstAttribute="height" constant="400" id="ThU-WF-2F8"/>
+                        <constraint firstAttribute="bottom" secondItem="SqM-LQ-7vY" secondAttribute="bottom" constant="120" id="gz5-Pz-BDr"/>
+                        <constraint firstItem="SqM-LQ-7vY" firstAttribute="top" secondItem="uVu-Ej-wFD" secondAttribute="top" constant="35" id="lmk-2d-S4E"/>
+                        <constraint firstAttribute="trailing" secondItem="XEk-93-0Bz" secondAttribute="trailing" id="sdG-LE-Ooo"/>
+                        <constraint firstAttribute="bottom" secondItem="XEk-93-0Bz" secondAttribute="bottom" id="wHA-Fq-SiF"/>
+                        <constraint firstAttribute="trailing" secondItem="SqM-LQ-7vY" secondAttribute="trailing" constant="36" id="zEr-Sm-YD8"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="0.0"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mgF-IL-5aJ">
+                    <rect key="frame" x="30" y="656" width="333" height="50"/>
+                    <color key="backgroundColor" red="1" green="0.72233860577950582" blue="0.46036158249981474" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="50" id="rBP-vZ-YdK"/>
+                    </constraints>
+                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                    <state key="normal" title="分享">
+                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </state>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="6"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                    <connections>
+                        <action selector="shareAction:" destination="w9v-FI-dhb" eventType="touchUpInside" id="6hV-vW-cIh"/>
+                    </connections>
+                </button>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="ZDx-on-aId"/>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstItem="uVu-Ej-wFD" firstAttribute="leading" secondItem="ZDx-on-aId" secondAttribute="leading" constant="30" id="9oM-1X-Lpf"/>
+                <constraint firstItem="uVu-Ej-wFD" firstAttribute="centerX" secondItem="w9v-FI-dhb" secondAttribute="centerX" id="FJk-bY-ARW"/>
+                <constraint firstItem="ZDx-on-aId" firstAttribute="trailing" secondItem="uVu-Ej-wFD" secondAttribute="trailing" constant="30" id="MBu-Oj-6eH"/>
+                <constraint firstItem="ZDx-on-aId" firstAttribute="trailing" secondItem="xdm-rN-ZUz" secondAttribute="trailing" id="VU9-Fr-nXD"/>
+                <constraint firstAttribute="bottom" secondItem="xdm-rN-ZUz" secondAttribute="bottom" id="dRd-Dq-WYi"/>
+                <constraint firstItem="ZDx-on-aId" firstAttribute="trailing" secondItem="mgF-IL-5aJ" secondAttribute="trailing" constant="30" id="eJ5-DS-xIC"/>
+                <constraint firstItem="xdm-rN-ZUz" firstAttribute="leading" secondItem="ZDx-on-aId" secondAttribute="leading" id="lJA-Y2-Uux"/>
+                <constraint firstItem="mgF-IL-5aJ" firstAttribute="leading" secondItem="ZDx-on-aId" secondAttribute="leading" constant="30" id="trZ-la-yH4"/>
+                <constraint firstItem="uVu-Ej-wFD" firstAttribute="centerY" secondItem="w9v-FI-dhb" secondAttribute="centerY" id="wR7-7t-ny6"/>
+                <constraint firstItem="mgF-IL-5aJ" firstAttribute="top" secondItem="uVu-Ej-wFD" secondAttribute="bottom" constant="30" id="wX3-BF-suJ"/>
+                <constraint firstItem="xdm-rN-ZUz" firstAttribute="top" secondItem="w9v-FI-dhb" secondAttribute="top" id="wak-3y-s0z"/>
+            </constraints>
+            <connections>
+                <outlet property="QRImgView" destination="SqM-LQ-7vY" id="lYH-NV-EVc"/>
+                <outlet property="blackView" destination="xdm-rN-ZUz" id="qBQ-1O-vs0"/>
+            </connections>
+            <point key="canvasLocation" x="151.90839694656489" y="8.4507042253521139"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="shareBackImg" width="1080" height="1464"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

ADHTuanCan/Class/我的/MyViewController.swift

@@ -67,6 +67,10 @@ class MyViewController: ADHBaseVC {
     
     let callView = Bundle.main.loadNibNamed("phoneCallView", owner: nil, options: nil)?.last as? phoneCallView
     
+    //分享
+    let shareQRcodeView = Bundle.main.loadNibNamed("ShareQRcodeView", owner: nil, options: nil)?.last as? ShareQRcodeView
+    
+    
     let viewModel : MyViewModel = MyViewModel.init()
     let diposableBag = DisposeBag()
     var dataModel : PersonalDetailModel?
@@ -158,16 +162,7 @@ class MyViewController: ADHBaseVC {
     /// 邀请
     /// - Parameter sender: <#sender description#>
     @IBAction func inviteAction(_ sender: UIButton) {
-        
-        let textShare = "KS Culinery"
-       
-        let imageShare = UIImage(named: "图标")
-        
-        let urlShare = URL(string: "https://kcapp.kiansengculinary.com")
-        let activityItems = [textShare,imageShare as Any,urlShare as Any]
-
-        let activityVC = UIActivityViewController.init(activityItems: activityItems, applicationActivities: nil)
-        self.present(activityVC, animated: true)
+        self.shareQRcodeView?.show(vc: self, QRString: self.dataModel?.inviteUrl ?? "")
     }
     
     /// 设置

ADHTuanCan/Class/我的/model/MyRequestModel.swift

@@ -81,6 +81,10 @@ class PersonalDetailModel : MCBaseModel{
     
     ///邀请码
     var inviteCode : String?
+    
+    ///邀请链接
+    var inviteUrl : String?
+
 }
 
 //MARK: - 获取佣金明细列表

ADHTuanCan/Class/我的/余额/Base.lproj/RechargeAmountViewController.xib

@@ -48,7 +48,7 @@
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MSm-8T-xJn">
-                    <rect key="frame" x="0.0" y="259.66666666666669" width="393" height="558.33333333333326"/>
+                    <rect key="frame" x="0.0" y="259.66666666666669" width="393" height="592.33333333333326"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="充值金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x9f-tA-Vrg">
                             <rect key="frame" x="24.000000000000004" y="24" width="57.333333333333343" height="17"/>
@@ -88,6 +88,25 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LsB-Jw-d0P">
+                    <rect key="frame" x="25" y="768" width="343" height="50"/>
+                    <color key="backgroundColor" red="0.77647058820000003" green="0.1333333333" blue="0.13725490200000001" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="50" id="VIq-z8-cg5"/>
+                    </constraints>
+                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                    <state key="normal" title="确定">
+                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </state>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="6"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                    <connections>
+                        <action selector="saveAction:" destination="-1" eventType="touchUpInside" id="trz-WF-Vhn"/>
+                    </connections>
+                </button>
             </subviews>
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
@@ -95,12 +114,15 @@
                 <constraint firstItem="eTY-ra-GTE" firstAttribute="leading" secondItem="zVO-9L-J3g" secondAttribute="trailing" constant="20" id="3bB-iE-bZv"/>
                 <constraint firstItem="MSm-8T-xJn" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="BgW-A7-dv1"/>
                 <constraint firstItem="zVO-9L-J3g" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="24" id="Glq-yR-3Vm"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="MSm-8T-xJn" secondAttribute="bottom" id="TeM-zV-8CI"/>
+                <constraint firstAttribute="bottom" secondItem="MSm-8T-xJn" secondAttribute="bottom" id="TeM-zV-8CI"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="MSm-8T-xJn" secondAttribute="trailing" id="YS0-CZ-J3P"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="eTY-ra-GTE" secondAttribute="trailing" constant="25" id="Z9g-PE-4pz"/>
                 <constraint firstItem="zVO-9L-J3g" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="128" id="bXc-UQ-bRM"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="LsB-Jw-d0P" secondAttribute="bottom" id="hjQ-VG-ffR"/>
                 <constraint firstItem="MSm-8T-xJn" firstAttribute="top" secondItem="eTY-ra-GTE" secondAttribute="bottom" constant="44" id="jgb-xe-8SD"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="LsB-Jw-d0P" secondAttribute="trailing" constant="25" id="jt4-Jf-Tun"/>
                 <constraint firstItem="eTY-ra-GTE" firstAttribute="centerY" secondItem="zVO-9L-J3g" secondAttribute="centerY" id="rGO-LC-410"/>
+                <constraint firstItem="LsB-Jw-d0P" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="25" id="u6w-KY-nNu"/>
             </constraints>
             <point key="canvasLocation" x="103" y="0.0"/>
         </view>

ADHTuanCan/Class/我的/余额/RechargeAmountViewController.swift

@@ -33,9 +33,9 @@ class RechargeAmountViewController: ADHBaseVC {
         moneyTF.text = ""
         moneyTF.inputDecimal(maxValue: 999999) {
             self.money = self.moneyTF.text
-            if self.money > 0{
-                self.getRechargeAmountOrderId()
-            }
+//            if self.money > 0{
+//                self.getRechargeAmountOrderId()
+//            }
         }
         moneyTF.becomeFirstResponder()
     }
@@ -122,5 +122,13 @@ class RechargeAmountViewController: ADHBaseVC {
       }
     }
     
-
+    @IBAction func saveAction(_ sender: UIButton) {
+        
+        if self.money > 0{
+            self.getRechargeAmountOrderId()
+        }else{
+            self.hud.showFailure(LanguagesUtil.createTextBy(Ctext: "充值金额必须大于0", Etext: "The recharge amount must be greater than 0"))
+        }
+    }
+    
 }

ADHTuanCan/Class/我的/余额/en.lproj/RechargeAmountViewController.strings

@@ -7,3 +7,6 @@
 
 /* Class = "UILabel"; text = "充值方式："; ObjectID = "zVO-9L-J3g"; */
 "zVO-9L-J3g.text" = "Recharge method：";
+
+/* Class = "UIButton"; normalTitle = "确定"; ObjectID = "LsB-Jw-d0P"; */
+"LsB-Jw-d0P.normalTitle" = "Confirm";

ADHTuanCan/Class/我的/余额/zh-Hans.lproj/RechargeAmountViewController.strings

@@ -7,3 +7,7 @@
 
 /* Class = "UILabel"; text = "充值方式："; ObjectID = "zVO-9L-J3g"; */
 "zVO-9L-J3g.text" = "充值方式：";
+
+
+/* Class = "UIButton"; normalTitle = "确定"; ObjectID = "LsB-Jw-d0P"; */
+"LsB-Jw-d0P.normalTitle" = "确定";

ADHTuanCan/Class/订单/Base.lproj/OrderManagerVC.xib

@@ -139,7 +139,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="78.666666666666671" height="32.666666666666664"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                    <state key="normal" title="待付款">
+                                    <state key="normal" title="全部">
                                         <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </state>
                                 </button>
@@ -147,7 +147,7 @@
                                     <rect key="frame" x="78.666666666666657" y="0.0" width="78.666666666666657" height="32.666666666666664"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                    <state key="normal" title="待接单">
+                                    <state key="normal" title="待付款">
                                         <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </state>
                                 </button>
@@ -155,7 +155,7 @@
                                     <rect key="frame" x="157.33333333333334" y="0.0" width="78.333333333333343" height="32.666666666666664"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                    <state key="normal" title="已完成">
+                                    <state key="normal" title="待接单">
                                         <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </state>
                                 </button>
@@ -171,7 +171,7 @@
                                     <rect key="frame" x="314.33333333333331" y="0.0" width="78.666666666666686" height="32.666666666666664"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                    <state key="normal" title="全部">
+                                    <state key="normal" title="待评价">
                                         <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </state>
                                 </button>

ADHTuanCan/Class/订单/OrderManagerVC.swift

@@ -379,21 +379,22 @@ class OrderManagerVC: ADHBaseVC, UIDocumentPickerDelegate {
     }
     
     @objc func sliderAction(sender : UIButton){
-        if sender.tag == 0{
-            self.orderType = .willPay
-        }
         if sender.tag == 1{
-            self.orderType = .takeOrdering
+            self.orderType = .willPay
         }
         if sender.tag == 2{
-            self.orderType = .finish
+            self.orderType = .takeOrdering
         }
         if sender.tag == 3{
             self.orderType = .delivery
         }
         if sender.tag == 4{
+            self.orderType = .finish
+        }
+        if sender.tag == 0{
             self.orderType = .all
         }
+        
         self.viewModel.orderType = self.orderType
         
         UIView.animate(withDuration: 0.2) {

ADHTuanCan/Class/订单/en.lproj/OrderManagerVC.strings

@@ -1,35 +1,27 @@
 
-/* Class = "UIButton"; normalTitle = "待付款"; ObjectID = "DZO-jF-xT2"; */
-"DZO-jF-xT2.normalTitle" = "Will pay";
+/* Class = "UIButton"; normalTitle = "预览"; ObjectID = "AEF-Qd-LRx"; */
+"AEF-Qd-LRx.normalTitle" = "Preview";
+
+/* Class = "UIButton"; normalTitle = "全部"; ObjectID = "DZO-jF-xT2"; */
+"DZO-jF-xT2.normalTitle" = "All";
 
 /* Class = "UIButton"; normalTitle = "订单"; ObjectID = "euo-KZ-OEN"; */
 "euo-KZ-OEN.normalTitle" = "Order";
 
-/* Class = "UIButton"; selectedTitle = "订单"; ObjectID = "euo-KZ-OEN"; */
-"euo-KZ-OEN.selectedTitle" = "Order";
-
-/* Class = "UIButton"; normalTitle = "白团订单"; ObjectID = "fNY-3c-M9u"; */
-"fNY-3c-M9u.normalTitle" = "White order";
-
 /* Class = "UIButton"; normalTitle = "白团订单"; ObjectID = "fNY-3c-M9u"; */
-"fNY-3c-M9u.selectedTitle" = "White order";
+"fNY-3c-M9u.normalTitle" = "Order";
 
 /* Class = "UIButton"; normalTitle = "待配送"; ObjectID = "g7q-0C-ZWR"; */
-"g7q-0C-ZWR.normalTitle" = "delivery";
-
-/* Class = "UIButton"; normalTitle = "待评价"; ObjectID = "gUO-Lf-Seq"; */
-"gUO-Lf-Seq.normalTitle" = "evaluate";
-
-/* Class = "UIButton"; normalTitle = "全部"; ObjectID = "mpc-hT-sX3"; */
-"mpc-hT-sX3.normalTitle" = "All";
-
-/* Class = "UIButton"; normalTitle = "预览"; ObjectID = "q2R-GF-Y5O"; */
-"q2R-GF-Y5O.normalTitle" = "Preview";
+"g7q-0C-ZWR.normalTitle" = "Delivered";
 
-/* Class = "UIButton"; normalTitle = "待接单"; ObjectID = "sXy-bX-p2I"; */
-"sXy-bX-p2I.normalTitle" = "take order";
+/* Class = "UIButton"; normalTitle = "待接单"; ObjectID = "gUO-Lf-Seq"; */
+"gUO-Lf-Seq.normalTitle" = "Pending";
 
+/* Class = "UIButton"; normalTitle = "待评价"; ObjectID = "mpc-hT-sX3"; */
+"mpc-hT-sX3.normalTitle" = "Evaluated";
 
 /* Class = "UIButton"; normalTitle = "订单"; ObjectID = "qol-Qs-RPl"; */
 "qol-Qs-RPl.normalTitle" = "Order";
 
+/* Class = "UIButton"; normalTitle = "待付款"; ObjectID = "sXy-bX-p2I"; */
+"sXy-bX-p2I.normalTitle" = "Will pay";

ADHTuanCan/Class/订单/zh-Hans.lproj/OrderManagerVC.strings

@@ -1,33 +1,27 @@
 
-/* Class = "UIButton"; normalTitle = "待付款"; ObjectID = "DZO-jF-xT2"; */
-"DZO-jF-xT2.normalTitle" = "待付款";
+/* Class = "UIButton"; normalTitle = "预览"; ObjectID = "AEF-Qd-LRx"; */
+"AEF-Qd-LRx.normalTitle" = "预览";
 
-/* Class = "UIButton"; normalTitle = "订单"; ObjectID = "FW9-Dg-E69"; */
-"euo-KZ-OEN.normalTitle" = "订单";
+/* Class = "UIButton"; normalTitle = "全部"; ObjectID = "DZO-jF-xT2"; */
+"DZO-jF-xT2.normalTitle" = "全部";
 
-/* Class = "UIButton"; selectedTitle = "订单"; ObjectID = "FW9-Dg-E69"; */
-"euo-KZ-OEN.selectedTitle" = "订单";
+/* Class = "UIButton"; normalTitle = "订单"; ObjectID = "euo-KZ-OEN"; */
+"euo-KZ-OEN.normalTitle" = "订单";
 
-/* Class = "UIButton"; normalTitle = "白团订单"; ObjectID = "SAY-cS-7t5"; */
+/* Class = "UIButton"; normalTitle = "白团订单"; ObjectID = "fNY-3c-M9u"; */
 "fNY-3c-M9u.normalTitle" = "白团订单";
 
-/* Class = "UIButton"; selectedTitle = "订单"; ObjectID = "fNY-3c-M9u"; */
-"fNY-3c-M9u.selectedTitle" = "订单";
-
 /* Class = "UIButton"; normalTitle = "待配送"; ObjectID = "g7q-0C-ZWR"; */
 "g7q-0C-ZWR.normalTitle" = "待配送";
 
-/* Class = "UIButton"; normalTitle = "待评价"; ObjectID = "gUO-Lf-Seq"; */
-"gUO-Lf-Seq.normalTitle" = "待评价";
+/* Class = "UIButton"; normalTitle = "待接单"; ObjectID = "gUO-Lf-Seq"; */
+"gUO-Lf-Seq.normalTitle" = "待接单";
 
-/* Class = "UIButton"; normalTitle = "全部"; ObjectID = "mpc-hT-sX3"; */
-"mpc-hT-sX3.normalTitle" = "全部";
-
-/* Class = "UIButton"; normalTitle = "预览"; ObjectID = "q2R-GF-Y5O"; */
-"q2R-GF-Y5O.normalTitle" = "预览";
-
-/* Class = "UIButton"; normalTitle = "待接单"; ObjectID = "sXy-bX-p2I"; */
-"sXy-bX-p2I.normalTitle" = "待接单";
+/* Class = "UIButton"; normalTitle = "待评价"; ObjectID = "mpc-hT-sX3"; */
+"mpc-hT-sX3.normalTitle" = "待评价";
 
 /* Class = "UIButton"; normalTitle = "订单"; ObjectID = "qol-Qs-RPl"; */
 "qol-Qs-RPl.normalTitle" = "订单";
+
+/* Class = "UIButton"; normalTitle = "待付款"; ObjectID = "sXy-bX-p2I"; */
+"sXy-bX-p2I.normalTitle" = "待付款";

ADHTuanCan/Class/订单/订单详情/view/Base.lproj/OderDetailHeadView.xib

@@ -12,11 +12,11 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="oGI-Hx-w6f" customClass="OderDetailHeadView" customModule="ADHTuanCan" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="554" height="857"/>
+            <rect key="frame" x="0.0" y="0.0" width="564" height="1361"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="z4z-tz-GIM">
-                    <rect key="frame" x="0.0" y="0.0" width="554" height="120"/>
+                    <rect key="frame" x="0.0" y="0.0" width="564" height="120"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单状态" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="95d-hI-PAF">
                             <rect key="frame" x="25" y="15" width="73.666666666666671" height="30"/>
@@ -36,17 +36,17 @@
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qcd-bS-y87">
-                    <rect key="frame" x="0.0" y="120" width="554" height="737"/>
+                    <rect key="frame" x="0.0" y="120" width="564" height="1241"/>
                     <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
                 </view>
                 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lz0-oV-QPp">
-                    <rect key="frame" x="10" y="50" width="534" height="480"/>
+                    <rect key="frame" x="10" y="50" width="544" height="480"/>
                     <subviews>
                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="fhN-rk-qXo">
-                            <rect key="frame" x="0.0" y="0.0" width="534" height="480"/>
+                            <rect key="frame" x="0.0" y="0.0" width="544" height="480"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jUr-m1-GgY" userLabel="timeView">
-                                    <rect key="frame" x="0.0" y="0.0" width="534" height="30"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="544" height="30"/>
                                     <subviews>
                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="喇叭灰" translatesAutoresizingMaskIntoConstraints="NO" id="4u0-dC-owE">
                                             <rect key="frame" x="10" y="7.6666666666666643" width="15" height="15"/>
@@ -72,10 +72,10 @@
                                     </constraints>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U8U-3J-BjC" userLabel="pendingOrderView">
-                                    <rect key="frame" x="0.0" y="30" width="534" height="100"/>
+                                    <rect key="frame" x="0.0" y="30" width="544" height="100"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xKz-oc-zaI">
-                                            <rect key="frame" x="25" y="20" width="499" height="20.333333333333329"/>
+                                            <rect key="frame" x="25" y="20" width="509" height="20.333333333333329"/>
                                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
                                             <color key="textColor" red="0.10980392160000001" green="0.18823529410000001" blue="0.30980392159999998" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
@@ -87,7 +87,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u8u-vy-6Mo">
-                                            <rect key="frame" x="10" y="99" width="514" height="1"/>
+                                            <rect key="frame" x="10" y="99" width="524" height="1"/>
                                             <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="1" id="riT-Vq-sD0"/>
@@ -113,17 +113,17 @@
                                     </constraints>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PPo-hY-IcP" userLabel="deliveringView">
-                                    <rect key="frame" x="0.0" y="130" width="534" height="100"/>
+                                    <rect key="frame" x="0.0" y="130" width="544" height="100"/>
                                     <subviews>
                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="配送中" translatesAutoresizingMaskIntoConstraints="NO" id="Csv-bT-pb3">
-                                            <rect key="frame" x="237" y="10" width="60" height="60"/>
+                                            <rect key="frame" x="242" y="10" width="60" height="60"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="60" id="AI7-WU-qdz"/>
                                                 <constraint firstAttribute="width" constant="60" id="aaz-Xj-dxv"/>
                                             </constraints>
                                         </imageView>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="78W-Ha-pzr">
-                                            <rect key="frame" x="10" y="99" width="514" height="1"/>
+                                            <rect key="frame" x="10" y="99" width="524" height="1"/>
                                             <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="1" id="zn3-bT-0eF"/>
@@ -135,7 +135,7 @@
                                             </userDefinedRuntimeAttributes>
                                         </view>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="正在路上..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oEQ-XL-iE6">
-                                            <rect key="frame" x="232" y="75" width="70" height="17"/>
+                                            <rect key="frame" x="237" y="75" width="70" height="17"/>
                                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                                             <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.1333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -154,7 +154,7 @@
                                     </constraints>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sRJ-LC-u4B" userLabel="deliveryView">
-                                    <rect key="frame" x="0.0" y="230" width="534" height="100"/>
+                                    <rect key="frame" x="0.0" y="230" width="544" height="100"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WsH-Bg-rQy">
                                             <rect key="frame" x="28.666666666666664" y="41" width="1" height="18"/>
@@ -177,7 +177,7 @@
                                             </userDefinedRuntimeAttributes>
                                         </view>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3bS-uL-2Cr">
-                                            <rect key="frame" x="10" y="99" width="514" height="1"/>
+                                            <rect key="frame" x="10" y="99" width="524" height="1"/>
                                             <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="1" id="aab-qg-SYh"/>
@@ -208,7 +208,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K2z-qH-F4v">
-                                            <rect key="frame" x="502" y="20" width="7" height="18"/>
+                                            <rect key="frame" x="512" y="20" width="7" height="18"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                             <color key="textColor" red="0.54901960780000003" green="0.58039215690000001" blue="0.69019607839999997" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
@@ -220,7 +220,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z3w-EZ-Onj">
-                                            <rect key="frame" x="500" y="61" width="9" height="18"/>
+                                            <rect key="frame" x="510" y="61" width="9" height="18"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                             <color key="textColor" red="0.54901960780000003" green="0.58039215690000001" blue="0.69019607839999997" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
@@ -251,16 +251,16 @@
                                     </constraints>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aio-pR-auZ" userLabel="timeOutView">
-                                    <rect key="frame" x="0.0" y="330" width="534" height="50"/>
+                                    <rect key="frame" x="0.0" y="330" width="544" height="50"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付超时，单已取消" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9CR-yj-6yn">
-                                            <rect key="frame" x="25" y="15.333333333333313" width="484" height="19.333333333333329"/>
+                                            <rect key="frame" x="25" y="15.333333333333313" width="494" height="19.333333333333329"/>
                                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                                             <color key="textColor" red="0.10980392160000001" green="0.18823529410000001" blue="0.30980392159999998" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6tF-gN-5Xj">
-                                            <rect key="frame" x="10" y="49" width="514" height="1"/>
+                                            <rect key="frame" x="10" y="49" width="524" height="1"/>
                                             <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="1" id="ZuQ-b0-NSd"/>
@@ -284,29 +284,29 @@
                                     </constraints>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VW4-NT-CHB" userLabel="btnView">
-                                    <rect key="frame" x="0.0" y="380" width="534" height="100"/>
+                                    <rect key="frame" x="0.0" y="380" width="544" height="100"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="NWz-7m-3GC">
-                                            <rect key="frame" x="0.0" y="0.0" width="534" height="100"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="544" height="100"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bms-Km-sbn" userLabel="payBtnView">
-                                                    <rect key="frame" x="0.0" y="0.0" width="76.333333333333329" height="100"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="77.666666666666671" height="100"/>
                                                     <subviews>
                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="修改收货地址" translatesAutoresizingMaskIntoConstraints="NO" id="gUc-od-tPX">
-                                                            <rect key="frame" x="25.666666666666664" y="22.666666666666686" width="25" height="25"/>
+                                                            <rect key="frame" x="26.333333333333336" y="22.666666666666686" width="25" height="25"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="25" id="hrm-LY-Jtl"/>
                                                                 <constraint firstAttribute="height" constant="25" id="xw0-IY-PO5"/>
                                                             </constraints>
                                                         </imageView>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="修改地址" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kVl-hg-cR0">
-                                                            <rect key="frame" x="7.3333333333333321" y="52.666666666666686" width="61.333333333333343" height="18"/>
+                                                            <rect key="frame" x="8.3333333333333321" y="52.666666666666686" width="61.333333333333343" height="18"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                             <color key="textColor" red="0.77647058820000003" green="0.1333333333" blue="0.13725490200000001" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DXN-hP-y0M">
-                                                            <rect key="frame" x="0.0" y="0.0" width="76.333333333333329" height="100"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="77.666666666666671" height="100"/>
                                                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                             <connections>
                                                                 <action selector="addressAction:" destination="oGI-Hx-w6f" eventType="touchUpInside" id="3IA-fg-zKT"/>
@@ -326,23 +326,23 @@
                                                     </constraints>
                                                 </view>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZQB-Ad-tb1" userLabel="payBtnView">
-                                                    <rect key="frame" x="76.333333333333343" y="0.0" width="76.333333333333343" height="100"/>
+                                                    <rect key="frame" x="77.666666666666657" y="0.0" width="77.666666666666657" height="100"/>
                                                     <subviews>
                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="再来一单" translatesAutoresizingMaskIntoConstraints="NO" id="eGb-ho-MhK">
-                                                            <rect key="frame" x="25.666666666666671" y="22.666666666666686" width="25" height="25"/>
+                                                            <rect key="frame" x="26.333333333333329" y="22.666666666666686" width="25" height="25"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="25" id="ST3-Al-FnN"/>
                                                                 <constraint firstAttribute="height" constant="25" id="Zj7-nu-ih4"/>
                                                             </constraints>
                                                         </imageView>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="再来一单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rxa-tS-ZuY">
-                                                            <rect key="frame" x="7.3333333333333464" y="52.666666666666686" width="61.333333333333343" height="18"/>
+                                                            <rect key="frame" x="8.3333333333333321" y="52.666666666666686" width="61.333333333333343" height="18"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                             <color key="textColor" red="0.77647058820000003" green="0.1333333333" blue="0.13725490200000001" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="P1q-mY-e3A">
-                                                            <rect key="frame" x="0.0" y="0.0" width="76.333333333333329" height="100"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="77.666666666666671" height="100"/>
                                                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                             <connections>
                                                                 <action selector="oneMoreAgain:" destination="oGI-Hx-w6f" eventType="touchUpInside" id="QIj-sD-GF1"/>
@@ -362,23 +362,23 @@
                                                     </constraints>
                                                 </view>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ln4-oU-LYm" userLabel="payBtnView">
-                                                    <rect key="frame" x="152.66666666666666" y="0.0" width="76.333333333333343" height="100"/>
+                                                    <rect key="frame" x="155.33333333333334" y="0.0" width="77.666666666666657" height="100"/>
                                                     <subviews>
                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="已收货" translatesAutoresizingMaskIntoConstraints="NO" id="Bok-nC-BZn">
-                                                            <rect key="frame" x="25.666666666666686" y="22.666666666666686" width="25" height="25"/>
+                                                            <rect key="frame" x="26.333333333333314" y="22.666666666666686" width="25" height="25"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="25" id="ZLW-TW-BSd"/>
                                                                 <constraint firstAttribute="width" constant="25" id="oCE-iW-3c3"/>
                                                             </constraints>
                                                         </imageView>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认收货" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rvn-6k-9O3">
-                                                            <rect key="frame" x="7.3333333333333464" y="52.666666666666686" width="61.333333333333343" height="18"/>
+                                                            <rect key="frame" x="8.3333333333333179" y="52.666666666666686" width="61.333333333333343" height="18"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                             <color key="textColor" red="0.77647058820000003" green="0.1333333333" blue="0.13725490200000001" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nrn-Tx-PEX">
-                                                            <rect key="frame" x="0.0" y="0.0" width="76.333333333333329" height="100"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="77.666666666666671" height="100"/>
                                                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                             <connections>
                                                                 <action selector="confirmReceipt:" destination="oGI-Hx-w6f" eventType="touchUpInside" id="nzC-J8-pZQ"/>
@@ -398,23 +398,23 @@
                                                     </constraints>
                                                 </view>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G69-QQ-K25" userLabel="payBtnView">
-                                                    <rect key="frame" x="229" y="0.0" width="76" height="100"/>
+                                                    <rect key="frame" x="233" y="0.0" width="78" height="100"/>
                                                     <subviews>
                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="取消订单" translatesAutoresizingMaskIntoConstraints="NO" id="NkR-iJ-jU7">
-                                                            <rect key="frame" x="25.666666666666686" y="22.666666666666686" width="25" height="25"/>
+                                                            <rect key="frame" x="26.666666666666686" y="22.666666666666686" width="25" height="25"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="25" id="EIR-Pd-Zaq"/>
                                                                 <constraint firstAttribute="width" constant="25" id="du6-X2-Izg"/>
                                                             </constraints>
                                                         </imageView>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="取消订单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YZZ-WB-1BO">
-                                                            <rect key="frame" x="7.3333333333333464" y="52.666666666666686" width="61.333333333333343" height="18"/>
+                                                            <rect key="frame" x="8.3333333333333464" y="52.666666666666686" width="61.333333333333343" height="18"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                             <color key="textColor" red="0.54901960780000003" green="0.58039215690000001" blue="0.69019607839999997" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uze-95-gTU">
-                                                            <rect key="frame" x="0.0" y="0.0" width="76" height="100"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="78" height="100"/>
                                                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                             <connections>
                                                                 <action selector="cancelOrderAction:" destination="oGI-Hx-w6f" eventType="touchUpInside" id="fTE-Ml-xDw"/>
@@ -434,23 +434,23 @@
                                                     </constraints>
                                                 </view>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rcq-rH-p8b" userLabel="payBtnView">
-                                                    <rect key="frame" x="305" y="0.0" width="76.333333333333314" height="100"/>
+                                                    <rect key="frame" x="311" y="0.0" width="77.666666666666686" height="100"/>
                                                     <subviews>
                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="去支付" translatesAutoresizingMaskIntoConstraints="NO" id="tlL-lN-BcH">
-                                                            <rect key="frame" x="25.666666666666686" y="22.666666666666686" width="25" height="25"/>
+                                                            <rect key="frame" x="26.333333333333314" y="22.666666666666686" width="25" height="25"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="25" id="8ee-A6-Tde"/>
                                                                 <constraint firstAttribute="width" constant="25" id="SxQ-Ac-6hQ"/>
                                                             </constraints>
                                                         </imageView>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="去支付" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fhp-LO-rtQ">
-                                                            <rect key="frame" x="15.333333333333314" y="52.666666666666686" width="46" height="18"/>
+                                                            <rect key="frame" x="15.666666666666686" y="52.666666666666686" width="46" height="18"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                             <color key="textColor" red="0.77647058820000003" green="0.1333333333" blue="0.13725490200000001" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2d8-BF-2L1">
-                                                            <rect key="frame" x="0.0" y="0.0" width="76.333333333333329" height="100"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="77.666666666666671" height="100"/>
                                                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                             <connections>
                                                                 <action selector="goToPayAction:" destination="oGI-Hx-w6f" eventType="touchUpInside" id="2NP-Mx-KRG"/>
@@ -470,23 +470,23 @@
                                                     </constraints>
                                                 </view>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WBQ-4V-csU" userLabel="payBtnView">
-                                                    <rect key="frame" x="381.33333333333331" y="0.0" width="76.333333333333314" height="100"/>
+                                                    <rect key="frame" x="388.66666666666669" y="0.0" width="77.666666666666686" height="100"/>
                                                     <subviews>
                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="去评价" translatesAutoresizingMaskIntoConstraints="NO" id="Xhy-k3-chf">
-                                                            <rect key="frame" x="25.666666666666686" y="22.666666666666686" width="25" height="25"/>
+                                                            <rect key="frame" x="26.333333333333314" y="22.666666666666686" width="25" height="25"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="25" id="83s-rr-Jir"/>
                                                                 <constraint firstAttribute="height" constant="25" id="nNk-T3-CHy"/>
                                                             </constraints>
                                                         </imageView>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="去评价" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ujf-Kp-KOn">
-                                                            <rect key="frame" x="15.333333333333371" y="52.666666666666686" width="46" height="18"/>
+                                                            <rect key="frame" x="15.666666666666629" y="52.666666666666686" width="46" height="18"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                             <color key="textColor" red="0.77647058820000003" green="0.1333333333" blue="0.13725490200000001" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tWY-U5-C3Y">
-                                                            <rect key="frame" x="0.0" y="0.0" width="76.333333333333329" height="100"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="77.666666666666671" height="100"/>
                                                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                             <connections>
                                                                 <action selector="goToEvaluate:" destination="oGI-Hx-w6f" eventType="touchUpInside" id="gRA-nz-vhA"/>
@@ -506,23 +506,23 @@
                                                     </constraints>
                                                 </view>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jcJ-kZ-28X" userLabel="payBtnView">
-                                                    <rect key="frame" x="457.66666666666669" y="0.0" width="76.333333333333314" height="100"/>
+                                                    <rect key="frame" x="466.33333333333331" y="0.0" width="77.666666666666686" height="100"/>
                                                     <subviews>
                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="联系商家" translatesAutoresizingMaskIntoConstraints="NO" id="GFM-Md-Yoi">
-                                                            <rect key="frame" x="25.666666666666629" y="22.666666666666686" width="25" height="25"/>
+                                                            <rect key="frame" x="26.333333333333371" y="22.666666666666686" width="25" height="25"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="25" id="FQO-UA-NNa"/>
                                                                 <constraint firstAttribute="width" constant="25" id="PO9-bC-ER1"/>
                                                             </constraints>
                                                         </imageView>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系商家" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yjq-NQ-iZh">
-                                                            <rect key="frame" x="7.6666666666666323" y="52.666666666666686" width="61.333333333333343" height="18"/>
+                                                            <rect key="frame" x="8.0000000000000036" y="52.666666666666686" width="61.333333333333343" height="18"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                             <color key="textColor" red="0.54901960780000003" green="0.58039215690000001" blue="0.69019607839999997" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YQS-FJ-OwW">
-                                                            <rect key="frame" x="0.0" y="0.0" width="76.333333333333329" height="100"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="77.666666666666671" height="100"/>
                                                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                             <connections>
                                                                 <action selector="phoneCall:" destination="oGI-Hx-w6f" eventType="touchUpInside" id="yfC-WX-lR3"/>
@@ -572,10 +572,10 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="veh-Ae-8pK">
-                    <rect key="frame" x="10" y="540" width="534" height="257"/>
+                    <rect key="frame" x="10" y="540" width="544" height="631"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="配送地址" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oe5-G4-EC8">
-                            <rect key="frame" x="10" y="66" width="65.333333333333329" height="20"/>
+                            <rect key="frame" x="10" y="253" width="65.333333333333329" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="20" id="gAq-Pi-HX6"/>
                             </constraints>
@@ -584,13 +584,13 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="749" text="0" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w9l-Ch-Kuy">
-                            <rect key="frame" x="95.333333333333343" y="15" width="428.66666666666663" height="122"/>
+                            <rect key="frame" x="95.333333333333343" y="15" width="438.66666666666663" height="496"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mba-iZ-Cby">
-                            <rect key="frame" x="514" y="152" width="10" height="20"/>
+                            <rect key="frame" x="524" y="526" width="10" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="20" id="5el-XG-p7g"/>
                             </constraints>
@@ -599,7 +599,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sox-bH-c8r">
-                            <rect key="frame" x="514" y="187" width="10" height="20"/>
+                            <rect key="frame" x="524" y="561" width="10" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="20" id="pgy-fO-ja3"/>
                             </constraints>
@@ -608,7 +608,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l4M-L1-Tmu">
-                            <rect key="frame" x="514.33333333333337" y="222" width="9.6666666666666288" height="20"/>
+                            <rect key="frame" x="524.33333333333337" y="596" width="9.6666666666666288" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="20" id="9eH-eV-AkD"/>
                             </constraints>
@@ -617,7 +617,7 @@
                             <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="C8E-yI-BT7">
-                            <rect key="frame" x="10" y="152" width="32.666666666666664" height="20"/>
+                            <rect key="frame" x="10" y="526" width="32.666666666666664" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="20" id="cdq-bG-6Tr"/>
                             </constraints>
@@ -626,7 +626,7 @@
                             <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="X7U-Jl-laK">
-                            <rect key="frame" x="10" y="187" width="32.666666666666664" height="20"/>
+                            <rect key="frame" x="10" y="561" width="32.666666666666664" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="20" id="Jq5-3n-9Ri"/>
                             </constraints>
@@ -635,7 +635,7 @@
                             <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="Vtc-fw-u8o">
-                            <rect key="frame" x="10" y="222" width="49" height="20"/>
+                            <rect key="frame" x="10" y="596" width="49" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="20" id="lc8-pj-elw"/>
                             </constraints>
@@ -672,8 +672,139 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JHN-Da-wA0">
+                    <rect key="frame" x="10" y="1181" width="544" height="120"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xsu-dd-1Bd">
+                            <rect key="frame" x="10.000000000000004" y="8" width="57.333333333333343" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="hqN-Xa-4EQ"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" red="0.54901960780000003" green="0.58039215690000001" blue="0.69019607839999997" alpha="1" colorSpace="calibratedRGB"/>
+                            <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="DcQ-4r-Rh3">
+                            <rect key="frame" x="10.000000000000004" y="37" width="57.333333333333343" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="wJe-xy-CmN"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" red="0.54901960780000003" green="0.58039215690000001" blue="0.69019607839999997" alpha="1" colorSpace="calibratedRGB"/>
+                            <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="DuL-kb-sTs">
+                            <rect key="frame" x="10.000000000000004" y="95" width="57.333333333333343" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="O5u-zt-rDy"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" red="0.54901960780000003" green="0.58039215690000001" blue="0.69019607839999997" alpha="1" colorSpace="calibratedRGB"/>
+                            <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="ESV-76-bB8">
+                            <rect key="frame" x="10.000000000000004" y="66" width="57.333333333333343" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="EHT-nx-zJe"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" red="0.54901960780000003" green="0.58039215690000001" blue="0.69019607839999997" alpha="1" colorSpace="calibratedRGB"/>
+                            <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="cNM-99-QI8">
+                            <rect key="frame" x="421.66666666666669" y="8" width="57.333333333333314" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="Zcu-jl-dnS"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
+                            <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="o18-Me-ItL">
+                            <rect key="frame" x="476.66666666666669" y="37" width="57.333333333333314" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="3xB-Hr-caX"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
+                            <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="Uwp-Av-5XD">
+                            <rect key="frame" x="476.66666666666669" y="66" width="57.333333333333314" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="PzH-cB-Abd"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
+                            <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="wjO-gE-axz">
+                            <rect key="frame" x="476.66666666666669" y="95" width="57.333333333333314" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="GEY-dy-i6J"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u65-ph-uR2">
+                            <rect key="frame" x="484" y="5.6666666666667425" width="50" height="25"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="50" id="hxT-8U-ogc"/>
+                                <constraint firstAttribute="height" constant="25" id="v9a-ru-Jog"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" title="复制">
+                                <color key="titleColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
+                            </state>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="4"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" red="0.54901960780000003" green="0.58039215690000001" blue="0.69019607839999997" alpha="1" colorSpace="calibratedRGB"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="copyAction:" destination="oGI-Hx-w6f" eventType="touchUpInside" id="9ah-6c-u6y"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="Uwp-Av-5XD" firstAttribute="centerY" secondItem="ESV-76-bB8" secondAttribute="centerY" id="0Y2-JV-0UP"/>
+                        <constraint firstItem="o18-Me-ItL" firstAttribute="centerY" secondItem="DcQ-4r-Rh3" secondAttribute="centerY" id="0t0-XX-RKF"/>
+                        <constraint firstItem="ESV-76-bB8" firstAttribute="top" secondItem="DcQ-4r-Rh3" secondAttribute="bottom" constant="9" id="6y4-mQ-wq8"/>
+                        <constraint firstAttribute="trailing" secondItem="u65-ph-uR2" secondAttribute="trailing" constant="10" id="8af-Js-8aA"/>
+                        <constraint firstItem="xsu-dd-1Bd" firstAttribute="leading" secondItem="JHN-Da-wA0" secondAttribute="leading" constant="10" id="8u3-eg-c6S"/>
+                        <constraint firstAttribute="trailing" secondItem="Uwp-Av-5XD" secondAttribute="trailing" constant="10" id="9Rk-8Q-JtH"/>
+                        <constraint firstItem="cNM-99-QI8" firstAttribute="centerY" secondItem="xsu-dd-1Bd" secondAttribute="centerY" id="HE6-mW-sKg"/>
+                        <constraint firstItem="DuL-kb-sTs" firstAttribute="top" secondItem="ESV-76-bB8" secondAttribute="bottom" constant="9" id="HqQ-tI-nvQ"/>
+                        <constraint firstItem="xsu-dd-1Bd" firstAttribute="top" secondItem="JHN-Da-wA0" secondAttribute="top" constant="8" id="J0i-Hg-vtE"/>
+                        <constraint firstAttribute="bottom" secondItem="DuL-kb-sTs" secondAttribute="bottom" constant="5" id="SEV-Ka-yvL"/>
+                        <constraint firstItem="u65-ph-uR2" firstAttribute="centerY" secondItem="cNM-99-QI8" secondAttribute="centerY" id="UBZ-wb-4PE"/>
+                        <constraint firstAttribute="trailing" secondItem="wjO-gE-axz" secondAttribute="trailing" constant="10" id="UTg-eh-Rd6"/>
+                        <constraint firstItem="DcQ-4r-Rh3" firstAttribute="leading" secondItem="JHN-Da-wA0" secondAttribute="leading" constant="10" id="VIl-8B-NrT"/>
+                        <constraint firstItem="ESV-76-bB8" firstAttribute="leading" secondItem="JHN-Da-wA0" secondAttribute="leading" constant="10" id="ZqV-cP-3gw"/>
+                        <constraint firstAttribute="trailing" secondItem="o18-Me-ItL" secondAttribute="trailing" constant="10" id="avh-5u-9qk"/>
+                        <constraint firstItem="u65-ph-uR2" firstAttribute="leading" secondItem="cNM-99-QI8" secondAttribute="trailing" constant="5" id="evW-Tj-sWh"/>
+                        <constraint firstItem="wjO-gE-axz" firstAttribute="centerY" secondItem="DuL-kb-sTs" secondAttribute="centerY" id="khH-MQ-dVx"/>
+                        <constraint firstItem="DcQ-4r-Rh3" firstAttribute="top" secondItem="xsu-dd-1Bd" secondAttribute="bottom" constant="9" id="nSJ-Ul-JfG"/>
+                        <constraint firstItem="DuL-kb-sTs" firstAttribute="leading" secondItem="JHN-Da-wA0" secondAttribute="leading" constant="10" id="ouF-vu-NSf"/>
+                        <constraint firstAttribute="height" constant="120" id="qoo-vR-OZr"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="24"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u41-Py-W3c">
-                    <rect key="frame" x="10" y="807" width="534" height="50"/>
+                    <rect key="frame" x="10" y="1311" width="544" height="50"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="eza-Ui-faq"/>
@@ -685,10 +816,10 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JTr-66-95P">
-                    <rect key="frame" x="10" y="833" width="534" height="24"/>
+                    <rect key="frame" x="10" y="1337" width="544" height="24"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="餐品详情" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zh3-b7-gpv">
-                            <rect key="frame" x="10" y="1.3333333333333712" width="73.666666666666671" height="21.666666666666668"/>
+                            <rect key="frame" x="10" y="1.3333333333332575" width="73.666666666666671" height="21.666666666666668"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                             <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -709,6 +840,7 @@
                 <constraint firstItem="veh-Ae-8pK" firstAttribute="top" secondItem="lz0-oV-QPp" secondAttribute="bottom" constant="10" id="A5s-Rr-tmq"/>
                 <constraint firstAttribute="bottom" secondItem="Qcd-bS-y87" secondAttribute="bottom" id="FR9-Ba-5jm"/>
                 <constraint firstAttribute="trailing" secondItem="JTr-66-95P" secondAttribute="trailing" constant="10" id="HKG-h1-pG9"/>
+                <constraint firstItem="JHN-Da-wA0" firstAttribute="leading" secondItem="oGI-Hx-w6f" secondAttribute="leading" constant="10" id="I8F-QM-1fI"/>
                 <constraint firstItem="JTr-66-95P" firstAttribute="leading" secondItem="oGI-Hx-w6f" secondAttribute="leading" constant="10" id="KgC-e0-pCU"/>
                 <constraint firstItem="Qcd-bS-y87" firstAttribute="top" secondItem="z4z-tz-GIM" secondAttribute="bottom" id="MCo-Tn-W3K"/>
                 <constraint firstAttribute="trailing" secondItem="veh-Ae-8pK" secondAttribute="trailing" constant="10" id="ZXf-az-0Za"/>
@@ -716,15 +848,16 @@
                 <constraint firstItem="z4z-tz-GIM" firstAttribute="leading" secondItem="oGI-Hx-w6f" secondAttribute="leading" id="cvz-Ug-fbc"/>
                 <constraint firstAttribute="bottom" secondItem="u41-Py-W3c" secondAttribute="bottom" id="gSv-qe-rBM"/>
                 <constraint firstItem="u41-Py-W3c" firstAttribute="leading" secondItem="oGI-Hx-w6f" secondAttribute="leading" constant="10" id="h9k-kR-abZ"/>
+                <constraint firstAttribute="bottom" secondItem="JHN-Da-wA0" secondAttribute="bottom" constant="60" id="hnB-D9-wWt"/>
                 <constraint firstAttribute="trailing" secondItem="lz0-oV-QPp" secondAttribute="trailing" constant="10" id="kvj-Bf-ycd"/>
+                <constraint firstAttribute="trailing" secondItem="JHN-Da-wA0" secondAttribute="trailing" constant="10" id="mbU-nE-9v8"/>
                 <constraint firstItem="Qcd-bS-y87" firstAttribute="leading" secondItem="oGI-Hx-w6f" secondAttribute="leading" id="nvb-1x-uN2"/>
                 <constraint firstItem="lz0-oV-QPp" firstAttribute="leading" secondItem="oGI-Hx-w6f" secondAttribute="leading" constant="10" id="op4-KI-mcu"/>
                 <constraint firstItem="lz0-oV-QPp" firstAttribute="top" secondItem="oGI-Hx-w6f" secondAttribute="top" constant="50" id="pCl-n9-bRC"/>
                 <constraint firstAttribute="trailing" secondItem="u41-Py-W3c" secondAttribute="trailing" constant="10" id="r4s-Yw-ll9"/>
-                <constraint firstItem="u41-Py-W3c" firstAttribute="top" secondItem="veh-Ae-8pK" secondAttribute="bottom" constant="10" id="sqc-FV-tZQ"/>
+                <constraint firstItem="u41-Py-W3c" firstAttribute="top" secondItem="veh-Ae-8pK" secondAttribute="bottom" constant="140" id="sqc-FV-tZQ"/>
                 <constraint firstAttribute="trailing" secondItem="Qcd-bS-y87" secondAttribute="trailing" id="wCk-KO-gmE"/>
                 <constraint firstAttribute="trailing" secondItem="z4z-tz-GIM" secondAttribute="trailing" id="xd1-xz-hXt"/>
-                <constraint firstAttribute="bottom" secondItem="veh-Ae-8pK" secondAttribute="bottom" constant="60" id="xkc-Kt-TEg"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
@@ -742,7 +875,11 @@
                 <outlet property="evaluateBtnView" destination="WBQ-4V-csU" id="sxG-eF-oh6"/>
                 <outlet property="makeOrdrtTime" destination="K2z-qH-F4v" id="58Z-We-2gy"/>
                 <outlet property="nameLab" destination="l4M-L1-Tmu" id="Sdc-OF-vDE"/>
+                <outlet property="orderNumLb" destination="cNM-99-QI8" id="Da5-a1-qNa"/>
+                <outlet property="orderTimeLb" destination="o18-Me-ItL" id="imd-Fy-PhC"/>
                 <outlet property="payBtnView" destination="rcq-rH-p8b" id="pr8-iu-FRf"/>
+                <outlet property="payTypeLb" destination="wjO-gE-axz" id="bqq-qd-7NK"/>
+                <outlet property="paymentLb" destination="Uwp-Av-5XD" id="wC9-ZW-Tdy"/>
                 <outlet property="phoneLab" destination="Sox-bH-c8r" id="bBz-C0-zZA"/>
                 <outlet property="postCodeLab" destination="Mba-iZ-Cby" id="J4b-gN-QJB"/>
                 <outlet property="receivingBtnView" destination="Ln4-oU-LYm" id="GEs-Yb-6GT"/>
@@ -752,7 +889,7 @@
                 <outlet property="tipLab" destination="xKz-oc-zaI" id="1Vp-ZU-F66"/>
                 <outlet property="typeLab" destination="95d-hI-PAF" id="0L8-ft-cgm"/>
             </connections>
-            <point key="canvasLocation" x="-204.58015267175571" y="42.605633802816904"/>
+            <point key="canvasLocation" x="-196.94656488549617" y="220.07042253521129"/>
         </view>
     </objects>
     <resources>

ADHTuanCan/Class/订单/订单详情/view/Base.lproj/OrderDetailFootView.xib

@@ -152,7 +152,7 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vcP-kB-UCf">
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vcP-kB-UCf">
                     <rect key="frame" x="10" y="250" width="502" height="120"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cea-Ce-64a">

ADHTuanCan/Class/订单/订单详情/view/OderDetailHeadView.swift

@@ -79,6 +79,23 @@ class OderDetailHeadView: UIView {
     /// 收货人
     @IBOutlet weak var nameLab: UILabel!
     
+    /// 订单编号
+    @IBOutlet weak var orderNumLb: UILabel!
+    
+    /// 订单时间
+    @IBOutlet weak var orderTimeLb: UILabel!
+    
+    /// 结算方式
+    @IBOutlet weak var paymentLb: UILabel!
+    
+    /// 支付方式
+    @IBOutlet weak var payTypeLb: UILabel!
+    
+    /// hud 提示
+    lazy var hud : MCHud! = {
+        return MCHud()
+    }()
+    
     /// 1去支付  2修改地址  3再来一单 4确认收货 5去评价 6联系商家 7取消订单
     var headBtnBlock : ((Int)->Void)?
     
@@ -103,10 +120,34 @@ class OderDetailHeadView: UIView {
         super.awakeFromNib()
     }
     
+    @IBAction func copyAction(_ sender: UIButton) {
+        let pastboard = UIPasteboard.general
+        pastboard.string = "\(self.dataModel?.orderNo ?? "")"
+        if !(pastboard.string.isEmptyStr){
+            print("%@",pastboard.string!)
+            self.hud.showSuccess(LanguagesUtil.createTextBy(Ctext: "复制成功", Etext: "copy success"))
+        }
+    }
+    
+    
     func configModel(model : OrderOutDetailModel){
         
         self.dataModel = model
         
+        self.orderNumLb.text = "\(model.orderNo ?? "")"
+        self.orderTimeLb.text = "\(model.createTime ?? "")"
+        
+        ///结算方式，1全款，2定金
+        if model.settleType === 1{
+            self.paymentLb.text = LanguagesUtil.createTextBy(Ctext: "全款", Etext: "full payment")
+        }else{
+            self.paymentLb.text = LanguagesUtil.createTextBy(Ctext: "定金", Etext: "deposit")
+        }
+        
+        self.payTypeLb.text = "支付方式"
+        
+        
+        
         self.makeOrdrtTime.text = "\(model.createTime ?? "")"
         self.deliveryTme.text = "\(model.deliveryTime ?? "")"
         self.addressLab.text = "\(model.detailAddress ?? "")"
@@ -209,9 +250,9 @@ class OderDetailHeadView: UIView {
         }
         
         if self.addressLab.text.isNotEmptyStr{
-            self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height:135 + labHeight + 30 + 100 + btnViewHeight + 100))
+            self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height:135 + labHeight + 30 + 100 + btnViewHeight + 100 + 130))
         }else{
-            self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height:155 + 30 + 100 + 100 + 100 + btnViewHeight))
+            self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height:155 + 30 + 100 + 100 + 100 + btnViewHeight + 130))
         }
      
         
@@ -225,10 +266,10 @@ class OderDetailHeadView: UIView {
             self.typeLab.text = LanguagesUtil.createTextBy(Ctext: "待支付", Etext: "Wait for payment")
             self.tipLab.text = LanguagesUtil.createTextBy(Ctext: "待支付，请立即支付", Etext: "Please pay as soon as possible")
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeView.height + self.detailView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeView.height + self.detailView.height + 135 + labHeight + btnViewHeight + 70 + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeView.height + self.detailView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeView.height + self.detailView.height + 155 + btnViewHeight + 70 + 130))
             }
             
         }
@@ -243,10 +284,10 @@ class OderDetailHeadView: UIView {
             self.tipLab.text = LanguagesUtil.createTextBy(Ctext: "已成功下单，感谢您对KIAN SENG的信任", Etext: "Order has been successfully placed, thank you for your trust in KIAN SENG")
             self.secTipLab.text = ""
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70 + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70 + 130))
             }
         }
         if status === 3{
@@ -261,10 +302,10 @@ class OderDetailHeadView: UIView {
 
             
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.deliveryView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.deliveryView.height + 135 + labHeight + btnViewHeight + 70 + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.deliveryView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.deliveryView.height + 155 + btnViewHeight + 70 + 130))
             }
         }
         if status === 4{
@@ -278,10 +319,10 @@ class OderDetailHeadView: UIView {
             self.tipLab.text = LanguagesUtil.createTextBy(Ctext: "感谢您对KIAN SENG的信任，欢迎再次光临", Etext: "Thank you for your trust in KIAN SENG and welcome to visit us again")
             self.secTipLab.text = ""
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70 + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70 + 130))
             }
         }
         if status === 5{
@@ -295,10 +336,10 @@ class OderDetailHeadView: UIView {
             self.cancelLab.text = LanguagesUtil.createTextBy(Ctext: "该订单已经取消，期待您的下次光临", Etext: "The order has been cancelled and we look forward to your next visit")
             
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 135 + labHeight + btnViewHeight + 70 + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 155 + btnViewHeight + 70 + 130))
             }
         }
         if status === 6{
@@ -311,10 +352,10 @@ class OderDetailHeadView: UIView {
             self.typeLab.text = LanguagesUtil.createTextBy(Ctext: "订单退款中", Etext: "Order refund process")
             
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 135 + labHeight + btnViewHeight + 70 + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 155 + btnViewHeight + 70 + 130))
             }
         }
         if status === 7{
@@ -327,10 +368,10 @@ class OderDetailHeadView: UIView {
             self.typeLab.text = LanguagesUtil.createTextBy(Ctext: "订单已退款", Etext: "Order refunded")
             
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 135 + labHeight + btnViewHeight + 70  + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.timeOutView.height + 155 + btnViewHeight + 70 + 130))
             }
         }
         if status === 8{
@@ -345,10 +386,10 @@ class OderDetailHeadView: UIView {
             self.tipLab.text = LanguagesUtil.createTextBy(Ctext: "感谢您对KIAN SENG的信任，欢迎再次光临", Etext: "Thank you for your trust in KIAN SENG and welcome to visit us again")
             
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70 + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70 + 130))
             }
         }
         
@@ -371,10 +412,10 @@ class OderDetailHeadView: UIView {
             
 
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70 + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70 + 130))
             }
         }
         
@@ -393,10 +434,10 @@ class OderDetailHeadView: UIView {
             
 
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70 + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70 + 130))
             }
         }
         
@@ -413,10 +454,10 @@ class OderDetailHeadView: UIView {
             
 
             if self.addressLab.text.isNotEmptyStr{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70 + 130))
     
             }else{
-                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70))
+                self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 155 + btnViewHeight + 70 + 130))
             }
         }
     }

ADHTuanCan/Class/订单/订单详情/view/en.lproj/OderDetailHeadView.strings

@@ -77,4 +77,19 @@
 /* Class = "UILabel"; text = "正在路上..."; ObjectID = "oEQ-XL-iE6"; */
 "oEQ-XL-iE6.text" = "On the road ...";
 
+/* Class = "UIButton"; normalTitle = "复制"; ObjectID = "u65-ph-uR2"; */
+"u65-ph-uR2.normalTitle" = "Copy";
 
+/* Class = "UILabel"; text = "订单编号"; ObjectID = "xsu-dd-1Bd"; */
+"xsu-dd-1Bd.text" = "Order number";
+
+
+/* Class = "UILabel"; text = "下单时间"; ObjectID = "DcQ-4r-Rh3"; */
+"DcQ-4r-Rh3.text" = "Order time";
+
+/* Class = "UILabel"; text = "结算方式"; ObjectID = "ESV-76-bB8"; */
+"ESV-76-bB8.text" = "Means of payments";
+
+
+/* Class = "UILabel"; text = "支付方式"; ObjectID = "DuL-kb-sTs"; */
+"DuL-kb-sTs.text" = "Mode of payment";

ADHTuanCan/Class/订单/订单详情/view/zh-Hans.lproj/OderDetailHeadView.strings

@@ -76,3 +76,21 @@
 
 /* Class = "UILabel"; text = "正在路上..."; ObjectID = "oEQ-XL-iE6"; */
 "oEQ-XL-iE6.text" = "正在路上...";
+
+
+/* Class = "UIButton"; normalTitle = "复制"; ObjectID = "u65-ph-uR2"; */
+"u65-ph-uR2.normalTitle" = "复制";
+
+/* Class = "UILabel"; text = "订单编号"; ObjectID = "xsu-dd-1Bd"; */
+"xsu-dd-1Bd.text" = "订单编号";
+
+
+/* Class = "UILabel"; text = "下单时间"; ObjectID = "DcQ-4r-Rh3"; */
+"DcQ-4r-Rh3.text" = "下单时间";
+
+/* Class = "UILabel"; text = "结算方式"; ObjectID = "ESV-76-bB8"; */
+"ESV-76-bB8.text" = "结算方式";
+
+
+/* Class = "UILabel"; text = "支付方式"; ObjectID = "DuL-kb-sTs"; */
+"DuL-kb-sTs.text" = "结算方式";

ADHTuanCan/Class/餐品详情/SingleMealDetailController.swift

@@ -138,7 +138,15 @@ class SingleMealDetailController: ADHBaseVC {
         // Do any additional setup after loading the view.
         self.navBar = MCNavBarView.init(title:"", subTitle: nil,style: nil)
         self.navBar?.insertNavRightBtn(nil, image: "分享图标", tap: {[unowned self] in
+            let textShare = "KS Culinery"
            
+            let imageShare = UIImage(named: "图标")
+            
+            let urlShare = URL(string: "https://kcapp.kiansengculinary.com")
+            let activityItems = [textShare,imageShare as Any,urlShare as Any]
+
+            let activityVC = UIActivityViewController.init(activityItems: activityItems, applicationActivities: nil)
+            self.present(activityVC, animated: true)
         }, semantic: nil, at: 0)
         
         self.addShopBtn.setBackColor(kThemeColorAlpha, forState: .normal)