Commit 1bea2681 authored by lujunye's avatar lujunye

修改文案绝对值改为固定提成

parent 62d31008
......@@ -135,9 +135,9 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="puW-3j-GZy">
<rect key="frame" x="181" y="121" width="67" height="19"/>
<rect key="frame" x="181" y="121" width="80" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title=" 绝对值" image="daixuan">
<state key="normal" title=" 固定提成" image="daixuan">
<color key="titleColor" name="标题字颜色"/>
</state>
<connections>
......
......@@ -56,15 +56,12 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
listView.mj_footer = footerMJ
listView.mj_header?.beginRefreshing()
}
//MARK:--loadData
//MARK:--列表数据源
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,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
......@@ -88,12 +85,9 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
} failture: { (error) in
self.listView.mj_header?.endRefreshing()
}
}
@objc func loadMoreData(){
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
......@@ -141,7 +135,6 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
}else{
cell.dotImgV.isHidden = false
}
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
......@@ -155,13 +148,10 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr[indexPath.section]
vc.orderId = goodArrModel.order_id
// vc.orderId = 12746
self.navigationController?.pushViewController(vc, animated: true)
}
}
@objc func didselectCellHorF(sender:UITapGestureRecognizer){
if self.title == "代销订单" {
......
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