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
8bd32014
Commit
8bd32014
authored
May 16, 2023
by
HouTiZhuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付优化
parent
a655f396
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
51 deletions
+1
-51
config/xhyx_uat.env.js
+1
-1
src/pages/paySuccess/index.vue
+0
-50
No files found.
config/xhyx_uat.env.js
View file @
8bd32014
...
...
@@ -16,7 +16,7 @@ module.exports = merge(prodEnv, {//zjgyl
// BASE_URL:"'https://shop.mayi888.com'",
// BASE_URL:"'http://192.168.1.146:3005'",
// BASE_URL:"'http://172.16.1.18:3000'",
BASE_URL
:
"'http
://192.168.18.176:3000
'"
,
BASE_URL
:
"'http
s://uat-m.xinhuabest.com
'"
,
ADMIN_URL
:
"'http://uat.admin.xinhuabest.com'"
,
GUIDE_URL
:
"'http://uat.guide.xinhuabest.com'"
,
// BASE_URL:"'http://192.168.137.1:3004'",
...
...
src/pages/paySuccess/index.vue
View file @
8bd32014
...
...
@@ -331,11 +331,6 @@ export default {
}
});
this
.
orderDetail
=
res
.
data
;
if
(
this
.
orderDetail
.
orderType
==
5
)
{
this
.
initWxShare
();
}
this
.
totalMoney
=
Number
(
res
.
data
.
totalAmountPayable
).
toFixed
(
2
);
console
.
log
(
Number
(
res
.
data
.
totalAmountPayable
).
toFixed
(
2
),
'--Number(res.data.totalAmountPayable).toFixed(2)'
)
this
.
inviteelShow
=
true
;
...
...
@@ -394,51 +389,6 @@ export default {
closeHandle
(){
this
.
showReceiveCard
=
false
;
},
async
initWxShare
()
{
return
let
this_
=
this
;
console
.
log
(
this
.
$store
.
state
.
spokemanInfo
,
'分销员信息---====='
);
let
spokesmanRelId
;
let
spokesmanGroupId
;
let
spokesmanShopId
let
spokemanInfo
=
this
.
$store
.
state
.
spokemanInfo
;
if
(
spokemanInfo
)
{
if
(
spokemanInfo
.
hasInvitationStatus
==
1
)
{
spokesmanRelId
=
spokemanInfo
.
spokesmanId
;
spokesmanGroupId
=
spokemanInfo
.
groupId
;
spokesmanShopId
=
spokemanInfo
.
shopId
;
}
}
console
.
log
(
spokesmanRelId
,
'分销员信息---====='
,
spokesmanGroupId
,
spokesmanShopId
);
let
newWindowHref
=
''
;
if
(
getTokenmu
()
&&
spokesmanRelId
){
newWindowHref
=
`
${
process
.
env
.
BASE_URL
}
/activty/receivingGift?mixid=
${
this
.
$route
.
query
.
mixid
}
&orderId=
${
this
.
orderDetail
.
orderId
}
&spokesmanGroupId=
${
spokesmanGroupId
}
&spokesmanShopId=
${
spokesmanShopId
}
&spokesmanRelId=
${
spokesmanRelId
}
&userId=
${
getTokenmu
()}
`
;
}
else
{
newWindowHref
=
`
${
process
.
env
.
BASE_URL
}
/activty/receivingGift?mixid=
${
this
.
$route
.
query
.
mixid
}
&orderId=
${
this
.
orderDetail
.
orderId
}
&userId=
${
getTokenmu
()}
`
;
}
let
shareImgUrl
=
DFSImg
(
this
.
orderDetail
.
noShipmentOrderItems
[
0
].
specificationPictureUrl
,
500
,
400
);
let
orgName
=
this
.
orderDetail
.
orgName
;
let
shareData
=
""
;
await
shop
.
indexWxShare
({
storeRouterUrl
:
'/activty/receivingGift'
}).
then
(
res
=>
{
if
(
res
.
code
==
200
){
shareData
=
res
.
data
}
})
let
shareText
=
shareData
&&
shareData
.
shareText
?
shareData
.
shareText
:
'我选了一份小礼物送你,赶紧收下吧!免费的哦~'
;
this
.
$customShare
.
customShare
(
shareText
,
newWindowHref
,
''
,
DFSImg
(
'https://mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/png/b9f3fdd1-513f-46df-aed2-7f42330beaca.png'
,
500
,
460
),
this
.
$store
.
state
.
wechatSignUrl
)
},
init
()
{
console
.
log
(
"----------------------207"
);
this
.
setVisible
(
this
.
mpApp
.
globalData
.
pageList
,
(
res
)
=>
{
...
...
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