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
8c71329b
Commit
8c71329b
authored
May 27, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
成功提交添加菊花
parent
0a31f184
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
9 deletions
+28
-9
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/SceneDelegate.swift
GeliBusinessPlatform/SceneDelegate.swift
+1
-1
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
...orm/ViewController/商品详情/ProductDetailViewController.swift
+25
-7
GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.swift
...Platform/ViewController/商家信息/ShopInfoViewController.swift
+2
-1
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
8c71329b
No preview for this file type
GeliBusinessPlatform/SceneDelegate.swift
View file @
8c71329b
...
@@ -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/ViewController/商品详情/ProductDetailViewController.swift
View file @
8c71329b
...
@@ -246,9 +246,12 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -246,9 +246,12 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
"goods_banner"
:
goods_bannerStr
as
Any
,
//商品副图,多张,最多5张,使用一维数组转json格式
"goods_banner"
:
goods_bannerStr
as
Any
,
//商品副图,多张,最多5张,使用一维数组转json格式
"sku_info"
:
sku_info
as
Any
]
"sku_info"
:
sku_info
as
Any
]
print
(
dic
)
print
(
dic
)
HUD
.
show
(
.
progress
)
//MARK:--新增商品接口
//MARK:--新增商品接口
goodsAdd
(
dic
,
success
:
{
(
data
)
in
goodsAdd
(
dic
,
success
:
{
(
data
)
in
HUD
.
hide
()
HUD
.
flash
(
.
labeledSubSuccess
(
subtitle
:
"提交成功"
),
delay
:
1.2
)
HUD
.
flash
(
.
labeledSubSuccess
(
subtitle
:
"提交成功"
),
delay
:
1.2
)
self
.
delegate
?
.
reloadDataByProductDetailViewController
()
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
})
{
(
error
)
in
})
{
(
error
)
in
...
@@ -395,10 +398,11 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -395,10 +398,11 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
return
cell
return
cell
}
}
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AddGuiGe"
)
as!
AddGuiGeCell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AddGuiGe"
)
as!
AddGuiGeCell
cell
.
imgBtn
.
addTarget
(
self
,
action
:
#selector(
addGuiGe
)
,
for
:
.
touchUpInside
)
cell
.
imgBtn
.
setImage
(
UIImage
(
named
:
"xinzeng"
),
for
:
.
normal
)
cell
.
imgBtn
.
setImage
(
UIImage
(
named
:
"xinzeng"
),
for
:
.
normal
)
cell
.
webView
.
isHidden
=
true
cell
.
webView
.
isHidden
=
true
cell
.
delegate
=
self
cell
.
actp
.
isHidden
=
true
cell
.
actp
.
isHidden
=
true
cell
.
tag
=
indexPath
.
section
return
cell
return
cell
case
3
:
case
3
:
if
indexPath
.
row
==
0
{
if
indexPath
.
row
==
0
{
...
@@ -457,6 +461,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -457,6 +461,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
cell
.
imgBtn
.
setImage
(
UIImage
(
named
:
"XiaYunDanViewController"
),
for
:
.
normal
)
cell
.
imgBtn
.
setImage
(
UIImage
(
named
:
"XiaYunDanViewController"
),
for
:
.
normal
)
cell
.
delegate
=
self
cell
.
delegate
=
self
cell
.
imgBtn
.
tag
=
indexPath
.
row
cell
.
imgBtn
.
tag
=
indexPath
.
row
cell
.
tag
=
indexPath
.
section
cell
.
actp
.
isHidden
=
true
cell
.
actp
.
isHidden
=
true
if
goodsDesc
.
count
>
0
{
if
goodsDesc
.
count
>
0
{
cell
.
actp
.
isHidden
=
false
cell
.
actp
.
isHidden
=
false
...
@@ -471,7 +476,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -471,7 +476,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
}
cell
.
imgBtn
.
setImage
(
UIImage
(
named
:
"tjxq"
),
for
:
.
normal
)
cell
.
imgBtn
.
setImage
(
UIImage
(
named
:
"tjxq"
),
for
:
.
normal
)
cell
.
btmH
.
constant
=
25
cell
.
btmH
.
constant
=
25
return
cell
return
cell
}
}
...
@@ -493,10 +498,23 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -493,10 +498,23 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
}
}
func
AddGuiGeCellClick
(
cell
:
AddGuiGeCell
)
{
func
AddGuiGeCellClick
(
cell
:
AddGuiGeCell
)
{
let
vc
=
LMNoteViewController
()
if
cell
.
tag
==
5
{
vc
.
htmlStr
=
goodsDesc
;
let
vc
=
LMNoteViewController
()
vc
.
delegatedata
=
self
vc
.
htmlStr
=
goodsDesc
;
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
vc
.
delegatedata
=
self
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
}
else
{
print
(
"新增规格"
)
let
vc
=
CreatNewSpecsViewController
()
vc
.
barTitle
=
"新增规格"
vc
.
delegate
=
self
vc
.
danWeiArr
=
generalInfoModel
?
.
data
!.
unit
vc
.
isYuShouSetting
=
isYuShouShangPin
!
vc
.
datasArr
=
guiGeArr
vc
.
selectIdx
=
selectIdx
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
}
}
}
//MARK: -- 点击按钮事件,跳转或者展示选择界面
//MARK: -- 点击按钮事件,跳转或者展示选择界面
func
btnClick
(
content
:
String
,
cell
:
TitleAndBtnCell
)
{
func
btnClick
(
content
:
String
,
cell
:
TitleAndBtnCell
)
{
...
@@ -1104,7 +1122,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -1104,7 +1122,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
}
func
YuShouWeiKuanFaHuoCellString
(
str
:
String
)
{
func
YuShouWeiKuanFaHuoCellString
(
str
:
String
)
{
faHuoTime
=
str
faHuoTime
=
str
}
}
override
func
backAction
()
{
override
func
backAction
()
{
...
...
GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.swift
View file @
8c71329b
...
@@ -18,6 +18,7 @@ class ShopInfoViewController: BaseViewController {
...
@@ -18,6 +18,7 @@ class ShopInfoViewController: BaseViewController {
super
.
viewDidLoad
()
super
.
viewDidLoad
()
navbar
.
title
=
"商家信息"
navbar
.
title
=
"商家信息"
self
.
view
.
addSubview
(
navbar
)
self
.
view
.
addSubview
(
navbar
)
scrlloV
.
showsVerticalScrollIndicator
=
false
scrlloV
.
snp
.
makeConstraints
{
(
make
)
in
scrlloV
.
snp
.
makeConstraints
{
(
make
)
in
make
.
top
.
equalTo
(
NavCGRect
.
height
)
make
.
top
.
equalTo
(
NavCGRect
.
height
)
make
.
left
.
bottom
.
right
.
equalTo
(
0
)
make
.
left
.
bottom
.
right
.
equalTo
(
0
)
...
@@ -39,7 +40,7 @@ class ShopInfoViewController: BaseViewController {
...
@@ -39,7 +40,7 @@ class ShopInfoViewController: BaseViewController {
//MARK:--需要计算高度,也可以根据行数确定
//MARK:--需要计算高度,也可以根据行数确定
self
.
compInfoLbl
.
text
=
self
.
dataModel
?
.
data
?
.
shop_intro
self
.
compInfoLbl
.
text
=
self
.
dataModel
?
.
data
?
.
shop_intro
print
(
"简介
\(
self
.
compInfoLbl
.
numberOfLines
)
"
)
print
(
"简介
\(
self
.
compInfoLbl
.
numberOfLines
)
"
)
self
.
scrollHeight
.
constant
=
10
3
1
+
CGFloat
(
self
.
compInfoLbl
.
numberOfLines
)
*
15*
glscale
self
.
scrollHeight
.
constant
=
10
8
1
+
CGFloat
(
self
.
compInfoLbl
.
numberOfLines
)
*
15*
glscale
self
.
stallNameLbl
.
text
=
self
.
dataModel
?
.
data
?
.
stall_name
self
.
stallNameLbl
.
text
=
self
.
dataModel
?
.
data
?
.
stall_name
self
.
accoutLbl
.
text
=
self
.
dataModel
?
.
data
?
.
contacts_name
self
.
accoutLbl
.
text
=
self
.
dataModel
?
.
data
?
.
contacts_name
self
.
emailLbl
.
text
=
self
.
dataModel
?
.
data
?
.
shop_email
self
.
emailLbl
.
text
=
self
.
dataModel
?
.
data
?
.
shop_email
...
...
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