Skip to content

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

1.5.1上架版本

parent d2447cf8
Show whitespace changes
Inline Side-by-side
Showing with 196 additions and 90 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
......@@ -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)
......@@ -535,7 +535,6 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}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)
......
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
rightBtn.isSelected = false
leftBtn.isSelected = !leftBtn.isSelected
if leftBtn.isSelected {
leftBtn.backgroundColor = UIColor(named: "按钮背景颜色")
time_type = 1
}else{
leftBtn.backgroundColor = UIColor(named: "分类Cell背景色")
rightBtn.backgroundColor = UIColor(named: "按钮背景颜色")
time_type = 0
}
rightBtn.isSelected = false
}else{
leftBtn.backgroundColor = UIColor(named: "分类Cell背景色")
leftBtn.isSelected = false
rightBtn.isSelected = true
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 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 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 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){
//还要传日期文本出去
@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
}
print("最后的时间",BeginDate,EndDate)
if time_type == 0 {
time_type = 1
}
listView.mj_header?.beginRefreshing()
selectView.isHidden = true
......
GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQViewController.xib
View file @ f12608a5
......@@ -11,7 +11,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="YingFuZhangKuanXQViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="closeBtn" destination="5UV-zj-jxf" id="Vbq-dY-Ijt"/>
<outlet property="closeBtn" destination="zyi-nL-GSG" id="mAQ-ei-rt5"/>
<outlet property="leftBtn" destination="CGG-bQ-22Y" id="ISw-SU-qHs"/>
<outlet property="listView" destination="7VX-Hn-lfa" id="MWv-pp-tI2"/>
<outlet property="rightBtn" destination="aff-vT-yfV" id="x2Z-c9-IDg"/>
......@@ -56,20 +56,79 @@
<outlet property="delegate" destination="-1" id="zHH-kE-AK4"/>
</connections>
</tableView>
<button hidden="YES" opaque="NO" alpha="0.40000000000000002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5UV-zj-jxf">
<button hidden="YES" opaque="NO" alpha="0.40000000000000002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zyi-nL-GSG">
<rect key="frame" x="0.0" y="88" width="414" height="808"/>
<color key="backgroundColor" name="标题字颜色"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="Button">
<color key="titleColor" name="标题字颜色"/>
</state>
<connections>
<action selector="closeAction:" destination="-1" eventType="touchUpInside" id="T7h-TJ-vEk"/>
<action selector="closeAction:" destination="-1" eventType="touchUpInside" id="M4t-U9-1pD"/>
</connections>
</button>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZLV-28-Hdt">
<rect key="frame" x="0.0" y="88" width="414" height="400"/>
<rect key="frame" x="0.0" y="88" width="414" height="449"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7hp-nb-k5h">
<rect key="frame" x="0.0" y="400" width="414" height="49"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CGG-bQ-22Y">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gAj-F6-fCg">
<rect key="frame" x="0.0" y="0.0" width="414" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="5ol-Nj-aNz"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RaI-ng-hEf">
<rect key="frame" x="206.5" y="0.0" width="1" height="49"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="iDB-0Y-n0a"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hGb-pp-DJn">
<rect key="frame" x="0.0" y="1" width="206.5" height="48"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="重置">
<color key="titleColor" name="多选按钮字体颜色"/>
</state>
<connections>
<action selector="resetAc:" destination="-1" eventType="touchUpInside" id="Tm9-8M-apw"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NhL-eZ-I6n">
<rect key="frame" x="207.5" y="1" width="206.5" height="48"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="确定">
<color key="titleColor" name="蓝色字体颜色"/>
</state>
<connections>
<action selector="submitAc:" destination="-1" eventType="touchUpInside" id="PpK-BI-fIB"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="gAj-F6-fCg" firstAttribute="top" secondItem="7hp-nb-k5h" secondAttribute="top" id="0BQ-8u-MPd"/>
<constraint firstItem="hGb-pp-DJn" firstAttribute="leading" secondItem="7hp-nb-k5h" secondAttribute="leading" id="2Us-mM-WYx"/>
<constraint firstAttribute="bottom" secondItem="hGb-pp-DJn" secondAttribute="bottom" id="2nf-V2-PbZ"/>
<constraint firstItem="hGb-pp-DJn" firstAttribute="top" secondItem="gAj-F6-fCg" secondAttribute="bottom" id="2qd-J6-QuX"/>
<constraint firstItem="gAj-F6-fCg" firstAttribute="leading" secondItem="7hp-nb-k5h" secondAttribute="leading" id="AZA-Cc-GF3"/>
<constraint firstItem="NhL-eZ-I6n" firstAttribute="top" secondItem="gAj-F6-fCg" secondAttribute="bottom" id="BuJ-pS-3lc"/>
<constraint firstItem="RaI-ng-hEf" firstAttribute="centerX" secondItem="7hp-nb-k5h" secondAttribute="centerX" id="E4J-Cj-1Et"/>
<constraint firstItem="RaI-ng-hEf" firstAttribute="top" secondItem="7hp-nb-k5h" secondAttribute="top" id="M5l-Bd-HE3"/>
<constraint firstAttribute="bottom" secondItem="RaI-ng-hEf" secondAttribute="bottom" id="NOa-5t-88J"/>
<constraint firstItem="RaI-ng-hEf" firstAttribute="leading" secondItem="hGb-pp-DJn" secondAttribute="trailing" id="P6Q-Cw-Op8"/>
<constraint firstAttribute="bottom" secondItem="NhL-eZ-I6n" secondAttribute="bottom" id="XT1-rN-sqZ"/>
<constraint firstAttribute="trailing" secondItem="NhL-eZ-I6n" secondAttribute="trailing" id="YE0-bb-GWW"/>
<constraint firstItem="NhL-eZ-I6n" firstAttribute="leading" secondItem="RaI-ng-hEf" secondAttribute="trailing" id="aJm-yk-KEj"/>
<constraint firstAttribute="trailing" secondItem="gAj-F6-fCg" secondAttribute="trailing" id="oZ2-Bt-0f0"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CGG-bQ-22Y">
<rect key="frame" x="15" y="20" width="86" height="30"/>
<color key="backgroundColor" name="按钮背景颜色"/>
<color key="backgroundColor" name="分类Cell背景色"/>
<constraints>
<constraint firstAttribute="width" constant="86" id="ib9-Xk-jxb"/>
<constraint firstAttribute="height" constant="30" id="wM8-De-cNt"/>
......@@ -124,20 +183,26 @@
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K8k-7a-iai">
<rect key="frame" x="0.0" y="71" width="414" height="329"/>
<color key="backgroundColor" name="白色背景色"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="329" id="wwh-zL-3Oe"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" name="白色背景色"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="K8k-7a-iai" secondAttribute="bottom" id="1mU-CM-tdG"/>
<constraint firstItem="Fyo-qu-1M0" firstAttribute="top" secondItem="CGG-bQ-22Y" secondAttribute="bottom" constant="20" id="9OI-Bg-5VR"/>
<constraint firstItem="Fyo-qu-1M0" firstAttribute="leading" secondItem="ZLV-28-Hdt" secondAttribute="leading" constant="15" id="BH9-fU-n3W"/>
<constraint firstItem="CGG-bQ-22Y" firstAttribute="top" secondItem="ZLV-28-Hdt" secondAttribute="top" constant="20" id="Cbl-8z-Y0X"/>
<constraint firstAttribute="height" constant="400" id="JZx-xw-bJf"/>
<constraint firstAttribute="trailing" secondItem="7hp-nb-k5h" secondAttribute="trailing" id="DdE-P6-whH"/>
<constraint firstItem="7hp-nb-k5h" firstAttribute="leading" secondItem="ZLV-28-Hdt" secondAttribute="leading" id="IAq-DM-L0L"/>
<constraint firstAttribute="height" constant="449" id="JZx-xw-bJf"/>
<constraint firstItem="K8k-7a-iai" firstAttribute="leading" secondItem="ZLV-28-Hdt" secondAttribute="leading" id="Lre-Yb-BNZ"/>
<constraint firstItem="aff-vT-yfV" firstAttribute="leading" secondItem="CGG-bQ-22Y" secondAttribute="trailing" constant="20" id="OJp-NB-irk"/>
<constraint firstAttribute="bottom" secondItem="7hp-nb-k5h" secondAttribute="bottom" id="dC4-n5-Y2M"/>
<constraint firstItem="CGG-bQ-22Y" firstAttribute="leading" secondItem="ZLV-28-Hdt" secondAttribute="leading" constant="15" id="jrh-a0-6Wf"/>
<constraint firstAttribute="trailing" secondItem="Fyo-qu-1M0" secondAttribute="trailing" id="lOa-vY-pnz"/>
<constraint firstItem="7hp-nb-k5h" firstAttribute="top" secondItem="K8k-7a-iai" secondAttribute="bottom" id="m0j-9u-AOR"/>
<constraint firstItem="aff-vT-yfV" firstAttribute="centerY" secondItem="CGG-bQ-22Y" secondAttribute="centerY" id="n9G-ib-t15"/>
<constraint firstItem="K8k-7a-iai" firstAttribute="top" secondItem="Fyo-qu-1M0" secondAttribute="bottom" id="qHj-wg-VSj"/>
<constraint firstAttribute="trailing" secondItem="K8k-7a-iai" secondAttribute="trailing" id="rlh-yY-Twy"/>
......@@ -147,18 +212,18 @@
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="7VX-Hn-lfa" secondAttribute="bottom" id="2Iq-cw-oqg"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="5UV-zj-jxf" secondAttribute="trailing" id="8Bf-1V-7xw"/>
<constraint firstItem="zyi-nL-GSG" firstAttribute="top" secondItem="fQf-mJ-t0V" secondAttribute="bottom" id="83u-fe-Bym"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="ZLV-28-Hdt" secondAttribute="trailing" id="8p9-2z-2Oc"/>
<constraint firstItem="7VX-Hn-lfa" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="C7e-vT-gsO"/>
<constraint firstItem="5UV-zj-jxf" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="CyH-Qz-hdT"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="7VX-Hn-lfa" secondAttribute="trailing" id="I5T-Hi-Vzl"/>
<constraint firstItem="ZLV-28-Hdt" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="ImO-oE-lyy"/>
<constraint firstItem="ZLV-28-Hdt" firstAttribute="top" secondItem="fQf-mJ-t0V" secondAttribute="bottom" id="OOX-HO-WB4"/>
<constraint firstItem="5UV-zj-jxf" firstAttribute="top" secondItem="fQf-mJ-t0V" secondAttribute="bottom" id="WEt-z9-b0d"/>
<constraint firstItem="zyi-nL-GSG" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="d6Y-W1-OAc"/>
<constraint firstItem="fQf-mJ-t0V" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="icu-mW-FZt"/>
<constraint firstAttribute="bottom" secondItem="5UV-zj-jxf" secondAttribute="bottom" id="kfL-Si-92f"/>
<constraint firstItem="fQf-mJ-t0V" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="nfj-aR-oRw"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="fQf-mJ-t0V" secondAttribute="trailing" id="nr6-M0-Qmp"/>
<constraint firstAttribute="bottom" secondItem="zyi-nL-GSG" secondAttribute="bottom" id="sJ8-YG-C8G"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="zyi-nL-GSG" secondAttribute="trailing" id="wNU-14-oa1"/>
<constraint firstItem="7VX-Hn-lfa" firstAttribute="top" secondItem="fQf-mJ-t0V" secondAttribute="bottom" id="zbU-xQ-hmN"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
......@@ -176,14 +241,17 @@
<namedColor name="多选按钮字体颜色">
<color red="0.41200000047683716" green="0.41200000047683716" blue="0.41200000047683716" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮背景颜色">
<color red="0.2199999988079071" green="0.45500001311302185" blue="0.82700002193450928" 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>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
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