Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
hello_taobao
Project
Project
Details
Activity
Releases
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
wildfirecode13
hello_taobao
Commits
d2245e7a
Commit
d2245e7a
authored
Sep 09, 2020
by
wildfirecode13
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
80fca674
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
app.js
dist/app.js
+4
-4
pageshou_ye.js
dist/pages/pageshou_ye/pageshou_ye.js
+4
-4
request.js
dist/tbcc-sdk/lib/request.js
+1
-1
No files found.
dist/app.js
View file @
d2245e7a
...
@@ -6,8 +6,8 @@ cloud.init({
...
@@ -6,8 +6,8 @@ cloud.init({
});
});
App
({
App
({
//
requestType: 'cloud', // yapi,cloud: 云函数
requestType
:
'cloud'
,
// yapi,cloud: 云函数
requestType
:
'yapi'
,
// yapi,cloud: 云函数
//
requestType: 'yapi', // yapi,cloud: 云函数
cloudName
:
'floor'
,
// 主云函数项目名 base clientTemplate2C
cloudName
:
'floor'
,
// 主云函数项目名 base clientTemplate2C
cloud
,
cloud
,
tbcc
,
tbcc
,
...
@@ -24,7 +24,7 @@ App({
...
@@ -24,7 +24,7 @@ App({
*/
*/
handleQuery
(
query
)
{
handleQuery
(
query
)
{
const
{
activityId
}
=
query
;
const
{
activityId
}
=
query
;
this
.
activityId
=
activityId
||
'5f505873738989c8b356e284'
;
//
this.activityId = activityId || '5f505873738989c8b356e284';
// this.activityId = activityId || '5f5759b2114fbb8f6d91245c';
this
.
activityId
=
activityId
||
'5f5759b2114fbb8f6d91245c'
;
//商家创建的测试环境活
}
}
});
});
dist/pages/pageshou_ye/pageshou_ye.js
View file @
d2245e7a
...
@@ -25,8 +25,8 @@ Page({
...
@@ -25,8 +25,8 @@ Page({
},
},
gotoVipPage
()
{
gotoVipPage
()
{
API
.
getVipInfo
().
then
(
res
=>
{
API
.
getVipInfo
().
then
(
res
=>
{
if
(
!
res
.
isVip
)
if
(
!
res
.
data
.
isVip
)
navigateToOutside
(
res
.
url
)
navigateToOutside
(
res
.
data
.
url
)
else
else
my
.
redirectTo
({
url
:
'/pages/pagehuo_dong_ye/pagehuo_dong_ye'
});
my
.
redirectTo
({
url
:
'/pages/pagehuo_dong_ye/pagehuo_dong_ye'
});
})
})
...
@@ -59,8 +59,8 @@ Page({
...
@@ -59,8 +59,8 @@ Page({
API
.
getActivityBaseInfoById
(),
API
.
getActivityBaseInfoById
(),
API
.
getVipInfo
(),
API
.
getVipInfo
(),
]);
]);
// vipInfo.isVip = true;
// vipInfo.
.data.
isVip = true;
if
(
vipInfo
.
isVip
&&
isUserJoin
)
{
if
(
vipInfo
.
data
.
isVip
&&
isUserJoin
)
{
if
(
isEnd
(
endTime
)
&&
if
(
isEnd
(
endTime
)
&&
(
openPrizeStatus
==
OPEN_PRIZE_STATUS
.
SUCCESS
||
openPrizeStatus
==
OPEN_PRIZE_STATUS
.
NOT_OPEN
))
{
//活动结束,开奖成功or不开奖
(
openPrizeStatus
==
OPEN_PRIZE_STATUS
.
SUCCESS
||
openPrizeStatus
==
OPEN_PRIZE_STATUS
.
NOT_OPEN
))
{
//活动结束,开奖成功or不开奖
my
.
redirectTo
({
url
:
'/pages/pagejie_shu_ye/pagejie_shu_ye?data='
+
JSON
.
stringify
({
prize
,
openPrizeStatus
,
isShowPrize
})
});
my
.
redirectTo
({
url
:
'/pages/pagejie_shu_ye/pagejie_shu_ye?data='
+
JSON
.
stringify
({
prize
,
openPrizeStatus
,
isShowPrize
})
});
...
...
dist/tbcc-sdk/lib/request.js
View file @
d2245e7a
...
@@ -84,7 +84,7 @@ const request = ({ cloud, cloudName, requestType = 'cloud' }) => {
...
@@ -84,7 +84,7 @@ const request = ({ cloud, cloudName, requestType = 'cloud' }) => {
const
requestCloud
=
()
=>
{
const
requestCloud
=
()
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
cloud
.
function
.
invoke
(
_cloudName
,
params
,
handle
).
then
(
res
=>
{
cloud
.
function
.
invoke
(
_cloudName
,
params
,
handle
).
then
(
res
=>
{
console
.
log
(
'request Cloud callback=>'
,
handle
,
res
);
console
.
log
(
'request Cloud callback=>'
,
handle
,
res
,
JSON
.
stringify
(
res
)
);
// console.log('requestCloud', handle, params, res);
// console.log('requestCloud', handle, params, res);
hideMyLoading
();
hideMyLoading
();
if
(
res
&&
res
.
success
)
{
if
(
res
&&
res
.
success
)
{
...
...
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