Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mayi-mp-shop
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
程默
mayi-mp-shop
Commits
7ee03e06
Commit
7ee03e06
authored
Jun 13, 2023
by
hxx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付成功页面优化
parent
10b16f19
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
23 deletions
+48
-23
src/components/paySuccess/paySuccessInfo.vue
+40
-23
src/components/paySuccess/payWithGifts.vue
+8
-0
No files found.
src/components/paySuccess/paySuccessInfo.vue
View file @
7ee03e06
...
@@ -5,15 +5,15 @@
...
@@ -5,15 +5,15 @@
class=
"paySuccess_detail"
class=
"paySuccess_detail"
:style=
"
{ 'padding-top': paddingTop, 'padding-bottom': paddingBottom }"
:style=
"
{ 'padding-top': paddingTop, 'padding-bottom': paddingBottom }"
>
>
<div
class=
"iconPay"
:style=
"
{'width':imgSize,'height':imgSize}">
<div
class=
"iconPay"
:style=
"
{'width':imgSize,'height':imgSize}"
v-if="iconShow"
>
<image
mode=
"aspectFit"
:src=
"icon"
alt
></image>
<image
mode=
"aspectFit"
:src=
"icon"
alt
></image>
</div>
</div>
<!-- 企业要货开启了待审核 -->
<!-- 企业要货开启了待审核 -->
<template
v-if=
"whetherOpenEnterprisesWantGoods == 1 && whetherOpenApproval == 1"
>
<template
v-if=
"whetherOpenEnterprisesWantGoods == 1 && whetherOpenApproval == 1"
>
<p
class=
"success"
>
提交成功,等待审核
</p>
<p
class=
"success"
:style=
"
{ fontSize: payTitleSize, color: payTitleColor }"
>提交成功,等待审核
</p>
</
template
>
</
template
>
<
template
v-else
>
<
template
v-else
>
<p
class=
"success"
>
{{
payTitle
}}
</p>
<p
class=
"success"
:style=
"
{ fontSize: payTitleSize, color: payTitleColor }"
>
{{
payTitle
}}
</p>
<p
v-if=
"orderDetail.orderType == 5"
class=
"tips"
>
<p
v-if=
"orderDetail.orderType == 5"
class=
"tips"
>
您可在【我的】-【我的礼包】中进行送礼
您可在【我的】-【我的礼包】中进行送礼
</p>
</p>
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
亦可以直接点下面按钮【立即送出】
亦可以直接点下面按钮【立即送出】
</p>
</p>
<div
v-if=
"orderDetail.orderType == 5"
></div>
<div
v-if=
"orderDetail.orderType == 5"
></div>
<div
v-else
class=
"orderPrice"
v-html=
"subTitle"
>
<div
v-else
class=
"orderPrice"
:style=
"subTitleStyle"
v-html=
"subTitle"
>
订单金额:
订单金额:
<span
v-if=
"routeQuery.multiMerchantsFlag || routeQuery.accountBalanceFlag"
<span
v-if=
"routeQuery.multiMerchantsFlag || routeQuery.accountBalanceFlag"
>
¥
{{
routeQuery
.
totalMoney
}}
</span
>
¥
{{
routeQuery
.
totalMoney
}}
</span
...
@@ -45,14 +45,14 @@
...
@@ -45,14 +45,14 @@
v-if=
"routeQuery.multiMerchantsFlag"
v-if=
"routeQuery.multiMerchantsFlag"
@
click=
"toOrderList"
@
click=
"toOrderList"
>
>
<van-button
size=
"normal"
>
查看详情
</van-button>
<van-button
size=
"normal"
:style=
"btnStyle"
>
查看详情
</van-button>
</div>
</div>
<div
v-else
@
click=
"toOrderDetail"
>
<div
v-else
@
click=
"toOrderDetail"
:style=
"btnStyle"
>
<van-button
size=
"normal"
>
查看详情
</van-button>
<van-button
size=
"normal"
:style=
"btnStyle"
>
查看详情
</van-button>
</div>
</div>
</
template
>
</
template
>
<div
@
click=
"toIndex"
>
<div
@
click=
"toIndex"
:style=
"btnStyle"
>
<van-button
size=
"normal"
>
回首页
</van-button>
<van-button
size=
"normal"
:style=
"btnStyle"
>
返
回首页
</van-button>
</div>
</div>
</template>
</template>
</div>
</div>
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
<div
class=
"line"
v-if=
"orderDetail.orderType == 5"
></div>
<div
class=
"line"
v-if=
"orderDetail.orderType == 5"
></div>
<div
class=
"bottom_box"
v-if=
"orderDetail.orderType == 5"
>
<div
class=
"bottom_box"
v-if=
"orderDetail.orderType == 5"
>
<div
class=
"bottom_item"
@
click=
"toShare"
>
现在就分享
</div>
<div
class=
"bottom_item"
@
click=
"toShare"
>
现在就分享
</div>
<div
class=
"bottom_item bottom_last"
@
click=
"backTo"
>
回首页
</div>
<div
class=
"bottom_item bottom_last"
@
click=
"backTo"
>
返
回首页
</div>
</div>
</div>
</div>
</div>
</template>
</template>
...
@@ -173,9 +173,18 @@ export default {
...
@@ -173,9 +173,18 @@ export default {
icon
()
{
icon
()
{
return
this
.
datas
.
componentData
[
"icon"
]
||
'http://mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/png/83a4a0bc-37fc-411e-bc5c-6dd9c1b4a921.png'
;
return
this
.
datas
.
componentData
[
"icon"
]
||
'http://mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/png/83a4a0bc-37fc-411e-bc5c-6dd9c1b4a921.png'
;
},
},
iconShow
()
{
return
this
.
datas
.
componentData
[
"iconShow"
]
===
undefined
?
true
:
this
.
datas
.
componentData
[
"iconShow"
];
},
payTitle
()
{
payTitle
()
{
return
this
.
datas
.
componentData
[
"title"
];
return
this
.
datas
.
componentData
[
"title"
];
},
},
payTitleSize
()
{
return
(
this
.
datas
.
componentData
[
"titleSize"
]
||
16
)
+
'px'
;
},
payTitleColor
()
{
return
this
.
datas
.
componentData
[
"titleColor"
]
||
'#333'
;
},
subTitle
()
{
subTitle
()
{
let
totalMoney
=
0
;
let
totalMoney
=
0
;
if
(
this
.
routeQuery
.
multiMerchantsFlag
)
{
if
(
this
.
routeQuery
.
multiMerchantsFlag
)
{
...
@@ -202,6 +211,12 @@ export default {
...
@@ -202,6 +211,12 @@ export default {
});
});
return
subTitle
;
return
subTitle
;
},
},
subTitleStyle
()
{
return
{
color
:
this
.
datas
.
componentData
[
"subTitleColor"
]
||
'#333'
,
fontSize
:
(
this
.
datas
.
componentData
[
'subTitleSize'
]
||
40
)
+
'px'
}
},
paddingTop
()
{
paddingTop
()
{
return
this
.
datas
.
componentData
[
"paddingTop"
]
+
"px"
;
return
this
.
datas
.
componentData
[
"paddingTop"
]
+
"px"
;
},
},
...
@@ -216,6 +231,13 @@ export default {
...
@@ -216,6 +231,13 @@ export default {
},
},
orderSns
()
{
orderSns
()
{
return
this
.
render
?
this
.
routeQuery
.
orderSns
:
'----------'
return
this
.
render
?
this
.
routeQuery
.
orderSns
:
'----------'
},
btnStyle
()
{
return
{
color
:
this
.
datas
.
componentData
[
"btnColor"
]
||
'rgba(0, 0, 0, 0.4)'
,
backgroundColor
:
this
.
datas
.
componentData
[
"btnBackgroundColor"
]
||
'rgba(0, 0, 0, 0)'
,
'border-radius'
:
(
this
.
datas
.
componentData
[
"btnBorderRadius"
]
||
25
)
+
'px'
}
}
}
},
},
onLoad
()
{
onLoad
()
{
...
@@ -404,7 +426,7 @@ export default {
...
@@ -404,7 +426,7 @@ export default {
line-height
:
20px
;
line-height
:
20px
;
font-size
:
18px
;
font-size
:
18px
;
font-family
:
MicrosoftYaHei
;
font-family
:
MicrosoftYaHei
;
font-weight
:
4
00
;
font-weight
:
6
00
;
color
:
#191919
;
color
:
#191919
;
}
}
.tips
{
.tips
{
...
@@ -415,11 +437,7 @@ export default {
...
@@ -415,11 +437,7 @@ export default {
.orderPrice
{
.orderPrice
{
text-align
:
center
;
text-align
:
center
;
margin
:
10px
;
margin
:
10px
;
font-size
:
14px
;
font-weight
:
500
;
span
{
font-size
:
18px
;
color
:
#666
;
}
}
}
.price
{
.price
{
width
:
116px
;
width
:
116px
;
...
@@ -447,14 +465,13 @@ export default {
...
@@ -447,14 +465,13 @@ export default {
}
}
.bottom
{
.bottom
{
margin-top
:
10px
;
margin-top
:
10px
;
justify-content
:
space-between
;
justify-content
:
center
;
gap
:
20px
;
/deep/.van-button
{
/deep/.van-button
{
width
:
140px
;
height
:
auto
;
height
:
35px
;
line-height
:
normal
;
color
:
#929292
;
padding
:
6px
24px
;
line-height
:
35px
;
border
:
1px
solid
;
border-radius
:
4px
;
border
:
1px
solid
rgba
(
146
,
146
,
146
,
1
);
}
}
.toShare
{
.toShare
{
background
:
var
(
--main-color
);
background
:
var
(
--main-color
);
...
...
src/components/paySuccess/payWithGifts.vue
View file @
7ee03e06
<
template
>
<
template
>
<div
v-if=
"isShowIntegral || isShowGifts"
:style=
"
{ 'padding-top': paddingTop, 'padding-bottom': paddingBottom }">
<div
v-if=
"isShowIntegral || isShowGifts"
:style=
"
{ 'padding-top': paddingTop, 'padding-bottom': paddingBottom }">
<div
class=
"title"
>
恭喜你获得
</div>
<div
class=
"pay-with-gifts__wrapper"
>
<div
class=
"pay-with-gifts__wrapper"
>
<template
v-if=
"isShowGifts"
>
<template
v-if=
"isShowGifts"
>
<!-- 推广类型: (0: 送优惠券 1: 抽奖大转盘 2: 优惠码) -->
<!-- 推广类型: (0: 送优惠券 1: 抽奖大转盘 2: 优惠码) -->
...
@@ -152,6 +153,13 @@
...
@@ -152,6 +153,13 @@
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.title
{
color
:
#666
;
font-size
:
13px
;
padding
:
8px
;
text-align
:
center
;
}
.pay-with-gifts__wrapper
{
.pay-with-gifts__wrapper
{
padding
:
0
12px
;
padding
:
0
12px
;
...
...
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