Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apaas-ui
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
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gzga-jzapi
apaas-ui
Commits
22b9410c
Commit
22b9410c
authored
Mar 16, 2021
by
刘殿昕
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev'
parents
98321b8f
861875c2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
8 deletions
+7
-8
src/components/service-info/service-info.vue
src/components/service-info/service-info.vue
+3
-3
src/components/shop-cloud/shop-cloud-new.vue
src/components/shop-cloud/shop-cloud-new.vue
+3
-4
src/pages/workbench/workPlace.vue
src/pages/workbench/workPlace.vue
+1
-1
No files found.
src/components/service-info/service-info.vue
View file @
22b9410c
...
@@ -7,12 +7,12 @@
...
@@ -7,12 +7,12 @@
>
>
<div
class=
"main_container"
>
<div
class=
"main_container"
>
<div
class=
"main_container-left"
v-if=
"data.cover"
>
<div
class=
"main_container-left"
v-if=
"data.cover"
>
<img
:src=
"data.cover"
width=
"100%"
v-if=
"
data.type !== 'workflow'
"
/>
<img
:src=
"data.cover"
width=
"100%"
v-if=
"
!(data.type == 'workflow' && data.workflows_id != 0) || !(data.type === 'Map Service')
"
/>
<workflows-view
<workflows-view
:isShop=
"true"
:isShop=
"true"
:id=
"parseInt(data.workflows_id)"
:id=
"parseInt(data.workflows_id)"
:hideDetail=
"true"
:hideDetail=
"true"
v-if=
"data.type == 'workflow'"
v-if=
"data.type == 'workflow'
&& data.workflows_id != 0
"
></workflows-view>
></workflows-view>
<map-view
<map-view
v-if=
"data.type === 'Map Service'"
v-if=
"data.type === 'Map Service'"
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
></map-view>
></map-view>
<process-view
<process-view
:id=
"parseInt(data.workflows_id)"
:id=
"parseInt(data.workflows_id)"
v-if=
"data.type == 'workflow'"
v-if=
"data.type == 'workflow'
&& data.workflows_id != 0
"
></process-view>
></process-view>
</div>
</div>
<div
class=
"main_container-right"
>
<div
class=
"main_container-right"
>
...
...
src/components/shop-cloud/shop-cloud-new.vue
View file @
22b9410c
...
@@ -1281,11 +1281,10 @@ export default {
...
@@ -1281,11 +1281,10 @@ export default {
);
);
if
(
if
(
this
.
formOld
.
dataDisk
>
0
&&
this
.
formOld
.
dataDisk
>
0
&&
this
.
formOld
.
perDataDisk
>
0
&&
this
.
formOld
.
perDataDisk
>
0
this
.
formOld
.
appDuration
>
0
)
{
)
{
console
.
log
(
"
j
,xq
d
"
);
console
.
log
(
"
jd
"
);
// 加D
,续期
// 加D
if
(
this
.
hard_disk
&&
this
.
hard_disk
.
length
!=
0
)
{
if
(
this
.
hard_disk
&&
this
.
hard_disk
.
length
!=
0
)
{
this
.
disk_single_money
=
Number
(
this
.
hard_disk
[
0
].
price
);
this
.
disk_single_money
=
Number
(
this
.
hard_disk
[
0
].
price
);
sumDisk
+=
Number
(
sumDisk
+=
Number
(
...
...
src/pages/workbench/workPlace.vue
View file @
22b9410c
...
@@ -319,7 +319,7 @@
...
@@ -319,7 +319,7 @@
:datas=
"app_data"
:datas=
"app_data"
:stripe=
"true"
:stripe=
"true"
:detailsUrl=
"detailsUrl1[now_user][now_app]"
:detailsUrl=
"detailsUrl1[now_user][now_app]"
:ites=
"
tru
e"
:ites=
"
fals
e"
height=
"285"
height=
"285"
></table-um>
></table-um>
<list-pagination
<list-pagination
...
...
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