Skip to content

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

阿斯顿发送到发顺丰达

parent da8dd94a
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 19 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 04563a8b
...@@ -5091,7 +5091,7 @@ ...@@ -5091,7 +5091,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements; CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.8; CURRENT_PROJECT_VERSION = 5.9;
DEFINES_MODULE = NO; DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH; DEVELOPMENT_TEAM = K48346UACH;
...@@ -5151,7 +5151,7 @@ ...@@ -5151,7 +5151,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GBDEMO", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GBDEMO",
); );
MARKETING_VERSION = 1.7.7; MARKETING_VERSION = 1.7.8;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
...@@ -5233,7 +5233,7 @@ ...@@ -5233,7 +5233,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements; CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.8; CURRENT_PROJECT_VERSION = 5.9;
DEFINES_MODULE = NO; DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH; DEVELOPMENT_TEAM = K48346UACH;
...@@ -5293,7 +5293,7 @@ ...@@ -5293,7 +5293,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GBDEMO", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GBDEMO",
); );
MARKETING_VERSION = 1.7.7; MARKETING_VERSION = 1.7.8;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
......
GeliBusinessPlatform/Define/Define.swift
View file @ 04563a8b
...@@ -27,10 +27,12 @@ let systemVersion = (UIDevice.current.systemVersion as String) ...@@ -27,10 +27,12 @@ let systemVersion = (UIDevice.current.systemVersion as String)
//接口地址 //接口地址
//test //test
let SERVERCE_ImageHost = "https://z.gelifood.com/" //let SERVERCE_ImageHost = "https://z.gelifood.com/"
let SERVERCE_HOST = "https://z.gelifood.com/admin/" //let SERVERCE_HOST = "https://z.gelifood.com/admin/"
//let SERVERCE_ImageHost = "https://zx.gelifood.com/" //let print_url = "http://z.gelifood.com/static/url/label.html?"
//let SERVERCE_HOST = "https://zx.gelifood.com/admin/" let SERVERCE_ImageHost = "https://zx.gelifood.com/"
let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
let print_url = "http://zx.gelifood.com/static/url/label.html?"
//online //online
//视图常量 //视图常量
......
GeliBusinessPlatform/Define/NetworkRequest.swift
View file @ 04563a8b
...@@ -73,12 +73,15 @@ class NetworkRequest { ...@@ -73,12 +73,15 @@ class NetworkRequest {
let serverTrustPolicies: [String: ServerTrustPolicy] = [ let serverTrustPolicies: [String: ServerTrustPolicy] = [
"z.gelifood.com": .disableEvaluation, "z.gelifood.com": .disableEvaluation,
"zx.gelifood.com": .disableEvaluation, "zx.gelifood.com": .disableEvaluation,
"cms.gelifood.com":.disableEvaluation "pay.gelifood.com": .disableEvaluation,
"cms.gelifood.com": .disableEvaluation
] ]
// Create custom manager // Create custom manager
if manager == nil { if manager == nil {
let configuration = URLSessionConfiguration.default let configuration = URLSessionConfiguration.default
configuration.httpAdditionalHeaders = Alamofire.SessionManager.defaultHTTPHeaders configuration.httpAdditionalHeaders = Alamofire.SessionManager.defaultHTTPHeaders
manager = Alamofire.SessionManager( manager = Alamofire.SessionManager(
configuration: URLSessionConfiguration.default, configuration: URLSessionConfiguration.default,
serverTrustPolicyManager: ServerTrustPolicyManager(policies: serverTrustPolicies) serverTrustPolicyManager: ServerTrustPolicyManager(policies: serverTrustPolicies)
......
GeliBusinessPlatform/Other/Web/WebViewController.swift
View file @ 04563a8b
...@@ -95,6 +95,8 @@ extension WebViewController: WKNavigationDelegate ...@@ -95,6 +95,8 @@ extension WebViewController: WKNavigationDelegate
// Log4jMessage(message: "当内容开始返回...") // Log4jMessage(message: "当内容开始返回...")
} }
// 页面加载完成之后调用 // 页面加载完成之后调用
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!){ func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!){
// Log4jMessage(message: "页面加载完成...") // Log4jMessage(message: "页面加载完成...")
...@@ -123,6 +125,8 @@ extension WebViewController: WKNavigationDelegate ...@@ -123,6 +125,8 @@ extension WebViewController: WKNavigationDelegate
if err.code == NSURLErrorCancelled { if err.code == NSURLErrorCancelled {
return return
} }
UIView.animate(withDuration: 0.5) { UIView.animate(withDuration: 0.5) {
self.progressView.progress = 0.0 self.progressView.progress = 0.0
self.progressView.isHidden = true self.progressView.isHidden = true
......
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift
View file @ 04563a8b
...@@ -113,10 +113,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne ...@@ -113,10 +113,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
var wkWebView:WKWebView? var wkWebView:WKWebView?
func printData(idx:Int){ func printData(idx:Int){
let model = printData[idx]["goods_data"] as! goodsInputBatchData let model = printData[idx]["goods_data"] as! goodsInputBatchData
//测试 let urlStr = print_url + "goods_name=\(printData[idx]["goods_name"] as! String)&spec_str=\(printData[idx]["spec_str"] as! String)&batch_sn=\(model.batch_sn!)&batch_id=\(model.batch_id!)&iscs=0"
let urlStr = "http://z.gelifood.com/static/url/label.html?goods_name=\(printData[idx]["goods_name"] as! String)&spec_str=\(printData[idx]["spec_str"] as! String)&batch_sn=\(model.batch_sn!)&batch_id=\(model.batch_id!)&iscs=1"
//online
// let urlStr = "http://zx.gelifood.com/static/url/label.html?goods_name=\(printData[idx]["goods_name"] as! String)&spec_str=\(printData[idx]["spec_str"] as! String)&batch_sn=\(model.batch_sn!)&batch_id=\(model.batch_id!)&iscs=0"
let urlString = urlStr.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)! let urlString = urlStr.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
let url = URL(string: urlString) let url = URL(string: urlString)
if wkWebView == nil { if wkWebView == nil {
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
View file @ 04563a8b
...@@ -84,10 +84,8 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo ...@@ -84,10 +84,8 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
var wkWebView:WKWebView? var wkWebView:WKWebView?
func printData(idx:Int){ func printData(idx:Int){
let model = printData[idx]["goods_data"] as! GetGoodBatchDataModel let model = printData[idx]["goods_data"] as! GetGoodBatchDataModel
//测试
// let urlStr = "http://z.gelifood.com/static/url/label.html?goods_name=\(printData[idx]["goods_name"] as! String)&spec_str=\(printData[idx]["spec_str"] as! String)&batch_sn=\(model.batch_sn!)&batch_id=\(model.batch_id!)&iscs=1" let urlStr = print_url + "goods_name=\(printData[idx]["goods_name"] as! String)&spec_str=\(printData[idx]["spec_str"] as! String)&batch_sn=\(model.batch_sn!)&batch_id=\(model.batch_id!)&iscs=0"
//online
let urlStr = "http://zx.gelifood.com/static/url/label.html?goods_name=\(printData[idx]["goods_name"] as! String)&spec_str=\(printData[idx]["spec_str"] as! String)&batch_sn=\(model.batch_sn!)&batch_id=\(model.batch_id!)&iscs=0"
let urlString = urlStr.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)! let urlString = urlStr.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
let url = URL(string: urlString) let url = URL(string: urlString)
if wkWebView == nil { if wkWebView == nil {
......
GeliBusinessPlatform/ViewController/地址管理/DZGLViewController.swift
View file @ 04563a8b
...@@ -572,6 +572,6 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData ...@@ -572,6 +572,6 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
deleteAction.image = UIImage(named: "shanchuWhite") deleteAction.image = UIImage(named: "shanchuWhite")
deleteAction.backgroundColor = UIColor(named: "#F57575") deleteAction.backgroundColor = UIColor(named: "#F57575")
//返回右侧事件按钮 //返回右侧事件按钮
return [deleteAction,] return [deleteAction]
} }
} }
GeliBusinessPlatform/ViewController/支付账号（设置，修改）/PayViewController.swift
View file @ 04563a8b
...@@ -94,6 +94,7 @@ class PayViewController: BaseViewController ,GeliAlertViewDelegate{ ...@@ -94,6 +94,7 @@ class PayViewController: BaseViewController ,GeliAlertViewDelegate{
let dataM = data as! LocationGeliPayModel let dataM = data as! LocationGeliPayModel
let vc = WebViewController() let vc = WebViewController()
vc.urlStr = dataM.data?.url vc.urlStr = dataM.data?.url
print("vcURL = ",vc.urlStr)
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
}) { (error) in }) { (error) in
......
GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift
View file @ 04563a8b
...@@ -219,7 +219,6 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl ...@@ -219,7 +219,6 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
vc.isCaiGou = true vc.isCaiGou = true
vc.isCaiGou_GYS_name = (modelD?.purchase_order?.ven_name)! vc.isCaiGou_GYS_name = (modelD?.purchase_order?.ven_name)!
vc.isCaiGou_GYS_ven_id = (modelD?.purchase_order?.ven_id)! vc.isCaiGou_GYS_ven_id = (modelD?.purchase_order?.ven_id)!
print("name= = ",vc.isCaiGou_GYS_name)
vc.rkSelectArr = rkDatas vc.rkSelectArr = rkDatas
vc.po_id = model?.po_id! as! Int vc.po_id = model?.po_id! as! Int
vc.delegate = self vc.delegate = self
......
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