Skip to content

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

1.5 上架版本

parent 792c1697
Expand all Show whitespace changes
Inline Side-by-side
Showing with 548 additions and 21 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 864b04cd
......@@ -316,6 +316,8 @@
E0DDCB1E244AE81800DF54C7 /* GuanLianKeHuCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0DDCB1C244AE81800DF54C7 /* GuanLianKeHuCell.xib */; };
E0E341EA246E95EE0060AC20 /* PingLunCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E341E8246E95EE0060AC20 /* PingLunCell.swift */; };
E0E341EB246E95EE0060AC20 /* PingLunCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0E341E9246E95EE0060AC20 /* PingLunCell.xib */; };
E0E4456924B00F7B00EF788E /* LogisticsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E4456824B00F7B00EF788E /* LogisticsModel.swift */; };
E0E4456B24B0221500EF788E /* LogisticsInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E4456A24B0221500EF788E /* LogisticsInterface.swift */; };
E0E8ABFD246E359700E3BB54 /* GuiGeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */; };
E0EABAE72487748500F6CA8D /* NewSelectWarehouseVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0EABAE52487748500F6CA8D /* NewSelectWarehouseVC.swift */; };
E0EABAE82487748500F6CA8D /* NewSelectWarehouseVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0EABAE62487748500F6CA8D /* NewSelectWarehouseVC.xib */; };
......@@ -879,6 +881,8 @@
E0DDCB1C244AE81800DF54C7 /* GuanLianKeHuCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GuanLianKeHuCell.xib; sourceTree = "<group>"; };
E0E341E8246E95EE0060AC20 /* PingLunCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PingLunCell.swift; sourceTree = "<group>"; };
E0E341E9246E95EE0060AC20 /* PingLunCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PingLunCell.xib; sourceTree = "<group>"; };
E0E4456824B00F7B00EF788E /* LogisticsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogisticsModel.swift; sourceTree = "<group>"; };
E0E4456A24B0221500EF788E /* LogisticsInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogisticsInterface.swift; sourceTree = "<group>"; };
E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuiGeModel.swift; sourceTree = "<group>"; };
E0EABAE52487748500F6CA8D /* NewSelectWarehouseVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewSelectWarehouseVC.swift; sourceTree = "<group>"; };
E0EABAE62487748500F6CA8D /* NewSelectWarehouseVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewSelectWarehouseVC.xib; sourceTree = "<group>"; };
......@@ -1723,6 +1727,7 @@
E09B03A92445B09200211A51 /* Model */ = {
isa = PBXGroup;
children = (
E0E4456724B00F6400EF788E /* Logistics */,
E019E97F24A975710086C565 /* pinPai */,
E05FAD282498A5E800D8C90D /* yfzkModel */,
F924B38E24971BB600A913CD /* CustomerModel */,
......@@ -1737,6 +1742,7 @@
F956D5BD246A3629003FF510 /* PersonCenterModel */,
F956D5BC246A35DB003FF510 /* GoodsManageMoel */,
F9171EFB245128B200359C2B /* Interface.swift */,
E0E4456A24B0221500EF788E /* LogisticsInterface.swift */,
E019E98224A9763A0086C565 /* BrandListInterface.swift */,
E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */,
E007B1DA248F8F57004D14CC /* PurchaseInterface.swift */,
......@@ -2080,6 +2086,14 @@
path = "预售价格修改";
sourceTree = "<group>";
};
E0E4456724B00F6400EF788E /* Logistics */ = {
isa = PBXGroup;
children = (
E0E4456824B00F7B00EF788E /* LogisticsModel.swift */,
);
path = Logistics;
sourceTree = "<group>";
};
E0EFB9C324930BEE005FB0CD /* 采购单列表 */ = {
isa = PBXGroup;
children = (
......@@ -3177,9 +3191,11 @@
E07B1E5E24591AA50055BA3C /* KeHuXQViewController.swift in Sources */,
F9DDBE962457D3EC00A32CB2 /* WebViewController.swift in Sources */,
F956D5AA246A2D9C003FF510 /* LMNBulletsLine.m in Sources */,
E0E4456B24B0221500EF788E /* LogisticsInterface.swift in Sources */,
E06524F924581A7900CA22E2 /* ChuKuCell.swift in Sources */,
E00ACBEB2490D6C800128052 /* YDLBVc.swift in Sources */,
F9A0E1DD246D198B00D7F26F /* CusListAllModel.swift in Sources */,
E0E4456924B00F7B00EF788E /* LogisticsModel.swift in Sources */,
F9956B2524640D34001A617D /* GoodsClassModel.swift in Sources */,
F961D26B24500FF6007FBE70 /* HeaderSelectView.swift in Sources */,
F9697244248F70C00010D39B /* VendorInterface.swift in Sources */,
......
GeliBusinessPlatform/Define/Define.swift
View file @ 864b04cd
......@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
//接口地址
//test
let SERVERCE_ImageHost = "https://z.gelifood.com/"
let SERVERCE_HOST = "https://z.gelifood.com/admin/"
//let SERVERCE_ImageHost = "https://zx.gelifood.com/"
//let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
//let SERVERCE_ImageHost = "https://z.gelifood.com/"
//let SERVERCE_HOST = "https://z.gelifood.com/admin/"
let SERVERCE_ImageHost = "https://zx.gelifood.com/"
let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
//online
//视图常量
......
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @ 864b04cd
......@@ -192,5 +192,15 @@
<string>brand/brandList</string>
<key>新增品牌</key>
<string>Brand/brandAdd</string>
<key>运单列表</key>
<string>Logistics/jdOrderList</string>
<key>获取所有物流公司</key>
<string>Logistics/lcAll</string>
<key>下单期望上门时间</key>
<string>Logistics/appointmentTime</string>
<key>物流费用预估</key>
<string>register</string>
<key>运单详情</key>
<string>Logistics/logisticsOrderDetails</string>
</dict>
</plist>
GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift 0 → 100644
View file @ 864b04cd
This diff is collapsed.
GeliBusinessPlatform/Model/LogisticsInterface.swift 0 → 100644
View file @ 864b04cd
//
// LogisticsInterface.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/7/4.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
import Alamofire
import SwiftyJSON
import ObjectMapper
//MARK:--运单列表
/*
user_token 验证token
keyword 搜索关键词
start_time 开始时间
end_time 结束时间
lc_id 物流公司id
order_sn 关联订单号（也是食品网订单号）
sale_plat 所属平台
pay_status 运单运费支付状态：1待支付 2已支付 3已退款
delivery_status 运单状态：1下单完成 2揽收成功 3运输中 4已签收 5已取消 6拒收 7再投
*/
func jdOrderList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("运单列表", params, { (rep:DataResponse<LogisticsModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--获取所有物流公司
/*
user_token 验证token
*/
func lcAll(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("获取所有物流公司", params, { (rep:DataResponse<lcAllModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:-- 下单期望上门时间
/*
user_token 验证token
*/
func appointmentTime(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("下单期望上门时间", params, { (rep:DataResponse<appointmentTimeModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:-- 物流费用预估
/*
user_token 验证token
*/
func register(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("物流费用预估", params, { (rep:DataResponse<registerModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:-- 运单详情
/*
user_token 验证token
*/
func logisticsOrderDetails(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("运单详情", params, { (rep:DataResponse<logisticsOrderDetailsModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
GeliBusinessPlatform/Model/pinPai/brandListModel.swift
View file @ 864b04cd
......@@ -24,13 +24,13 @@ class brandListModel: Mappable {
}
}
class brandListDataModel: Mappable {
var brand_id:Int?
var brand_name : String?
var brand_logo :String?
var brand_id:Int?//品牌id
var brand_name : String?//品牌名
var brand_logo :String? //品牌图标
var brand_desc:String?
var site_url : String?
var sort_order :Int?
var brand_desc:String?//品牌描述
var site_url : String?//站点地址
var sort_order :Int? //排序
var is_show:Int?
var brand_img : String?
......
GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQCell.swift
View file @ 864b04cd
......@@ -50,7 +50,7 @@ class YingFuZhangKuanXQCell: UITableViewCell {
date2Lbl.isHidden = true
if data?.pay_time != 0 && data?.pay_time != nil {
date2Lbl.text = "收款时间:" + dayAndTimeByDouble(sender: (data?.pay_time)!)
date2Lbl.isHidden = false
// date2Lbl.isHidden = false
}
priceLbl3.text = data?.arrears_money!
......@@ -86,7 +86,7 @@ class YingFuZhangKuanXQCell: UITableViewCell {
date2Lbl.isHidden = true
if model?.pay_time != 0 && model?.pay_time != nil {
date2Lbl.text = "付款时间:" + dayAndTimeByDouble(sender: (model?.pay_time!)!)
date2Lbl.isHidden = false
// date2Lbl.isHidden = false
}
// if model?.type == 1 {//应付
priceLbl1.text = model?.money
......
GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQViewController.swift
View file @ 864b04cd
......@@ -120,9 +120,9 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
@IBOutlet weak var listView: UITableView!
@IBOutlet weak var searchBGView: UIView!
var first = ""
var second = ""
var third = ""
var first = "0"
var second = "0"
var third = "0"
override func viewDidLoad() {
super.viewDidLoad()
......@@ -199,6 +199,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
make.height.equalTo(18.5)
make.width.equalTo(title2.bounds.size.width)
}
let ti11 = UILabel()
ti11.text = "¥\(second)"
ti11.font = UIFont.boldSystemFont(ofSize: 13)
......@@ -226,6 +227,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
make.height.equalTo(18.5)
make.width.equalTo(title3.bounds.size.width)
}
let ti111 = UILabel()
ti111.text = "¥\(third)"
ti111.font = UIFont.boldSystemFont(ofSize: 13)
......@@ -390,10 +392,10 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
if model.data?.payable != nil{
self.first = model.data?.payable as! String
}
if self.first.count == 0 {
}else{
self.first = "0"
}
if model.data?.already != nil {
self.second = "\(model.data!.already!)"
}else{
......@@ -420,9 +422,9 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
}else{//应收
let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"cus_id":ven_id as Any]
accountReceivableDetail(dic, success: { (data) in
self.second = "0.00"
self.third = "0.00"
self.first = "0"
self.second = "0"
self.third = "0"
let model = data as! accountReceivableDetailModel
if model.code == 2 {
self.listView.mj_header?.endRefreshing()
......@@ -432,16 +434,22 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
model.data?.list?.forEach({ (item) in
self.datas.append(item)
})
if model.data?.arrears_money != nil {
self.first = model.data?.arrears_money! as! String
}else{
self.first = "0"
}
if model.data!.jf != nil {
self.second = "\(model.data!.jf!)"
}else{
self.second = "0"
}
if model.data!.df != nil {
self.third = "\(model.data!.df!)"
}else{
self.third = "0"
}
self.listView.reloadData()
......
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