Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GeliBusinessPlatform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ljy
GeliBusinessPlatform
Commits
45ef00e0
Commit
45ef00e0
authored
4 years ago
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复货拉拉载重显示bug
parent
3b58c1f5
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
12 deletions
+29
-12
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Define/Define.swift
GeliBusinessPlatform/Define/Define.swift
+4
-4
GeliBusinessPlatform/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.xib
...m/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.xib
+0
-0
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.swift
...essPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.swift
+8
-1
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.xib
...inessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.xib
+17
-7
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
45ef00e0
No preview for this file type
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/Define/Define.swift
View file @
45ef00e0
...
@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
...
@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
//接口地址
//接口地址
//test
//test
let
SERVERCE_ImageHost
=
"https://z.gelifood.com/"
//
let SERVERCE_ImageHost = "https://z.gelifood.com/"
let
SERVERCE_HOST
=
"https://z.gelifood.com/admin/"
//
let SERVERCE_HOST = "https://z.gelifood.com/admin/"
//
let SERVERCE_ImageHost = "https://zx.gelifood.com/"
let
SERVERCE_ImageHost
=
"https://zx.gelifood.com/"
//
let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
let
SERVERCE_HOST
=
"https://zx.gelifood.com/admin/"
////online
////online
//视图常量
//视图常量
...
...
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.xib
View file @
45ef00e0
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.swift
View file @
45ef00e0
...
@@ -81,9 +81,16 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
...
@@ -81,9 +81,16 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
numIdx
=
num
numIdx
=
num
}
}
let
model
=
datas
[
numIdx
]
let
model
=
datas
[
numIdx
]
weightLbl
.
text
=
model
.
vehicle_price_text_item
?
.
text_weight
if
(
model
.
vehicle_price_text_item
!.
text_weight
!.
contains
(
"/"
)){
let
arr
=
model
.
vehicle_price_text_item
?
.
text_weight
?
.
components
(
separatedBy
:
"/"
)
weightLbl
.
text
=
arr
?
.
first
}
else
{
weightLbl
.
text
=
model
.
vehicle_price_text_item
?
.
text_weight
}
sizeLbl
.
text
=
model
.
vehicle_price_text_item
?
.
text_size
sizeLbl
.
text
=
model
.
vehicle_price_text_item
?
.
text_size
tjLbl
.
text
=
model
.
vehicle_price_text_item
?
.
text_volume
tjLbl
.
text
=
model
.
vehicle_price_text_item
?
.
text_volume
}
}
@IBOutlet
weak
var
rightBtn
:
UIButton
!
@IBOutlet
weak
var
rightBtn
:
UIButton
!
...
...
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.xib
View file @
45ef00e0
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"1
6097.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=
"1
7701
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<dependencies>
<dependencies>
<deployment
identifier=
"iOS"
/>
<deployment
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
6087
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
7703
"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
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"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
</dependencies>
</dependencies>
<objects>
<objects>
...
@@ -31,7 +32,7 @@
...
@@ -31,7 +32,7 @@
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"加载中..."
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"aC7-Bu-5oE"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"加载中..."
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"aC7-Bu-5oE"
>
<rect
key=
"frame"
x=
"167.5"
y=
"21.5"
width=
"
51.
5"
height=
"18.5"
/>
<rect
key=
"frame"
x=
"167.5"
y=
"21.5"
width=
"
8
5"
height=
"18.5"
/>
<constraints>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"18.5"
id=
"VaA-Ma-ZMN"
/>
<constraint
firstAttribute=
"height"
constant=
"18.5"
id=
"VaA-Ma-ZMN"
/>
</constraints>
</constraints>
...
@@ -49,7 +50,10 @@
...
@@ -49,7 +50,10 @@
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"加载中..."
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Yit-BG-pxY"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"加载中..."
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Yit-BG-pxY"
>
<rect
key=
"frame"
x=
"267.5"
y=
"23"
width=
"51.5"
height=
"16"
/>
<rect
key=
"frame"
x=
"267.5"
y=
"23"
width=
"92.5"
height=
"16"
/>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"16"
id=
"AON-sN-Tci"
/>
</constraints>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"13"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"灰色字体颜色"
/>
<color
key=
"textColor"
name=
"灰色字体颜色"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
...
@@ -64,24 +68,27 @@
...
@@ -64,24 +68,27 @@
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"加载中..."
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"3Ee-iC-Maa"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"加载中..."
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"3Ee-iC-Maa"
>
<rect
key=
"frame"
x=
"57.5"
y=
"23"
width=
"
51.
5"
height=
"16"
/>
<rect
key=
"frame"
x=
"57.5"
y=
"23"
width=
"
9
5"
height=
"16"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"13"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"灰色字体颜色"
/>
<color
key=
"textColor"
name=
"灰色字体颜色"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
</subviews>
</subviews>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
cocoaTouchSystemColor=
"whiteColor"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
<constraints>
<constraints>
<constraint
firstItem=
"AsL-1h-Y7c"
firstAttribute=
"top"
secondItem=
"6H1-9e-5gM"
secondAttribute=
"top"
id=
"4Dh-9v-gYg"
/>
<constraint
firstItem=
"AsL-1h-Y7c"
firstAttribute=
"top"
secondItem=
"6H1-9e-5gM"
secondAttribute=
"top"
id=
"4Dh-9v-gYg"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"Yit-BG-pxY"
secondAttribute=
"trailing"
constant=
"15"
id=
"5Ny-IH-p4m"
/>
<constraint
firstAttribute=
"height"
constant=
"51"
id=
"7Is-x1-1hq"
/>
<constraint
firstAttribute=
"height"
constant=
"51"
id=
"7Is-x1-1hq"
/>
<constraint
firstItem=
"wLi-w7-vL4"
firstAttribute=
"top"
secondItem=
"6H1-9e-5gM"
secondAttribute=
"top"
id=
"EzS-pi-dWY"
/>
<constraint
firstItem=
"wLi-w7-vL4"
firstAttribute=
"top"
secondItem=
"6H1-9e-5gM"
secondAttribute=
"top"
id=
"EzS-pi-dWY"
/>
<constraint
firstItem=
"Yit-BG-pxY"
firstAttribute=
"centerY"
secondItem=
"aC7-Bu-5oE"
secondAttribute=
"centerY"
id=
"FEL-Zp-Y4G"
/>
<constraint
firstItem=
"Yit-BG-pxY"
firstAttribute=
"centerY"
secondItem=
"aC7-Bu-5oE"
secondAttribute=
"centerY"
id=
"FEL-Zp-Y4G"
/>
<constraint
firstItem=
"Yit-BG-pxY"
firstAttribute=
"leading"
secondItem=
"dcU-lR-ZVX"
secondAttribute=
"leading"
id=
"GgP-zY-J9k"
/>
<constraint
firstItem=
"Yit-BG-pxY"
firstAttribute=
"leading"
secondItem=
"dcU-lR-ZVX"
secondAttribute=
"leading"
id=
"GgP-zY-J9k"
/>
<constraint
firstItem=
"wLi-w7-vL4"
firstAttribute=
"leading"
secondItem=
"6H1-9e-5gM"
secondAttribute=
"leading"
constant=
"57.5"
id=
"IAQ-n4-Do0"
/>
<constraint
firstItem=
"wLi-w7-vL4"
firstAttribute=
"leading"
secondItem=
"6H1-9e-5gM"
secondAttribute=
"leading"
constant=
"57.5"
id=
"IAQ-n4-Do0"
/>
<constraint
firstItem=
"aC7-Bu-5oE"
firstAttribute=
"leading"
secondItem=
"3Ee-iC-Maa"
secondAttribute=
"trailing"
constant=
"15"
id=
"QsG-xM-4Ot"
/>
<constraint
firstItem=
"aC7-Bu-5oE"
firstAttribute=
"top"
secondItem=
"AsL-1h-Y7c"
secondAttribute=
"bottom"
constant=
"3"
id=
"Qy9-Zc-gHc"
/>
<constraint
firstItem=
"aC7-Bu-5oE"
firstAttribute=
"top"
secondItem=
"AsL-1h-Y7c"
secondAttribute=
"bottom"
constant=
"3"
id=
"Qy9-Zc-gHc"
/>
<constraint
firstItem=
"3Ee-iC-Maa"
firstAttribute=
"centerY"
secondItem=
"aC7-Bu-5oE"
secondAttribute=
"centerY"
id=
"UKT-1O-yg0"
/>
<constraint
firstItem=
"3Ee-iC-Maa"
firstAttribute=
"centerY"
secondItem=
"aC7-Bu-5oE"
secondAttribute=
"centerY"
id=
"UKT-1O-yg0"
/>
<constraint
firstItem=
"aC7-Bu-5oE"
firstAttribute=
"leading"
secondItem=
"AsL-1h-Y7c"
secondAttribute=
"leading"
id=
"WrE-Jq-ofm"
/>
<constraint
firstItem=
"aC7-Bu-5oE"
firstAttribute=
"leading"
secondItem=
"AsL-1h-Y7c"
secondAttribute=
"leading"
id=
"WrE-Jq-ofm"
/>
<constraint
firstItem=
"dcU-lR-ZVX"
firstAttribute=
"top"
secondItem=
"6H1-9e-5gM"
secondAttribute=
"top"
id=
"Z0z-vO-vfu"
/>
<constraint
firstItem=
"dcU-lR-ZVX"
firstAttribute=
"top"
secondItem=
"6H1-9e-5gM"
secondAttribute=
"top"
id=
"Z0z-vO-vfu"
/>
<constraint
firstItem=
"Yit-BG-pxY"
firstAttribute=
"leading"
secondItem=
"aC7-Bu-5oE"
secondAttribute=
"trailing"
constant=
"15"
id=
"dkL-mj-Tix"
/>
<constraint
firstItem=
"3Ee-iC-Maa"
firstAttribute=
"leading"
secondItem=
"wLi-w7-vL4"
secondAttribute=
"leading"
id=
"sTl-1n-vkH"
/>
<constraint
firstItem=
"3Ee-iC-Maa"
firstAttribute=
"leading"
secondItem=
"wLi-w7-vL4"
secondAttribute=
"leading"
id=
"sTl-1n-vkH"
/>
<constraint
firstItem=
"AsL-1h-Y7c"
firstAttribute=
"centerX"
secondItem=
"6H1-9e-5gM"
secondAttribute=
"centerX"
id=
"vj6-vD-EeX"
/>
<constraint
firstItem=
"AsL-1h-Y7c"
firstAttribute=
"centerX"
secondItem=
"6H1-9e-5gM"
secondAttribute=
"centerX"
id=
"vj6-vD-EeX"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"dcU-lR-ZVX"
secondAttribute=
"trailing"
constant=
"53.5"
id=
"zbV-6L-D7f"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"dcU-lR-ZVX"
secondAttribute=
"trailing"
constant=
"53.5"
id=
"zbV-6L-D7f"
/>
...
@@ -115,7 +122,7 @@
...
@@ -115,7 +122,7 @@
</button>
</button>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"yKZ-TN-Ah3"
>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"yKZ-TN-Ah3"
>
<rect
key=
"frame"
x=
"63"
y=
"35"
width=
"249"
height=
"76"
/>
<rect
key=
"frame"
x=
"63"
y=
"35"
width=
"249"
height=
"76"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
cocoaTouchSystemColor=
"whiteColor"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
<constraints>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"76"
id=
"Tmt-kI-8i7"
/>
<constraint
firstAttribute=
"height"
constant=
"76"
id=
"Tmt-kI-8i7"
/>
</constraints>
</constraints>
...
@@ -156,5 +163,8 @@
...
@@ -156,5 +163,8 @@
<namedColor
name=
"灰色字体颜色"
>
<namedColor
name=
"灰色字体颜色"
>
<color
red=
"0.40000000000000002"
green=
"0.40000000000000002"
blue=
"0.40000000000000002"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
red=
"0.40000000000000002"
green=
"0.40000000000000002"
blue=
"0.40000000000000002"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</namedColor>
</namedColor>
<systemColor
name=
"systemBackgroundColor"
>
<color
white=
"1"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"genericGamma22GrayColorSpace"
/>
</systemColor>
</resources>
</resources>
</document>
</document>
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment