规格新增条形码

GeliBusinessPlatform/View/Cell/AddGuiGeCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

GeliBusinessPlatform/View/Cell/ShangPinGguiGeCell.swift

@@ -11,6 +11,20 @@ protocol ShangPinGguiGeCellDelegate {
     func ShangPinGguiGeCellEditAction(cell:ShangPinGguiGeCell)
 }
 class ShangPinGguiGeCell: UITableViewCell {
+    var isCheck = false{
+        didSet{
+            if isCheck {
+                top_view.isHidden = false
+                code_lbl.isHidden = false
+                top_view_h.constant = 49
+            }else{
+                top_view_h.constant = 0
+            }
+        }
+    }
+    @IBOutlet weak var code_lbl: UILabel!
+    @IBOutlet weak var top_view_h: NSLayoutConstraint!
+    @IBOutlet weak var top_view: UIView!
     var delegate:ShangPinGguiGeCellDelegate?
     @IBAction func editAction(_ sender: Any) {
         delegate?.ShangPinGguiGeCellEditAction(cell: self)

GeliBusinessPlatform/View/Cell/ShangPinGguiGeCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="ShangPinGguiGeCell" customModule="TestClass" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="146"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="199"/>
             <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="375" height="146"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="199"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="售价：¥260.00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mw0-dB-6KQ">
-                        <rect key="frame" x="0.0" y="0.0" width="187.5" height="49"/>
+                        <rect key="frame" x="0.0" y="49" width="187.5" height="49"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="49" id="cTs-tj-wBd"/>
                         </constraints>
@@ -28,7 +29,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单位：吨" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oOy-dE-JIB">
-                        <rect key="frame" x="187.5" y="0.0" width="187.5" height="49"/>
+                        <rect key="frame" x="187.5" y="49" width="187.5" height="49"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="49" id="hTR-gc-CIs"/>
                         </constraints>
@@ -37,14 +38,14 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K8k-YW-neS">
-                        <rect key="frame" x="15" y="49" width="345" height="1"/>
+                        <rect key="frame" x="15" y="98" width="345" height="1"/>
                         <color key="backgroundColor" name="灰色分界线"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="1" id="DDV-Is-JZh"/>
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="规格：100kg/件" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GPm-DS-HCD">
-                        <rect key="frame" x="0.0" y="50" width="187.5" height="49"/>
+                        <rect key="frame" x="0.0" y="99" width="187.5" height="49"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="49" id="O1L-rk-sve"/>
                         </constraints>
@@ -53,7 +54,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="重量（kg）：10kg" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EeX-7S-sb3">
-                        <rect key="frame" x="187.5" y="50" width="187.5" height="49"/>
+                        <rect key="frame" x="187.5" y="99" width="187.5" height="49"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="49" id="sFh-GY-fga"/>
                         </constraints>
@@ -62,14 +63,14 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dLV-gy-4MF">
-                        <rect key="frame" x="15" y="99" width="345" height="1"/>
+                        <rect key="frame" x="15" y="148" width="345" height="1"/>
                         <color key="backgroundColor" name="灰色分界线"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="1" id="ubu-me-Hbc"/>
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="冷藏：-18℃" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bIm-PK-kvk">
-                        <rect key="frame" x="0.0" y="100" width="187.5" height="49"/>
+                        <rect key="frame" x="0.0" y="149" width="187.5" height="49"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="49" id="b0p-xi-VUN"/>
                         </constraints>
@@ -77,8 +78,8 @@
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yWF-ML-clI">
-                        <rect key="frame" x="187.5" y="100" width="187.5" height="49"/>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yWF-ML-clI">
+                        <rect key="frame" x="187.5" y="149" width="187.5" height="49"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="49" id="Vhh-bn-CUk"/>
                         </constraints>
@@ -91,7 +92,7 @@
                         </connections>
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K2a-dA-ghw">
-                        <rect key="frame" x="187" y="14.5" width="1" height="20"/>
+                        <rect key="frame" x="187" y="63.5" width="1" height="20"/>
                         <color key="backgroundColor" name="灰色分界线"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="1" id="6as-Vx-EHs"/>
@@ -99,7 +100,7 @@
                         </constraints>
                     </view>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OfO-Ur-eKC">
-                        <rect key="frame" x="187" y="64.5" width="1" height="20"/>
+                        <rect key="frame" x="187" y="113.5" width="1" height="20"/>
                         <color key="backgroundColor" name="灰色分界线"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="H93-wO-ov1"/>
@@ -107,15 +108,44 @@
                         </constraints>
                     </view>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7kc-iX-5UF">
-                        <rect key="frame" x="187" y="114.5" width="1" height="20"/>
+                        <rect key="frame" x="187" y="163.5" width="1" height="20"/>
                         <color key="backgroundColor" name="灰色分界线"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="1" id="IOJ-D4-uLs"/>
                             <constraint firstAttribute="height" constant="20" id="ye5-4z-tTY"/>
                         </constraints>
                     </view>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f14-22-Hil">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tbS-BR-V9w">
+                                <rect key="frame" x="15" y="48" width="345" height="1"/>
+                                <color key="backgroundColor" name="灰色分界线"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="1" id="qrB-UU-mM5"/>
+                                </constraints>
+                            </view>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="商品条码：46547519640058" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t3v-T0-DHl">
+                                <rect key="frame" x="49" y="15" width="311" height="16"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                <color key="textColor" name="标题字颜色"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="49" id="K1Y-Qm-qZd"/>
+                            <constraint firstAttribute="trailing" secondItem="tbS-BR-V9w" secondAttribute="trailing" constant="15" id="Yum-2p-anA"/>
+                            <constraint firstAttribute="trailing" secondItem="t3v-T0-DHl" secondAttribute="trailing" constant="15" id="ZRE-1j-9oH"/>
+                            <constraint firstItem="t3v-T0-DHl" firstAttribute="leading" secondItem="f14-22-Hil" secondAttribute="leading" constant="49" id="bZE-mq-tQ6"/>
+                            <constraint firstAttribute="bottom" secondItem="tbS-BR-V9w" secondAttribute="bottom" id="cXf-Ai-tZV"/>
+                            <constraint firstItem="tbS-BR-V9w" firstAttribute="leading" secondItem="f14-22-Hil" secondAttribute="leading" constant="15" id="x7h-za-meU"/>
+                            <constraint firstItem="t3v-T0-DHl" firstAttribute="top" secondItem="f14-22-Hil" secondAttribute="top" constant="15" id="y0x-Vo-15S"/>
+                        </constraints>
+                    </view>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="f14-22-Hil" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="3nM-zZ-2AW"/>
                     <constraint firstItem="7kc-iX-5UF" firstAttribute="centerY" secondItem="bIm-PK-kvk" secondAttribute="centerY" id="4Gk-GB-sLe"/>
                     <constraint firstItem="OfO-Ur-eKC" firstAttribute="centerY" secondItem="GPm-DS-HCD" secondAttribute="centerY" id="4IO-rL-OHY"/>
                     <constraint firstItem="yWF-ML-clI" firstAttribute="top" secondItem="dLV-gy-4MF" secondAttribute="bottom" id="4Z4-S5-zYD"/>
@@ -126,12 +156,13 @@
                     <constraint firstItem="oOy-dE-JIB" firstAttribute="width" secondItem="Mw0-dB-6KQ" secondAttribute="width" id="CTH-cF-Vv9"/>
                     <constraint firstItem="7kc-iX-5UF" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="GRb-ta-B5q"/>
                     <constraint firstItem="yWF-ML-clI" firstAttribute="leading" secondItem="bIm-PK-kvk" secondAttribute="trailing" id="I4O-7p-T2E"/>
-                    <constraint firstItem="oOy-dE-JIB" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Jsj-Z5-Czt"/>
+                    <constraint firstItem="oOy-dE-JIB" firstAttribute="top" secondItem="f14-22-Hil" secondAttribute="bottom" id="Jsj-Z5-Czt"/>
                     <constraint firstItem="Mw0-dB-6KQ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="PcZ-yC-jNk"/>
-                    <constraint firstItem="Mw0-dB-6KQ" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="UrE-nZ-0Ou"/>
+                    <constraint firstItem="Mw0-dB-6KQ" firstAttribute="top" secondItem="f14-22-Hil" secondAttribute="bottom" id="UrE-nZ-0Ou"/>
                     <constraint firstAttribute="trailing" secondItem="oOy-dE-JIB" secondAttribute="trailing" id="Wdn-Vq-vfJ"/>
                     <constraint firstItem="oOy-dE-JIB" firstAttribute="leading" secondItem="Mw0-dB-6KQ" secondAttribute="trailing" id="XhB-sH-Fd1"/>
                     <constraint firstAttribute="trailing" secondItem="yWF-ML-clI" secondAttribute="trailing" id="XmT-41-e7C"/>
+                    <constraint firstAttribute="trailing" secondItem="f14-22-Hil" secondAttribute="trailing" id="YH9-jn-8FM"/>
                     <constraint firstItem="dLV-gy-4MF" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="bOL-OP-9Kw"/>
                     <constraint firstItem="K2a-dA-ghw" firstAttribute="centerY" secondItem="Mw0-dB-6KQ" secondAttribute="centerY" id="bt0-NL-DgF"/>
                     <constraint firstAttribute="trailing" secondItem="EeX-7S-sb3" secondAttribute="trailing" id="drL-r7-Erz"/>
@@ -139,6 +170,7 @@
                     <constraint firstItem="K2a-dA-ghw" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="lAL-H6-q1X"/>
                     <constraint firstItem="bIm-PK-kvk" firstAttribute="top" secondItem="dLV-gy-4MF" secondAttribute="bottom" id="lLs-EN-Mbn"/>
                     <constraint firstItem="EeX-7S-sb3" firstAttribute="width" secondItem="GPm-DS-HCD" secondAttribute="width" id="nbk-Dm-GIi"/>
+                    <constraint firstItem="f14-22-Hil" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="pQq-4n-hLh"/>
                     <constraint firstItem="bIm-PK-kvk" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="qQi-us-lCp"/>
                     <constraint firstItem="EeX-7S-sb3" firstAttribute="top" secondItem="K8k-YW-neS" secondAttribute="bottom" id="rFN-Nj-vBJ"/>
                     <constraint firstItem="yWF-ML-clI" firstAttribute="width" secondItem="bIm-PK-kvk" secondAttribute="width" id="she-GH-xJn"/>
@@ -151,13 +183,16 @@
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
                 <outlet property="btn" destination="yWF-ML-clI" id="D0u-7Q-exy"/>
+                <outlet property="code_lbl" destination="t3v-T0-DHl" id="YZb-x4-rgU"/>
                 <outlet property="danWeiLbl" destination="oOy-dE-JIB" id="mAU-7i-WZz"/>
                 <outlet property="guiGeLbl" destination="GPm-DS-HCD" id="HD8-uW-HzQ"/>
                 <outlet property="sellPriceLbl" destination="Mw0-dB-6KQ" id="LxY-Qz-4j7"/>
                 <outlet property="tempLbl" destination="bIm-PK-kvk" id="PfP-6Q-if1"/>
+                <outlet property="top_view" destination="f14-22-Hil" id="6ac-Nn-5FA"/>
+                <outlet property="top_view_h" destination="K1Y-Qm-qZd" id="1pY-RN-XRp"/>
                 <outlet property="weightLbl" destination="EeX-7S-sb3" id="yjA-Zu-wCa"/>
             </connections>
-            <point key="canvasLocation" x="131.15942028985509" y="121.875"/>
+            <point key="canvasLocation" x="131.15942028985509" y="121.54017857142857"/>
         </tableViewCell>
     </objects>
     <resources>
@@ -170,5 +205,8 @@
         <namedColor name="蓝色字体颜色">
             <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

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

@@ -77,8 +77,8 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     }
     
     var titleArr = ["商品信息","商品图片","商品规格","预售设置","其它信息","商品详情"]
-    let spxxArr = ["商品名称","商品类型","商品分类","品牌","起卖数量","是否清真","是否询价"]
-    var tishixxArr = ["请输入商品名称","请选择商品类型","请选择商品分类","请选择品牌","请输入起卖数量"]
+    let spxxArr = ["商品名称","商品类型","商品分类","品牌","可售库存","起卖数量","是否清真","是否询价"]
+    var tishixxArr = ["请输入商品名称","请选择商品类型","请选择商品分类","请选择品牌","查看库存","请输入起卖数量"]
     var tishixxArr1 = ["请输入关键字","请输入物流费用","请选择国家","热销","请选择运输方式"]
     let sptpArr = ["商品封面图(限一张)","商品主图(限五张)"]
     let qtxxArr = ["关键字","物流费用","国家","商品状态","运输方式"]
@@ -154,7 +154,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             }
         }else if sender.tag == 1002 {
             //MARK:---新增商品接口
-        
+            
             var goods_type = ""
             for i in 1..<itemTypeArr!.count {
                 let num = itemTypeArr![i]
@@ -219,34 +219,34 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             getUpSkuInfoEditByData(dataArr: guiGeArr)
             
             let dic = ["user_token":UserToken as Any, //验证token
-                "goods_id":goods_id as Any,//修改的商品ID
-                "cat_id":selectGoodsClassModel.cat_id as Any,  //分类ID
-                "brand_id":pinPai_id as Any, // 品牌ID
-                "goods_name":itemName as Any, //商品名称
-                "is_qz":is_qz as Any, //是否清真商品，1是0非
-                "goods_type":goods_type as Any, //商品类型，普通2现货3期货4团购
-                "is_adsale":is_adsale as Any, //商品类型字段，预售专用，选定”预售”则值为1，否则值为0
-                "is_inquiry":is_inquiry as Any, //是否询价：1是0非
-                "need_check":need_check as Any, //付款是否需要审核， 1是0非
-                "dj_time_start":dj_time_start as Any, //预设预付定金开始时间，时间戳，预售专用
-                "dj_time_end":dj_time_end as Any, //预设预付定金结束时间，时间戳，预售专用
-                "wk_time_start":wk_time_start as Any, //预设预付尾款开始时间，时间戳，预售专用
-                "wk_time_end":wk_time_end as Any, //预设预付尾款结束时间，时间戳，预售专用
-                "set_time":faHuoTime as Any, //预付尾款后几天后发货
-                "keywords":keyWord as Any, //关键字
-                "logistics":wuLiuPrice as Any, //物流费用
-                "origin_number":qiMaiShuLiang as Any, //起购数量
-                "coun_id":"1" as Any, //国家id 1(中国）
-                "gs_id":gs_id as Any, //商品状态
-                "transportation":transportation as Any, //运输方式，1冷链，2常温，3热链
-                "goods_desc":goodsDesc as Any, //商品详情 html p标签
-                "specifications":specifications as Any, //默认规格，选sku中最低价格(需判定阶梯价)的 规格值
-                "shop_price":shop_price as Any, //默认售价，选sku中最低价格(需判定阶梯价)的价格
-                "goods_unit":goods_unit as Any, //默认商品单位，选sku中最低价格(需判定阶梯价)的单位
-                "original_img":original_img as Any, //商品封面图
-                "original_img_edit":original_img_edit  as Any,//商品封面图是否有修改，1是0非
-                "goods_banner":goods_bannerStr as Any, //商品副图，多张，最多5张，使用一维数组转json格式
-                "sku_info":sku_info as Any]
+                       "goods_id":goods_id as Any,//修改的商品ID
+                       "cat_id":selectGoodsClassModel.cat_id as Any,  //分类ID
+                       "brand_id":pinPai_id as Any, // 品牌ID
+                       "goods_name":itemName as Any, //商品名称
+                       "is_qz":is_qz as Any, //是否清真商品，1是0非
+                       "goods_type":goods_type as Any, //商品类型，普通2现货3期货4团购
+                       "is_adsale":is_adsale as Any, //商品类型字段，预售专用，选定”预售”则值为1，否则值为0
+                       "is_inquiry":is_inquiry as Any, //是否询价：1是0非
+                       "need_check":need_check as Any, //付款是否需要审核， 1是0非
+                       "dj_time_start":dj_time_start as Any, //预设预付定金开始时间，时间戳，预售专用
+                       "dj_time_end":dj_time_end as Any, //预设预付定金结束时间，时间戳，预售专用
+                       "wk_time_start":wk_time_start as Any, //预设预付尾款开始时间，时间戳，预售专用
+                       "wk_time_end":wk_time_end as Any, //预设预付尾款结束时间，时间戳，预售专用
+                       "set_time":faHuoTime as Any, //预付尾款后几天后发货
+                       "keywords":keyWord as Any, //关键字
+                       "logistics":wuLiuPrice as Any, //物流费用
+                       "origin_number":qiMaiShuLiang as Any, //起购数量
+                       "coun_id":"1" as Any, //国家id 1(中国）
+                       "gs_id":gs_id as Any, //商品状态
+                       "transportation":transportation as Any, //运输方式，1冷链，2常温，3热链
+                       "goods_desc":goodsDesc as Any, //商品详情 html p标签
+                       "specifications":specifications as Any, //默认规格，选sku中最低价格(需判定阶梯价)的 规格值
+                       "shop_price":shop_price as Any, //默认售价，选sku中最低价格(需判定阶梯价)的价格
+                       "goods_unit":goods_unit as Any, //默认商品单位，选sku中最低价格(需判定阶梯价)的单位
+                       "original_img":original_img as Any, //商品封面图
+                       "original_img_edit":original_img_edit  as Any,//商品封面图是否有修改，1是0非
+                       "goods_banner":goods_bannerStr as Any, //商品副图，多张，最多5张，使用一维数组转json格式
+                       "sku_info":sku_info as Any]
             print(sku_info)
             //MARK:--修改商品接口
             goodsEdit(dic, success: { (data) in
@@ -265,7 +265,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             }
         }else if sender.tag == 1003 {
             
-           
+            
             onOff(["user_token":UserToken as Any,"goods_id":goods_id as Any,"is_show":1], success: { (data) in
                 let dataM = data as! UpDataModel
                 if dataM.code == 1 {
@@ -276,7 +276,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             }) { (erro) in
             }
         }else if sender.tag == 1004 {
-         
+            
             onOff(["user_token":UserToken as Any,"goods_id":goods_id as Any,"is_show":0], success: { (data) in
                 let dataM = data as! UpDataModel
                 if dataM.code == 1 {
@@ -321,7 +321,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
             alertView.rightBtn.tag = 1001
             self.view.window?.addSubview(alertView)
-           
+            
             break
         case "保存":
             print("保存按钮submitAction")
@@ -455,7 +455,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     }
     func loadData () {
         //MARK:--新增商品和编辑商品所需要的基本信息（无）就页面不正常显示
-      
+        
         goodsDetail(["user_token":UserToken,"goods_id":goods_id], success: { (data) in
             //MARK: - 获取详情
             self.listTbv.isHidden = false
@@ -735,7 +735,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         switch indexPath.section {
         case 0:
-            if indexPath.row == 0 || indexPath.row == 4 {
+            if indexPath.row == 0 || indexPath.row == 5 {
                 let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTF") as! TitleAndTFCell
                 cell.textTF.delegate = self
                 cell.nameLbl.text = spxxArr[indexPath.row]
@@ -758,7 +758,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                 cell.delegate = self
                 return cell
             }
-            if indexPath.row > 4{
+            if indexPath.row > 5{
                 let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndSwitch") as! TitleAndSwitchCell
                 cell.infoSw.isUserInteractionEnabled = isAllEditing
                 cell.namelbl.text = spxxArr[indexPath.row]
@@ -824,6 +824,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         case 2:
             if guiGeArr.count > 0 {
                 let cell = tableView.dequeueReusableCell(withIdentifier: "ShangPinGguiGeCell") as! ShangPinGguiGeCell
+                cell.isCheck = true
                 cell.delegate = self
                 if isAllEditing {
                     cell.btn.setTitle("编辑规格", for: .normal)
@@ -838,7 +839,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                     
                     dict = guiGeArr.first
                 }
-                
+                cell.code_lbl.text = "商品条码：未记录"
+                if dict.code_number.count > 0 {
+                    cell.code_lbl.text = "商品条码：\(dict.code_number)"
+                }
                 cell.tempLbl.text = "温藏：未记录"
                 if dict.wenDu.count > 0 {
                     cell.tempLbl.text = "温藏：\(dict.wenDu)"
@@ -960,7 +964,9 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        
+        if indexPath.row == 4 {
+            print("abc")
+        }
     }
     //MARK: - 底部广告软文跳转 && 编辑
     @objc func editHtml(){
@@ -1102,11 +1108,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             timeSelectV.titleLbl.text = "预设预付尾款时间段"
             timeSelectV.delegate = self
             if wk_time_start != 0 &&  wk_time_end != 0{
-                 var time = TimeInterval(exactly: wk_time_start!)
-                 timeSelectV.BeginDate = Date(timeIntervalSince1970: time!)
-                 time = TimeInterval(exactly: wk_time_end!)
-                 timeSelectV.EndDate = Date(timeIntervalSince1970: time!)
-             }
+                var time = TimeInterval(exactly: wk_time_start!)
+                timeSelectV.BeginDate = Date(timeIntervalSince1970: time!)
+                time = TimeInterval(exactly: wk_time_end!)
+                timeSelectV.EndDate = Date(timeIntervalSince1970: time!)
+            }
             let dijitime:TimeInterval = TimeInterval(exactly: (dj_time_start! + (24 * 60 * 60)))!
             let beginDate = Date(timeIntervalSince1970: dijitime)
             timeSelectV.beginDateByWork = beginDate
@@ -1496,7 +1502,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         switch section {
-        case 0: return 7
+        case 0: return 8
         case 1:return 2
         case 2:return 1
         case 3:
@@ -1640,7 +1646,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         case 1:return 148.5
         case 2:
             if guiGeArr.count > 0 {
-                return 146
+                return 199
             }
             return 123.5
         case 3:
@@ -1698,13 +1704,13 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             let item = dataArr[i]
             var pData = ""
             if item.price.contains(",") {
-
+                
                 let pArr = item.price.components(separatedBy: ",")
                 pData = pArr.joined(separator: "")
-
-//                let arr = item.price.components(separatedBy: ",")
-//                pData = arr.joined(separator: "")
-
+                
+                //                let arr = item.price.components(separatedBy: ",")
+                //                pData = arr.joined(separator: "")
+                
             }else{
                 pData = item.price
             }
@@ -1813,7 +1819,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                 pct = item.DJBiLi
             }
             
- 
+            
             
             var sku = ["sku_sn":"",
                        "sku_id":item.sku_id,

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

@@ -407,6 +407,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
         case 2:
             if guiGeArr.count > 0 {
                 let cell = tableView.dequeueReusableCell(withIdentifier: "ShangPinGguiGeCell") as! ShangPinGguiGeCell
+                cell.isCheck = true
                 cell.delegate = self
                 var dict:GuiGeModel!
                 if selectIdx != nil{
@@ -416,6 +417,10 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
                     
                     dict = guiGeArr.first
                 }
+                cell.code_lbl.text = "商品条码：未记录"
+                if dict.code_number.count > 0 {
+                    cell.code_lbl.text = "商品条码：\(dict.code_number)"
+                }
                 cell.tempLbl.text = "温藏：未记录"
                 if dict.wenDu.count > 0 {
                     cell.tempLbl.text = "温藏：\(dict.wenDu)"
@@ -1196,7 +1201,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
         case 1:return 148.5
         case 2:
             if guiGeArr.count > 0 {
-                return 146
+                return 199
             }
             return 123.5
         case 3:

GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift

@@ -36,8 +36,8 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
     var datasArr:Array<GuiGeModel> = []
     var dataModel = GuiGeModel()
     var firstTimeSetting = true
-    let titleArray = ["售价：","规格：","重量(kg)：","温藏：","单位：","原价：","起售数量："]
-    let pliceHolderArr = ["请输入商品售价","请输入商品规格","请输入商品重量","常温","请选择商品单位","请输入商品原价","请输入起售数量"]
+    let titleArray = ["售价：","规格：","重量(kg)：","温藏：","单位：","原价：","起售数量：","商品编码："]
+    let pliceHolderArr = ["请输入商品售价","请输入商品规格","请输入商品重量","常温","请选择商品单位","请输入商品原价","请输入起售数量","请输入商品编码"]
     @IBOutlet weak var btmLbl: UILabel!
     @IBOutlet weak var bottomBtn: LGButton!
     @IBOutlet weak var listTbv: UITableView!
@@ -62,7 +62,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
     var weight = ""
     var wenDu = "常温"
     var danWei = ""
-    
+    var code_number = ""
     var originalPrice = ""
     var originNumberSku = ""
     
@@ -209,21 +209,27 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
             }
         }
         
-        if DJBiLi.count == 0 {
-            HUD.flash(.label("默认定金范围(1~20%)"), delay: 1.2)
-            DJBiLi = "20"
-            let idx = IndexPath(row: 0, section: 1)
-            let cell = listTbv.cellForRow(at: idx) as! YuShouCell
-            cell.inputTF3.text = "20"
+        if isYuShouSetting {
+            if DJBiLi.count == 0 {
+                HUD.flash(.label("默认定金范围(1~20%)"), delay: 1.2)
+                DJBiLi = "20"
+                let idx = IndexPath(row: 0, section: 1)
+                let cell = listTbv.cellForRow(at: idx) as! YuShouCell
+                cell.inputTF3.text = "20"
+                return
+            }
+        }
+        if code_number.count == 0 {
+            HUD.flash(.label("请输入商品编码"), delay: 1.2)
             return
         }
-        
         dataModel.originalPrice = originalPrice
         dataModel.originNumberSku = originNumberSku
         
         dataModel.price = price
         dataModel.guiGe = guiGe
         dataModel.weight = weight
+        dataModel.code_number = code_number
         dataModel.wenDu = wenDu
         dataModel.danWei = danWei
         dataModel.isYsJieTiOpen = isYsJieTiOpen
@@ -300,6 +306,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
             }
             break
         default:
+            code_number = textField.text!
             break
         }
     }
@@ -352,7 +359,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
                 //keyboardType
                 cell.textTF.returnKeyType = .done
                 cell.textTF.delegate = self
-                if indexPath.row == 0 || indexPath.row == 2 || indexPath.row == 5 || indexPath.row == 6{
+                if indexPath.row == 0 || indexPath.row == 2 || indexPath.row == 5 || indexPath.row == 6 || indexPath.row == 7{
                     cell.textTF.keyboardType = .decimalPad
                 }
                 let str = NSAttributedString(string: pliceHolderArr[indexPath.row], attributes: [NSAttributedString.Key.foregroundColor:UIColor(named: "灰色字体颜色")])
@@ -371,9 +378,15 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
                     case 6:
                         cell.textTF.text = originNumberSku
                         break
-                    default:
+                    case 2:
                         cell.textTF.text = weight
                         break
+                    default:
+                        cell.textTF.text = code_number
+                        if code_number.count == 0 && barTitle?.contains("查看") == true{
+                            cell.textTF.text = "未记录"
+                        }
+                        break
                     }
                     
                 }
@@ -791,6 +804,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         price = dataDict.price
         guiGe = dataDict.guiGe
         weight = dataDict.weight
+        code_number = dataDict.code_number
         wenDu = dataDict.wenDu
         danWei = dataDict.danWei
         yuShouPrice = dataDict.yuShouPrice

GeliBusinessPlatform/ViewController/新增规格/GuiGeModel.swift

@@ -17,6 +17,8 @@ class GuiGeModel: NSObject {
     var guiGe : String = ""
     ///重量
     var weight : String = ""
+    ///条形码
+    var code_number : String = ""
     ///温度
     var wenDu : String = ""
     ///单位

GeliBusinessPlatform/ViewController/新增规格/YuShouCell.xib

@@ -51,7 +51,7 @@
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入预售价格" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="COH-zY-OUo">
+                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入预售价格" textAlignment="right" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="COH-zY-OUo">
                         <rect key="frame" x="85" y="46" width="220" height="34"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="34" id="iAs-XY-QMJ"/>
@@ -77,7 +77,7 @@
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <textField opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入预售库存" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Qb7-aM-usa">
+                    <textField opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入预售库存" textAlignment="right" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Qb7-aM-usa">
                         <rect key="frame" x="101" y="89" width="204" height="34"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="34" id="JmO-9y-uwH"/>
@@ -103,7 +103,7 @@
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <textField opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入预售定金比例" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mht-f5-qwh">
+                    <textField opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入预售定金比例" textAlignment="right" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="mht-f5-qwh">
                         <rect key="frame" x="121" y="140" width="184" height="34"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="34" id="57U-zx-suF"/>