Skip to content

G
GeliBusinessPlatform
Commit a997896c authored by lujunye's avatar lujunye
Browse files
Options

去掉删除客户功能

parent 6af63694
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 31 deletions
GeliBusinessPlatform/Model/dbtIncomeInfoInterface.swift
View file @ a997896c
......@@ -52,6 +52,7 @@ func incomeDetails(_ params:[String:Any],success:@escaping (_ res:Any)->(),failt
start_time 开始时间
end_time 结束时间
from 来源：0:PC后台,1:小程序,2:PC官网,3:商户端app,不传为全部
page 分页
*/
func examineDbtInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("待审核分销员界面信息查询", params, { (rep:DataResponse<examineDbtInfoModel>) in
......
GeliBusinessPlatform/Model/dbtIncomeInfo_model/dbtIncomeInfoModel.swift
View file @ a997896c
......@@ -75,14 +75,15 @@ class incomeDetailsModel: Mappable {
class incomeDetailsDataModel: Mappable {
var in_amount:String?//收益金额
var remark : String?//出入账类型
var collection_account :String?//转账账户
var collection_account :String?//转账账户
var collection_name:String?//转账店铺名称
var collection_time : Double?//转账时间
var supplier_account :String? //收款账户
var collection_time : String?//转账时间
var supplier_account :String? //收款账户
var supplier_name:String? //收款店铺名称
var supplier_time : Double?//到账时间
var supplier_time : String?//到账时间
var order_sn :String? //订单编号
var add_time:String?//退款时间（先用这个）
......
GeliBusinessPlatform/ViewController/分销收益页/FXSY_Detail_ViewController.swift
View file @ a997896c
......@@ -24,10 +24,10 @@ class FXSY_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.contentLbl.text = model?.data?.order_sn
break
case 1:
cell.contentLbl.text = model?.data!.collection_account
cell.contentLbl.text = model?.data!.collection_name
break
default:
cell.contentLbl.text = TimeByDouble(sender: (model?.data?.supplier_time)!)
cell.contentLbl.text = (model?.data?.supplier_time)!
break
}
break
......@@ -37,7 +37,7 @@ class FXSY_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.contentLbl.text = model?.data?.order_sn
break
case 1:
cell.contentLbl.text = TimeByDouble(sender: (model?.data?.supplier_time)!)
cell.contentLbl.text = model?.data?.supplier_time
break
default:
cell.contentLbl.text = model?.data?.refund_cycle
......@@ -54,7 +54,7 @@ class FXSY_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.contentLbl.text = model?.data!.collection_name
break
case 2:
cell.contentLbl.text = TimeByDouble(sender: (model?.data?.collection_time)!)
cell.contentLbl.text = (model?.data?.collection_time)!
break
case 3:
cell.contentLbl.text = model?.data!.supplier_account
......@@ -63,7 +63,7 @@ class FXSY_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.contentLbl.text = model?.data?.supplier_name
break
default:
cell.contentLbl.text = TimeByDouble(sender: (model?.data?.supplier_time)!)
cell.contentLbl.text = (model?.data?.supplier_time)!
break
}
break
......@@ -104,7 +104,7 @@ class FXSY_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
self.titles = ["订单编号","到账时间","退款周期"]
break
default:
self.titles = ["转账账户","转账店铺名称","转账时间","收款账户","收款店铺名称","到账时间"]
self.titles = ["转账账户","转账账户名称","转账时间","收款账户","收款账户名称","到账时间"]
break
}
self.list_view.reloadData()
......
GeliBusinessPlatform/ViewController/分销收益页/FXSY_ViewController.swift
View file @ a997896c
......@@ -251,10 +251,10 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
var isFirstTime = true
var isNonFirst = false
// var isNonFirst = false
@objc func loadData(){
var dic:Dictionary<String,Any>!
if isNonFirst {
// if isNonFirst {
var year = "0"
var month = "0"
var day = "0"
......@@ -280,17 +280,17 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
"day":day as Any
]
}else{
isNonFirst = true
dic = ["user_token":UserToken as Any,
"role_type":"" as Any,
"inc_exp_type":inc_exp_type as Any,
"keyword":keyword as Any,
"year":"" as Any,
"month":"" as Any,
"day":"" as Any
]
}
// }else{
// isNonFirst = true
// dic = ["user_token":UserToken as Any,
// "role_type":"" as Any,
// "inc_exp_type":inc_exp_type as Any,
// "keyword":keyword as Any,
// "year":"" as Any,
// "month":"" as Any,
// "day":"" as Any
// ]
// }
dbtIncomeInfo(dic) { (data) in
let dateModel = data as! dbtIncomeInfoModel
self.model = dateModel.data
......
GeliBusinessPlatform/ViewController/客户详情/KHXQ_Cell.xib
View file @ a997896c
......@@ -31,26 +31,26 @@
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8M9-sC-ZZh">
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8M9-sC-ZZh">
<rect key="frame" x="233" y="3" width="52" height="43"/>
<constraints>
<constraint firstAttribute="height" constant="43" id="0oO-Vt-xXu"/>
<constraint firstAttribute="width" constant="52" id="XwD-O2-oe8"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title="终止合作">
<state key="normal" title="删除">
<color key="titleColor" name="#F57575"/>
</state>
<connections>
<action selector="cancel_contract_action:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="JcS-8T-cRI"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HPH-5c-brH">
<rect key="frame" x="233" y="32.5" width="52" height="1"/>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HPH-5c-brH">
<rect key="frame" x="246" y="32.5" width="26" height="1"/>
<color key="backgroundColor" name="#F57575"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="o7j-rB-Ofw"/>
<constraint firstAttribute="width" constant="52" id="tff-gc-etY"/>
<constraint firstAttribute="width" constant="26" id="tff-gc-etY"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ly9-9O-pxg">
......
GeliBusinessPlatform/ViewController/待审核分销员/DSHFXY_ViewController.swift
View file @ a997896c
......@@ -207,20 +207,23 @@ class DSHFXY_ViewController: BaseViewController, HeaderSelectViewDelegate, TimeS
make.left.right.bottom.equalTo(0)
}
tableView.mj_header?.beginRefreshing()
self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
tableView.mj_footer = self.footerMJ
}
var dataArr :Array<examineDbtInfoDataModel> = []
var page = 0
@objc func loadData(){
dataArr.removeAll()
page = 1
let dic = [
"user_token":UserToken as Any,
"keyword":keyword as Any,
"start_time":startTime as Any,
"end_time":endTime as Any,
"from":from as Any
"from":from as Any,
"page":page as Any
]
examineDbtInfo(dic) { (data) in
let model = data as! examineDbtInfoModel
......@@ -228,11 +231,48 @@ class DSHFXY_ViewController: BaseViewController, HeaderSelectViewDelegate, TimeS
self.dataArr.append(item)
})
self.tableView.reloadData()
self.page = 2
self.tableView.mj_header?.endRefreshing()
if model.data?.count == 0 {
self.tableView.mj_footer?.endRefreshingWithNoMoreData()
}else{
self.tableView.mj_footer?.endRefreshing()
}
} failture: { (err) in
self.tableView.mj_header?.endRefreshing()
}
}
//MARK:--加载更多数据
@objc func loadMoreData(){
print("加载更多数据")
let dic = [
"user_token":UserToken as Any,
"keyword":keyword as Any,
"start_time":startTime as Any,
"end_time":endTime as Any,
"from":from as Any,
"page":page as Any
]
examineDbtInfo(dic) { (data) in
let model = data as! examineDbtInfoModel
if model.data?.count == 0 {
self.tableView.mj_footer?.endRefreshingWithNoMoreData()
}else{
self.page += 1
model.data?.forEach({ (item) in
self.dataArr.append(item)
})
self.tableView.reloadData()
self.tableView.mj_footer?.endRefreshing()
}
} failture: { (err) in
self.tableView.mj_footer?.endRefreshing()
}
}
//MARK:--HeaderSelectView
let changeBgView = UIView()
weak var selectV: HeaderSelectView! = nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment