键盘

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -10,6 +10,8 @@
 		9C3AD0BD567C3C122CCE3169 /* Pods_GeliBusinessPlatform.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA2D518C6159EA47DCD8E0C /* Pods_GeliBusinessPlatform.framework */; };
 		E00B0B1B24629E99006DC846 /* SJMapCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00B0B1924629E99006DC846 /* SJMapCell.swift */; };
 		E00B0B1C24629E99006DC846 /* SJMapCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00B0B1A24629E99006DC846 /* SJMapCell.xib */; };
+		E00CDE732474BBB60018AEF8 /* EPViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00CDE712474BBB60018AEF8 /* EPViewController.swift */; };
+		E00CDE742474BBB60018AEF8 /* EPViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00CDE722474BBB60018AEF8 /* EPViewController.xib */; };
 		E00D85DF244561FD00F5F816 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00D85DE244561FD00F5F816 /* AppDelegate.swift */; };
 		E00D85E1244561FD00F5F816 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00D85E0244561FD00F5F816 /* SceneDelegate.swift */; };
 		E00D85E5244561FE00F5F816 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E00D85E4244561FE00F5F816 /* Assets.xcassets */; };
@@ -148,8 +150,6 @@
 		E07B1E70245929060055BA3C /* GYSGLViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07B1E6E245929060055BA3C /* GYSGLViewController.xib */; };
 		E07B1E78245966E60055BA3C /* XinCaiGouViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07B1E76245966E60055BA3C /* XinCaiGouViewController.swift */; };
 		E07B1E79245966E60055BA3C /* XinCaiGouViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07B1E77245966E60055BA3C /* XinCaiGouViewController.xib */; };
-		E07C7F86246BD8AB000B0714 /* EditProductViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07C7F84246BD8AB000B0714 /* EditProductViewController.swift */; };
-		E07C7F87246BD8AB000B0714 /* EditProductViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07C7F85246BD8AB000B0714 /* EditProductViewController.xib */; };
 		E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E088CC8C24470BF0000DAA8A /* CodeView.swift */; };
 		E088CC932447124D000DAA8A /* BindViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E088CC912447124D000DAA8A /* BindViewController.swift */; };
 		E088CC942447124D000DAA8A /* BindViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E088CC922447124D000DAA8A /* BindViewController.xib */; };
@@ -490,6 +490,8 @@
 		6FA79EFC99FED0CA28AA1444 /* Pods-GeliBusinessPlatform.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GeliBusinessPlatform.debug.xcconfig"; path = "Target Support Files/Pods-GeliBusinessPlatform/Pods-GeliBusinessPlatform.debug.xcconfig"; sourceTree = "<group>"; };
 		E00B0B1924629E99006DC846 /* SJMapCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SJMapCell.swift; sourceTree = "<group>"; };
 		E00B0B1A24629E99006DC846 /* SJMapCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SJMapCell.xib; sourceTree = "<group>"; };
+		E00CDE712474BBB60018AEF8 /* EPViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPViewController.swift; sourceTree = "<group>"; };
+		E00CDE722474BBB60018AEF8 /* EPViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EPViewController.xib; sourceTree = "<group>"; };
 		E00D85DB244561FD00F5F816 /* GeliBusinessPlatform.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GeliBusinessPlatform.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E00D85DE244561FD00F5F816 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		E00D85E0244561FD00F5F816 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -636,8 +638,6 @@
 		E07B1E6E245929060055BA3C /* GYSGLViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYSGLViewController.xib; sourceTree = "<group>"; };
 		E07B1E76245966E60055BA3C /* XinCaiGouViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinCaiGouViewController.swift; sourceTree = "<group>"; };
 		E07B1E77245966E60055BA3C /* XinCaiGouViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XinCaiGouViewController.xib; sourceTree = "<group>"; };
-		E07C7F84246BD8AB000B0714 /* EditProductViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProductViewController.swift; sourceTree = "<group>"; };
-		E07C7F85246BD8AB000B0714 /* EditProductViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EditProductViewController.xib; sourceTree = "<group>"; };
 		E088CC8C24470BF0000DAA8A /* CodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeView.swift; sourceTree = "<group>"; };
 		E088CC912447124D000DAA8A /* BindViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BindViewController.swift; sourceTree = "<group>"; };
 		E088CC922447124D000DAA8A /* BindViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BindViewController.xib; sourceTree = "<group>"; };
@@ -1845,8 +1845,8 @@
 				E0F97B072451620B001BD600 /* ProductDetailViewController.xib */,
 				E0F1BE4624692379003015B2 /* ItemCell.swift */,
 				E0F1BE4724692379003015B2 /* ItemCell.xib */,
-				E07C7F84246BD8AB000B0714 /* EditProductViewController.swift */,
-				E07C7F85246BD8AB000B0714 /* EditProductViewController.xib */,
+				E00CDE712474BBB60018AEF8 /* EPViewController.swift */,
+				E00CDE722474BBB60018AEF8 /* EPViewController.xib */,
 			);
 			path = "商品详情";
 			sourceTree = "<group>";
@@ -2509,7 +2509,6 @@
 				E09B03C12445B96500211A51 /* FgPassViewController.xib in Resources */,
 				E06524EE2458008900CA22E2 /* RuKuViewController.xib in Resources */,
 				E06524F624580BB600CA22E2 /* BaoZhiQiCell.xib in Resources */,
-				E07C7F87246BD8AB000B0714 /* EditProductViewController.xib in Resources */,
 				E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */,
 				F93E320B2473D83D00524DFC /* GeliAlertTextFiled.xib in Resources */,
 				E07B1E5F24591AA50055BA3C /* KeHuXQViewController.xib in Resources */,
@@ -2563,6 +2562,7 @@
 				F95567A82453DA86009674AB /* WarehoseMangementListVC.xib in Resources */,
 				E0C4F4BE244EF53D00CC7E2F /* BindStepTwoViewController.xib in Resources */,
 				E00B0B1C24629E99006DC846 /* SJMapCell.xib in Resources */,
+				E00CDE742474BBB60018AEF8 /* EPViewController.xib in Resources */,
 				E02C882B2456B4BA00925766 /* WLGZCell.xib in Resources */,
 				E042F735245274F200CDFA12 /* YunDanLieBiaoCell.xib in Resources */,
 				E0D197CB24484D90002B080C /* PersonCenterCell.xib in Resources */,
@@ -2855,7 +2855,6 @@
 				F961D271245016B7007FBE70 /* SelectContentView.swift in Sources */,
 				F933F6C02452C68B00189561 /* PKHUDSystemActivityIndicatorView.swift in Sources */,
 				E08B0674244A98B2001D2E01 /* WareHouseSpCell.swift in Sources */,
-				E07C7F86246BD8AB000B0714 /* EditProductViewController.swift in Sources */,
 				E0A2E81E24552F0A00D6DB34 /* TilteAndTextViewCell.swift in Sources */,
 				F9531F3D2465108800724BEE /* JXPhotoBrowserAnimatedTransitioning.swift in Sources */,
 				E0D197CA24484D90002B080C /* PersonCenterCell.swift in Sources */,
@@ -2873,6 +2872,7 @@
 				E0A2E82724555B4400D6DB34 /* KuCunShangPinCell.swift in Sources */,
 				F950FDA72451494500C40530 /* GeliPayInfoModel.swift in Sources */,
 				F9531F432465108800724BEE /* JXPhotoBrowserImageCell.swift in Sources */,
+				E00CDE732474BBB60018AEF8 /* EPViewController.swift in Sources */,
 				E07B1E6B245926330055BA3C /* GYSGLCell.swift in Sources */,
 				F956D5AC246A2D9C003FF510 /* LMNImageLine.m in Sources */,
 				E09B03C02445B96500211A51 /* FgPassViewController.swift in Sources */,

GeliBusinessPlatform/SceneDelegate.swift

@@ -42,7 +42,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
     }
     //MARK:--loginVC
     func addLoginVc (isAgain:Bool){
-        
+//
         let vc = LoginViewController()
         vc.delegate = self
         let contentView = vc

GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift

@@ -408,13 +408,17 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
     }
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         print("选中===\(indexPath)")
-        let vc = ProductDetailViewController()
+        let vc = EPViewController()
+        let data = items[indexPath.row]
+        vc.goods_id = data.goods_id
         self.navigationController?.pushViewController(vc, animated: true)
     }
 
     //MARK:---cell delegate 选中
     func selectListsIndex(index: Int) {
-        let vc = ProductDetailViewController()
+        let vc = EPViewController()
+        let data = items[index]
+        vc.goods_id = data.goods_id
         self.navigationController?.pushViewController(vc, animated: true)
     }
     //MARK:-- cell delegate 上下架，入库

GeliBusinessPlatform/ViewController/商品详情/EditProductViewController.xib → GeliBusinessPlatform/ViewController/商品详情/EPViewController.xib

@@ -8,10 +8,11 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="EditProductViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="EPViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
             <connections>
-                <outlet property="bottomView" destination="eFg-iG-awf" id="UXR-sY-RHK"/>
-                <outlet property="listTbv" destination="8Fv-Ss-fcb" id="xab-1c-WUC"/>
+                <outlet property="btmBtnBGView" destination="H2x-8q-Enj" id="zfZ-07-szf"/>
+                <outlet property="btmBtnViewH" destination="zvU-A1-Wlq" id="gZn-F8-1hh"/>
+                <outlet property="tbvBGView" destination="ZLj-69-KvE" id="sHZ-SL-tOh"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
@@ -20,47 +21,43 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="drN-vh-kV3">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8BW-ln-Nxl">
                     <rect key="frame" x="0.0" y="813" width="414" height="83"/>
                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eFg-iG-awf">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H2x-8q-Enj">
                     <rect key="frame" x="0.0" y="813" width="414" height="49"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBlueColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="49" id="Yga-Ec-b4a"/>
+                        <constraint firstAttribute="height" constant="49" id="zvU-A1-Wlq"/>
                     </constraints>
                 </view>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="8Fv-Ss-fcb">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZLj-69-KvE">
                     <rect key="frame" x="0.0" y="44" width="414" height="769"/>
-                    <color key="backgroundColor" name="白色背景色"/>
-                    <connections>
-                        <outlet property="dataSource" destination="-1" id="UML-aq-eZJ"/>
-                        <outlet property="delegate" destination="-1" id="LEW-Yi-wxv"/>
-                    </connections>
-                </tableView>
+                    <color key="backgroundColor" name="app底色"/>
+                </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="drN-vh-kV3" secondAttribute="trailing" id="5Ua-1G-oDk"/>
-                <constraint firstItem="eFg-iG-awf" firstAttribute="top" secondItem="8Fv-Ss-fcb" secondAttribute="bottom" id="6nY-7j-452"/>
-                <constraint firstItem="8Fv-Ss-fcb" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="6vq-Th-6hv"/>
-                <constraint firstAttribute="bottom" secondItem="drN-vh-kV3" secondAttribute="bottom" id="EzG-9Q-6Cg"/>
-                <constraint firstItem="drN-vh-kV3" firstAttribute="top" secondItem="eFg-iG-awf" secondAttribute="top" id="PwX-Ue-uGH"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="8Fv-Ss-fcb" secondAttribute="trailing" id="WIB-ml-ERa"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="eFg-iG-awf" secondAttribute="trailing" id="b1W-KS-K4v"/>
-                <constraint firstItem="eFg-iG-awf" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="eBR-6r-zfV"/>
-                <constraint firstItem="8Fv-Ss-fcb" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="j0E-Bg-S0z"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="eFg-iG-awf" secondAttribute="bottom" id="nwH-n3-0GY"/>
-                <constraint firstItem="drN-vh-kV3" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="pa9-O7-nAr"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="ZLj-69-KvE" secondAttribute="trailing" id="3Jk-Tc-TKn"/>
+                <constraint firstAttribute="bottom" secondItem="8BW-ln-Nxl" secondAttribute="bottom" id="4Gl-Yg-o45"/>
+                <constraint firstItem="8BW-ln-Nxl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="8oR-Lt-pCU"/>
+                <constraint firstAttribute="trailing" secondItem="8BW-ln-Nxl" secondAttribute="trailing" id="NbR-OX-9fd"/>
+                <constraint firstItem="H2x-8q-Enj" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Pcj-8n-w37"/>
+                <constraint firstItem="ZLj-69-KvE" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="Y3r-3J-qfn"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="H2x-8q-Enj" secondAttribute="bottom" id="bNX-52-VdE"/>
+                <constraint firstItem="8BW-ln-Nxl" firstAttribute="top" secondItem="ZLj-69-KvE" secondAttribute="bottom" id="biy-r5-iTE"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="H2x-8q-Enj" secondAttribute="trailing" id="f4A-MP-LP5"/>
+                <constraint firstItem="8BW-ln-Nxl" firstAttribute="top" secondItem="H2x-8q-Enj" secondAttribute="top" id="qVu-HU-nQk"/>
+                <constraint firstItem="ZLj-69-KvE" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="w6v-Bv-ydF"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
-            <point key="canvasLocation" x="131.8840579710145" y="130.58035714285714"/>
+            <point key="canvasLocation" x="131.8840579710145" y="101.78571428571428"/>
         </view>
     </objects>
     <resources>
-        <namedColor name="白色背景色">
-            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        <namedColor name="app底色">
+            <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift

@@ -318,18 +318,20 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
                 //商家名称
                 switch cell.nameLbl.text {
                 case "商品名称":
+                    cell.textTF.keyboardType = .default
                     cell.textTF.text = itemName
                     cell.textTF.returnKeyType = .done
                     break
                 case "起卖数量":
-                    cell.textTF.text = qiMaiShuLiang
                     cell.textTF.keyboardType = .numberPad
+                    cell.textTF.text = qiMaiShuLiang
                     break
                 default:
                     break
                 }
                 
                 cell.textTF.placeholder = tishixxArr[indexPath.row] as! String
+                
                 cell.delegate = self
                 return cell
             }
@@ -392,7 +394,6 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
                     
                     dict = guiGeArr.first
                 }
-                
                 cell.tempLbl.text = "冷藏：\(dict.wenDu)℃"
                 cell.weightLbl.text = "重量（kg）：\(dict.weight)kg"
                 cell.guiGeLbl.text = "规格：\(dict.guiGe)kg/件"
@@ -432,10 +433,11 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
                 let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTF") as! TitleAndTFCell
                 cell.nameLbl.text = qtxxArr[indexPath.row]
                 cell.textTF.delegate = self
-                cell.textTF.returnKeyType = .done
                 switch cell.nameLbl.text {
                 case "关键字":
                     cell.textTF.text = keyWord
+                    cell.textTF.keyboardType = .default
+                    cell.textTF.returnKeyType = .done
                     break
                 case "物流费用":
                     cell.textTF.text = wuLiuPrice
@@ -445,6 +447,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
                     break
                 }
                 cell.textTF.placeholder = tishixxArr1[indexPath.row] as! String
+             
                 cell.tag = indexPath.row
                 cell.delegate = self
                 return cell