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
5fd3de09
Commit
5fd3de09
authored
Nov 03, 2020
by
刘殿昕
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ldx' into dev
parents
da510826
ec1385e9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
42 deletions
+50
-42
src/components/shop-cloud/shop-cloud.vue
src/components/shop-cloud/shop-cloud.vue
+42
-36
src/components/shopping-cart/shopping-cart-com.vue
src/components/shopping-cart/shopping-cart-com.vue
+2
-2
src/pages/user/questions-answers/community.vue
src/pages/user/questions-answers/community.vue
+3
-1
src/pages/user/questions-answers/my-qa.vue
src/pages/user/questions-answers/my-qa.vue
+3
-3
No files found.
src/components/shop-cloud/shop-cloud.vue
View file @
5fd3de09
...
@@ -651,11 +651,15 @@
...
@@ -651,11 +651,15 @@
<span
@
click=
"dialogFymx = true"
class=
"ckfymx_a"
>
<span
@
click=
"dialogFymx = true"
class=
"ckfymx_a"
>
查看费用明细
查看费用明细
</span>
</span>
<span
class=
"ckfymx_qian"
>
账户余额:
{{
userInfo
.
account_balance
}}
金币
</span>
<span
class=
"ckfymx_qian"
>
账户余额:
{{
userInfo
.
account_balance
}}
金币
</span
>
</p>
</p>
</div>
</div>
<el-button
<el-button
:class=
"getSumCoin
<
=
userInfo
.
account_balance
?
'
submit
'
:
'
nosubmit
'"
:class=
"
getSumCoin
<
=
userInfo
.
account_balance
?
'
submit
'
:
'
nosubmit
'
"
:disabled=
"getSumCoin > userInfo.account_balance"
:disabled=
"getSumCoin > userInfo.account_balance"
@
click=
"submitApp"
@
click=
"submitApp"
>
>
...
@@ -964,7 +968,9 @@
...
@@ -964,7 +968,9 @@
<
/p
>
<
/p
>
<
/div
>
<
/div
>
<
p
class
=
"
fyzj_2
"
>
<
p
class
=
"
fyzj_2
"
>
账户余额:
<
span
class
=
"
fyzj_2_num
"
>
{{
userInfo
.
account_balance
}}
金币
<
/span
>
账户余额:
<
span
class
=
"
fyzj_2_num
"
>
{{
userInfo
.
account_balance
}}
金币
<
/spa
n
>
<
/p
>
<
/p
>
<
/div
>
<
/div
>
<
div
class
=
"
clear_xxx
"
><
/div
>
<
div
class
=
"
clear_xxx
"
><
/div
>
...
@@ -1053,27 +1059,27 @@ export default {
...
@@ -1053,27 +1059,27 @@ export default {
a_deductions
=
this
.
deductions
;
a_deductions
=
this
.
deductions
;
if
(
this
.
formNew
.
cpu
==
"
8
"
)
{
if
(
this
.
formNew
.
cpu
==
"
8
"
)
{
if
(
this
.
formNew
.
memory
==
"
16
"
)
{
if
(
this
.
formNew
.
memory
==
"
16
"
)
{
let
priceObj
=
this
.
cpu_memory
.
find
(
item
=>
{
let
priceObj
=
this
.
cpu_memory
.
find
(
(
item
)
=>
{
return
item
.
cpu
==
8
&&
item
.
memory
==
16
;
return
item
.
cpu
==
8
&&
item
.
memory
==
16
;
}
)
}
)
;
sumCM
+=
priceObj
.
price
;
sumCM
+=
Number
(
priceObj
.
price
)
;
}
else
if
(
this
.
formNew
.
memory
==
"
32
"
)
{
}
else
if
(
this
.
formNew
.
memory
==
"
32
"
)
{
let
priceObj
=
this
.
cpu_memory
.
find
(
item
=>
{
let
priceObj
=
this
.
cpu_memory
.
find
(
(
item
)
=>
{
return
item
.
cpu
==
8
&&
item
.
memory
==
32
;
return
item
.
cpu
==
8
&&
item
.
memory
==
32
;
}
)
}
)
;
sumCM
+=
priceObj
.
price
;
sumCM
+=
Number
(
priceObj
.
price
)
;
}
}
}
else
if
(
this
.
formNew
.
cpu
==
"
16
"
)
{
}
else
if
(
this
.
formNew
.
cpu
==
"
16
"
)
{
if
(
this
.
formNew
.
memory
==
"
32
"
)
{
if
(
this
.
formNew
.
memory
==
"
32
"
)
{
let
priceObj
=
this
.
cpu_memory
.
find
(
item
=>
{
let
priceObj
=
this
.
cpu_memory
.
find
(
(
item
)
=>
{
return
item
.
cpu
==
16
&&
item
.
memory
==
32
;
return
item
.
cpu
==
16
&&
item
.
memory
==
32
;
}
)
}
)
;
sumCM
+=
priceObj
.
price
;
sumCM
+=
Number
(
priceObj
.
price
)
;
}
else
if
(
this
.
formNew
.
memory
==
"
64
"
)
{
}
else
if
(
this
.
formNew
.
memory
==
"
64
"
)
{
let
priceObj
=
this
.
cpu_memory
.
find
(
item
=>
{
let
priceObj
=
this
.
cpu_memory
.
find
(
(
item
)
=>
{
return
item
.
cpu
==
16
&&
item
.
memory
==
64
;
return
item
.
cpu
==
16
&&
item
.
memory
==
64
;
}
)
}
)
;
sumCM
+=
priceObj
.
price
;
sumCM
+=
Number
(
priceObj
.
price
)
;
}
}
}
}
if
(
if
(
...
@@ -1082,10 +1088,10 @@ export default {
...
@@ -1082,10 +1088,10 @@ export default {
this
.
formNew
.
appDuration
>=
1
this
.
formNew
.
appDuration
>=
1
)
{
)
{
sumDisk
+=
sumDisk
+=
this
.
formNew
.
dataDisk
*
Number
(
this
.
formNew
.
dataDisk
)
*
this
.
formNew
.
perDataDisk
*
Number
(
this
.
formNew
.
perDataDisk
)
*
this
.
formNew
.
appDuration
*
Number
(
this
.
formNew
.
appDuration
)
*
this
.
hard_disk
[
0
].
price
;
Number
(
this
.
hard_disk
[
0
].
price
)
;
this
.
jifeiList1
[
2
]
=
{
this
.
jifeiList1
[
2
]
=
{
name
:
"
数据盘
"
,
name
:
"
数据盘
"
,
num
:
`${this.formNew.dataDisk
}
个数据盘,每个数据盘${this.formNew.perDataDisk
}
GB`
,
num
:
`${this.formNew.dataDisk
}
个数据盘,每个数据盘${this.formNew.perDataDisk
}
GB`
,
...
@@ -1112,27 +1118,27 @@ export default {
...
@@ -1112,27 +1118,27 @@ export default {
a_deductions
=
this
.
deductions
;
a_deductions
=
this
.
deductions
;
if
(
this
.
formOld
.
cpu
==
"
8
"
)
{
if
(
this
.
formOld
.
cpu
==
"
8
"
)
{
if
(
this
.
formOld
.
memory
==
"
16
"
)
{
if
(
this
.
formOld
.
memory
==
"
16
"
)
{
let
priceObj
=
this
.
cpu_memory
.
find
(
item
=>
{
let
priceObj
=
this
.
cpu_memory
.
find
(
(
item
)
=>
{
return
item
.
cpu
==
8
&&
item
.
memory
==
16
;
return
item
.
cpu
==
8
&&
item
.
memory
==
16
;
}
)
}
)
;
sumCM
+=
priceObj
.
price
;
sumCM
+=
Number
(
priceObj
.
price
)
;
}
else
if
(
this
.
formOld
.
memory
==
"
32
"
)
{
}
else
if
(
this
.
formOld
.
memory
==
"
32
"
)
{
let
priceObj
=
this
.
cpu_memory
.
find
(
item
=>
{
let
priceObj
=
this
.
cpu_memory
.
find
(
(
item
)
=>
{
return
item
.
cpu
==
8
&&
item
.
memory
==
32
;
return
item
.
cpu
==
8
&&
item
.
memory
==
32
;
}
)
}
)
;
sumCM
+=
priceObj
.
price
;
sumCM
+=
Number
(
priceObj
.
price
)
;
}
}
}
else
if
(
this
.
formOld
.
cpu
==
"
16
"
)
{
}
else
if
(
this
.
formOld
.
cpu
==
"
16
"
)
{
if
(
this
.
formOld
.
memory
==
"
32
"
)
{
if
(
this
.
formOld
.
memory
==
"
32
"
)
{
let
priceObj
=
this
.
cpu_memory
.
find
(
item
=>
{
let
priceObj
=
this
.
cpu_memory
.
find
(
(
item
)
=>
{
return
item
.
cpu
==
16
&&
item
.
memory
==
32
;
return
item
.
cpu
==
16
&&
item
.
memory
==
32
;
}
)
}
)
;
sumCM
+=
priceObj
.
price
;
sumCM
+=
Number
(
priceObj
.
price
)
;
}
else
if
(
this
.
formOld
.
memory
==
"
64
"
)
{
}
else
if
(
this
.
formOld
.
memory
==
"
64
"
)
{
let
priceObj
=
this
.
cpu_memory
.
find
(
item
=>
{
let
priceObj
=
this
.
cpu_memory
.
find
(
(
item
)
=>
{
return
item
.
cpu
==
16
&&
item
.
memory
==
64
;
return
item
.
cpu
==
16
&&
item
.
memory
==
64
;
}
)
}
)
;
sumCM
+=
priceObj
.
price
;
sumCM
+=
Number
(
priceObj
.
price
)
;
}
}
}
}
if
(
if
(
...
@@ -1141,10 +1147,10 @@ export default {
...
@@ -1141,10 +1147,10 @@ export default {
this
.
formOld
.
appDuration
>=
1
this
.
formOld
.
appDuration
>=
1
)
{
)
{
sumDisk
+=
sumDisk
+=
this
.
formOld
.
dataDisk
*
Number
(
this
.
formOld
.
dataDisk
)
*
this
.
formOld
.
perDataDisk
*
Number
(
this
.
formOld
.
perDataDisk
)
*
this
.
formOld
.
appDuration
*
Number
(
this
.
formOld
.
appDuration
)
*
this
.
hard_disk
[
0
].
price
;
Number
(
this
.
hard_disk
[
0
].
price
)
;
this
.
jifeiList1
[
2
]
=
{
this
.
jifeiList1
[
2
]
=
{
name
:
"
数据盘
"
,
name
:
"
数据盘
"
,
num
:
`${this.formOld.dataDisk
}
个数据盘,每个数据盘${this.formOld.perDataDisk
}
GB`
,
num
:
`${this.formOld.dataDisk
}
个数据盘,每个数据盘${this.formOld.perDataDisk
}
GB`
,
...
@@ -1168,7 +1174,7 @@ export default {
...
@@ -1168,7 +1174,7 @@ export default {
this.formOld.appDuration >= 1 ? this.formOld.appDuration : 0
this.formOld.appDuration >= 1 ? this.formOld.appDuration : 0
}
个月`
;
}
个月`
;
}
}
this
.
amounts_payable
=
(
sumCM
+
sumDisk
).
toFixed
(
2
);
this
.
amounts_payable
=
Number
((
Number
(
sumCM
)
+
Number
(
sumDisk
)).
toFixed
(
2
)
);
// this.total_money = sumCM + sumDisk - a_deductions;
// this.total_money = sumCM + sumDisk - a_deductions;
return
this
.
amounts_payable
;
return
this
.
amounts_payable
;
}
,
}
,
...
...
src/components/shopping-cart/shopping-cart-com.vue
View file @
5fd3de09
...
@@ -132,9 +132,9 @@ export default {
...
@@ -132,9 +132,9 @@ export default {
this
.
checkList
.
forEach
((
item
,
index
)
=>
{
this
.
checkList
.
forEach
((
item
,
index
)
=>
{
if
(
item
)
{
if
(
item
)
{
if
(
this
.
list
[
index
].
service_id
!=
0
)
{
if
(
this
.
list
[
index
].
service_id
!=
0
)
{
sum
+=
(
this
.
list
[
index
].
service
.
spcs_info
.
money
*
this
.
list
[
index
].
duration
).
toFixed
(
2
);
sum
+=
Number
((
this
.
list
[
index
].
service
.
spcs_info
.
money
*
this
.
list
[
index
].
duration
).
toFixed
(
2
)
);
}
else
{
}
else
{
sum
+=
(
this
.
list
[
index
].
application
.
price
*
this
.
list
[
index
].
duration
).
toFixed
(
2
);
sum
+=
Number
((
this
.
list
[
index
].
application
.
price
*
this
.
list
[
index
].
duration
).
toFixed
(
2
)
);
}
}
}
}
});
});
...
...
src/pages/user/questions-answers/community.vue
View file @
5fd3de09
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
>
>
<div
class=
"dia_reason"
>
<div
class=
"dia_reason"
>
<el-form
ref=
"form1"
:model=
"reason_form"
:rules=
"reason_rules"
>
<el-form
ref=
"form1"
:model=
"reason_form"
:rules=
"reason_rules"
>
<el-form-item
class=
"dia_item"
>
<el-form-item
class=
"dia_item"
prop=
"reason"
>
<p>
删除理由:
</p>
<p>
删除理由:
</p>
<el-input
<el-input
type=
"textarea"
type=
"textarea"
...
@@ -292,6 +292,7 @@ export default {
...
@@ -292,6 +292,7 @@ export default {
this
.
table_header
=
[];
this
.
table_header
=
[];
if
(
val
==
"
/qa/questions
"
)
{
if
(
val
==
"
/qa/questions
"
)
{
this
.
form_data
[
1
].
label
=
"
发布人搜索
"
;
this
.
form_data
[
1
].
label
=
"
发布人搜索
"
;
this
.
form_data
[
1
].
placeholder
=
"
请输入发布人名称
"
;
this
.
form_data
[
2
].
label
=
"
发布时间
"
;
this
.
form_data
[
2
].
label
=
"
发布时间
"
;
this
.
table_header
=
[
this
.
table_header
=
[
{
{
...
@@ -355,6 +356,7 @@ export default {
...
@@ -355,6 +356,7 @@ export default {
this
.
getQList
();
this
.
getQList
();
}
else
if
(
val
==
"
/qa/answers
"
)
{
}
else
if
(
val
==
"
/qa/answers
"
)
{
this
.
form_data
[
1
].
label
=
"
回复人搜索
"
;
this
.
form_data
[
1
].
label
=
"
回复人搜索
"
;
this
.
form_data
[
1
].
placeholder
=
"
请输入回复人名称
"
;
this
.
form_data
[
2
].
label
=
"
回复时间
"
;
this
.
form_data
[
2
].
label
=
"
回复时间
"
;
this
.
table_header
=
[
this
.
table_header
=
[
{
{
...
...
src/pages/user/questions-answers/my-qa.vue
View file @
5fd3de09
...
@@ -67,8 +67,7 @@
...
@@ -67,8 +67,7 @@
<div
v-for=
"(item, index) in data_list"
:key=
"index"
class=
"qa_cell"
>
<div
v-for=
"(item, index) in data_list"
:key=
"index"
class=
"qa_cell"
>
<div
class=
"qa_cell_in"
>
<div
class=
"qa_cell_in"
>
<div
:class=
"activeName == 2 ? 'qa_is_del' : 'qa_init'"
>
<div
:class=
"activeName == 2 ? 'qa_is_del' : 'qa_init'"
>
<p
v-if=
"activeName == 1"
class=
"cell_answer"
>
<p
v-if=
"activeName == 1"
class=
"cell_answer"
v-html=
"item.answer"
>
{{
item
.
answer
}}
</p>
</p>
<p
<p
@
click=
"gotodeta(item.question_id)"
@
click=
"gotodeta(item.question_id)"
...
@@ -324,7 +323,7 @@ export default {
...
@@ -324,7 +323,7 @@ export default {
},
},
delQ
()
{
delQ
()
{
let
items
=
[{
id
:
this
.
delItem
.
id
}];
let
items
=
[{
id
:
this
.
delItem
.
id
}];
console
.
log
(
items
)
;
this
.
diaDelItem
=
false
;
this
.
$api
.
user
.
delQuestions
(
items
).
then
((
response
)
=>
{
this
.
$api
.
user
.
delQuestions
(
items
).
then
((
response
)
=>
{
if
(
response
.
data
.
success
==
1
)
{
if
(
response
.
data
.
success
==
1
)
{
this
.
$message
({
this
.
$message
({
...
@@ -336,6 +335,7 @@ export default {
...
@@ -336,6 +335,7 @@ export default {
},
},
delA
()
{
delA
()
{
let
items
=
[{
id
:
this
.
delItem
.
id
}];
let
items
=
[{
id
:
this
.
delItem
.
id
}];
this
.
diaDelItem
=
false
;
this
.
$api
.
user
.
delAnswers
(
items
).
then
((
response
)
=>
{
this
.
$api
.
user
.
delAnswers
(
items
).
then
((
response
)
=>
{
if
(
response
.
data
.
success
==
1
)
{
if
(
response
.
data
.
success
==
1
)
{
this
.
$message
({
this
.
$message
({
...
...
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