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
44e1e34f
Commit
44e1e34f
authored
Jul 02, 2021
by
李嘉林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新人有礼
parent
b6f89e7a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
src/components/newCustomer/newPolite.vue
+2
-4
src/pages/home/index.vue
+5
-5
src/pages/login/index.vue
+4
-2
No files found.
src/components/newCustomer/newPolite.vue
View file @
44e1e34f
...
@@ -121,12 +121,10 @@ export default {
...
@@ -121,12 +121,10 @@ export default {
},
1000
);
},
1000
);
},
},
toEnvPage
()
{
toEnvPage
()
{
let
backUrl
=
`/home/main`
;
let
backUrl
=
`/
pages/
home/main`
;
const
url
=
`/pages/login/main?back=
${
encodeURIComponent
(
const
url
=
`/pages/login/main?back=
${
encodeURIComponent
(
backUrl
backUrl
)}
¶ms=
${
JSON
.
stringify
({
)}
`
;
fromType
:
"mini"
})}
`
;
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
url
url
:
url
});
});
...
...
src/pages/home/index.vue
View file @
44e1e34f
...
@@ -569,15 +569,15 @@ export default {
...
@@ -569,15 +569,15 @@ export default {
this
.
timer
=
setInterval
(()
=>
{
this
.
timer
=
setInterval
(()
=>
{
// 查询我领取的新客礼品
// 查询我领取的新客礼品
promote
.
query_my_new_customer_gift
().
then
((
res
)
=>
{
promote
.
query_my_new_customer_gift
().
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
// data为null就是没有查询到我领取的优惠券,就再调一次领取优惠券接口手动领取下
// data为null就是没有查询到我领取的优惠券,就再调一次领取优惠券接口手动领取下
if
(
res
.
data
==
null
)
{
if
(
res
.
data
.
data
==
null
)
{
console
.
log
(
"没领到"
);
console
.
log
(
"没领到"
);
}
else
{
}
else
{
clearInterval
(
this
.
timer
);
clearInterval
(
this
.
timer
);
}
}
}
else
{
}
else
{
Toast
(
res
.
msg
);
Toast
(
res
.
data
.
msg
);
clearInterval
(
this
.
timer
);
clearInterval
(
this
.
timer
);
}
}
});
});
...
@@ -597,11 +597,11 @@ export default {
...
@@ -597,11 +597,11 @@ export default {
if
(
wx
.
getStorageSync
(
"sessionid"
))
{
if
(
wx
.
getStorageSync
(
"sessionid"
))
{
index
.
cancelNewCustome
(
this
.
newCustomerGiftActivityId
).
then
((
res
)
=>
{
index
.
cancelNewCustome
(
this
.
newCustomerGiftActivityId
).
then
((
res
)
=>
{
// console.log(res,'ooooooooo123');
// console.log(res,'ooooooooo123');
if
(
res
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
// 接口调成功之后,就关闭弹框
// 接口调成功之后,就关闭弹框
this
.
showgiftBag
=
false
;
this
.
showgiftBag
=
false
;
}
else
{
}
else
{
Toast
(
res
.
msg
);
Toast
(
res
.
data
.
msg
);
this
.
showgiftBag
=
false
;
this
.
showgiftBag
=
false
;
}
}
});
});
...
...
src/pages/login/index.vue
View file @
44e1e34f
...
@@ -321,9 +321,11 @@ export default {
...
@@ -321,9 +321,11 @@ export default {
}
}
})
})
if
(
this
.
backPath
.
includes
(
'/pages/'
)){
let
parseLink
=
decodeURIComponent
(
this
.
backPath
);
console
.
log
(
this
.
backPath
,
parseLink
,
'---------------------------325'
)
if
(
parseLink
.
includes
(
'/pages/'
)){
wx
.
reLaunch
({
wx
.
reLaunch
({
url
:
this
.
backPath
url
:
parseLink
});
});
}
else
if
(
this
.
fromType
==
'mini'
){
}
else
if
(
this
.
fromType
==
'mini'
){
wx
.
navigateBack
({
wx
.
navigateBack
({
...
...
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