Skip to content

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

更新下运单样式，重开京东

parent e5f5a236
Show whitespace changes
Inline Side-by-side
Showing with 175 additions and 190 deletions
GeliBusinessPlatform/Define/NetworkRequest.swift
View file @ 536446e3
......@@ -129,6 +129,7 @@ extension NetworkRequest {
UserDefaults.standard.removeObject(forKey: "WorkDataModel")
UserDefaults.standard.removeObject(forKey: "user_token")
UserDefaults.standard.removeObject(forKey: "userName")
NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
JPUSHService.deleteAlias({ (resCode, alias, num) in
......
GeliBusinessPlatform/Other/LMNote/LMNoteViewController.m
View file @ 536446e3
......@@ -526,9 +526,10 @@
[[PHImageManager defaultManager] requestImageForAsset:asset targetSize:targetSize contentMode:PHImageContentModeAspectFill options:options resultHandler:^(UIImage *result, NSDictionary *info) {
//请求上传图片
NSString *token = [[NSUserDefaults standardUserDefaults]stringForKey:@"user_token"];
TestClass *model = [[TestClass alloc]init];
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:10];
[dict setValue:@"RQdwz5QKpeg=" forKey:@"user_token"];
[dict setValue:token forKey:@"user_token"];
[model saveFileWithImage:result params:dict success:^(NSDictionary<NSString *,id> * data) {
if ([[NSString stringWithFormat:@"%@",data[@"code"]]isEqualToString:@"1"]) {
......
GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.swift
View file @ 536446e3
......@@ -39,6 +39,8 @@ class LogisticalSelectView: UIView {
@IBOutlet weak var xyAgreeLbl: UILabel!
@IBOutlet weak var sfPriceLbl: UILabel!
@IBOutlet weak var jdPriceLbl: UILabel!
var SFtempArr:Array<UILabel> = []
var SFfuTitleArr:Array<String> = [] {
didSet {
......@@ -46,7 +48,7 @@ class LogisticalSelectView: UIView {
SFtempArr.forEach { (item) in
item.removeFromSuperview()
}
selectBgHeight.constant = CGFloat(270)
selectBgHeight.constant = CGFloat(340)
xyTop.constant = CGFloat(0)
sflineBottom.constant = CGFloat(0)
......@@ -67,7 +69,7 @@ class LogisticalSelectView: UIView {
xyTop.constant = CGFloat(SFfuTitleArr.count * 19)
sflineBottom.constant = CGFloat(-(SFfuTitleArr.count * 19))
selectBgHeight.constant = CGFloat(270 + SFfuTitleArr.count * 19)
selectBgHeight.constant = CGFloat(340 + SFfuTitleArr.count * 19)
}
}
......@@ -78,7 +80,7 @@ class LogisticalSelectView: UIView {
XYtempArr.forEach { (item) in
item.removeFromSuperview()
}
selectBgHeight.constant = CGFloat(270)
selectBgHeight.constant = CGFloat(340)
return
}
for i in 0..<XYfuTitleArr.count {
......@@ -93,7 +95,7 @@ class LogisticalSelectView: UIView {
}
XYtempArr.append(lbl)
}
selectBgHeight.constant = CGFloat(270 + XYfuTitleArr.count * 19)
selectBgHeight.constant = CGFloat(340 + XYfuTitleArr.count * 19)
}
}
......@@ -167,7 +169,7 @@ class LogisticalSelectView: UIView {
func setJD(){
jdBgViewH.constant = 0
jdBgView.isHidden = true
selectBgHeight.constant = CGFloat(270)
selectBgHeight.constant = CGFloat(340)
}
func setSF(){
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/JiTuoWuXinXiView.swift
View file @ 536446e3
......@@ -22,26 +22,26 @@ class JiTuoWuXinXiView: UIView,UITextFieldDelegate{
}
@IBOutlet weak var countTf: UITextField!
@IBOutlet weak var weightTf: UITextField!
@IBOutlet weak var gaoTf: UITextField!
@IBOutlet weak var kuanTf: UITextField!
@IBOutlet weak var changTf: UITextField!
// @IBOutlet weak var gaoTf: UITextField!
// @IBOutlet weak var kuanTf: UITextField!
// @IBOutlet weak var changTf: UITextField!
@IBOutlet weak var itemBaoTf: UITextField!//寄托物品包装
@IBAction func jiaJianMethod(_ sender: UIButton) {
switch sender.tag {
case 0:
changTf.text = ""
kuanTf.text = ""
gaoTf.text = ""
// changTf.text = ""
// kuanTf.text = ""
// gaoTf.text = ""
var str = tiJiTF.text as! NSString
str = "\(str.integerValue + 1)" as NSString
tiJiTF.text = str as String
break
case 1:
changTf.text = ""
kuanTf.text = ""
gaoTf.text = ""
// changTf.text = ""
// kuanTf.text = ""
// gaoTf.text = ""
var str = tiJiTF.text as! NSString
if str.integerValue > 1 {
str = "\(str.integerValue - 1)" as NSString
......@@ -84,7 +84,7 @@ class JiTuoWuXinXiView: UIView,UITextFieldDelegate{
let tiji = tiJiTF.text as! NSString
let weight = weightTf.text as! NSString
let count = countTf.text as! NSString
delegate?.JiTuoWuXinXiViewSubmit(itemName: itemNameTF.text!,itemBaoName:itemBaoTf.text!, tiJi: tiji.floatValue, weight: weight.floatValue, count: count.integerValue, isCheck: infoSw.isOn,chang: changTf.text,kuang: kuanTf.text,gao: gaoTf.text)
delegate?.JiTuoWuXinXiViewSubmit(itemName: itemNameTF.text!,itemBaoName:itemBaoTf.text!, tiJi: tiji.floatValue, weight: weight.floatValue, count: count.integerValue, isCheck: infoSw.isOn,chang: "",kuang: "",gao: "")
}
@IBOutlet weak var tiJiTF: UITextField!
@IBOutlet weak var itemNameTF: UITextField!
......@@ -100,30 +100,30 @@ class JiTuoWuXinXiView: UIView,UITextFieldDelegate{
masklayer.path = maskPath.cgPath
bottomView.layer.mask = masklayer
changTf.delegate = self
kuanTf.delegate = self
gaoTf.delegate = self
// changTf.delegate = self
// kuanTf.delegate = self
// gaoTf.delegate = self
tiJiTF.delegate = self
changTf.keyboardType = .numberPad
kuanTf.keyboardType = .numberPad
gaoTf.keyboardType = .numberPad
// changTf.keyboardType = .numberPad
// kuanTf.keyboardType = .numberPad
// gaoTf.keyboardType = .numberPad
}
func textFieldDidEndEditing(_ textField: UITextField) {
if textField == tiJiTF {
changTf.text = ""
kuanTf.text = ""
gaoTf.text = ""
}
if changTf.text!.count > 0 && kuanTf.text!.count > 0 && gaoTf.text!.count > 0 {
let chang = changTf.text as! NSString
let kuan = kuanTf.text as! NSString
let gao = gaoTf.text as! NSString
let c = chang.floatValue / 100
let k = kuan.floatValue / 100
let g = gao.floatValue / 100
tiJiTF.text = String(format: "%.2f", c * k * g)
}
// if textField == tiJiTF {
// changTf.text = ""
// kuanTf.text = ""
// gaoTf.text = ""
// }
// if changTf.text!.count > 0 && kuanTf.text!.count > 0 && gaoTf.text!.count > 0 {
// let chang = changTf.text as! NSString
// let kuan = kuanTf.text as! NSString
// let gao = gaoTf.text as! NSString
// let c = chang.floatValue / 100
// let k = kuan.floatValue / 100
// let g = gao.floatValue / 100
// tiJiTF.text = String(format: "%.2f", c * k * g)
// }
}
//初始化时将xib中的view添加进来
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/JiTuoWuXinXiView.xib
View file @ 536446e3
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<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" customClass="JiTuoWuXinXiView" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="bottomView" destination="rW2-Ka-gAx" id="QZC-w2-eDD"/>
<outlet property="changTf" destination="5E2-xz-YWP" id="PZv-hI-SaR"/>
<outlet property="countTf" destination="xT3-6M-vtU" id="3Qs-lY-VyP"/>
<outlet property="gaoTf" destination="Ccw-5O-TIs" id="4vD-69-zxj"/>
<outlet property="infoSw" destination="n6W-Cn-03r" id="7Cp-xO-kfJ"/>
<outlet property="itemBaoTf" destination="hlo-EC-mgW" id="bPZ-at-Fm5"/>
<outlet property="itemNameTF" destination="jQJ-ZH-wxQ" id="sy3-Jc-pvu"/>
<outlet property="kuanTf" destination="VMY-3D-Df9" id="ycj-dg-1bV"/>
<outlet property="tiJiTF" destination="oYB-7R-ZKc" id="cwv-iS-Kfl"/>
<outlet property="weightTf" destination="dXi-t1-G5Y" id="ILG-HQ-Gme"/>
</connections>
......@@ -28,7 +26,7 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<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">
<button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6Sh-qF-UK5">
<rect key="frame" x="0.0" y="-36" width="414" height="978"/>
<color key="backgroundColor" name="标题字颜色"/>
<connections>
......@@ -36,7 +34,7 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rW2-Ka-gAx">
<rect key="frame" x="0.0" y="423" width="414" height="390"/>
<rect key="frame" x="0.0" y="463" width="414" height="350"/>
<subviews>
<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"/>
......@@ -74,10 +72,10 @@
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(必填)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AMe-xQ-yG4">
<rect key="frame" x="99" y="24.5" width="32" height="15"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AMe-xQ-yG4">
<rect key="frame" x="99" y="24.5" width="5" height="15"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="ZAc-Xa-CeA"/>
<constraint firstAttribute="width" constant="5" id="ZAc-Xa-CeA"/>
<constraint firstAttribute="height" constant="15" id="gdz-Hd-odC"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
......@@ -85,10 +83,10 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Agk-2x-4w0">
<rect key="frame" x="141" y="11" width="258" height="37"/>
<rect key="frame" x="114" y="11" width="285" height="37"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="最多输入十个汉字喔。" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jQJ-ZH-wxQ">
<rect key="frame" x="5" y="0.0" width="248" height="37"/>
<rect key="frame" x="5" y="0.0" width="275" height="37"/>
<color key="textColor" name="灰色字体颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
......@@ -122,7 +120,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G9X-pI-5Ce">
<rect key="frame" x="0.0" y="168" width="414" height="95"/>
<rect key="frame" x="0.0" y="168" width="414" height="44"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jia " translatesAutoresizingMaskIntoConstraints="NO" id="Ltu-VH-zad">
<rect key="frame" x="379" y="20" width="20" height="20"/>
......@@ -154,85 +152,7 @@
<constraint firstAttribute="width" constant="20" id="m1K-jU-EVz"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="cm" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SRh-PH-yRq">
<rect key="frame" x="380" y="76.5" width="19" height="18.5"/>
<constraints>
<constraint firstAttribute="width" constant="19" id="KT6-9j-YFD"/>
<constraint firstAttribute="height" constant="18.5" id="rH3-gF-sSr"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="高" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Ccw-5O-TIs">
<rect key="frame" x="310" y="60" width="65" height="35"/>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="height" constant="35" id="4Jg-41-eqK"/>
<constraint firstAttribute="width" constant="65" id="jPc-ED-NMm"/>
</constraints>
<color key="textColor" name="灰色字体颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="3"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="cm" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xHl-Yl-Ph9">
<rect key="frame" x="271" y="76.5" width="19" height="18.5"/>
<constraints>
<constraint firstAttribute="height" constant="18.5" id="4ME-j7-8LH"/>
<constraint firstAttribute="width" constant="19" id="yoQ-hm-jck"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="宽" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="VMY-3D-Df9">
<rect key="frame" x="201" y="60" width="65" height="35"/>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="width" constant="65" id="6AO-QZ-CtY"/>
<constraint firstAttribute="height" constant="35" id="dJ6-MW-74g"/>
</constraints>
<color key="textColor" name="灰色字体颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="3"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="cm" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nHd-U2-0Tt">
<rect key="frame" x="162" y="76.5" width="19" height="18.5"/>
<constraints>
<constraint firstAttribute="width" constant="19" id="0Yg-2w-vSZ"/>
<constraint firstAttribute="height" constant="18.5" id="mSd-HT-xlK"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="长" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5E2-xz-YWP">
<rect key="frame" x="92" y="60" width="65" height="35"/>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="height" constant="35" id="8y2-sr-WKK"/>
<constraint firstAttribute="width" constant="65" id="ktF-C2-HsJ"/>
</constraints>
<color key="textColor" name="灰色字体颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="3"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textField>
<button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bie-z4-ar6">
<button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bie-z4-ar6">
<rect key="frame" x="366.5" y="7.5" width="45" height="45"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
......@@ -243,7 +163,7 @@
<action selector="jiaJianMethod:" destination="-1" eventType="touchUpInside" id="TAA-Mr-5ig"/>
</connections>
</button>
<button opaque="NO" alpha="0.5" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O28-9q-hfK">
<button opaque="NO" alpha="0.5" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O28-9q-hfK">
<rect key="frame" x="236.5" y="7.5" width="45" height="45"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
......@@ -269,33 +189,21 @@
<constraint firstItem="hxq-1f-Dpl" firstAttribute="leading" secondItem="6FH-ec-Y1m" secondAttribute="trailing" id="1uw-hB-gi9"/>
<constraint firstItem="Ltu-VH-zad" firstAttribute="top" secondItem="G9X-pI-5Ce" secondAttribute="top" constant="20" id="2MH-8c-Hsq"/>
<constraint firstItem="Ltu-VH-zad" firstAttribute="leading" secondItem="oYB-7R-ZKc" secondAttribute="trailing" constant="15" id="3r5-KP-8M0"/>
<constraint firstAttribute="bottom" secondItem="5E2-xz-YWP" secondAttribute="bottom" id="4jQ-ud-LiX"/>
<constraint firstItem="SRh-PH-yRq" firstAttribute="leading" secondItem="Ccw-5O-TIs" secondAttribute="trailing" constant="5" id="6F2-2J-7nc"/>
<constraint firstAttribute="trailing" secondItem="Ltu-VH-zad" secondAttribute="trailing" constant="15" id="8t2-s4-Woe"/>
<constraint firstItem="O28-9q-hfK" firstAttribute="centerX" secondItem="hxq-1f-Dpl" secondAttribute="centerX" id="8zE-Sb-IMM"/>
<constraint firstAttribute="bottom" secondItem="nHd-U2-0Tt" secondAttribute="bottom" id="Ab6-34-bkN"/>
<constraint firstAttribute="trailing" secondItem="SRh-PH-yRq" secondAttribute="trailing" constant="15" id="BLr-3E-aQT"/>
<constraint firstItem="bie-z4-ar6" firstAttribute="centerX" secondItem="Ltu-VH-zad" secondAttribute="centerX" id="Bru-5y-mke"/>
<constraint firstItem="O28-9q-hfK" firstAttribute="centerY" secondItem="hxq-1f-Dpl" secondAttribute="centerY" id="CYJ-fd-p4H"/>
<constraint firstAttribute="bottom" secondItem="xHl-Yl-Ph9" secondAttribute="bottom" id="FLg-3h-Bnl"/>
<constraint firstItem="Ccw-5O-TIs" firstAttribute="leading" secondItem="xHl-Yl-Ph9" secondAttribute="trailing" constant="20" id="FTi-dz-sfp"/>
<constraint firstAttribute="bottom" secondItem="VMY-3D-Df9" secondAttribute="bottom" id="GRc-Ix-u6p"/>
<constraint firstItem="oYB-7R-ZKc" firstAttribute="leading" secondItem="hxq-1f-Dpl" secondAttribute="trailing" constant="15" id="MBo-vk-a2M"/>
<constraint firstItem="VMY-3D-Df9" firstAttribute="leading" secondItem="nHd-U2-0Tt" secondAttribute="trailing" constant="20" id="PFu-tL-gHh"/>
<constraint firstItem="xHl-Yl-Ph9" firstAttribute="leading" secondItem="VMY-3D-Df9" secondAttribute="trailing" constant="5" id="QWF-68-ugJ"/>
<constraint firstItem="bie-z4-ar6" firstAttribute="centerY" secondItem="Ltu-VH-zad" secondAttribute="centerY" id="RaX-ik-okl"/>
<constraint firstItem="oYB-7R-ZKc" firstAttribute="centerY" secondItem="Ltu-VH-zad" secondAttribute="centerY" id="Usj-UU-uXk"/>
<constraint firstAttribute="bottom" secondItem="Ccw-5O-TIs" secondAttribute="bottom" id="VEq-Xy-4dl"/>
<constraint firstItem="nHd-U2-0Tt" firstAttribute="leading" secondItem="5E2-xz-YWP" secondAttribute="trailing" constant="5" id="aSh-1R-wAU"/>
<constraint firstItem="hxq-1f-Dpl" firstAttribute="centerY" secondItem="oYB-7R-ZKc" secondAttribute="centerY" id="b8A-dE-9RT"/>
<constraint firstItem="6FH-ec-Y1m" firstAttribute="centerY" secondItem="hxq-1f-Dpl" secondAttribute="centerY" id="cpL-YF-Ubq"/>
<constraint firstItem="6FH-ec-Y1m" firstAttribute="leading" secondItem="G9X-pI-5Ce" secondAttribute="leading" constant="15" id="die-NC-CGt"/>
<constraint firstAttribute="height" constant="95" id="f5s-Xy-Mu6"/>
<constraint firstAttribute="bottom" secondItem="SRh-PH-yRq" secondAttribute="bottom" id="hHv-zL-ByU"/>
<constraint firstAttribute="height" constant="44" id="f5s-Xy-Mu6"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3m5-vv-wjM">
<rect key="frame" x="0.0" y="268" width="414" height="50"/>
<rect key="frame" x="0.0" y="217" width="414" height="50"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="1" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dXi-t1-G5Y">
<rect key="frame" x="319" y="15" width="80" height="35"/>
......@@ -334,7 +242,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9xb-ef-BR6">
<rect key="frame" x="0.0" y="323" width="414" height="50"/>
<rect key="frame" x="0.0" y="272" width="414" height="50"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jia " translatesAutoresizingMaskIntoConstraints="NO" id="0Zy-eC-BOB">
<rect key="frame" x="379" y="20" width="20" height="20"/>
......@@ -376,7 +284,7 @@
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" alpha="0.5" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OY2-Kj-DtJ">
<button opaque="NO" alpha="0.5" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OY2-Kj-DtJ">
<rect key="frame" x="374" y="15" width="30" height="30"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
......@@ -387,7 +295,7 @@
<action selector="jiaJianMethod:" destination="-1" eventType="touchUpInside" id="rsg-7J-8Jx"/>
</connections>
</button>
<button opaque="NO" alpha="0.5" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3OQ-Ur-PSr">
<button opaque="NO" alpha="0.5" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3OQ-Ur-PSr">
<rect key="frame" x="244" y="15" width="30" height="30"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
......@@ -417,7 +325,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Trf-1A-2UZ">
<rect key="frame" x="0.0" y="373" width="414" height="0.0"/>
<rect key="frame" x="0.0" y="322" width="414" height="0.0"/>
<subviews>
<switch hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="n6W-Cn-03r">
<rect key="frame" x="350" y="-15.5" width="51" height="31"/>
......@@ -489,7 +397,7 @@
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="j7A-oC-j4G" secondAttribute="trailing" id="5tV-gW-2Pb"/>
<constraint firstItem="3m5-vv-wjM" firstAttribute="top" secondItem="G9X-pI-5Ce" secondAttribute="bottom" constant="5" id="6HS-cH-xzB"/>
......@@ -507,7 +415,7 @@
<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="390" id="eAp-Aj-L92"/>
<constraint firstAttribute="height" constant="350" id="eAp-Aj-L92"/>
<constraint firstItem="9xb-ef-BR6" firstAttribute="top" secondItem="3m5-vv-wjM" secondAttribute="bottom" constant="5" 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"/>
......@@ -520,11 +428,11 @@
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="42o-v7-rc9">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</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"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
......@@ -558,6 +466,7 @@
<nil key="highlightedColor"/>
</label>
</subviews>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="gq9-xD-Wd8" firstAttribute="top" secondItem="i2O-Lc-NwB" secondAttribute="top" id="5aU-gh-ZPo"/>
......@@ -579,10 +488,14 @@
<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"/>
<point key="canvasLocation" x="-210" y="121"/>
</view>
</objects>
<designables>
<designable name="gq9-xD-Wd8">
<size key="intrinsicContentSize" width="10" height="10"/>
</designable>
</designables>
<resources>
<image name="jia " width="20" height="20"/>
<image name="jian" width="20" height="20"/>
......@@ -598,9 +511,6 @@
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......@@ -610,11 +520,11 @@
<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.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/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ 536446e3
......@@ -670,7 +670,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
let alertView = LogisticalSelectView(frame: self.view.window!.bounds)
alertView.delegate = self
if logPayPriceModel?.price_jd != nil {
alertView.jdPriceLbl.text = "京东物流（预估运费" + String(format: "%.2f", (logPayPriceModel?.price_jd)!) + "元）"
}
if logPayPriceModel?.price_sf != nil {
alertView.sfPriceLbl.text = "顺丰冷运（预估运费" + String(format: "%.2f", (logPayPriceModel?.price_sf)!) + "元）"
}
......@@ -681,7 +683,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
self.view.window?.addSubview(alertView)
alertView.setJD()
// alertView.setJD()
weak_alertView = alertView
}
......@@ -689,6 +691,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
func LogisticalSelectViewBtnclick(idx:Int){
weak_alertView?.SFfuTitleArr = []
weak_alertView?.XYfuTitleArr = []
if idx == 1{
var futitleArr:Array<String> = []
logPayPriceModel?.sf_data?.forEach({ (model) in
......@@ -1486,9 +1489,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
jtwxxView?.weightTf.text = String(format: "%.f", (weight)!)
jtwxxView?.countTf.text = String(format: "%.d", (count)!)
jtwxxView?.infoSw.isOn = isCheck!
jtwxxView?.changTf.text = chang
jtwxxView?.kuanTf.text = kuang
jtwxxView?.gaoTf.text = gao
// jtwxxView?.changTf.text = chang
// jtwxxView?.kuanTf.text = kuang
// jtwxxView?.gaoTf.text = gao
jtwxxView?.itemBaoTf.text = self.itemBaoName
}
}
......
GeliBusinessPlatform/ViewController/修改密码/ChangePassViewController.swift
View file @ 536446e3
......@@ -66,6 +66,7 @@ class ChangePassViewController: BaseViewController {
HUD.flash(.label("请重新登录"), delay: 1.5)
delay(1.5){
UserDefaults.standard.removeObject(forKey: "user_token")
UserDefaults.standard.removeObject(forKey: "userName")
NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
}
......
GeliBusinessPlatform/ViewController/地址管理/DZGLViewController.swift
View file @ 536446e3
......@@ -109,6 +109,7 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
super.viewDidLoad()
navbar.title = "地址管理"
self.view.addSubview(navbar)
self.holder_view.isHidden = true
if isSelectlogAddress {
navbar.title = "地址选择"
HUD.flash(.progress)
......@@ -116,6 +117,9 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
getAddr(["user_token":UserToken as Any], success: { (data) in
self.adrInfo = (data as! GetAddrsInfoModel)
if self.adrInfo?.data?.count == 0 {
self.holder_view.isHidden = false
}
self.listView.reloadData()
HUD.hide()
}) { (error) in
......@@ -127,6 +131,10 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
searchBgH.constant = 0
getAddrsInfo(["user_token":UserToken as Any,"cus_id":cus_id as Any], success: { (data) in
self.adrInfo = (data as! GetAddrsInfoModel)
if self.adrInfo?.data?.count == 0 {
self.holder_view.isHidden = false
}
self.listView.reloadData()
HUD.hide()
}) { (error) in
......
GeliBusinessPlatform/ViewController/地址管理/DZGLViewController.xib
View file @ 536446e3
......@@ -86,7 +86,7 @@
<constraint firstAttribute="trailing" secondItem="4o7-3y-vAM" secondAttribute="trailing" id="kNH-yD-Ob3"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DR7-L3-keQ">
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DR7-L3-keQ">
<rect key="frame" x="0.0" y="89" width="414" height="724"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="无数据2" translatesAutoresizingMaskIntoConstraints="NO" id="EVe-xn-vda">
......
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ 536446e3
......@@ -443,8 +443,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
self.navigationController?.pushViewController(vc, animated: true)
return
case 53: //销售下单-代客下单
let vc = DaiKeXiaDanGouWuViewController()
// let vc = PrintListMgVc()
// let vc = DaiKeXiaDanGouWuViewController()
let vc = PrintListMgVc()
self.navigationController?.pushViewController(vc, animated: true)
return
case 54: //扫码下单
......
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.swift
View file @ 536446e3
......@@ -12,12 +12,19 @@ import LGButton
class PrintListMgVc: BaseViewController, PagingViewControllerDelegate {
@IBAction func check_detail(_ sender: UIButton) {
print("check_detail")
}
@IBAction func print_action(_ sender: LGButton) {
if userName != "不二制油" { //普通
}else{//不二
let vc = viewControllers[selectIndex]
if selectIndex != 0 {
print(vc.FM_str,vc.detail_adr_str,vc.phone_str,vc.contect_str)
}
}
}
@IBOutlet weak var contentV: UIView!
......@@ -39,6 +46,11 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate {
//头部滚动视图
weak var pagingVC : PagingViewController?
@IBOutlet weak var holder_img: UIImageView!
let UserToken = UserDefaults.standard.value(forKey: "user_token")
let userName = UserDefaults.standard.string(forKey: "userName")
@IBOutlet weak var normal_type_btn: UIButton!
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "打印模版确认"
......@@ -46,6 +58,10 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate {
self.view.addSubview(navbar)
SetTopFrameView(view: contentV, btmView: self.view)
if userName != "不二制油" {
normal_type_btn.isHidden = false
}else{
normal_type_btn.isHidden = true
let pagingViewController = PagingViewController(viewControllers: viewControllers)
pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale)
......@@ -62,9 +78,15 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate {
contentV.constrainToEdges(pagingViewController.view)
pagingViewController.didMove(toParent: self)
pagingVC = pagingViewController
}
holder_img.isHidden = normal_type_btn.isHidden
// Do any additional setup after loading the view.
}
@IBOutlet weak var btm_lbl: UILabel!
func pagingViewController(
_ pagingViewController: PagingViewController,
didScrollToItem pagingItem: PagingItem,
......
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.xib
View file @ 536446e3
......@@ -12,7 +12,10 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PrintListMgVc" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="btm_lbl" destination="GVM-RK-kDz" id="ylh-ra-iZO"/>
<outlet property="contentV" destination="csb-7S-KV5" id="Fc6-4G-C1V"/>
<outlet property="holder_img" destination="YMY-lm-aa2" id="ozd-BX-aAI"/>
<outlet property="normal_type_btn" destination="dit-qO-w20" id="WUj-ye-kqr"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
......@@ -23,7 +26,32 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="csb-7S-KV5">
<rect key="frame" x="0.0" y="44" width="414" height="774"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="print_img" translatesAutoresizingMaskIntoConstraints="NO" id="YMY-lm-aa2">
<rect key="frame" x="8" y="15" width="398" height="212.5"/>
<constraints>
<constraint firstAttribute="width" secondItem="YMY-lm-aa2" secondAttribute="height" multiplier="15:8" id="M2P-wM-MmU"/>
</constraints>
</imageView>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dit-qO-w20">
<rect key="frame" x="15" y="15" width="384" height="250.5"/>
<constraints>
<constraint firstAttribute="width" secondItem="dit-qO-w20" secondAttribute="height" multiplier="23:15" id="1p1-mq-wEu"/>
</constraints>
<connections>
<action selector="check_detail:" destination="-1" eventType="touchUpInside" id="0Ou-Vc-t2Y"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="dit-qO-w20" firstAttribute="leading" secondItem="csb-7S-KV5" secondAttribute="leading" constant="15" id="4Xf-RG-R2P"/>
<constraint firstAttribute="trailing" secondItem="YMY-lm-aa2" secondAttribute="trailing" constant="8" id="Dsu-uO-mpS"/>
<constraint firstItem="YMY-lm-aa2" firstAttribute="top" secondItem="csb-7S-KV5" secondAttribute="top" constant="15" id="Fzk-gI-t1a"/>
<constraint firstAttribute="trailing" secondItem="dit-qO-w20" secondAttribute="trailing" constant="15" id="cOk-zh-xKI"/>
<constraint firstItem="dit-qO-w20" firstAttribute="top" secondItem="csb-7S-KV5" secondAttribute="top" constant="15" id="f39-q1-ndD"/>
<constraint firstItem="YMY-lm-aa2" firstAttribute="leading" secondItem="csb-7S-KV5" secondAttribute="leading" constant="8" id="qiw-yV-pKq"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zM2-Kx-oSf" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="818" width="414" height="78"/>
......@@ -75,6 +103,7 @@
</designable>
</designables>
<resources>
<image name="print_img" width="355" height="210"/>
<namedColor name="按钮渐变色上">
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
GeliBusinessPlatform/ViewController/登录/LoginViewController.swift
View file @ 536446e3
......@@ -203,6 +203,8 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
login(["user_name":phoneTF.text as Any,"pwd":passTF.text as Any], success: { (data) in
let dataM = data as! LoginModel
UserDefaults.standard.set(dataM.data?.user_token, forKey: "user_token")
UserDefaults.standard.set(dataM.data?.user_name, forKey: "userName")
UserDefaults.standard.synchronize()
self.loginBtn.isLoading = false
self.delegate?.successLogin()
......@@ -232,6 +234,8 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
mobileLogin(["mobile":phoneLogInputTF.text as Any,"auth_code":phoneLogCodeTF.text as Any], success: { (data) in
let dataM = data as! LoginModel
UserDefaults.standard.set(dataM.data?.user_token, forKey: "user_token")
UserDefaults.standard.set(dataM.data?.user_name, forKey: "userName")
UserDefaults.standard.synchronize()
self.loginBtn.isLoading = false
self.delegate?.successLogin()
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 536446e3
......@@ -1218,58 +1218,58 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
switch status {
case 0:
// str = "未确定" "待付款"
titleArr = ["修改价格","拒绝接单","先货后款","同意接单"]
titleArr = ["打印","修改价格","拒绝接单","先货后款","同意接单"]
if self.dataMdoel!.order_res?.goods_before_pay == 1 {
titleArr = ["修改价格","拒绝接单","同意接单"]
titleArr = ["打印","修改价格","拒绝接单","同意接单"]
}
break
case 1:
// str = "已确定" "待付款"
titleArr = ["修改价格","付款码","取消订单"]
titleArr = ["打印","修改价格","付款码","取消订单"]
if self.dataMdoel!.order_res?.shipping_status == 1 && self.dataMdoel!.order_res?.pay_status != 2 {
titleArr = ["修改价格","付款码","退货"]
titleArr = ["打印","修改价格","付款码","退货"]
}
break
case 6:
// str = "待发货"
if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
titleArr = ["取消订单并退款","发货"]
titleArr = ["打印","取消订单并退款","发货"]
if self.dataMdoel!.order_res?.pay_status != 2{
titleArr = ["确认收款","取消订单","发货"]
titleArr = ["打印","确认收款","取消订单","发货"]
}
}else{
titleArr = ["退款","发货"]
titleArr = ["打印","退款","发货"]
if self.dataMdoel!.order_res?.pay_status != 2{
titleArr = ["取消订单","发货"]
titleArr = ["打印","取消订单","发货"]
}
if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
titleArr.insert("付款码", at: 0)
}
}
if self.dataMdoel?.order_res?.apply_cancel == 1 {
titleArr = ["同意取消订单","拒绝取消订单"]
titleArr = ["打印","同意取消订单","拒绝取消订单"]
}
break
case 7:
// str = "待收货"
if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
titleArr = ["退款","退款退货","确认收货"]
titleArr = ["打印","退款","退款退货","确认收货"]
if self.dataMdoel?.order_res?.pay_status != 2{//未收款
titleArr = ["取消订单","确认收款","确认收货"]
titleArr = ["打印","取消订单","确认收款","确认收货"]
}
}else{
titleArr = ["退款"]
titleArr = ["打印","退款"]
if self.dataMdoel?.order_res?.pay_status != 2 {
titleArr = ["取消订单"]
titleArr = ["打印","取消订单"]
}
if self.dataMdoel?.order_res?.goods_before_pay == 1 && lmIdx == 1{
titleArr = ["付款码","取消订单"]
titleArr = ["打印","付款码","取消订单"]
}
}
if self.dataMdoel?.order_res?.apply_cancel == 1 {
titleArr = ["同意取消订单","拒绝取消订单"]
titleArr = ["打印","同意取消订单","拒绝取消订单"]
}
break
//订单完成
......@@ -1279,10 +1279,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case 9:
// 退款中
if self.dataMdoel!.order_res?.order_status_d == 91 && self.dataMdoel!.order_res?.from == 3 || self.dataMdoel!.order_res?.from == 5 {
titleArr = ["确认收到退款"]
titleArr = ["打印","确认收到退款"]
}
if self.dataMdoel!.order_res?.order_status_d == 93 {
titleArr = ["确认收到退货"]
titleArr = ["打印","确认收到退货"]
}
break
//订单关闭
......@@ -1290,10 +1290,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
titleArr = []
break
case 10:
titleArr = ["退款退货"]
titleArr = ["打印","退款退货"]
if self.dataMdoel!.order_res?.pay_status != 2 {
titleArr = ["取消订单"]
titleArr = ["打印","取消订单"]
}
if self.dataMdoel!.order_res?.from == 3 || self.dataMdoel!.order_res?.from == 5 {
titleArr.append("确认收款")
......@@ -1305,15 +1305,15 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
break
case 11:
titleArr = ["查看订单"]
titleArr = ["打印","查看订单"]
if self.dataMdoel!.order_res?.order_status_d == 111 || self.dataMdoel!.order_res?.order_status_d == 112 || self.dataMdoel!.order_res?.order_status_d == 113{
titleArr = ["同意退款","拒绝退款"]
titleArr = ["打印","同意退款","拒绝退款"]
}
if self.dataMdoel!.order_res?.order_status_d == 114 || self.dataMdoel!.order_res?.order_status_d == 115 {
titleArr = ["同意退货","拒绝退货"]
titleArr = ["打印","同意退货","拒绝退货"]
}
if self.dataMdoel!.order_res?.order_status_d == 116 || self.dataMdoel!.order_res?.order_status_d == 117 {
titleArr = ["同意退款退货","拒绝退款退货"]
titleArr = ["打印","同意退款退货","拒绝退款退货"]
}
break
default:
......@@ -1367,7 +1367,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case "打印":
//暂无
print("暂无")
HUD.flash(.label("打印功能开发中"),delay: 1.2)
// HUD.flash(.label("打印功能开发中"),delay: 1.2)
let vc = PrintListMgVc()
self.navigationController?.pushViewController(vc, animated: true)
break
case "确认订单":
let alertView = GeliAlertView(frame: self.view.window!.bounds)
......
GeliBusinessPlatform/ViewController/账号信息/AccountViewController.swift
View file @ 536446e3
......@@ -54,6 +54,7 @@ class AccountViewController: BaseViewController{
//模拟退出登录
UserDefaults.standard.removeObject(forKey: "WorkDataModel")
UserDefaults.standard.removeObject(forKey: "user_token")
UserDefaults.standard.removeObject(forKey: "userName")
NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
JPUSHService.deleteAlias({ (resCode, alias, num) in
......
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