Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PHP
vryPanoEdit
Commits
5ae76b95
Commit
5ae76b95
authored
5 years ago
by
李文起
Browse files
Options
Download
Plain Diff
Merge branch 'feature/v1.2.4' into 'master'
更新提示 See merge request
!25
parents
dcaad0d1
6304fb91
1 merge request
!25
更新提示
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Services/ProjectAction/ActionType/PageCoverAction.php
+4
-1
src/Services/ProjectAction/ActionType/PageCoverAction.php
src/Services/ProjectAction/ActionType/PromptAction.php
+4
-3
src/Services/ProjectAction/ActionType/PromptAction.php
with
8 additions
and
4 deletions
+8
-4
src/Services/ProjectAction/ActionType/PageCoverAction.php
View file @
5ae76b95
...
...
@@ -19,8 +19,11 @@ class PageCoverAction extends ProjectAction
$pageCover
=
json_decode
(
$this
->
data
[
'value'
],
true
);
$pageCover
[
'app_img'
]
=
!
empty
(
$pageCover
[
'app_img'
])
?
getStorageUrl
(
env
(
'APP_ENV'
)
.
$pageCover
[
'app_img'
])[
'url'
]
:
''
;
$pageCover
[
'pc_img'
]
=
!
empty
(
$pageCover
[
'pc_img'
])
?
getStorageUrl
(
env
(
'APP_ENV'
)
.
$pageCover
[
'pc_img'
])[
'url'
]
:
''
;
return
!
empty
(
$pageCover
)
?
[
'app_img'
=>
!
empty
(
$pageCover
[
'app_img'
])
?
getStorageUrl
(
env
(
'APP_ENV'
)
.
$pageCover
[
'app_img'
])[
'url'
]
:
''
,
'pc_img'
=>
!
empty
(
$pageCover
[
'pc_img'
])
?
getStorageUrl
(
env
(
'APP_ENV'
)
.
$pageCover
[
'pc_img'
])[
'url'
]
:
''
]
:
[
'app_img'
=>
''
,
'pc_img'
=>
''
];
return
$pageCover
;
}
...
...
This diff is collapsed.
Click to expand it.
src/Services/ProjectAction/ActionType/PromptAction.php
View file @
5ae76b95
...
...
@@ -19,12 +19,13 @@ class PromptAction extends ProjectAction
$prompt
=
json_decode
(
$this
->
data
[
'value'
],
true
);
$prompt
[
'app_img'
]
=
!
empty
(
$prompt
[
'app_img'
])
?
getStorageUrl
(
env
(
'APP_ENV'
)
.
$prompt
[
'app_img'
])[
'url'
]
:
''
;
$prompt
[
'pc_img'
]
=
!
empty
(
$prompt
[
'pc_img'
])
?
getStorageUrl
(
env
(
'APP_ENV'
)
.
$prompt
[
'pc_img'
])[
'url'
]
:
''
;
return
!
empty
(
$prompt
)
?
[
'app_img'
=>
!
empty
(
$prompt
[
'app_img'
])
?
getStorageUrl
(
env
(
'APP_ENV'
)
.
$prompt
[
'app_img'
])[
'url'
]
:
''
,
'pc_img'
=>
!
empty
(
$prompt
[
'pc_img'
])
?
getStorageUrl
(
env
(
'APP_ENV'
)
.
$prompt
[
'pc_img'
])[
'url'
]
:
''
]
:
[
'app_img'
=>
''
,
'pc_img'
=>
''
];
return
$prompt
;
}
return
[
'app_img'
=>
''
,
'pc_img'
=>
''
];
return
[
'app_img'
=>
''
,
'pc_img'
=>
''
,
'time'
=>
0
];
}
...
...
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
Menu
Projects
Groups
Snippets
Help