Skip to content

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

改佣金为提成，加新界面

parent 301b95c9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 346 additions and 63 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 3d4bbb4f
......@@ -432,6 +432,12 @@
E0E5605425C1672E0004BA56 /* Print_Gprinter_View.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0E5605325C1672E0004BA56 /* Print_Gprinter_View.xib */; };
E0E5605A25C169E30004BA56 /* GPrinter_Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E5605825C169E30004BA56 /* GPrinter_Cell.swift */; };
E0E5605B25C169E30004BA56 /* GPrinter_Cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0E5605925C169E30004BA56 /* GPrinter_Cell.xib */; };
E0E6A59825FC66C600C9BCD6 /* DZSHCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E6A59625FC66C600C9BCD6 /* DZSHCell.swift */; };
E0E6A59925FC66C600C9BCD6 /* DZSHCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0E6A59725FC66C600C9BCD6 /* DZSHCell.xib */; };
E0E6A5A225FC6B0A00C9BCD6 /* DZSHViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E6A5A025FC6B0A00C9BCD6 /* DZSHViewController.swift */; };
E0E6A5A325FC6B0A00C9BCD6 /* DZSHViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0E6A5A125FC6B0A00C9BCD6 /* DZSHViewController.xib */; };
E0E6A5A925FC6EE700C9BCD6 /* DZSH_Mg_ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E6A5A725FC6EE700C9BCD6 /* DZSH_Mg_ViewController.swift */; };
E0E6A5AA25FC6EE700C9BCD6 /* DZSH_Mg_ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0E6A5A825FC6EE700C9BCD6 /* DZSH_Mg_ViewController.xib */; };
E0E7CB6124C17B9F00A26D3F /* GLKHCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E7CB5F24C17B9F00A26D3F /* GLKHCell.swift */; };
E0E7CB6224C17B9F00A26D3F /* GLKHCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0E7CB6024C17B9F00A26D3F /* GLKHCell.xib */; };
E0E8ABFD246E359700E3BB54 /* GuiGeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */; };
......@@ -1197,6 +1203,12 @@
E0E5605325C1672E0004BA56 /* Print_Gprinter_View.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Print_Gprinter_View.xib; sourceTree = "<group>"; };
E0E5605825C169E30004BA56 /* GPrinter_Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GPrinter_Cell.swift; sourceTree = "<group>"; };
E0E5605925C169E30004BA56 /* GPrinter_Cell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GPrinter_Cell.xib; sourceTree = "<group>"; };
E0E6A59625FC66C600C9BCD6 /* DZSHCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DZSHCell.swift; sourceTree = "<group>"; };
E0E6A59725FC66C600C9BCD6 /* DZSHCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DZSHCell.xib; sourceTree = "<group>"; };
E0E6A5A025FC6B0A00C9BCD6 /* DZSHViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DZSHViewController.swift; sourceTree = "<group>"; };
E0E6A5A125FC6B0A00C9BCD6 /* DZSHViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DZSHViewController.xib; sourceTree = "<group>"; };
E0E6A5A725FC6EE700C9BCD6 /* DZSH_Mg_ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DZSH_Mg_ViewController.swift; sourceTree = "<group>"; };
E0E6A5A825FC6EE700C9BCD6 /* DZSH_Mg_ViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DZSH_Mg_ViewController.xib; sourceTree = "<group>"; };
E0E7CB5F24C17B9F00A26D3F /* GLKHCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLKHCell.swift; sourceTree = "<group>"; };
E0E7CB6024C17B9F00A26D3F /* GLKHCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GLKHCell.xib; sourceTree = "<group>"; };
E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuiGeModel.swift; sourceTree = "<group>"; };
......@@ -2272,6 +2284,7 @@
E09B03AD2445B0BA00211A51 /* ViewController */ = {
isa = PBXGroup;
children = (
E0E6A59525FC66A800C9BCD6 /* 店长审核 */,
E0F83BA625F7082E00D31672 /* 批次库新Cell */,
E02A3CAC25C3ECCD00A4E369 /* 商品库存 */,
E06FBA9025BFE3B100E9C2BA /* 溯源 */,
......@@ -2829,6 +2842,19 @@
path = Logistics;
sourceTree = "<group>";
};
E0E6A59525FC66A800C9BCD6 /* 店长审核 */ = {
isa = PBXGroup;
children = (
E0E6A59625FC66C600C9BCD6 /* DZSHCell.swift */,
E0E6A59725FC66C600C9BCD6 /* DZSHCell.xib */,
E0E6A5A025FC6B0A00C9BCD6 /* DZSHViewController.swift */,
E0E6A5A125FC6B0A00C9BCD6 /* DZSHViewController.xib */,
E0E6A5A725FC6EE700C9BCD6 /* DZSH_Mg_ViewController.swift */,
E0E6A5A825FC6EE700C9BCD6 /* DZSH_Mg_ViewController.xib */,
);
path = "店长审核";
sourceTree = "<group>";
};
E0EFB9C324930BEE005FB0CD /* 采购单列表 */ = {
isa = PBXGroup;
children = (
......@@ -3789,6 +3815,7 @@
E03549AE24582828008BD021 /* KeHuGuanLiCell.xib in Resources */,
F950FDB12451811A00C40530 /* TitleAndSelCalendarView.xib in Resources */,
E0B946282456775000FBEC9A /* DaiKeXiaDanGouWuCell.xib in Resources */,
E0E6A5AA25FC6EE700C9BCD6 /* DZSH_Mg_ViewController.xib in Resources */,
E0B6036F244D376900A56B38 /* KuWeiCell.xib in Resources */,
E0273DDA24551B6D00B3FCAE /* SendTimeSelectView.xib in Resources */,
F9011C0E24CE6A4C00AAF4F5 /* LogisticalSelectView.xib in Resources */,
......@@ -3841,6 +3868,7 @@
E0A2E81F24552F0A00D6DB34 /* TilteAndTextViewCell.xib in Resources */,
E0F97B0D24516B1F001BD600 /* AddImgCell.xib in Resources */,
E09B3AD224B2FCAF00E3B238 /* ShareSDKUI.bundle in Resources */,
E0E6A59925FC66C600C9BCD6 /* DZSHCell.xib in Resources */,
E0D197D6244860B1002B080C /* BlueToothCell.xib in Resources */,
E04025FC259C142E00EDF182 /* KHXQ_ViewController.xib in Resources */,
E027E37125B5693A00CBCA65 /* print_bottom_cell.xib in Resources */,
......@@ -3950,6 +3978,7 @@
E0272A86259C2525008142BB /* FXYGL_ViewController.xib in Resources */,
E02C88272456B24F00925766 /* WuLiuGenZongViewController.xib in Resources */,
F9D44E8924CBC6A400FBD8DB /* ToAndFormSelectViewController.xib in Resources */,
E0E6A5A325FC6B0A00C9BCD6 /* DZSHViewController.xib in Resources */,
E0C4F4A8244EC82A00CC7E2F /* TitleAndBtnCell.xib in Resources */,
E0974D5F25C12E8D00E3C86B /* two_title_cell.xib in Resources */,
F97E73322552A22000A11F98 /* DistributorSettingAlertView.xib in Resources */,
......@@ -4247,6 +4276,7 @@
E09F4C9D2452BEBB00BE033D /* JiPaiFangShiViewController.swift in Sources */,
F96407642468DEB400A05E12 /* SaveFileModel.swift in Sources */,
E0D4166424483058008DCAB4 /* ChangePassViewController.swift in Sources */,
E0E6A5A225FC6B0A00C9BCD6 /* DZSHViewController.swift in Sources */,
F933F6C12452C68B00189561 /* PKHUDAnimation.swift in Sources */,
E0C4F4A7244EC82A00CC7E2F /* TitleAndBtnCell.swift in Sources */,
F93E320D2473DA1C00524DFC /* GeliAlertTextFiled.swift in Sources */,
......@@ -4293,6 +4323,7 @@
E0D197CA24484D90002B080C /* PersonCenterCell.swift in Sources */,
E0337EF52464FCFC00952EF4 /* GYSListViewController.swift in Sources */,
F96E48A724CA90DC000AB8D4 /* DriverItemTableViewCell.swift in Sources */,
E0E6A5A925FC6EE700C9BCD6 /* DZSH_Mg_ViewController.swift in Sources */,
E0C4F4B5244EE9EE00CC7E2F /* YuShouCell.swift in Sources */,
F933F6C52452C68B00189561 /* PKHUDSuccessView.swift in Sources */,
E09B03A82445B04E00211A51 /* BaseView.swift in Sources */,
......@@ -4402,6 +4433,7 @@
E0516F772448003D00E373CE /* PayViewController.swift in Sources */,
E02DDD952450106C00ABB707 /* PuTongJieTiCell.swift in Sources */,
E0BE8A8B245A7D3300E80134 /* BtmBtnCell.swift in Sources */,
E0E6A59825FC66C600C9BCD6 /* DZSHCell.swift in Sources */,
E0CC848424823B72009B1FE9 /* InGoodsDetailModel.swift in Sources */,
E0B28DAC24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift in Sources */,
F9531F452465108800724BEE /* JXPhotoBrowserLog.swift in Sources */,
......@@ -4630,7 +4662,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.3;
CURRENT_PROJECT_VERSION = 5.4;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -4684,7 +4716,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GprinterSDKforIOS_v1.0.8",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK",
);
MARKETING_VERSION = 1.7.2;
MARKETING_VERSION = 1.7.3;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......@@ -4766,7 +4798,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.3;
CURRENT_PROJECT_VERSION = 5.4;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -4820,7 +4852,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GprinterSDKforIOS_v1.0.8",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK",
);
MARKETING_VERSION = 1.7.2;
MARKETING_VERSION = 1.7.3;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......
GeliBusinessPlatform/AppDelegate.swift
View file @ 3d4bbb4f
......@@ -282,7 +282,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont
let v1 = OrderListViewController()
let v2 = GoodsManageListVC()
// let v2 = GoodsManageListVC()
let v2 = DZSH_Mg_ViewController()
let v3 = WorkCViewController()
let v4 = WarehoseMangementListVC()
......
GeliBusinessPlatform/Assets.xcassets/print/nonPassImg.imageset/Contents.json 0 → 100644
View file @ 3d4bbb4f
{
"images" : [
{
"filename" : "编组.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "编组@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "编组@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/print/passImg.imageset/Contents.json 0 → 100644
View file @ 3d4bbb4f
{
"images" : [
{
"filename" : "编组.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "编组@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "编组@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
View file @ 3d4bbb4f
......@@ -45,9 +45,9 @@ class OrderDetailDbtInfoDataModel: Mappable {
var target_id : Int? //分销对象id
var target_name :String? //分销对象名称
var dbt_type : Int? //分销分账方式 1人工结算 2自动结算
var commission_time : String? //佣金结算时间
var sum_commission_val : String? //总佣金
var commission_type : String? //佣金方式
var commission_time : String? //提成结算时间
var sum_commission_val : String? //总提成
var commission_type : String? //提成方式
required init?( map: Map) {
......@@ -91,7 +91,7 @@ class OrderDetailResModel: Mappable {
var pay_type_cn : String? //支付方式中文
var pay_status_cn : String? //支付状态中文
var order_type : Int?//订单类型 1普通2期货3团购4预售
var commission_time_type:Int?//佣金退款类型
var commission_time_type:Int?//提成退款类型
var order_status : Int?//订单状态
var order_status_d : Int?//订单详细状态
var shipping_type : Int?//配送方式：1派送,2自提
......@@ -100,7 +100,7 @@ class OrderDetailResModel: Mappable {
var sale_res : OrderDetailSaleResModel?//订单预售详情(不是预售订单为空数组，无key=>value)
var invoice_img : String? //发票图片
var invoice_link : String? //发票链接
var sum_commission_val : String? //总佣金
var sum_commission_val : String? //总提成
var dbt_target : Int? //分销对象：1供应商 2分销商 3分销员
var target_name : String? //分销商名称
var order_associated_code : String?//关联凭证
......@@ -318,7 +318,7 @@ class OrderDetailGoodsModel: Mappable {
var goods_thumb : String? //商品缩略图
var warehouse_inventory : Int? //商品库存
var is_edit : Int? = 0 //订单商品是否有修改，1是0非--前端自主添加的字段
var commission_val:String? //这个商品的总佣金
var commission_val:String? //这个商品的总提成
var remark:String?//商品备注
var goods_source:Array<OrderDetailGoodsSourceModel>?//溯源信息
required init?( map: Map) {
......
GeliBusinessPlatform/Model/OrderManageModel/OrderListModel.swift
View file @ 3d4bbb4f
......@@ -33,7 +33,7 @@ class OrderListDataModel: Mappable {
var order_status_d : Int? //订单详细状态
var goods_before_pay :Int? //是否为先货后款：0否 1是
var order_type : Int? //订单类型 1普通2期货3团购4预售5分销商品
var commission_time_type:Int?//佣金退款类型
var commission_time_type:Int?//提成退款类型
var pay_status : Int? //支付状态
var pay_type : Int? //支付类型
var apply_cancel:Int? //申请取消订单标识：0待申请 1申请取消中 2已取消
......
GeliBusinessPlatform/Model/dbtIncomeInfo_model/dbtIncomeInfoModel.swift
View file @ 3d4bbb4f
......@@ -228,7 +228,7 @@ class dbtManageQueryDatasModel: Mappable {
var update_time : String? //合作时间
var user_id :Int? //用户id
var sum_in_amount : Float?//累计佣金收益
var sum_in_amount : Float?//累计提成收益
var count_customers :Int?//累计客户人数
required init?( map: Map) {
......
GeliBusinessPlatform/Model/getDbtRuleInterface.swift
View file @ 3d4bbb4f
......@@ -26,7 +26,7 @@ func getDbtRule(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture
params
key:user_token
dbt_type:分账方式 1人工结算 2自动结算
commission_time:佣金结算时间 1立即结算
commission_time:提成结算时间 1立即结算
share_type:分享方式 1（1对1结算）2（1对多结算）
*/
func setDbtRule(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
......@@ -189,7 +189,7 @@ func stopContract(_ params:[String:Any],success:@escaping (_ res:Any)->(),failtu
/*
//params-key:user_token
keyword 关键字
goods_type 下拉框 1为全部商品，2为不参与分销商品，3参与分销商品，4佣金比例商品，5绝对额比例商品
goods_type 下拉框 1为全部商品，2为不参与分销商品，3参与分销商品，4提成比例商品，5绝对额比例商品
is_show 上下架 （1为上架，0为下架，2全部）
page 页数
*/
......@@ -208,9 +208,9 @@ func supGoodsList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failtu
operation_type 1参与分销 2不参与分销
sku_id
dbt_price 分销价
commission_type 佣金类型 1百分比 2固定值
commission_per 佣金百分比
commission_val 佣金
commission_type 提成类型 1百分比 2固定值
commission_per 提成百分比
commission_val 提成
*/
func supSetCommodity(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("分销商品管理", params, { (rep:DataResponse<UpDataModel>) in
......
GeliBusinessPlatform/Model/get_dbt_rule_model/getDbtRuleModel.swift
View file @ 3d4bbb4f
......@@ -27,7 +27,7 @@ class getDbtRuleDataModel: Mappable {
var is_sup:Int? //是否是供应商（1是，0不是）
var is_dbt : Int? //是否是分销商（1是，0不是）
var dbt_type :Int? //分账方式 1人工结算 2自动结算（初始化为0，0的话就是没有设置过）
var commission_time : Int?//佣金结算时间 1立即结算（初始化为0，0的话就是没有设置过）
var commission_time : Int?//提成结算时间 1立即结算（初始化为0，0的话就是没有设置过）
var share_type :Int?//分享方式 1（1对1结算）2（1对多结算）（初始化为0，0的话就是没有设置过）
required init?( map: Map) {
......@@ -170,8 +170,8 @@ class supSpreadGoodsDataModel: Mappable {
var inventory:Int?//库存
var price : String?//价格
var dbt_price :String?//分销价
var commission_type:Int?//佣金类型 1百分比 2固定值
var commission_per:Int?//佣金百分比(0为初始值)
var commission_type:Int?//提成类型 1百分比 2固定值
var commission_per:Int?//提成百分比(0为初始值)
var sku_id:Int?//sku_id
required init?( map: Map) {
......@@ -330,9 +330,9 @@ class supGoodsListResDataModel: Mappable {
var sku_id:Int?//sku的id
var dbt_price : String? //分销价
var dbt_sale:Int? //销售量
var commission_per :Int?//佣金百分比
var commission_type:Int?//佣金类型 1百分比 2固定值
var commission_val :String?//佣金
var commission_per :Int?//提成百分比
var commission_type:Int?//提成类型 1百分比 2固定值
var commission_val :String?//提成
var is_dbt:Int?//分销商品的id，为0的话说明未设置分销
......
GeliBusinessPlatform/View/AlertView/DistributorSettingAlertView.swift
View file @ 3d4bbb4f
......@@ -108,7 +108,7 @@ class DistributorSettingAlertView: UIView {
@IBOutlet weak var payJueBtn: UIButton!
@IBAction func payAction(_ sender: UIButton) {
//佣金比例
//提成比例
payBiBtn .setImage(UIImage.init(named: "yuxuan"), for: .normal)
payJueBtn .setImage(UIImage.init(named: "daixuan"), for: .normal)
payBiBtn.isSelected = true
......@@ -151,7 +151,7 @@ class DistributorSettingAlertView: UIView {
return
}
if input_value! > 100 {
HUD.flash(.label("佣金不大于100%~"), delay: 1.2)
HUD.flash(.label("提成不大于100%~"), delay: 1.2)
textField.text! = ""
return
}else{
......@@ -164,7 +164,7 @@ class DistributorSettingAlertView: UIView {
return
}
if input_value! > fx_price! {
HUD.flash(.label("佣金大于分销价~"), delay: 1.2)
HUD.flash(.label("提成大于分销价~"), delay: 1.2)
textField.text! = ""
return
}
......@@ -217,14 +217,14 @@ class DistributorSettingAlertView: UIView {
commission_val = payTF.text!
if Float(commission_val)! > Float(fx_price!)! {
HUD.flash(.label("佣金大于分销价~"), delay: 1.2)
HUD.flash(.label("提成大于分销价~"), delay: 1.2)
payTF.text! = ""
return
}
}else{
commission_per = payTF.text!
if Float(commission_per)! > 100 {
HUD.flash(.label("佣金不大于100%~"), delay: 1.2)
HUD.flash(.label("提成不大于100%~"), delay: 1.2)
payTF.text! = ""
return
}
......
GeliBusinessPlatform/View/AlertView/DistributorSettingAlertView.xib
View file @ 3d4bbb4f
......@@ -96,7 +96,7 @@
<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="o0f-Uf-X61">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提成设置:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o0f-Uf-X61">
<rect key="frame" x="15" y="121" width="56" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
......@@ -105,7 +105,7 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qLO-Gc-A3W">
<rect key="frame" x="86" y="121" width="80" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title=" 佣金比例" image="yuxuan">
<state key="normal" title=" 提成比例" image="yuxuan">
<color key="titleColor" name="标题字颜色"/>
</state>
<connections>
......
GeliBusinessPlatform/View/HeaderSelectView/HeaderSelectView.xib
View file @ 3d4bbb4f
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......
GeliBusinessPlatform/View/HeaderSelectView/SelectContentView.swift
View file @ 3d4bbb4f
......@@ -8,7 +8,7 @@
import Foundation
protocol SelectContentViewDelegate {
func didselectCell(sender:Int)
func didselectCell(sender:Int,SelectContentView:SelectContentView)
func selectContentvRemoveForSup()
}
class SelectContentView: UIView, UITableViewDelegate, UITableViewDataSource {
......@@ -76,7 +76,7 @@ class SelectContentView: UIView, UITableViewDelegate, UITableViewDataSource {
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
self.delegate?.didselectCell(sender: indexPath.row)
self.delegate?.didselectCell(sender: indexPath.row, SelectContentView: self)
self.removeFromSuperview()
}
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.xib
View file @ 3d4bbb4f
<?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"/>
......@@ -101,7 +99,7 @@
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="佣金：¥50" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X1B-vl-mvy">
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提成：¥50" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X1B-vl-mvy">
<rect key="frame" x="10" y="59" width="55" height="13.5"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="灰色字体颜色"/>
......
GeliBusinessPlatform/ViewController/分销商分账设置/DistributorSettingViewController.swift
View file @ 3d4bbb4f
......@@ -101,7 +101,7 @@ class DistributorSettingViewController: BaseViewController {
typeBtn1 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
typeBtn2 .setImage(UIImage.init(named: "daixuan"), for: .normal)
dbt_type = "1"
intro_lbl.text = "需要你自行与分销员进行业绩结算，通过线下转账方式发放佣金。"
intro_lbl.text = "需要你自行与分销员进行业绩结算，通过线下转账方式发放提成。"
}else if typeBtn2 == sender{
typeBtn1 .setImage(UIImage.init(named: "daixuan"), for: .normal)
typeBtn2 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
......
GeliBusinessPlatform/ViewController/分销商分账设置/DistributorSettingViewController.xib
View file @ 3d4bbb4f
......@@ -99,7 +99,7 @@
<action selector="typeAction:" destination="-1" eventType="touchUpInside" id="vXK-mL-4go"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="需要你自行与分销员进行业绩结算，通过线下转账方式发放佣金。" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rdF-Hk-QO2">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="需要你自行与分销员进行业绩结算，通过线下转账方式发放提成。" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rdF-Hk-QO2">
<rect key="frame" x="110" y="93" width="294" height="36.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="灰色字体颜色"/>
......@@ -112,7 +112,7 @@
<constraint firstAttribute="height" constant="1" id="O4O-5A-JCd"/>
</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="2Yp-84-pY1">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提成结算时间:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Yp-84-pY1">
<rect key="frame" x="13.5" y="170.5" width="81.5" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
......@@ -121,7 +121,7 @@
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sJn-mb-uqO">
<rect key="frame" x="110" y="170.5" width="145" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title=" 订单完成时发放佣金" image="yuxuan">
<state key="normal" title=" 订单完成时发放提成" image="yuxuan">
<color key="titleColor" name="标题字颜色"/>
</state>
<connections>
......@@ -137,7 +137,7 @@
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="因用户收货时未过售后期，如果用户退款，在无法收回佣金情况下需要您线上先垫付佣金。" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wD1-ht-M3Y">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="因用户收货时未过售后期，如果用户退款，在无法收回提成情况下需要您线上先垫付提成。" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wD1-ht-M3Y">
<rect key="frame" x="110" y="280" width="294" height="0.0"/>
<constraints>
<constraint firstAttribute="height" id="yDm-Qs-QZ4"/>
......@@ -188,7 +188,7 @@
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uvw-yO-xN6">
<rect key="frame" x="110" y="251" width="145" 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>
......
GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift
View file @ 3d4bbb4f
......@@ -94,11 +94,11 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
let UserToken = UserDefaults.standard.value(forKey: "user_token")
weak var showSelectV: SelectContentView! = nil
func didselectCell(sender: Int) {
func didselectCell(sender: Int, SelectContentView: SelectContentView) {
selectIndexArr[showSelectvIndex] = sender
var arr:[String] = []
if showSelectvIndex == 0 {
let arr1 = ["全部商品", "不参与分销商品", "参与分销商品", "佣金比例商品", "绝对额比例商品"]
let arr1 = ["全部商品", "不参与分销商品", "参与分销商品", "提成比例商品", "绝对额比例商品"]
arr.append(arr1[sender])
}else if showSelectvIndex == 1{
let arr2 = ["上架", "下架"]
......@@ -125,7 +125,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
make.top.equalTo(top_btn_bg_view.snp_bottom)
}
showSelectV = showSelectView
showSelectView.dataArr = ["全部商品", "不参与分销商品", "参与分销商品", "佣金比例商品", "绝对额比例商品"]
showSelectView.dataArr = ["全部商品", "不参与分销商品", "参与分销商品", "提成比例商品", "绝对额比例商品"]
showSelectView.selectIndx = selectIndexArr[0]
}
break
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailListMgVC.swift
View file @ 3d4bbb4f
......@@ -218,7 +218,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
}
//MARK:--SelectContentViewDelegate
func didselectCell(sender: Int) {
func didselectCell(sender: Int, SelectContentView: SelectContentView) {
selectIndexArr[showSelectvIndex] = sender
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
viewControllers.forEach { (vc) in
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift
View file @ 3d4bbb4f
......@@ -56,7 +56,7 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
let goodsTitleArr = ["商品合计"]
let fenxiaoTitleArr = ["分销角色","结算方式","佣金方式","佣金结算时间","佣金分销结算"]
let fenxiaoTitleArr = ["分销角色","结算方式","提成方式","提成结算时间","提成分销结算"]
let orderTitleArr = ["订单编号","下单时间","订单来源","支付方式","支付状态","买家留言","订单备注"]
@IBOutlet weak var listView: UITableView!
......@@ -158,7 +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 = "佣金:￥" + (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
......@@ -307,7 +307,7 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
}
if section == 2 {
let view = OrderDViewSumFooter(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 59))
view.priceLbl.text = "￥" + (self.dataMdoel?.order_res!.sum_amount)! + "(总佣金" + (self.dataMdoel?.order_res!.sum_commission_val)! + "元)"
view.priceLbl.text = "￥" + (self.dataMdoel?.order_res!.sum_amount)! + "(总提成" + (self.dataMdoel?.order_res!.sum_commission_val)! + "元)"
return view
}
return view
......
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageFooterView.xib
View file @ 3d4bbb4f
<?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"/>
......@@ -39,7 +37,7 @@
<color key="textColor" name="#F57575"/>
<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="HNd-Yn-970">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提成：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HNd-Yn-970">
<rect key="frame" x="316" y="16" width="39" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
......
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
View file @ 3d4bbb4f
......@@ -94,7 +94,6 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
//MARK:--jpushServiceNotification
@objc func jpushServiceNotification(notion:Notification) {
let dict = notion.userInfo! as NSDictionary
print("123123 ==",dict.allKeys)
let vc = MsgCenterViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
......@@ -336,7 +335,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
showSelectV.removeFromSuperview()
}
}
func didselectCell(sender: Int) {
func didselectCell(sender: Int, SelectContentView: SelectContentView) {
selectIndexArr[showSelectvIndex] = sender
var arr:[String] = []
if showSelectvIndex == 0 {
......
GeliBusinessPlatform/ViewController/店长审核/DZSHCell.swift 0 → 100644
View file @ 3d4bbb4f
//
// DZSHCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/3/13.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class DZSHCell: UITableViewCell {
@IBOutlet weak var date_lbl: UILabel!
@IBOutlet weak var from_lbl: UILabel!
@IBOutlet weak var name_lbl: UILabel!
@IBOutlet weak var action_btn: UIButton!
@IBOutlet weak var resultImg: UIImageView!
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
self.selectionStyle = .none
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/店长审核/DZSHCell.xib 0 → 100644
View file @ 3d4bbb4f
This diff is collapsed.
GeliBusinessPlatform/ViewController/店长审核/DZSHViewController.swift 0 → 100644
View file @ 3d4bbb4f
//
// DZSHViewController.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/3/13.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class DZSHViewController: BaseViewController {
@IBOutlet weak var listView: UITableView!
var keyword = ""
var isUpData = false{
didSet{
if !isUpData {
if listView != nil {
listView.mj_header?.beginRefreshing()
}
}
}
}
var startTime :Int? = 0
var endTime :Int? = 0
//MARK:--VC 初始化
convenience init(title: String) {
self.init(title: title, content: "")
}
init(title: String, content: String) {
super.init(nibName: nil, bundle: nil)
self.title = title
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
GeliBusinessPlatform/ViewController/店长审核/DZSHViewController.xib 0 → 100644
View file @ 3d4bbb4f
<?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="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DZSHViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="listView" destination="lSX-9b-cFw" id="zZH-ZZ-QGI"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8L7-vJ-qVH">
<rect key="frame" x="0.0" y="44" width="414" height="50"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="HL3-UL-d3J"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bHR-an-pKl">
<rect key="frame" x="0.0" y="94" width="414" height="45"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="drv-W6-3xI"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="lSX-9b-cFw">
<rect key="frame" x="0.0" y="139" width="414" height="757"/>
<color key="backgroundColor" name="app底色"/>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="lSX-9b-cFw" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="0aj-4L-xx8"/>
<constraint firstItem="bHR-an-pKl" firstAttribute="top" secondItem="8L7-vJ-qVH" secondAttribute="bottom" id="63b-PC-ZN0"/>
<constraint firstAttribute="bottom" secondItem="lSX-9b-cFw" secondAttribute="bottom" id="FEN-bg-ubq"/>
<constraint firstItem="lSX-9b-cFw" firstAttribute="top" secondItem="bHR-an-pKl" secondAttribute="bottom" id="JHX-Kd-NcS"/>
<constraint firstItem="bHR-an-pKl" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Rzy-zQ-ECJ"/>
<constraint firstItem="8L7-vJ-qVH" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="g1z-Sl-xNc"/>
<constraint firstItem="bHR-an-pKl" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="idB-cA-nen"/>
<constraint firstItem="8L7-vJ-qVH" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="lc3-ld-mig"/>
<constraint firstItem="lSX-9b-cFw" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="tSR-ZH-wRg"/>
<constraint firstItem="8L7-vJ-qVH" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="zQG-Wp-ZvL"/>
</constraints>
<point key="canvasLocation" x="142" y="109"/>
</view>
</objects>
<resources>
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/店长审核/DZSH_Mg_ViewController.xib 0 → 100644
View file @ 3d4bbb4f
<?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="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DZSH_Mg_ViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="contentV" destination="2JQ-am-y9K" id="KS5-IL-FII"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2JQ-am-y9K">
<rect key="frame" x="0.0" y="44" width="414" height="852"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="2JQ-am-y9K" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Af7-c7-8in"/>
<constraint firstItem="2JQ-am-y9K" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="Epp-j9-2YZ"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="2JQ-am-y9K" secondAttribute="trailing" id="bt4-Fm-7cP"/>
<constraint firstAttribute="bottom" secondItem="2JQ-am-y9K" secondAttribute="bottom" id="hGx-OE-dvR"/>
</constraints>
<point key="canvasLocation" x="141" y="109"/>
</view>
</objects>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/待审核分销员/DSHFXY_ViewController.swift
View file @ 3d4bbb4f
......@@ -77,7 +77,7 @@ class DSHFXY_ViewController: BaseViewController, HeaderSelectViewDelegate, TimeS
return cell
}
func didselectCell(sender: Int) {
func didselectCell(sender: Int, SelectContentView: SelectContentView) {
selectIndexArr[showSelectvIndex] = sender
var arr:[String] = []
if showSelectvIndex == 1{
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 3d4bbb4f
......@@ -490,6 +490,16 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if isYuShou {
isYushoucount = 2
}
if indexPath.row == 5 {
print("abc === ")
let alterView = GeliAlertTextFiled(frame: self.view.window!.bounds)
alterView.delegate = self
if self.dataMdoel?.order_res?.lwb_no != nil {
alterView.textTF.text = self.dataMdoel?.order_res?.lwb_no
}
self.view.window?.addSubview(alterView)
return
}
if indexPath.row == 7 + isYushoucount{
print("备注")
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
......@@ -616,7 +626,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
cell.dan_jia_lbl.text = "单价:" + (rowModel?.goods_price)!
cell.yong_jin_lbl.text = "佣金:" + (rowModel?.commission_val)!
cell.yong_jin_lbl.text = "提成:" + (rowModel?.commission_val)!
cell.count_lbl.text = "数量:" + StringByInt(number: (rowModel?.cart_number!)!)
cell.xiao_ji_lbl.text = "小计:￥" + (self.dataMdoel?.order_res?.goods_amount)!
......@@ -1294,7 +1304,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let view = OrderDViewSumFooter(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 59))
if self.dataMdoel?.order_res?.order_type == 5 {
//分销的话
view.priceLbl.text = "￥" + (self.dataMdoel?.order_res!.sum_amount)! + "(佣金" + (self.dataMdoel?.order_res!.sum_commission_val)! + ")"
view.priceLbl.text = "￥" + (self.dataMdoel?.order_res!.sum_amount)! + "(提成" + (self.dataMdoel?.order_res!.sum_commission_val)! + ")"
}else{
view.priceLbl.text = "￥" + (self.dataMdoel?.order_res!.sum_amount)!
}
......@@ -1633,7 +1643,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
var content = "暂不支持原路退款，请注意使用其他渠道退还金额"
var remind = "继续退款"
if self.dataMdoel?.order_res?.commission_time_type == 1 && self.dataMdoel?.order_res?.order_type == 5 {
content = "该笔分销订单已结算佣金至分销商/员格利支付账户，如果您确认退款需要先垫付该笔分销订单佣金，等分销商/员账户入帐系统将自动扣还；是否确认退款？"
content = "该笔分销订单已结算提成至分销商/员格利支付账户，如果您确认退款需要先垫付该笔分销订单提成，等分销商/员账户入帐系统将自动扣还；是否确认退款？"
remind = "确认"
}
let alertView = GeliAlertView(frame: self.view.window!.bounds)
......@@ -1707,7 +1717,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "该笔分销订单已结算佣金至分销商/员格利支付账户，如果您确认退款需要先垫付该笔分销订单佣金，等分销商/员账户入帐系统将自动扣还；是否确认退款？"
alertView.titileLbl.text = "该笔分销订单已结算提成至分销商/员格利支付账户，如果您确认退款需要先垫付该笔分销订单提成，等分销商/员账户入帐系统将自动扣还；是否确认退款？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1100
self.view.window?.addSubview(alertView)
......@@ -1768,7 +1778,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "该笔分销订单已结算佣金至分销商/员格利支付账户，如果您确认退款需要先垫付该笔分销订单佣金，等分销商/员账户入帐系统将自动扣还；是否确认退款？"
alertView.titileLbl.text = "该笔分销订单已结算提成至分销商/员格利支付账户，如果您确认退款需要先垫付该笔分销订单提成，等分销商/员账户入帐系统将自动扣还；是否确认退款？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1021
self.view.window?.addSubview(alertView)
......
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