Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
user
Overview
Overview
Details
Activity
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
hooloo
mp
user
Commits
5e7d1237
Commit
5e7d1237
authored
2 years ago
by
songbingqi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改首页样式效果
parent
ba390777
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
30 deletions
+38
-30
components/OrderQrCode/index.vue
+14
-13
components/menuAssembly/index.vue
+2
-2
components/shopCar/shopCar.vue
+17
-10
components/tabBar/tabBar.vue
+1
-1
pages/menu/menu.vue
+4
-4
No files found.
components/OrderQrCode/index.vue
View file @
5e7d1237
<
template
>
<div>
<u-popup
:show=
"show"
:round=
"10"
mode=
"bottom"
@
close=
"close"
:safeAreaInsetBottom=
"false"
>
<view
class=
"bigBox"
:style=
"
{'height':'9
0
vh'}">
<u-popup
:show=
"show"
:round=
"10"
mode=
"bottom"
@
close=
"close"
:safeAreaInsetBottom=
"false"
zIndex=
"10078"
>
<view
class=
"bigBox"
:style=
"
{'height':'9
4
vh'}">
<div
class=
"order_flow"
>
<div
class=
"code"
>
取单码
{{
orderInfo
.
orderNum
}}
</div>
<!--
<image
mode=
"scaleToFill"
:src=
"qrCode"
class=
"qr_code"
></image>
-->
...
...
@@ -12,7 +12,7 @@
<image
mode=
"aspectFit"
:src=
"'/static/imgs/erweimazhedang.png'"
class=
"qr"
></image>
</div>
<view
class=
"status_text"
v-if=
"showMask"
>
——制作完成后才能扫哦——
</view>
<div
class=
"flow_describe"
>
<div
class=
"flow_describe"
:style=
"
{'padding-top':(!showMask)?'48rpx':'80rpx'}"
>
<view
class=
"title"
>
扫码流程
</view>
<image
:mode=
"'aspectFit'"
class=
"flow_img"
:src=
"'/static/imgs/saomaliucheng.png'"
></image>
</div>
...
...
@@ -89,7 +89,7 @@ export default {
if
(
this
.
showMask
)
{
this
.
qrCode
=
''
;
}
else
{
this
.
qrCode
=
path
;
this
.
qrCode
=
'https://t7.baidu.com/it/u=192737963,550444895&fm=218&app=126&size=f242,150&n=0&f=PNG?s=18AAE7177DCBF747466A567D03008078&sec=1656608400&t=2fa7a10f21b5f54a2aefd0fde2db3bb9'
;
}
},
jsonParse
(
json
)
{
...
...
@@ -146,18 +146,19 @@ export default {
background
:
#F7F7F7
;
border-radius
:
10px
10px
0px
0px
;
overflow
:
auto
;
z-index
:
10078
!important
;
}
.order_flow
{
background
:
#FFFFFF
;
margin
:
32
rpx
;
padding-top
:
40
rpx
;
padding-bottom
:
25
rpx
;
padding-top
:
54
rpx
;
padding-bottom
:
60
rpx
;
.status_text
{
font-size
:
28
rpx
;
font-family
:
PingFangSC-Medium
,
PingFang
SC
;
font-weight
:
500
;
color
:
#
333333
;
color
:
#
666666
;
text-align
:
center
;
}
.code
{
...
...
@@ -180,7 +181,7 @@ export default {
height
:
347
rpx
;
width
:
353
rpx
;
display
:
block
;
margin
:
7
0
rpx
auto
;
margin
:
7
2
rpx
auto
;
position
:
relative
;
padding-bottom
:
40
rpx
;
margin-bottom
:
0
rpx
;
...
...
@@ -204,7 +205,6 @@ export default {
.flow_describe
{
width
:
100%
;
height
:
300
rpx
;
padding-top
:
48
rpx
;
padding-left
:
31
rpx
;
.title
{
...
...
@@ -215,7 +215,7 @@ export default {
}
.flow_img
{
padding
:
36
rpx
32
rpx
0
rpx
32
rpx
;
padding
:
18
rpx
32
rpx
0
rpx
32.83
rpx
;
width
:
590
rpx
;
height
:
244
rpx
;
display
:
block
;
...
...
@@ -227,14 +227,15 @@ export default {
margin-top
:
100
rpx
;
background
:
#FFFFFF
;
margin
:
32
rpx
;
padding
:
2
5
rpx
31
rpx
;
padding
:
2
6
rpx
32
rpx
32
rpx
24
rpx
;
.title{
font-size
:
28
rpx
;
font-family
:
PingFangSC-Medium
,
PingFang
SC
;
font-weight
:
500
;
color
:
#333333
;
padding-bottom
:
24
rpx
;
border-bottom
:
1px
solid
#ECECEC
;
border-bottom
:
2
rpx
solid
#ECECEC
;
letter-spacing
:
1
rpx
;
}
.text
{
margin-top
:
18
rpx
;
...
...
@@ -242,7 +243,7 @@ export default {
font-family
:
PingFangSC-Regular
,
PingFang
SC
;
font-weight
:
400
;
color
:
#999999
;
line-height
:
48
rpx
;
line-height
:
50
rpx
;
}
}
.customer_service
{
...
...
This diff is collapsed.
Click to expand it.
components/menuAssembly/index.vue
View file @
5e7d1237
...
...
@@ -33,7 +33,7 @@
<view
class=
"addbox"
>
<image
v-if=
"getSku(item).state==1"
@
click
.
stop=
"getallNum(item, category)"
class=
"add"
:src=
"'../../static/imgs/jiahao.png'"
/>
<!--
<u-icon
class=
"add"
name=
"plus-circle-fill"
color=
"#0050F6"
@
click
.
stop=
"getallNum(item, category)"
size=
"22"
></u-icon>
-->
<div
v-if=
"getSku(item).state!=1"
style=
"color: #858585;font-size: 20rpx;"
>
已售罄
</div>
<div
v-if=
"getSku(item).state!=1"
style=
"color: #858585;font-size: 20rpx;
margin-top:16rpx
"
>
已售罄
</div>
</view>
</view>
</view>
...
...
@@ -605,7 +605,7 @@ export default {
height
:
100%
;
width
:
4
rpx
;
position
:
absolute
;
right
:
0
rpx
;
right
:
5
rpx
;
box-sizing
:
border-box
;
top
:
0
;
background
:
#0050F6
;
...
...
This diff is collapsed.
Click to expand it.
components/shopCar/shopCar.vue
View file @
5e7d1237
...
...
@@ -29,7 +29,7 @@
</u-checkbox-group>
-->
<view>
<image
:src=
"item.pics.thumbnailApplet || item.pics.thumbnail"
style=
"width: 120rpx;height: 120rpx;margin-top: 4rpx"
></image>
style=
"width: 120rpx;height: 120rpx;margin-top: 4
.24
rpx"
></image>
</view>
</view>
<view
class=
"size"
>
...
...
@@ -41,7 +41,7 @@
</text>
</view>
<view
class=
"goods-price"
>
<text
class=
"price-discount"
>
¥
{{
Utils
.
isInteger
(
item
.
sku
.
discount
)
}}
</text>
<text
class=
"price-discount"
>
<text
class=
"moneyLog"
>
¥
</text>
{{
Utils
.
isInteger
(
item
.
sku
.
discount
)
}}
</text>
<text
class=
"price-x"
v-show=
"item.sku.price!=item.sku.discount"
>
¥
</text>
<text
class=
"price-xx"
v-show=
"item.sku.price!=item.sku.discount"
>
{{
Utils
.
isInteger
(
item
.
sku
.
price
)
}}
</text>
</view>
...
...
@@ -278,7 +278,7 @@ export default {
.header
{
padding
:
24.87
rpx
31.78
rpx
22.3
rpx
31.54
rpx
;
display
:
flex
;
border-bottom
:
1px
solid
#ECECEC
;
border-bottom
:
1
r
px
solid
#ECECEC
;
.left
{
flex
:
1
;
...
...
@@ -323,7 +323,7 @@ export default {
&-detail
{
display
:
flex
;
padding
:
30
rpx
2
6
rpx
30
rpx
32
rpx
;
padding
:
30
rpx
2
5.87
rpx
30
rpx
32
rpx
;
background-color
:
#fff
;
justify-content
:
space-between
;
align-items
:
center
;
...
...
@@ -386,7 +386,7 @@ export default {
.goods-price
{
margin-top
:
24
rpx
;
.
price-discount
{
.
moneyLog
{
height
:
38
rpx
;
font-size
:
24
rpx
;
font-family
:
Futura-Medium
,
Futura
;
...
...
@@ -394,8 +394,17 @@ export default {
color
:
#333333
;
line-height
:
30
rpx
;
}
.price-discount
{
height
:
38
rpx
;
font-size
:
28
rpx
;
font-family
:
Futura-Medium
,
Futura
;
font-weight
:
500
;
color
:
#333333
;
line-height
:
30
rpx
;
}
.price-x
{
margin-left
:
6
rpx
;
margin-left
:
4.2
rpx
;
font-size
:
20
rpx
;
font-family
:
ArialMT
;
line-height
:
22
rpx
;
...
...
@@ -435,14 +444,12 @@ export default {
}
.num
{
height
:
28
rpx
;
font-size
:
32
rpx
;
font-family
:
ArialMT
;
color
:
#000000
;
line-height
:
28
rpx
;
margin-left
:
26
rpx
;
margin-right
:
26
rpx
;
font-weight
:
bold
;
margin-right
:
22
rpx
;
}
.add
{
width
:
40
rpx
;
...
...
@@ -487,7 +494,7 @@ export default {
left
:
0
;
box-shadow
:
0px
-4px
8px
0px
rgba
(
102
,
102
,
102
,
0.1
);
display
:
flex
;
z-index
:
99999
;
z-index
:
10076
;
align-items
:
center
;
&-left
{
...
...
This diff is collapsed.
Click to expand it.
components/tabBar/tabBar.vue
View file @
5e7d1237
...
...
@@ -74,7 +74,7 @@
left
:
0
;
width
:
100%
;
height
:
100
rpx
;
z-index
:
99999
;
z-index
:
10076
;
background
:
#FFFFFF
;
border-top
:
2
rpx
solid
#FFFFFF
;
}
...
...
This diff is collapsed.
Click to expand it.
pages/menu/menu.vue
View file @
5e7d1237
...
...
@@ -451,7 +451,7 @@ export default {
justify-content
:
flex-start
;
.info
{
padding-left
:
34
rpx
;
padding-left
:
34
.48
rpx
;
.first
{
height
:
44
rpx
;
...
...
@@ -460,7 +460,7 @@ export default {
font-weight
:
600
;
color
:
#666666
;
line-height
:
44
rpx
;
margin-top
:
4
0
rpx
;
margin-top
:
4
4
rpx
;
.first-code{
font-family
:
Arial
,
Helvetica
SC
;
font-size
:
28
rpx
;
...
...
@@ -469,7 +469,7 @@ export default {
}
.second
{
margin-top
:
20
rpx
;
margin-top
:
12
rpx
;
width
:
400
rpx
;
font-size
:
24
rpx
;
font-family
:
PingFangSC-Regular
,
PingFang
SC
;
...
...
@@ -492,7 +492,7 @@ export default {
.line
{
width
:
4
rpx
;
height
:
104
rpx
;
border-right
:
2
rpx
solid
#f8f5f
8
;
border-right
:
1
rpx
solid
#E8E8E
8
;
position
:
absolute
;
left
:
510
rpx
;
box-shadow
:
-2px
-4px
8px
0px
rgba
(
102
,
102
,
102
,
0.1
);
...
...
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