分销页完成

GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,4 +3,27 @@
    uuid = "4EFF3422-0342-402A-BFF0-17B15851B3EC"
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            uuid = "C83E3376-0312-4D15-99E3-5CBF74F24A36"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            breakpointStackSelectionBehavior = "1"
+            scope = "1"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
+         <BreakpointContent
+            uuid = "7F243655-7F7D-4E57-927F-4125D0651B3C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -300,5 +300,9 @@
 	<string>Distribution/supGoodsList</string>
 	<key>分销商品管理</key>
 	<string>Distribution/supSetCommodity</string>
+	<key>分销收益界面查询</key>
+	<string>Distribution/dbtIncomeInfo</string>
+	<key>收益详情界面信息</key>
+	<string>Distribution/incomeDetails</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/dbtIncomeInfoInterface.swift

+//
+//  dbtIncomeInfoInterface.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/12/29.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import Alamofire
+import SwiftyJSON
+import ObjectMapper
+//MARK:--分销收益界面查询
+/*
+ user_token 用户token
+ role_type 身份类型：1为供应商2为分销商
+ inc_exp_type 收支类型0为全部、1为支出、2为收入(默认为0)
+ keyword 模糊查询（订单编号）
+ year 年
+ month 月
+ day 日
+ */
+func dbtIncomeInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("分销收益界面查询", params, { (rep:DataResponse<dbtIncomeInfoModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+
+//MARK:--收益详情界面信息
+/*
+ user_token 用户token
+ record_sn   流水号
+ 
+ */
+func incomeDetails(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("收益详情界面信息", params, { (rep:DataResponse<incomeDetailsModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/dbtIncomeInfo_model/dbtIncomeInfoModel.swift

+//
+//  dbtIncomeInfoModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/12/29.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//MARK: - 分销收益详情
+class dbtIncomeInfoModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data :dbtIncomeInfoDataModel?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class dbtIncomeInfoDataModel: Mappable {
+    var is_sup:Int?///是否是供应商（1是0否）
+    var is_dbt : Int? ///是否是分销商（1是0否）
+    var inc :Float?///收入
+    var exp:Float?///支出
+    var res : Array<dbtIncomeInfoDatasModel>?
+    required init?( map: Map) {
+    }
+    func mapping(map: Map) {
+        is_sup <- map["is_sup"]
+        is_dbt <- map["is_dbt"]
+        inc <- map["inc"]
+        exp <- map["exp"]
+        res <- map["res"]
+    }
+}
+class dbtIncomeInfoDatasModel: Mappable {
+    var add_time:String?///时间
+    var record_sn : String? ///流水号
+    var remark :String?///分账类型
+    
+    var order_sn:String?///订单编号
+    var in_amount :String?///收益金额
+    required init?( map: Map) {
+    }
+    func mapping(map: Map) {
+        add_time <- map["add_time"]
+        record_sn <- map["record_sn"]
+        remark <- map["remark"]
+        order_sn <- map["order_sn"]
+        in_amount <- map["in_amount"]
+    }
+}
+
+class incomeDetailsModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data :incomeDetailsDataModel?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class incomeDetailsDataModel: Mappable {
+    var in_amount:String?//收益金额
+    var remark : String?//出入账类型
+    var collection_account :String?//转账账户
+    
+    var collection_name:String?//转账店铺名称
+    var collection_time : Int?//转账时间
+    var supplier_account :String? //收款账户
+    
+    var supplier_name:String? //收款店铺名称
+    var supplier_time : Int?//到账时间
+    var order_sn :String? //订单编号
+    
+    var add_time:String?//退款时间（先用这个）
+    var refund_cycle : String?//退款周期(写死)
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        in_amount <- map["in_amount"]
+        remark <- map["remark"]
+        collection_account <- map["collection_account"]
+        
+        collection_name <- map["collection_name"]
+        collection_time <- map["collection_time"]
+        supplier_account <- map["supplier_account"]
+        
+        supplier_name <- map["supplier_name"]
+        supplier_time <- map["supplier_time"]
+        order_sn <- map["order_sn"]
+        
+        add_time <- map["add_time"]
+        refund_cycle <- map["refund_cycle"]
+    }
+}

GeliBusinessPlatform/View/AlertView/GLMessageAlertView.swift

@@ -27,7 +27,7 @@ class GLMessageAlertView: UIView,UITableViewDelegate,UITableViewDataSource {
         return cell
     }
     
-    var contentView:UIView!
+    
     
     @IBOutlet weak var topLbl: UILabel!
     @IBOutlet weak var tbvH: NSLayoutConstraint!
@@ -57,7 +57,7 @@ class GLMessageAlertView: UIView,UITableViewDelegate,UITableViewDataSource {
         }
     }
     
-    
+    var contentView:UIView!
     //初始化时将xib中的view添加进来
     override init(frame: CGRect) {
         super.init(frame: frame)

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

@@ -43,7 +43,6 @@ class GYS_FX_SearchViewController: BaseViewController,UITableViewDelegate,UITabl
         if keyword.count > 0 {
             self.home_list_tbv.mj_header?.beginRefreshing()
         }
-        
     }
     //MARK:--取消搜索代理
     func clearSearchAction() {

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

+//
+//  FXSY_Cell.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/12/29.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+
+class FXSY_Cell: UITableViewCell {
+
+    @IBOutlet weak var order_id_lbl2: UILabel!
+    @IBOutlet weak var time_lbl: UILabel!
+    @IBOutlet weak var order_id_lbl: UILabel!
+    @IBOutlet weak var price_lbl: UILabel!
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.selectionStyle = .none
+        
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<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="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="FXSY_Cell" customModule="TestClass" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="84"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="84"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dYv-Zp-euR">
+                        <rect key="frame" x="15" y="83" width="305" height="1"/>
+                        <color key="backgroundColor" name="灰色分界线"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="ZKO-ar-JqT"/>
+                        </constraints>
+                    </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U3t-Za-6cK">
+                        <rect key="frame" x="15" y="10" width="8" height="18.5"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" 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="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b1H-lz-RdM">
+                        <rect key="frame" x="15" y="33.5" width="0.0" height="0.0"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" 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="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2UX-LB-mec">
+                        <rect key="frame" x="305" y="33.5" width="0.0" height="0.0"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" 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="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wuq-Qz-gAj">
+                        <rect key="frame" x="15" y="38.5" width="0.0" height="0.0"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                        <color key="textColor" name="标题字颜色"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="2UX-LB-mec" firstAttribute="centerY" secondItem="b1H-lz-RdM" secondAttribute="centerY" id="0bK-mz-0ig"/>
+                    <constraint firstItem="dYv-Zp-euR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="0wv-nq-HIl"/>
+                    <constraint firstItem="wuq-Qz-gAj" firstAttribute="leading" secondItem="b1H-lz-RdM" secondAttribute="leading" id="4Oe-sZ-pRd"/>
+                    <constraint firstAttribute="trailing" secondItem="dYv-Zp-euR" secondAttribute="trailing" id="5qC-9a-KH9"/>
+                    <constraint firstItem="b1H-lz-RdM" firstAttribute="leading" secondItem="U3t-Za-6cK" secondAttribute="leading" id="BMK-Ff-YRD"/>
+                    <constraint firstItem="wuq-Qz-gAj" firstAttribute="top" secondItem="b1H-lz-RdM" secondAttribute="bottom" constant="5" id="Dkn-Jh-Jmt"/>
+                    <constraint firstItem="U3t-Za-6cK" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="FVo-YQ-ckR"/>
+                    <constraint firstAttribute="bottom" secondItem="dYv-Zp-euR" secondAttribute="bottom" id="TZJ-Tc-FZd"/>
+                    <constraint firstItem="U3t-Za-6cK" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="WVW-9J-eAb"/>
+                    <constraint firstAttribute="trailing" secondItem="2UX-LB-mec" secondAttribute="trailing" constant="15" id="Wgd-9J-TbA"/>
+                    <constraint firstItem="b1H-lz-RdM" firstAttribute="top" secondItem="U3t-Za-6cK" secondAttribute="bottom" constant="5" id="t46-JY-Qmz"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="order_id_lbl" destination="U3t-Za-6cK" id="m76-86-e0d"/>
+                <outlet property="order_id_lbl2" destination="wuq-Qz-gAj" id="Br8-9Z-on5"/>
+                <outlet property="price_lbl" destination="2UX-LB-mec" id="li6-X0-YED"/>
+                <outlet property="time_lbl" destination="b1H-lz-RdM" id="DP7-LG-V2R"/>
+            </connections>
+            <point key="canvasLocation" x="142" y="103"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <namedColor name="多选按钮字体颜色">
+            <color red="0.41176470588235292" green="0.41176470588235292" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="标题字颜色">
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="灰色分界线">
+            <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
+</document>

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

@@ -634,6 +634,17 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         case 139: //分销员管理
             HUD.flash(.label("敬请期待"),delay: 1.2)
             return
+        case 140://待审核分销员管理
+            HUD.flash(.label("敬请期待"),delay: 1.2)
+            return
+        case 141://分销客户管理
+            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()

GeliBusinessPlatform/ViewController/采购单列表/CGDListViewController.swift

@@ -38,6 +38,8 @@ class CGDListViewController: BaseViewController  ,UISearchBarDelegate, SearchBar
     var searchV : SearchBarView? = nil
     func rightBtnClick() {
         
+        
+        
         removeBlackBtnView()
 
         let vc = XinCaiGouViewController()