Skip to content

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

格利商品安全溯源信息

parent cc448fb1
Hide whitespace changes
Inline Side-by-side
Showing with 959 additions and 26 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 7a3499b3
......@@ -236,6 +236,14 @@
E095C42724874BDA00922571 /* CKNonGmCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E095C42524874BDA00922571 /* CKNonGmCell.xib */; };
E095C42A24874E6100922571 /* CKGmCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E095C42824874E6100922571 /* CKGmCell.swift */; };
E095C42B24874E6100922571 /* CKGmCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E095C42924874E6100922571 /* CKGmCell.xib */; };
E0974D5725C12DE100E3C86B /* one_title_cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0974D5525C12DE100E3C86B /* one_title_cell.swift */; };
E0974D5825C12DE100E3C86B /* one_title_cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0974D5625C12DE100E3C86B /* one_title_cell.xib */; };
E0974D5E25C12E8D00E3C86B /* two_title_cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0974D5C25C12E8D00E3C86B /* two_title_cell.swift */; };
E0974D5F25C12E8D00E3C86B /* two_title_cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0974D5D25C12E8D00E3C86B /* two_title_cell.xib */; };
E0974D6525C12FAA00E3C86B /* scv_cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0974D6325C12FAA00E3C86B /* scv_cell.swift */; };
E0974D6625C12FAA00E3C86B /* scv_cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0974D6425C12FAA00E3C86B /* scv_cell.xib */; };
E0974D6C25C140A600E3C86B /* S_Y_Detail_Vc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0974D6A25C140A600E3C86B /* S_Y_Detail_Vc.swift */; };
E0974D6D25C140A600E3C86B /* S_Y_Detail_Vc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0974D6B25C140A600E3C86B /* S_Y_Detail_Vc.xib */; };
E099B588246BF8FA009F587F /* OrderDViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E099B586246BF8FA009F587F /* OrderDViewController.swift */; };
E099B589246BF8FA009F587F /* OrderDViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E099B587246BF8FA009F587F /* OrderDViewController.xib */; };
E09B03A12445AF7100211A51 /* Define.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B03A02445AF7100211A51 /* Define.swift */; };
......@@ -364,6 +372,8 @@
E0CC848824823EC1009B1FE9 /* CRKCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0CC848624823EC1009B1FE9 /* CRKCell.xib */; };
E0CC848B24824291009B1FE9 /* CRKListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0CC848924824291009B1FE9 /* CRKListVC.swift */; };
E0CC848C24824291009B1FE9 /* CRKListVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0CC848A24824291009B1FE9 /* CRKListVC.xib */; };
E0D11BD525C12C540066DB21 /* img_title_cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D11BD325C12C540066DB21 /* img_title_cell.swift */; };
E0D11BD625C12C540066DB21 /* img_title_cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D11BD425C12C540066DB21 /* img_title_cell.xib */; };
E0D197BA2448431C002B080C /* BabyDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197A92448431B002B080C /* BabyDefine.m */; };
E0D197BB2448431C002B080C /* BabyCallback.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197AB2448431B002B080C /* BabyCallback.m */; };
E0D197BC2448431C002B080C /* BabyPeripheralManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197AD2448431B002B080C /* BabyPeripheralManager.m */; };
......@@ -945,6 +955,14 @@
E095C42524874BDA00922571 /* CKNonGmCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CKNonGmCell.xib; sourceTree = "<group>"; };
E095C42824874E6100922571 /* CKGmCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CKGmCell.swift; sourceTree = "<group>"; };
E095C42924874E6100922571 /* CKGmCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CKGmCell.xib; sourceTree = "<group>"; };
E0974D5525C12DE100E3C86B /* one_title_cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = one_title_cell.swift; sourceTree = "<group>"; };
E0974D5625C12DE100E3C86B /* one_title_cell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = one_title_cell.xib; sourceTree = "<group>"; };
E0974D5C25C12E8D00E3C86B /* two_title_cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = two_title_cell.swift; sourceTree = "<group>"; };
E0974D5D25C12E8D00E3C86B /* two_title_cell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = two_title_cell.xib; sourceTree = "<group>"; };
E0974D6325C12FAA00E3C86B /* scv_cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = scv_cell.swift; sourceTree = "<group>"; };
E0974D6425C12FAA00E3C86B /* scv_cell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = scv_cell.xib; sourceTree = "<group>"; };
E0974D6A25C140A600E3C86B /* S_Y_Detail_Vc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = S_Y_Detail_Vc.swift; sourceTree = "<group>"; };
E0974D6B25C140A600E3C86B /* S_Y_Detail_Vc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = S_Y_Detail_Vc.xib; sourceTree = "<group>"; };
E099B586246BF8FA009F587F /* OrderDViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderDViewController.swift; sourceTree = "<group>"; };
E099B587246BF8FA009F587F /* OrderDViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OrderDViewController.xib; sourceTree = "<group>"; };
E09B03A02445AF7100211A51 /* Define.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Define.swift; sourceTree = "<group>"; };
......@@ -1078,6 +1096,8 @@
E0CC848624823EC1009B1FE9 /* CRKCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CRKCell.xib; sourceTree = "<group>"; };
E0CC848924824291009B1FE9 /* CRKListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CRKListVC.swift; sourceTree = "<group>"; };
E0CC848A24824291009B1FE9 /* CRKListVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CRKListVC.xib; sourceTree = "<group>"; };
E0D11BD325C12C540066DB21 /* img_title_cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = img_title_cell.swift; sourceTree = "<group>"; };
E0D11BD425C12C540066DB21 /* img_title_cell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = img_title_cell.xib; sourceTree = "<group>"; };
E0D197A82448431B002B080C /* BabyCentralManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BabyCentralManager.h; sourceTree = "<group>"; };
E0D197A92448431B002B080C /* BabyDefine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BabyDefine.m; sourceTree = "<group>"; };
E0D197AA2448431B002B080C /* BabyOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BabyOptions.h; sourceTree = "<group>"; };
......@@ -1974,10 +1994,13 @@
E06FBA9025BFE3B100E9C2BA /* 溯源 */ = {
isa = PBXGroup;
children = (
E0D11BD225C12C400066DB21 /* cell */,
E06FBAA225BFEFB200E9C2BA /* S_Y_View.swift */,
E06FBAA725BFEFBC00E9C2BA /* S_Y_View.xib */,
E01313DA25C0048C006CFA5D /* Add_Report_View.swift */,
E01313DF25C00496006CFA5D /* Add_Report_View.xib */,
E0974D6A25C140A600E3C86B /* S_Y_Detail_Vc.swift */,
E0974D6B25C140A600E3C86B /* S_Y_Detail_Vc.xib */,
);
path = "溯源";
sourceTree = "<group>";
......@@ -2582,6 +2605,21 @@
path = "应付账款";
sourceTree = "<group>";
};
E0D11BD225C12C400066DB21 /* cell */ = {
isa = PBXGroup;
children = (
E0D11BD325C12C540066DB21 /* img_title_cell.swift */,
E0D11BD425C12C540066DB21 /* img_title_cell.xib */,
E0974D5525C12DE100E3C86B /* one_title_cell.swift */,
E0974D5625C12DE100E3C86B /* one_title_cell.xib */,
E0974D5C25C12E8D00E3C86B /* two_title_cell.swift */,
E0974D5D25C12E8D00E3C86B /* two_title_cell.xib */,
E0974D6325C12FAA00E3C86B /* scv_cell.swift */,
E0974D6425C12FAA00E3C86B /* scv_cell.xib */,
);
path = cell;
sourceTree = "<group>";
};
E0D197A72448430E002B080C /* 蓝牙 */ = {
isa = PBXGroup;
children = (
......@@ -3589,9 +3627,11 @@
E02EE126259AD6FB00733764 /* FXSY_Cell.xib in Resources */,
E02870C2258C547400271055 /* AMap.bundle in Resources */,
E0A2E82824555B4400D6DB34 /* KuCunShangPinCell.xib in Resources */,
E0974D6625C12FAA00E3C86B /* scv_cell.xib in Resources */,
E0239203249069FD00C4C632 /* CGDXQVc.xib in Resources */,
F9B9FAC824DE409300ACDC8F /* UpBillDataTableViewCell.xib in Resources */,
E042F73D245288F800CDFA12 /* WenDuCell.xib in Resources */,
E0974D6D25C140A600E3C86B /* S_Y_Detail_Vc.xib in Resources */,
E02DDD92244FE55400ABB707 /* NewCreateHeader.xib in Resources */,
F9956B1C2463D941001A617D /* WorkSelectTimeView.xib in Resources */,
E09B03B72445B85A00211A51 /* LoginViewController.xib in Resources */,
......@@ -3733,6 +3773,7 @@
E0402603259C186800EDF182 /* KHXQ_Cell.xib in Resources */,
F971D7B3248B6432007F1619 /* address_new.json in Resources */,
E00D85E8244561FE00F5F816 /* Preview Assets.xcassets in Resources */,
E0D11BD625C12C540066DB21 /* img_title_cell.xib in Resources */,
E02DDD962450106C00ABB707 /* PuTongJieTiCell.xib in Resources */,
E0BE8A88245A7A1500E80134 /* JiBenXinXiCell.xib in Resources */,
F9697246248F88BB0010D39B /* GeliAltetCodeView.xib in Resources */,
......@@ -3771,6 +3812,7 @@
E02C88272456B24F00925766 /* WuLiuGenZongViewController.xib in Resources */,
F9D44E8924CBC6A400FBD8DB /* ToAndFormSelectViewController.xib in Resources */,
E0C4F4A8244EC82A00CC7E2F /* TitleAndBtnCell.xib in Resources */,
E0974D5F25C12E8D00E3C86B /* two_title_cell.xib in Resources */,
F97E73322552A22000A11F98 /* DistributorSettingAlertView.xib in Resources */,
E02FD9F72455790800E10E27 /* DiZhiGuanLiCell.xib in Resources */,
F9ECC929255CD7FD00990B61 /* RetailManageDetailViewController.xib in Resources */,
......@@ -3785,6 +3827,7 @@
E0C4F4B6244EE9EE00CC7E2F /* YuShouCell.xib in Resources */,
F95A9EDE24557CD500867849 /* GuanLianKehuVC.xib in Resources */,
E07B1E6C245926330055BA3C /* GYSGLCell.xib in Resources */,
E0974D5825C12DE100E3C86B /* one_title_cell.xib in Resources */,
E0337EEE2464EED000952EF4 /* PinPaiListViewController.xib in Resources */,
E095C42B24874E6100922571 /* CKGmCell.xib in Resources */,
E01313E025C00496006CFA5D /* Add_Report_View.xib in Resources */,
......@@ -3864,6 +3907,7 @@
F956D5B7246A3255003FF510 /* OrderListModel.swift in Sources */,
E0A409C32463F31600CFF109 /* ShouZhiTongJiViewController.swift in Sources */,
F950FDE624518B9500C40530 /* FSCalendarAppearance.m in Sources */,
E0974D6C25C140A600E3C86B /* S_Y_Detail_Vc.swift in Sources */,
F9531F392465108800724BEE /* JXPhotoBrowserPageIndicator.swift in Sources */,
F9023F6D2449A9B100DD5A63 /* TitleAndTFCell.swift in Sources */,
F9B9FAC724DE409300ACDC8F /* UpBillDataTableViewCell.swift in Sources */,
......@@ -3890,6 +3934,7 @@
F9023F712449ACA800DD5A63 /* TitleAndSwitchCell.swift in Sources */,
E0C4F4BD244EF53D00CC7E2F /* BindStepTwoViewController.swift in Sources */,
E0A409CC2464026B00CFF109 /* SecondCell.swift in Sources */,
E0974D6525C12FAA00E3C86B /* scv_cell.swift in Sources */,
E0BE8A87245A7A1500E80134 /* JiBenXinXiCell.swift in Sources */,
E0DDCB13244ADF2C00DF54C7 /* ChangePriceNormalCell.swift in Sources */,
E0EABAE72487748500F6CA8D /* NewSelectWarehouseVC.swift in Sources */,
......@@ -3913,6 +3958,7 @@
E0B5307E247266F400FFCC15 /* DKXDAdrCell.swift in Sources */,
F93E31FD24727A2D00524DFC /* ShowTimeSelectView.swift in Sources */,
E0B94623245671E100FBEC9A /* DaiKeXiaDanGouWuViewController.swift in Sources */,
E0D11BD525C12C540066DB21 /* img_title_cell.swift in Sources */,
E0A320C52456D01300AF321C /* DaiKeXiaDanFooterView.swift in Sources */,
E0336DD5244EC40000380BE9 /* CreatNewSpecsViewController.swift in Sources */,
F9531F3F2465108800724BEE /* JXPhotoBrowserNumberPageIndicator.swift in Sources */,
......@@ -3997,6 +4043,7 @@
E0AACC76255BB03C00FC9010 /* TitleAndSelectCell.swift in Sources */,
E0F97B082451620B001BD600 /* ProductDetailViewController.swift in Sources */,
E0BFFAA0259C2E6200CC8CA3 /* ADD_FXY_View.swift in Sources */,
E0974D5725C12DE100E3C86B /* one_title_cell.swift in Sources */,
F95A9EDD24557CD500867849 /* GuanLianKehuVC.swift in Sources */,
E00D85DF244561FD00F5F816 /* AppDelegate.swift in Sources */,
E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */,
......@@ -4140,6 +4187,7 @@
E051EBD724A1F0ED00892DA9 /* CGDCell.swift in Sources */,
F9697248248F88C70010D39B /* GeliAltetCodeView.swift in Sources */,
F93615DB2480B421004187F9 /* WorkInterface.swift in Sources */,
E0974D5E25C12E8D00E3C86B /* two_title_cell.swift in Sources */,
F956D5A0246A2D9C003FF510 /* LMNImageView.m in Sources */,
F970B3672550F5AA0026F9D5 /* RetailManageViewController.swift in Sources */,
E0E341EA246E95EE0060AC20 /* PingLunCell.swift in Sources */,
......
GeliBusinessPlatform/Assets.xcassets/分销商管理/down_ar.imageset/Contents.json 0 → 100644
View file @ 7a3499b3
{
"images" : [
{
"filename" : "编组 3.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "编组 3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "编组 3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/分销商管理/s_y_left_arrow.imageset/Contents.json 0 → 100644
View file @ 7a3499b3
{
"images" : [
{
"filename" : "路径备份 2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "路径备份 2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "路径备份 2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/分销商管理/s_y_right_arrow.imageset/Contents.json 0 → 100644
View file @ 7a3499b3
{
"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/Assets.xcassets/分销商管理/up_ar.imageset/Contents.json 0 → 100644
View file @ 7a3499b3
{
"images" : [
{
"filename" : "编组 3.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "编组 3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "编组 3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Model/printOrder_model/printOrderModel.swift
View file @ 7a3499b3
......@@ -54,6 +54,7 @@ class printOrder_data_res_model: Mappable {
var add_time_year:String?//年
var add_time_month:String?//月
var add_time_day:String?//日
var print_type:Int?//默认打印
required init?( map: Map) {
......@@ -78,6 +79,8 @@ class printOrder_data_res_model: Mappable {
add_time_year <- map["add_time_year"]
add_time_month <- map["add_time_month"]
add_time_day <- map["add_time_day"]
print_type <- map["print_type"]
}
}
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.swift
View file @ 7a3499b3
......@@ -13,6 +13,7 @@ protocol DaiKeXiaDanGouWuCellDelegate {
func DaiKeXiaDanGouWuCell_check(cell:DaiKeXiaDanGouWuCell)
}
class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate {
@IBOutlet weak var btm_line: UIView!
@IBOutlet weak var arrow_img: UIImageView!
@IBOutlet weak var check_button: UIButton!
var isFx = false
......@@ -55,6 +56,7 @@ class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate {
delImg.isHidden = true
delBtn.isHidden = true
holder_lbl.isHidden = true
}
}
}
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.xib
View file @ 7a3499b3
......@@ -233,6 +233,7 @@
<connections>
<outlet property="arrow_img" destination="2p2-7L-Hi7" id="iJ8-Mg-yL3"/>
<outlet property="btmLIneWidth" destination="qMJ-nI-cSg" id="dsM-yO-8bv"/>
<outlet property="btm_line" destination="oAm-E1-HwQ" id="vp2-Uf-gI6"/>
<outlet property="bz_lbl" destination="ykh-Oc-5e6" id="1JL-Gh-kqG"/>
<outlet property="changeBtn" destination="4lb-rz-I6F" id="OEf-1Q-OVb"/>
<outlet property="check_button" destination="DvI-Hk-ZNE" id="egI-io-mdA"/>
......
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ 7a3499b3
......@@ -478,7 +478,10 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
self.navigationController?.pushViewController(vc, animated: true)
return
case 63: //入库--直接入库
let vc = NewRKVc()
// let vc = NewRKVc()
// self.navigationController?.pushViewController(vc, animated: true)
let vc = S_Y_Detail_Vc()
vc.user_type = 1
self.navigationController?.pushViewController(vc, animated: true)
return
case 64: //出库--直接出库
......
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.swift
View file @ 7a3499b3
......@@ -43,7 +43,7 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
pc.printInfo = printInfo
pc.delegate = self
if userName != "不二制油" { //普通
if userName == "不二制油" { //普通
let dic = ["user_token":UserToken as Any,
"order_id":order_id as Any,
"remittance_account":"" as Any,
......@@ -158,6 +158,7 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
@IBOutlet weak var contentV: UIView!
var printData:printOrder_data_res_model?{
didSet{
viewControllers.forEach { (vc) in
if printData?.province_id != nil {
vc.provinceIndex = (printData?.province_id)!
......@@ -231,7 +232,7 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
self.view.addSubview(navbar)
SetTopFrameView(view: contentV, btmView: self.view)
if userName != "不二制油" {
if userName == "不二制油" {
normal_type_btn.isHidden = false
}else{
normal_type_btn.isHidden = true
......@@ -254,7 +255,7 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
}
holder_img.isHidden = normal_type_btn.isHidden
pagingVC?.select(index: selectIndex)
// Do any additional setup after loading the view.
}
......
GeliBusinessPlatform/ViewController/打印订单/PrintViewController.swift
View file @ 7a3499b3
......@@ -377,7 +377,7 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
list_view.separatorStyle = .none
list_view.showsVerticalScrollIndicator = false
getIndex()
if userName == "不二制油"{
if userName != "不二制油"{
get_location_id()
}
}
......
GeliBusinessPlatform/ViewController/溯源/S_Y_Detail_Vc.swift 0 → 100644
View file @ 7a3499b3
//
// S_Y_Detail_Vc.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/1/27.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class S_Y_Detail_Vc: BaseViewController ,UITableViewDataSource,UITableViewDelegate, scv_cell_delegate{
func scv_cell_check_img(idx: Int) {
print("图片 = ",idx)
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if user_type == 0 {
return 9
}
return 11
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.row == 0 {
return 442
}
if indexPath.row < 7 && indexPath.row != 0 {
return 80.5
}
if user_type == 0 {
if indexPath.row == 8 {
return 197
}
}else{
if indexPath.row > 8 {
return 197
}
}
return 114
}
var two_titles = ["","","","","","","","供货单位名称"]
let titles = ["","商品名称","商品规格","产品产地","商品条码","生产日期","保质期","","","",""]
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.row == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: "img_title_cell") as! img_title_cell
return cell
}
if indexPath.row < 7 && indexPath.row != 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: "one_title_cell") as! one_title_cell
cell.title_lbl.text = titles[indexPath.row]
return cell
}
if user_type == 0 {
if indexPath.row == 8 {
let cell = tableView.dequeueReusableCell(withIdentifier: "scv_cell") as! scv_cell
return cell
}
}else{
if indexPath.row > 8 {
let cell = tableView.dequeueReusableCell(withIdentifier: "scv_cell") as! scv_cell
cell.title_lbl.text = "供货商资质证书"
cell.delegate = self
if indexPath.row == 10 {
if user_type == 1 {
cell.title_lbl.text = "经销商资质证书"
}else{
cell.title_lbl.text = "代理商资质证书"
}
}
return cell
}
}
let cell = tableView.dequeueReusableCell(withIdentifier: "two_title_cell") as! two_title_cell
cell.title_2_lbl.text = "统一社会信用代码"
cell.title_1_lbl.text = two_titles[indexPath.row]
return cell
}
var user_type = 0{
didSet{
if user_type == 1 {
two_titles.append("经销商单位名称")
}
if user_type == 2 {
two_titles.append("代理商单位名称")
}
}
}
@IBOutlet weak var list_view: UITableView!
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "格利商品安全溯源信息"
self.view.addSubview(navbar)
list_view.snp.makeConstraints { (make) in
make.top.equalTo(navbar.snp_bottom)
make.left.right.bottom.equalTo(0)
}
list_view.separatorStyle = .none
list_view.showsVerticalScrollIndicator = false
list_view.register(UINib(nibName: "scv_cell", bundle: nil), forCellReuseIdentifier: "scv_cell")
list_view.register(UINib(nibName: "two_title_cell", bundle: nil), forCellReuseIdentifier: "two_title_cell")
list_view.register(UINib(nibName: "one_title_cell", bundle: nil), forCellReuseIdentifier: "one_title_cell")
list_view.register(UINib(nibName: "img_title_cell", bundle: nil), forCellReuseIdentifier: "img_title_cell")
}
}
GeliBusinessPlatform/ViewController/溯源/S_Y_Detail_Vc.xib 0 → 100644
View file @ 7a3499b3
<?xml version="1.0" encoding="UTF-8"?>
<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="17703"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="S_Y_Detail_Vc" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="list_view" destination="eIg-pi-wtm" id="A05-9w-f3c"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="eIg-pi-wtm">
<rect key="frame" x="0.0" y="44" width="414" height="852"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="KCc-CE-MzM"/>
<outlet property="delegate" destination="-1" id="NjD-p8-MrN"/>
</connections>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="eIg-pi-wtm" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="4Sd-Hd-7aj"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="eIg-pi-wtm" secondAttribute="trailing" id="FA9-GN-cGO"/>
<constraint firstAttribute="bottom" secondItem="eIg-pi-wtm" secondAttribute="bottom" id="hcS-2Q-XKU"/>
<constraint firstItem="eIg-pi-wtm" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="k9K-2Q-62v"/>
</constraints>
<point key="canvasLocation" x="142" y="59"/>
</view>
</objects>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/溯源/cell/img_title_cell.swift 0 → 100644
View file @ 7a3499b3
//
// img_title_cell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/1/27.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class img_title_cell: UITableViewCell {
@IBOutlet weak var img_view: UIImageView!
@IBOutlet weak var name_lbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/溯源/cell/img_title_cell.xib 0 → 100644
View file @ 7a3499b3
<?xml version="1.0" encoding="UTF-8"?>
<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="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"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="img_title_cell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="442"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="375" height="442"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="rak-sc-7q0">
<rect key="frame" x="0.0" y="0.0" width="375" height="375"/>
<constraints>
<constraint firstAttribute="height" constant="375" id="xyg-eo-yBQ"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8gT-lP-oMT">
<rect key="frame" x="0.0" y="375" width="375" height="62"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wXl-BH-s8v">
<rect key="frame" x="15" y="15" width="345" height="32"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="wXl-BH-s8v" secondAttribute="trailing" constant="15" id="Ads-ES-n2H"/>
<constraint firstItem="wXl-BH-s8v" firstAttribute="top" secondItem="8gT-lP-oMT" secondAttribute="top" constant="15" id="Ahy-f4-ikE"/>
<constraint firstAttribute="bottom" secondItem="wXl-BH-s8v" secondAttribute="bottom" constant="15" id="N5u-7z-xv2"/>
<constraint firstItem="wXl-BH-s8v" firstAttribute="leading" secondItem="8gT-lP-oMT" secondAttribute="leading" constant="15" id="rct-Z2-QaS"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstItem="8gT-lP-oMT" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="XiF-G2-wiN"/>
<constraint firstItem="8gT-lP-oMT" firstAttribute="top" secondItem="rak-sc-7q0" secondAttribute="bottom" id="eos-H3-7i2"/>
<constraint firstItem="rak-sc-7q0" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="ft9-XJ-eJg"/>
<constraint firstAttribute="trailing" secondItem="8gT-lP-oMT" secondAttribute="trailing" id="iDC-UX-1dq"/>
<constraint firstAttribute="bottom" secondItem="8gT-lP-oMT" secondAttribute="bottom" constant="5" id="pTm-lP-xZP"/>
<constraint firstItem="rak-sc-7q0" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="ryr-Mr-plF"/>
<constraint firstAttribute="trailing" secondItem="rak-sc-7q0" secondAttribute="trailing" id="uCU-Vf-35r"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="img_view" destination="rak-sc-7q0" id="tak-PE-OZE"/>
<outlet property="name_lbl" destination="wXl-BH-s8v" id="xAi-Hg-4Gl"/>
</connections>
<point key="canvasLocation" x="141.30434782608697" y="55.580357142857139"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" 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>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/溯源/cell/one_title_cell.swift 0 → 100644
View file @ 7a3499b3
//
// one_title_cell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/1/27.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class one_title_cell: UITableViewCell {
@IBOutlet weak var content_lbl: UILabel!
@IBOutlet weak var title_lbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/溯源/cell/one_title_cell.xib 0 → 100644
View file @ 7a3499b3
<?xml version="1.0" encoding="UTF-8"?>
<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="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"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="one_title_cell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="80.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="375" height="80.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Le1-hI-qXY">
<rect key="frame" x="15" y="79.5" width="360" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="qdo-PB-zAX"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DPG-Lk-Nqo">
<rect key="frame" x="15" y="10" width="33" height="18.5"/>
<constraints>
<constraint firstAttribute="height" constant="18.5" id="64F-Kp-lI6"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gPA-WE-zaw">
<rect key="frame" x="15" y="33.5" width="345" height="41"/>
<string key="text">法国进口鲜冻红金枪鱼法国进口鲜冻红金法国口鲜冻红金进
口鲜冻红金</string>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="gPA-WE-zaw" secondAttribute="trailing" constant="15" id="52Z-9E-XpV"/>
<constraint firstItem="Le1-hI-qXY" firstAttribute="top" secondItem="gPA-WE-zaw" secondAttribute="bottom" constant="5" id="G0B-9D-GHZ"/>
<constraint firstItem="DPG-Lk-Nqo" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="NTz-dp-oX2"/>
<constraint firstItem="gPA-WE-zaw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Z6t-fa-wY3"/>
<constraint firstAttribute="trailing" secondItem="Le1-hI-qXY" secondAttribute="trailing" id="eQO-ln-PKQ"/>
<constraint firstAttribute="bottom" secondItem="Le1-hI-qXY" secondAttribute="bottom" id="khz-mc-U1A"/>
<constraint firstItem="DPG-Lk-Nqo" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="qNX-rv-we3"/>
<constraint firstItem="Le1-hI-qXY" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="qaK-Wu-0FS"/>
<constraint firstItem="gPA-WE-zaw" firstAttribute="top" secondItem="DPG-Lk-Nqo" secondAttribute="bottom" constant="5" id="xl0-TP-kKg"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="content_lbl" destination="gPA-WE-zaw" id="GcT-Va-wVh"/>
<outlet property="title_lbl" destination="DPG-Lk-Nqo" id="83Y-kU-VIq"/>
</connections>
<point key="canvasLocation" x="141" y="94"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="个人中心灰色字体">
<color red="0.38823529411764707" green="0.38823529411764707" blue="0.38823529411764707" 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>
</resources>
</document>
GeliBusinessPlatform/ViewController/溯源/cell/scv_cell.swift 0 → 100644
View file @ 7a3499b3
//
// scv_cell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/1/27.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
protocol scv_cell_delegate {
func scv_cell_check_img(idx:Int)
}
class scv_cell: UITableViewCell {
var delegate:scv_cell_delegate?
@IBOutlet weak var right_arrow: UIImageView!
@IBOutlet weak var left_arrow: UIImageView!
@IBOutlet weak var title_lbl: UILabel!
let scrollview = UIScrollView(frame: CGRect(x: 45, y: 53.5, width: ScreenWidth-90, height: 123.5))
@IBAction func tap_action(_ sender: UIButton) {
if sender == left_btn {
left_btn.isHidden = true
left_arrow.isHidden = true
right_arrow.isHidden = false
right_btn.isHidden = false
scrollview.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
}else{
right_btn.isHidden = true
right_arrow.isHidden = true
left_btn.isHidden = false
left_arrow.isHidden = false
scrollview.setContentOffset(CGPoint(x: ScreenWidth-90, y: 0), animated: true)
}
}
@IBOutlet weak var right_btn: UIButton!
@IBOutlet weak var left_btn: UIButton!
let titles = ["营业执照","生产许可证","商品流通许可证"]
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
scrollview.showsHorizontalScrollIndicator = false
scrollview.isPagingEnabled = true
scrollview.contentSize = CGSize(width: (ScreenWidth-90)*2, height: 123.5)
self.contentView.addSubview(scrollview)
let width = (ScreenWidth-115)*0.5
for i in 0 ..< 3 {
let btn = UIButton(frame: CGRect(x: CGFloat(i)*(width+25), y: 0, width: width, height: 95))
btn.backgroundColor = UIColor.blue
if i == 1 {
btn.backgroundColor = UIColor.gray
}
btn.tag = i
btn.addTarget(self, action: #selector(btn_click(btn:)), for: .touchUpInside)
scrollview.addSubview(btn)
let lbl = UILabel()
lbl.textAlignment = .center
lbl.textColor = UIColor(named: "标题字颜色")
lbl.text = titles[i]
lbl.font = UIFont(name: "PingFangSC-Medium", size: 13)
scrollview.addSubview(lbl)
lbl.snp.makeConstraints { (make) in
make.centerX.equalTo(btn.snp.centerX)
make.top.equalTo(btn.snp_bottom).offset(10)
make.width.equalTo(btn.snp_width)
make.height.equalTo(18.5)
}
}
}
@objc func btn_click(btn:UIButton){
delegate?.scv_cell_check_img(idx: btn.tag)
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/溯源/cell/scv_cell.xib 0 → 100644
View file @ 7a3499b3
<?xml version="1.0" encoding="UTF-8"?>
<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="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"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="scv_cell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="197"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="375" height="197"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Qw-8r-MGg">
<rect key="frame" x="0.0" y="5" width="375" height="192"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="供货商资质证书" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IvB-Hh-L6A">
<rect key="frame" x="142" y="20" width="91" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="蓝色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OgN-Xg-Yvc">
<rect key="frame" x="77" y="29" width="50" height="1"/>
<color key="backgroundColor" name="蓝色字体颜色"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="4Jf-nf-bD4"/>
<constraint firstAttribute="width" constant="50" id="Dav-nG-sDq"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4MA-G2-8cW">
<rect key="frame" x="248" y="29" width="50" height="1"/>
<color key="backgroundColor" name="蓝色字体颜色"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="tJg-xg-Jdz"/>
<constraint firstAttribute="height" constant="1" id="xPC-fC-WDr"/>
</constraints>
</view>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="s_y_left_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="KEa-gd-uEe">
<rect key="frame" x="15" y="96" width="4.5" height="10"/>
<constraints>
<constraint firstAttribute="height" constant="10" id="3Y9-IA-2OQ"/>
<constraint firstAttribute="width" constant="4.5" id="cVQ-cg-MZ1"/>
</constraints>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="s_y_right_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="9ms-uh-NVR">
<rect key="frame" x="355.5" y="96" width="4.5" height="10"/>
<constraints>
<constraint firstAttribute="width" constant="4.5" id="K6A-Mx-MDb"/>
<constraint firstAttribute="height" constant="10" id="c7Z-ab-7Te"/>
</constraints>
</imageView>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Use-9D-LZd">
<rect key="frame" x="-5.5" y="78.5" width="45.5" height="45"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="acc-eA-Uer"/>
<constraint firstAttribute="width" constant="45" id="exY-Q0-J46"/>
</constraints>
<connections>
<action selector="tap_action:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="rc1-7h-Wgh"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rpG-kq-Rmm">
<rect key="frame" x="335.5" y="78.5" width="45" height="45"/>
<constraints>
<constraint firstAttribute="width" constant="45" id="bv8-Lf-vWr"/>
<constraint firstAttribute="height" constant="45" id="yh7-1U-KUZ"/>
</constraints>
<connections>
<action selector="tap_action:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Z8f-tp-4l1"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="9ms-uh-NVR" firstAttribute="centerY" secondItem="KEa-gd-uEe" secondAttribute="centerY" id="7F1-Ca-wtY"/>
<constraint firstItem="IvB-Hh-L6A" firstAttribute="centerX" secondItem="1Qw-8r-MGg" secondAttribute="centerX" id="8ZA-oS-7TT"/>
<constraint firstItem="KEa-gd-uEe" firstAttribute="leading" secondItem="1Qw-8r-MGg" secondAttribute="leading" constant="15" id="8sj-vv-ZsY"/>
<constraint firstAttribute="trailing" secondItem="9ms-uh-NVR" secondAttribute="trailing" constant="15" id="JbZ-CM-JRg"/>
<constraint firstItem="IvB-Hh-L6A" firstAttribute="top" secondItem="1Qw-8r-MGg" secondAttribute="top" constant="20" id="LAu-yx-Uqk"/>
<constraint firstItem="rpG-kq-Rmm" firstAttribute="centerX" secondItem="9ms-uh-NVR" secondAttribute="centerX" id="Pvm-tK-vjn"/>
<constraint firstItem="Use-9D-LZd" firstAttribute="centerX" secondItem="KEa-gd-uEe" secondAttribute="centerX" id="USG-hU-QLh"/>
<constraint firstItem="Use-9D-LZd" firstAttribute="centerY" secondItem="KEa-gd-uEe" secondAttribute="centerY" id="W4V-7X-z9M"/>
<constraint firstItem="4MA-G2-8cW" firstAttribute="centerY" secondItem="IvB-Hh-L6A" secondAttribute="centerY" id="WMc-pS-VxW"/>
<constraint firstItem="IvB-Hh-L6A" firstAttribute="leading" secondItem="OgN-Xg-Yvc" secondAttribute="trailing" constant="15" id="cFU-8b-Vp9"/>
<constraint firstItem="OgN-Xg-Yvc" firstAttribute="centerY" secondItem="IvB-Hh-L6A" secondAttribute="centerY" id="fy3-SD-X4q"/>
<constraint firstAttribute="bottom" secondItem="KEa-gd-uEe" secondAttribute="bottom" constant="86" id="hXE-tY-diM"/>
<constraint firstItem="rpG-kq-Rmm" firstAttribute="centerY" secondItem="9ms-uh-NVR" secondAttribute="centerY" id="nvk-GQ-OHl"/>
<constraint firstItem="4MA-G2-8cW" firstAttribute="leading" secondItem="IvB-Hh-L6A" secondAttribute="trailing" constant="15" id="qxU-DC-a1o"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="1Qw-8r-MGg" secondAttribute="bottom" id="8b5-1K-eRd"/>
<constraint firstItem="1Qw-8r-MGg" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="5" id="Awu-HQ-HO8"/>
<constraint firstItem="1Qw-8r-MGg" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="kQ9-PH-y8f"/>
<constraint firstAttribute="trailing" secondItem="1Qw-8r-MGg" secondAttribute="trailing" id="yMn-03-Iez"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="left_arrow" destination="KEa-gd-uEe" id="C1T-e7-6vq"/>
<outlet property="left_btn" destination="Use-9D-LZd" id="7Ya-AV-Z77"/>
<outlet property="right_arrow" destination="9ms-uh-NVR" id="wDJ-p9-Po3"/>
<outlet property="right_btn" destination="rpG-kq-Rmm" id="XlW-Sh-rge"/>
<outlet property="title_lbl" destination="IvB-Hh-L6A" id="q0B-ef-0Ix"/>
</connections>
<point key="canvasLocation" x="141.30434782608697" y="101.45089285714285"/>
</tableViewCell>
</objects>
<resources>
<image name="s_y_left_arrow" width="6.5" height="12"/>
<image name="s_y_right_arrow" width="6.5" height="12"/>
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" 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>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/溯源/cell/two_title_cell.swift 0 → 100644
View file @ 7a3499b3
//
// two_title_cell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/1/27.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class two_title_cell: UITableViewCell {
@IBOutlet weak var content_2_lbl: UILabel!
@IBOutlet weak var title_2_lbl: UILabel!
@IBOutlet weak var title_1_lbl: UILabel!
@IBOutlet weak var content_1_lbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/溯源/cell/two_title_cell.xib 0 → 100644
View file @ 7a3499b3
<?xml version="1.0" encoding="UTF-8"?>
<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="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"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="two_title_cell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="114"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="375" height="114"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tnB-mz-Hwe">
<rect key="frame" x="15" y="113" width="360" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="fm3-TJ-8pk"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="acv-qK-gmn">
<rect key="frame" x="15" y="10" width="33" height="18.5"/>
<constraints>
<constraint firstAttribute="height" constant="18.5" id="LYx-gD-Gkc"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NIe-e5-x6Q">
<rect key="frame" x="15" y="33.5" width="345" height="18.5"/>
<constraints>
<constraint firstAttribute="height" constant="18.5" id="JCX-4S-E5p"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bEx-3M-ori">
<rect key="frame" x="15" y="62" width="33" height="18.5"/>
<constraints>
<constraint firstAttribute="height" constant="18.5" id="2it-2t-aJv"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IH2-Ru-pJb">
<rect key="frame" x="15" y="85.5" width="345" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="tnB-mz-Hwe" secondAttribute="bottom" id="4Oc-Qf-Oib"/>
<constraint firstItem="NIe-e5-x6Q" firstAttribute="top" secondItem="acv-qK-gmn" secondAttribute="bottom" constant="5" id="4cs-2K-yLo"/>
<constraint firstItem="NIe-e5-x6Q" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="5ZF-kW-zTa"/>
<constraint firstItem="IH2-Ru-pJb" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="8i9-jE-Tdv"/>
<constraint firstAttribute="trailing" secondItem="IH2-Ru-pJb" secondAttribute="trailing" constant="15" id="A9T-bu-Tz6"/>
<constraint firstItem="acv-qK-gmn" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="MuB-vZ-xNN"/>
<constraint firstItem="IH2-Ru-pJb" firstAttribute="top" secondItem="bEx-3M-ori" secondAttribute="bottom" constant="5" id="POA-oM-oYk"/>
<constraint firstAttribute="trailing" secondItem="tnB-mz-Hwe" secondAttribute="trailing" id="SFF-4J-t4V"/>
<constraint firstItem="bEx-3M-ori" firstAttribute="top" secondItem="NIe-e5-x6Q" secondAttribute="bottom" constant="10" id="T6u-Hn-tSq"/>
<constraint firstItem="acv-qK-gmn" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="dSU-H7-ARZ"/>
<constraint firstItem="bEx-3M-ori" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ocO-Yf-7Jy"/>
<constraint firstItem="tnB-mz-Hwe" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="pLe-xD-6b7"/>
<constraint firstAttribute="trailing" secondItem="NIe-e5-x6Q" secondAttribute="trailing" constant="15" id="xOp-DC-XMN"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="content_1_lbl" destination="NIe-e5-x6Q" id="cLs-gk-SuR"/>
<outlet property="content_2_lbl" destination="IH2-Ru-pJb" id="0GX-g8-fPh"/>
<outlet property="title_1_lbl" destination="acv-qK-gmn" id="LJk-kz-Ljm"/>
<outlet property="title_2_lbl" destination="bEx-3M-ori" id="0ax-zT-PHl"/>
</connections>
<point key="canvasLocation" x="142" y="102"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="个人中心灰色字体">
<color red="0.38823529411764707" green="0.38823529411764707" blue="0.38823529411764707" 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>
</resources>
</document>
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 7a3499b3
......@@ -11,7 +11,30 @@ import Photos
protocol OrderDViewControllerDelegate {
func refishingOrderDchange()
}
class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate{
class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate{
func S_Y_View_Check_Detail() {
print("查看溯源")
let vc = S_Y_Detail_Vc()
vc.user_type = 1
self.navigationController?.pushViewController(vc, animated: true)
}
func DaiKeXiaDanGouWuCellDelAction(cell: DaiKeXiaDanGouWuCell) {
//此处无用
}
func DaiKeXiaDanGouWuCellRemarkChange(cell: DaiKeXiaDanGouWuCell) {
//此处无用
}
func DaiKeXiaDanGouWuCell_check(cell: DaiKeXiaDanGouWuCell) {
print("溯源")
print("check S_Y")
let vc = S_Y_View(frame: self.view.bounds)
vc.delegate = self
self.view.addSubview(vc)
}
var lmIdx = 100
......@@ -431,13 +454,20 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case 1:
//MARK:--商品cell
let cell = tableView.dequeueReusableCell(withIdentifier: "DaiKeXiaDanGouWuCell") as! DaiKeXiaDanGouWuCell
// cell.priceLbl.isHidden = false
cell.delegate = self
cell.isDetail = true
// cell.selectBtn.isHidden = true
let rowModel = self.dataMdoel?.order_goods![indexPath.row]
if self.dataMdoel?.order_goods != nil {
if (self.dataMdoel?.order_goods!.count)! > 2 && check_all == false{
if indexPath.row == 1 {
cell.btm_line.isHidden = true
}
}
if indexPath.row == (self.dataMdoel?.order_goods!.count)! - 1 {
cell.btm_line.isHidden = true
}
}
cell.check_button.isHidden = false
cell.imgView?.sd_setImage(with: URL(string: SERVERCE_ImageHost + (rowModel?.goods_thumb)!))
cell.content_tv.text = rowModel?.remark
cell.titleLbl.text = rowModel?.goods_name
......@@ -752,12 +782,18 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
return cell
}
var check_all = false
//MARK:--查看全部商品
func OrderDViewFooterViewBtnClick() {
func OrderDViewFooterViewBtnClick(img:OrderDViewFooterView) {
print("查看全部商品")
let vc = ShowAlGoodsViewController()
vc.order_goods = self.dataMdoel?.order_goods
self.navigationController?.pushViewController(vc, animated: true)
check_all = !check_all
self.listView.reloadData()
// let vc = ShowAlGoodsViewController()
// vc.order_goods = self.dataMdoel?.order_goods
// self.navigationController?.pushViewController(vc, animated: true)
}
//MARK:--选择的关联客户返回数据
......@@ -1048,7 +1084,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if (self.dataMdoel?.order_goods?.count)! < 2 {
num = (self.dataMdoel?.order_goods?.count)!
}else{
num = 2
//abc
if check_all {
num = (self.dataMdoel?.order_goods?.count)!
}else{
num = 2
}
}
}
......@@ -1094,7 +1135,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if (self.dataMdoel?.order_goods?.count)! > 2 {
let view = OrderDViewFooterView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 33.5))
view.delegate = self
view.nameLbl.text = "查看全部（共" + StringByInt(number: (self.dataMdoel?.order_goods!.count)!) + "个商品）"
view.check_all = check_all
return view
}
}
......@@ -1375,6 +1416,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let vc = PrintListMgVc()
vc.printData = d.data?.order_res
vc.order_id = self.orderId!
vc.selectIndex = (d.data?.order_res?.print_type)!-1
self.navigationController?.pushViewController(vc, animated: true)
} failture: { (err) in
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewFooterView.swift
View file @ 7a3499b3
......@@ -8,16 +8,27 @@
import UIKit
@objc protocol OrderDViewFooterViewDelegate {
@objc optional func OrderDViewFooterViewBtnClick()
@objc optional func OrderDViewFooterViewBtnClick(img:OrderDViewFooterView)
}
class OrderDViewFooterView: UIView {
@IBOutlet weak var arrow_img: UIImageView!
var check_all = false {
didSet{
if check_all {
arrow_img.image = UIImage(named: "up_ar")
}else{
arrow_img.image = UIImage(named: "down_ar")
}
}
}
var contentView:UIView!
var delegate:OrderDViewFooterViewDelegate?
@IBOutlet weak var nameLbl: UILabel!
//初始化时将xib中的view添加进来
@IBAction func pushAction(_ sender: Any) {
delegate?.OrderDViewFooterViewBtnClick?()
delegate?.OrderDViewFooterViewBtnClick?(img: self)
}
override init(frame: CGRect) {
super.init(frame: frame)
contentView = loadViewFromNib()
......@@ -32,6 +43,7 @@ class OrderDViewFooterView: UIView {
super.init(coder: aDecoder)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewFooterView.xib
View file @ 7a3499b3
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OrderDViewFooterView" customModule="GeliBusinessPlatform" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OrderDViewFooterView" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="arrow_img" destination="Qc3-GU-bzm" id="lHI-7H-T03"/>
<outlet property="nameLbl" destination="rj1-Gd-MWT" id="KSu-0f-TCJ"/>
</connections>
</placeholder>
......@@ -17,27 +19,36 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="34"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="查看全部（共20个商品）" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rj1-Gd-MWT">
<rect key="frame" x="0.0" y="0.0" width="375" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rj1-Gd-MWT">
<rect key="frame" x="0.0" y="0.0" width="375" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="蓝色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y9f-zb-HLE">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y9f-zb-HLE">
<rect key="frame" x="0.0" y="0.0" width="375" height="34"/>
<connections>
<action selector="pushAction:" destination="-1" eventType="touchUpInside" id="CgM-7b-gUF"/>
</connections>
</button>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="down_ar" translatesAutoresizingMaskIntoConstraints="NO" id="Qc3-GU-bzm">
<rect key="frame" x="182" y="5" width="11" height="10"/>
<constraints>
<constraint firstAttribute="width" constant="11" id="0MZ-m8-rzj"/>
<constraint firstAttribute="height" constant="10" id="R0d-Qs-rTC"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="Y9f-zb-HLE" secondAttribute="trailing" id="8xs-gb-RG2"/>
<constraint firstItem="Qc3-GU-bzm" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="5" id="JcM-xj-WZq"/>
<constraint firstAttribute="bottom" secondItem="Y9f-zb-HLE" secondAttribute="bottom" id="WaI-Zw-HGe"/>
<constraint firstItem="Y9f-zb-HLE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="YUZ-JY-agY"/>
<constraint firstItem="Y9f-zb-HLE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="l9s-Wb-cxT"/>
<constraint firstItem="rj1-Gd-MWT" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="lgW-4x-UBl"/>
<constraint firstItem="rj1-Gd-MWT" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="oyd-48-QGP"/>
<constraint firstItem="Qc3-GU-bzm" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="snn-as-tcZ"/>
<constraint firstAttribute="trailing" secondItem="rj1-Gd-MWT" secondAttribute="trailing" id="yIC-RO-Ugz"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
......@@ -45,8 +56,9 @@
</view>
</objects>
<resources>
<image name="down_ar" width="12" height="11"/>
<namedColor name="蓝色字体颜色">
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
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