更新下运单样式，重开京东

GeliBusinessPlatform/Define/NetworkRequest.swift

@@ -129,6 +129,7 @@ extension NetworkRequest {
                         UserDefaults.standard.removeObject(forKey: "WorkDataModel")
 
                         UserDefaults.standard.removeObject(forKey: "user_token")
+                        UserDefaults.standard.removeObject(forKey: "userName")
                         NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
                         JPUSHService.deleteAlias({ (resCode, alias, num) in
                             

GeliBusinessPlatform/Other/LMNote/LMNoteViewController.m

@@ -526,9 +526,10 @@
     [[PHImageManager defaultManager] requestImageForAsset:asset targetSize:targetSize contentMode:PHImageContentModeAspectFill options:options resultHandler:^(UIImage *result, NSDictionary *info) {
  
         //请求上传图片
+        NSString *token = [[NSUserDefaults standardUserDefaults]stringForKey:@"user_token"];
         TestClass *model = [[TestClass alloc]init];
         NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:10];
-        [dict setValue:@"RQdwz5QKpeg=" forKey:@"user_token"];
+        [dict setValue:token forKey:@"user_token"];
         [model saveFileWithImage:result params:dict success:^(NSDictionary<NSString *,id> * data) {
             if ([[NSString stringWithFormat:@"%@",data[@"code"]]isEqualToString:@"1"]) {
                 

GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.swift

@@ -39,6 +39,8 @@ class LogisticalSelectView: UIView {
     @IBOutlet weak var xyAgreeLbl: UILabel!
     @IBOutlet weak var sfPriceLbl: UILabel!
     @IBOutlet weak var jdPriceLbl: UILabel!
+    
+    
     var SFtempArr:Array<UILabel> = []
     var SFfuTitleArr:Array<String> = [] {
         didSet {
@@ -46,7 +48,7 @@ class LogisticalSelectView: UIView {
                 SFtempArr.forEach { (item) in
                     item.removeFromSuperview()
                 }
-                selectBgHeight.constant = CGFloat(270)
+                selectBgHeight.constant = CGFloat(340)
                 xyTop.constant = CGFloat(0)
                 sflineBottom.constant = CGFloat(0)
 
@@ -67,7 +69,7 @@ class LogisticalSelectView: UIView {
             xyTop.constant = CGFloat(SFfuTitleArr.count * 19)
             sflineBottom.constant = CGFloat(-(SFfuTitleArr.count * 19))
             
-            selectBgHeight.constant = CGFloat(270 + SFfuTitleArr.count * 19)
+            selectBgHeight.constant = CGFloat(340 + SFfuTitleArr.count * 19)
         }
     }
     
@@ -78,7 +80,7 @@ class LogisticalSelectView: UIView {
                 XYtempArr.forEach { (item) in
                     item.removeFromSuperview()
                 }
-                selectBgHeight.constant = CGFloat(270)
+                selectBgHeight.constant = CGFloat(340)
                 return
             }
             for i in 0..<XYfuTitleArr.count {
@@ -93,7 +95,7 @@ class LogisticalSelectView: UIView {
                 }
                 XYtempArr.append(lbl)
             }
-            selectBgHeight.constant = CGFloat(270 + XYfuTitleArr.count * 19)
+            selectBgHeight.constant = CGFloat(340 + XYfuTitleArr.count * 19)
         }
     }
     
@@ -167,7 +169,7 @@ class LogisticalSelectView: UIView {
     func setJD(){
         jdBgViewH.constant = 0
         jdBgView.isHidden = true
-        selectBgHeight.constant = CGFloat(270)
+        selectBgHeight.constant = CGFloat(340)
 
     }
     func setSF(){

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/JiTuoWuXinXiView.swift

@@ -22,26 +22,26 @@ class JiTuoWuXinXiView: UIView,UITextFieldDelegate{
     }
     @IBOutlet weak var countTf: UITextField!
     @IBOutlet weak var weightTf: UITextField!
-    @IBOutlet weak var gaoTf: UITextField!
-    @IBOutlet weak var kuanTf: UITextField!
-    @IBOutlet weak var changTf: UITextField!
+//    @IBOutlet weak var gaoTf: UITextField!
+//    @IBOutlet weak var kuanTf: UITextField!
+//    @IBOutlet weak var changTf: UITextField!
     @IBOutlet weak var itemBaoTf: UITextField!//寄托物品包装
     
     @IBAction func jiaJianMethod(_ sender: UIButton) {
         
         switch sender.tag {
         case 0:
-            changTf.text = ""
-            kuanTf.text = ""
-            gaoTf.text = ""
+//            changTf.text = ""
+//            kuanTf.text = ""
+//            gaoTf.text = ""
             var str = tiJiTF.text as! NSString
             str = "\(str.integerValue + 1)" as NSString
             tiJiTF.text = str as String
             break
         case 1:
-            changTf.text = ""
-            kuanTf.text = ""
-            gaoTf.text = ""
+//            changTf.text = ""
+//            kuanTf.text = ""
+//            gaoTf.text = ""
             var str = tiJiTF.text as! NSString
             if str.integerValue > 1 {
                 str = "\(str.integerValue - 1)" as NSString
@@ -84,7 +84,7 @@ class JiTuoWuXinXiView: UIView,UITextFieldDelegate{
         let tiji = tiJiTF.text as! NSString
         let weight = weightTf.text as! NSString
         let count = countTf.text as! NSString
-        delegate?.JiTuoWuXinXiViewSubmit(itemName: itemNameTF.text!,itemBaoName:itemBaoTf.text!, tiJi: tiji.floatValue, weight: weight.floatValue, count: count.integerValue, isCheck: infoSw.isOn,chang: changTf.text,kuang: kuanTf.text,gao: gaoTf.text)
+        delegate?.JiTuoWuXinXiViewSubmit(itemName: itemNameTF.text!,itemBaoName:itemBaoTf.text!, tiJi: tiji.floatValue, weight: weight.floatValue, count: count.integerValue, isCheck: infoSw.isOn,chang: "",kuang: "",gao: "")
     }
     @IBOutlet weak var tiJiTF: UITextField!
     @IBOutlet weak var itemNameTF: UITextField!
@@ -100,30 +100,30 @@ class JiTuoWuXinXiView: UIView,UITextFieldDelegate{
         masklayer.path = maskPath.cgPath
         bottomView.layer.mask = masklayer
         
-        changTf.delegate = self
-        kuanTf.delegate = self
-        gaoTf.delegate = self
+//        changTf.delegate = self
+//        kuanTf.delegate = self
+//        gaoTf.delegate = self
         tiJiTF.delegate = self
-        changTf.keyboardType = .numberPad
-        kuanTf.keyboardType = .numberPad
-        gaoTf.keyboardType = .numberPad
+//        changTf.keyboardType = .numberPad
+//        kuanTf.keyboardType = .numberPad
+//        gaoTf.keyboardType = .numberPad
     }
     
     func textFieldDidEndEditing(_ textField: UITextField) {
-        if textField == tiJiTF {
-            changTf.text = ""
-            kuanTf.text = ""
-            gaoTf.text = ""
-        }
-        if changTf.text!.count > 0 && kuanTf.text!.count > 0 && gaoTf.text!.count > 0 {
-            let chang = changTf.text as! NSString
-            let kuan = kuanTf.text as! NSString
-            let gao = gaoTf.text as! NSString
-            let c = chang.floatValue / 100
-            let k = kuan.floatValue / 100
-            let g = gao.floatValue / 100
-            tiJiTF.text = String(format: "%.2f", c * k * g)
-        }
+//        if textField == tiJiTF {
+//            changTf.text = ""
+//            kuanTf.text = ""
+//            gaoTf.text = ""
+//        }
+//        if changTf.text!.count > 0 && kuanTf.text!.count > 0 && gaoTf.text!.count > 0 {
+//            let chang = changTf.text as! NSString
+//            let kuan = kuanTf.text as! NSString
+//            let gao = gaoTf.text as! NSString
+//            let c = chang.floatValue / 100
+//            let k = kuan.floatValue / 100
+//            let g = gao.floatValue / 100
+//            tiJiTF.text = String(format: "%.2f", c * k * g)
+//        }
     }
     
     //初始化时将xib中的view添加进来

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -670,7 +670,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         }
         let alertView = LogisticalSelectView(frame: self.view.window!.bounds)
         alertView.delegate = self
-        
+        if logPayPriceModel?.price_jd != nil {
+            alertView.jdPriceLbl.text = "京东物流（预估运费" + String(format: "%.2f",  (logPayPriceModel?.price_jd)!) + "元）"
+        }
         if logPayPriceModel?.price_sf != nil {
             alertView.sfPriceLbl.text = "顺丰冷运（预估运费" + String(format: "%.2f",  (logPayPriceModel?.price_sf)!) + "元）"
         }
@@ -681,7 +683,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         }
         
         self.view.window?.addSubview(alertView)
-        alertView.setJD()
+//        alertView.setJD()
         weak_alertView = alertView
         
     }
@@ -689,6 +691,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     func LogisticalSelectViewBtnclick(idx:Int){
         weak_alertView?.SFfuTitleArr = []
         weak_alertView?.XYfuTitleArr = []
+        
         if idx == 1{
             var futitleArr:Array<String> = []
             logPayPriceModel?.sf_data?.forEach({ (model) in
@@ -1486,9 +1489,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                                 jtwxxView?.weightTf.text = String(format: "%.f", (weight)!)
                                 jtwxxView?.countTf.text = String(format: "%.d", (count)!)
                                 jtwxxView?.infoSw.isOn = isCheck!
-                                jtwxxView?.changTf.text = chang
-                                jtwxxView?.kuanTf.text = kuang
-                                jtwxxView?.gaoTf.text = gao
+//                                jtwxxView?.changTf.text = chang
+//                                jtwxxView?.kuanTf.text = kuang
+//                                jtwxxView?.gaoTf.text = gao
                                 jtwxxView?.itemBaoTf.text = self.itemBaoName
                             }
                         }

GeliBusinessPlatform/ViewController/修改密码/ChangePassViewController.swift

@@ -66,6 +66,7 @@ class ChangePassViewController: BaseViewController {
                 HUD.flash(.label("请重新登录"), delay: 1.5)
                 delay(1.5){
                     UserDefaults.standard.removeObject(forKey: "user_token")
+                    UserDefaults.standard.removeObject(forKey: "userName")
                     NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
                 }
                 

GeliBusinessPlatform/ViewController/地址管理/DZGLViewController.swift

@@ -109,6 +109,7 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
         super.viewDidLoad()
         navbar.title = "地址管理"
         self.view.addSubview(navbar)
+        self.holder_view.isHidden = true
         if isSelectlogAddress {
             navbar.title = "地址选择"
             HUD.flash(.progress)
@@ -116,6 +117,9 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
             getAddr(["user_token":UserToken as Any], success: { (data) in
                 self.adrInfo = (data as! GetAddrsInfoModel)
                 
+                if self.adrInfo?.data?.count == 0 {
+                    self.holder_view.isHidden = false
+                }
                 self.listView.reloadData()
                 HUD.hide()
             }) { (error) in
@@ -127,6 +131,10 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
                 searchBgH.constant = 0
                 getAddrsInfo(["user_token":UserToken as Any,"cus_id":cus_id as Any], success: { (data) in
                     self.adrInfo = (data as! GetAddrsInfoModel)
+                    
+                    if self.adrInfo?.data?.count == 0 {
+                        self.holder_view.isHidden = false
+                    }
                     self.listView.reloadData()
                     HUD.hide()
                 }) { (error) in

GeliBusinessPlatform/ViewController/地址管理/DZGLViewController.xib

@@ -86,7 +86,7 @@
                         <constraint firstAttribute="trailing" secondItem="4o7-3y-vAM" secondAttribute="trailing" id="kNH-yD-Ob3"/>
                     </constraints>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DR7-L3-keQ">
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DR7-L3-keQ">
                     <rect key="frame" x="0.0" y="89" width="414" height="724"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="无数据2" translatesAutoresizingMaskIntoConstraints="NO" id="EVe-xn-vda">

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -443,8 +443,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
                         self.navigationController?.pushViewController(vc, animated: true)
             return
         case 53: //销售下单-代客下单
-            let vc = DaiKeXiaDanGouWuViewController()
-//            let vc = PrintListMgVc()
+//            let vc = DaiKeXiaDanGouWuViewController()
+            let vc = PrintListMgVc()
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 54: //扫码下单

GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.swift

@@ -11,13 +11,20 @@ import Parchment
 import LGButton
 
 class PrintListMgVc: BaseViewController, PagingViewControllerDelegate {
-
+    
+    @IBAction func check_detail(_ sender: UIButton) {
+        print("check_detail")
+    }
     @IBAction func print_action(_ sender: LGButton) {
-        
-        let vc = viewControllers[selectIndex]
-        if selectIndex != 0 {
-            print(vc.FM_str,vc.detail_adr_str,vc.phone_str,vc.contect_str)
+        if userName != "不二制油" { //普通
+            
+        }else{//不二
+            let vc = viewControllers[selectIndex]
+            if selectIndex != 0 {
+                print(vc.FM_str,vc.detail_adr_str,vc.phone_str,vc.contect_str)
+            }
         }
+       
         
     }
     @IBOutlet weak var contentV: UIView!
@@ -39,6 +46,11 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate {
     //头部滚动视图
     weak var pagingVC : PagingViewController?
     
+    @IBOutlet weak var holder_img: UIImageView!
+    let UserToken = UserDefaults.standard.value(forKey: "user_token")
+    let userName = UserDefaults.standard.string(forKey: "userName")
+    
+    @IBOutlet weak var normal_type_btn: UIButton!
     override func viewDidLoad() {
         super.viewDidLoad()
         navbar.title = "打印模版确认"
@@ -46,25 +58,35 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate {
         self.view.addSubview(navbar)
         SetTopFrameView(view: contentV, btmView: self.view)
         
-        let pagingViewController = PagingViewController(viewControllers: viewControllers)
-        pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
-        pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale)
-        pagingViewController.font = UIFont.systemFont(ofSize: 13)
-        pagingViewController.selectedFont = UIFont.systemFont(ofSize: 13)
-        pagingViewController.textColor = UIColor.init(named: "灰色字体颜色")!
-        pagingViewController.selectedTextColor = UIColor.init(named: "蓝色字体颜色")!
-        pagingViewController.delegate = self
-        pagingViewController.dataSource = self
-        pagingViewController.sizeDelegate = self
-        addChild(pagingViewController)
-        contentV.addSubview(pagingViewController.view)
-        contentV.backgroundColor = UIColor(named: "app底色")!
-        contentV.constrainToEdges(pagingViewController.view)
-        pagingViewController.didMove(toParent: self)
-        pagingVC = pagingViewController
+        if userName != "不二制油" {
+            normal_type_btn.isHidden = false
+        }else{
+            normal_type_btn.isHidden = true
+            let pagingViewController = PagingViewController(viewControllers: viewControllers)
+            pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
+            pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale)
+            pagingViewController.font = UIFont.systemFont(ofSize: 13)
+            pagingViewController.selectedFont = UIFont.systemFont(ofSize: 13)
+            pagingViewController.textColor = UIColor.init(named: "灰色字体颜色")!
+            pagingViewController.selectedTextColor = UIColor.init(named: "蓝色字体颜色")!
+            pagingViewController.delegate = self
+            pagingViewController.dataSource = self
+            pagingViewController.sizeDelegate = self
+            addChild(pagingViewController)
+            contentV.addSubview(pagingViewController.view)
+            contentV.backgroundColor = UIColor(named: "app底色")!
+            contentV.constrainToEdges(pagingViewController.view)
+            pagingViewController.didMove(toParent: self)
+            pagingVC = pagingViewController
+        }
+        holder_img.isHidden = normal_type_btn.isHidden
+        
+            
+        
         // Do any additional setup after loading the view.
     }
-
+    
+    @IBOutlet weak var btm_lbl: UILabel!
     func pagingViewController(
         _ pagingViewController: PagingViewController,
         didScrollToItem pagingItem: PagingItem,
@@ -75,7 +97,7 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate {
             guard let item = pagingItem as? PagingIndexItem else { return}
             if selectIndex != item.index {
                 selectIndex = item.index
-               
+                
             }
         }
     }

GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.xib

@@ -12,7 +12,10 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PrintListMgVc" customModule="TestClass" customModuleProvider="target">
             <connections>
+                <outlet property="btm_lbl" destination="GVM-RK-kDz" id="ylh-ra-iZO"/>
                 <outlet property="contentV" destination="csb-7S-KV5" id="Fc6-4G-C1V"/>
+                <outlet property="holder_img" destination="YMY-lm-aa2" id="ozd-BX-aAI"/>
+                <outlet property="normal_type_btn" destination="dit-qO-w20" id="WUj-ye-kqr"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
@@ -23,7 +26,32 @@
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="csb-7S-KV5">
                     <rect key="frame" x="0.0" y="44" width="414" height="774"/>
+                    <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="print_img" translatesAutoresizingMaskIntoConstraints="NO" id="YMY-lm-aa2">
+                            <rect key="frame" x="8" y="15" width="398" height="212.5"/>
+                            <constraints>
+                                <constraint firstAttribute="width" secondItem="YMY-lm-aa2" secondAttribute="height" multiplier="15:8" id="M2P-wM-MmU"/>
+                            </constraints>
+                        </imageView>
+                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dit-qO-w20">
+                            <rect key="frame" x="15" y="15" width="384" height="250.5"/>
+                            <constraints>
+                                <constraint firstAttribute="width" secondItem="dit-qO-w20" secondAttribute="height" multiplier="23:15" id="1p1-mq-wEu"/>
+                            </constraints>
+                            <connections>
+                                <action selector="check_detail:" destination="-1" eventType="touchUpInside" id="0Ou-Vc-t2Y"/>
+                            </connections>
+                        </button>
+                    </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <constraints>
+                        <constraint firstItem="dit-qO-w20" firstAttribute="leading" secondItem="csb-7S-KV5" secondAttribute="leading" constant="15" id="4Xf-RG-R2P"/>
+                        <constraint firstAttribute="trailing" secondItem="YMY-lm-aa2" secondAttribute="trailing" constant="8" id="Dsu-uO-mpS"/>
+                        <constraint firstItem="YMY-lm-aa2" firstAttribute="top" secondItem="csb-7S-KV5" secondAttribute="top" constant="15" id="Fzk-gI-t1a"/>
+                        <constraint firstAttribute="trailing" secondItem="dit-qO-w20" secondAttribute="trailing" constant="15" id="cOk-zh-xKI"/>
+                        <constraint firstItem="dit-qO-w20" firstAttribute="top" secondItem="csb-7S-KV5" secondAttribute="top" constant="15" id="f39-q1-ndD"/>
+                        <constraint firstItem="YMY-lm-aa2" firstAttribute="leading" secondItem="csb-7S-KV5" secondAttribute="leading" constant="8" id="qiw-yV-pKq"/>
+                    </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zM2-Kx-oSf" customClass="LGButton" customModule="LGButton">
                     <rect key="frame" x="0.0" y="818" width="414" height="78"/>
@@ -75,6 +103,7 @@
         </designable>
     </designables>
     <resources>
+        <image name="print_img" width="355" height="210"/>
         <namedColor name="按钮渐变色上">
             <color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

GeliBusinessPlatform/ViewController/登录/LoginViewController.swift

@@ -203,6 +203,8 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
                 login(["user_name":phoneTF.text as Any,"pwd":passTF.text as Any], success: { (data) in
                     let dataM = data as! LoginModel
                     UserDefaults.standard.set(dataM.data?.user_token, forKey: "user_token")
+                    UserDefaults.standard.set(dataM.data?.user_name, forKey: "userName")
+                    
                     UserDefaults.standard.synchronize()
                     self.loginBtn.isLoading = false
                     self.delegate?.successLogin()
@@ -232,6 +234,8 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
             mobileLogin(["mobile":phoneLogInputTF.text as Any,"auth_code":phoneLogCodeTF.text as Any], success: { (data) in
                 let dataM = data as! LoginModel
                 UserDefaults.standard.set(dataM.data?.user_token, forKey: "user_token")
+                UserDefaults.standard.set(dataM.data?.user_name, forKey: "userName")
+                
                 UserDefaults.standard.synchronize()
                 self.loginBtn.isLoading = false
                 self.delegate?.successLogin()

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -1218,58 +1218,58 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         switch status {
         case 0:
             //               str = "未确定" "待付款"
-            titleArr = ["修改价格","拒绝接单","先货后款","同意接单"]
+            titleArr = ["打印","修改价格","拒绝接单","先货后款","同意接单"]
             if self.dataMdoel!.order_res?.goods_before_pay == 1 {
-                titleArr = ["修改价格","拒绝接单","同意接单"]
+                titleArr = ["打印","修改价格","拒绝接单","同意接单"]
             }
             break
         case 1:
             //               str = "已确定" "待付款"
-            titleArr = ["修改价格","付款码","取消订单"]
+            titleArr = ["打印","修改价格","付款码","取消订单"]
             if self.dataMdoel!.order_res?.shipping_status == 1 && self.dataMdoel!.order_res?.pay_status != 2 {
-                titleArr = ["修改价格","付款码","退货"]
+                titleArr = ["打印","修改价格","付款码","退货"]
             }
      
             break
         case 6:
             //               str = "待发货"
             if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
-                titleArr = ["取消订单并退款","发货"]
+                titleArr = ["打印","取消订单并退款","发货"]
                 if self.dataMdoel!.order_res?.pay_status != 2{
-                    titleArr = ["确认收款","取消订单","发货"]
+                    titleArr = ["打印","确认收款","取消订单","发货"]
                 }
             }else{
-                titleArr = ["退款","发货"]
+                titleArr = ["打印","退款","发货"]
                 if self.dataMdoel!.order_res?.pay_status != 2{
-                    titleArr = ["取消订单","发货"]
+                    titleArr = ["打印","取消订单","发货"]
                 }
                 if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
                     titleArr.insert("付款码", at: 0)
                 }
             }
             if self.dataMdoel?.order_res?.apply_cancel == 1 {
-                titleArr = ["同意取消订单","拒绝取消订单"]
+                titleArr = ["打印","同意取消订单","拒绝取消订单"]
             }
             break
         case 7:
             //   str = "待收货"
             if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
-                titleArr = ["退款","退款退货","确认收货"]
+                titleArr = ["打印","退款","退款退货","确认收货"]
                 if self.dataMdoel?.order_res?.pay_status != 2{//未收款
-                    titleArr = ["取消订单","确认收款","确认收货"]
+                    titleArr = ["打印","取消订单","确认收款","确认收货"]
                 }
             }else{
-                titleArr = ["退款"]
+                titleArr = ["打印","退款"]
                 if self.dataMdoel?.order_res?.pay_status != 2 {
-                    titleArr = ["取消订单"]
+                    titleArr = ["打印","取消订单"]
                 }
                 if self.dataMdoel?.order_res?.goods_before_pay == 1 && lmIdx == 1{
-                    titleArr = ["付款码","取消订单"]
+                    titleArr = ["打印","付款码","取消订单"]
                 }
             }
 
             if self.dataMdoel?.order_res?.apply_cancel == 1 {
-                titleArr = ["同意取消订单","拒绝取消订单"]
+                titleArr = ["打印","同意取消订单","拒绝取消订单"]
             }
             break
         //订单完成
@@ -1279,10 +1279,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         case 9:
             //       退款中
             if self.dataMdoel!.order_res?.order_status_d == 91 && self.dataMdoel!.order_res?.from == 3 || self.dataMdoel!.order_res?.from == 5 {
-                titleArr = ["确认收到退款"]
+                titleArr = ["打印","确认收到退款"]
             }
             if self.dataMdoel!.order_res?.order_status_d == 93 {
-                titleArr = ["确认收到退货"]
+                titleArr = ["打印","确认收到退货"]
             }
             break
         //订单关闭
@@ -1290,10 +1290,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             titleArr = []
             break
         case 10:
-            titleArr = ["退款退货"]
+            titleArr = ["打印","退款退货"]
             
             if self.dataMdoel!.order_res?.pay_status != 2 {
-                titleArr = ["取消订单"]
+                titleArr = ["打印","取消订单"]
             }
             if self.dataMdoel!.order_res?.from == 3 || self.dataMdoel!.order_res?.from == 5 {
                 titleArr.append("确认收款")
@@ -1305,15 +1305,15 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
  
             break
         case 11:
-            titleArr = ["查看订单"]
+            titleArr = ["打印","查看订单"]
             if self.dataMdoel!.order_res?.order_status_d == 111 || self.dataMdoel!.order_res?.order_status_d == 112 || self.dataMdoel!.order_res?.order_status_d == 113{
-                titleArr = ["同意退款","拒绝退款"]
+                titleArr = ["打印","同意退款","拒绝退款"]
             }
             if self.dataMdoel!.order_res?.order_status_d == 114 || self.dataMdoel!.order_res?.order_status_d == 115 {
-                titleArr = ["同意退货","拒绝退货"]
+                titleArr = ["打印","同意退货","拒绝退货"]
             }
             if self.dataMdoel!.order_res?.order_status_d == 116 || self.dataMdoel!.order_res?.order_status_d == 117 {
-                titleArr = ["同意退款退货","拒绝退款退货"]
+                titleArr = ["打印","同意退款退货","拒绝退款退货"]
             }
             break
         default:
@@ -1367,7 +1367,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         case "打印":
             //暂无
             print("暂无")
-            HUD.flash(.label("打印功能开发中"),delay: 1.2)
+//            HUD.flash(.label("打印功能开发中"),delay: 1.2)
+            let vc = PrintListMgVc()
+            
+            self.navigationController?.pushViewController(vc, animated: true)
             break
         case "确认订单":
             let alertView = GeliAlertView(frame: self.view.window!.bounds)

GeliBusinessPlatform/ViewController/账号信息/AccountViewController.swift

@@ -54,6 +54,7 @@ class AccountViewController: BaseViewController{
         //模拟退出登录
         UserDefaults.standard.removeObject(forKey: "WorkDataModel")
         UserDefaults.standard.removeObject(forKey: "user_token")
+        UserDefaults.standard.removeObject(forKey: "userName")
         NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
         JPUSHService.deleteAlias({ (resCode, alias, num) in