完成订单详情修正

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -50,11 +50,11 @@ class OrderDetailResModel: Mappable {
     var logistics_price : String? //物流费用
     var other_price : String?//其他费用
     var sum_amount : String?  //订单合计价格
-    var from : String?
-    var lc_id : String?
+    var from : Int?
+    var lc_id : Int?
     var lwb_no : String?//运单号
-    var pay_type : String?
-    var pay_status : String?
+    var pay_type : Int?
+    var pay_status : Int?
     var postscript : String? //买家留言
     var order_postscript : String? //订单备注
     var address : String?
@@ -203,10 +203,10 @@ class OrderDetailGoodsModel: Mappable {
     var goods_attr : String?  //商品规格
     var goods_unit : String? //商品单位
     var goods_price : String?  //商品单价
-    var cart_number : String? //商品数量
+    var cart_number : Int? //商品数量
     var goods_subtotal : String?  //商品小计
     var goods_thumb : String? //商品缩略图
-    var warehouse_inventory : String?   //商品库存
+    var warehouse_inventory : Int?   //商品库存
     var is_edit : Int? = 0   //订单商品是否有修改，1是0非--前端自主添加的字段
 
     required init?( map: Map) {

GeliBusinessPlatform/SceneDelegate.swift

@@ -43,12 +43,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
     //MARK:--loginVC
     func addLoginVc (isAgain:Bool){
 
-//        let vc = LoginViewController()
-//        vc.delegate = self
-//        let contentView = vc
-//
-        let vc = EPViewController()
+        let vc = LoginViewController()
+        vc.delegate = self
         let contentView = vc
+//
+//        let vc = EPViewController()
+//        let contentView = vc
         
         if let windowScene = sceneC as? UIWindowScene {
             if isAgain {
@@ -95,7 +95,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
         
         tabBarController.viewControllers = [v1, v2, v3, v4, v5]
 
-        tabBarController.selectedIndex = 2
+//        tabBarController.selectedIndex = 2
 
         
         

GeliBusinessPlatform/View/Cell/PingLunCell.swift

@@ -10,6 +10,7 @@ import UIKit
 
 class PingLunCell: UITableViewCell {
 
+    @IBOutlet weak var editIconImgV: UIImageView!
     @IBOutlet weak var contentLbl: UILabel!
     @IBOutlet weak var nameLbl: UILabel!
     override func awakeFromNib() {
@@ -18,7 +19,8 @@ class PingLunCell: UITableViewCell {
         
         // Initialization code
     }
-
+    @IBOutlet weak var contentRight: NSLayoutConstraint!
+    
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
 

GeliBusinessPlatform/View/Cell/PingLunCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <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"/>
@@ -10,7 +10,7 @@
     <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="PingLunCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="PingLunCell" customModule="TestClass" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
             <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">
@@ -31,10 +31,10 @@
                         </constraints>
                     </view>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bianji" translatesAutoresizingMaskIntoConstraints="NO" id="ai0-qt-tes">
-                        <rect key="frame" x="326" y="8" width="34" height="33"/>
+                        <rect key="frame" x="343" y="16.5" width="17" height="16.5"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="13" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u0y-iz-OFK">
-                        <rect key="frame" x="57" y="10" width="254" height="28"/>
+                        <rect key="frame" x="57" y="10" width="273" height="28"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="灰色字体颜色"/>
                         <nil key="highlightedColor"/>
@@ -52,12 +52,14 @@
                     <constraint firstItem="uoz-6f-uUt" firstAttribute="top" secondItem="9hM-p4-cpX" secondAttribute="bottom" id="iDZ-J7-NXw"/>
                     <constraint firstAttribute="bottom" secondItem="uoz-6f-uUt" secondAttribute="bottom" id="n0B-iM-v7R"/>
                     <constraint firstItem="9hM-p4-cpX" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="q2Q-IK-ynT"/>
-                    <constraint firstItem="ai0-qt-tes" firstAttribute="leading" secondItem="u0y-iz-OFK" secondAttribute="trailing" constant="15" id="w97-SL-zh2"/>
+                    <constraint firstAttribute="trailing" secondItem="u0y-iz-OFK" secondAttribute="trailing" constant="45" id="w97-SL-zh2"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
                 <outlet property="contentLbl" destination="u0y-iz-OFK" id="UlA-85-uH9"/>
+                <outlet property="contentRight" destination="w97-SL-zh2" id="zH7-gM-tRN"/>
+                <outlet property="editIconImgV" destination="ai0-qt-tes" id="Vig-37-dxb"/>
                 <outlet property="nameLbl" destination="9hM-p4-cpX" id="0Pr-Hd-ejy"/>
             </connections>
             <point key="canvasLocation" x="131.15942028985509" y="127.56696428571428"/>

GeliBusinessPlatform/View/Cell/TitleAndBtnCell.swift

@@ -23,7 +23,9 @@ var delegate:TitleAndBtnCellDelegate?
         self.selectionStyle = .none
         // Initialization code
     }
-
+    
+    @IBOutlet weak var contentRight: NSLayoutConstraint!
+    
     @IBAction func btnClick(_ sender: Any) {
         delegate?.btnClick?(content: contentLbl.text!, cell: self)
     }

GeliBusinessPlatform/View/Cell/TitleAndBtnCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <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"/>
@@ -10,7 +10,7 @@
     <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="TitleAndBtnCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="TitleAndBtnCell" customModule="TestClass" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <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">
@@ -100,6 +100,7 @@
                 <outlet property="arrowImg" destination="Gf0-pG-ZDj" id="uaE-Be-XYP"/>
                 <outlet property="btn" destination="VXU-ef-rsF" id="92Z-x4-AVW"/>
                 <outlet property="contentLbl" destination="7nL-vu-Tdl" id="sEW-G5-GaR"/>
+                <outlet property="contentRight" destination="6yZ-7e-lVf" id="4sv-ji-kLJ"/>
                 <outlet property="imgView" destination="HSb-Uo-Ffy" id="9RM-uK-s3I"/>
                 <outlet property="lineWidth" destination="EUi-Y9-d4w" id="0on-lp-cbT"/>
                 <outlet property="nameLbl" destination="EfU-Eu-amU" id="XOH-Zx-SHi"/>

GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift

@@ -101,8 +101,10 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
         }else if indexPath.row == 2{
             //权限设置-弹窗
             HUD.flash(.label("权限设置开发中"), delay: 1.2)
+   
         }
     }
+    
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 50*glscale
     }

GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementListVC.swift

@@ -151,7 +151,7 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
         vc.titleStr = "新增仓库"
         vc.delegate = self
         
-        self.navigationController?.pushViewController(vc, animated: false)
+        self.navigationController?.pushViewController(vc, animated: true)
     }
     
     var warehourseArr:Array<ShopWarehouseListDataModel> = []//仓库数组
@@ -199,7 +199,7 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
         vc.editIdx = indexPath.row
         vc.delegate = self
         
-        self.navigationController?.pushViewController(vc, animated: false)
+        self.navigationController?.pushViewController(vc, animated: true)
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {

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

@@ -433,6 +433,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
     func changeGoodsIsShow(isTrue: Bool, byIndex: Int) {
         //左按钮为false 右按钮为true
         let rowModel = self.items[byIndex]
+        //添加提示
         if rowModel.is_show == 1 {
             if isTrue {
                 print("入库哦哦")

GeliBusinessPlatform/ViewController/订单管理/查看全部/ShowAlGoodsViewController.swift

@@ -46,11 +46,12 @@ class ShowAlGoodsViewController: BaseViewController  , UITableViewDelegate, UITa
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "XuanZeShangPinCell") as! XuanZeShangPinCell
         cell.selectBtn.isHidden = true
-        cell.detailLbl2.isHidden = true
         let rowModel = order_goods![indexPath.row]
         cell.nameLbl.text = rowModel.goods_name
         cell.detailLbl.text = rowModel.goods_attr
         cell.priceLbl.text = "￥" + (rowModel.goods_price!)
+        cell.iconImg.sd_setImage(with: URL(string: SERVERCE_ImageHost + (rowModel.goods_thumb)!))
+        cell.detailLbl2.text = "x" + StringByInt(number: rowModel.cart_number!)
         
         return cell
     }