Skip to content

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

按私服大收到发

parent 13f11669
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 55 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 3eedab35
......@@ -188,6 +188,10 @@
E05AEF99261572D500FB7CF4 /* MAMapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E05AEF96261572D500FB7CF4 /* MAMapKit.framework */; };
E05AEF9A261572D500FB7CF4 /* AMapSearchKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E05AEF97261572D500FB7CF4 /* AMapSearchKit.framework */; };
E05AEF9F261572E600FB7CF4 /* AMap.bundle in Resources */ = {isa = PBXBuildFile; fileRef = E05AEF9E261572E600FB7CF4 /* AMap.bundle */; };
E05AEFA6261577EA00FB7CF4 /* P_P_H_Adr_VC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05AEFA4261577EA00FB7CF4 /* P_P_H_Adr_VC.swift */; };
E05AEFA7261577EA00FB7CF4 /* P_P_H_Adr_VC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E05AEFA5261577EA00FB7CF4 /* P_P_H_Adr_VC.xib */; };
E05AEFAD2615976200FB7CF4 /* P_P_H_YDLB_VC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05AEFAB2615976200FB7CF4 /* P_P_H_YDLB_VC.swift */; };
E05AEFAE2615976200FB7CF4 /* P_P_H_YDLB_VC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E05AEFAC2615976200FB7CF4 /* P_P_H_YDLB_VC.xib */; };
E05FAD272498A5E500D8C90D /* accountsPayableInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */; };
E05FAD2A2498A5F200D8C90D /* accountsPayableListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05FAD292498A5F200D8C90D /* accountsPayableListModel.swift */; };
E06524F124580AAC00CA22E2 /* RuKuJiaGeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E06524EF24580AAC00CA22E2 /* RuKuJiaGeCell.swift */; };
......@@ -957,6 +961,10 @@
E05AEF96261572D500FB7CF4 /* MAMapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MAMapKit.framework; sourceTree = "<group>"; };
E05AEF97261572D500FB7CF4 /* AMapSearchKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AMapSearchKit.framework; sourceTree = "<group>"; };
E05AEF9E261572E600FB7CF4 /* AMap.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AMap.bundle; sourceTree = "<group>"; };
E05AEFA4261577EA00FB7CF4 /* P_P_H_Adr_VC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = P_P_H_Adr_VC.swift; sourceTree = "<group>"; };
E05AEFA5261577EA00FB7CF4 /* P_P_H_Adr_VC.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = P_P_H_Adr_VC.xib; sourceTree = "<group>"; };
E05AEFAB2615976200FB7CF4 /* P_P_H_YDLB_VC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = P_P_H_YDLB_VC.swift; sourceTree = "<group>"; };
E05AEFAC2615976200FB7CF4 /* P_P_H_YDLB_VC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = P_P_H_YDLB_VC.xib; sourceTree = "<group>"; };
E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = accountsPayableInterface.swift; sourceTree = "<group>"; };
E05FAD292498A5F200D8C90D /* accountsPayableListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = accountsPayableListModel.swift; sourceTree = "<group>"; };
E06524EF24580AAC00CA22E2 /* RuKuJiaGeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuKuJiaGeCell.swift; sourceTree = "<group>"; };
......@@ -2114,6 +2122,17 @@
path = Frameworks;
sourceTree = "<group>";
};
E05AEFA3261577C600FB7CF4 /* 拼拼货group */ = {
isa = PBXGroup;
children = (
E05AEFA4261577EA00FB7CF4 /* P_P_H_Adr_VC.swift */,
E05AEFA5261577EA00FB7CF4 /* P_P_H_Adr_VC.xib */,
E05AEFAB2615976200FB7CF4 /* P_P_H_YDLB_VC.swift */,
E05AEFAC2615976200FB7CF4 /* P_P_H_YDLB_VC.xib */,
);
path = "拼拼货group";
sourceTree = "<group>";
};
E05FAD282498A5E800D8C90D /* yfzkModel */ = {
isa = PBXGroup;
children = (
......@@ -2376,6 +2395,7 @@
E09B03AD2445B0BA00211A51 /* ViewController */ = {
isa = PBXGroup;
children = (
E05AEFA3261577C600FB7CF4 /* 拼拼货group */,
E083F0B826047B8200627DBE /* 店长管理 */,
E0E6A59525FC66A800C9BCD6 /* 店长审核 */,
E0F83BA625F7082E00D31672 /* 批次库新Cell */,
......@@ -3993,6 +4013,7 @@
F95567A82453DA86009674AB /* WarehoseMangementListVC.xib in Resources */,
E0C4F4BE244EF53D00CC7E2F /* BindStepTwoViewController.xib in Resources */,
E00B0B1C24629E99006DC846 /* SJMapCell.xib in Resources */,
E05AEFAE2615976200FB7CF4 /* P_P_H_YDLB_VC.xib in Resources */,
E02A3CB025C3ED0400A4E369 /* S_P_K_C_Detail_Vc.xib in Resources */,
E01613DE2601B47700E55497 /* Location_Cell.xib in Resources */,
F90D37FA25529984001F3AED /* GLAlertTbAddViewCell.xib in Resources */,
......@@ -4003,6 +4024,7 @@
E007B1D5248F6880004D14CC /* CGDDayCell.xib in Resources */,
E07B1E63245921A60055BA3C /* KeHuXQCell.xib in Resources */,
E00D85EB244561FE00F5F816 /* LaunchScreen.storyboard in Resources */,
E05AEFA7261577EA00FB7CF4 /* P_P_H_Adr_VC.xib in Resources */,
E0AD92EA2550E50500D82C17 /* GYS_FX_Product_VC.xib in Resources */,
E02FD9FB24557E8600E10E27 /* XinZengDiZhiViewController.xib in Resources */,
E0E5605B25C169E30004BA56 /* GPrinter_Cell.xib in Resources */,
......@@ -4521,6 +4543,7 @@
E0A930142603387A00287E4A /* OnlyTimeSelectView.swift in Sources */,
E07B1E62245921A60055BA3C /* KeHuXQCell.swift in Sources */,
E0CC847C24823087009B1FE9 /* GetGoodBatchModel.swift in Sources */,
E05AEFA6261577EA00FB7CF4 /* P_P_H_Adr_VC.swift in Sources */,
F9FA9C5A255B8772004034B3 /* RetailManageFooterView.swift in Sources */,
E077DC6A25512E94000B0DA5 /* FX_Product_GuanLiVC.swift in Sources */,
E0AA3A89248F3E1400CBFC27 /* StatisticsInterface.swift in Sources */,
......@@ -4598,6 +4621,7 @@
F956D5AE246A2D9C003FF510 /* LMNTextLine.m in Sources */,
F9531F442465108800724BEE /* JXPhotoBrowserFadeAnimator.swift in Sources */,
E007B1DB248F8F57004D14CC /* PurchaseInterface.swift in Sources */,
E05AEFAD2615976200FB7CF4 /* P_P_H_YDLB_VC.swift in Sources */,
F956D5AD246A2D9C003FF510 /* LMNLine.m in Sources */,
E02A3CD525C3F4E700A4E369 /* S_P_K_C_Report_Cell.swift in Sources */,
E0CC848724823EC1009B1FE9 /* CRKCell.swift in Sources */,
......
GeliBusinessPlatform/AppDelegate.swift
View file @ 3eedab35
......@@ -282,7 +282,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont
let v2 = GoodsManageListVC()
let v3 = WorkCViewController()
// let v3 = WorkCViewController()
let v3 = P_P_H_YDLB_VC()
let v4 = WarehoseMangementListVC()
......
GeliBusinessPlatform/Assets.xcassets/仓库/Gloc.imageset/Contents.json 0 → 100644
View file @ 3eedab35
{
"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/View/Cell/YunDanLieBiaoCell.swift
View file @ 3eedab35
......@@ -31,9 +31,6 @@ class YunDanLieBiaoCell: UITableViewCell {
/// 收货人
@IBOutlet weak var receiverLbl: UILabel!
/// 货品名称
@IBOutlet weak var productNameLbl: UILabel!
/// 签收状态
@IBOutlet weak var signLbl: UILabel!
/// 根据状态给标题
@IBOutlet weak var acButton: UIButton!
override func awakeFromNib() {
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下单成功/BtmBtnCell.xib
View file @ 3eedab35
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<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="16087"/>
<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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -18,7 +18,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="108.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GA5-ph-e3Y">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GA5-ph-e3Y">
<rect key="frame" x="92.5" y="20" width="90" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="90" id="48a-I5-oaq"/>
......@@ -42,7 +42,7 @@
<action selector="btnClickAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Cnf-wV-WAH"/>
</connections>
</button>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WYB-IU-5ll">
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WYB-IU-5ll">
<rect key="frame" x="192.5" y="20" width="90" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="90" id="qDW-aj-1Vm"/>
......@@ -66,7 +66,7 @@
<action selector="btnClickAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="rsj-ga-xL7"/>
</connections>
</button>
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1D3-Ie-AV7">
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1D3-Ie-AV7">
<rect key="frame" x="157.5" y="70" width="60" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="F12-eU-DN8"/>
......
GeliBusinessPlatform/ViewController/地图/SJMapViewController.swift
View file @ 3eedab35
......@@ -30,13 +30,9 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
var adrArr:Array<AMapPOI> = []
var searchV : SearchBarView? = nil
var listView:UITableView? = nil
override func viewWillAppear(_ animated: Bool) {
self.navigationController?.navigationBar.isHidden = true
IQKeyboardManager.shared.shouldPlayInputClicks = true
......@@ -303,6 +299,13 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
make.top.left.right.equalTo(0)
make.bottom.equalTo(btmView.snp_top)
}
mapView.subviews.forEach { (item) in
if item.isKind(of: UIImageView.classForCoder()){
let img = item as! UIImageView
img.image = UIImage()
}
}
let tap = UITapGestureRecognizer(target: self, action: #selector(cancelKeyboard))
mapView.addGestureRecognizer(tap)
......
GeliBusinessPlatform/ViewController/店长管理/DZGL_VC.swift
View file @ 3eedab35
......@@ -229,7 +229,7 @@ class DZGL_VC: BaseViewController, UITableViewDelegate, UITableViewDataSource, U
tableView.mj_header = self.headerMJ
tableView.mj_header?.beginRefreshing()
self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
tableView.mj_footer = self.footerMJ
tableView.register(UINib(nibName: "DZGL_Cell", bundle: nil), forCellReuseIdentifier: "DZGL_Cell")
......
GeliBusinessPlatform/ViewController/拼拼货group/P_P_H_Adr_VC.swift 0 → 100644
View file @ 3eedab35
//
// P_P_H_Adr_VC.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/4/1.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class P_P_H_Adr_VC: BaseViewController {
@IBAction func adr_select_action(_ sender: UIButton) {
}
@IBOutlet weak var city_lbl: UILabel!
@IBOutlet weak var top_view: UIView!
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "信息填写"
self.view.addSubview(navbar)
top_view.snp.makeConstraints { (make) in
make.top.equalTo(NavCGRect.height+10)
make.left.equalTo(15)
make.right.equalTo(-15)
make.height.equalTo(200)
}
}
/*
// 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/拼拼货group/P_P_H_YDLB_VC.swift 0 → 100644
View file @ 3eedab35
//
// P_P_H_YDLB_VC.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/4/1.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class P_P_H_YDLB_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource {
@IBOutlet weak var line_view: UIView!
@IBAction func click_action(_ sender: UIButton) {
line_view.center.x = sender.center.x
if sender == receive_btn {
receive_btn.isSelected = true
send_btn.isSelected = false
}else{
receive_btn.isSelected = false
send_btn.isSelected = true
}
list_view.mj_header?.beginRefreshing()
}
@IBOutlet weak var receive_btn: UIButton!
@IBOutlet weak var send_btn: UIButton!
@IBOutlet weak var list_view: UITableView!
@IBOutlet weak var top_btn_view: UIView!
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "运单列表"
self.view.addSubview(navbar)
SetTopFrame(view: top_btn_view, height: 44)
list_view.separatorStyle = .none
list_view.register(UINib(nibName: "YunDanLieBiaoCell", bundle: nil), forCellReuseIdentifier: "YunDanLieBiaoCell")
headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
list_view.mj_header = self.headerMJ
list_view.mj_header?.beginRefreshing()
footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
list_view.mj_footer = self.footerMJ
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 3
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 181
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "YunDanLieBiaoCell") as! YunDanLieBiaoCell
return cell
}
var page = 0
let UserToken = UserDefaults.standard.value(forKey: "user_token")
var isUpData = false{
didSet{
if !isUpData {
if list_view != nil {
list_view.mj_header?.beginRefreshing()
}
}
}
}
@objc func loadData(){
page = 1
isUpData = true
// dbtList(["page":page as Any,"user_token":UserToken as Any,"is_shopowner":is_shopowner as Any,"keyword":keyword as Any]) { (data) in
// self.dbt_datas.removeAll()
// let model = data as! dbtListModel
// model.data?.forEach({ (item) in
// self.dbt_datas.append(item)
// })
self.list_view.reloadData()
self.list_view?.mj_header?.endRefreshing()
// if model.data?.count == 0 {
// self.list_view?.mj_footer?.endRefreshingWithNoMoreData()
// }else{
// self.list_view?.mj_footer?.endRefreshing()
// }
// self.page = 2
// } failture: { (err) in
// self.list_view?.mj_header?.endRefreshing()
// }
}
@objc func loadMoreData(){
// dbtList(["page":page as Any,"user_token":UserToken as Any,"is_shopowner":is_shopowner as Any,"keyword":keyword as Any]){ (data) in
// let dataM = data as! dbtListModel
// if dataM.data?.count == 0 {
// self.list_view.mj_footer?.endRefreshingWithNoMoreData()
// }else{
// self.page += 1
// dataM.data?.forEach({ (model) in
// self.dbt_datas.append(model)
// })
// self.list_view.reloadData()
// self.list_view.mj_footer?.endRefreshing()
// }
// } failture: { (error) in
// self.list_view.mj_footer?.endRefreshing()
// }
}
}
GeliBusinessPlatform/ViewController/物流跟踪/WuLiuGenZongViewController.swift
View file @ 3eedab35
......@@ -63,7 +63,7 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable
//cell
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 0 {
return 227
return 181
}
return 70
}
......@@ -88,8 +88,7 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable
cell.receiverLbl.text = dataModel!.r_city_name
cell.statusLbl.text = dataModel?.delivery_status_cn
cell.productNameLbl.text = "寄托物：" + dataModel!.express_item_name!
cell.signLbl.text = "签收状态：-"
cell.standerLbl.text = "订单平台：" + dataModel!.sale_plat!
if dataModel!.sale_plat?.count == 0 {
......
GeliBusinessPlatform/ViewController/运单列表/YDLBVc.swift
View file @ 3eedab35
......@@ -747,23 +747,23 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
if rowModel.delivery_status == 1 {
return 257
return 211
}
if rowModel.delivery_status == 4 && rowModel.pay_status == 1 {
return 257
return 211
}
return 227
return 181
}
//京东、顺丰
if rowModel.delivery_status == 1 {
return 257
return 211
}
if ((rowModel.freight)! > 0) && rowModel.pay_status == 1 {
return 257
return 211
}
return 227
return 181
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return datas.count
......@@ -809,8 +809,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
cell.receiverLbl.text = rowModel.r_city_name!
cell.statusLbl.text = rowModel.delivery_status_cn!
cell.productNameLbl.text = "寄托物：" + rowModel.express_item_name!
cell.signLbl.text = "签收状态：-"
cell.standerLbl.text = "订单平台：" + rowModel.sale_plat!
if rowModel.sale_plat?.count == 0 {
......
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