28

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -5083,7 +5083,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.7;
+				CURRENT_PROJECT_VERSION = 5.8;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -5143,7 +5143,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GBDEMO",
 				);
-				MARKETING_VERSION = 1.7.6;
+				MARKETING_VERSION = 1.7.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -5225,7 +5225,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.7;
+				CURRENT_PROJECT_VERSION = 5.8;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -5285,7 +5285,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GBDEMO",
 				);
-				MARKETING_VERSION = 1.7.6;
+				MARKETING_VERSION = 1.7.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

GeliBusinessPlatform/AppDelegate.swift

@@ -283,7 +283,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont
         let v2 = GoodsManageListVC()
         
         let v3 = WorkCViewController()
-//        let v3 = GYS_FX_Product_ListVc()
         
         let v4 = WarehoseMangementListVC()
         

GeliBusinessPlatform/Define/Define.swift

@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
 
 //接口地址
 //test
-let SERVERCE_ImageHost = "https://z.gelifood.com/"
-let SERVERCE_HOST = "https://z.gelifood.com/admin/"
-//let SERVERCE_ImageHost = "https://zx.gelifood.com/"
-//let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
+//let SERVERCE_ImageHost = "https://z.gelifood.com/"
+//let SERVERCE_HOST = "https://z.gelifood.com/admin/"
+let SERVERCE_ImageHost = "https://zx.gelifood.com/"
+let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
 //online
         
 //视图常量

GeliBusinessPlatform/Model/Work/WorkcenterIndexModel.swift

@@ -26,7 +26,8 @@ class WorkcenterIndexModel: Mappable {
 }
 
 class WorkcenterIndexDataModel: Mappable {
- 
+    var shop_name :String?
+    var abbreviation : String?
     var order_count : Int?  //订单数量
     var paid : Float? //已收款
     var npaid : Float? //待付款
@@ -43,6 +44,8 @@ class WorkcenterIndexDataModel: Mappable {
         
     }
     func mapping(map: Map) {
+        shop_name <- map["shop_name"]
+        abbreviation <- map["abbreviation"]
         order_count <- map["order_count"]
         paid <- map["paid"]
         npaid <- map["npaid"]

GeliBusinessPlatform/Model/agentList_model/agentList_model.swift

@@ -437,6 +437,7 @@ class supDbtOrderLis_model: Mappable {
         data <- map["data"]
     }
 }
+
 class supDbtOrderLis_list_Data_model: Mappable {
     var goods_name:String?
     var goods_number : Int?//商品数量
@@ -593,7 +594,7 @@ class agentList_data_model: Mappable {
     var status :String?//合作状态
     
     var age_id:Int?//代理商id
-    var sum_agent_commission_val : Int? //累计分销收益
+    var sum_agent_commission_val : Float? //累计分销收益
     
     required init?( map: Map) {
         

GeliBusinessPlatform/Model/dbtIncomeInfo_model/dbtIncomeInfoModel.swift

@@ -32,6 +32,7 @@ class dbtIncomeInfoDataModel: Mappable {
     var inc :Float?//收入
     var exp:Float?//支出
     var res : Array<dbtIncomeInfoDatasModel>?
+    var refund:Float?//退款
     required init?( map: Map) {
     }
     func mapping(map: Map) {
@@ -42,6 +43,7 @@ class dbtIncomeInfoDataModel: Mappable {
         inc <- map["inc"]
         exp <- map["exp"]
         res <- map["res"]
+        refund <- map["refund"]
     }
 }
 class dbtIncomeInfoDatasModel: Mappable {

GeliBusinessPlatform/View/Cell/GYS_GuanLi_Cell.swift

@@ -11,6 +11,10 @@ protocol GYS_GuanLi_CellDelegate {
     func GYS_GuanLi_CellStopAction(idx:Int)
 }
 class GYS_GuanLi_Cell: UITableViewCell {
+    @IBOutlet weak var t1: UILabel!
+    @IBOutlet weak var margin2: NSLayoutConstraint!
+    @IBOutlet weak var margin1: NSLayoutConstraint!
+    @IBOutlet weak var relationship_lbl: UILabel!
     var isFenXiaoShang : Bool = false //分销商管理 == true,改变合作按钮颜色。
     var delegate:GYS_GuanLi_CellDelegate?
     @IBOutlet weak var icon_Img: UIImageView!//公司LOGO

GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift

@@ -87,9 +87,9 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
     func printData(idx:Int){
         let model = printData[idx]["goods_data"] as! GetGoodBatchDataModel
         //测试
-        let urlStr = "http://z.gelifood.com/static/url/label.html?goods_name=\(printData[idx]["goods_name"] as! String)&spec_str=\(printData[idx]["spec_str"] as! String)&batch_sn=\(model.batch_sn!)&batch_id=\(model.batch_id!)&iscs=1"
+//        let urlStr = "http://z.gelifood.com/static/url/label.html?goods_name=\(printData[idx]["goods_name"] as! String)&spec_str=\(printData[idx]["spec_str"] as! String)&batch_sn=\(model.batch_sn!)&batch_id=\(model.batch_id!)&iscs=1"
         //online
-        //        let urlStr = "http://zx.gelifood.com/static/url/label.html?goods_name=\(printData[idx]["goods_name"] as! String)&spec_str=\(printData[idx]["spec_str"] as! String)&batch_sn=\(model.batch_sn!)&batch_id=\(model.batch_id!)&iscs=0"
+                let urlStr = "http://zx.gelifood.com/static/url/label.html?goods_name=\(printData[idx]["goods_name"] as! String)&spec_str=\(printData[idx]["spec_str"] as! String)&batch_sn=\(model.batch_sn!)&batch_id=\(model.batch_id!)&iscs=0"
         let urlString = urlStr.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
         let url = URL(string: urlString)
         if wkWebView == nil {

GeliBusinessPlatform/ViewController/供应商分销商品管理/GYS_FX_Product_VC.swift

@@ -513,7 +513,9 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
         cell.tag = indexPath.row
         cell.delegate = self
         if self.title!.contains("已铺货") {
+            if vcType != 161 {
                 cell.set_btn_w.constant = 0
+            }
             cell.cancel_btn_w.constant = 77
             cell.up_down_btn_w.constant = 77
         }else{
@@ -557,19 +559,19 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
             if (self.title!.contains("已铺货")) {
                 if model.price_type == 0 {//分销
                     cell.price.text = "分销价:￥\(model.dbt_price!)"
-                    cell.comission.text = "(提成:\(model.commission_val!))"
+                    cell.comission.text = "(代理提成:\(model.commission_val_agent!))"
                     cell.inventory.text = "库存:\(model.inventory!)"
                     cell.fx_price.isHidden = true
                     cell.store.isHidden = true
                 }else{//
                     cell.price.text = "供货价:￥\(model.supply_price!)"
-                    cell.comission.text = "(提成:\(model.commission_val!))"
+                    cell.comission.text = "(代理提成:\(model.commission_val_agent!))"
                     cell.inventory.text = "库存:\(model.inventory!)"
                     cell.store.isHidden = true
                     cell.store_w.constant = 0
                     cell.fx_price.text = "分销价:￥ -"
                     if model.dbt_price != nil {
-                        cell.fx_price.text = "分销价:￥\(model.dbt_price!)"
+                        cell.fx_price.text = "分销价:￥\(model.dbt_price!)(店长提成:\(model.commission_val!)）"
                     }
                     cell.margin.constant = 0
                 }

GeliBusinessPlatform/ViewController/供应商分销商品管理/ageSetDbtGoods_View.swift

@@ -10,7 +10,7 @@ import UIKit
 protocol ageSetDbtGoods_View_Delegate {
     func ageSetDbtGoods_View_submit_action(view:ageSetDbtGoods_View,sell_price:String?,commission:String)
 }
-class ageSetDbtGoods_View: UIView {
+class ageSetDbtGoods_View: UIView ,UITextFieldDelegate{
     @IBOutlet weak var comission_lbl: UILabel!
     var delegate:ageSetDbtGoods_View_Delegate?
     var model:selAgeDbtGoodsList_Data_D_model?{
@@ -59,7 +59,7 @@ class ageSetDbtGoods_View: UIView {
         contentView.snp.makeConstraints { (make) in
             make.left.top.right.bottom.equalToSuperview()
         }
-        sell_price_tf.addTarget(self, action: #selector(textChange(text:)), for: .allEditingEvents)
+        sell_price_tf.delegate = self
     }
     //    /初始化时将xib中的view添加进来
     required init?(coder aDecoder: NSCoder) {
@@ -69,25 +69,24 @@ class ageSetDbtGoods_View: UIView {
         contentView.snp.makeConstraints { (make) in
             make.left.top.right.bottom.equalToSuperview()
         }
-        sell_price_tf.addTarget(self, action: #selector(textChange(text:)), for: .allEditingEvents)
+        sell_price_tf.delegate = self
     }
-    
-    @objc func textChange(text:UITextField){
+    func textFieldDidEndEditing(_ textField: UITextField) {
         let high = Float((model?.ceiling_price!)!)
         let low = Float((model?.floor_price!)!)
         let supply_p = Float((model?.supply_price!)!)
         let high_p = high! + supply_p!
         let low_p = low! + supply_p!
-        if text.text!.count > 0 {
-            let input_p = Float(text.text!)
+        if textField.text!.count > 0 {
+            let input_p = Float(textField.text!)
             if input_p! > high_p {
                 HUD.flash(.label("输入价格高于最大加价范围\(model!.ceiling_price!)元"), delay: 1.2)
-                text.text = "\(high_p)"
+                textField.text = "\(high_p)"
                 return
             }
             if input_p! < low_p {
                 HUD.flash(.label("输入价格低于最小加价范围\(model!.floor_price!)元"), delay: 1.2)
-                text.text = "\(low_p)"
+                textField.text = "\(low_p)"
                 return
             }
             comission_lbl.text = String(format: "(提成%.2f元)",input_p! - supply_p!)

GeliBusinessPlatform/ViewController/供应商分销商品管理/ageSetDbtGoods_View.xib

@@ -69,6 +69,7 @@
                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="QVd-05-Mcc">
                                     <rect key="frame" x="125.5" y="18" width="102.5" height="35"/>
                                     <color key="backgroundColor" name="#F3F4F8"/>
+                                    <color key="tintColor" red="0.2784313725" green="0.56078431370000004" blue="0.89019607840000003" alpha="1" colorSpace="calibratedRGB"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="35" id="QBo-Om-5ms"/>
                                     </constraints>
@@ -133,6 +134,7 @@
                         <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="EY8-7S-NI4">
                             <rect key="frame" x="169.5" y="188.5" width="133.5" height="35"/>
                             <color key="backgroundColor" name="#F3F4F8"/>
+                            <color key="tintColor" red="0.2784313725" green="0.56078431370000004" blue="0.89019607840000003" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="35" id="48U-xG-YBd"/>
                             </constraints>

GeliBusinessPlatform/ViewController/供应商合作管理/GYS_HZ_Vc.swift

@@ -15,7 +15,7 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
     var title_str = ""
     
     func sureGeliAlertViewAction(sender: UIButton) {
-        if title_str == "分销商管理" {
+        if title_str == "下游店长管理" {
             let model = dbt_datas[sender.tag]
             stopContract(["user_token":UserToken as Any,"dbt_id":model.dbt_id]) { (data) in
                 HUD.flash(.label("删除成功~"), delay: 1.2)
@@ -32,7 +32,7 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
     
     func GYS_GuanLi_CellStopAction(idx:Int) {
         var content = "终止和单个供应商的合作后，从该供应商处代销的所有产品都将不再能订单回流，且立即生效，是否确认终止合作？"
-        if title_str == "分销商管理" {
+        if title_str == "下游店长管理" {
             content = "删除该店铺后，该店铺将无法代销对应的分销产品，是否确定删除该分销商？"
         }
         let alertView = GeliAlertView(frame: self.view.window!.bounds)
@@ -166,7 +166,7 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
         
         var holder_str = "请输入供应商名称"
         
-        if title_str == "分销商管理" {
+        if title_str == "下游店长管理" {
             navbar.rightTitle = "新增店铺"
             holder_str = "请输入分销商名称"
             is_gys = false
@@ -210,7 +210,7 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
     }
     
     @objc func loadData(){
-        if title_str == "分销商管理" {
+        if title_str == "下游店长管理" {
             dbtList(["user_token":UserToken as Any,"keyword":keyword as Any]) { (data) in
                 self.dbt_datas.removeAll()
                 let model = data as! dbtListModel
@@ -248,7 +248,7 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
     }
     //MARK: - tableview_delegate
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if title_str == "分销商管理" {
+        if title_str == "下游店长管理" {
             return dbt_datas.count
         }else{
             return gys_datas.count
@@ -258,7 +258,7 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "GYS_GuanLi_Cell") as! GYS_GuanLi_Cell
         cell.delegate = self
-        if title_str == "分销商管理" {
+        if title_str == "下游店长管理" {
             cell.isFenXiaoShang = true
             if dbt_datas.count > 0  {
                 let model = dbt_datas[indexPath.row]
@@ -274,6 +274,10 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
                     cell.adr_Lbl.text = model.address
                 }
                 cell.title_Lbl.text = model.shop_name
+                cell.relationship_lbl.text = "一对一"
+                if model.is_shopowner == 0 {
+                    cell.relationship_lbl.text = "一对多"
+                }
             }
         }else{
             if gys_datas.count > 0  {
@@ -281,6 +285,10 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
                 if model.shop_img_thumb != nil {
                     cell.icon_Img.sd_setImage(with:URL(string:SERVERCE_ImageHost +  model.shop_img_thumb!), placeholderImage: nil,options:.allowInvalidSSLCertificates)
                 }
+                cell.t1.isHidden = true
+                cell.relationship_lbl.isHidden = true
+                cell.margin1.constant = 16
+                cell.margin2.constant = 16
                 cell.title_Lbl.text = "-"
                 if model.create_time != nil {
                     cell.time_Lbl.text = model.create_time

GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift

@@ -271,10 +271,10 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
             var arr1:Array<String> = []
             switch vcType {
             case 136:
-                arr1 = ["全部商品", "不参与分销商品", "参与分销商品", "提成比例商品", "绝对额比例商品"]
+                arr1 = ["全部商品", "不参与分销商品", "参与分销商品"]
                 break
             default:
-                arr1 = ["全部商品", "分销商品", "现货商品", "提成比例分销商品", "固定提成分销商品"]
+                arr1 = ["全部商品", "分销商品", "现货商品"]
                 break
             }
             arr.append(arr1[sender])
@@ -305,10 +305,10 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
                 showSelectV = showSelectView
                 switch vcType {
                 case 136:
-                    showSelectView.dataArr = ["全部商品", "不参与分销商品", "参与分销商品", "提成比例商品", "绝对额比例商品"]
+                    showSelectView.dataArr = ["全部商品", "不参与分销商品", "参与分销商品"]
                     break
                 default:
-                    showSelectView.dataArr = ["全部商品", "分销商品", "现货商品", "提成比例分销商品", "固定提成分销商品"]
+                    showSelectView.dataArr = ["全部商品", "分销商品", "现货商品"]
                     break
                 }
                 
@@ -637,8 +637,8 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
         if titleStr.contains("代理"){
             dbt_goods_type = selectIndexArr.first!
             if isFisrtTime == true {
+                isFisrtTime = false
                 selectIndexArr = [1,0]
-                
                 dbt_goods_type = 1
             }else{
                 if dbt_goods_type == 0 {
@@ -683,7 +683,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
         if isFisrtTime == true {
             isFisrtTime = false
             selectIndexArr = [2,0]
-            
             goods_type = 3
         }else{
             goods_type = selectIndexArr.first! + 1

GeliBusinessPlatform/ViewController/分销收益页/FXSY_ViewController.swift

@@ -135,6 +135,7 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
             glSelectView = view
         }
     }
+    @IBOutlet weak var back_money_lbl: UILabel!
     @IBOutlet weak var arrow_img: UIImageView!
     @IBOutlet weak var refuse_lbl: UILabel!
     @IBOutlet weak var income_lbl: UILabel!
@@ -251,9 +252,6 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
         gys_list.mj_footer = self.footerMJ
     }
     
-    
-    
-    var isFirstTime = true
     var page = 0
     
     //MARK:--加载更多数据
@@ -307,6 +305,7 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
     
     
     @objc func loadData(){
+        HUD.show(.progress)
         var dic:Dictionary<String,Any>!
         page = 1
         var year = "0"
@@ -336,12 +335,39 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
         ]
         
         dbtIncomeInfo(dic) { [self] (data) in
+            HUD.hide()
             let dateModel = data as! dbtIncomeInfoModel
             self.model = dateModel.data
+                let count = (self.model?.is_agent)! + (self.model?.is_dbt)! + (self.model?.is_sup)!
+                if count > 1 {
+                    self.top_view.isHidden = false
+                    self.bottom_line.isHidden = false
+                    SetTopFrame(view: self.top_view, height: 44)
+                    var titleArr:Array<String> = []
+                    if self.model?.is_sup == 1 {
+                        titleArr.append("供应商")
+                    }
+                    if self.model?.is_agent == 1 {
+                        titleArr.append("代理商")
+                    }
+                    if self.model?.is_dbt == 1 {
+                        titleArr.append("分销店长")
+                    }
+                    
+                    if top_view.subviews.count == 0 && titleArr.count > 1 {
+                        setBtns(titles: titleArr)
+                    }
+                }else{
+                    self.top_view.isHidden = true
+                    self.bottom_line.isHidden = true
+                    SetTopFrame(view: self.top_view, height: 0.00001)
+                }
+            
             if self.model?.res?.count == nil || self.model?.res?.count == 0 {
                 self.gys_list.isHidden = true
                 self.income_lbl.text = "收入:¥0.0"
                 self.refuse_lbl.text = "支出:¥0.0"
+                self.back_money_lbl.text = "退款:¥0.0"
                 self.gys_list?.mj_header?.endRefreshing()
                 self.gys_list?.mj_footer?.endRefreshingWithNoMoreData()
                 
@@ -359,36 +385,15 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
                     self.refuse_lbl.text = "支出:¥0.0"
                 }
                 
-                self.dataArr.removeAll()
-                
-                self.role_type = (self.model?.role_type) as! Int
-                if self.isFirstTime {
-                    self.isFirstTime = false
-                    let count = (self.model?.is_agent)! + (self.model?.is_dbt)! + (self.model?.is_sup)!
-                    if count > 1 {
-                        self.top_view.isHidden = false
-                        self.bottom_line.isHidden = false
-                        SetTopFrame(view: self.top_view, height: 44)
-                        var titleArr:Array<String> = []
-                        if self.model?.is_sup == 1 {
-                            titleArr.append("供应商")
-                        }
-                        if self.model?.is_dbt == 1 {
-                            titleArr.append("代理商")
-                        }
-                        if self.model?.is_agent == 1 {
-                            titleArr.append("分销店长")
-                        }
-                        if top_view.subviews.count == 0 && titleArr.count > 1 {
-                            setBtns(titles: titleArr)
-                        }
+                if self.model?.refund != nil {
+                    self.back_money_lbl.text = "退款:¥"+String(format: "%.02f", self.model?.refund! as! CVarArg)
                 }else{
-                        self.top_view.isHidden = true
-                        self.bottom_line.isHidden = true
-                        SetTopFrame(view: self.top_view, height: 0.00001)
-                    }
+                    self.back_money_lbl.text = "退款:¥0.0"
                 }
                 
+                self.dataArr.removeAll()
+                self.role_type = (self.model?.role_type) as! Int
+                
                 self.page = 2
                 self.model?.res?.forEach({ (item) in
                     self.dataArr.append(item)

GeliBusinessPlatform/ViewController/分销收益页/FXSY_ViewController.xib

@@ -13,6 +13,7 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FXSY_ViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="arrow_img" destination="LRJ-fs-pAL" id="I0L-fH-eGz"/>
+                <outlet property="back_money_lbl" destination="FNh-hj-wH6" id="kXn-Yh-BI1"/>
                 <outlet property="bottom_line" destination="IxS-20-RHd" id="ySN-mt-ImV"/>
                 <outlet property="date_lbl" destination="p0d-nN-gRY" id="32x-fS-Ztn"/>
                 <outlet property="gys_list" destination="x8A-F9-ceB" id="r5R-8a-geu"/>
@@ -110,6 +111,12 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Agb-5D-GhT">
                     <rect key="frame" x="0.0" y="144" width="414" height="87.5"/>
                     <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="退款:¥0.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FNh-hj-wH6">
+                            <rect key="frame" x="158" y="54" width="56.5" height="18.5"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                            <color key="textColor" name="标题字颜色"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p0d-nN-gRY">
                             <rect key="frame" x="15" y="20" width="44" height="24"/>
                             <constraints>
@@ -155,9 +162,11 @@
                         <constraint firstItem="LRJ-fs-pAL" firstAttribute="leading" secondItem="p0d-nN-gRY" secondAttribute="trailing" constant="5" id="g2R-00-lCd"/>
                         <constraint firstItem="p0d-nN-gRY" firstAttribute="leading" secondItem="Agb-5D-GhT" secondAttribute="leading" constant="15" id="gFf-aY-Idf"/>
                         <constraint firstItem="LLc-OZ-DX2" firstAttribute="top" secondItem="Agb-5D-GhT" secondAttribute="top" id="hof-1E-QQe"/>
+                        <constraint firstItem="FNh-hj-wH6" firstAttribute="leading" secondItem="WW0-jT-mpV" secondAttribute="trailing" constant="15" id="jQw-zA-trK"/>
                         <constraint firstItem="WW0-jT-mpV" firstAttribute="centerY" secondItem="Bxv-vi-fqZ" secondAttribute="centerY" id="jxj-vy-qLO"/>
                         <constraint firstItem="Bxv-vi-fqZ" firstAttribute="top" secondItem="p0d-nN-gRY" secondAttribute="bottom" constant="10" id="pzi-hu-9lq"/>
                         <constraint firstItem="LRJ-fs-pAL" firstAttribute="centerY" secondItem="p0d-nN-gRY" secondAttribute="centerY" id="rgE-jf-N9Z"/>
+                        <constraint firstItem="FNh-hj-wH6" firstAttribute="centerY" secondItem="WW0-jT-mpV" secondAttribute="centerY" id="s3e-py-Hb2"/>
                         <constraint firstItem="WW0-jT-mpV" firstAttribute="leading" secondItem="Bxv-vi-fqZ" secondAttribute="trailing" constant="15" id="v0K-Qx-suZ"/>
                         <constraint firstItem="Bxv-vi-fqZ" firstAttribute="leading" secondItem="p0d-nN-gRY" secondAttribute="leading" id="wBd-5w-aua"/>
                     </constraints>

GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift

@@ -58,6 +58,9 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     //MARK:--loadData
     //MARK:--列表数据源
     var dataArr:Array<supDbtOrderLis_Data_model> = []
+    
+    var ghj_dataArr:Array<supDbtOrderLis_Data_model> = []
+    
     var price_type = 0
     @objc func loadData(){
         isUpData = true
@@ -67,12 +70,19 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
         case 157:
             print("loaddata")
             let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"order_status":order_status as Any,"start_time":startTime as Any,"end_time":endTime as Any,"price_type":price_type as Any]
-            supDbtOrderLis(dic) { (data) in
+            supDbtOrderLis(dic) { [self] (data) in
                 let dataM = data as! supDbtOrderLis_model
+                if price_type == 0 {
                     self.dataArr.removeAll()
                     dataM.data?.forEach({ (model) in
                         self.dataArr.append(model)
                     })
+                }else{
+                    self.ghj_dataArr.removeAll()
+                    dataM.data?.forEach({ (model) in
+                        self.ghj_dataArr.append(model)
+                    })
+                }
                 self.listView.mj_header?.endRefreshing()
                 
                 self.listView.reloadData()
@@ -87,6 +97,7 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
             }
             break
         default:
+            
             break
         }
     }
@@ -94,15 +105,21 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
         switch view.tag {
         case 157:
             let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"order_status":order_status as Any,"start_time":startTime as Any,"end_time":endTime as Any,"price_type":price_type as Any]
-            supDbtOrderLis(dic) { (data) in
+            supDbtOrderLis(dic) { [self] (data) in
                 let dataM = data as! supDbtOrderLis_model
                 if dataM.data?.count == 0 {
                     self.listView.mj_footer?.endRefreshingWithNoMoreData()
                 }else{
                     self.page += 1
+                    if price_type == 0 {
                         dataM.data?.forEach({ (model) in
                             self.dataArr.append(model)
                         })
+                    }else{
+                        dataM.data?.forEach({ (model) in
+                            self.ghj_dataArr.append(model)
+                        })
+                    }
                     self.listView.reloadData()
                     self.listView.mj_footer?.endRefreshing()
                 }
@@ -116,28 +133,42 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
         }
     }
     func numberOfSections(in tableView: UITableView) -> Int {
-        
+        if price_type == 0 {
             return self.dataArr.count
+        }else{
+            return self.ghj_dataArr.count
         }
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if price_type == 0 {
             let goodArrModel = self.dataArr[section]
             
+            return goodArrModel.order_goods!.count
+        }else{
+            let goodArrModel = self.ghj_dataArr[section]
+            
             return goodArrModel.order_goods!.count
         }
+        
+    }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "RetailManageViewCell") as! RetailManageViewCell
-        let goodArrModel = self.dataArr[indexPath.section]
-        
-        let goodModel = goodArrModel.order_goods![indexPath.row]
+        var goodArrModel:supDbtOrderLis_Data_model?
+        if price_type == 0 {
+            goodArrModel = self.dataArr[indexPath.section]
+        }else{
+            goodArrModel = self.ghj_dataArr[indexPath.section]
+        }
+        let goodModel = goodArrModel!.order_goods![indexPath.row]
         
         cell.goodsLbl.text = goodModel.goods_name
         cell.numLbl.text = "x" + StringByInt(number: goodModel.goods_number!)
+    
         cell.priceLbl.text = "￥" + goodModel.amount!
         
-        if (indexPath.row + 1) == goodArrModel.order_goods?.count {
+        if (indexPath.row + 1) == goodArrModel!.order_goods?.count {
             cell.dotImgV.isHidden = true
-            
         }else{
             cell.dotImgV.isHidden = false
         }
@@ -146,6 +177,7 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         let vc = RetailManageDetailViewController()
+        
         let goodArrModel = self.dataArr[indexPath.section]
         vc.orderId = goodArrModel.order_id
         self.navigationController?.pushViewController(vc, animated: true)
@@ -153,8 +185,15 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     
     @objc func didselectCellHorF(sender:UITapGestureRecognizer){
         let vc = RetailManageDetailViewController()
-        let goodArrModel = self.dataArr[sender.view!.tag]
-        vc.orderId = goodArrModel.order_id
+        
+        var goodArrModel:supDbtOrderLis_Data_model?
+        if price_type == 0 {
+            goodArrModel = self.dataArr[sender.view!.tag]
+        }else{
+            goodArrModel = self.ghj_dataArr[sender.view!.tag]
+        }
+        
+        vc.orderId = goodArrModel!.order_id
         self.navigationController?.pushViewController(vc, animated: true)
     }
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
@@ -246,13 +285,18 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     }
     
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        let model = self.dataArr[section]
+        var model:supDbtOrderLis_Data_model?
+        if price_type == 0 {
+            model = self.dataArr[section]
+        }else{
+            model = self.ghj_dataArr[section]
+        }
         //已结算
-        if model.commission_status == 1 {
+        if model!.commission_status == 1 {
             return 48
         }
         //或 自动结算 不需要显示标记
-        if model.dbt_type == 2 {
+        if model!.dbt_type == 2 {
             return 48
         }
         return 100

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

@@ -14,6 +14,7 @@ import SwiftyJSON
 
 class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewDataSource  ,WorkSelectTimeViewDelegate,WorkItemTableViewCellDelegate,EditWorkCViewControllerDelegate, GeliAlertViewDelegate{
     
+    @IBOutlet weak var t_lbl: UILabel!
     //MARK:--一级分类
     var titleStrArr:[String] = []
     var pAuthResModelArr:[WorkcenterIndexAuthResModel] = []
@@ -199,6 +200,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         
         WorkcenterIndex(["user_token":UserToken as Any,"star_time":star_time as Any,"end_time":end_time as Any], success: { (data) in
             let dataM = data as! WorkcenterIndexModel
+            self.t_lbl.text = dataM.data?.shop_name
             if dataM.code == 1 {
                 self.dataModel = dataM.data
                 //查询常用的
@@ -626,7 +628,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
                 case 134: //分销商管理
         //            HUD.flash(.label("敬请期待"),delay: 1.2)
                     let vc = GYS_HZ_Vc()
-                    vc.title_str = "分销商管理"
+                    vc.title_str = "下游店长管理"
                     self.navigationController?.pushViewController(vc, animated: true)
                     return
         //        case 133: //供应商管理
@@ -776,6 +778,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         case 161://代理商商品管理
             let vc = GYS_FX_Product_ListVc()
             vc.titleStr = "代理商商品管理"
+            vc.vcType = 161
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 162://代理订单管理
@@ -798,6 +801,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         case 166://上游供应商商品
             let vc = GYS_FX_Product_ListVc()
             vc.titleStr = "上游供应商商品"
+            vc.vcType = 166
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 167://上游代理商商品管理

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

 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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="retina4_7" 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" customClass="WorkCViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="Ljz-8E-4Zf" id="KmD-fN-LkV"/>
+                <outlet property="t_lbl" destination="U1p-Pn-k3L" id="Vxd-I9-yza"/>
                 <outlet property="topNavBtn" destination="1ie-Ew-Tp5" id="xH1-fJ-48Y"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
@@ -24,10 +26,10 @@
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="worktop" translatesAutoresizingMaskIntoConstraints="NO" id="66C-br-VYC">
                     <rect key="frame" x="0.0" y="-90" width="375" height="90"/>
                 </imageView>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="workdaohanglan" translatesAutoresizingMaskIntoConstraints="NO" id="X1E-5F-jT9">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="worktop" translatesAutoresizingMaskIntoConstraints="NO" id="X1E-5F-jT9">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="88"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="44" id="FHP-3L-b7g">
+                        <constraint firstAttribute="height" constant="88" id="FHP-3L-b7g">
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
                             </userDefinedRuntimeAttributes>
@@ -35,18 +37,18 @@
                     </constraints>
                 </imageView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YIb-m5-MdC">
-                    <rect key="frame" x="343" y="11" width="17" height="22"/>
+                    <rect key="frame" x="343" y="55" width="17" height="22"/>
                     <state key="normal" image="workerweima"/>
                     <connections>
                         <action selector="codeAction:" destination="-1" eventType="touchUpInside" id="q4J-lo-HKl"/>
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ljz-8E-4Zf">
-                    <rect key="frame" x="0.0" y="44" width="375" height="623"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <rect key="frame" x="0.0" y="88" width="375" height="579"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1ie-Ew-Tp5">
-                    <rect key="frame" x="164" y="11" width="47" height="22"/>
+                    <rect key="frame" x="164" y="55" width="47" height="22"/>
                     <state key="normal" title="今日" image="workxiala">
                         <color key="titleColor" name="白色背景色"/>
                     </state>
@@ -54,17 +56,30 @@
                         <action selector="topNavBtnAction:" destination="-1" eventType="touchUpInside" id="RGM-7a-Ezn"/>
                     </connections>
                 </button>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U1p-Pn-k3L">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="44" id="XkS-b5-Pp5"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
+                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <nil key="highlightedColor"/>
+                </label>
             </subviews>
-            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstItem="X1E-5F-jT9" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="DFv-HO-c0p"/>
+                <constraint firstItem="U1p-Pn-k3L" firstAttribute="top" secondItem="66C-br-VYC" secondAttribute="bottom" id="E8e-b7-hBH"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="U1p-Pn-k3L" secondAttribute="trailing" id="N4L-qc-Gex"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="X1E-5F-jT9" secondAttribute="trailing" id="OgH-dg-ZCT"/>
                 <constraint firstItem="Ljz-8E-4Zf" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="PPR-dq-rC6"/>
                 <constraint firstItem="1ie-Ew-Tp5" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="TCt-8V-VOA"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="YIb-m5-MdC" secondAttribute="trailing" constant="15" id="ULs-Fd-CoY"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Ljz-8E-4Zf" secondAttribute="trailing" id="Z5L-4v-B2X"/>
-                <constraint firstItem="YIb-m5-MdC" firstAttribute="centerY" secondItem="X1E-5F-jT9" secondAttribute="centerY" id="ZI5-io-bUQ"/>
-                <constraint firstItem="1ie-Ew-Tp5" firstAttribute="centerY" secondItem="X1E-5F-jT9" secondAttribute="centerY" id="bbq-jr-uIF"/>
+                <constraint firstItem="YIb-m5-MdC" firstAttribute="centerY" secondItem="X1E-5F-jT9" secondAttribute="centerY" constant="22" id="ZI5-io-bUQ"/>
+                <constraint firstItem="1ie-Ew-Tp5" firstAttribute="centerY" secondItem="X1E-5F-jT9" secondAttribute="centerY" constant="22" id="bbq-jr-uIF"/>
+                <constraint firstItem="U1p-Pn-k3L" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="e82-qD-j42"/>
                 <constraint firstItem="X1E-5F-jT9" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="f2E-Nx-hLz"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="Ljz-8E-4Zf" secondAttribute="bottom" id="hLG-4i-Ucw"/>
                 <constraint firstItem="66C-br-VYC" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="iRS-gk-bGU"/>
@@ -72,17 +87,18 @@
                 <constraint firstItem="Ljz-8E-4Zf" firstAttribute="top" secondItem="X1E-5F-jT9" secondAttribute="bottom" id="tbU-Hu-Nwy"/>
                 <constraint firstItem="X1E-5F-jT9" firstAttribute="top" secondItem="66C-br-VYC" secondAttribute="bottom" id="yFS-jd-dcC"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <point key="canvasLocation" x="132" y="138.98050974512745"/>
         </view>
     </objects>
     <resources>
-        <image name="workdaohanglan" width="375" height="44"/>
         <image name="workerweima" width="17" height="17"/>
         <image name="worktop" width="375" height="90"/>
         <image name="workxiala" width="9.5" height="5"/>
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/工作中心/编辑工作中心/EditWorkCViewController.swift

@@ -191,11 +191,9 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC
                 //带背景常用app_icon_bg
                 if rowModel.app_icon == nil {
                     cell.itemImgV.image  = UIImage.init(named: "worktest1")
-                    
                 }else{
                     //带背景常用icon
                     cell.itemImgV.sd_setImage(with:  URL(string:SERVERCE_ImageHost +  rowModel.app_icon!), placeholderImage: UIImage.init(named: "worktest1"),options:.allowInvalidSSLCertificates)
-            
                 }
                 cell.itemNameLbl.text = rowModel.auth_name
                 cell.bgImV.image = UIImage.init(named: "workjian")