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
9995ec5b
Commit
9995ec5b
authored
Aug 20, 2022
by
songbingqi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复我的页面优惠券列表ios异常问题
parent
bc52288d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
9 deletions
+34
-9
components/Ticket/index.vue
+4
-1
mineSubPackage/pages/coupon/index.vue
+15
-2
orderSubPackage/pages/orderInfo/index.vue
+12
-4
orderSubPackage/pages/settlement/index.vue
+3
-2
No files found.
components/Ticket/index.vue
View file @
9995ec5b
<
template
>
<view
class=
"all"
>
<view
class=
"all"
:key=
"KEYindex"
>
<view
class=
"part"
:style=
"
{'margin-bottom':indexValue?'200rpx':'0rpx'}">
<view
class=
"partOne"
>
<view
class=
"one_left"
>
...
...
@@ -68,6 +68,7 @@
export
default
{
props
:{
indexValue
:[
Boolean
],
KEYindex
:[
Number
],
type
:{
type
:
String
,
default
(){
...
...
@@ -285,6 +286,7 @@ export default {
background
:
#0050F6
;
border-radius
:
2
rpx
;
font-size
:
24
rpx
;
z-index
:
999
;
font-family
:
PingFangSC-Regular
,
PingFang
SC
;
font-weight
:
400
;
color
:
#FFFFFF
;
...
...
@@ -296,6 +298,7 @@ export default {
background
:
#999999
;
border-radius
:
2
rpx
;
font-size
:
24
rpx
;
z-index
:
999
;
font-family
:
PingFangSC-Regular
,
PingFang
SC
;
font-weight
:
400
;
color
:
#FFFFFF
;
...
...
mineSubPackage/pages/coupon/index.vue
View file @
9995ec5b
...
...
@@ -5,7 +5,9 @@
<swiper
:current=
"current"
class=
"swiper"
@
change=
"swiperChange"
>
<swiper-item>
<view
class=
"list"
v-if=
"canuse.length!=0"
>
<scroll-view
class=
"A"
scroll-y
>
<Ticket
v-for=
"(item,index) in canuse"
:key=
"index"
:info=
"item"
/>
</scroll-view>
</view>
<view
class=
"emty"
v-else
>
<view
class=
"text"
>
暂无可用优惠券
</view>
...
...
@@ -13,7 +15,9 @@
</swiper-item>
<swiper-item>
<view
class=
"list"
v-if=
"cantuse.length!=0"
>
<scroll-view
class=
"B"
scroll-y
>
<Ticket
v-for=
"(item,index) in cantuse"
:key=
"index"
:info=
"item"
/>
</scroll-view>
</view>
<view
class=
"emty"
v-else
>
<view
class=
"text"
>
暂无可用优惠券
</view>
...
...
@@ -111,11 +115,20 @@ export default {
.bigBox
{
.swiper
{
background
:
#F8F8F8
;
height
:
calc
(
100vh
-
64
rpx
);
height
:
calc
(
100vh
-
90
rpx
);
.list{
.A
{
max-height
:
calc
(
100vh
-
90
rpx
);
overflow-y
:
scroll
;
}
.B
{
max-height
:
calc
(
100vh
-
90
rpx
);
overflow-y
:
scroll
;
}
height
:
100
%;
padding
:
0rpx
32rpx
;
overflow-y
:
scroll
;
padding-bottom
:
32rpx
;
}
.emty
{
.text{
...
...
orderSubPackage/pages/orderInfo/index.vue
View file @
9995ec5b
...
...
@@ -136,8 +136,12 @@ import { $EventBus } from "@/utils/EventBus";
export
default
{
mixins
:
[
systemInfo
],
onLoad
(
option
)
{
this
.
Authorization
=
uni
.
getStorageSync
(
'Authorization'
)
this
.
initData
(
option
)
},
onShow
()
{
this
.
backToMneu
=
false
},
onUnload
(){
this
.
goBack
()
},
...
...
@@ -149,7 +153,8 @@ export default {
isBuild
:
true
,
waitTime
:
0
,
backFlag
:
false
,
backToMneu
:
false
backToMneu
:
false
,
Authorization
:
''
}
},
methods
:
{
...
...
@@ -179,6 +184,7 @@ export default {
this
.
goBack
()
},
goBack
(){
console
.
log
(
this
.
backToMneu
,
'backToMneu'
)
if
(
this
.
backFlag
){
if
(
this
.
backToMneu
){
uni
.
switchTab
({
url
:
'/pages/menu/menu'
})
...
...
@@ -230,16 +236,18 @@ export default {
this
.
option
=
JSON
.
stringify
(
option
)
const
{
orderId
=
''
,
from
=
''
}
=
option
// 从结算进入
console
.
log
(
from
)
if
(
from
===
'settlement'
){
this
.
backToMneu
=
true
}
// 从订阅消息进入
let
Authorization
=
uni
.
getStorageSync
(
'Authorization'
)
console
.
log
(
this
.
userms
,
'userms'
)
console
.
log
(
this
.
Authorization
,
'Authorization'
)
if
(
orderId
){
console
.
log
(
!
Authorization
,
Authorization
)
if
(
!
Authorization
){
if
(
!
this
.
userms
&&!
this
.
Authorization
){
this
.
backFlag
=
true
this
.
goBack
(
)
uni
.
switchTab
({
url
:
'/pages/order/order'
}
)
return
}
else
{
this
.
backFlag
=
false
...
...
orderSubPackage/pages/settlement/index.vue
View file @
9995ec5b
...
...
@@ -120,8 +120,9 @@ import User from '@/request/user'
import
Order
from
'@/request/order'
export
default
{
onShow
()
{
console
.
log
(
'show'
)
if
(
this
.
goods
)
{
this
.
goods
=
uni
.
getStorageSync
(
'goodsList'
)
||
[];
console
.
log
(
'show'
,
this
.
goods
)
if
(
JSON
.
stringify
(
this
.
goods
)
!=
"{}"
)
{
Order
.
getWaitTine
({
shopId
:
uni
.
getStorageSync
(
'shopData'
).
id
,
goods
:
this
.
goods
...
...
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