Skip to content

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

1.5.1上架版本

parent d2447cf8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 103 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ f12608a5
......@@ -3685,7 +3685,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.26;
CURRENT_PROJECT_VERSION = 1.27;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -3733,7 +3733,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
);
MARKETING_VERSION = 1.5;
MARKETING_VERSION = 1.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......@@ -3814,7 +3814,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.26;
CURRENT_PROJECT_VERSION = 1.27;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -3862,7 +3862,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
);
MARKETING_VERSION = 1.5;
MARKETING_VERSION = 1.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......
GeliBusinessPlatform/Info.plist
View file @ f12608a5
......@@ -24,6 +24,10 @@
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MOBAppKey</key>
<string>2ff67ee668728</string>
<key>MOBAppSecret</key>
<string>20e76534ce633b6488851fe9f67349e0</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
......@@ -68,9 +72,5 @@
</array>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>MOBAppKey</key>
<string>2ff67ee668728</string>
<key>MOBAppSecret</key>
<string>20e76534ce633b6488851fe9f67349e0</string>
</dict>
</plist>
GeliBusinessPlatform/Model/yfzkModel/accountsPayableListModel.swift
View file @ f12608a5
......@@ -90,7 +90,7 @@ class accountsPayableDetailDataListModel: Mappable {
var money:String?//金额（根据类型应付已付决定）
var type :Int?//类型：1应付 2已付
var create_time :Double? //时间
var add_time :Double? //时间
var payable_money:String? //欠款额
var status :Int? //支付状态：1应付未付 2应付已付
......@@ -107,7 +107,7 @@ class accountsPayableDetailDataListModel: Mappable {
money <- map["money"]
type <- map["type"]
create_time <- map["create_time"]
add_time <- map["add_time"]
payable_money <- map["payable_money"]
status <- map["status"]
......@@ -202,7 +202,7 @@ class accountReceivableDetailListModel: Mappable {
var money:String? //交易金额(为贷方金额还是借方金额，由 type 字段确定)
var type : Int? //类型 1借出 2归还
var create_time :Double? //时间
var add_time :Double? //时间
var update_time:Double?
var is_del : Int?
......@@ -224,7 +224,7 @@ class accountReceivableDetailListModel: Mappable {
money <- map["money"]
type <- map["type"]
create_time <- map["create_time"]
add_time <- map["add_time"]
update_time <- map["update_time"]
is_del <- map["is_del"]
......
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
View file @ f12608a5
......@@ -11,8 +11,8 @@ import ViewAnimator
import SkeletonView
class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollectionViewDataSource ,UICollectionViewDelegateFlowLayout,HeaderSelectViewDelegate,SelectContentViewDelegate,UISearchBarDelegate, SearchBarViewDelegate, GoodsCollectionViewCellDelegate,ProductDetailViewControllerDelegate, GeliAlertViewDelegate,EPViewControllerDelegate{
let UserToken = UserDefaults.standard.value(forKey: "user_token")
let UserToken = UserDefaults.standard.value(forKey: "user_token")
var collection : UICollectionView? = nil
var layout = UICollectionViewFlowLayout()
......@@ -91,7 +91,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
//MARK:--jpushServiceNotification
@objc func jpushServiceNotification(notion:Notification) {
let dict = notion.userInfo! as NSDictionary
print("123123 ==",dict.allKeys)
print("123123 ==",dict.allKeys)
let vc = MsgCenterViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
......@@ -129,16 +129,16 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
page = pageNum
}
getSortData ()
goodsList(["user_token":UserToken as Any,"keyword":keyword,"goods_type":goodsType,"sort":sort,"is_show":isShow,"page":page], success: { (data) in
let dataM = data as! GoodsListModel
if self.isSearch {
self.pageSearchNum = 2
self.itemsSearch.removeAll()
dataM.data?.goods_res?.forEach({ (model) in
self.itemsSearch.append(model)
})
self.itemsSearch.removeAll()
dataM.data?.goods_res?.forEach({ (model) in
self.itemsSearch.append(model)
})
}else{
self.pageNum = 2
self.items.removeAll()
......@@ -177,7 +177,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}
getSortData ()
goodsList(["user_token":UserToken as Any,"keyword":keyword,"goods_type":goodsType,"sort":sort,"is_show":isShow,"page":page], success: { (data) in
let dataM = data as! GoodsListModel
if (dataM.data?.goods_res!.count)! > 0 {
......@@ -194,7 +194,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}
self.collection?.reloadData()
self.collection?.mj_footer?.endRefreshing()
}else{
self.collection?.mj_footer?.endRefreshingWithNoMoreData()
}
......@@ -212,7 +212,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
if showSelectV != nil {
showSelectV.removeFromSuperview()
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
blackBtnView = UIButton ()
blackBtnView.backgroundColor = UIColor.init(named: "提示视图背景色")
......@@ -241,11 +241,11 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
isSearch = true
keyword = searchBar.text!
self.collection?.mj_header?.beginRefreshing()
}
//MARK:--清空搜索代理
func clearSearchAction() {
}
//MARK:--编辑即将结束
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
......@@ -269,7 +269,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
if showSelectV != nil {
showSelectV.removeFromSuperview()
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
let vc = ProductDetailViewController()
vc.delegate = self
......@@ -278,11 +278,11 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}
//MARK:--新增回调刷新
func EPViewControllerFinishEdit() {
self.collection?.mj_header?.beginRefreshing()
}
self.collection?.mj_header?.beginRefreshing()
}
func reloadDataByProductDetailViewController() {
self.collection?.mj_header?.beginRefreshing()
}
//MARK:--下拉视图模块
func showAction(sender: Int) {
......@@ -371,7 +371,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
headerLbl.text = ""
}
}
headerLbl.textColor = UIColor.init(named: "标题字颜色")
headerLbl.font = UIFont.systemFont(ofSize: 13)
headerV.addSubview(headerLbl)
......@@ -404,7 +404,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
cell.goodsName.text = rowModel.goods_name
cell.speatrr.text = rowModel.spec_str
cell.priceLbl.text = "￥" + rowModel.price!
cell.goodsImgV.sd_setImage(with: URL(string: SERVERCE_ImageHost + rowModel.goods_thumb!))
if rowModel.is_show == 1 {
......@@ -413,7 +413,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}else if rowModel.is_show == 0{
cell.leftBtn.setTitle("入库", for: .normal)
cell.rightBtn.setTitle("上架", for: .normal)
}
cell.lgBtn.tag = indexPath.row
cell.leftBtn.tag = indexPath.row
......@@ -447,7 +447,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
vc.sku_id = data.sku_id
self.navigationController?.pushViewController(vc, animated: true)
}
//MARK:---cell delegate 选中
func selectListsIndex(index: Int) {
let idx = IndexPath(item: index, section: 0)
......@@ -499,16 +499,16 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
if rowModel.is_show == 1 {
if isTrue {
print("入库哦哦")
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
let vc = NewRKVc()
// let vc = NewCKVc()
// let vc = NewCKVc()
vc.sku_id = changeGoodsResModel?.sku_id
vc.goods_id = changeGoodsResModel?.goods_id
self.navigationController?.pushViewController(vc, animated: true)
// let vc = RuKuViewController()
// vc.barTitle = "入库"
// self.navigationController?.pushViewController(vc, animated: true)
// let vc = RuKuViewController()
// vc.barTitle = "入库"
// self.navigationController?.pushViewController(vc, animated: true)
}else{
print("下架啦")
let alertView = GeliAlertView(frame: self.view.window!.bounds)
......@@ -519,7 +519,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
alertView.rightBtn.tag = 1001
self.view.window?.addSubview(alertView)
}
}else{
if isTrue {
......@@ -531,19 +531,18 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1002
self.view.window?.addSubview(alertView)
}else{
print("入库哦哦")
let vc = NewRKVc()
// let vc = NewCKVc()
vc.sku_id = changeGoodsResModel?.sku_id
vc.goods_id = changeGoodsResModel?.goods_id
self.navigationController?.pushViewController(vc, animated: true)
}
}
}
func upDataByGoodsId(goodsId:String) {
}
}
GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQCell.swift
View file @ f12608a5
......@@ -44,13 +44,13 @@ class YingFuZhangKuanXQCell: UITableViewCell {
if data != nil {
nameLbl.text = data?.order_sn
if data?.create_time != nil {
dateLbl.text = dayAndTimeByDouble(sender: (data?.create_time)!)
if data?.add_time != nil {
dateLbl.text = dayAndTimeByDouble(sender: (data?.add_time)!)
}
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!
......@@ -82,11 +82,11 @@ class YingFuZhangKuanXQCell: UITableViewCell {
if model != nil {
nameLbl.text = model?.po_no!
dateLbl.text = dayAndTimeByDouble(sender: (model?.create_time!)!)
dateLbl.text = dayAndTimeByDouble(sender: (model?.add_time!)!)
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 @ f12608a5
......@@ -26,17 +26,27 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
@IBOutlet weak var selectimeBV: UIView!
@IBAction func btnSelect(_ sender: UIButton) {
if sender.tag == 0 {
leftBtn.backgroundColor = UIColor(named: "按钮背景颜色")
rightBtn.backgroundColor = UIColor(named: "分类Cell背景色")
leftBtn.isSelected = true
leftBtn.isSelected = !leftBtn.isSelected
if leftBtn.isSelected {
leftBtn.backgroundColor = UIColor(named: "按钮背景颜色")
time_type = 1
}else{
leftBtn.backgroundColor = UIColor(named: "分类Cell背景色")
time_type = 0
}
rightBtn.isSelected = false
time_type = 1
}else{
leftBtn.backgroundColor = UIColor(named: "分类Cell背景色")
rightBtn.backgroundColor = UIColor(named: "按钮背景颜色")
leftBtn.isSelected = false
rightBtn.isSelected = true
time_type = 2
rightBtn.isSelected = !rightBtn.isSelected
if rightBtn.isSelected {
rightBtn.backgroundColor = UIColor(named: "按钮背景颜色")
time_type = 2
}else{
rightBtn.backgroundColor = UIColor(named: "分类Cell背景色")
time_type = 0
}
}
//10086
timeView.removeFromSuperview()
......@@ -59,7 +69,10 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
}
@IBAction func showSelectAction(_ sender: UIButton) {
removeBlackBtnView()
selectView.isHidden = !selectView.isHidden
closeBtn.isHidden = selectView.isHidden
......@@ -215,7 +228,8 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
//上拉加载相关设置
listView.mj_header?.beginRefreshing()
footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
listView.mj_footer = self.footerMJ
}
......@@ -332,7 +346,6 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
cell.delegate = self
cell.submitBtn.tag = indexPath.row
cell.tag = indexPath.row
if navTitle.contains("应付"){
if dataArr.count > 0 {
let model = dataArr[indexPath.row]
......@@ -472,10 +485,9 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
self.listView.reloadData()
self.listView.mj_header?.endRefreshing()
self.page = 2
if self.dataArr.count == 20 {
self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
self.listView.mj_footer = self.footerMJ
}
// if self.dataArr.count == 20 {
//
// }
if model.data?.list == nil {
self.listView.mj_footer?.endRefreshingWithNoMoreData()
self.footerMJ.setTitle("暂无应付账款记录", for: .noMoreData)
......@@ -523,10 +535,10 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
self.listView.reloadData()
self.listView.mj_header?.endRefreshing()
self.page = 2
if self.datas.count == 20 {
self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
self.listView.mj_footer = self.footerMJ
}
// if self.datas.count == 20 {
// self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
// self.listView.mj_footer = self.footerMJ
// }
if model.data?.list == nil {
self.listView.mj_footer?.endRefreshingWithNoMoreData()
self.footerMJ.setTitle("暂无应收账款记录", for: .noMoreData)
......@@ -599,29 +611,29 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
timeView.addSubview(calendarV)
calendarV.delegate = self
CalendarV = calendarV
let line2 = UIView()
line2.backgroundColor = UIColor.init(named: "灰色分界线")
timeView.addSubview(line2)
line2.snp.makeConstraints { (make) in
make.left.equalTo(15*glscale)
make.right.equalTo(-15*glscale)
make.top.equalTo(calendarV.snp_bottom)
make.height.equalTo(1)
}
// let line2 = UIView()
// line2.backgroundColor = UIColor.init(named: "灰色分界线")
// timeView.addSubview(line2)
// line2.snp.makeConstraints { (make) in
// make.left.equalTo(15*glscale)
// make.right.equalTo(-15*glscale)
// make.top.equalTo(calendarV.snp_bottom)
// make.height.equalTo(1)
// }
let sureBtn = UIButton(type: .custom)
sureBtn.setTitleColor(UIColor.init(named: "白色背景色"), for: .normal)
sureBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
sureBtn.backgroundColor = UIColor.init(named: "蓝色字体颜色")
sureBtn.setTitle("确定", for: .normal)
sureBtn.layer.cornerRadius = 3
sureBtn.addTarget(self, action: #selector(sureBtnAction(sender:)), for: .touchUpInside)
timeView.addSubview(sureBtn)
sureBtn.snp.makeConstraints { (make) in
make.right.bottom.equalTo(-15*glscale)
make.width.equalTo(70*glscale)
make.height.equalTo(30*glscale)
}
// let sureBtn = UIButton(type: .custom)
// sureBtn.setTitleColor(UIColor.init(named: "白色背景色"), for: .normal)
// sureBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
// sureBtn.backgroundColor = UIColor.init(named: "蓝色字体颜色")
// sureBtn.setTitle("确定", for: .normal)
// sureBtn.layer.cornerRadius = 3
// sureBtn.addTarget(self, action: #selector(sureBtnAction(sender:)), for: .touchUpInside)
// timeView.addSubview(sureBtn)
// sureBtn.snp.makeConstraints { (make) in
// make.right.bottom.equalTo(-15*glscale)
// make.width.equalTo(70*glscale)
// make.height.equalTo(30*glscale)
// }
let kuangV = UIView()
kuangV.layer.borderColor = UIColor.init(named: "灰色字体颜色")?.cgColor
......@@ -629,10 +641,9 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
kuangV.layer.cornerRadius = 3
timeView.addSubview(kuangV)
kuangV.snp.makeConstraints { (make) in
make.height.equalTo(sureBtn)
make.right.equalTo(sureBtn.snp_left).offset(-15*glscale)
make.height.equalTo(30*glscale)
make.width.equalTo(180*glscale)
make.centerY.equalTo(sureBtn)
make.right.bottom.equalTo(-15*glscale)
}
let clearBtn = UIButton(type: .custom)
......@@ -641,7 +652,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
timeView.addSubview(clearBtn)
clearBtn.snp.makeConstraints { (make) in
make.right.equalTo(kuangV.snp_right).offset(-7*glscale)
make.centerY.equalTo(sureBtn)
make.centerY.equalTo(kuangV)
}
let timeLbl = UILabel()
......@@ -650,7 +661,6 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
let timeIntervalEnd:TimeInterval = EndDate.timeIntervalSince1970
timeLbl.text = dayByDouble(sender: timeInterval) + "-" + dayByDouble(sender: timeIntervalEnd)
calendarV.setOldDate(beginD: BeginDate!, endD: EndDate!)
}else{
timeLbl.text = "-"
}
......@@ -679,19 +689,35 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
TimeLbl!.text = "-"
BeginDate = nil
EndDate = nil
start_time = 0
end_time = 0
CalendarV!.clearTheSelect()
}
var BeginDate: Date! = nil
var EndDate: Date! = nil
@objc func sureBtnAction(sender:UIButton){
//还要传日期文本出去
if BeginDate == nil || EndDate == nil {
HUD.flash(.label("请选择自定义时间段"),delay: 1.2)
return
}
print("最后的时间",BeginDate,EndDate)
if time_type == 0 {
time_type = 1
@IBAction func resetAc(_ sender: Any) {
time_type = 0
start_time = 0
end_time = 0
rightBtn.backgroundColor = UIColor(named: "分类Cell背景色")
leftBtn.backgroundColor = UIColor(named: "分类Cell背景色")
leftBtn.isSelected = false
rightBtn.isSelected = false
TimeLbl!.text = "-"
BeginDate = nil
EndDate = nil
CalendarV!.clearTheSelect()
}
@IBAction func submitAc(_ sender: Any) {
if time_type != 0 {
if BeginDate == nil || EndDate == nil {
HUD.flash(.label("请选择自定义时间段"),delay: 1.2)
return
}
}
listView.mj_header?.beginRefreshing()
selectView.isHidden = true
......
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
View file @ f12608a5
......@@ -21,7 +21,15 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
var shippingStatus : String = "100"
var orderStatus : Int = 100
var page : Int = 0
var isUpData = false
var isUpData = false{
didSet{
if !isUpData {
if tableV != nil {
loadData()
}
}
}
}
//MARK:--列表数据源
var dataArr:Array<OrderListDataModel> = []
......
GeliBusinessPlatform/ViewController/订单管理/普通商品修改价格/ChangeGoodsPriceVC.swift
View file @ f12608a5
......@@ -79,6 +79,8 @@ class ChangeGoodsPriceVC: BaseViewController , UITableViewDelegate, UITableView
editOrderGoodsPrice(["user_token":UserToken as Any,"order_id":orderID as Any,"order_goods":order_goods as Any,"logistics_price":wlPrice as Any,"other_price":qtPrice as Any], success: { (data) in
let dataM = data as! UpDataModel
if dataM.code == 1 {
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
self.delegate?.changeGoodsPriByData(sender: self.dataArr!)
self.navigationController?.popViewController(animated: true)
}
......@@ -89,6 +91,9 @@ class ChangeGoodsPriceVC: BaseViewController , UITableViewDelegate, UITableView
}
}
deinit {
NotificationCenter.default.removeObserver(self)
}
func textFieldDidEndEditing(_ textField: UITextField) {
var total = Float(0)
for i in 0..<dataArr!.count {
......
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