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
5deb34a1
Commit
5deb34a1
authored
Sep 20, 2022
by
宋冰琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复部分bug
parent
798eca9e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
15 deletions
+32
-15
orderSubPackage/pages/orderInfo/index.vue
+16
-12
pages/menu/menu.vue
+14
-3
pages/order/order.vue
+1
-0
request/order/index.js
+1
-0
No files found.
orderSubPackage/pages/orderInfo/index.vue
View file @
5deb34a1
...
...
@@ -267,16 +267,16 @@ export default {
this
.
waitTime
=
data
?.
data
}
if
(
isBuild
)
{
new
QRCode
(
'myQrcode'
,
{
text
:
this
.
orderInfo
.
pickCode
+
'###'
,
width
:
141
,
//canvas 画布的宽
height
:
141
,
//canvas 画布的高
padding
:
0
,
// 生成二维码四周自动留边宽度,不传入默认为0
correctLevel
:
QRCode
.
CorrectLevel
.
L
,
// 二维码可辨识度
callback
:
(
res
)
=>
{
this
.
ewmImg
=
res
.
path
}
})
//
new QRCode('myQrcode', {
//
text: this.orderInfo.pickCode+'###',
//
width: 141, //canvas 画布的宽
//
height: 141, //canvas 画布的高
//
padding: 0, // 生成二维码四周自动留边宽度,不传入默认为0
//
correctLevel: QRCode.CorrectLevel.L, // 二维码可辨识度
//
callback: (res) => {
this
.
ewmImg
=
this
.
orderInfo
.
pickCode
//
}
//
})
}
this
.
isBuild
=
isBuild
},
...
...
@@ -507,6 +507,7 @@ export default {
font-family
:
PingFangSC-Semibold
,
PingFang
SC
;
font-weight
:
600
;
color
:
#333333
;
z-index
:
99
}
.status_text
{
...
...
@@ -547,9 +548,12 @@ export default {
margin-top
:
38
rpx
;
margin-bottom
:
37
rpx
;
height
:
476
rpx
;
overflow
:
hidden
;
image{
width
:
100%
;
height
:
100%
;
width
:
130%
;
height
:
130%
;
margin-left
:
-34px
;
margin-top
:
-34px
;
vertical-align
:
bottom
;
}
}
...
...
pages/menu/menu.vue
View file @
5deb34a1
...
...
@@ -18,10 +18,10 @@
</view>
<view
class=
"user-info"
@
click=
"goToMyPage(userms)"
>
<view
class=
"user-infocontent"
>
<view
class=
"user-name"
v-if=
"userms"
>
H
I
!
{{
userInfo
.
customerName
||
'我是谁'
}}
</view>
<view
class=
"user-name"
v-if=
"userms"
>
H
i
!
{{
userInfo
.
customerName
||
'我是谁'
}}
</view>
<view
class=
"user-name"
v-else
>
未登录
</view>
<view
class=
"dialog"
>
<view
class=
"content"
v-if=
"userms"
>
希望你今天,明天,天天都开心~
</view>
<view
class=
"content"
v-if=
"userms"
>
{{
dayTitle
}}
</view>
<view
class=
"content"
v-if=
"!userms"
>
请您尽快登录~
</view>
</view>
</view>
...
...
@@ -86,7 +86,8 @@ export default {
customerName
:
''
,
loginInfo
:
""
,
img
:
''
,
isInRange
:
true
isInRange
:
true
,
dayTitle
:
''
};
},
computed
:
{
...
...
@@ -193,6 +194,16 @@ export default {
return
this
.
getShareData
();
},
async
onShow
()
{
const
dayTitleList
=
[
'呼噜咖啡,用对待人生的态度,做一杯专业好咖啡~'
,
'随手一杯好咖啡,希望你今天,明天,天天都开心~'
,
'咖啡哪有打工苦,喝完这杯再上班~'
,
'今天不听大道理,只喝专业好咖啡~'
,
'来杯美式,少点破事~'
,
'用咖啡拯救疲惫的灵魂~'
,
'呼噜咖啡由37%的咖啡加63%的生活构成~'
]
this
.
dayTitle
=
dayTitleList
[
new
Date
().
getDay
()]
uni
.
setStorageSync
(
"selectFlag"
,
false
)
const
updataLoactionFlag
=
uni
.
getStorageSync
(
"updataLoadtion"
)
if
(
updataLoactionFlag
)
{
...
...
pages/order/order.vue
View file @
5deb34a1
...
...
@@ -216,6 +216,7 @@ export default {
orderId
:
id
,
...
orderInfo
.
data
.
data
}
console
.
log
(
orderInfo
,
'orderInfo'
)
if
(
orderInfo
)
{
if
(
orderInfo
&&
orderInfo
.
data
.
code
==
200
)
{
await
Menu
.
requestPayment
(
sendData
);
...
...
request/order/index.js
View file @
5deb34a1
...
...
@@ -56,6 +56,7 @@ export default {
},
// 立即支付
payOrder
(
params
)
{
console
.
log
(
params
,
'params'
)
return
uni
.
$u
.
http
.
get
(
'order/payOrder'
,
{
params
,
...
...
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