Skip to content

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

下一版本：1.7.5

parent 23066f90
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 19 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 14fc9e81
......@@ -4742,7 +4742,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.5;
CURRENT_PROJECT_VERSION = 5.6;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -4796,7 +4796,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GprinterSDKforIOS_v1.0.8",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK",
);
MARKETING_VERSION = 1.7.4;
MARKETING_VERSION = 1.7.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......@@ -4878,7 +4878,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.5;
CURRENT_PROJECT_VERSION = 5.6;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -4932,7 +4932,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GprinterSDKforIOS_v1.0.8",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK",
);
MARKETING_VERSION = 1.7.4;
MARKETING_VERSION = 1.7.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
View file @ 14fc9e81
......@@ -461,7 +461,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
func loadData () {
//MARK:--新增商品和编辑商品所需要的基本信息（无）就页面不正常显示
goodsDetail(["user_token":UserToken,"goods_id":goods_id], success: { (data) in
goodsDetail(["user_token":UserToken,"goods_id":goods_id], success: { [self] (data) in
//MARK: - 获取详情
self.listTbv.isHidden = false
let model = data as! GoodsDetailModel
......@@ -572,9 +572,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
data.sku_id = dataSource.sku_id!//sku_id
let arr = dataSource.spec_str?.components(separatedBy: ":")
data.guiGe = (arr?.last)!//规格
print("dict == ",dataSource.pack_attr!)
let dict = getDictionaryFromJSONString(jsonString: dataSource.pack_attr!)
data.weight = dict["wg"] as! String//重量
// print("dict == ",dataSource.pack_attr!)
if dataSource.pack_attr != nil {
let dict = getDictionaryFromJSONString(jsonString: dataSource.pack_attr!)
data.weight = dict["wg"] as! String//重量
}
data.wenDu = dataSource.refrigerate!//温藏
data.originalPrice = item.original_price!
......@@ -670,8 +672,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
// self.tishixxArr1.remove(at: 3)
//商品状态
self.shangPinStatus = (model.data?.goods_res?.gs_id)!-1
self.tishixxArr1.insert((model.data?.goods_res!.gs_name)!, at: 3)
self.tishixxArr1.remove(at: 4)
if model.data?.goods_res!.gs_name != nil {
self.tishixxArr1.insert((model.data?.goods_res!.gs_name)!, at: 3)
self.tishixxArr1.remove(at: 4)
}
//运输方式
self.yunShuType = (model.data?.goods_res!.transportation)! - 1
self.tishixxArr1.insert(self.yunShuTypeArr[self.yunShuType!], at: 4)
......
GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQCell.xib
View file @ 14fc9e81
<?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" 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="17125"/>
<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"/>
......@@ -218,9 +218,6 @@
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift
View file @ 14fc9e81
......@@ -95,7 +95,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
var titleArr = ["采购单号","采购日期","供应商","采购人","采购类型","支付方式","支付状态","备注","制单人"]
var holderArr = ["-","-","-","-","-","未支付","未付款","-","-"]
let zfTypeArr = ["未付款","已付款","月结","欠款"]
let zfTypeArr = ["未付款","已付款","月结","欠款（纳入应收账款）"]
let zfWayArr = ["未支付","现金","转账（私）","转账（公）","转账（微信）","转账（支付宝）"]
......@@ -104,7 +104,6 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
var model:PurchaseOrderDetailDataModel?
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "采购单详情"
......@@ -125,7 +124,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
btmView.isHidden = true
btmColor.isHidden = true
btmHeight.constant = 0
btmColor.backgroundColor = UIColor(named: "app底色")
btmColor.backgroundColor = UIColor(named:"app底色")
}else{
btmHeight.constant = 49
btmColor.backgroundColor = UIColor.white
......@@ -143,7 +142,6 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
btn.addTarget(self, action: #selector(btmBtnClick(sender:)), for: .touchUpInside)
}
}
}
var isBackOut = false
@objc func btmBtnClick(sender:UIButton){
......
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