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
5cf657cd
Commit
5cf657cd
authored
Jan 29, 2021
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
打印模板图片调整完成
parent
5d61ba01
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
42 additions
and
6 deletions
+42
-6
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Assets.xcassets/print/print_img_2.imageset/Contents.json
.../Assets.xcassets/print/print_img_2.imageset/Contents.json
+23
-0
GeliBusinessPlatform/Assets.xcassets/print/print_img_2.imageset/编组 3.png
...tform/Assets.xcassets/print/print_img_2.imageset/编组 3.png
+0
-0
GeliBusinessPlatform/Assets.xcassets/print/print_img_2.imageset/编组 3@2x.png
...rm/Assets.xcassets/print/print_img_2.imageset/编组 3@2x.png
+0
-0
GeliBusinessPlatform/Assets.xcassets/print/print_img_2.imageset/编组 3@3x.png
...rm/Assets.xcassets/print/print_img_2.imageset/编组 3@3x.png
+0
-0
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.swift
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.swift
+2
-2
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.xib
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.xib
+2
-2
GeliBusinessPlatform/ViewController/打印订单/PrintViewController.swift
...essPlatform/ViewController/打印订单/PrintViewController.swift
+2
-1
GeliBusinessPlatform/ViewController/打印订单/print_top_btn_cell.swift
...nessPlatform/ViewController/打印订单/print_top_btn_cell.swift
+10
-1
GeliBusinessPlatform/ViewController/打印订单/print_top_btn_cell.xib
...sinessPlatform/ViewController/打印订单/print_top_btn_cell.xib
+3
-0
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
5cf657cd
No preview for this file type
GeliBusinessPlatform/Assets.xcassets/print/print_img_2.imageset/Contents.json
0 → 100644
View file @
5cf657cd
{
"images"
:
[
{
"filename"
:
"编组 3.png"
,
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"编组 3@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"编组 3@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
GeliBusinessPlatform/Assets.xcassets/print/print_img_2.imageset/编组 3.png
0 → 100644
View file @
5cf657cd
15.7 KB
GeliBusinessPlatform/Assets.xcassets/print/print_img_2.imageset/编组 3@2x.png
0 → 100644
View file @
5cf657cd
44.7 KB
GeliBusinessPlatform/Assets.xcassets/print/print_img_2.imageset/编组 3@3x.png
0 → 100644
View file @
5cf657cd
85.1 KB
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.swift
View file @
5cf657cd
...
@@ -245,8 +245,8 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
...
@@ -245,8 +245,8 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
override
func
viewDidLoad
()
{
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
super
.
viewDidLoad
()
web_vc
.
wkWebView
.
navigationDelegate
=
self
web_vc
.
wkWebView
.
navigationDelegate
=
self
let
vc
=
viewControllers
[
0
]
vc
.
isNormal
=
true
let
vc2
=
viewControllers
[
1
]
let
vc2
=
viewControllers
[
1
]
vc2
.
type
=
2
vc2
.
type
=
2
let
vc3
=
viewControllers
[
2
]
let
vc3
=
viewControllers
[
2
]
...
...
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.xib
View file @
5cf657cd
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"csb-7S-KV5"
>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"csb-7S-KV5"
>
<rect
key=
"frame"
x=
"0.0"
y=
"44"
width=
"414"
height=
"774"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"44"
width=
"414"
height=
"774"
/>
<subviews>
<subviews>
<imageView
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"scaleAspectFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"print_img"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"YMY-lm-aa2"
>
<imageView
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"scaleAspectFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"print_img
_2
"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"YMY-lm-aa2"
>
<rect
key=
"frame"
x=
"8"
y=
"15"
width=
"398"
height=
"212.5"
/>
<rect
key=
"frame"
x=
"8"
y=
"15"
width=
"398"
height=
"212.5"
/>
<constraints>
<constraints>
<constraint
firstAttribute=
"width"
secondItem=
"YMY-lm-aa2"
secondAttribute=
"height"
multiplier=
"15:8"
id=
"M2P-wM-MmU"
/>
<constraint
firstAttribute=
"width"
secondItem=
"YMY-lm-aa2"
secondAttribute=
"height"
multiplier=
"15:8"
id=
"M2P-wM-MmU"
/>
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
</designable>
</designable>
</designables>
</designables>
<resources>
<resources>
<image
name=
"print_img"
width=
"355"
height=
"210"
/>
<image
name=
"print_img
_2
"
width=
"355"
height=
"210"
/>
<namedColor
name=
"按钮渐变色上"
>
<namedColor
name=
"按钮渐变色上"
>
<color
red=
"0.3880000114440918"
green=
"0.62400001287460327"
blue=
"0.90200001001358032"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
red=
"0.3880000114440918"
green=
"0.62400001287460327"
blue=
"0.90200001001358032"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</namedColor>
</namedColor>
...
...
GeliBusinessPlatform/ViewController/打印订单/PrintViewController.swift
View file @
5cf657cd
...
@@ -17,6 +17,7 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -17,6 +17,7 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
day
=
date_arr
[
2
]
day
=
date_arr
[
2
]
list_view
.
reloadData
()
list_view
.
reloadData
()
}
}
var
isNormal
=
false
func
GLTimeSelectViewClose
()
{
func
GLTimeSelectViewClose
()
{
...
@@ -453,7 +454,7 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -453,7 +454,7 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
if
indexPath
.
row
==
0
{
if
indexPath
.
row
==
0
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"print_top_btn_cell"
)
as!
print_top_btn_cell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"print_top_btn_cell"
)
as!
print_top_btn_cell
cell
.
isNormal
=
isNormal
return
cell
return
cell
}
}
...
...
GeliBusinessPlatform/ViewController/打印订单/print_top_btn_cell.swift
View file @
5cf657cd
...
@@ -9,7 +9,16 @@
...
@@ -9,7 +9,16 @@
import
UIKit
import
UIKit
class
print_top_btn_cell
:
UITableViewCell
{
class
print_top_btn_cell
:
UITableViewCell
{
var
isNormal
=
false
{
didSet
{
if
isNormal
{
img_View
.
image
=
UIImage
(
named
:
"print_img_2"
)
}
else
{
img_View
.
image
=
UIImage
(
named
:
"print_img"
)
}
}
}
@IBOutlet
weak
var
img_View
:
UIImageView
!
override
func
awakeFromNib
()
{
override
func
awakeFromNib
()
{
super
.
awakeFromNib
()
super
.
awakeFromNib
()
self
.
selectionStyle
=
.
none
self
.
selectionStyle
=
.
none
...
...
GeliBusinessPlatform/ViewController/打印订单/print_top_btn_cell.xib
View file @
5cf657cd
...
@@ -29,6 +29,9 @@
...
@@ -29,6 +29,9 @@
</constraints>
</constraints>
</tableViewCellContentView>
</tableViewCellContentView>
<viewLayoutGuide
key=
"safeArea"
id=
"njF-e1-oar"
/>
<viewLayoutGuide
key=
"safeArea"
id=
"njF-e1-oar"
/>
<connections>
<outlet
property=
"img_View"
destination=
"QHd-cH-MIc"
id=
"vAj-mA-EN6"
/>
</connections>
<point
key=
"canvasLocation"
x=
"141"
y=
"89"
/>
<point
key=
"canvasLocation"
x=
"141"
y=
"89"
/>
</tableViewCell>
</tableViewCell>
</objects>
</objects>
...
...
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