Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jz_Travel
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
zhengke
jz_Travel
Commits
b7aa3ed6
Commit
b7aa3ed6
authored
Oct 11, 2021
by
罗超
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/zk123/jz_travel
into master
parents
b2cf7ff9
4d1d8446
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
list.vue
components/goods/list.vue
+2
-1
style1.vue
components/goods/style1.vue
+5
-3
No files found.
components/goods/list.vue
View file @
b7aa3ed6
...
...
@@ -15,7 +15,8 @@
</view>
<view
class=
"good-info"
>
<view
class=
"price"
>
{{
$utils
.
getretailer
()
==
true
?
cx
.
b2BPrice
:
cx
.
b2CPrice
}}
<text
class=
"sell"
>
起
</text>
{{
$utils
.
getretailer
()
==
true
?
cx
.
b2BPrice
:
cx
.
b2CPrice
}}
<!--
<text
class=
"sell"
>
起
</text>
-->
</view>
<view
class=
"cart"
>
<u-icon
name=
"cart-o"
color=
"#ff4544"
size=
"40"
/>
...
...
components/goods/style1.vue
View file @
b7aa3ed6
...
...
@@ -38,7 +38,9 @@
<div
class=
"good-name"
v-if=
"goodsInfo.showGoodsName"
>
{{
item
.
name
}}
</div>
<view
class=
"good-sub-name"
v-if=
"item.subname"
>
{{
item
.
subname
}}
</view>
<div
class=
"good-price-info"
>
<span
class=
"price"
>
{{
goodsInfo
.
showGoodsPrice
?
getPrice
(
item
.
price
)
:
''
}}
<span
class=
"price"
>
<span
style=
"font-size: 28rpx;font-weight: 500;margin-right: 2rpx;"
>
¥
</span>
{{
goodsInfo
.
showGoodsPrice
?
getPrice
(
item
.
price
)
:
''
}}
<!--
<span
style=
'text-decoration: line-through;margin-left: 10px;font-size: 10px;color: gray;font-family: aa;'
>
原价:
{{
goodsInfo
.
showGoodsPrice
?
getPrice
(
item
.
OriginalPrice
)
:
''
}}
</span>
-->
</span>
<span
class=
"buy"
v-if=
"goodsInfo.showBuyBtn"
>
...
...
@@ -58,7 +60,7 @@
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else
>
{{
goodsInfo
.
buyBtnText
}}
</u-button>
</span>
...
...
@@ -152,7 +154,7 @@ export default {
position
:
relative
;
border
:
1
rpx
solid
transparent
;
border-radius
:
10px
;
padding-bottom
:
10
r
px
;
padding-bottom
:
10px
;
overflow
:
hidden
;
box-shadow
:
0
4px
10px
1px
#D2D2D2
;
}
...
...
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