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
eeeef0f4
Commit
eeeef0f4
authored
Aug 05, 2022
by
李嘉林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
电子卡券支付成功原生页
parent
414d762f
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
449 additions
and
3 deletions
+449
-3
config/dev.env.js
+1
-0
config/prod.env.js
+1
-0
src/api/order.js
+4
-0
src/components/paySuccess/PayElectronCard.vue
+397
-0
src/pages/paySuccess/index.vue
+46
-3
No files found.
config/dev.env.js
View file @
eeeef0f4
...
...
@@ -18,6 +18,7 @@ module.exports = merge(prodEnv, {//zjgyl
// BASE_URL:"'http://172.16.1.18:3000'",
BASE_URL
:
"'https://test-m-shop.mayi888.cn'"
,
ADMIN_URL
:
"'https://test-ant.mayi888.cn'"
,
GUIDE_URL
:
"'https://guide-m.mayi888.cn'"
,
// BASE_URL:"'http://192.168.137.1:3004'",
OLSHOP_URL
:
'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"'
,
...
...
config/prod.env.js
View file @
eeeef0f4
...
...
@@ -3,6 +3,7 @@ module.exports = {
SHOP_MIXID
:
"'ant'"
,
NODE_ENV
:
'"production"'
,
BASE_URL
:
"'https://shop.mayi888.com'"
,
GUIDE_URL
:
"'https://m-guide.mayi888.com'"
,
ADMIN_URL
:
"'https://admin.mayi888.com'"
,
OLSHOP_URL
:
'"https://shop.mayi888.com/innerApi/shopApiService"'
,
...
...
src/api/order.js
View file @
eeeef0f4
...
...
@@ -13,4 +13,8 @@ export default {
orderDetail
(
data
)
{
return
requestPOST
(
`
${
process
.
env
.
OLSHOP_URL
}
/order/detail?orderSn=
${
data
.
orderSn
}
`
)
},
//获取电子卡券订单卡券
getElectronicCardRedeemCode
(
data
){
return
requestGET
(
`
${
process
.
env
.
OLSHOP_URL
}
/order/getElectronicCardRedeemCode?orderSn=
${
data
}
`
)
}
}
src/components/paySuccess/PayElectronCard.vue
0 → 100644
View file @
eeeef0f4
This diff is collapsed.
Click to expand it.
src/pages/paySuccess/index.vue
View file @
eeeef0f4
<
template
>
<!-- 支付成功页 -->
<div
class=
"paySuccess"
v-
show=
"showPage
"
>
<div
class=
"paySuccess"
v-
if=
"showPage"
:style=
"
{'--main-color':themeColor['--main-color'],'--minor-color':themeColor['--minor-color']}
">
<ThemeDataPlant
:pageCode=
"11"
></ThemeDataPlant>
<PayElectronCard
v-if=
"orderDetail.orderType==15"
:orderDetail=
"orderDetail"
></PayElectronCard>
<div
v-else
>
<div
style=
"margin-top: 60px;"
></div>
<div
v-for=
"(item, index) in pageData"
:key=
"index"
>
<!-- 其他组件 -->
...
...
@@ -45,6 +47,7 @@
:totalMoney=
"totalMoney"
/>
</div>
</div>
<!-- 分销员弹框入口 -->
<van-popup
class=
"spokemanEntry"
...
...
@@ -76,9 +79,10 @@ import order from "@/api/order";
import
spokesman
from
"@/api/spokesman"
;
import
{
getMiniProgram
,
query_isEntry
}
from
"@/utils/mayi_fenxiao"
;
import
{
serialize
}
from
"@/utils/index"
;
import
{
checkTabbarPage
,
checkShowConditionIds
}
from
"@/utils/mayi"
;
import
{
checkTabbarPage
,
checkShowConditionIds
,
themeColor
}
from
"@/utils/mayi"
;
import
ThemeDataPlant
from
"../../components/ThemeDataPlant"
;
import
paySuccessInfo
from
"../../components/paySuccess/paySuccessInfo"
;
import
PayElectronCard
from
"../../components/paySuccess/PayElectronCard"
;
import
text
from
"@/components/content/text"
;
import
richText
from
"../../components/basicTool/rich-text"
;
import
interval
from
"@/components/basicTool/interval/index.vue"
;
...
...
@@ -112,6 +116,12 @@ export default {
pageInfo
:
{},
pageData
:
{},
showPage
:
false
,
systemInfo
:
{},
tabbarHeight
:
0
,
themeColor
:{
'--main-color'
:
""
,
'--minor-color'
:
""
,
},
};
},
components
:
{
...
...
@@ -121,6 +131,7 @@ export default {
interval
,
partition
,
paySuccessInfo
,
PayElectronCard
},
computed
:
{},
onLoad
(
options
)
{
...
...
@@ -142,6 +153,19 @@ export default {
that
.
init
(
params
);
};
}
this
.
systemInfo
=
wx
.
getSystemInfoSync
()
console
.
log
(
this
.
systemInfo
,
'-----------systemInfo'
)
let
menuButtonInfo
=
wx
.
getMenuButtonBoundingClientRect
()
console
.
log
(
menuButtonInfo
,
'menuButtonInfo'
)
this
.
tabbarHeight
=
(
menuButtonInfo
.
top
-
this
.
systemInfo
.
statusBarHeight
)
*
2
+
menuButtonInfo
.
height
+
this
.
systemInfo
.
statusBarHeight
console
.
log
(
this
.
tabbarHeight
,
'-----------tabbarHeight'
)
if
(
themeColor
[
'--main-color'
]
!=
'#ffffff'
){
this
.
themeColor
=
themeColor
}
else
{
this
.
mpApp
.
themeColorCallBack
=
(
res
)
=>
{
this
.
themeColor
=
res
}
}
},
onShow
()
{
console
.
log
(
"--paySuccess-onShow"
);
...
...
@@ -161,6 +185,7 @@ export default {
this
.
title
=
"拼团详情"
}
else
{
this
.
title
=
"支付成功"
this
.
showPage
=
true
;
}
this
.
splitStatus
=
res
.
data
.
splitStatus
;
this
.
orderId
=
res
.
data
.
orderId
;
...
...
@@ -169,7 +194,6 @@ export default {
this
.
goodsId
=
res
.
data
.
noShipmentOrderItems
[
0
].
terminalProductGoodsId
;
}
this
.
showPage
=
true
;
//查询是否是分销员
getMiniProgram
().
then
(
res1
=>
{
...
...
@@ -443,6 +467,25 @@ export default {
<
style
lang=
"scss"
scoped
>
.paySuccess
{
position
:
relative
;
width
:
100vw
;
height
:
100vh
;
overflow-y
:
auto
;
.tabbar{
position
:
sticky
;
top
:
0
;
z-index
:
9999
;
width
:
100%
;
box-sizing
:
border-box
;
display
:
flex
;
align-items
:
center
;
padding-left
:
12px
;
.tab-back{
/deep/.van-icon-arrow-left{
font-size
:
22px
;
}
}
}
}
.spokemanEntry
{
/deep/.van-popup{
...
...
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