Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
galaxy-iOS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mobile-group
galaxy-iOS
Commits
22c2c733
Commit
22c2c733
authored
Jul 02, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
图片替换
parent
50f7a08e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
7 deletions
+2
-7
YHActivityViewModel.swift
...s/Community(社区)/Activity(活动)/VM/YHActivityViewModel.swift
+0
-5
Contents.json
...ssets.xcassets/Home/home_salon_bkg.imageset/Contents.json
+2
-2
九宫格6(1)@2x.png
...sets.xcassets/Home/home_salon_bkg.imageset/九宫格6(1)@2x.png
+0
-0
九宫格6(1)@3x.png
...sets.xcassets/Home/home_salon_bkg.imageset/九宫格6(1)@3x.png
+0
-0
首页-活动入口图@2x.png
...ets.xcassets/Home/home_salon_bkg.imageset/首页-活动入口图@2x.png
+0
-0
首页-活动入口图@3x.png
...ets.xcassets/Home/home_salon_bkg.imageset/首页-活动入口图@3x.png
+0
-0
No files found.
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/VM/YHActivityViewModel.swift
View file @
22c2c733
...
@@ -146,7 +146,6 @@ extension YHActivityViewModel {
...
@@ -146,7 +146,6 @@ extension YHActivityViewModel {
if
json
.
code
==
200
{
if
json
.
code
==
200
{
let
dic
=
json
.
data
let
dic
=
json
.
data
guard
let
result
=
YHActivityDetailModel
.
deserialize
(
from
:
dic
as?
Dictionary
)
else
{
guard
let
result
=
YHActivityDetailModel
.
deserialize
(
from
:
dic
as?
Dictionary
)
else
{
// self.activityDetailModel = nil
self
.
arrActivityDetail
=
[]
self
.
arrActivityDetail
=
[]
callBackBlock
(
false
,
nil
)
callBackBlock
(
false
,
nil
)
return
return
...
@@ -169,8 +168,6 @@ extension YHActivityViewModel {
...
@@ -169,8 +168,6 @@ extension YHActivityViewModel {
self
.
arrActivityDetail
.
append
(
model1
)
self
.
arrActivityDetail
.
append
(
model1
)
}
}
if
!
result
.
tips
.
isEmpty
{
if
!
result
.
tips
.
isEmpty
{
let
model2
=
YHActivityHelpModel
()
let
model2
=
YHActivityHelpModel
()
model2
.
type
=
2
model2
.
type
=
2
...
@@ -179,13 +176,11 @@ extension YHActivityViewModel {
...
@@ -179,13 +176,11 @@ extension YHActivityViewModel {
}
}
callBackBlock
(
true
,
nil
)
callBackBlock
(
true
,
nil
)
}
else
{
}
else
{
// self.activityDetailModel = nil
self
.
arrActivityDetail
=
[]
self
.
arrActivityDetail
=
[]
let
error
:
YHErrorModel
=
YHErrorModel
(
errorCode
:
Int32
(
json
.
code
),
errorMsg
:
json
.
msg
)
let
error
:
YHErrorModel
=
YHErrorModel
(
errorCode
:
Int32
(
json
.
code
),
errorMsg
:
json
.
msg
)
callBackBlock
(
false
,
error
)
callBackBlock
(
false
,
error
)
}
}
}
failBlock
:
{
err
in
}
failBlock
:
{
err
in
// self.activityDetailModel = nil
self
.
arrActivityDetail
=
[]
self
.
arrActivityDetail
=
[]
callBackBlock
(
false
,
err
)
callBackBlock
(
false
,
err
)
}
}
...
...
galaxy/galaxy/Res/Assets.xcassets/Home/home_salon_bkg.imageset/Contents.json
View file @
22c2c733
...
@@ -5,12 +5,12 @@
...
@@ -5,12 +5,12 @@
"scale"
:
"1x"
"scale"
:
"1x"
},
},
{
{
"filename"
:
"
九宫格6(1)
@2x.png"
,
"filename"
:
"
首页-活动入口图
@2x.png"
,
"idiom"
:
"universal"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
"scale"
:
"2x"
},
},
{
{
"filename"
:
"
九宫格6(1)
@3x.png"
,
"filename"
:
"
首页-活动入口图
@3x.png"
,
"idiom"
:
"universal"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
"scale"
:
"3x"
}
}
...
...
galaxy/galaxy/Res/Assets.xcassets/Home/home_salon_bkg.imageset/九宫格6(1)@2x.png
deleted
100644 → 0
View file @
50f7a08e
396 KB
galaxy/galaxy/Res/Assets.xcassets/Home/home_salon_bkg.imageset/九宫格6(1)@3x.png
deleted
100644 → 0
View file @
50f7a08e
873 KB
galaxy/galaxy/Res/Assets.xcassets/Home/home_salon_bkg.imageset/首页-活动入口图@2x.png
0 → 100644
View file @
22c2c733
306 KB
galaxy/galaxy/Res/Assets.xcassets/Home/home_salon_bkg.imageset/首页-活动入口图@3x.png
0 → 100644
View file @
22c2c733
643 KB
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