添加订单备注

ADHTuanCan.xcodeproj/project.pbxproj

@@ -249,6 +249,8 @@
 		C4836C2D2AC87B6900E3FA1B /* HomeRecommendView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4836C2C2AC87B6900E3FA1B /* HomeRecommendView.xib */; };
 		C4836C302AC89C1800E3FA1B /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4836C2F2AC89C1800E3FA1B /* SearchView.swift */; };
 		C4836C332AC8A26A00E3FA1B /* SearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4836C352AC8A26A00E3FA1B /* SearchView.xib */; };
+		C4A604582BF1BDC0005074A0 /* RemarkOderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A604572BF1BDC0005074A0 /* RemarkOderView.swift */; };
+		C4A6045B2BF1CA08005074A0 /* RemarkOderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4A6045D2BF1CA08005074A0 /* RemarkOderView.xib */; };
 		C4A73B502B18E4D200A1595A /* SalesmanFirstShowView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4A73B522B18E4D200A1595A /* SalesmanFirstShowView.xib */; };
 		C4A73B572B18E6C300A1595A /* AddressEditorVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4A73B592B18E6C300A1595A /* AddressEditorVC.xib */; };
 		C4B082B82AF54CA500CD146E /* CheckOrderHeadView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4B082BA2AF54CA500CD146E /* CheckOrderHeadView.xib */; };
@@ -767,6 +769,10 @@
 		C4836C342AC8A26A00E3FA1B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SearchView.xib; sourceTree = "<group>"; };
 		C4836C372AC8A26D00E3FA1B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SearchView.strings; sourceTree = "<group>"; };
 		C4836C392AC8A26D00E3FA1B /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SearchView.strings"; sourceTree = "<group>"; };
+		C4A604572BF1BDC0005074A0 /* RemarkOderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemarkOderView.swift; sourceTree = "<group>"; };
+		C4A6045C2BF1CA08005074A0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/RemarkOderView.xib; sourceTree = "<group>"; };
+		C4A6045F2BF1CA0A005074A0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/RemarkOderView.strings; sourceTree = "<group>"; };
+		C4A604612BF1CA12005074A0 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/RemarkOderView.strings"; sourceTree = "<group>"; };
 		C4A73B512B18E4D200A1595A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SalesmanFirstShowView.xib; sourceTree = "<group>"; };
 		C4A73B542B18E4D400A1595A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SalesmanFirstShowView.strings; sourceTree = "<group>"; };
 		C4A73B562B18E4D600A1595A /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SalesmanFirstShowView.strings"; sourceTree = "<group>"; };
@@ -1357,6 +1363,8 @@
 				C470B57A2AEFBD07009046B4 /* AddRemarkView.xib */,
 				C4E333132B91891C004DD994 /* TwoSeparateMealsView.swift */,
 				C406A0802B9191D6005A6423 /* TwoSeparateMealsView.xib */,
+				C4A604572BF1BDC0005074A0 /* RemarkOderView.swift */,
+				C4A6045D2BF1CA08005074A0 /* RemarkOderView.xib */,
 			);
 			path = view;
 			sourceTree = "<group>";
@@ -2511,6 +2519,7 @@
 				C4836B202AC5601900E3FA1B /* ContractView.xib in Resources */,
 				C467315E2AFA13FF00658C58 /* UnsubscribeDetailVC.xib in Resources */,
 				C470B5932AF0B05B009046B4 /* DeliveryTimeSetView.xib in Resources */,
+				C4A6045B2BF1CA08005074A0 /* RemarkOderView.xib in Resources */,
 				C48363BB2AC3D96500E3FA1B /* Assets.xcassets in Resources */,
 				C45C8A192AD18D41009D6C3A /* timeManageSheetView.xib in Resources */,
 				C4577CE72AEBC8A7004D9439 /* ChangeMealCollectItem.xib in Resources */,
@@ -2688,6 +2697,7 @@
 				C4577CC72AEA9E02004D9439 /* SetMealModel.swift in Sources */,
 				C4EDDA032AF28B0D00BE8EFF /* MACTableView.m in Sources */,
 				C4EDDA102AF28B0D00BE8EFF /* MACRefreshHeader.m in Sources */,
+				C4A604582BF1BDC0005074A0 /* RemarkOderView.swift in Sources */,
 				C4EDDA1F2AF28B7400BE8EFF /* MGSwipeTableCell.m in Sources */,
 				C4836B852AC7F79600E3FA1B /* BaseTabbarController.swift in Sources */,
 				C48363AF2AC3D96400E3FA1B /* AppDelegate.swift in Sources */,
@@ -3603,6 +3613,16 @@
 			name = SearchView.xib;
 			sourceTree = "<group>";
 		};
+		C4A6045D2BF1CA08005074A0 /* RemarkOderView.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				C4A6045C2BF1CA08005074A0 /* Base */,
+				C4A6045F2BF1CA0A005074A0 /* en */,
+				C4A604612BF1CA12005074A0 /* zh-Hans */,
+			);
+			name = RemarkOderView.xib;
+			sourceTree = "<group>";
+		};
 		C4A73B522B18E4D200A1595A /* SalesmanFirstShowView.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -3799,7 +3819,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = VUHRW5BP4S;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ADHTuanCan/Info.plist;
@@ -3819,7 +3839,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = TuanCanId.ADHTuanCan;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -3843,7 +3863,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = VUHRW5BP4S;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ADHTuanCan/Info.plist;
@@ -3863,7 +3883,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = TuanCanId.ADHTuanCan;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

ADHTuanCan/Assets.xcassets/首页/首页背景.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "64601713925485_.pic_hd.jpg",
+      "filename" : "WechatIMG6654.jpg",
       "idiom" : "universal",
       "scale" : "2x"
     },

ADHTuanCan/Class/订单/model/OrderDataModel.swift

@@ -53,7 +53,11 @@ class OrderListModel : MCBaseModel{
     ///1待付款，2待接单，3待配送，4已完成，5取消，6退款中，7已退款，8已完成且已评价，9已支付定金，10延后支付
     var status : String?
     
-    /// 
+    
+    /// 备注
+    var comment : String?
+    
+    ///
     var link : String?
     
     ///改收货地址按钮，为0隐藏，为1显示

ADHTuanCan/Class/订单/view/Base.lproj/OrderListCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<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="22131"/>
+        <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"/>
@@ -40,7 +40,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="W2T-e7-mg7">
-                                <rect key="frame" x="776.66666666666663" y="122" width="42.333333333333371" height="20"/>
+                                <rect key="frame" x="772.66666666666663" y="122" width="46.333333333333371" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="bHW-Zy-NHr"/>
                                 </constraints>
@@ -283,7 +283,7 @@
                                 </constraints>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="749" text="某某某的3天团餐" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ta3-T2-QwP">
-                                <rect key="frame" x="79" y="31" width="116.66666666666669" height="18"/>
+                                <rect key="frame" x="79" y="31" width="120.33333333333331" height="18"/>
                                 <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                                 <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>

ADHTuanCan/Class/购物车/view/Base.lproj/MenuTableViewCell.xib

@@ -10,18 +10,18 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="400" id="KGk-i7-Jjw" customClass="MenuTableViewCell" customModule="ADHTuanCan" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="535" height="400"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="459" id="KGk-i7-Jjw" customClass="MenuTableViewCell" customModule="ADHTuanCan" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="535" height="459"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="535" height="400"/>
+                <rect key="frame" x="0.0" y="0.0" width="535" height="459"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tql-ao-uXB">
-                        <rect key="frame" x="20" y="30" width="495" height="360"/>
+                        <rect key="frame" x="20" y="30" width="495" height="419"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dsi-yh-2Wd">
-                                <rect key="frame" x="0.0" y="0.0" width="495" height="360"/>
+                                <rect key="frame" x="0.0" y="0.0" width="495" height="419"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="分类菜品尺寸" translatesAutoresizingMaskIntoConstraints="NO" id="mav-jt-Dru">
                                         <rect key="frame" x="20" y="20" width="65" height="65"/>
@@ -81,124 +81,124 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="mtf-JX-kjf">
-                                        <rect key="frame" x="105" y="49.333333333333343" width="380" height="256.66666666666663"/>
+                                        <rect key="frame" x="105" y="49.333333333333314" width="380" height="276"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="1" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1LO-N9-WYs" userLabel="Label1">
-                                                <rect key="frame" x="0.0" y="0.0" width="380" height="188.66666666666666"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="380" height="208"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pnu-74-zMD" userLabel="Label2">
-                                                <rect key="frame" x="0.0" y="188.66666666666669" width="380" height="17"/>
+                                                <rect key="frame" x="0.0" y="208" width="380" height="17"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" 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" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c1H-I0-gRK" userLabel="Label3">
-                                                <rect key="frame" x="0.0" y="205.66666666666669" width="380" height="17"/>
+                                                <rect key="frame" x="0.0" y="225" width="380" height="17"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JqH-Da-TqY" userLabel="Label4">
-                                                <rect key="frame" x="0.0" y="222.66666666666669" width="380" height="17"/>
+                                                <rect key="frame" x="0.0" y="242" width="380" height="17"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nM9-AJ-CPf" userLabel="Label5">
-                                                <rect key="frame" x="0.0" y="239.66666666666669" width="380" height="17"/>
+                                                <rect key="frame" x="0.0" y="259" width="380" height="17"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pmx-iU-Cto" userLabel="Label6">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="77" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P1q-Vk-6mL" userLabel="Label7">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="8" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1JE-yB-msM" userLabel="Label8">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fe7-WX-C1p" userLabel="Label9">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TvT-Cx-ERT" userLabel="Label10">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5D3-C9-E21" userLabel="Label11">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZVV-xM-qPt" userLabel="Label12">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dw9-6S-D4K" userLabel="Label13">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LMj-75-PIa" userLabel="Label14">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jg6-m6-wd6" userLabel="Label15">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A5u-Z6-fkG" userLabel="Label16">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zci-53-FhT" userLabel="Label17">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZAQ-HE-935" userLabel="Label18">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nR9-dS-fUE" userLabel="Label19">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QAF-4H-Zmy" userLabel="Label20">
-                                                <rect key="frame" x="0.0" y="256.66666666666669" width="380" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="276" width="380" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -211,7 +211,7 @@
                                         </constraints>
                                     </stackView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="人民币12.00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u6e-x0-cEF">
-                                        <rect key="frame" x="105" y="316" width="81.333333333333314" height="20"/>
+                                        <rect key="frame" x="105" y="335.33333333333331" width="81.333333333333314" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="jgx-74-Kvr"/>
                                         </constraints>
@@ -220,7 +220,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8lk-Ck-AZW">
-                                        <rect key="frame" x="447" y="314" width="24" height="24"/>
+                                        <rect key="frame" x="447" y="333.33333333333331" width="24" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="24" id="I5u-oz-ZLM"/>
                                             <constraint firstAttribute="height" constant="24" id="aw8-6S-hhy"/>
@@ -232,7 +232,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xhV-qu-Ga2">
-                                        <rect key="frame" x="387" y="311" width="60" height="30"/>
+                                        <rect key="frame" x="387" y="330.33333333333331" width="60" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="60" id="QON-cB-V7Y"/>
                                         </constraints>
@@ -246,7 +246,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7os-Ob-S8q">
-                                        <rect key="frame" x="363" y="314" width="24" height="24"/>
+                                        <rect key="frame" x="363" y="333.33333333333331" width="24" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="24" id="Jv2-FZ-gGh"/>
                                             <constraint firstAttribute="width" constant="24" id="LuB-kr-0dM"/>
@@ -257,6 +257,27 @@
                                             <action selector="subtractionAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Iua-JM-PBx"/>
                                         </connections>
                                     </button>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BFo-kI-fS7">
+                                        <rect key="frame" x="0.0" y="370.33333333333331" width="495" height="48.666666666666686"/>
+                                        <subviews>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tee-uD-9uT">
+                                                <rect key="frame" x="25" y="0.0" width="445" height="33.666666666666664"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="25" id="06x-CS-Tty"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstItem="Tee-uD-9uT" firstAttribute="leading" secondItem="BFo-kI-fS7" secondAttribute="leading" constant="25" id="699-l2-pO5"/>
+                                            <constraint firstItem="Tee-uD-9uT" firstAttribute="top" secondItem="BFo-kI-fS7" secondAttribute="top" id="96S-L2-Aam"/>
+                                            <constraint firstAttribute="bottom" secondItem="Tee-uD-9uT" secondAttribute="bottom" constant="15" id="YJT-6y-cH2"/>
+                                            <constraint firstAttribute="trailing" secondItem="Tee-uD-9uT" secondAttribute="trailing" constant="25" id="qCw-ca-Zc4"/>
+                                        </constraints>
+                                    </view>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
@@ -264,9 +285,11 @@
                                     <constraint firstItem="7os-Ob-S8q" firstAttribute="centerY" secondItem="8lk-Ck-AZW" secondAttribute="centerY" id="3VT-h1-c95"/>
                                     <constraint firstAttribute="trailing" secondItem="mtf-JX-kjf" secondAttribute="trailing" constant="10" id="4iN-BR-Hom"/>
                                     <constraint firstItem="xhV-qu-Ga2" firstAttribute="leading" secondItem="7os-Ob-S8q" secondAttribute="trailing" id="4uI-P8-yOJ"/>
+                                    <constraint firstItem="BFo-kI-fS7" firstAttribute="top" secondItem="u6e-x0-cEF" secondAttribute="bottom" constant="15" id="5Pr-9w-JIj"/>
                                     <constraint firstItem="8lk-Ck-AZW" firstAttribute="centerY" secondItem="u6e-x0-cEF" secondAttribute="centerY" id="6mK-Fm-Ozk"/>
                                     <constraint firstItem="u6e-x0-cEF" firstAttribute="leading" secondItem="wGc-z5-HIj" secondAttribute="leading" id="97b-0T-BJe"/>
                                     <constraint firstItem="mtf-JX-kjf" firstAttribute="top" secondItem="wGc-z5-HIj" secondAttribute="bottom" constant="10" id="9Bx-Is-3OS"/>
+                                    <constraint firstItem="BFo-kI-fS7" firstAttribute="leading" secondItem="dsi-yh-2Wd" secondAttribute="leading" id="9XI-ly-D4g"/>
                                     <constraint firstItem="mav-jt-Dru" firstAttribute="top" secondItem="dsi-yh-2Wd" secondAttribute="top" constant="20" id="9vC-r0-EyI"/>
                                     <constraint firstItem="wGc-z5-HIj" firstAttribute="top" secondItem="mav-jt-Dru" secondAttribute="top" id="B9z-uC-ys6"/>
                                     <constraint firstItem="AKe-Nx-Npr" firstAttribute="top" secondItem="mav-jt-Dru" secondAttribute="top" id="HWi-Om-uUb"/>
@@ -279,7 +302,8 @@
                                     <constraint firstItem="8lk-Ck-AZW" firstAttribute="leading" secondItem="xhV-qu-Ga2" secondAttribute="trailing" id="fQo-2x-7wb"/>
                                     <constraint firstItem="mav-jt-Dru" firstAttribute="leading" secondItem="dsi-yh-2Wd" secondAttribute="leading" constant="20" id="hfi-37-4pJ"/>
                                     <constraint firstAttribute="trailing" secondItem="8lk-Ck-AZW" secondAttribute="trailing" constant="24" id="hmv-BM-Zza"/>
-                                    <constraint firstAttribute="bottom" secondItem="u6e-x0-cEF" secondAttribute="bottom" constant="24" id="odQ-ZK-2hV"/>
+                                    <constraint firstAttribute="bottom" secondItem="BFo-kI-fS7" secondAttribute="bottom" id="lej-CK-gAD"/>
+                                    <constraint firstAttribute="trailing" secondItem="BFo-kI-fS7" secondAttribute="trailing" id="m0M-yi-rbF"/>
                                     <constraint firstItem="7os-Ob-S8q" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="u6e-x0-cEF" secondAttribute="trailing" constant="5" id="tde-P2-Sfj"/>
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
@@ -289,7 +313,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qSd-4b-NSt">
-                                <rect key="frame" x="495" y="0.0" width="0.0" height="360"/>
+                                <rect key="frame" x="495" y="0.0" width="0.0" height="419"/>
                                 <color key="backgroundColor" red="0.77647058820000003" green="0.1333333333" blue="0.13725490200000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 <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"/>
@@ -341,6 +365,8 @@
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
+                <outlet property="commentHeight" destination="06x-CS-Tty" id="zdO-b2-weK"/>
+                <outlet property="commentLab" destination="Tee-uD-9uT" id="q7g-AW-vnG"/>
                 <outlet property="dataView" destination="dsi-yh-2Wd" id="HyU-qM-O4P"/>
                 <outlet property="foodImg" destination="mav-jt-Dru" id="3vd-QS-jej"/>
                 <outlet property="headHeight" destination="fhP-3p-bkR" id="ZOU-If-i9W"/>
@@ -373,7 +399,7 @@
                 <outletCollection property="foodLabList" destination="nR9-dS-fUE" collectionClass="NSMutableArray" id="23i-UJ-xzo"/>
                 <outletCollection property="foodLabList" destination="QAF-4H-Zmy" collectionClass="NSMutableArray" id="6hb-7l-RFY"/>
             </connections>
-            <point key="canvasLocation" x="303.05343511450383" y="144.36619718309859"/>
+            <point key="canvasLocation" x="303.05343511450383" y="165.14084507042256"/>
         </tableViewCell>
     </objects>
     <resources>

ADHTuanCan/Class/购物车/view/MenuTableViewCell.swift

@@ -30,6 +30,11 @@ class MenuTableViewCell: UITableViewCell {
     ///就餐人数BTN
     @IBOutlet weak var peopleNumBtn: UIButton!
     
+    /// 备注
+    @IBOutlet weak var commentLab: UILabel!
+    
+    /// 备注GAO
+    @IBOutlet weak var commentHeight: NSLayoutConstraint!
     ///减
     @IBAction func subtractionAction(_ sender: UIButton) {
         
@@ -143,6 +148,16 @@ class MenuTableViewCell: UITableViewCell {
         self.dataModel = model
         self.headTyoeLab.text = "\(model?.supplyType ?? "")"
         self.mealNameLab.text = "\(model?.name ?? "")"
+        
+        if "\(model?.comment ?? "")".count > 0{
+            let typeS = LanguagesUtil.createTextBy(Ctext: "备注：", Etext: "Commen：")
+            self.commentLab.text = "\(typeS)\(model?.comment ?? "")"
+        }else{
+            self.commentLab.text = ""
+            self.commentHeight.constant = 0
+        }
+        
+        
         self.foodImg.sd_setImage(url: URL.init(string: model?.link ?? "") ,placeHolderImage: UIImage.init(named: "placeHolderImage"))
         if isfirstLine{
             self.mealNameLab.isHidden = false

ADHTuanCan/Class/购物车/确认订单/view/OrderReadyCell.swift

@@ -24,6 +24,11 @@ class OrderReadyCell: UITableViewCell {
     @IBOutlet weak var timeLab: UILabel!
     @IBOutlet var foodLabList: [UILabel]!
     
+    
+    @IBOutlet weak var commentLab: UILabel!
+    
+    @IBOutlet weak var commentHeight: NSLayoutConstraint!
+    
     var dataModel : ShopMealMsgDetailModel?
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -47,6 +52,14 @@ class OrderReadyCell: UITableViewCell {
         let star = "\(model?.deliveryStart ?? "")".prefix(5)
         let end = "\(model?.deliveryEnd ?? "")".prefix(5)
         self.timeLab.text = LanguagesUtil.createTextBy(Ctext: "约\(star)~\(end)送达", Etext: "Delivery around \(star)~\(end)")
+        
+        if "\(model?.comment ?? "")".count > 0{
+            let typeS = LanguagesUtil.createTextBy(Ctext: "备注：", Etext: "Commen：")
+            self.commentLab.text = "\(typeS)\(model?.comment ?? "")"
+        }else{
+            self.commentLab.text = ""
+            self.commentHeight.constant = 0
+        }
        
         if isfirstLine{
             self.typeLab.isHidden = false

ADHTuanCan/Class/购物车/确认订单/view/OrderReadyCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<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="22131"/>
+        <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"/>
@@ -11,21 +11,21 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="533" id="KGk-i7-Jjw" customClass="OrderReadyCell" customModule="ADHTuanCan" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="449" height="533"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="660" id="KGk-i7-Jjw" customClass="OrderReadyCell" customModule="ADHTuanCan" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="449" height="660"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="449" height="533"/>
+                <rect key="frame" x="0.0" y="0.0" width="449" height="660"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HJn-ZJ-na2">
-                        <rect key="frame" x="10" y="0.0" width="429" height="533"/>
+                        <rect key="frame" x="10" y="0.0" width="429" height="660"/>
                         <subviews>
                             <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4zc-IK-L8F" userLabel="View1">
-                                <rect key="frame" x="10" y="0.0" width="409" height="533"/>
+                                <rect key="frame" x="10" y="0.0" width="409" height="660"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mH7-Vz-AhU" userLabel="contentView">
-                                        <rect key="frame" x="10" y="30" width="389" height="493"/>
+                                        <rect key="frame" x="10" y="30" width="389" height="620"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Cu-IY-PxT">
                                                 <rect key="frame" x="10" y="20" width="70" height="70"/>
@@ -205,35 +205,47 @@
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </stackView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="15人" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xHQ-yW-GGy">
-                                                <rect key="frame" x="90" y="427" width="31.333333333333329" height="18"/>
+                                                <rect key="frame" x="90" y="493.66666666666663" width="33" height="18"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                 <color key="textColor" red="0.10980392160000001" green="0.18823529410000001" blue="0.30980392159999998" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="约384789送达" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i8T-Xq-BYD">
-                                                <rect key="frame" x="90" y="455" width="100.66666666666669" height="18"/>
+                                                <rect key="frame" x="90" y="521.66666666666663" width="104.33333333333331" height="18"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                 <color key="textColor" systemColor="systemOrangeColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AEe-60-OLn">
+                                                <rect key="frame" x="25" y="554.66666666666663" width="339" height="50.333333333333371"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="25" id="5iF-md-BJA"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                <color key="textColor" red="0.41568627450000001" green="0.45882352939999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
                                         </subviews>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstItem="xHQ-yW-GGy" firstAttribute="leading" secondItem="fWd-8p-m7E" secondAttribute="leading" id="3Dz-05-XZg"/>
-                                            <constraint firstAttribute="bottom" secondItem="i8T-Xq-BYD" secondAttribute="bottom" constant="20" id="3G6-MD-Jfl"/>
                                             <constraint firstItem="fWd-8p-m7E" firstAttribute="top" secondItem="byM-04-3Y2" secondAttribute="bottom" constant="10" id="5cc-a1-POp"/>
                                             <constraint firstItem="1Cu-IY-PxT" firstAttribute="top" secondItem="mH7-Vz-AhU" secondAttribute="top" constant="20" id="A7p-kb-lnO"/>
                                             <constraint firstItem="i8T-Xq-BYD" firstAttribute="top" secondItem="xHQ-yW-GGy" secondAttribute="bottom" constant="10" id="CQZ-GJ-Vb4"/>
                                             <constraint firstItem="haf-ZC-Jaw" firstAttribute="centerY" secondItem="byM-04-3Y2" secondAttribute="centerY" id="Daw-ne-0N1"/>
                                             <constraint firstItem="xHQ-yW-GGy" firstAttribute="top" relation="greaterThanOrEqual" secondItem="fWd-8p-m7E" secondAttribute="bottom" constant="8.3300000000000001" id="Ga2-7e-4EC"/>
                                             <constraint firstItem="1Cu-IY-PxT" firstAttribute="leading" secondItem="mH7-Vz-AhU" secondAttribute="leading" constant="10" id="L6W-cy-8RH"/>
+                                            <constraint firstAttribute="trailing" secondItem="AEe-60-OLn" secondAttribute="trailing" constant="25" id="RGV-Y8-2AS"/>
                                             <constraint firstItem="byM-04-3Y2" firstAttribute="top" secondItem="1Cu-IY-PxT" secondAttribute="top" constant="10" id="XUl-gn-JtA"/>
                                             <constraint firstItem="i8T-Xq-BYD" firstAttribute="leading" secondItem="xHQ-yW-GGy" secondAttribute="leading" id="ZFY-vb-DdL"/>
+                                            <constraint firstItem="AEe-60-OLn" firstAttribute="top" secondItem="i8T-Xq-BYD" secondAttribute="bottom" constant="15" id="bQu-1l-qCZ"/>
                                             <constraint firstAttribute="trailing" secondItem="fWd-8p-m7E" secondAttribute="trailing" constant="20" id="eJX-M0-ZjB"/>
                                             <constraint firstAttribute="trailing" secondItem="haf-ZC-Jaw" secondAttribute="trailing" constant="20" id="h9n-H0-Z9w"/>
+                                            <constraint firstAttribute="bottom" secondItem="AEe-60-OLn" secondAttribute="bottom" constant="15" id="jv8-g1-Mfu"/>
                                             <constraint firstItem="byM-04-3Y2" firstAttribute="leading" secondItem="1Cu-IY-PxT" secondAttribute="trailing" constant="10" id="kmY-Cv-Rrm"/>
                                             <constraint firstItem="fWd-8p-m7E" firstAttribute="leading" secondItem="byM-04-3Y2" secondAttribute="leading" id="qaz-pv-olW"/>
                                             <constraint firstItem="haf-ZC-Jaw" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="byM-04-3Y2" secondAttribute="trailing" constant="5" id="rLz-Rm-TLX"/>
+                                            <constraint firstItem="AEe-60-OLn" firstAttribute="leading" secondItem="mH7-Vz-AhU" secondAttribute="leading" constant="25" id="yU1-RP-FLw"/>
                                         </constraints>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -289,6 +301,8 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
                 <outlet property="backView" destination="4zc-IK-L8F" id="gwM-3Z-dRH"/>
+                <outlet property="commentHeight" destination="5iF-md-BJA" id="tNi-kr-s3W"/>
+                <outlet property="commentLab" destination="AEe-60-OLn" id="YwM-S1-LMF"/>
                 <outlet property="foodImg" destination="KGE-9n-y9b" id="Vg2-58-ruu"/>
                 <outlet property="headHeight" destination="KWK-VK-qez" id="xXq-IU-rb3"/>
                 <outlet property="nameLab" destination="byM-04-3Y2" id="CbF-zD-A0f"/>
@@ -318,7 +332,7 @@
                 <outletCollection property="foodLabList" destination="gh1-pX-7CA" collectionClass="NSMutableArray" id="gkc-ZH-nus"/>
                 <outletCollection property="foodLabList" destination="qki-Qy-H5V" collectionClass="NSMutableArray" id="rlZ-qN-7fJ"/>
             </connections>
-            <point key="canvasLocation" x="171.75572519083968" y="179.92957746478874"/>
+            <point key="canvasLocation" x="171.75572519083968" y="224.64788732394368"/>
         </tableViewCell>
     </objects>
     <resources>

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

@@ -78,6 +78,9 @@ class SetMealDetailVC: ADHBaseVC {
         }
     }
     
+    /// 备注
+    var comment : String?
+    
     ///最低用餐人数
     var lowestNum : Int = 1
 
@@ -113,6 +116,11 @@ class SetMealDetailVC: ADHBaseVC {
     //配送时间选择
     let deliveryTimeSetView = Bundle.main.loadNibNamed("DeliveryTimeSetView", owner: nil, options: nil)?.last as? DeliveryTimeSetView
     
+    //备注
+    let remarkOderView = Bundle.main.loadNibNamed("RemarkOderView", owner: nil, options: nil)?.last as? RemarkOderView
+    
+    
+    
 //    //需知
 //    let needKonwView = Bundle.main.loadNibNamed("NeedKonwView", owner: nil, options: nil)?.last as? NeedKonwView
     
@@ -214,9 +222,9 @@ class SetMealDetailVC: ADHBaseVC {
         
         
         if (self.viewModel.SMDetailModel?.isFixed ?? "0") == "1"{
-            self.viewList = [self.mealHeadView!,self.changeMealCollectionView!,self.deliveryTimeSetView!]
+            self.viewList = [self.mealHeadView!,self.changeMealCollectionView!,self.deliveryTimeSetView!,self.remarkOderView!]
         }else{
-            self.viewList = [self.mealHeadView!,self.mealCollectionView!,self.deliveryTimeSetView!]
+            self.viewList = [self.mealHeadView!,self.mealCollectionView!,self.deliveryTimeSetView!,self.remarkOderView!]
         }
         self.scrollView.addSubview(self.mealHeadView!)
 
@@ -229,6 +237,9 @@ class SetMealDetailVC: ADHBaseVC {
         
         self.scrollView.addSubview(self.deliveryTimeSetView!)
         
+        self.scrollView.addSubview(self.remarkOderView!)
+        
+        
         self.resetConstraint()
         
         //查看评论
@@ -272,6 +283,10 @@ class SetMealDetailVC: ADHBaseVC {
             needKonwView?.showWithString(detail: self?.viewModel.SMDetailModel?.notice)
         }
         
+        //备注
+        self.remarkOderView?.callBackBlock = {[unowned self] comment in
+            self.comment = comment
+        }
         
         //MARK: 获取配送时段
         self.changeMealCollectionView?.changeFoodBlock = {[weak self] model , row in
@@ -496,9 +511,15 @@ class SetMealDetailVC: ADHBaseVC {
                         lin2 = 1
                     }
                     make?.height.offset()(154 + 44 * CGFloat(lin1 + lin2) - 12)
-                    make?.bottom.mas_equalTo()(self.scrollView)
+//                    make?.bottom.mas_equalTo()(self.scrollView)
                     
                 }
+                if i == 3{
+                    make?.top.mas_equalTo()(self.deliveryTimeSetView?.mas_bottom)
+                    make?.width.offset()(kSCREEN_WIDTH)
+                    make?.height.offset()(220)
+                    make?.bottom.mas_equalTo()(self.scrollView)
+                }
             }
             contentSizeH = contentSizeH + itme.frame.size.height
         }
@@ -591,7 +612,7 @@ class SetMealDetailVC: ADHBaseVC {
             }
         }
         
-//        self.viewModel.addShoppingRequestModel.mealFoodMsgs =
+        self.viewModel.addShoppingRequestModel.comment = self.comment
         
         //MARK: 加入购物车
         self.viewModel.signalAddShopping()?.on(success: { dd in

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

@@ -82,6 +82,8 @@ class SingleMealDetailController: ADHBaseVC {
         }
     }
     
+    /// 备注
+    var comment : String?
     
     ///最低用餐人数
     var lowestNum : Int = 1
@@ -118,6 +120,9 @@ class SingleMealDetailController: ADHBaseVC {
     //配送时间选择
     let deliveryTimeSetView = Bundle.main.loadNibNamed("DeliveryTimeSetView", owner: nil, options: nil)?.last as? DeliveryTimeSetView
     
+    //备注
+    let remarkOderView = Bundle.main.loadNibNamed("RemarkOderView", owner: nil, options: nil)?.last as? RemarkOderView
+    
 //    //需知
 //    let needKonwView = Bundle.main.loadNibNamed("NeedKonwView", owner: nil, options: nil)?.last as? NeedKonwView
     
@@ -212,10 +217,11 @@ class SingleMealDetailController: ADHBaseVC {
             make?.width.offset()(kSCREEN_WIDTH)
         }
         
-        self.viewList = [self.mealHeadView!,self.mealDescribeView!,self.deliveryTimeSetView!]
+        self.viewList = [self.mealHeadView!,self.mealDescribeView!,self.deliveryTimeSetView!,self.remarkOderView!]
         self.scrollView.addSubview(self.mealHeadView!)
         self.scrollView.addSubview(self.mealDescribeView!)
         self.scrollView.addSubview(self.deliveryTimeSetView!)
+        self.scrollView.addSubview(self.remarkOderView!)
         self.resetConstraint()
         
         //查看评论
@@ -269,6 +275,11 @@ class SingleMealDetailController: ADHBaseVC {
                 
             }
         }
+        
+        //备注
+        self.remarkOderView?.callBackBlock = {[unowned self] comment in
+            self.comment = comment
+        }
     }
 
     
@@ -299,9 +310,14 @@ class SingleMealDetailController: ADHBaseVC {
                         lin2 = 1
                     }
                     make?.height.offset()(154 + 44 * CGFloat(lin1 + lin2) - 12)
-                    make?.bottom.mas_equalTo()(self.scrollView)
+//                    make?.bottom.mas_equalTo()(self.scrollView)
                     
                 }
+                if i == 3{
+                    make?.top.mas_equalTo()(self.deliveryTimeSetView?.mas_bottom)
+                    make?.height.offset()(220)
+                    make?.bottom.mas_equalTo()(self.scrollView)
+                }
             }
             contentSizeH = contentSizeH + itme.frame.size.height
         }
@@ -385,6 +401,8 @@ class SingleMealDetailController: ADHBaseVC {
             return
         }
         
+        self.viewModel.addShoppingRequestModel.comment = self.comment
+
         
         //MARK: 加入购物车
         self.viewModel.signalAddShopping()?.on(success: { dd in

ADHTuanCan/Class/餐品详情/view/Base.lproj/RemarkOderView.xib

@@ -0,0 +1,76 @@
+<?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="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="u8V-TU-p0v" customClass="RemarkOderView" customModule="ADHTuanCan" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="681" height="220"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M1m-N2-Zku">
+                    <rect key="frame" x="0.0" y="0.0" width="681" height="220"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="备注" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="83M-KQ-fmB">
+                            <rect key="frame" x="24.999999999999996" y="0.0" width="34.666666666666657" height="21"/>
+                            <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"/>
+                        </label>
+                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Cpq-Dj-OmO">
+                            <rect key="frame" x="25" y="46" width="631" height="149"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                            <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="4"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </textView>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <constraints>
+                        <constraint firstItem="Cpq-Dj-OmO" firstAttribute="leading" secondItem="M1m-N2-Zku" secondAttribute="leading" constant="25" id="7wP-Ql-2jj"/>
+                        <constraint firstItem="Cpq-Dj-OmO" firstAttribute="top" secondItem="83M-KQ-fmB" secondAttribute="bottom" constant="25" id="QsG-kE-uvl"/>
+                        <constraint firstItem="83M-KQ-fmB" firstAttribute="leading" secondItem="M1m-N2-Zku" secondAttribute="leading" constant="25" id="S3d-i8-0T7"/>
+                        <constraint firstAttribute="height" constant="220" id="pBU-Me-vcU"/>
+                        <constraint firstAttribute="trailing" secondItem="Cpq-Dj-OmO" secondAttribute="trailing" constant="25" id="rn2-KH-wkx"/>
+                        <constraint firstAttribute="bottom" secondItem="Cpq-Dj-OmO" secondAttribute="bottom" constant="25" id="s5M-eU-8oE"/>
+                        <constraint firstItem="83M-KQ-fmB" firstAttribute="top" secondItem="M1m-N2-Zku" secondAttribute="top" id="yUB-vF-zZ0"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="M1m-N2-Zku" secondAttribute="trailing" id="8lF-DJ-ltU"/>
+                <constraint firstAttribute="bottom" secondItem="M1m-N2-Zku" secondAttribute="bottom" id="Mu5-nD-DYj"/>
+                <constraint firstItem="M1m-N2-Zku" firstAttribute="top" secondItem="u8V-TU-p0v" secondAttribute="top" id="aOo-Aw-nQe"/>
+                <constraint firstItem="M1m-N2-Zku" firstAttribute="leading" secondItem="u8V-TU-p0v" secondAttribute="leading" id="pjn-1M-Ceb"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="remarkDetailTextView" destination="Cpq-Dj-OmO" id="wLq-Qz-nJw"/>
+            </connections>
+            <point key="canvasLocation" x="266.41221374045801" y="-226.05633802816902"/>
+        </view>
+    </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

ADHTuanCan/Class/餐品详情/view/RemarkOderView.swift

@@ -0,0 +1,29 @@
+//
+//  RemarkOderView.swift
+//  ADHTuanCan
+//
+//  Created by 敖德亨 on 2024/5/13.
+//
+
+import UIKit
+
+class RemarkOderView: UIView {
+
+    @IBOutlet weak var remarkDetailTextView: UITextView!
+
+    var comment : String?
+    
+    var callBackBlock : ((String)->Void)?
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.remarkDetailTextView.inputText(maxLength: 200) {
+            self.comment = self.remarkDetailTextView.text
+            if self.callBackBlock != nil{
+                self.callBackBlock!(self.comment ?? "")
+            }
+        }
+    }
+  
+
+}

ADHTuanCan/Class/餐品详情/view/en.lproj/RemarkOderView.strings

@@ -0,0 +1,3 @@
+
+/* Class = "UILabel"; text = "备注"; ObjectID = "83M-KQ-fmB"; */
+"83M-KQ-fmB.text" = "Comment";

ADHTuanCan/Class/餐品详情/view/zh-Hans.lproj/RemarkOderView.strings

@@ -0,0 +1,3 @@
+
+/* Class = "UILabel"; text = "备注"; ObjectID = "83M-KQ-fmB"; */
+"83M-KQ-fmB.text" = "备注";