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
b849eb9c
Commit
b849eb9c
authored
May 26, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
计算webView高度
parent
699e8138
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
27 deletions
+49
-27
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/SceneDelegate.swift
GeliBusinessPlatform/SceneDelegate.swift
+1
-1
GeliBusinessPlatform/View/Cell/AddGuiGeCell.swift
GeliBusinessPlatform/View/Cell/AddGuiGeCell.swift
+17
-7
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
...sinessPlatform/ViewController/商品详情/EPViewController.swift
+20
-15
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
...orm/ViewController/商品详情/ProductDetailViewController.swift
+11
-4
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
b849eb9c
No preview for this file type
GeliBusinessPlatform/SceneDelegate.swift
View file @
b849eb9c
...
@@ -95,7 +95,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
...
@@ -95,7 +95,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
tabBarController
.
viewControllers
=
[
v1
,
v2
,
v3
,
v4
,
v5
]
tabBarController
.
viewControllers
=
[
v1
,
v2
,
v3
,
v4
,
v5
]
tabBarController
.
selectedIndex
=
2
//
tabBarController.selectedIndex = 2
...
...
GeliBusinessPlatform/View/Cell/AddGuiGeCell.swift
View file @
b849eb9c
...
@@ -11,31 +11,41 @@ import WebKit
...
@@ -11,31 +11,41 @@ import WebKit
@objc
protocol
AddGuiGeCellDelegate
{
@objc
protocol
AddGuiGeCellDelegate
{
@objc
optional
func
AddGuiGeCellClick
(
cell
:
AddGuiGeCell
)
@objc
optional
func
AddGuiGeCellClick
(
cell
:
AddGuiGeCell
)
@objc
optional
func
AddGuiGeCellWebViewHeight
(
height
:
CGFloat
)
}
}
class
AddGuiGeCell
:
UITableViewCell
{
class
AddGuiGeCell
:
UITableViewCell
,
WKNavigationDelegate
{
var
delegate
:
AddGuiGeCellDelegate
?
var
delegate
:
AddGuiGeCellDelegate
?
@IBOutlet
weak
var
btmH
:
NSLayoutConstraint
!
@IBOutlet
weak
var
btmH
:
NSLayoutConstraint
!
@IBAction
func
btnClick
(
_
sender
:
Any
)
{
@IBAction
func
btnClick
(
_
sender
:
Any
)
{
delegate
?
.
AddGuiGeCellClick
?(
cell
:
self
)
delegate
?
.
AddGuiGeCellClick
?(
cell
:
self
)
}
}
@IBOutlet
weak
var
webView
:
WKWebView
!
@IBOutlet
weak
var
webView
:
WKWebView
!
@IBOutlet
weak
var
imgBtn
:
UIButton
!
@IBOutlet
weak
var
imgBtn
:
UIButton
!
override
func
awakeFromNib
()
{
override
func
awakeFromNib
()
{
super
.
awakeFromNib
()
super
.
awakeFromNib
()
selectionStyle
=
.
none
selectionStyle
=
.
none
webView
.
navigationDelegate
=
self
// Initialization code
// Initialization code
}
}
override
func
setSelected
(
_
selected
:
Bool
,
animated
:
Bool
)
{
override
func
setSelected
(
_
selected
:
Bool
,
animated
:
Bool
)
{
super
.
setSelected
(
selected
,
animated
:
animated
)
super
.
setSelected
(
selected
,
animated
:
animated
)
// Configure the view for the selected state
// Configure the view for the selected state
}
}
func
webView
(
_
webView
:
WKWebView
,
didFinish
navigation
:
WKNavigation
!
)
{
webView
.
scrollView
.
isScrollEnabled
=
false
webView
.
evaluateJavaScript
(
"document.body.scrollHeight"
)
{
(
result
,
error
)
in
let
h
=
result
as!
CGFloat
print
(
"webH = "
,
h
)
self
.
delegate
?
.
AddGuiGeCellWebViewHeight
?(
height
:
h
)
}
}
}
}
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
View file @
b849eb9c
...
@@ -66,7 +66,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
...
@@ -66,7 +66,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
var
yunShuTypeArr
=
[
"冷链"
,
"常温"
,
"热链"
]
var
yunShuTypeArr
=
[
"冷链"
,
"常温"
,
"热链"
]
var
countryArr
=
[
"中国"
]
var
countryArr
=
[
"中国"
]
var
layout
=
UICollectionViewFlowLayout
()
var
layout
=
UICollectionViewFlowLayout
()
var
webH
:
CGFloat
=
0
var
glSelectView
:
GLAlertSelectView
?
var
glSelectView
:
GLAlertSelectView
?
var
selectIdx
:
IndexPath
?
=
IndexPath
(
item
:
0
,
section
:
0
)
//多规格状态下点击collectionCell的row记录
var
selectIdx
:
IndexPath
?
=
IndexPath
(
item
:
0
,
section
:
0
)
//多规格状态下点击collectionCell的row记录
...
@@ -376,7 +376,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
...
@@ -376,7 +376,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
tag
=
1003
alertView
.
rightBtn
.
tag
=
1003
self
.
view
.
window
?
.
addSubview
(
alertView
)
self
.
view
.
window
?
.
addSubview
(
alertView
)
break
break
case
"下架"
:
case
"下架"
:
//提示是否下架
//提示是否下架
...
@@ -398,7 +398,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
...
@@ -398,7 +398,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
tag
=
1005
alertView
.
rightBtn
.
tag
=
1005
self
.
view
.
window
?
.
addSubview
(
alertView
)
self
.
view
.
window
?
.
addSubview
(
alertView
)
break
break
default
:
default
:
break
break
...
@@ -507,7 +507,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
...
@@ -507,7 +507,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
data
.
yuShouPrice
=
dataSource
.
adsale_pri
!
data
.
yuShouPrice
=
dataSource
.
adsale_pri
!
//预售库存
//预售库存
data
.
ysKuCun
=
StringByInt
(
number
:
dataSource
.
adsale_inventory
!
)
data
.
ysKuCun
=
StringByInt
(
number
:
dataSource
.
adsale_inventory
!
)
//百分比
//百分比
data
.
DJBiLi
=
StringByInt
(
number
:
dataSource
.
pct
!
)
data
.
DJBiLi
=
StringByInt
(
number
:
dataSource
.
pct
!
)
//阶梯价
//阶梯价
...
@@ -1114,11 +1114,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
...
@@ -1114,11 +1114,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
func
uploadImg
(
imge
:
UIImage
,
isOriginal
:
Bool
,
tag
:
Int
){
func
uploadImg
(
imge
:
UIImage
,
isOriginal
:
Bool
,
tag
:
Int
){
let
UserToken
=
UserDefaults
.
standard
.
value
(
forKey
:
"user_token"
)
let
UserToken
=
UserDefaults
.
standard
.
value
(
forKey
:
"user_token"
)
let
upLoadImg
=
imge
as!
UIImage
let
upLoadImg
=
imge
as!
UIImage
HUD
.
show
(
.
progress
)
HUD
.
show
(
.
progress
)
saveFile
(
image
:
upLoadImg
,
[
"user_token"
:
UserToken
as
Any
],
success
:
{
(
data
)
in
saveFile
(
image
:
upLoadImg
,
[
"user_token"
:
UserToken
as
Any
],
success
:
{
(
data
)
in
let
dataM
=
data
as!
SaveFileModel
let
dataM
=
data
as!
SaveFileModel
if
dataM
.
code
==
1
{
if
dataM
.
code
==
1
{
print
(
"图片上传成功
\(
dataM
.
data
?
.
url
)
"
)
print
(
"图片上传成功
\(
dataM
.
data
?
.
url
)
"
)
if
isOriginal
{
if
isOriginal
{
self
.
original_img
=
dataM
.
data
?
.
url
!
self
.
original_img
=
dataM
.
data
?
.
url
!
...
@@ -1490,7 +1490,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
...
@@ -1490,7 +1490,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
case
4
:
return
49
case
4
:
return
49
default
:
default
:
if
goodsDesc
.
count
>
0
{
//有内容
if
goodsDesc
.
count
>
0
{
//有内容
return
250
return
webH
}
else
{
//无内容
}
else
{
//无内容
if
isAllEditing
{
//非编辑
if
isAllEditing
{
//非编辑
return
0.001
return
0.001
...
@@ -1502,7 +1502,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
...
@@ -1502,7 +1502,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
}
}
func
YuShouWeiKuanFaHuoCellString
(
str
:
String
)
{
func
YuShouWeiKuanFaHuoCellString
(
str
:
String
)
{
if
isPurnInt
(
string
:
str
)
{
if
isPurnInt
(
string
:
str
)
{
faHuoTime
=
formatShowNumber
(
value
:
str
)
faHuoTime
=
formatShowNumber
(
value
:
str
)
}
else
{
}
else
{
HUD
.
flash
(
.
label
(
"请输入正确的数据"
),
delay
:
1.2
)
HUD
.
flash
(
.
label
(
"请输入正确的数据"
),
delay
:
1.2
)
}
}
...
@@ -1510,12 +1510,12 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
...
@@ -1510,12 +1510,12 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
override
func
backAction
()
{
override
func
backAction
()
{
if
editBtn
?
.
titleLabel
!.
text
==
"保存"
{
if
editBtn
?
.
titleLabel
!.
text
==
"保存"
{
let
alertView
=
GeliAlertView
(
frame
:
self
.
view
.
window
!.
bounds
)
let
alertView
=
GeliAlertView
(
frame
:
self
.
view
.
window
!.
bounds
)
alertView
.
delegate
=
self
;
alertView
.
delegate
=
self
;
alertView
.
tishiLbl
.
text
=
""
alertView
.
tishiLbl
.
text
=
""
alertView
.
titileLbl
.
text
=
"编辑尚未保存,是否离开?"
alertView
.
titileLbl
.
text
=
"编辑尚未保存,是否离开?"
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
tag
=
10086
alertView
.
rightBtn
.
tag
=
10086
self
.
view
.
window
?
.
addSubview
(
alertView
)
self
.
view
.
window
?
.
addSubview
(
alertView
)
}
else
{
}
else
{
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
}
}
...
@@ -1777,7 +1777,12 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
...
@@ -1777,7 +1777,12 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
return
dataChangeString
(
sender
:
data4
)
return
dataChangeString
(
sender
:
data4
)
}
}
func
AddGuiGeCellWebViewHeight
(
height
:
CGFloat
)
{
if
webH
==
0
{
webH
=
height
listTbv
.
reloadData
()
}
}
var
goodsDesc
=
""
var
goodsDesc
=
""
func
getHTMLByVc
(
_
model
:
String
!
)
{
func
getHTMLByVc
(
_
model
:
String
!
)
{
...
...
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
View file @
b849eb9c
...
@@ -11,6 +11,7 @@ import LGButton
...
@@ -11,6 +11,7 @@ import LGButton
import
Photos
import
Photos
import
IQKeyboardManagerSwift
import
IQKeyboardManagerSwift
import
Dollar
import
Dollar
import
WebKit
protocol
ProductDetailViewControllerDelegate
{
protocol
ProductDetailViewControllerDelegate
{
func
reloadDataByProductDetailViewController
()
func
reloadDataByProductDetailViewController
()
...
@@ -58,7 +59,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -58,7 +59,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
var
selectIdx
:
IndexPath
?
=
IndexPath
(
item
:
0
,
section
:
0
)
//多规格状态下点击collectionCell的row记录
var
selectIdx
:
IndexPath
?
=
IndexPath
(
item
:
0
,
section
:
0
)
//多规格状态下点击collectionCell的row记录
var
isYuShouShangPin
:
Bool
?
//是否为预售商品
var
isYuShouShangPin
:
Bool
?
//是否为预售商品
var
webH
:
CGFloat
=
0
var
itemTypeArr
:
Array
<
Int
>
?
=
[]
//多选
var
itemTypeArr
:
Array
<
Int
>
?
=
[]
//多选
var
shangPinStatus
:
Int
?
=
0
//商品状态
var
shangPinStatus
:
Int
?
=
0
//商品状态
var
yunShuType
:
Int
?
=
0
//运输类型
var
yunShuType
:
Int
?
=
0
//运输类型
...
@@ -456,7 +457,9 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -456,7 +457,9 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
cell
.
delegate
=
self
cell
.
delegate
=
self
cell
.
imgBtn
.
tag
=
indexPath
.
row
cell
.
imgBtn
.
tag
=
indexPath
.
row
if
goodsDesc
.
count
>
0
{
if
goodsDesc
.
count
>
0
{
cell
.
webView
.
isHidden
=
false
cell
.
webView
.
isHidden
=
false
let
headerString
:
String
=
"<header><meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no'><style>img{max-width:100%}</style></header>"
let
headerString
:
String
=
"<header><meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no'><style>img{max-width:100%}</style></header>"
let
goodsDescHmtl
=
"<html>"
+
goodsDesc
+
"</html>"
let
goodsDescHmtl
=
"<html>"
+
goodsDesc
+
"</html>"
...
@@ -1089,9 +1092,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -1089,9 +1092,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
case
4
:
return
49
case
4
:
return
49
default
:
default
:
if
goodsDesc
.
count
>
0
{
if
goodsDesc
.
count
>
0
{
return
webH
return
450*
glscale
}
}
return
98
return
98
...
@@ -1255,6 +1256,12 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -1255,6 +1256,12 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
}
func
AddGuiGeCellWebViewHeight
(
height
:
CGFloat
)
{
if
webH
==
0
{
webH
=
height
listTbv
.
reloadData
()
}
}
//MARK:---商品详情回调的数据
//MARK:---商品详情回调的数据
var
goodsDesc
=
""
var
goodsDesc
=
""
func
getHTMLByVc
(
_
model
:
String
!
)
{
func
getHTMLByVc
(
_
model
:
String
!
)
{
...
...
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