14

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -376,5 +376,37 @@
 	<string>Distribution/supDbtOrderLis</string>
 	<key>上下架(设置分销商品给分销商)</key>
 	<string>Distribution/setDbtGoodsAttr</string>
+	<key>上游供应商信息页面查询</key>
+	<string>Distribution/upstreamSupList</string>
+	<key>代理商终止与供应商合作</key>
+	<string>Distribution/stopeSupAgeCon</string>
+	<key>代理商设置分销商品信息页面查询</key>
+	<string>Distribution/selAgeDbtGoodsList</string>
+	<key>代理商的铺货或分销设置</key>
+	<string>Distribution/ageSetDbtGoods</string>
+	<key>下拉框供应商信息</key>
+	<string>Distribution/getsupList</string>
+	<key>取消分销</key>
+	<string>Distribution/delAgentDbt</string>
+	<key>代理商设置分销商品上下架商品</key>
+	<string>Distribution/ageSetGoodsAttr</string>
+	<key>上游代理商管理界面信息查询</key>
+	<string>Distribution/upAgentInfoList</string>
+	<key>代理商终止合作</key>
+	<string>Distribution/delAgentContract</string>
+	<key>分销商新增代理商</key>
+	<string>Distribution/addAgentShops</string>
+	<key>下拉框代理商商信息（未与分销商合作着的代理商信息）</key>
+	<string>Distribution/getAgeList</string>
+	<key>订单列表(代理商订单列表和分销商订单列表)</key>
+	<string>Distribution/dbtAgeOrderList</string>
+	<key>下游店长管理信息查询</key>
+	<string>Distribution/agentDetDbtList</string>
+	<key>删除下游店长</key>
+	<string>Distribution/delDbtContract</string>
+	<key>新增店铺</key>
+	<string>Distribution/addDbtShops</string>
+	<key>下拉框分销商商信息（未与代理商合作着的分销商信息）</key>
+	<string>Distribution/getDbtList</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/UpDataModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import ObjectMapper
-//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付，发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作,分销商品管理,分销商新增供应商,审核操作（通过和不通过）,删除客户,新增分销员,删除分销员,修改不二制油订单打印,店长审核通过、审核通过待补齐资料、不通过,保存店长审核信息（商家信息）,拼拼货取消订单,供应商新增代理商(批量和单个新增代理商),终止与代理商合作,给代理商设置分销商品,商品上下架,供应商取消商品分销,上下架(设置分销商品给分销商),
+//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付，发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作,分销商品管理,分销商新增供应商,审核操作（通过和不通过）,删除客户,新增分销员,删除分销员,修改不二制油订单打印,店长审核通过、审核通过待补齐资料、不通过,保存店长审核信息（商家信息）,拼拼货取消订单,供应商新增代理商(批量和单个新增代理商),终止与代理商合作,给代理商设置分销商品,商品上下架,供应商取消商品分销,上下架(设置分销商品给分销商),代理商终止与供应商合作,代理商的铺货或分销设置,取消分销,代理商设置分销商品上下架商品,代理商终止合作,分销商新增代理商,删除下游店长,新增店铺,
 
 
 class UpDataModel: Mappable {

GeliBusinessPlatform/Model/agentList_interface.swift

@@ -165,3 +165,228 @@ func setDbtGoodsAttr(_ params:[String:Any],success:@escaping (_ res:Any)->(),fai
         failture(error)
     }
 }
+//MARK:-- 上游供应商信息页面查询
+/*
+ user_token : 验证token
+ keyword : 供应商名称
+ page : 分页
+ */
+func upstreamSupList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("上游供应商信息页面查询", params, { (rep:DataResponse<upstreamSupList_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:-- 代理商终止与供应商合作
+/*
+ user_token : 验证token
+ sup_id :供应商id
+ */
+func stopeSupAgeCon(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("代理商终止与供应商合作", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:-- 代理商设置分销商品信息页面查询
+/*
+ user_token : 验证token
+ tab_type :1为已铺货,2为可铺货(默认为1)
+ keyword : 模糊搜索（商店名称）
+ sup_id  : 供应商id(不传随机数据库一个供应商,那个供应商就是下拉框第一个)
+ page : 分页
+ */
+func selAgeDbtGoodsList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("代理商设置分销商品信息页面查询", params, { (rep:DataResponse<selAgeDbtGoodsList_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:-- 代理商的铺货或分销设置
+/*
+ user_token : 验证token
+ sup_id :供应商id
+ sku_id: 商品sku_id
+ goods_id :商品goods_id
+ price_type :供应商设置商品的那种类型：0分销价 1供应价
+ price :售卖价格
+ commission_val:固定提成
+ supply_price:代理商供货价
+ floor_price:最低价格范围
+ ceiling_price:最高价格范围
+ commission_val_agent:代理商佣金
+ */
+func ageSetDbtGoods(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("代理商的铺货或分销设置", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:-- 下拉框供应商信息
+/*
+ user_token : 验证token
+ */
+func getsupList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("下拉框供应商信息", params, { (rep:DataResponse<getsupList_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:-- 取消分销
+/*
+ user_token : 验证token
+ sku_id: 商品sku_id
+ */
+func delAgentDbt(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("取消分销", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:-- 代理商设置分销商品上下架商品
+/*
+ user_token : 验证token
+ sku_id: 商品sku_id
+ action:操作，1为上架2为下架
+ */
+func ageSetGoodsAttr(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("代理商设置分销商品上下架商品", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:-- 上游代理商管理界面信息查询
+/*
+ user_token : 验证token
+ keyword: 模糊搜索（代理商名称）
+ */
+func upAgentInfoList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("上游代理商管理界面信息查询", params, { (rep:DataResponse<upAgentInfoList_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK:-- 代理商终止合作
+/*
+ user_token : 验证token
+ agent_id: 代理商id
+ */
+func delAgentContract(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("代理商终止合作", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK:-- 分销商新增代理商
+/*
+ user_token : 验证token
+ age_id: 代理商id(批量新增代理商,用英文逗号隔开)
+ */
+func addAgentShops(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("代理商终止合作", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK:-- 订单列表(代理商订单列表和分销商订单列表)
+/*
+ user_token : 验证token
+ order_status: 订单状态：1为待付款、7为待收货、10为已收货、2为交易关闭、100为全部（默认100）
+ keyword:模糊搜索订单编号、商品名称
+ start_time:开始时间（时间戳）
+ end_time     结束时间（时间戳）
+ dbt_type      0全部 1人工已结算、2人工未结算、3自动已结算、4自动未结算、5人工结算失败、6人工结算中、7自动结算失败、8自动结算中、9人工已退还、10自动已退还
+ page      分页 
+ jurisdiction     权限类型:1为代理商，2为分销商
+ */
+
+func dbtAgeOrderList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("订单列表(代理商订单列表和分销商订单列表)", params, { (rep:DataResponse<dbtAgeOrderList_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK:-- 下游店长管理信息查询
+/*
+ user_token    1    string    验证token    必填
+ keyword    0    string    模糊搜索（分销商名称）    非必填
+ */
+
+func agentDetDbtList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("下游店长管理信息查询", params, { (rep:DataResponse<agentDetDbtList_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:-- 删除下游店长
+/*
+ user_token    1    string    验证token    必填
+ keyword    0    string    模糊搜索（分销商名称）    非必填
+ */
+
+func delDbtContract(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("删除下游店长", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:-- 新增店铺
+/*
+ user_token    1    string    验证token    必填
+ keyword    0    string    模糊搜索（分销商名称）    非必填
+ */
+
+func addDbtShops(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("新增店铺", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+
+//MARK:-- 下拉框分销商商信息（未与代理商合作着的分销商信息）
+/*
+ user_token    1    string    验证token    必填
+ keyword    0    string    模糊搜索（分销商名称）    非必填
+ */
+
+func getDbtList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("下拉框分销商商信息（未与代理商合作着的分销商信息）", params, { (rep:DataResponse<getDbtList_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/agentList_model/agentList_model.swift

@@ -8,6 +8,314 @@
 
 import Foundation
 import ObjectMapper
+//MARK: - 下拉框分销商商信息（未与代理商合作着的分销商信息）
+class getDbtList_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<getDbtList_Data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class getDbtList_Data_model: Mappable {
+    var shop_id:Int?
+    var shop_name : String?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        shop_id <- map["shop_id"]
+        shop_name <- map["shop_name"]
+    }
+}
+//MARK: - 下游店长管理信息查询
+class agentDetDbtList_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<agentDetDbtList_Data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class agentDetDbtList_Data_model: Mappable {
+    var shop_name:String?
+    var shop_img_thumb : String?
+    var address :String?
+    
+    var create_time:String?
+    var status : String?
+    var is_shopowner :String?
+    
+    var dbt_id :Int?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        shop_name <- map["shop_name"]
+        shop_img_thumb <- map["shop_img_thumb"]
+        address <- map["address"]
+        
+        create_time <- map["create_time"]
+        status <- map["status"]
+        is_shopowner <- map["is_shopowner"]
+        
+        dbt_id <- map["dbt_id"]
+    }
+}
+//MARK: - 订单列表(代理商订单列表和分销商订单列表)
+class dbtAgeOrderList_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<dbtAgeOrderList_Data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class dbtAgeOrderList_Data_model: Mappable {
+    var order_id:Int?
+    var order_sn : String?
+    var pay_status :Int?
+    
+    var dbt_type:Int?
+    var sum_amount : String?
+    var commission_status :Int?
+    
+    var commission:String?
+    var shop_id : String?
+    var order_goods :Array<dbtAgeOrderList_Data_d_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        order_id <- map["order_id"]
+        order_sn <- map["order_sn"]
+        pay_status <- map["pay_status"] //支付状态;0未付款;1欠款;2已付款3付款异常,线下汇款（4待提交凭证，5审核中，6重新提交凭证，7审核成功）,8(部分)账期支付，9欠款（废弃）,10月结,11已退款 12已付定金
+        
+        dbt_type <- map["dbt_type"]//分销分账方式 1人工结算 2自动结算
+        sum_amount <- map["sum_amount"]//总价
+        commission_status <- map["commission_status"] //佣金结算 1已结算 0 未结算 2处理中 3结算失败 4已退还佣金
+        
+        commission <- map["commission"]//佣金
+        shop_id <- map["shop_id"]
+        order_goods <- map["order_goods"]
+    }
+}
+class dbtAgeOrderList_Data_d_model: Mappable {
+    var goods_name:String?
+    var goods_number : Int?
+    var amount :String?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        goods_name <- map["goods_name"]
+        goods_number <- map["goods_number"]
+        amount <- map["amount"]
+    }
+}
+//MARK: - 下拉框代理商商信息（未与分销商合作着的代理商信息）
+class getAgeList_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<getAgeList_Data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class getAgeList_Data_model: Mappable {
+    var shop_id:Int?
+    var shop_name : String?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        shop_id <- map["shop_id"]
+        shop_name <- map["shop_name"]
+    }
+}
+//MARK: - 上游代理商管理界面信息查询
+class upAgentInfoList_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<upAgentInfoList_Data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class upAgentInfoList_Data_model: Mappable {
+    var shop_name:String?
+    var shop_img_thumb : String?
+    var address :String?
+    
+    var create_time:String?
+    var status : String?
+    var sup_id :Int?
+    
+    var sum_commission_val :Float? //佣金
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        shop_name <- map["shop_name"]
+        shop_img_thumb <- map["shop_img_thumb"]
+        address <- map["address"]
+        
+        create_time <- map["create_time"]
+        status <- map["status"]
+        sup_id <- map["sup_id"]
+        
+        sum_commission_val <- map["sum_commission_val"]
+    }
+}
+//MARK: - 下拉框供应商信息
+class getsupList_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<getsupList_Data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class getsupList_Data_model: Mappable {
+    var sup_id:Int?
+    var shop_name : String?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        sup_id <- map["sup_id"]
+        shop_name <- map["shop_name"]
+    }
+}
+//MARK: - 代理商设置分销商品信息页面查询
+class selAgeDbtGoodsList_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<selAgeDbtGoodsList_Data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class selAgeDbtGoodsList_Data_model: Mappable {
+    var goods_name:String?
+    var goods_thumb : String?
+    var goods_id :Int?
+    
+    var sku_id:Int?
+    var inventory : Int? //库存
+    var price_type :Int? //分销价格类型：0普通 1供应价
+    
+    var supply_price:String?//代理商供货价
+    var floor_price : String?  //最低价格范围
+    var ceiling_price :String?   //最高价格范围
+    
+    var dbt_price:String? //分销价
+    var commission_val : String? //佣金
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        goods_name <- map["goods_name"]
+        goods_thumb <- map["goods_thumb"]
+        goods_id <- map["goods_id"]
+        
+        sku_id <- map["sku_id"]
+        inventory <- map["inventory"]
+        price_type <- map["price_type"]
+        
+        supply_price <- map["supply_price"]
+        floor_price <- map["floor_price"]
+        ceiling_price <- map["ceiling_price"]
+        
+        dbt_price <- map["dbt_price"]
+        commission_val <- map["commission_val"]
+    }
+}
+//MARK: - 上游供应商信息页面查询
+class upstreamSupList_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<upstreamSupList_Data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class upstreamSupList_Data_model: Mappable {
+    var sup_id:Int?
+    var start_time : String?
+    var shop_name :String?
+    
+    var shop_img_thumb : String?
+    var address :String?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        sup_id <- map["sup_id"]
+        start_time <- map["start_time"]
+        shop_name <- map["shop_name"]
+        
+        shop_img_thumb <- map["shop_img_thumb"]
+        address <- map["address"]
+    }
+}
 //MARK: - 供应商分销订单管理
 class supDbtOrderLis_model: Mappable {
     var code:Int?

GeliBusinessPlatform/ViewController/上游供应商管理/SY_GYS_GL_Cell.swift

@@ -7,9 +7,20 @@
 //
 
 import UIKit
-
+protocol SY_GYS_GL_Cell_Delegate {
+    func SY_GYS_GL_Cell_action(cell:SY_GYS_GL_Cell)
+}
 class SY_GYS_GL_Cell: UITableViewCell {
-
+    var delegate:SY_GYS_GL_Cell_Delegate?
+    @IBAction func action_click(_ sender: UIButton) {
+        delegate?.SY_GYS_GL_Cell_action(cell: self)
+    }
+    @IBOutlet weak var action_btn: UIButton!
+    @IBOutlet weak var status: UILabel!
+    @IBOutlet weak var time: UILabel!
+    @IBOutlet weak var adr: UILabel!
+    @IBOutlet weak var name: UILabel!
+    @IBOutlet weak var icon: UIImageView!
     override func awakeFromNib() {
         super.awakeFromNib()
         self.selectionStyle = .none

GeliBusinessPlatform/ViewController/上游供应商管理/SY_GYS_GL_Cell.xib

@@ -87,6 +87,9 @@
                                         <real key="value" value="5"/>
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="action_click:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="et0-m6-KKg"/>
+                                </connections>
                             </button>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -121,6 +124,14 @@
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="action_btn" destination="Fpz-FC-IPz" id="SzH-Ki-mLh"/>
+                <outlet property="adr" destination="bqE-s0-1kL" id="JrM-Sb-SDL"/>
+                <outlet property="icon" destination="xbg-rr-PYw" id="Ac6-yf-COo"/>
+                <outlet property="name" destination="71O-qP-qIR" id="MXd-gL-0xb"/>
+                <outlet property="status" destination="kux-r5-jZI" id="2aL-jT-ITO"/>
+                <outlet property="time" destination="flq-2w-rjy" id="oD0-Fx-dVn"/>
+            </connections>
             <point key="canvasLocation" x="141" y="94"/>
         </tableViewCell>
     </objects>

GeliBusinessPlatform/ViewController/上游供应商管理/SY_GYS_GL_VC.swift

@@ -8,7 +8,31 @@
 
 import UIKit
 
-class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource {
+class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource,SY_GYS_GL_Cell_Delegate, GeliAlertViewDelegate{
+    func sureGeliAlertViewAction(sender: UIButton) {
+        delAgentContract(["user_token":UserToken as Any,"agent_id":sender.tag as Any]) { (data) in
+            self.list_view.mj_header?.beginRefreshing()
+        } failture: { (err) in
+                
+        }
+    }
+    
+    func SY_GYS_GL_Cell_action(cell: SY_GYS_GL_Cell) {
+        
+        let alertView = GeliAlertView(frame: self.view.window!.bounds)
+        alertView.delegate = self;
+        alertView.tishiLbl.text = ""
+        alertView.titileLbl.text = "是否确定终止合作？"
+        alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
+        let model = upAgentInfoList_Arr[cell.tag]
+        alertView.rightBtn.tag = model.sup_id!
+        self.view.window?.addSubview(alertView)
+        
+        
+        
+
+    }
+    
     var titleStr = ""
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     var keyword = ""
@@ -18,11 +42,27 @@ class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDeleg
         return 125
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 3
+        if self.view.tag == 165 {
+            return upAgentInfoList_Arr.count
+        }else{
+            return 3
+        }
     }
-    
+    var upAgentInfoList_Arr:Array<upAgentInfoList_Data_model> = []
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "SY_GYS_GL_Cell") as! SY_GYS_GL_Cell
+        if self.view.tag == 165 {
+            let model = upAgentInfoList_Arr[indexPath.row]
+            cell.icon.sd_setImage(with:URL(string:SERVERCE_ImageHost + model.shop_img_thumb!), placeholderImage: nil,options:.allowInvalidSSLCertificates)
+            cell.name.text = model.shop_name
+            cell.adr.text = model.address
+            cell.time.text = model.create_time
+            cell.status.text = model.status
+            cell.tag = indexPath.row
+            cell.delegate = self
+        }else{
+            
+        }
         return cell
     }
     @IBOutlet weak var list_view: UITableView!
@@ -30,6 +70,7 @@ class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDeleg
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
         navbar.title = titleStr
         self.view.addSubview(navbar)
         SetTopFrame(view: contentV, height: 45)
@@ -56,13 +97,42 @@ class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDeleg
         list_view.mj_header = self.headerMJ
         list_view.mj_header?.beginRefreshing()
         
-        footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
-        list_view.mj_footer = self.footerMJ
+//        footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
+//        list_view.mj_footer = self.footerMJ
+    }
+    @objc func loadData(){
+        print("加载数据")
+        if self.view.tag == 165 {
+            upAgentInfoList_Arr.removeAll()
+            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any]
+            upAgentInfoList(dic, success: { (data) in
+                let model = data as! upAgentInfoList_model
+                model.data?.forEach({ (item) in
+                    self.upAgentInfoList_Arr.append(item)
+                })
+                self.list_view.reloadData()
+                self.list_view.mj_header?.endRefreshing()
+                if model.data?.count == 0 {
+                    self.list_view.mj_footer?.endRefreshingWithNoMoreData()
+                }else{
+                    self.list_view.mj_footer?.endRefreshing()
+                }
+            }) { (error) in
+                self.list_view.mj_header?.endRefreshing()
+                
+            }
+        }else{
+            
+        }
     }
     
-    @objc func loadData(){}
-    
-    @objc func loadMoreData(){}
+    @objc func loadMoreData(){
+        if self.view.tag == 165 {
+            
+        }else{
+            
+        }
+    }
     
     var blackBtnView:UIButton! = nil
     

GeliBusinessPlatform/ViewController/下游店长管理/XY_DZ_GL_VC_Cell.swift

@@ -22,7 +22,6 @@ class XY_DZ_GL_VC_Cell: UITableViewCell {
 
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
-
         // Configure the view for the selected state
     }
     

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

@@ -9,9 +9,8 @@
 import UIKit
 import Parchment
 
-class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchBarDelegate, SearchBarViewDelegate ,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte, UITableViewDelegate, UITableViewDataSource, GeliAlertViewDelegate, RetailManageFooterViewDelagte{
-    let UserToken = UserDefaults.standard.value(forKey: "user_token")
-    var dataArr:Array<dbtOrderLisDataModel> = []
+class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchBarDelegate, SearchBarViewDelegate ,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte{
+
     @IBOutlet weak var contentV: UIView!
     
     fileprivate let cities = [
@@ -24,123 +23,48 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
     ]
     //头部滚动视图
     weak var pagingVC : PagingViewController?
-    var titleStr = ""
-    var list_view:UITableView?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-        navbar.title = titleStr
+        navbar.title = "分销订单管理"
         navbar.lineView.isHidden = true
         self.view.addSubview(navbar)
         SetTopFrameView(view: contentV, btmView: self.view)
-        if titleStr != "分销订单管理" {
-            if list_view == nil {
-                list_view = UITableView()
-                list_view?.delegate = self
-                list_view?.dataSource = self
-                list_view?.separatorStyle = .none
-                list_view?.backgroundColor = UIColor(named: "app底色")
-                self.view.addSubview(list_view!)
-                list_view?.register(UINib(nibName: "RetailManageViewCell", bundle: nil), forCellReuseIdentifier: "RetailManageViewCell")
-                headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
-                list_view?.mj_header = headerMJ
-                footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
-                list_view?.mj_footer = footerMJ
-                list_view?.mj_header?.beginRefreshing()
-            }
-        }else{
-            print("abcdddd")
-            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
-        }
+        
+        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
+        
         initSearchBar()
         initHeaderSelectView()
     }
-    var page = 0
-    
-    @objc func loadData(){
-        //        isUpData = true
-        //结算方式（0全部1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算)）
-        page = 1
-        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"start_time":startTime as Any,"end_time":endTime as Any]
-        
-        //        dbtOrderLis(dic) { (data) in
-        //            let dataM = data as! dbtOrderLisModel
-        //
-        //            self.dataArr.removeAll()
-        //            dataM.data?.forEach({ (model) in
-        //                self.dataArr.append(model)
-        //            })
-        //            self.listView.mj_header?.endRefreshing()
-        //
-        //            self.listView.reloadData()
-        //             if dataM.data?.count == 0 {
-        //                self.listView.mj_footer?.endRefreshingWithNoMoreData()
-        //            }else{
-        //                self.listView.mj_footer?.endRefreshing()
-        //            }
-        //            self.page = 2
-        //
-        //        } failture: { (error) in
-        //            self.listView.mj_header?.endRefreshing()
-        //        }
-    }
-    @objc func loadMoreData(){
-        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"start_time":startTime as Any,"end_time":endTime as Any]
-        //        dbtOrderLis(dic) { (data) in
-        //            let dataM = data as! dbtOrderLisModel
-        //            if dataM.data?.count == 0 {
-        //                self.listView.mj_footer?.endRefreshingWithNoMoreData()
-        //            }else{
-        //                self.page += 1
-        //                dataM.data?.forEach({ (model) in
-        //                    self.dataArr.append(model)
-        //                })
-        //                self.listView.reloadData()
-        //                self.listView.mj_footer?.endRefreshing()
-        //            }
-        //
-        //
-        //
-        //        } failture: { (error) in
-        //            self.listView.mj_footer?.endRefreshing()
-        //
-        //        }
-    }
-    
-    
     weak var searchV: SearchBarView? = nil
     var blackBtnView:UIButton! = nil
     var keyword = ""
     let SearchBarContentV = UIView()
-    
+
     var btn_view = UIView()
     var btn_line_view = UIView()
     func initSearchBar() {
         contentV.addSubview(btn_view)
         btn_view.snp.makeConstraints { (make) in
             make.left.right.equalToSuperview()
-            if titleStr == "代理订单管理" {
-                make.top.equalTo(0)
-            }else{
-                make.top.equalTo(50)
-            }
+            make.top.equalTo(50)
             make.height.equalTo(40)
         }
-        
         contentV.addSubview(btn_line_view)
         
         let titles = ["全部","待付款","待发货","已收货","交易关闭"]
@@ -176,7 +100,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         contentV.addSubview(SearchBarContentV)
         SearchBarContentV.snp.makeConstraints { (make) in
             make.left.right.equalToSuperview()
-            make.top.equalTo(btn_view.snp_bottom)
+            make.top.equalTo(90)
             make.height.equalTo(45)
         }
         let searchBr = SearchBarView.init()
@@ -222,7 +146,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
     }
     
     func clearSearchAction() {
-        
+    
     }
     func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
         removeBlackBtnView()
@@ -245,8 +169,8 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         }
         let vc = viewControllers[selectIndex]
         vc.listView.mj_header?.beginRefreshing()
-        
-    }
+
+     }
     @objc func removeBlackBtnView(){
         if blackBtnView != nil {
             blackBtnView.removeFromSuperview()
@@ -289,14 +213,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
             make.top.equalTo(SearchBarContentV.snp_bottom)
             make.height.equalTo(45)
         }
-        if titleStr == "代理订单管理" {
-            if list_view != nil {
-                list_view?.snp.makeConstraints { (make) in
-                    make.top.equalTo(changeBgView.snp_bottom)
-                    make.bottom.left.right.equalTo(0)
-                }
-            }
-        }
+        
         let selectView = HeaderSelectView()
         selectView.firstBtn.setTitle("结算方式", for: .normal)
         selectView.secBtn.setTitle("结算时间", for: .normal)
@@ -330,7 +247,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
                     make.top.equalTo(changeBgView.snp_bottom)
                 }
                 showSelectV = showSelectView
-                showSelectView.dataArr = ["全部", "人工已结算","人工未结算", "自动已结算", "自动未结算", "人工结算失败", "人工结算中", "自动结算失败", "自动结算中", "人工已退还", "自动已退还"]
+                showSelectView.dataArr = ["全部", "人工结算", "自动结算", "待自动结算", "已自动结算", "待人工结算", "已人工结算"]
                 showSelectView.selectIndx = selectIndexArr[0]
                 
             }
@@ -355,7 +272,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
                 }
             }
             break
-        default: break
+         default: break
         }
     }
     
@@ -398,19 +315,16 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
             startTime = Int(timeInterval)
             endTime = Int(timeIntervalEnd)
         }
-        if titleStr == "代理订单管理"{
-            list_view?.mj_header?.beginRefreshing()
-        }else{
-            viewControllers.forEach { (vc) in
-                vc.startTime = startTime
-                vc.endTime = endTime
-                vc.isUpData = false
-            }
-            let vc = viewControllers[selectIndex]
-            vc.listView.mj_header?.beginRefreshing()
+        viewControllers.forEach { (vc) in
+            vc.startTime = startTime
+            vc.endTime = endTime
+            vc.isUpData = false
         }
+        let vc = viewControllers[selectIndex]
+        vc.listView.mj_header?.beginRefreshing()
+ 
     }
-    
+   
     //MARK:---滚动选择
     var selectIndex = 0
     func pagingViewController(_ pagingViewController: PagingViewController, didScrollToItem pagingItem: PagingItem, startingViewController: UIViewController?, destinationViewController: UIViewController, transitionSuccessful: Bool) {
@@ -431,170 +345,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
             }
         }
     }
-    
-    func numberOfSections(in tableView: UITableView) -> Int {
-        
-        return self.dataArr.count
-    }
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        
-        let goodArrModel = self.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]
-        
-        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 {
-            cell.dotImgV.isHidden = true
-            
-        }else{
-            cell.dotImgV.isHidden = false
-        }
-        return cell
-    }
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-//        if self.title == "代销订单" {
-//            let vc = RetailManageDetailViewController()
-//            let goodArrModel = self.dataArr[indexPath.section]
-//            vc.orderId = goodArrModel.order_id
-//            vc.dbt_shop_id = goodArrModel.shop_id
-//            self.navigationController?.pushViewController(vc, animated: true)
-//        }else{
-            let vc = RetailManageDetailViewController()
-            let goodArrModel = self.dataArr[indexPath.section]
-            vc.orderId = goodArrModel.order_id
-            self.navigationController?.pushViewController(vc, animated: true)
-//        }
-    }
-    
-    @objc func didselectCellHorF(sender:UITapGestureRecognizer){
-        
-//        if self.title == "代销订单" {
-//            let vc = RetailManageDetailViewController()
-//            let goodArrModel = self.dataArr[sender.view!.tag]
-//            vc.orderId = goodArrModel.order_id
-//            vc.dbt_shop_id = goodArrModel.shop_id
-//            self.navigationController?.pushViewController(vc, animated: true)
-//        }else{
-            let vc = RetailManageDetailViewController()
-            let goodArrModel = self.dataArr[sender.view!.tag]
-            vc.orderId = goodArrModel.order_id
-            self.navigationController?.pushViewController(vc, animated: true)
-//        }
-        
-    }
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        let headerV = UIView()
-        let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
-        headerV.addGestureRecognizer(tap)
-        headerV.tag = section
-        
-        let contentV = RetailManageHeaderView()
-        headerV.addSubview(contentV)
-        contentV.snp_makeConstraints { (make) in
-            make.left.top.right.bottom.equalToSuperview()
-        }
-        let model = self.dataArr[section]
-        contentV.snNumLbl.text = model.order_sn
-        var dbt_typeStr = "人工结算"
-        if model.dbt_type == 2 {
-            dbt_typeStr = "自动结算"
-        }
-        switch model.pay_status {
-        case 2:
-            contentV.stateLbl.text = "已付款/" + dbt_typeStr
-            break
-        case 10:
-            contentV.stateLbl.text = "月结/" + dbt_typeStr
-            break
-        case 11:
-            contentV.stateLbl.text = "已退款/" + dbt_typeStr
-            break
-        default:
-            contentV.stateLbl.text = "未付款/" + dbt_typeStr
-            break
-        }
-        return headerV
-        
-    }
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 50
-    }
-    
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
-        let footerV = UIView()
-        let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
-        footerV.addGestureRecognizer(tap)
-        footerV.tag = section
-        
-        let contentV = RetailManageFooterView()
-        footerV.addSubview(contentV)
-        contentV.snp_makeConstraints { (make) in
-            make.left.top.right.bottom.equalToSuperview()
-        }
-        let model = self.dataArr[section]
-        contentV.priceLbl.text = model.sum_amount!
-        if model.commission_status == 1 {
-            contentV.moneyLbl.text = model.sum_commission_val! + "(已结算)"
-            
-        }else{
-            contentV.moneyLbl.text = model.sum_commission_val! + "(未结算)"
-            
-        }
-        contentV.actionBtn.tag = section
-        contentV.delgate = self
-        return footerV
-        
-    }
-    func tapRetailManageFooterBtnAction(sender: Int) {
-        //标记为人工结算
-        let alertView = GeliAlertView(frame: self.view.window!.bounds)
-        alertView.delegate = self;
-        alertView.tishiLbl.text = ""
-        alertView.titileLbl.text = "是否把该订单标记为已人工结算？"
-        alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
-        alertView.rightBtn.tag = sender
-        self.view.window?.addSubview(alertView)
-    }
-    func sureGeliAlertViewAction(sender: UIButton) {
-        HUD.flash(.progress)
-        let model = self.dataArr[sender.tag]
-        editCommissionStatus(["user_token":UserToken as Any,"order_id":model.order_id as Any]) { (data) in
-            HUD.hide()
-            model.commission_status = 1
-            
-            HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2)
-            self.list_view!.reloadSections([sender.tag], with: .none)
-        } failture: { (error) in
-            
-        }
-        
-    }
-    
-    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        let model = self.dataArr[section]
-        //已结算
-        if model.commission_status == 1 {
-            return 48
-        }
-        //或 自动结算 不需要显示标记
-        if model.dbt_type == 2 {
-            return 48
-        }
-        return 100
-        
-    }
 }
-
-
 extension RetailListMgVC: PagingViewControllerDataSource {
     
     func pagingViewController(_: PagingViewController, pagingItemAt index: Int) -> PagingItem {

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

@@ -56,7 +56,7 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
     
     
     let goodsTitleArr = ["商品合计"]
-    let fenxiaoTitleArr = ["分销角色","所属代理商","分享结算方式","系统结算方式","提现发放方式","提成结算时间"]
+    let fenxiaoTitleArr = ["分销角色","结算方式","提成方式","提成结算时间","提成分销结算"]
     let orderTitleArr = ["订单编号","下单时间","订单来源","支付方式","支付状态","买家留言","订单备注"]
     
     @IBOutlet weak var listView: UITableView!
@@ -158,10 +158,7 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
 
             cell.count_lbl.text = "单价:" + (rowModel?.goods_price)!
             cell.yong_jin_lbl.text = "小计:" + String(format: "%.2f", p_count)
-            cell.dan_jia_lbl.text = "提成:￥-"
-            if rowModel?.commission_val != nil {
-                cell.dan_jia_lbl.text =  "提成:￥" + (rowModel?.commission_val)!
-            }
+            cell.dan_jia_lbl.text =  "提成:￥" + (rowModel?.commission_val)!
             cell.xiao_ji_lbl.text = "数量:" +  StringByInt(number: (rowModel?.cart_number!)!)
             cell.delegate = self
             cell.tag = indexPath.row
@@ -180,7 +177,7 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
             
         case 3:
             switch indexPath.row {
-            case 0://分销角色：
+            case 0:
                 if self.dataMdoel?.order_res?.dbt_target == 1 {
                     cell.textTF.text = "供应商" + "(" + (self.dataMdoel?.order_res?.target_name)! + ")"
                 }else if self.dataMdoel?.order_res?.dbt_target == 2 {
@@ -190,38 +187,45 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
                 }else{
                     cell.textTF.text = "-"
                 }
-            case 1://所属代理商
-                cell.textTF.text = "-"
-                if self.dataMdoel?.dbt_info?.agent_name != nil {
-                    cell.textTF.text = self.dataMdoel?.dbt_info?.agent_name!
-                }
-            case 2://分享结算方式：
-                cell.textTF.text = "-"
-                if self.dataMdoel?.dbt_info?.share_type != nil{
-              
-                        cell.textTF.text = self.dataMdoel?.dbt_info?.share_type!
+            case 1:
+                if self.dataMdoel?.dbt_info?.dbt_type == 1 {
+                    cell.textTF.text = "人工结算"
+                    
+                }else if self.dataMdoel?.dbt_info?.dbt_type == 2{
+                    cell.textTF.text = "自动结算"
+                    
+                }else{
+                    cell.textTF.text = "-"
                 }
-            case 3://系统结算方式：
-                cell.textTF.text = "-"
-                if self.dataMdoel?.dbt_info?.commission_status != nil {
-                var status = "自动结算"
-                if self.dataMdoel?.dbt_info?.dbt_type != 2{
-                    status = "人工结算"
+            case 2:
+                if self.dataMdoel?.dbt_info?.commission_type != nil{
+                    if  (self.dataMdoel?.dbt_info?.commission_type!.count)! > 0{
+                        cell.textTF.text = self.dataMdoel?.dbt_info?.commission_type
+                        
+                    }else{
+                        cell.textTF.text = "-"
+                        
+                    }
+                }else{
+                    cell.textTF.text = "-"
                 }
-                cell.textTF.text = status + "(\(self.dataMdoel!.dbt_info!.commission_status!))"
+            case 3:
+                if self.dataMdoel?.dbt_info?.commission_time != nil{
+                    if  (self.dataMdoel?.dbt_info?.commission_time!.count)! > 0{
+                        cell.textTF.text = self.dataMdoel?.dbt_info?.commission_time
+                        
+                    }else{
+                        cell.textTF.text = "-"
+                        
+                    }
+                }else{
+                    cell.textTF.text = "-"
                 }
                 
-            case 4://提现发放方式：
-                cell.textTF.text = "-"
-                if self.dataMdoel?.dbt_info!.commission_time_type != nil {
-                    cell.textTF.text = self.dataMdoel?.dbt_info!.commission_time_type
-                }
-                break
-            default://提成结算时间：
+            case 4:
+                cell.textTF.text = "￥" + (self.dataMdoel?.order_res!.sum_commission_val)!
+            default:
                 cell.textTF.text = "-"
-                if self.dataMdoel?.dbt_info?.commission_time != nil && (self.dataMdoel?.dbt_info?.commission_time!.count)! > 0 {
-                    cell.textTF.text = self.dataMdoel?.dbt_info!.commission_time
-                }
                 break
             }
             cell.nameLbl.text = fenxiaoTitleArr[indexPath.row]

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

@@ -10,30 +10,7 @@ import UIKit
 
 class RetailManageViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,RetailManageFooterViewDelagte, GeliAlertViewDelegate{
     
-    var order_status = 100 {
-        didSet{
-            switch order_status {
-            case 0:
-                order_status = 100
-                break
-            case 1:
-                order_status = 1
-                break
-            case 2:
-                order_status = 7
-                break
-            case 3:
-                order_status = 10
-                break
-            case 4:
-                order_status = 2
-                break
-            default:
-                break
-            }
-        }
-    }
-    var price_type = 1
+    var order_status = 0
     var page : Int = 0
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     var startTime :Int? = 0
@@ -61,12 +38,9 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     init(title: String, content: String) {
         super.init(nibName: nil, bundle: nil)
         self.title = title
-        if title.contains("分销"){
-            price_type = 0
+        if self.title == "代销订单" {
+            dbt_people = 2
         }
-//        if self.title == "代销订单" {
-//            dbt_people = 2
-//        }
     }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -85,53 +59,57 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     }
     //MARK:--loadData
     //MARK:--列表数据源
-    var dataArr:Array<supDbtOrderLis_Data_model> = []
+    var dataArr:Array<dbtOrderLisDataModel> = []
 //    var dataArr2:Array<dbtOrderLisDataModel> = []
     @objc func loadData(){
         isUpData = true
         //结算方式（0全部1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算)）
         page = 1
-        let dic = ["user_token":UserToken as Any,"keyword":keyword,"order_status":order_status as Any,"page":page,"dbt_type":dbt_type,"start_time":startTime as Any,"end_time":endTime as Any,"price_type":price_type as Any]
-        supDbtOrderLis(dic) { (data) in
-            let dataM = data as! supDbtOrderLis_model
-            
-                        self.dataArr.removeAll()
-                        dataM.data?.forEach({ (model) in
-                            self.dataArr.append(model)
-                        })
-                        self.listView.mj_header?.endRefreshing()
+        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
+        
+        dbtOrderLis(dic) { (data) in
+            let dataM = data as! dbtOrderLisModel
             
-                        self.listView.reloadData()
-                         if dataM.data?.count == 0 {
-                            self.listView.mj_footer?.endRefreshingWithNoMoreData()
-                        }else{
-                            self.listView.mj_footer?.endRefreshing()
-                        }
-                        self.page = 2
-        } failture: { (err) in
+            self.dataArr.removeAll()
+            dataM.data?.forEach({ (model) in
+                self.dataArr.append(model)
+            })
             self.listView.mj_header?.endRefreshing()
-        }
 
+            self.listView.reloadData()
+             if dataM.data?.count == 0 {
+                self.listView.mj_footer?.endRefreshingWithNoMoreData()
+            }else{
+                self.listView.mj_footer?.endRefreshing()
+            }
+            self.page = 2
+   
+        } failture: { (error) in
+            self.listView.mj_header?.endRefreshing()
+        }
     }
     @objc func loadMoreData(){
-        let dic = ["user_token":UserToken as Any,"keyword":keyword,"order_status":order_status as Any,"page":page,"dbt_type":dbt_type,"start_time":startTime as Any,"end_time":endTime as Any,"price_type":price_type as Any]
-        supDbtOrderLis(dic) { (data) in
-            let dataM = data as! supDbtOrderLis_model
-                        if dataM.data?.count == 0 {
-                            self.listView.mj_footer?.endRefreshingWithNoMoreData()
-                        }else{
-                            self.page += 1
-                            dataM.data?.forEach({ (model) in
-                                self.dataArr.append(model)
-                            })
-                            self.listView.reloadData()
-                            self.listView.mj_footer?.endRefreshing()
-                        }
-        } failture: { (err) in
+        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
+        dbtOrderLis(dic) { (data) in
+            let dataM = data as! dbtOrderLisModel
+            if dataM.data?.count == 0 {
+                self.listView.mj_footer?.endRefreshingWithNoMoreData()
+            }else{
+                self.page += 1
+                dataM.data?.forEach({ (model) in
+                    self.dataArr.append(model)
+                })
+                self.listView.reloadData()
+                self.listView.mj_footer?.endRefreshing()
+            }
+            
+            
+
+        } failture: { (error) in
             self.listView.mj_footer?.endRefreshing()
+
         }
     }
-    
     func numberOfSections(in tableView: UITableView) -> Int {
     
         return self.dataArr.count
@@ -204,7 +182,6 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
         }
         let model = self.dataArr[section]
         contentV.snNumLbl.text = model.order_sn
-        
         var dbt_typeStr = "人工结算"
         if model.dbt_type == 2 {
             dbt_typeStr = "自动结算"

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

@@ -623,44 +623,43 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         //        case 131: //分销管理
         //            HUD.flash(.label("敬请期待"),delay: 1.2)
         //            return
-        //        case 134: //分销商管理
-        ////            HUD.flash(.label("敬请期待"),delay: 1.2)
-        //            let vc = GYS_HZ_Vc()
-        //            vc.title_str = "分销商管理"
-        //            let vc = DZGL_VC()
-        //            self.navigationController?.pushViewController(vc, animated: true)
-        //            return
+                case 134: //分销商管理
+        //            HUD.flash(.label("敬请期待"),delay: 1.2)
+                    let vc = GYS_HZ_Vc()
+                    vc.title_str = "分销商管理"
+                    self.navigationController?.pushViewController(vc, animated: true)
+                    return
         //        case 133: //供应商管理
         ////            HUD.flash(.label("敬请期待"),delay: 1.2)
         //            let vc = GYS_HZ_Vc()
         //            vc.title_str = "供应商管理"
         //            self.navigationController?.pushViewController(vc, animated: true)
         //            return
-        //        case 139: //分销员管理
-        //            let vc = FXYGL_ViewController()
-        //            self.navigationController?.pushViewController(vc, animated: true)
-        ////            HUD.flash(.label("敬请期待"),delay: 1.2)
-        //            return
-        //        case 140://待审核分销员管理
-        //            let vc = DSHFXY_ViewController()
-        //            self.navigationController?.pushViewController(vc, animated: true)
-        ////            HUD.flash(.label("敬请期待"),delay: 1.2)
-        //            return
-        //        case 141://分销客户管理
-        //            let vc = KHXQ_ViewController()
-        //            self.navigationController?.pushViewController(vc, animated: true)
-        ////            HUD.flash(.label("敬请期待"),delay: 1.2)
-        //            return
-        //        case 142://分销收益管理
-        //            let vc = FXSY_ViewController()
-        //            self.navigationController?.pushViewController(vc, animated: true)
-        ////            HUD.flash(.label("敬请期待"),delay: 1.2)
-        //            return
-        //        case 136: //分销商品管理
+                case 139: //分销员管理
+                    let vc = FXYGL_ViewController()
+                    self.navigationController?.pushViewController(vc, animated: true)
         //            HUD.flash(.label("敬请期待"),delay: 1.2)
-        //            let vc = FX_Product_GuanLiVC()
-        //            self.navigationController?.pushViewController(vc, animated: true)
-        //            return
+                    return
+                case 140://待审核分销员管理
+                    let vc = DSHFXY_ViewController()
+                    self.navigationController?.pushViewController(vc, animated: true)
+        //            HUD.flash(.label("敬请期待"),delay: 1.2)
+                    return
+                case 141://分销客户管理
+                    let vc = KHXQ_ViewController()
+                    self.navigationController?.pushViewController(vc, animated: true)
+        //            HUD.flash(.label("敬请期待"),delay: 1.2)
+                    return
+                case 142://分销收益管理
+                    let vc = FXSY_ViewController()
+                    self.navigationController?.pushViewController(vc, animated: true)
+        //            HUD.flash(.label("敬请期待"),delay: 1.2)
+                    return
+                case 136: //分销商品管理
+                    HUD.flash(.label("敬请期待"),delay: 1.2)
+                    let vc = FX_Product_GuanLiVC()
+                    self.navigationController?.pushViewController(vc, animated: true)
+                    return
         //        case 137: //分销分账设置
         ////       只有当其为供应商才可以进入
         //            HUD.flash(.label("敬请期待"),delay: 1.2)
@@ -681,19 +680,19 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         //
         //            }
         //            return
-        //        case 132: //分销订单管理
-        //            let vc = RetailListMgVC()
-        //            self.navigationController?.pushViewController(vc, animated: true)
-        //            return
+                case 132: //分销订单管理
+                    let vc = RetailListMgVC()
+                    self.navigationController?.pushViewController(vc, animated: true)
+                    return
         //        case 135: //供应商分销商品管理
         //            HUD.flash(.label("敬请期待"),delay: 1.2)
         //            let vc = GYS_FX_Product_ListVc()
         //            self.navigationController?.pushViewController(vc, animated: true)
         //            return
-        //        case 146://店长申请审核
-        //            let vc = DZSH_Mg_ViewController()
-        //            self.navigationController?.pushViewController(vc, animated: true)
-        //            return
+                case 146://店长申请审核
+                    let vc = DZSH_Mg_ViewController()
+                    self.navigationController?.pushViewController(vc, animated: true)
+                    return
         case 148://下游代理商管理
             let vc = SY_DLS_GL_VC()
             vc.titleStr =  "下游代理商管理"
@@ -749,12 +748,13 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             return
         case 157://分销订单管理
             let vc = RetailListMgVC()
-            vc.titleStr = "分销订单管理"
+            vc.view.tag = 157
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 159://上游供应商管理
             let vc = SY_GYS_GL_VC()
             vc.titleStr =  "上游供应商管理"
+            vc.view.tag = 159
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 160://下游店长管理
@@ -769,7 +769,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             return
         case 162://代理订单管理
             let vc = RetailListMgVC()
-            vc.titleStr = "代理订单管理"
+            vc.view.tag = 162
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 164://上游供应商管理
@@ -780,6 +780,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         case 165://上游代理商管理
             let vc = SY_GYS_GL_VC()
             vc.titleStr = "上游代理商管理"
+            vc.view.tag = 165
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 166://上游供应商商品
@@ -794,9 +795,18 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             return
         case 168://店长订单管理
             let vc = RetailListMgVC()
-            vc.titleStr = "店长订单管理"
+            vc.view.tag = 168
             self.navigationController?.pushViewController(vc, animated: true)
             return
+        case 171://分销收益
+            HUD.flash(.label("敬请期待"),delay: 1.2)
+            return
+        case 179://分销收益
+            HUD.flash(.label("敬请期待"),delay: 1.2)
+            return
+        case 180://分销收益
+            HUD.flash(.label("敬请期待"),delay: 1.2)
+            return
         default:
             break;
         }