修正 个人中心+仓库管理 （接口同上）

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

@@ -29,11 +29,11 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
         }
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
         HUD.flash(.progress)
-        adminInfo(["user_token":UserToken as Any], success: { (data) in
+        adminInfo(["user_token":UserToken as Any], success: { [self] (data) in
             HUD.hide()
             self.dataModel = (data as! AdminInfoModel)
 //            self.shopNameLbl.text = self.dataModel?.data?.stall_name
-            self.shopNameLbl.text = "" //个人中心，去掉档口名称
+            self.shopNameLbl.text = (self.dataModel?.data?.shop_name!)! //个人中心，去掉档口名称
             self.nameLbl.text = self.nowDateStr()
             
             if self.dataModel?.data?.about != nil {
@@ -62,13 +62,13 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
         let date  = Date() + 8.hours
  
         if date.compare(.isMorning) {
-            return "Hi~早上好！" + (dataModel?.data?.shop_name!)!
+            return "Hi~早上好！"
         }else if date.compare(.isAfternoon) {
-            return "Hi~下午好！" + (dataModel?.data?.shop_name!)!
+            return "Hi~下午好！"
         }else if date.compare(.isEvening) {
-            return "Hi~傍晚好！" + (dataModel?.data?.shop_name!)!
+            return "Hi~傍晚好！"
         }else if date.compare(.isNight) {
-            return "Hi~深夜了！" + (dataModel?.data?.shop_name!)!
+            return "Hi~深夜了！"
         }
         return ""
     }

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

@@ -3,7 +3,7 @@
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
         <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"/>
@@ -84,7 +84,7 @@
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1dW-Zl-K3m">
                     <rect key="frame" x="25" y="107" width="0.0" height="0.0"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" name="白色背景色"/>
                     <nil key="highlightedColor"/>
                     <userDefinedRuntimeAttributes>

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

@@ -10,6 +10,7 @@ import UIKit
 import SwipeCellKit
 class WarehoseMangementCell: SwipeTableViewCell {
 
+    @IBOutlet weak var delbl: UILabel!
     @IBOutlet weak var adrLbl: UILabel!
     @IBOutlet weak var kuCunLbl: UILabel!
     @IBOutlet weak var statusLbl: UILabel!

GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.xib

@@ -74,6 +74,30 @@
                         <color key="textColor" name="灰色字体颜色"/>
                         <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="DuL-JY-rIP">
+                        <rect key="frame" x="94" y="15" width="32" height="16"/>
+                        <color key="backgroundColor" name="蓝色字体颜色"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="16" id="TsX-Z2-8x3">
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
+                                </userDefinedRuntimeAttributes>
+                            </constraint>
+                            <constraint firstAttribute="width" constant="32" id="nem-Yt-ba1">
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
+                                </userDefinedRuntimeAttributes>
+                            </constraint>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                        <color key="textColor" name="白色背景色"/>
+                        <nil key="highlightedColor"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                <real key="value" value="2"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
+                    </label>
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="KhW-Le-FMh" secondAttribute="bottom" id="1ub-oa-aqP"/>
@@ -106,6 +130,7 @@
                             <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
                         </userDefinedRuntimeAttributes>
                     </constraint>
+                    <constraint firstItem="DuL-JY-rIP" firstAttribute="centerY" secondItem="zy2-GT-oMd" secondAttribute="centerY" id="cw9-XK-NTe"/>
                     <constraint firstItem="voP-B3-BGZ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="eip-ze-5GO">
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
@@ -119,11 +144,13 @@
                         </userDefinedRuntimeAttributes>
                     </constraint>
                     <constraint firstItem="bj5-q9-e71" firstAttribute="centerY" secondItem="TPl-73-La4" secondAttribute="centerY" id="r32-31-ctS"/>
+                    <constraint firstItem="DuL-JY-rIP" firstAttribute="leading" secondItem="S67-Hn-Sjn" secondAttribute="trailing" constant="10" id="wdv-2D-YXy"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
                 <outlet property="adrLbl" destination="voP-B3-BGZ" id="yKJ-8X-6xP"/>
+                <outlet property="delbl" destination="DuL-JY-rIP" id="vU7-ne-Bj5"/>
                 <outlet property="kuCunLbl" destination="bj5-q9-e71" id="ogC-qs-3L8"/>
                 <outlet property="nameLbl" destination="zy2-GT-oMd" id="cN5-EF-Wy5"/>
                 <outlet property="statusLbl" destination="S67-Hn-Sjn" id="ZJM-FP-Bb9"/>

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

@@ -207,35 +207,32 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
         cell.kuCunLbl.text = "库存位" + StringByInt(number: model.position_count!) + "  " + "总库存数：" + StringByInt(number: model.inventory_count!)
         
         if model.is_default! == 1  {
-            cell.statusLbl.isHidden = false
-            cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
-            cell.statusLbl.alpha = 1
-            cell.statusLbl.text = "默认"
+            cell.delbl.isHidden = false
+            cell.delbl.text = "默认"
         }else{
-            cell.statusLbl.isHidden = true
+            cell.delbl.isHidden = true
         }
         
-        //仓库管理→仓库列表，没有选择“仓库类型”的仓库，不要显示任何“仓库类型标签”，现在是会显示“常温”。
-//        switch model.w_type {
-//        case 0:
-//            //异常
-//            cell.statusLbl.isHidden = true
-//            break
-//        case 1:
-//            cell.statusLbl.backgroundColor = UIColor(named: "标题背景色")
-//            cell.statusLbl.alpha = 1
-//            break
-//        case 2:
-//            cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
-//            cell.statusLbl.alpha = 0.5
-//            break
-//        case 3:
-//            cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
-//            cell.statusLbl.alpha = 1
-//            break
-//        default:
-//            break
-//        }
+        switch model.w_type {
+        case 0:
+            //异常
+            cell.statusLbl.isHidden = true
+            break
+        case 1:
+            cell.statusLbl.backgroundColor = UIColor(named: "标题背景色")
+            cell.statusLbl.alpha = 1
+            break
+        case 2:
+            cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
+            cell.statusLbl.alpha = 0.5
+            break
+        case 3:
+            cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
+            cell.statusLbl.alpha = 1
+            break
+        default:
+            break
+        }
         return cell
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {