Skip to content

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

整理代码

parent 2ed63472
Show whitespace changes
Inline Side-by-side
Showing with 560 additions and 487 deletions
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ 7b8bccd6
......@@ -5,23 +5,23 @@
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
uuid = "46B6B765-5B4F-49F9-BFB7-4E596F3F184F"
uuid = "46523EDE-134D-4CC0-9B0D-03CF99ED75C4"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No">
continueAfterRunningActions = "No"
scope = "1"
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
<BreakpointContent
uuid = "B61C3BDB-EDAD-4F1C-9E1B-3E983CC96C75"
uuid = "07A0A3DD-FE69-427B-BC36-C6421ABF6B4E"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
scope = "1"
stopOnStyle = "0">
continueAfterRunningActions = "No">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
......
GeliBusinessPlatform/Assets.xcassets/代客下单/tjxq.imageset/Contents.json 0 → 100644
View file @ 7b8bccd6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tjxq@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tjxq@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
View file @ 7b8bccd6
......@@ -11,7 +11,7 @@ import IQKeyboardManagerSwift
@objc protocol GLAlertSelectViewDelegate {
//普通状态（单多选）
@objc optional func GLAlertSelectViewClick(selectNum:NSString,view:GLAlertSelectView)//单选
@objc optional func GLAlertSelectViewClick(selectNum:Int,view:GLAlertSelectView)//单选
@objc optional func GLAlertMoreSelectViewClick(sender:NSArray,view:UIView)//多选
//通用
@objc optional func GLAlertSelectViewClose(sender:UIButton)//关闭
......@@ -29,7 +29,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
var delegate:GLAlertSelectViewDelegate?
var inputTextTF:UITextField?
var selectArray:NSMutableArray?
var selectNum:String? = ""
var selectNum:Int?
var selectLblText:String? = ""
var dataArr = Array<String>(){
......@@ -149,6 +149,8 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
cell.titleLbl.text = dataArr[indexPath.row]
cell.delegate = self
cell.tag = indexPath.row
cell.titleLbl.textColor = UIColor(named: "标题字颜色")
cell.selectBtn.isSelected = false
if isMultipleS == true {
for item in selectArray! {
let row = "\(item)" as! NSString
......@@ -158,8 +160,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
}
}
}else{
let str = selectNum as! NSString
if str.integerValue == indexPath.row {
if selectNum == indexPath.row {
cell.titleLbl.textColor = UIColor(named: "蓝色字体颜色")
cell.selectBtn.isSelected = true
}
......@@ -170,8 +171,8 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
if (titleLbl.text?.contains("库位"))! {
}else{
if selectNum!.count > 0 {
delegate?.GLAlertSelectViewClick?(selectNum: selectNum as! NSString,view: self)
if isMultipleS == false {
delegate?.GLAlertSelectViewClick?(selectNum: selectNum!,view: self)
}else{
delegate?.GLAlertMoreSelectViewClick?(sender: selectArray!,view:self)
......@@ -181,29 +182,17 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
//MARK: - 自定义CELL DELEGATE
//普通
func TitleAndSelectCellClick(content: UIButton, cell: TitleAndSelectCell) {
if selectNum!.count > 0 {
for item in selectTbv.visibleCells {
let cel = item as! TitleAndSelectCell
cel.titleLbl.textColor = UIColor(named: "标题字颜色")
cel.selectBtn.isSelected = false
if cell == cel {
cel.selectBtn.isSelected = true
cel.titleLbl.textColor = UIColor(named: "蓝色字体颜色")
selectNum = "\(cel.tag)"
}
}
if isMultipleS == false {
selectNum = cell.tag
}else{
cell.titleLbl.textColor = UIColor(named: "")
if cell.selectBtn.isSelected == true {
cell.selectBtn.isSelected = false
cell.titleLbl.textColor = UIColor(named: "标题字颜色")
selectArray!.replaceObject(at: cell.tag, with: "99")
}else{
cell.titleLbl.textColor = UIColor(named: "蓝色字体颜色")
cell.selectBtn.isSelected = true
selectArray!.replaceObject(at: cell.tag, with: cell.tag)
}
}
selectTbv.reloadData()
}
//库位
func editClickAction(sender: Int) {
......
GeliBusinessPlatform/View/Cell/AddGuiGeCell.swift
View file @ 7b8bccd6
......@@ -12,6 +12,7 @@ import UIKit
}
class AddGuiGeCell: UITableViewCell {
var delegate:AddGuiGeCellDelegate?
@IBOutlet weak var btmH: NSLayoutConstraint!
@IBAction func btnClick(_ sender: Any) {
delegate?.AddGuiGeCellClick?(cell: self)
}
......
GeliBusinessPlatform/View/Cell/AddGuiGeCell.xib
View file @ 7b8bccd6
......@@ -35,6 +35,7 @@
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="btmH" destination="log-wz-xog" id="axu-Jf-zWN"/>
<outlet property="imgBtn" destination="FpT-RN-ad7" id="DdI-mW-7wW"/>
</connections>
<point key="canvasLocation" x="132" y="122"/>
......
GeliBusinessPlatform/View/Cell/AddImgCell.swift
View file @ 7b8bccd6
......@@ -95,7 +95,7 @@ class AddImgCell: UITableViewCell {
make.right.equalTo(img.snp_right).offset(6)
make.width.height.equalTo(15)
}
delImg.isHidden = isEdit!
delImg.isHidden = !isEdit!
let delBtn = UIButton()
delBtn.isUserInteractionEnabled = isEdit!
......
GeliBusinessPlatform/View/Cell/ShangPinGguiGeCell.swift
View file @ 7b8bccd6
......@@ -7,15 +7,15 @@
//
import UIKit
@objc protocol ShangPinGguiGeCellDelegate {
@objc optional func ShangPinGguiGeCellEditAction(cell:ShangPinGguiGeCell)
protocol ShangPinGguiGeCellDelegate {
func ShangPinGguiGeCellEditAction(cell:ShangPinGguiGeCell)
}
class ShangPinGguiGeCell: UITableViewCell {
var delegate:ShangPinGguiGeCellDelegate?
@IBAction func editAction(_ sender: Any) {
delegate?.ShangPinGguiGeCellEditAction?(cell: self)
delegate?.ShangPinGguiGeCellEditAction(cell: self)
}
// var itemIdx:Int?
@IBOutlet weak var btn: UIButton!
@IBOutlet weak var tempLbl: UILabel!
@IBOutlet weak var weightLbl: UILabel!
......
GeliBusinessPlatform/View/Cell/ShangPinGguiGeCell.xib
View file @ 7b8bccd6
......@@ -8,11 +8,7 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner">
<connections>
<outlet property="btn" destination="yWF-ML-clI" id="Bg6-Sd-ken"/>
</connections>
</placeholder>
<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="ShangPinGguiGeCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="146"/>
......@@ -90,7 +86,7 @@
<color key="titleColor" name="蓝色字体颜色"/>
</state>
<connections>
<action selector="editAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="NUZ-aA-T5Q"/>
<action selector="editAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="91o-np-dL3"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K2a-dA-ghw">
......@@ -153,12 +149,12 @@
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="btn" destination="yWF-ML-clI" id="Doh-Sc-3q4"/>
<outlet property="danWeiLbl" destination="oOy-dE-JIB" id="Dw6-Zt-80o"/>
<outlet property="guiGeLbl" destination="GPm-DS-HCD" id="ePF-lx-scy"/>
<outlet property="sellPriceLbl" destination="Mw0-dB-6KQ" id="ofk-s2-w0v"/>
<outlet property="tempLbl" destination="bIm-PK-kvk" id="QrY-UP-WZk"/>
<outlet property="weightLbl" destination="EeX-7S-sb3" id="bkH-WA-6Wt"/>
<outlet property="btn" destination="yWF-ML-clI" id="D0u-7Q-exy"/>
<outlet property="danWeiLbl" destination="oOy-dE-JIB" id="mAU-7i-WZz"/>
<outlet property="guiGeLbl" destination="GPm-DS-HCD" id="HD8-uW-HzQ"/>
<outlet property="sellPriceLbl" destination="Mw0-dB-6KQ" id="LxY-Qz-4j7"/>
<outlet property="tempLbl" destination="bIm-PK-kvk" id="PfP-6Q-if1"/>
<outlet property="weightLbl" destination="EeX-7S-sb3" id="yjA-Zu-wCa"/>
</connections>
<point key="canvasLocation" x="131.15942028985509" y="121.875"/>
</tableViewCell>
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/JiTuoWuXinXiView.xib
View file @ 7b8bccd6
......@@ -27,56 +27,16 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6Sh-qF-UK5">
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
<rect key="frame" x="0.0" y="-92" width="414" height="1108"/>
<color key="backgroundColor" name="标题字颜色"/>
</button>
<view alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tDf-Te-gP3">
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
<color key="backgroundColor" name="标题字颜色"/>
</view>
<view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z9Q-fQ-f12" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="862" width="414" height="60"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="JME-PC-LPi"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rW2-Ka-gAx">
<rect key="frame" x="0.0" y="490" width="414" height="372"/>
<rect key="frame" x="0.0" y="495" width="414" height="318"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W4e-rq-GWo" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="323" width="414" height="49"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="GSb-Ls-6mX"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="titleString" value="确定"/>
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="titleFontName" value="PingFangSC"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitAction:" destination="-1" eventType="touchUpInside" id="TdR-2t-Ltl"/>
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ufe-WI-qAR">
<rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
<constraints>
......@@ -450,21 +410,14 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Trf-1A-2UZ">
<rect key="frame" x="0.0" y="275" width="414" height="48"/>
<rect key="frame" x="0.0" y="275" width="414" height="43"/>
<subviews>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="n6W-Cn-03r">
<rect key="frame" x="352" y="8.5" width="49" height="31"/>
<constraints>
<constraint firstAttribute="height" constant="31" id="5F8-am-PsJ"/>
<constraint firstAttribute="width" constant="47" id="XcT-Ta-L1s"/>
</constraints>
<rect key="frame" x="350" y="6" width="51" height="31"/>
<color key="onTintColor" name="按钮渐变色下,字体颜色"/>
</switch>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="动物检疫证：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K1L-ek-eBf">
<rect key="frame" x="15" y="13.5" width="337" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="OvT-8g-gl9"/>
</constraints>
<rect key="frame" x="15" y="14.5" width="74" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
......@@ -472,60 +425,92 @@
</subviews>
<color key="backgroundColor" name="白色背景色"/>
<constraints>
<constraint firstItem="n6W-Cn-03r" firstAttribute="centerY" secondItem="Trf-1A-2UZ" secondAttribute="centerY" id="Se7-2p-B6v"/>
<constraint firstAttribute="trailing" secondItem="n6W-Cn-03r" secondAttribute="trailing" constant="15" id="b5P-is-9PD"/>
<constraint firstItem="n6W-Cn-03r" firstAttribute="leading" secondItem="K1L-ek-eBf" secondAttribute="trailing" id="cpZ-Ue-UYF"/>
<constraint firstItem="K1L-ek-eBf" firstAttribute="leading" secondItem="Trf-1A-2UZ" secondAttribute="leading" constant="15" id="lI5-X0-uUt"/>
<constraint firstItem="K1L-ek-eBf" firstAttribute="centerY" secondItem="n6W-Cn-03r" secondAttribute="centerY" id="qT6-JB-w9v"/>
<constraint firstItem="K1L-ek-eBf" firstAttribute="centerY" secondItem="Trf-1A-2UZ" secondAttribute="centerY" id="WyV-QL-bCZ"/>
<constraint firstItem="K1L-ek-eBf" firstAttribute="leading" secondItem="Trf-1A-2UZ" secondAttribute="leading" constant="15" id="X27-na-xmD"/>
<constraint firstAttribute="height" constant="43" id="yI9-mB-aeO"/>
<constraint firstItem="n6W-Cn-03r" firstAttribute="centerY" secondItem="Trf-1A-2UZ" secondAttribute="centerY" id="yzO-Po-Hso"/>
<constraint firstAttribute="trailing" secondItem="n6W-Cn-03r" secondAttribute="trailing" constant="15" id="zxA-c4-De6"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="Trf-1A-2UZ" firstAttribute="top" secondItem="9xb-ef-BR6" secondAttribute="bottom" id="0S2-42-Xxc"/>
<constraint firstAttribute="trailing" secondItem="Trf-1A-2UZ" secondAttribute="trailing" id="69j-3i-jrN"/>
<constraint firstItem="3m5-vv-wjM" firstAttribute="top" secondItem="G9X-pI-5Ce" secondAttribute="bottom" id="6HS-cH-xzB"/>
<constraint firstAttribute="trailing" secondItem="P6u-9D-ZKm" secondAttribute="trailing" id="9NH-ae-s2d"/>
<constraint firstItem="Ufe-WI-qAR" firstAttribute="top" secondItem="rW2-Ka-gAx" secondAttribute="top" id="9tx-oZ-KLE"/>
<constraint firstAttribute="bottom" secondItem="W4e-rq-GWo" secondAttribute="bottom" id="CnI-ir-g74"/>
<constraint firstItem="W4e-rq-GWo" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="F1C-KN-y5l"/>
<constraint firstItem="9xb-ef-BR6" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="F1k-rF-Jdo"/>
<constraint firstItem="G9X-pI-5Ce" firstAttribute="top" secondItem="P6u-9D-ZKm" secondAttribute="bottom" id="HwL-CO-LHP"/>
<constraint firstItem="G9X-pI-5Ce" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="J32-7j-OpU"/>
<constraint firstItem="Trf-1A-2UZ" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="JF1-iT-7e5"/>
<constraint firstItem="3m5-vv-wjM" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="Qdd-rt-qFk"/>
<constraint firstItem="HOF-TP-XRe" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="Rle-2X-fot"/>
<constraint firstItem="W4e-rq-GWo" firstAttribute="top" secondItem="Trf-1A-2UZ" secondAttribute="bottom" id="UXV-bm-aDQ"/>
<constraint firstAttribute="trailing" secondItem="G9X-pI-5Ce" secondAttribute="trailing" id="WDh-VB-SY3"/>
<constraint firstAttribute="trailing" secondItem="9xb-ef-BR6" secondAttribute="trailing" id="Wfd-Zb-JQm"/>
<constraint firstItem="HOF-TP-XRe" firstAttribute="top" secondItem="Ufe-WI-qAR" secondAttribute="bottom" id="Wq2-5N-E0z"/>
<constraint firstAttribute="trailing" secondItem="3m5-vv-wjM" secondAttribute="trailing" id="aED-IL-b0O"/>
<constraint firstItem="Trf-1A-2UZ" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="bQ1-nz-kvy"/>
<constraint firstAttribute="trailing" secondItem="HOF-TP-XRe" secondAttribute="trailing" id="diI-HO-EFh"/>
<constraint firstAttribute="height" constant="372" id="eAp-Aj-L92"/>
<constraint firstAttribute="height" constant="318" id="eAp-Aj-L92"/>
<constraint firstItem="9xb-ef-BR6" firstAttribute="top" secondItem="3m5-vv-wjM" secondAttribute="bottom" id="eTx-WO-ZrZ"/>
<constraint firstItem="Ufe-WI-qAR" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="gTo-oN-cLg"/>
<constraint firstAttribute="trailing" secondItem="Ufe-WI-qAR" secondAttribute="trailing" id="hV8-R6-19E"/>
<constraint firstItem="P6u-9D-ZKm" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="hq6-OF-b5V"/>
<constraint firstAttribute="trailing" secondItem="Trf-1A-2UZ" secondAttribute="trailing" id="jne-sK-XiQ"/>
<constraint firstItem="P6u-9D-ZKm" firstAttribute="top" secondItem="HOF-TP-XRe" secondAttribute="bottom" id="qWH-3f-0Ca"/>
<constraint firstAttribute="trailing" secondItem="W4e-rq-GWo" secondAttribute="trailing" id="rbw-5V-eYv"/>
<constraint firstItem="Trf-1A-2UZ" firstAttribute="top" secondItem="9xb-ef-BR6" secondAttribute="bottom" id="rt6-MH-8ac"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gq9-xD-Wd8" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitAction:" destination="-1" eventType="valueChanged" id="bci-rS-ceQ"/>
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i2O-Lc-NwB">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="K5Q-0x-Nfa"/>
</constraints>
<attributedString key="attributedText">
<fragment content="确定">
<attributes>
<color key="NSColor" name="白色背景色"/>
<font key="NSFont" size="17" name="PingFangSC-Medium"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Z9Q-fQ-f12" firstAttribute="top" secondItem="rW2-Ka-gAx" secondAttribute="bottom" id="0jq-P0-IfO"/>
<constraint firstItem="6Sh-qF-UK5" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="BEH-1L-gfy"/>
<constraint firstItem="gq9-xD-Wd8" firstAttribute="top" secondItem="i2O-Lc-NwB" secondAttribute="top" id="5aU-gh-ZPo"/>
<constraint firstItem="rW2-Ka-gAx" firstAttribute="bottom" secondItem="vUN-kp-3ea" secondAttribute="bottom" constant="-49" id="9k5-X2-pnB"/>
<constraint firstItem="6Sh-qF-UK5" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="-136" id="BEH-1L-gfy"/>
<constraint firstAttribute="trailing" secondItem="gq9-xD-Wd8" secondAttribute="trailing" id="Bzi-eL-ajv"/>
<constraint firstAttribute="bottom" secondItem="gq9-xD-Wd8" secondAttribute="bottom" id="EVw-zY-FJl"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="rW2-Ka-gAx" secondAttribute="trailing" id="IfG-9S-fZ5"/>
<constraint firstItem="6Sh-qF-UK5" firstAttribute="top" secondItem="tDf-Te-gP3" secondAttribute="bottom" id="N9W-fu-qJZ"/>
<constraint firstItem="Z9Q-fQ-f12" firstAttribute="top" secondItem="6Sh-qF-UK5" secondAttribute="bottom" id="T6v-Cx-fQD"/>
<constraint firstItem="i2O-Lc-NwB" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="JhM-bb-elg"/>
<constraint firstItem="6Sh-qF-UK5" firstAttribute="top" secondItem="tDf-Te-gP3" secondAttribute="bottom" constant="-136" id="N9W-fu-qJZ"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="6Sh-qF-UK5" secondAttribute="trailing" id="UCg-B2-JXR"/>
<constraint firstItem="tDf-Te-gP3" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="VXM-Yf-Vxh"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="i2O-Lc-NwB" secondAttribute="trailing" id="ht6-ge-aco"/>
<constraint firstItem="6Sh-qF-UK5" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="hxs-hs-0GO"/>
<constraint firstItem="tDf-Te-gP3" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="j1O-jc-bP8"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="6Sh-qF-UK5" secondAttribute="bottom" id="p0G-24-PI1"/>
<constraint firstAttribute="trailing" secondItem="Z9Q-fQ-f12" secondAttribute="trailing" id="srH-BV-xIs"/>
<constraint firstItem="Z9Q-fQ-f12" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="toL-bK-g4M"/>
<constraint firstItem="gq9-xD-Wd8" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="laU-gC-rJG"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="6Sh-qF-UK5" secondAttribute="bottom" constant="-154" id="p0G-24-PI1"/>
<constraint firstAttribute="trailing" secondItem="tDf-Te-gP3" secondAttribute="trailing" id="uOz-jT-nGj"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="i2O-Lc-NwB" secondAttribute="bottom" id="wZT-BC-AYX"/>
<constraint firstItem="rW2-Ka-gAx" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="x4f-1E-FoH"/>
</constraints>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
......@@ -559,6 +544,9 @@
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" 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.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.swift
View file @ 7b8bccd6
......@@ -10,7 +10,7 @@ import UIKit
class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,DaiKeXiaDanFooterViewDelegate,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate{
var orderType = "99" //订单类型
var orderType:Int? //订单类型
var glSelectView:GLAlertSelectView? = nil
var holderArr = ["未支付","未付款","自提","暂不出库","0","0"]
......@@ -127,7 +127,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
if glSelectView == nil {
let view = GLAlertSelectView(frame: self.view.bounds)
// view.isMultipleSelect = false//是否多选
view.selectNum = orderType
view.selectNum = orderType!
view.delegate = self
view.titleLbl.text = "请选择订单类型"
view.dataArr = ["普通订单","预售下单"]
......@@ -142,10 +142,10 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
break
}
}
var zhiFuType = "99"
var zhiFuWay = "99"
var tiHuoWay = "99"
var chuHuoWay = "99"
var zhiFuType:Int?
var zhiFuWay:Int?
var tiHuoWay:Int?
var chuHuoWay:Int?
func btnClick(content: String, cell: TitleAndBtnCell) {
if glSelectView == nil {
let view = GLAlertSelectView(frame: self.view.bounds)
......@@ -153,22 +153,22 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
view.delegate = self
switch cell.tag {
case 0://支付状态
view.selectNum = zhiFuType
view.selectNum = zhiFuType!
view.titleLbl.text = "请选择\(p3Arr[cell.tag])"
view.dataArr = ["预售","普通","期货","团购"]
break
case 1://支付方式
view.selectNum = zhiFuWay
view.selectNum = zhiFuWay!
view.titleLbl.text = "请选择\(p3Arr[cell.tag])"
view.dataArr = ["预售","普通","期货","团购"]
break
case 2://提货方式
view.selectNum = tiHuoWay
view.selectNum = tiHuoWay!
view.titleLbl.text = "请选择\(p3Arr[cell.tag])"
view.dataArr = ["预售","普通","期货","团购"]
break
default://出货状态
view.selectNum = chuHuoWay
view.selectNum = chuHuoWay!
view.titleLbl.text = "请选择\(p3Arr[cell.tag])"
view.dataArr = ["预售","普通","期货","团购"]
break
......@@ -178,7 +178,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
glSelectView = view
}
}
func GLAlertSelectViewClick(selectNum: NSString, view: GLAlertSelectView) {
func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
print("单选",selectNum)
glSelectView?.removeFromSuperview()
glSelectView = nil
......
GeliBusinessPlatform/ViewController/商品详情/EditProductViewController.swift
View file @ 7b8bccd6
......@@ -31,10 +31,10 @@ class EditProductViewController: BaseViewController,UITableViewDelegate,UITableV
var itemTypeArr = NSMutableArray()
var shangPinStatus = "99"
var shangPinStatus:Int?
var shangPinStatusArr = ["热销","爆款","新品","促销","外采","团购"]
var yunShuType = "99"
var yunShuType:Int?
var yunShuTypeArr = ["冷链","常温","热链"]
//MARK:--保存按钮
@IBOutlet weak var bottomView: UIView!
......@@ -426,7 +426,7 @@ class EditProductViewController: BaseViewController,UITableViewDelegate,UITableV
view.titleLbl.text = "请选择商品类型"
view.delegate = self
view.dataArr = shangPinStatusArr
view.selectNum = shangPinStatus
view.selectNum = shangPinStatus!
self.view.addSubview(view)
glSelectView = view
}
......@@ -436,7 +436,7 @@ class EditProductViewController: BaseViewController,UITableViewDelegate,UITableV
view.titleLbl.text = "请选择运输方式"
view.delegate = self
view.dataArr = yunShuTypeArr
view.selectNum = yunShuType
view.selectNum = yunShuType!
self.view.addSubview(view)
glSelectView = view
}
......@@ -458,17 +458,17 @@ class EditProductViewController: BaseViewController,UITableViewDelegate,UITableV
}
func GLAlertSelectViewClick(selectNum: NSString, view: GLAlertSelectView) {
func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
print("单选",selectNum)
print(view.titleLbl.text)
switch view.titleLbl.text {
case "请选择商品类型":
shangPinStatus = selectNum as String
tishixxArr1.replaceObject(at: view.tag, with: shangPinStatusArr[selectNum.integerValue])
shangPinStatus = selectNum
tishixxArr1.replaceObject(at: view.tag, with: shangPinStatusArr[selectNum])
break
case "请选择运输方式":
yunShuType = selectNum as String
tishixxArr1.replaceObject(at: view.tag, with: yunShuTypeArr[selectNum.integerValue])
yunShuType = selectNum
tishixxArr1.replaceObject(at: view.tag, with: yunShuTypeArr[selectNum])
break
default:
break
......
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
View file @ 7b8bccd6
......@@ -10,7 +10,7 @@ import UIKit
import LGButton
import Photos
class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,CommendCellDelegate,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate,GoodsClassViewControllerDelegate,PinPaiListViewControllerDelegate,AddImgCellDelegate,AddGuiGeCellDelegate,CreatNewSpecsViewControllerDelegate,ShangPinGguiGeCellDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,TitleAndSwitchCellDelegate{
class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate,GoodsClassViewControllerDelegate,PinPaiListViewControllerDelegate,AddImgCellDelegate,AddGuiGeCellDelegate,CreatNewSpecsViewControllerDelegate,ShangPinGguiGeCellDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,TitleAndSwitchCellDelegate,TitleAndTFCellDelegate{
let titleArr = ["商品信息","商品图片","商品规格","预售设置","其它信息","商品详情"]
......@@ -26,29 +26,45 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
var layout = UICollectionViewFlowLayout()
var glSelectView:GLAlertSelectView?
var selectIdx:IndexPath?
var selectIdx:IndexPath?//多规格状态下点击collectionCell的row记录
var isYuShouShangPin:Bool?//是否为预售商品
var itemTypeArr = NSMutableArray()//多选
var isYuShou:Bool = false//是否预售
var shangPinStatus = "99"//商品状态
var yunShuType = "99"//运输类型
var shangPinStatus:Int?//商品状态
var yunShuType:Int?//运输类型
var maxFiveImgsArr = NSMutableArray()//多图
var singleImgArr = NSMutableArray()//单张图
var itemName = ""//商品名称
var qiMaiShuLiang = ""//起卖数量
var shiFouQZ = false//是否清真
var shiFouXJ = false//是否询价
var keyWord = ""//关键字
var wuLiuPrice = ""//物流费用
var guiGeArr:NSMutableArray = []//规格数组,根据规格资料数量控制右上角新增按钮是否显示
//MARK:--保存按钮
@IBAction func submitAction(_ sender: Any) {
print("保存按钮submitAction")
print(itemName)//商品名称
print(itemTypeArr)//商品类型
print(qiMaiShuLiang)//起卖数量
print(shiFouQZ)//是否清真
print(shiFouXJ)//是否询价
print(singleImgArr.firstObject)//商品封面图
print(maxFiveImgsArr)//商品主图
print(guiGeArr)//商品规格
print(keyWord)//关键字
print(wuLiuPrice)//物流费用
print(shangPinStatusArr[shangPinStatus!])//商品状态
print(yunShuTypeArr[yunShuType!])//运输方式
}
@IBOutlet weak var submitBtn: LGButton!
@IBOutlet weak var listTbv: UITableView!
var cellHeight = 18.5
var contentStr:String = ""
var guiGeArr:NSMutableArray = []//根据规格资料数量控制右上角新增按钮是否显示
@IBOutlet weak var lgBtnLbl: UILabel!
var isYuShouShangPin:Bool?//是否为预售商品
var cellHeight = 18.5
var generalInfoModel : GeneralInfoModel? = nil
override func viewDidLoad() {
......@@ -80,35 +96,19 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
listTbv.register(UINib(nibName: "TitleAndBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndBtn")
listTbv.register(UINib(nibName: "AddImgCell", bundle: nil), forCellReuseIdentifier: "AddImg")
listTbv.register(UINib(nibName: "AddGuiGeCell", bundle: nil), forCellReuseIdentifier: "AddGuiGe")
listTbv.register(UINib(nibName: "CommendCell", bundle: nil), forCellReuseIdentifier: "Commend")
listTbv.register(UINib(nibName: "YuShouWeiKuanFaHuoCell", bundle: nil), forCellReuseIdentifier: "YuShouWeiKuanFaHuoCell")
listTbv.register(UINib(nibName: "ShangPinGguiGeCell", bundle: nil), forCellReuseIdentifier: "ShangPinGguiGeCell")
// Do any additional setup after loading the view.
}
//MARK: - cell delegate
func numberOfSections(in tableView: UITableView) -> Int {
return 6
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
switch section {
case 0: return 7
case 1:return 2
case 2:return 1
case 3:return 4
case 4:return 5
default:return 2
}
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
switch indexPath.section {
case 0:
if indexPath.row == 0 || indexPath.row == 4 {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTF") as! TitleAndTFCell
cell.nameLbl.text = spxxArr[indexPath.row]
cell.textTF.placeholder = tishixxArr[indexPath.row] as! String
cell.delegate = self
return cell
}
if indexPath.row > 4{
......@@ -137,6 +137,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
cell.delegate = self
cell.addBtn.tag = indexPath.row
cell.isEdit = true
return cell
case 2:
if guiGeArr.count > 0 {
......@@ -187,153 +188,33 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
cell.nameLbl.text = qtxxArr[indexPath.row]
cell.textTF.placeholder = tishixxArr1[indexPath.row] as! String
cell.tag = indexPath.row
cell.delegate = self
return cell
}else{
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtn") as! TitleAndBtnCell
cell.nameLbl.text = qtxxArr[indexPath.row]
cell.tag = indexPath.row
cell.contentLbl.text = tishixxArr1[indexPath.row] as! String
cell.delegate = self
return cell
}
default:
if indexPath.row == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: "Commend") as! CommendCell
cell.delegate = self
return cell
}else{
let cell = tableView.dequeueReusableCell(withIdentifier: "AddGuiGe") as! AddGuiGeCell
cell.imgBtn.setImage(UIImage(named: "tupian"), for: .normal)
cell.imgBtn.setImage(UIImage(named: "XiaYunDanViewController"), for: .normal)
cell.delegate = self
cell.imgBtn.tag = indexPath.row
cell.imgBtn.setImage(UIImage(named: "tjxq"), for: .normal)
cell.btmH.constant = 25
return cell
}
}
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
switch indexPath.section {
case 0: return 49
case 1:return 148.5
case 2:
if guiGeArr.count > 0 {
return 146
}
return 123.5
case 3:
if isYuShouShangPin == false {
return 0.01
}else{
return 49
}
case 4:return 49
default:
if indexPath.row == 0 {
return CGFloat(cellHeight)+27.5
}else{
return 155.5
}
}
}
//MARK: - tableview header
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
if section == 3 {
if isYuShouShangPin == false {
return UIView()
}
}
let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))
let lbl = UILabel(frame: CGRect(x: 15, y: 15, width: fullScreenWidth, height: 21))
lbl.text = titleArr[section]
lbl.textColor = UIColor(named: "标题字颜色")
lbl.font = UIFont.boldSystemFont(ofSize: 15)
view.addSubview(lbl)
if section == 2 && guiGeArr.count > 0{
let btn = UIButton()
btn.setTitle(" 新增", for: .normal)
btn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
btn.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
btn.setImage(UIImage(named: "jiahaoXG"), for: .normal)
view.addSubview(btn)
btn.sizeToFit()
btn.snp.makeConstraints { (make) in
make.centerY.equalTo(lbl.snp_centerY)
make.right.equalTo(-15)
make.height.equalTo(btn.frame.size.height)
make.width.equalTo(btn.frame.size.width)
}
let btn2 = UIButton()
view.addSubview(btn2)
btn2.snp.makeConstraints { (make) in
make.top.right.bottom.equalTo(0)
make.width.equalTo(80)
}
btn2.addTarget(self, action: #selector(addGuiGe), for: .touchUpInside)
if guiGeArr.count > 1 {
view.frame = CGRect(x: 0, y: 0, width: fullScreenWidth, height: 80)
let collectionView = UICollectionView(frame: CGRect(x: 0, y: 0, width: 0, height: 0), collectionViewLayout: layout)
collectionView.backgroundColor = UIColor.white
collectionView.delegate = self
collectionView.dataSource = self
view.addSubview(collectionView)
collectionView.snp.makeConstraints { (make) in
make.bottom.left.right.equalTo(0)
make.height.equalTo(41)
}
collectionView.showsHorizontalScrollIndicator = false
collectionView.isPagingEnabled = true
layout.itemSize = CGSize(width: fullScreenWidth*0.5, height: 41)
layout.scrollDirection = .horizontal
collectionView.collectionViewLayout = layout
collectionView.register(UINib(nibName: "ItemCell", bundle: nil), forCellWithReuseIdentifier: "ItemCell")
collectionView.selectItem(at:selectIdx, animated: false, scrollPosition: .left)
}
}
return view
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
if section == 3 {
if isYuShouShangPin == false {
return 0.001
}
}
if section == 2 {
if guiGeArr.count > 1 {
return 80
}
}
return 39
}
//MARK: - tableview footer
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 10))
view.backgroundColor = UIColor(named: "app底色")
return view
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
if section == 3 {
if isYuShouShangPin == false {
return 0.001
}
}
return 10
}
//MARK: - 自定义delegate
func CommendCellSendH(height: CGFloat) {
cellHeight = Double(height)
listTbv.beginUpdates()
listTbv.endUpdates()
}
func CommendCellSendStr(content: String) {
print("CommendCellSendStr")
}
override func backAction() {
self.navigationController?.popViewController(animated: true)
//MARK: - 底部广告软文跳转
func AddGuiGeCellClick(cell: AddGuiGeCell) {
print("底部广告软文跳转")
}
//MARK: -- 点击按钮事件，跳转或者展示选择界面
func btnClick(content: String, cell: TitleAndBtnCell) {
......@@ -369,7 +250,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
self.navigationController?.pushViewController(vc, animated: true)
}
if cell.nameLbl.text == "国家" {
print("选择国家")
}
if cell.nameLbl.text == "商品状态" {
let view = GLAlertSelectView(frame: self.view.bounds)
......@@ -377,7 +258,9 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
view.titleLbl.text = "请选择商品类型"
view.delegate = self
view.dataArr = shangPinStatusArr
view.selectNum = shangPinStatus
if shangPinStatus != nil {
view.selectNum = shangPinStatus!
}
self.view.addSubview(view)
glSelectView = view
}
......@@ -387,7 +270,9 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
view.titleLbl.text = "请选择运输方式"
view.delegate = self
view.dataArr = yunShuTypeArr
view.selectNum = yunShuType
if yunShuType != nil{
view.selectNum = yunShuType!
}
self.view.addSubview(view)
glSelectView = view
}
......@@ -407,17 +292,61 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
print("选择品牌返回的数据=\(sender)")
}
//MARK:--图片选择处理
func AddImgCellBtnClick(cell: AddImgCell) {
if cell.addBtn.tag == 0 {//仅一张
_ = self.presentHGImagePicker(maxSelected:1) { (assets) in
//结果处理
print("共选择了\(assets.count)张图片，分别如下：")
let option = PHImageRequestOptions()
option.isSynchronous = true
option.isNetworkAccessAllowed = true
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
self.singleImgArr.add(image)
})
}
cell.imgs = self.singleImgArr
}
}else{//可多张
_ = self.presentHGImagePicker(maxSelected:5) { (assets) in
//结果处理
print("共选择了\(assets.count)张图片，分别如下：")
let option = PHImageRequestOptions()
option.isSynchronous = true
option.isNetworkAccessAllowed = true
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
self.maxFiveImgsArr.add(image)
})
}
cell.imgs = self.maxFiveImgsArr
}
}
}
//MARK: - 删除图片处理
func DelImgCellBtnClick(sender: UIButton, cell: AddImgCell) {
if cell.isSingle == true {
singleImgArr.removeObject(at: sender.tag)
listTbv.reloadData()
}else{
maxFiveImgsArr.removeObject(at: sender.tag)
listTbv.reloadData()
}
}
//MARK: - GLAlertView（单选）下的页面
func GLAlertSelectViewClick(selectNum: NSString, view: GLAlertSelectView) {
func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
print(view.titleLbl.text)
switch view.titleLbl.text {
case "请选择商品类型":
shangPinStatus = selectNum as String
tishixxArr1.replaceObject(at: view.tag, with: shangPinStatusArr[selectNum.integerValue])
shangPinStatus = selectNum
tishixxArr1.replaceObject(at: view.tag, with: shangPinStatusArr[selectNum])
break
case "请选择运输方式":
yunShuType = selectNum as String
tishixxArr1.replaceObject(at: view.tag, with: yunShuTypeArr[selectNum.integerValue])
yunShuType = selectNum
tishixxArr1.replaceObject(at: view.tag, with: yunShuTypeArr[selectNum])
break
default:
break
......@@ -460,49 +389,23 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
glSelectView?.removeFromSuperview()
glSelectView = nil
}
//MARK: - 图片处理
func DelImgCellBtnClick(sender: UIButton, cell: AddImgCell) {
if cell.isSingle == true {
singleImgArr.removeObject(at: sender.tag)
listTbv.reloadData()
}else{
maxFiveImgsArr.removeObject(at: sender.tag)
listTbv.reloadData()
}
}
func AddImgCellBtnClick(cell: AddImgCell) {
if cell.addBtn.tag == 0 {//仅一张
_ = self.presentHGImagePicker(maxSelected:1) { (assets) in
//结果处理
print("共选择了\(assets.count)张图片，分别如下：")
let option = PHImageRequestOptions()
option.isSynchronous = true
option.isNetworkAccessAllowed = true
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
self.singleImgArr.add(image)
})
}
cell.imgs = self.singleImgArr
}
}else{//可多张
_ = self.presentHGImagePicker(maxSelected:5) { (assets) in
//结果处理
print("共选择了\(assets.count)张图片，分别如下：")
let option = PHImageRequestOptions()
option.isSynchronous = true
option.isNetworkAccessAllowed = true
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
self.maxFiveImgsArr.add(image)
})
}
cell.imgs = self.maxFiveImgsArr
}
//MARK: - titleAndTFdelegate
func textFieldContent(content: String, cell: TitleAndTFCell) {
switch cell.nameLbl.text {
case "商品名称":
itemName = content
break
case "起卖数量":
qiMaiShuLiang = content
break
case "关键字":
keyWord = content
break
case "物流费用":
wuLiuPrice = content
break
default:
break
}
}
//MARK: - 编辑规格
......@@ -542,10 +445,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
func CreatNewSpecsViewControllerDeleteAction() {
print("删除数据")
}
func AddGuiGeCellClick(cell: AddGuiGeCell) {
//
print("商品详情添加图片")
}
//MARK: - 新增规格
@objc func addGuiGe(){
print("新增规格")
......@@ -557,15 +457,12 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
vc.datasArr = guiGeArr
self.navigationController?.pushViewController(vc, animated: true)
}
@objc func addImageAction(sender:UIButton){
print(sender.tag)
}
//MARK: - 新增、编辑规格
func CreatNewSpecsViewControllerSaveAction(datas: NSMutableArray) {
guiGeArr = datas
listTbv.reloadData()
}
//MARK: - COLLECTIONVIEW DELEGATE
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
return 0
......@@ -594,8 +491,140 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
selectIdx = indexPath
//刷新cell
print("selectItem",selectIdx?.item)
listTbv.reloadData()
collectionView.reloadData()
}
//MARK: - switchClick
func switchClick(content: UISwitch, cell: TitleAndSwitchCell) {
switch cell.namelbl.text {
case "是否清真":
shiFouQZ = content.isOn
break
case "是否询价":
shiFouXJ = content.isOn
break
default:
break
}
}
func numberOfSections(in tableView: UITableView) -> Int {
return 6
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
switch section {
case 0: return 7
case 1:return 2
case 2:return 1
case 3:return 4
case 4:return 5
default:return 1
}
}
//MARK: - tableview footer
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 10))
view.backgroundColor = UIColor(named: "app底色")
return view
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
if section == 3 {
if isYuShouShangPin == false {
return 0.001
}
}
return 10
}
//MARK: - tableview header
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
if section == 3 {
if isYuShouShangPin == false {
return UIView()
}
}
let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))
let lbl = UILabel(frame: CGRect(x: 15, y: 15, width: fullScreenWidth, height: 21))
lbl.text = titleArr[section]
lbl.textColor = UIColor(named: "标题字颜色")
lbl.font = UIFont.boldSystemFont(ofSize: 15)
view.addSubview(lbl)
if section == 2 && guiGeArr.count > 0{
let btn = UIButton()
btn.setTitle(" 新增", for: .normal)
btn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
btn.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
btn.setImage(UIImage(named: "jiahaoXG"), for: .normal)
view.addSubview(btn)
btn.sizeToFit()
btn.snp.makeConstraints { (make) in
make.centerY.equalTo(lbl.snp_centerY)
make.right.equalTo(-15)
make.height.equalTo(btn.frame.size.height)
make.width.equalTo(btn.frame.size.width)
}
let btn2 = UIButton()
view.addSubview(btn2)
btn2.snp.makeConstraints { (make) in
make.top.right.bottom.equalTo(0)
make.width.equalTo(80)
}
btn2.addTarget(self, action: #selector(addGuiGe), for: .touchUpInside)
if guiGeArr.count > 1 {
view.frame = CGRect(x: 0, y: 0, width: fullScreenWidth, height: 80)
let collectionView = UICollectionView(frame: CGRect(x: 0, y: 0, width: 0, height: 0), collectionViewLayout: layout)
collectionView.backgroundColor = UIColor.white
collectionView.delegate = self
collectionView.dataSource = self
view.addSubview(collectionView)
collectionView.snp.makeConstraints { (make) in
make.bottom.left.right.equalTo(0)
make.height.equalTo(41)
}
collectionView.showsHorizontalScrollIndicator = false
collectionView.isPagingEnabled = true
layout.itemSize = CGSize(width: fullScreenWidth*0.5, height: 41)
layout.scrollDirection = .horizontal
collectionView.collectionViewLayout = layout
collectionView.register(UINib(nibName: "ItemCell", bundle: nil), forCellWithReuseIdentifier: "ItemCell")
collectionView.selectItem(at:selectIdx, animated: false, scrollPosition: .left)
}
}
return view
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
if section == 3 {
if isYuShouShangPin == false {
return 0.001
}
}
if section == 2 {
if guiGeArr.count > 1 {
return 80
}
}
return 39
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
switch indexPath.section {
case 0: return 49
case 1:return 148.5
case 2:
if guiGeArr.count > 0 {
return 146
}
return 123.5
case 3:
if isYuShouShangPin == false {
return 0.01
}else{
return 49
}
case 4:return 49
default:
return 98
}
}
override func backAction() {
self.navigationController?.popViewController(animated: true)
}
}
GeliBusinessPlatform/ViewController/地图/SJMapViewController.swift
View file @ 7b8bccd6
......@@ -164,14 +164,10 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
if idx == indexPath {
return
}else{
for item in tableView.visibleCells {
let cell = item as! SJMapCell
cell.imgView.isHidden = true
}
idx = indexPath
let cell = tableView.cellForRow(at: idx!) as! SJMapCell
cell.imgView.isHidden = false
mapView.setCenter(CLLocationCoordinate2D(latitude:CLLocationDegrees(cell.lat!), longitude: CLLocationDegrees(cell.lng!)), animated: false)
listView?.reloadData()
}
}
......
GeliBusinessPlatform/ViewController/寄派方式/JiPaiFangShiViewController.swift
View file @ 7b8bccd6
......@@ -8,12 +8,24 @@
import UIKit
class JiPaiFangShiViewController: BaseViewController {
class JiPaiFangShiViewController: BaseViewController ,SendTimeSelectViewDeleagte{
func SendTimeSelectViewSubmit(date: String) {
print(date)
sendTimeView?.removeFromSuperview()
sendTimeView = nil
}
func SendTimeSelectViewClose() {
sendTimeView?.removeFromSuperview()
sendTimeView = nil
}
var sendTimeView:SendTimeSelectView?
@IBAction func selectTimeAction(_ sender: UIButton) {
if sendTimeView == nil {
let view = SendTimeSelectView(frame:self.view.bounds)
view.delegate = self
self.view.addSubview(view)
sendTimeView = view
}
}
@IBOutlet weak var topView: UIView!
@IBOutlet weak var PLBL: UILabel!
......
GeliBusinessPlatform/ViewController/寄派方式/SendTimeSelectView.swift
View file @ 7b8bccd6
......@@ -7,19 +7,28 @@
//
import UIKit
protocol SendTimeSelectViewDeleagte {
func SendTimeSelectViewClose()
func SendTimeSelectViewSubmit(date:String)
}
class SendTimeSelectView: UIView,UITableViewDelegate,UITableViewDataSource {
var delegate:SendTimeSelectViewDeleagte?
let leftListArr = ["今天","明天","后天"]
let rightListArr = ["1","2","3"]
var contentView:UIView!
var leftSelectIdx:Int?
var rightSelectIdx:Int?
@IBAction func submitAction(_ sender: Any) {
delegate?.SendTimeSelectViewSubmit(date:"\(leftListArr[leftSelectIdx!]) \(rightListArr[rightSelectIdx!])")
}
@IBOutlet weak var rightListView: UITableView!
@IBOutlet weak var leftListView: UITableView!
@IBOutlet weak var bottomView: UIView!
@IBAction func closeAction(_ sender: Any) {
delegate?.SendTimeSelectViewClose()
}
func setUI(){
let maskPath = UIBezierPath(roundedRect: bottomView.bounds,
byRoundingCorners:[.topLeft, .topRight], cornerRadii:CGSize(width:3, height:3))
......@@ -83,46 +92,42 @@ class SendTimeSelectView: UIView,UITableViewDelegate,UITableViewDataSource {
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "OnlyLabel") as! OnlyLabelCell
cell.tag = indexPath.row
cell.titleLbl.text = rightListArr[indexPath.row]
if tableView == leftListView {
cell.titleLbl.text = leftListArr[indexPath.row]
cell.titleLbl.textColor = UIColor(named: "灰色字体颜色")
cell.titleLbl.font = UIFont.systemFont(ofSize: 13)
cell.backgroundColor = UIColor(named: "搜索框背景色")
if leftSelectIdx == indexPath.row{
cell.titleLbl.textColor = UIColor(named: "标题字颜色")
cell.titleLbl.font = UIFont.boldSystemFont(ofSize: 13)
cell.backgroundColor = UIColor.white
}
}else{
cell.titleLbl.text = rightListArr[indexPath.row]
cell.titleLbl.textColor = UIColor(named: "灰色字体颜色")
cell.titleLbl.font = UIFont.systemFont(ofSize: 13)
if rightSelectIdx == indexPath.row{
cell.titleLbl.textColor = UIColor(named: "蓝色字体颜色")
cell.titleLbl.font = UIFont.systemFont (ofSize: 13)
}
}
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if tableView == leftListView {
//
//cell状态效果
for item in leftListView.visibleCells {
let cel = item as! OnlyLabelCell
cel.titleLbl.textColor = UIColor(named: "灰色字体颜色")
cel.titleLbl.font = UIFont.systemFont(ofSize: 13)
cel.backgroundColor = UIColor(named: "搜索框背景色")
if cel.tag == indexPath.row {
cel.titleLbl.textColor = UIColor(named: "标题字颜色")
cel.titleLbl.font = UIFont.boldSystemFont(ofSize: 13)
cel.backgroundColor = UIColor.white
}
}
leftSelectIdx = indexPath.row
rightSelectIdx = nil
rightListView.reloadData()
leftListView.reloadData()
}
if tableView == rightListView {
//
//cell状态效果
for item in rightListView.visibleCells {
let cel = item as! OnlyLabelCell
cel.titleLbl.textColor = UIColor(named: "灰色字体颜色")
cel.titleLbl.font = UIFont.systemFont(ofSize: 13)
if cel.tag == indexPath.row {
cel.titleLbl.textColor = UIColor(named: "蓝色字体颜色")
cel.titleLbl.font = UIFont.systemFont (ofSize: 13)
}
rightSelectIdx = indexPath.row
rightListView.reloadData()
}
}
}
}
GeliBusinessPlatform/ViewController/寄派方式/SendTimeSelectView.xib
View file @ 7b8bccd6
......@@ -21,58 +21,44 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pzj-OB-7vE">
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
<rect key="frame" x="0.0" y="-60" width="414" height="1016"/>
<color key="backgroundColor" name="标题字颜色"/>
<connections>
<action selector="closeAction:" destination="-1" eventType="touchUpInside" id="2Nl-ek-T0g"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NDY-nX-rrQ">
<rect key="frame" x="0.0" y="502" width="414" height="360"/>
<rect key="frame" x="0.0" y="502" width="414" height="311"/>
<subviews>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bby-Me-LEh" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="311" width="414" height="49"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="titleString" value="确定"/>
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="titleFontName" value="PingFangSC"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitAction:" destination="-1" eventType="touchUpInside" id="k6O-tJ-5iq"/>
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="期望上门时间" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YFX-9l-JIo">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="期望上门时间" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YFX-9l-JIo">
<rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="579-R7-5y6"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Qul-rX-gAx">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qul-rX-gAx">
<rect key="frame" x="0.0" y="50" width="414" height="1"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="atF-8h-2ur"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="QvL-x6-Nh2">
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="QvL-x6-Nh2">
<rect key="frame" x="0.0" y="51" width="120" height="260"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" name="搜索框背景色"/>
<constraints>
<constraint firstAttribute="width" constant="120" id="5Zm-SS-f0u"/>
</constraints>
<connections>
<outlet property="dataSource" destination="-1" id="g69-0j-TlD"/>
<outlet property="delegate" destination="-1" id="OFq-A5-YDR"/>
</connections>
</tableView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="JWY-Hf-Cvn">
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="JWY-Hf-Cvn">
<rect key="frame" x="120" y="51" width="294" height="260"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="07f-lH-rDV"/>
......@@ -81,26 +67,74 @@
</tableView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="JWY-Hf-Cvn" secondAttribute="trailing" id="0Vp-EF-sd0"/>
<constraint firstItem="Qul-rX-gAx" firstAttribute="leading" secondItem="NDY-nX-rrQ" secondAttribute="leading" id="1fY-uR-k7D"/>
<constraint firstItem="YFX-9l-JIo" firstAttribute="leading" secondItem="NDY-nX-rrQ" secondAttribute="leading" id="1yL-EO-dGc"/>
<constraint firstAttribute="bottom" secondItem="QvL-x6-Nh2" secondAttribute="bottom" id="5ZZ-Pc-nyE"/>
<constraint firstItem="Qul-rX-gAx" firstAttribute="top" secondItem="YFX-9l-JIo" secondAttribute="bottom" id="Jlg-y7-K0j"/>
<constraint firstItem="YFX-9l-JIo" firstAttribute="top" secondItem="NDY-nX-rrQ" secondAttribute="top" id="OG5-Zp-0Z5"/>
<constraint firstAttribute="trailing" secondItem="YFX-9l-JIo" secondAttribute="trailing" id="PXm-8u-5eA"/>
<constraint firstAttribute="height" constant="311" id="ekl-CL-hHJ"/>
<constraint firstItem="JWY-Hf-Cvn" firstAttribute="top" secondItem="Qul-rX-gAx" secondAttribute="bottom" id="elT-0f-lRU"/>
<constraint firstAttribute="bottom" secondItem="JWY-Hf-Cvn" secondAttribute="bottom" id="gOn-Sv-tbI"/>
<constraint firstItem="QvL-x6-Nh2" firstAttribute="top" secondItem="Qul-rX-gAx" secondAttribute="bottom" id="lqy-ZZ-FHd"/>
<constraint firstItem="JWY-Hf-Cvn" firstAttribute="leading" secondItem="QvL-x6-Nh2" secondAttribute="trailing" id="mqL-fT-aH2"/>
<constraint firstAttribute="trailing" secondItem="Qul-rX-gAx" secondAttribute="trailing" id="nbS-UW-E2K"/>
<constraint firstItem="QvL-x6-Nh2" firstAttribute="leading" secondItem="NDY-nX-rrQ" secondAttribute="leading" id="s7H-WP-h4P"/>
</constraints>
</view>
<view alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vti-4i-27f">
<rect key="frame" x="0.0" y="-6" width="414" height="50"/>
<color key="backgroundColor" name="标题字颜色"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QPf-cc-IOc" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="83" id="QVy-lU-nMy"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitAction:" destination="-1" eventType="valueChanged" id="paV-fh-4L7"/>
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dmy-0B-RQj">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="Z5f-xt-94M"/>
</constraints>
<attributedString key="attributedText">
<fragment content="确定">
<attributes>
<color key="NSColor" name="白色背景色"/>
<font key="NSFont" size="17" name="PingFangSC-Medium"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Pzj-OB-7vE" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="AFW-j5-u0x"/>
<constraint firstItem="Pzj-OB-7vE" firstAttribute="top" secondItem="vti-4i-27f" secondAttribute="bottom" id="E0r-R8-HJA"/>
<constraint firstItem="vti-4i-27f" firstAttribute="trailing" secondItem="Pzj-OB-7vE" secondAttribute="trailing" id="Htb-Y8-LDS"/>
<constraint firstAttribute="bottom" secondItem="vti-4i-27f" secondAttribute="bottom" constant="852" id="HwX-R9-csQ"/>
<constraint firstItem="vti-4i-27f" firstAttribute="leading" secondItem="Pzj-OB-7vE" secondAttribute="leading" id="NSW-Cb-lEn"/>
<constraint firstItem="vti-4i-27f" firstAttribute="leading" secondItem="NDY-nX-rrQ" secondAttribute="leading" id="R5o-xt-6cH"/>
<constraint firstItem="Pzj-OB-7vE" firstAttribute="bottom" secondItem="vUN-kp-3ea" secondAttribute="bottom" id="TPi-74-1lB"/>
<constraint firstItem="vti-4i-27f" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="-6" id="UTz-6Q-eEg"/>
<constraint firstItem="NDY-nX-rrQ" firstAttribute="bottom" secondItem="vUN-kp-3ea" secondAttribute="bottom" id="bqN-Hs-EOD"/>
<constraint firstItem="Pzj-OB-7vE" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="kUF-Q8-JgT"/>
<constraint firstItem="NDY-nX-rrQ" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="502" id="ptB-vl-YvK"/>
<constraint firstItem="vti-4i-27f" firstAttribute="trailing" secondItem="NDY-nX-rrQ" secondAttribute="trailing" id="q2A-wH-Xva"/>
<constraint firstItem="Pzj-OB-7vE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="-60" id="6RX-jF-T34"/>
<constraint firstItem="Dmy-0B-RQj" firstAttribute="bottom" secondItem="vUN-kp-3ea" secondAttribute="bottom" id="BTL-Ju-jwq"/>
<constraint firstItem="QPf-cc-IOc" firstAttribute="top" secondItem="NDY-nX-rrQ" secondAttribute="bottom" id="E3f-Jz-7zg"/>
<constraint firstAttribute="bottom" secondItem="Pzj-OB-7vE" secondAttribute="bottom" constant="-60" id="FOI-0h-ESL"/>
<constraint firstItem="Pzj-OB-7vE" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="Pai-yb-WCE"/>
<constraint firstItem="Dmy-0B-RQj" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="UdG-mf-RzW"/>
<constraint firstItem="Pzj-OB-7vE" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="Yxv-2q-Qip"/>
<constraint firstItem="NDY-nX-rrQ" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="fXf-NH-dbm"/>
<constraint firstItem="Dmy-0B-RQj" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="mfD-mV-IdW"/>
<constraint firstItem="QPf-cc-IOc" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="qgh-vO-5VB"/>
<constraint firstAttribute="bottom" secondItem="QPf-cc-IOc" secondAttribute="bottom" id="sCY-pY-Dcu"/>
<constraint firstItem="QPf-cc-IOc" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="uMi-Hd-vIt"/>
<constraint firstItem="NDY-nX-rrQ" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="wUR-i3-vDQ"/>
</constraints>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<point key="canvasLocation" x="131.8840579710145" y="121.875"/>
......@@ -111,7 +145,7 @@
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="搜索框背景色">
<color red="0.9137254901960784" green="0.90588235294117647" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -122,5 +156,8 @@
<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>
</resources>
</document>
GeliBusinessPlatform/ViewController/新增、编辑品牌/PinPaiListViewController.swift
View file @ 7b8bccd6
......@@ -81,6 +81,9 @@ class PinPaiListViewController: BaseViewController,UISearchBarDelegate,SearchBar
if selectIdx == indexPath.row {
cell.titleLbl.textColor = UIColor(named: "蓝色字体颜色")
cell.selectBtn.isSelected = true
}else{
cell.titleLbl.textColor = UIColor(named: "标题字颜色")
cell.selectBtn.isSelected = false
}
// let rowModel = dataModelArray![indexPath.row] as! GeneralInfoBrandModel
// cell.nameLbl.text = rowModel.brand_name
......@@ -95,9 +98,10 @@ class PinPaiListViewController: BaseViewController,UISearchBarDelegate,SearchBar
var selectModel : GeneralInfoBrandModel? = nil
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if isSelectData {
let rowModel = dataModelArray![indexPath.row] as! GeneralInfoBrandModel
selectModel = rowModel
// let rowModel = dataModelArray![indexPath.row] as! GeneralInfoBrandModel
// selectModel = rowModel
selectIdx = indexPath.row
listView.reloadData()
}else{
let vc = XinZengPinPaiViewController()
vc.navTitle = "编辑品牌"
......@@ -120,18 +124,9 @@ class PinPaiListViewController: BaseViewController,UISearchBarDelegate,SearchBar
//MARK:--自定义celldelegate
func TitleAndSelectCellClick(content: UIButton, cell: TitleAndSelectCell) {
print(cell.tag)
selectIdx = cell.tag
listView.reloadData()
let cells = listView.visibleCells as! Array<TitleAndSelectCell>
for item in cells {
item.titleLbl.textColor = UIColor(named: "标题字颜色")
item.selectBtn.isSelected = false
if item == cell {
item.titleLbl.textColor = UIColor(named: "蓝色字体颜色")
item.selectBtn.isSelected = true
}
}
}
}
GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift
View file @ 7b8bccd6
......@@ -8,16 +8,15 @@
import UIKit
import LGButton
@objc protocol CreatNewSpecsViewControllerDelegate {
@objc optional func CreatNewSpecsViewControllerSaveAction(datas:NSMutableArray)
@objc optional func CreatNewSpecsViewControllerDeleteAction()
protocol CreatNewSpecsViewControllerDelegate {
func CreatNewSpecsViewControllerSaveAction(datas:NSMutableArray)
func CreatNewSpecsViewControllerDeleteAction()
}
class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndTFCellDelegate,TitleAndBtnCellDelegate,TitleAndSwitchCellDelegate,TitleAndSwitchHeaderViewDelegate,NewCreateHeaderDelegate,NewCreateFooterDelegate,YuShouCellDelegate,GLAlertSelectViewDelegate,PuTongJieTiCellDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout{
var layout = UICollectionViewFlowLayout()
var delegate:CreatNewSpecsViewControllerDelegate?
var collectView:UICollectionView?
var datasArr:NSMutableArray = []
......@@ -85,7 +84,6 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
print("item == ",selectIdx?.item)
collectView?.selectItem(at:selectIdx, animated: false, scrollPosition: .bottom)
}
@IBOutlet weak var topBarView: UIView!
......@@ -201,12 +199,11 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
dict["isYuShouSetting"] = isYuShouSetting
dict["yuShouPrice"] = yuShouPrice
if barTitle?.contains("编辑") == true {
print("abc == ",selectIdx?.item)
datasArr.replaceObject(at: selectIdx!.item, with: dict)
}else{
datasArr.add(dict)
}
delegate?.CreatNewSpecsViewControllerSaveAction?(datas: datasArr)
delegate?.CreatNewSpecsViewControllerSaveAction(datas: datasArr)
self.navigationController?.popViewController(animated: true)
}
//MARK: - cell delegate
......@@ -266,13 +263,13 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
cell.nameLbl.text = titleArray[indexPath.row]
cell.contentLbl.text = pliceHolderArr[indexPath.row]
if indexPath.row == 3 {
if tempSelect != "99" {
cell.contentLbl.text = selectListArr[tempSelect.integerValue]
if tempSelect != nil {
cell.contentLbl.text = selectListArr[tempSelect!]
}
}
if indexPath.row == 4 {
if itemDanWeiSelect != "99" {
cell.contentLbl.text = selectListArr[itemDanWeiSelect.integerValue]
if itemDanWeiSelect != nil {
cell.contentLbl.text = selectListArr1[itemDanWeiSelect!]
}
}
if datasArr.count > 0 {
......@@ -353,7 +350,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if indexPath.section == 3 {
delegate?.CreatNewSpecsViewControllerDeleteAction?()
delegate?.CreatNewSpecsViewControllerDeleteAction()
}
}
......@@ -447,16 +444,16 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
break
}
}
func GLAlertSelectViewClick(selectNum: NSString, view: GLAlertSelectView) {
func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
let cell = listTbv.cellForRow(at: IndexPath(row: view.tag, section: 0)) as! TitleAndBtnCell
if view.tag == 3 {
tempSelect = selectNum
wenDu = selectListArr[selectNum.integerValue]
cell.contentLbl.text = selectListArr[selectNum.integerValue]
wenDu = selectListArr[selectNum]
cell.contentLbl.text = selectListArr[selectNum]
}else{
itemDanWeiSelect = selectNum
cell.contentLbl.text = selectListArr1[selectNum.integerValue]
danWei = selectListArr1[selectNum.integerValue]
cell.contentLbl.text = selectListArr1[selectNum]
danWei = selectListArr1[selectNum]
}
......@@ -471,8 +468,8 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
// var tempSelectArr = NSMutableArray()
var tempSelect:NSString = "99"
var itemDanWeiSelect:NSString = "99"
var tempSelect:Int?
var itemDanWeiSelect:Int?
func btnClick(content: String, cell: TitleAndBtnCell) {
if cell.tag == 3 {
......@@ -482,7 +479,9 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
view.titleLbl.text = "请选择商品温藏"
view.delegate = self
view.dataArr = selectListArr
view.selectNum = tempSelect as String //单选
if tempSelect != nil {
view.selectNum = tempSelect!
}
self.view.addSubview(view)
selectView = view
}
......@@ -492,7 +491,9 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
view.tag = cell.tag
view.titleLbl.text = "请选择商品单位"
view.delegate = self
view.selectNum = itemDanWeiSelect as String
if itemDanWeiSelect != nil {
view.selectNum = itemDanWeiSelect!
}
view.dataArr = selectListArr1
self.view.addSubview(view)
selectView = view
......
GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.swift
View file @ 7b8bccd6
......@@ -22,7 +22,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
var isEdit:Bool?
//测试数据
var data:NSDictionary? = nil
var gouWuType = "99" //购物类型
var gouWuType:Int? //购物类型
override func viewDidLoad() {
super.viewDidLoad()
......@@ -195,7 +195,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
if glSelectView == nil {
let view = GLAlertSelectView(frame: self.view.bounds)
// view.isMultipleSelect = false//是否多选
view.selectNum = gouWuType
view.selectNum = gouWuType!
view.delegate = self
view.titleLbl.text = "请选择购物类型"
view.dataArr = ["普通订单","预售下单"]
......@@ -251,7 +251,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
print("AddGuiGeCellClick")
}
func GLAlertSelectViewClick(selectNum: NSString, view: GLAlertSelectView) {
func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
print("单选",selectNum)
glSelectView?.removeFromSuperview()
glSelectView = nil
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 7b8bccd6
......@@ -89,9 +89,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case 3:
let view = HeaderOnlyTitleView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))
if isYuShou {
view.nameLbl.text = "收货信息"
}else{
view.nameLbl.text = "订单信息"
}else{
view.nameLbl.text = "收货信息"
}
return view
case 4:
......@@ -177,8 +177,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
cell.textTF.isUserInteractionEnabled = false
if isYuShou {
cell.nameLbl.text = yuShouTitleArr[indexPath.row]
cell.textTF.text = yuShouTitleArr[indexPath.row]
cell.nameLbl.text = nonYuShouPart3Arr[indexPath.row]
cell.textTF.text = nonYuShouPart3Arr[indexPath.row]
cell.delegate = self
if indexPath.row == yuShouTitleArr.count - 1 {
cell.line.isHidden = true
......@@ -196,8 +196,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if isYuShou {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
cell.textTF.isUserInteractionEnabled = false
cell.nameLbl.text = YuShouPart3Arr[indexPath.row]
cell.textTF.text = YuShouPart3Arr[indexPath.row]
cell.nameLbl.text = nonYuShouPart3Arr[indexPath.row]
cell.textTF.text = nonYuShouPart3Arr[indexPath.row]
return cell
}else{
if indexPath.row == 4 || indexPath.row == 5 || indexPath.row == 9 {
......
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