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
961f3ade
Commit
961f3ade
authored
Dec 18, 2020
by
刘殿昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
统一修复
parent
cf6f5727
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
179 additions
and
102 deletions
+179
-102
src/assets/css/index.css
src/assets/css/index.css
+25
-3
src/components/comments-list.vue
src/components/comments-list.vue
+2
-1
src/components/comments-score.vue
src/components/comments-score.vue
+3
-2
src/components/e-charts/commentlist.vue
src/components/e-charts/commentlist.vue
+4
-3
src/components/e-charts/starlist.vue
src/components/e-charts/starlist.vue
+1
-1
src/components/order-list/order-list-cell.vue
src/components/order-list/order-list-cell.vue
+7
-4
src/components/service-list/commodity-card-new.vue
src/components/service-list/commodity-card-new.vue
+17
-8
src/components/service-list/commodity-cell-new.vue
src/components/service-list/commodity-cell-new.vue
+13
-7
src/components/service-list/commodity-cell-old.vue
src/components/service-list/commodity-cell-old.vue
+2
-0
src/pages/service_shop/shop_car_apply.vue
src/pages/service_shop/shop_car_apply.vue
+99
-69
src/pages/user/order/order_detail.vue
src/pages/user/order/order_detail.vue
+6
-4
No files found.
src/assets/css/index.css
View file @
961f3ade
...
...
@@ -228,13 +228,14 @@ div {
.el-dialog__header
{
border-bottom
:
1px
solid
#edf0ff
;
padding
:
20px
16px
;
}
.el-dialog__title
{
font-size
:
1
6
px
;
font-size
:
1
8
px
;
font-weight
:
700
;
color
:
#1d1e20
;
padding-left
:
8
px
;
padding-left
:
12
px
;
position
:
relative
;
}
...
...
@@ -246,7 +247,19 @@ div {
border-radius
:
2px
;
background-color
:
#515fe7
;
left
:
0
;
top
:
2px
;
top
:
5px
;
}
.el-dialog__headerbtn
{
top
:
24px
;
}
.el-dialog__headerbtn
.el-dialog__close
{
color
:
#8890a7
;
}
.el-dialog__headerbtn
:focus
.el-dialog__close
,
.el-dialog__headerbtn
:hover
.el-dialog__close
{
color
:
#515fe7
;
}
.el-dialog__body
{
...
...
@@ -1227,4 +1240,13 @@ border-radius:8px;
.el-input__inner
:-ms-input-placeholder
,
.el-textarea__inner
:-ms-input-placeholder
{
color
:
#a9aec0
;
}
[
class
*=
" el-icon-"
],
[
class
^=
el-icon-
]
{
font-weight
:
700
;
}
.el-rate__item
.el-rate__icon
{
font-size
:
18px
;
margin-right
:
0
;
}
\ No newline at end of file
src/components/comments-list.vue
View file @
961f3ade
...
...
@@ -12,10 +12,11 @@
<p
class=
"comment-user_name"
v-text=
"item.user_name"
></p>
<div
class=
"commnet-rate"
>
<el-rate
:colors=
"['#
e69232', '#e69232', '#e69232
']"
:colors=
"['#
fac266', '#fac266', '#fac266
']"
:value=
"item.score"
disabled
score-template=
"
{value}"
disabled-void-color="#d9dce5"
>
</el-rate>
</div>
...
...
src/components/comments-score.vue
View file @
961f3ade
...
...
@@ -7,9 +7,10 @@
<p
class=
"comment-full_score"
>
满分5分
</p>
<div
class=
"comment-total_rata"
>
<el-rate
:colors=
"['#
e69232', '#e69232', '#e69232
']"
:colors=
"['#
fac266', '#fac266', '#fac266
']"
:value=
"data.score"
disabled
disabled-void-color=
"#d9dce5"
>
</el-rate>
</div>
...
...
@@ -23,7 +24,7 @@
>
<el-rate
class=
"comments_score_item-rate"
:colors=
"['#
8890a7', '#8890a7', '#8890a7
']"
:colors=
"['#
fac266', '#fac266', '#fac266
']"
:value=
"item.star"
disabled
disabled-void-color=
"transparent"
...
...
src/components/e-charts/commentlist.vue
View file @
961f3ade
...
...
@@ -25,10 +25,11 @@
</p>
<div
class=
"commnet-rate"
>
<el-rate
:colors=
"['#
e69232', '#e69232', '#e69232
']"
:colors=
"['#
fac266', '#fac266', '#fac266
']"
:value=
"item.score"
disabled
score-template=
"
{value}"
disabled-void-color="#d9dce5"
>
</el-rate>
</div>
<p
class=
"comment-description"
v-text=
"item.message"
></p>
...
...
@@ -158,10 +159,10 @@ export default {
<
style
>
.comment-right
>
.commnet-rate
.el-rate
{
height
:
20
px
;
height
:
18
px
;
}
.comment-right
>
.commnet-rate
.el-rate__icon
{
font-size
:
20
px
;
font-size
:
18
px
;
margin-right
:
0
;
}
</
style
>
src/components/e-charts/starlist.vue
View file @
961f3ade
...
...
@@ -4,7 +4,7 @@
<el-rate
v-if=
"show_star"
class=
"item-rate"
:colors=
"['#
8890a7', '#8890a7', '#8890a7
']"
:colors=
"['#
fac266', '#fac266', '#fac266
']"
:value=
"option.star"
disabled
disabled-void-color=
"transparent"
...
...
src/components/order-list/order-list-cell.vue
View file @
961f3ade
...
...
@@ -209,6 +209,7 @@
:colors=
"colors"
show-score
score-template=
"
{value}"
disabled-void-color="#d9dce5"
>
</el-rate>
</div>
<p>
填写评价:
</p>
...
...
@@ -310,6 +311,7 @@
v-model=
"message.score"
disabled
:colors=
"colors"
disabled-void-color=
"#d9dce5"
></el-rate>
</div>
<div
class=
"msg_title"
>
评价详情:
</div>
...
...
@@ -334,7 +336,7 @@ export default {
},
data
:
()
=>
({
visible
:
false
,
colors
:
[
"
#
99A9BF
"
,
"
#F7BA2A
"
,
"
#FF9900
"
],
colors
:
[
"
#
fac266
"
,
"
#fac266
"
,
"
#fac266
"
],
serviceRate
:
null
,
textarea
:
""
,
showMsgBox
:
false
,
...
...
@@ -436,11 +438,12 @@ export default {
});
},
nextApply
()
{
console
.
log
(
this
.
cellItem
.
spec_app
)
let
query
=
{};
if
(
this
.
cellItem
.
order_type
==
1
)
{
query
=
{
service_id
:
parseFloat
(
this
.
cellItem
.
service_id
),
sp
cs_id
:
this
.
cellItem
.
spcs
_id
,
sp
ec_id
:
this
.
cellItem
.
svc_spec
_id
,
duration
:
this
.
cellItem
.
duration
,
duration_unit
:
this
.
cellItem
.
duration_unit
,
};
...
...
@@ -451,7 +454,7 @@ export default {
}
else
if
(
this
.
cellItem
.
order_type
==
2
)
{
query
=
{
app_id
:
parseFloat
(
this
.
cellItem
.
app_id
),
spec_id
:
this
.
cellItem
.
s
pec_app
++
,
spec_id
:
this
.
cellItem
.
s
vc_spec_id
,
duration
:
this
.
cellItem
.
duration
,
duration_unit
:
this
.
cellItem
.
duration_unit
,
};
...
...
@@ -723,7 +726,7 @@ export default {
font-size
:
24px
;
}
.pop_rate
.el-rate__text
{
font-size
:
20
px
;
font-size
:
18
px
;
margin-left
:
20px
;
position
:
relative
;
top
:
1px
;
...
...
src/components/service-list/commodity-card-new.vue
View file @
961f3ade
...
...
@@ -7,7 +7,10 @@
<div
class=
"com_cell_up_right"
>
<div
class=
"up_title"
>
<div
class=
"up_tit_name_in"
>
<span
class=
"up_tit_name"
:title=
"cellData.app_name + ' ( V' + cellData.version + ' )'"
>
<span
class=
"up_tit_name"
:title=
"cellData.app_name + ' ( V' + cellData.version + ' )'"
>
{{
cellData
.
app_name
}}
( V
{{
cellData
.
version
}}
)
</span>
</div>
...
...
@@ -19,6 +22,8 @@
show-score
text-color=
"#ea7d19"
score-template=
"
{value}"
:colors="['#fac266', '#fac266', '#fac266']"
disabled-void-color="#d9dce5"
>
</el-rate>
<p
class=
"get_num"
>
获取次数:
...
...
@@ -38,14 +43,14 @@
{{
cellData
.
yyjj
}}
</p>
<el-row
:gutter=
"16"
>
<el-col
:span=
"14"
class=
"com_other"
>
<el-col
:span=
"14"
class=
"com_other
1
"
>
<span
class=
"name_title"
>
应用类型:
</span>
{{
cellData
.
type_name
}}
{{
cellData
.
data_service_type2_name
}}
{{
cellData
.
data_service_type3_name
}}
</el-col>
<el-col
:span=
"10"
class=
"com_other"
>
<el-col
:span=
"10"
class=
"com_other
1
"
>
<span
class=
"name_title"
>
业务领域:
</span>
{{
cellData
.
area_name
}}
</el-col>
...
...
@@ -197,7 +202,7 @@ export default {
-webkit-line-clamp
:
2
;
overflow
:
hidden
;
height
:
42px
;
margin-bottom
:
8
px
;
margin-bottom
:
5
px
;
}
.com_other
{
color
:
#58617a
;
...
...
@@ -207,15 +212,19 @@ export default {
-webkit-line-clamp
:
1
;
overflow
:
hidden
;
}
.com_other1
{
color
:
#58617a
;
margin-bottom
:
9px
;
display
:
-webkit-box
;
-webkit-box-orient
:
vertical
;
-webkit-line-clamp
:
1
;
overflow
:
hidden
;
}
.name_title
{
color
:
#8890a7
;
}
</
style
>
<
style
>
.com_cell
.el-rate__item
.el-rate__icon
{
font-size
:
20px
;
margin-right
:
0
;
}
.com_cell
.el-rate__text
{
margin-left
:
4px
;
position
:
relative
;
...
...
src/components/service-list/commodity-cell-new.vue
View file @
961f3ade
...
...
@@ -29,7 +29,9 @@
disabled
show-score
text-color=
"#ea7d19"
:colors=
"['#fac266', '#fac266', '#fac266']"
score-template=
"
{value}"
disabled-void-color="#d9dce5"
>
</el-rate>
<p
class=
"get_num"
>
获取次数:
...
...
@@ -49,14 +51,14 @@
{{
cellData
.
descript
}}
</p>
<el-row
:gutter=
"16"
>
<el-col
:span=
"14"
class=
"com_other"
>
<el-col
:span=
"14"
class=
"com_other
1
"
>
<span
class=
"name_title"
>
服务类型:
</span>
{{
cellData
.
data_service_type1_name
}}
{{
cellData
.
data_service_type2_name
}}
{{
cellData
.
data_service_type3_name
}}
</el-col>
<el-col
:span=
"10"
class=
"com_other"
>
<el-col
:span=
"10"
class=
"com_other
1
"
>
<span
class=
"name_title"
>
服务领域:
</span>
{{
cellData
.
sectors_name
}}
</el-col>
...
...
@@ -208,7 +210,7 @@ export default {
-webkit-line-clamp
:
2
;
overflow
:
hidden
;
height
:
42px
;
margin-bottom
:
8
px
;
margin-bottom
:
5
px
;
}
.com_other
{
color
:
#58617a
;
...
...
@@ -218,15 +220,19 @@ export default {
-webkit-line-clamp
:
1
;
overflow
:
hidden
;
}
.com_other1
{
color
:
#58617a
;
margin-bottom
:
9px
;
display
:
-webkit-box
;
-webkit-box-orient
:
vertical
;
-webkit-line-clamp
:
1
;
overflow
:
hidden
;
}
.name_title
{
color
:
#8890a7
;
}
</
style
>
<
style
>
.com_cell
.el-rate__item
.el-rate__icon
{
font-size
:
20px
;
margin-right
:
0
;
}
.com_cell
.el-rate__text
{
margin-left
:
4px
;
position
:
relative
;
...
...
src/components/service-list/commodity-cell-old.vue
View file @
961f3ade
...
...
@@ -41,6 +41,8 @@
show-score
text-color=
"#58617a"
score-template=
"
{value}"
:colors="['#fac266', '#fac266', '#fac266']"
disabled-void-color="#d9dce5"
>
</el-rate>
<div
class=
"com_cell_right_text"
>
<span
class=
"com_cell_right_time_tit"
>
本月获取次数:
</span>
...
...
src/pages/service_shop/shop_car_apply.vue
View file @
961f3ade
This diff is collapsed.
Click to expand it.
src/pages/user/order/order_detail.vue
View file @
961f3ade
...
...
@@ -97,6 +97,7 @@
:colors=
"colors"
show-score
score-template=
"
{value}"
disabled-void-color="#d9dce5"
>
</el-rate>
</div>
<p>
填写评价:
</p>
...
...
@@ -188,6 +189,7 @@
v-model=
"message.score"
disabled
:colors=
"colors"
disabled-void-color=
"#d9dce5"
></el-rate>
</div>
<div
class=
"msg_title"
>
评价详情:
</div>
...
...
@@ -276,7 +278,7 @@
{{
orderDetail
.
single_money
}}
金币/
{{
orderDetail
.
spcs_type
==
1
?
orderDetail
.
sp
ec
_count
+
"
次
"
?
orderDetail
.
sp
cs
_count
+
"
次
"
:
"
月
"
}}
</span>
...
...
@@ -486,7 +488,7 @@ export default {
data
:
()
=>
({
helper
:
helper
,
visible
:
false
,
colors
:
[
"
#
99A9BF
"
,
"
#F7BA2A
"
,
"
#FF9900
"
],
colors
:
[
"
#
fac266
"
,
"
#fac266
"
,
"
#fac266
"
],
serviceRate
:
0
,
textarea
:
""
,
orderDetail
:
{},
...
...
@@ -747,7 +749,7 @@ export default {
if
(
this
.
orderDetail
.
order_type
==
1
)
{
query
=
{
service_id
:
parseFloat
(
this
.
orderDetail
.
service_id
),
sp
cs_id
:
this
.
orderDetail
.
spcs
_id
,
sp
ec_id
:
this
.
orderDetail
.
svc_spec
_id
,
duration
:
this
.
orderDetail
.
duration
,
duration_unit
:
this
.
orderDetail
.
duration_unit
,
};
...
...
@@ -759,7 +761,7 @@ export default {
}
else
if
(
this
.
orderDetail
.
order_type
==
2
)
{
query
=
{
app_id
:
parseFloat
(
this
.
orderDetail
.
app_id
),
sp
cs_id
:
this
.
orderDetail
.
spcs
_id
,
sp
ec_id
:
this
.
orderDetail
.
svc_spec
_id
,
duration
:
this
.
orderDetail
.
duration
,
duration_unit
:
this
.
orderDetail
.
duration_unit
,
};
...
...
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