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
bf579af6
Commit
bf579af6
authored
Sep 02, 2022
by
宋冰琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复部分bug
parent
2a0b6748
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
9 deletions
+15
-9
components/Ticket/index.vue
+8
-4
components/shopCar/shopCar.vue
+3
-3
orderSubPackage/pages/orderInfo/index.vue
+1
-1
pages/menu/menu.vue
+2
-0
pages/mine/mine.vue
+1
-1
No files found.
components/Ticket/index.vue
View file @
bf579af6
...
@@ -254,9 +254,7 @@ export default {
...
@@ -254,9 +254,7 @@ export default {
display
:
flex
;
display
:
flex
;
align-items
:
flex-end
;
align-items
:
flex-end
;
justify-content
:
center
;
justify-content
:
center
;
.dkStyle
{
font-size
:
48
rpx
;
}
.dw
{
.dw
{
height
:
40
rpx
;
height
:
40
rpx
;
font-size
:
24
rpx
;
font-size
:
24
rpx
;
...
@@ -266,6 +264,11 @@ export default {
...
@@ -266,6 +264,11 @@ export default {
line-height
:
30
rpx
;
line-height
:
30
rpx
;
}
}
}
}
.dkStyle
{
font-size
:
48
rpx
;
margin-top
:
-5
rpx
;
}
}
}
.price_desc
{
.price_desc
{
height
:
28
rpx
;
height
:
28
rpx
;
...
@@ -275,6 +278,7 @@ export default {
...
@@ -275,6 +278,7 @@ export default {
color
:
var
(
color
);
color
:
var
(
color
);
line-height
:
28
rpx
;
line-height
:
28
rpx
;
width
:
178
rpx
;
width
:
178
rpx
;
margin-top
:
2
rpx
;
text-align
:
center
;
text-align
:
center
;
}
}
}
}
...
@@ -360,7 +364,7 @@ export default {
...
@@ -360,7 +364,7 @@ export default {
margin-right
:
32
rpx
;
margin-right
:
32
rpx
;
.more_info
{
.more_info
{
padding-bottom
:
8
rpx
;
padding-bottom
:
8
rpx
;
padding-top
:
8
rpx
;
padding-top
:
10
rpx
;
display
:
flex
;
display
:
flex
;
justify-content
:
flex-start
;
justify-content
:
flex-start
;
align-items
:
center
;
align-items
:
center
;
...
...
components/shopCar/shopCar.vue
View file @
bf579af6
...
@@ -124,9 +124,9 @@ export default {
...
@@ -124,9 +124,9 @@ export default {
this
.
animation
=
uni
.
createAnimation
()
this
.
animation
=
uni
.
createAnimation
()
this
.
BottomSafeHeight
=
uni
.
getStorageSync
(
'BottomSafeHeight'
)
||
50
this
.
BottomSafeHeight
=
uni
.
getStorageSync
(
'BottomSafeHeight'
)
||
50
console
.
log
(
this
.
BottomSafeHeight
,
'this.BottomSafeHeight'
)
console
.
log
(
this
.
BottomSafeHeight
,
'this.BottomSafeHeight'
)
this
.
bottomPadding
=
20
5
this
.
bottomPadding
=
20
4
this
.
shopCar
=
uni
.
getStorageSync
(
'shopCar'
)
+
4
this
.
shopCar
=
uni
.
getStorageSync
(
'shopCar'
)
+
5
if
(
!
this
.
userms
){
if
(
!
this
.
userms
){
User
.
wxLoginAndGetOpenid
(
true
).
then
(
loginInfo
=>
{
User
.
wxLoginAndGetOpenid
(
true
).
then
(
loginInfo
=>
{
this
.
loginInfo
=
loginInfo
this
.
loginInfo
=
loginInfo
...
@@ -598,7 +598,7 @@ export default {
...
@@ -598,7 +598,7 @@ export default {
font-family
:
Futura-Medium
,
Futura
;
font-family
:
Futura-Medium
,
Futura
;
background
:
#FF63BA
;
background
:
#FF63BA
;
right
:
-22
rpx
;
right
:
-22
rpx
;
top
:
-
6
rpx
;
top
:
-
8
rpx
;
min-width
:
32
rpx
;
min-width
:
32
rpx
;
font-weight
:
500
;
font-weight
:
500
;
font-size
:
20
rpx
;
font-size
:
20
rpx
;
...
...
orderSubPackage/pages/orderInfo/index.vue
View file @
bf579af6
...
@@ -246,13 +246,13 @@ export default {
...
@@ -246,13 +246,13 @@ export default {
// 从订阅消息进入
// 从订阅消息进入
let
Authorization
=
uni
.
getStorageSync
(
'Authorization'
)
let
Authorization
=
uni
.
getStorageSync
(
'Authorization'
)
if
(
orderId
){
if
(
orderId
){
uni
.
setStorageSync
(
"updataShopCar"
,
false
)
if
(
!
Authorization
){
if
(
!
Authorization
){
this
.
backFlag
=
true
this
.
backFlag
=
true
uni
.
switchTab
({
url
:
'/pages/order/order'
})
uni
.
switchTab
({
url
:
'/pages/order/order'
})
return
return
}
else
{
}
else
{
this
.
backFlag
=
false
this
.
backFlag
=
false
this
.
backToMneu
=
true
oId
=
orderId
oId
=
orderId
}
}
}
}
...
...
pages/menu/menu.vue
View file @
bf579af6
...
@@ -203,9 +203,11 @@ export default {
...
@@ -203,9 +203,11 @@ export default {
$EventBus
.
$on
(
'getMenuList'
,
(
data
)
=>
{
$EventBus
.
$on
(
'getMenuList'
,
(
data
)
=>
{
if
(
this
.
shopInfo
&&
this
.
shopInfo
.
id
!=
data
.
id
)
{
if
(
this
.
shopInfo
&&
this
.
shopInfo
.
id
!=
data
.
id
)
{
// 切换店铺清空购物车
// 切换店铺清空购物车
if
(
this
.
shopInfo
.
id
){
uni
.
removeStorageSync
(
'shopCarInfo'
);
uni
.
removeStorageSync
(
'shopCarInfo'
);
$EventBus
.
$emit
(
'updateCar'
);
$EventBus
.
$emit
(
'updateCar'
);
}
}
}
this
.
shopInfo
=
data
;
this
.
shopInfo
=
data
;
uni
.
setStorageSync
(
"shopInfo"
,
JSON
.
stringify
(
this
.
shopInfo
))
uni
.
setStorageSync
(
"shopInfo"
,
JSON
.
stringify
(
this
.
shopInfo
))
this
.
getMenuList
(
data
.
id
);
this
.
getMenuList
(
data
.
id
);
...
...
pages/mine/mine.vue
View file @
bf579af6
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
<view
class=
"box"
@
click
.
stop=
"goToPage('coupon')"
>
<view
class=
"box"
@
click
.
stop=
"goToPage('coupon')"
>
<view
class=
"left"
>
<view
class=
"left"
>
<view
class=
"text"
>
HOOLOO券
</view>
<view
class=
"text"
>
HOOLOO券
</view>
<view
class=
"tickNum"
v-if=
"tickNum"
>
{{
tickNum
}}
张可用
</view>
<view
class=
"tickNum"
v-if=
"tickNum"
>
<span
:style=
"
{'color':'#FA5151'}">
{{
tickNum
}}
</span>
张可用
</view>
</view>
</view>
<view
class=
"right"
><image
class=
"icon"
src=
"/static/imgs/youhuijuan.png"
></image></view>
<view
class=
"right"
><image
class=
"icon"
src=
"/static/imgs/youhuijuan.png"
></image></view>
</view>
</view>
...
...
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