Skip to content

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

27

parent 65123257
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 57 deletions
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
View file @ 54c6a3f5
......@@ -106,7 +106,7 @@ class OrderDetailResModel: Mappable {
var invoice_img : String? //发票图片
var invoice_link : String? //发票链接
var sum_commission_val : String? //总提成
var dbt_target : Int? //分销对象：1供应商 2分销商 3分销员
var dbt_target : Int? //分销对象：1供应商 2分销商 3店长
var target_name : String? //分销商名称
var order_associated_code : String?//关联凭证
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.swift
View file @ 54c6a3f5
......@@ -14,6 +14,7 @@ protocol DaiKeXiaDanGouWuCellDelegate {
func DaiKeXiaDanGouWuCell_select_pi_ci(cell:DaiKeXiaDanGouWuCell)
}
class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate {
@IBOutlet weak var bz_lbl2: UILabel!
@IBOutlet weak var bottom_margin: NSLayoutConstraint!
@IBOutlet weak var dj_wk_view: UIView!
@IBOutlet weak var dj_wk_top: NSLayoutConstraint!
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.xib
View file @ 54c6a3f5
<?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"/>
......@@ -155,6 +157,7 @@
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DvI-Hk-ZNE">
<rect key="frame" x="244" y="86" width="78" height="31"/>
<constraints>
<constraint firstAttribute="width" constant="78" id="oX5-xg-JNp"/>
<constraint firstAttribute="height" constant="31" id="tH7-Qz-qRx"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
......@@ -205,6 +208,12 @@
<constraint firstItem="hpw-Ue-F2i" firstAttribute="leading" secondItem="eKk-wu-XQi" secondAttribute="leading" id="xUx-Dd-oSy"/>
</constraints>
</view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vc0-Ft-Q17">
<rect key="frame" x="10" y="93.5" width="219" height="16"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
......@@ -214,9 +223,12 @@
<constraint firstAttribute="trailing" secondItem="CW3-oD-5Hm" secondAttribute="trailing" constant="10" id="6vz-aS-Foq"/>
<constraint firstItem="CW3-oD-5Hm" firstAttribute="leading" secondItem="Dmd-Un-AkZ" secondAttribute="trailing" constant="10" id="7n2-Vb-3XY"/>
<constraint firstAttribute="trailing" secondItem="JyG-Tf-6Jd" secondAttribute="trailing" constant="10" id="9AX-WF-nFt"/>
<constraint firstItem="DvI-Hk-ZNE" firstAttribute="leading" secondItem="vc0-Ft-Q17" secondAttribute="trailing" constant="15" id="DG0-wY-CAR"/>
<constraint firstItem="X1B-vl-mvy" firstAttribute="top" secondItem="3f3-RV-d16" secondAttribute="bottom" constant="10" id="G0k-U9-DVo"/>
<constraint firstItem="vc0-Ft-Q17" firstAttribute="leading" secondItem="3f3-RV-d16" secondAttribute="leading" id="ITO-KS-7Yf"/>
<constraint firstItem="LBB-wB-bMd" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="L6M-kd-Qvr"/>
<constraint firstItem="Rio-TZ-iyo" firstAttribute="centerY" secondItem="3f3-RV-d16" secondAttribute="centerY" id="MHT-Tf-HPF"/>
<constraint firstItem="vc0-Ft-Q17" firstAttribute="centerY" secondItem="DvI-Hk-ZNE" secondAttribute="centerY" id="NPe-9X-G0H"/>
<constraint firstItem="3f3-RV-d16" firstAttribute="top" secondItem="LBB-wB-bMd" secondAttribute="bottom" constant="10" id="RhT-R5-aDU"/>
<constraint firstItem="2p2-7L-Hi7" firstAttribute="leading" secondItem="DvI-Hk-ZNE" secondAttribute="trailing" constant="5" id="T3l-7I-23e"/>
<constraint firstItem="WVL-NG-HsK" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" id="VEI-Ck-HWY"/>
......@@ -323,6 +335,7 @@
<outlet property="btmLIneWidth" destination="qMJ-nI-cSg" id="dsM-yO-8bv"/>
<outlet property="btm_line" destination="oAm-E1-HwQ" id="vp2-Uf-gI6"/>
<outlet property="bz_lbl" destination="ykh-Oc-5e6" id="1JL-Gh-kqG"/>
<outlet property="bz_lbl2" destination="vc0-Ft-Q17" id="q72-Y6-a8G"/>
<outlet property="changeBtn" destination="4lb-rz-I6F" id="OEf-1Q-OVb"/>
<outlet property="check_button" destination="DvI-Hk-ZNE" id="egI-io-mdA"/>
<outlet property="content_tv" destination="CW3-oD-5Hm" id="FqB-Cg-d4n"/>
......
GeliBusinessPlatform/ViewController/供应商分销商品管理/ageSetDbtGoods_View.swift
View file @ 54c6a3f5
......@@ -82,12 +82,12 @@ class ageSetDbtGoods_View: UIView {
let input_p = Float(text.text!)
if input_p! > high_p {
HUD.flash(.label("输入价格高于最大加价范围\(model!.ceiling_price!)元"), delay: 1.2)
text.text = ""
text.text = "\(high_p)"
return
}
if input_p! < low_p {
HUD.flash(.label("输入价格低于最小加价范围\(model!.floor_price!)元"), delay: 1.2)
text.text = ""
text.text = "\(low_p)"
return
}
comission_lbl.text = String(format: "(提成%.2f元)",input_p! - supply_p!)
......
GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift
View file @ 54c6a3f5
......@@ -11,6 +11,8 @@ import UIKit
class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDataSource, UISearchBarDelegate, SearchBarViewDelegate,SelectContentViewDelegate,HeaderSelectViewDelegate, New_Fx_Cell_Delegate, FXSZ_View_Delegate, XY_FX_Setting_View_Delegate{
var vcType = 0
var isFisrtTime = true
func XY_FX_Setting_View_action(view: XY_FX_Setting_View) {
var price_type = 0
if view.ghj_btn.isSelected == true {
......@@ -72,7 +74,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
} failture: { (err) in}
return
}
print("tag == ",tag)
let model = datas[tag]
let dic = ["user_token":UserToken as Any,
"operation_type":1 as Any,
......@@ -236,7 +238,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
}
break
}
}
@IBOutlet weak var all_select_btn: UIButton!
......@@ -311,6 +313,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
}
showSelectView.selectIndx = selectIndexArr[0]
}
break
case 1:
......@@ -443,7 +446,11 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
func initHeaderSelectView() {
let selectView = HeaderSelectView()
selectView.firstBtn.setTitle("全部商品", for: .normal)
if titleStr.contains("代理"){
selectView.firstBtn.setTitle("分销商品", for: .normal)
}else{
selectView.firstBtn.setTitle("参与分销商品", for: .normal)
}
selectView.secBtn.setTitle("上架", for: .normal)
selectView.thereBtn.removeFromSuperview()
selectView.firstBtn.snp_makeConstraints { (make) in
......@@ -467,8 +474,10 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
SetTopFrame(view: search_view, height: 44)
navbar.title = titleStr
self.view.addSubview(navbar)
if titleStr.contains("代理") == false {
navbar.rightTitle = "编辑商品"
}
let searchBr = SearchBarView.init()
......@@ -502,10 +511,10 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
//MARK: - tableview_delegate
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
switch vcType {
case 136:
return datas.count
default:
return dbt_datas.count
case 136:
return datas.count
default:
return dbt_datas.count
}
}
......@@ -581,7 +590,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
if model.price_type == 0 {
cell.price.text = "分销价: ¥\(model.dbt_price!) (固定提成: \(model.commission_val!))"
}else{
cell.price.text = "供货价: ¥\(model.supply_price!) (加价范围: \(model.floor_price!)-\(model.ceiling_price!)"
cell.price.text = "供货价: ¥\(model.supply_price!) (加价范围: \(model.floor_price!)-\(model.ceiling_price!))"
}
}
}
......@@ -616,6 +625,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
//MARK:--加载数据
@objc func loadData(){
print("加载数据")
page = 1
isUpData = true
if selectIndexArr.last == 1 {
......@@ -626,8 +636,14 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
if titleStr.contains("代理"){
dbt_goods_type = selectIndexArr.first!
if dbt_goods_type == 0 {
dbt_goods_type = 100
if isFisrtTime == true {
selectIndexArr = [1,0]
dbt_goods_type = 1
}else{
if dbt_goods_type == 0 {
dbt_goods_type = 100
}
}
let dict = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"dbt_goods_type":dbt_goods_type as Any,"is_show":is_show as Any]
queryAgentGoods(dict){ (data) in
......@@ -664,8 +680,14 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
return
}
goods_type = selectIndexArr.first! + 1
if isFisrtTime == true {
isFisrtTime = false
selectIndexArr = [2,0]
goods_type = 3
}else{
goods_type = selectIndexArr.first! + 1
}
let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"goods_type":goods_type as Any,"is_show":is_show as Any]
......
GeliBusinessPlatform/ViewController/分销收益页/FXSY_ViewController.swift
View file @ 54c6a3f5
......@@ -365,7 +365,7 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
if self.isFirstTime {
self.isFirstTime = false
let count = (self.model?.is_agent)! + (self.model?.is_dbt)! + (self.model?.is_sup)!
if count != 0 {
if count > 1 {
self.top_view.isHidden = false
self.bottom_line.isHidden = false
SetTopFrame(view: self.top_view, height: 44)
......@@ -381,7 +381,6 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
}
if top_view.subviews.count == 0 && titleArr.count > 1 {
setBtns(titles: titleArr)
}
}else{
self.top_view.isHidden = true
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift
View file @ 54c6a3f5
......@@ -56,7 +56,7 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
let goodsTitleArr = ["商品合计"]
let fenxiaoTitleArr = ["分销角色","结算方式","提成方式","提成结算时间","提成分销结算"]
let fenxiaoTitleArr = ["分销角色","所属代理商","分销结算方式","系统结算方式","提现发款方式","提成结算时间"]
let orderTitleArr = ["订单编号","下单时间","订单来源","支付方式","支付状态","买家留言","订单备注"]
@IBOutlet weak var listView: UITableView!
......@@ -147,15 +147,14 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
cell.titleLbl.text = rowModel?.goods_name
cell.imgView?.sd_setImage(with: URL(string: SERVERCE_ImageHost + (rowModel?.goods_thumb)!), placeholderImage: nil,options:.allowInvalidSSLCertificates)
if rowModel?.goods_attr != nil {
cell.detailLbl.text = "规格:" + (rowModel?.goods_attr)!
cell.detailLbl.text = "规格:" + (rowModel?.goods_attr)!
}else{
cell.detailLbl.text = "规格:-"
}
let s_p = rowModel?.goods_price as! NSString
let p_count = Float((rowModel?.cart_number)!) * s_p.floatValue
cell.bz_lbl2.isHidden = false
cell.count_lbl.text = "单价:" + (rowModel?.goods_price)!
cell.yong_jin_lbl.text = "小计:" + String(format: "%.2f", p_count)
cell.dan_jia_lbl.text = "提成:-"
......@@ -165,7 +164,10 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
cell.xiao_ji_lbl.text = "数量:" + StringByInt(number: (rowModel?.cart_number!)!)
cell.delegate = self
cell.tag = indexPath.row
cell.bz_lbl2.text = "备注:无"
if rowModel?.remark != nil {
cell.bz_lbl2.text = "备注:" + (rowModel?.remark!)!
}
cell.arrow_img.isHidden = true
cell.check_button.isHidden = true
if (rowModel?.goods_source!.count)! > 0 {
......@@ -179,59 +181,56 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
cell.textTF.text = "￥" + (self.dataMdoel?.order_res!.goods_amount)!
case 3:
cell.nameLbl.text = fenxiaoTitleArr[indexPath.row]
// ["分销角色","所属代理商","分销结算方式","系统结算方式","提现发款方式","提成结算时间"]
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 {
cell.textTF.text = "分销商" + "(" + (self.dataMdoel?.order_res?.target_name)! + ")"
}else if self.dataMdoel?.order_res?.dbt_target == 3{
cell.textTF.text = "分销员" + "(" + (self.dataMdoel?.order_res?.target_name)! + ")"
cell.textTF.text = "店长" + "(" + (self.dataMdoel?.order_res?.target_name)! + ")"
}else{
cell.textTF.text = "-"
}
case 1:
break
case 1://所属代理商
cell.textTF.text = "-"
if self.dataMdoel?.dbt_info?.agent_name != nil {
cell.textTF.text = self.dataMdoel?.dbt_info?.agent_name!
}
break
case 2://分销结算方式
cell.textTF.text = "-"
if self.dataMdoel?.dbt_info?.share_type != nil {
cell.textTF.text = self.dataMdoel?.dbt_info?.share_type!
}
break
case 3://系统结算方式
if self.dataMdoel?.dbt_info?.commission_status != nil {
cell.textTF.text = "自动结算(\(self.dataMdoel!.dbt_info!.commission_status!))"
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 = "-"
cell.textTF.text = "人工结算(\(self.dataMdoel!.dbt_info!.commission_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 = "-"
}
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 = "-"
break
case 4://提现发款方式
cell.textTF.text = "-"
if self.dataMdoel?.dbt_info?.commission_time_type != nil {
cell.textTF.text = self.dataMdoel?.dbt_info?.commission_time_type!
}
case 4:
cell.textTF.text = "￥" + (self.dataMdoel?.order_res!.sum_commission_val)!
default:
break
default://提成结算时间
cell.textTF.text = "-"
if self.dataMdoel?.dbt_info?.commission_time != nil {
cell.textTF.text = self.dataMdoel?.dbt_info?.commission_time!
}
break
}
cell.nameLbl.text = fenxiaoTitleArr[indexPath.row]
case 4:
cell.nameLbl.text = orderTitleArr[indexPath.row]
......
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