Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
new_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
new_taobao
Commits
e45e44de
Commit
e45e44de
authored
Sep 29, 2020
by
AU-Pro-mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change
parent
0ebe8c4a
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
265 additions
and
95 deletions
+265
-95
comMissionModal.js
...mini/client/components/comMissionModal/comMissionModal.js
+3
-1
commonModalT1.acss
...o_mini/client/components/commonModalT1/commonModalT1.acss
+1
-1
commonModalT1.axml
...o_mini/client/components/commonModalT1/commonModalT1.axml
+3
-1
commonModalT2.acss
...o_mini/client/components/commonModalT2/commonModalT2.acss
+1
-1
commonModalT2.axml
...o_mini/client/components/commonModalT2/commonModalT2.axml
+3
-1
prizeModal.acss
taobao_mini/client/components/prizeModal/prizeModal.acss
+8
-2
prizeModal.axml
taobao_mini/client/components/prizeModal/prizeModal.axml
+1
-1
ruleModal.acss
taobao_mini/client/components/ruleModal/ruleModal.acss
+44
-11
ruleModal.axml
taobao_mini/client/components/ruleModal/ruleModal.axml
+8
-2
ruleModal.js
taobao_mini/client/components/ruleModal/ruleModal.js
+12
-0
goodsPage.js
taobao_mini/client/pages/goodsPage/goodsPage.js
+1
-1
homePage.acss
taobao_mini/client/pages/homePage/homePage.acss
+5
-2
homePage.axml
taobao_mini/client/pages/homePage/homePage.axml
+9
-8
homePage.js
taobao_mini/client/pages/homePage/homePage.js
+140
-55
myprize.js
taobao_mini/client/pages/myprize/myprize.js
+5
-5
turnTablePage.js
taobao_mini/client/pages/turnTablePage/turnTablePage.js
+1
-1
resList.js
taobao_mini/client/resconfig/resList.js
+18
-0
request.js
taobao_mini/client/tbcc-sdk/lib/request.js
+2
-2
No files found.
taobao_mini/client/components/comMissionModal/comMissionModal.js
View file @
e45e44de
...
...
@@ -104,7 +104,7 @@ Component({
let
ds
=
e
.
currentTarget
.
dataset
if
(
ds
.
status
===
1
)
{
switch
(
ds
.
type
)
{
case
"
frontOrder
Goods"
:
case
"
money
Goods"
:
this
.
gotoFrontOrderGoods
(
ds
.
itemIds
)
break
;
case
"invites"
:
...
...
@@ -147,6 +147,7 @@ Component({
// 支付定金
gotoFrontOrderGoods
(
itemIds
)
{
console
.
log
(
itemIds
)
my
.
navigateTo
({
url
:
`../../pages/goodsPage/goodsPage?taskType=frontOrderGoods&itemIds=
${
itemIds
}
`
})
},
...
...
@@ -180,6 +181,7 @@ Component({
if
(
!
success
)
{
console
.
warn
(
res
);
commonToast
(
res
&&
res
.
message
)
}
else
{
console
.
log
(
'%c--------完成关注店铺
\
n'
+
'-----yd.doFollowTask
\
n'
,
ConsoleStyle
,
data
)
commonToast
(
'完成关注店铺'
)
this
.
getMissionList
()
}
})
...
...
taobao_mini/client/components/commonModalT1/commonModalT1.acss
View file @
e45e44de
...
...
@@ -68,7 +68,7 @@
.huo_de_ya_dun_bi {
width: 100%;
height: 32rpx;
line-height:
3
2rpx;
line-height:
4
2rpx;
opacity: 1;
left: 0;
top: 230rpx;
...
...
taobao_mini/client/components/commonModalT1/commonModalT1.axml
View file @
e45e44de
...
...
@@ -7,7 +7,9 @@
<text class="kan_shi_pin_jiang_li">{{title}}</text>
<view class="flex_content">
<view class="huo_de_ya_dun_bi">{{content}}</view>
<view class="huo_de_ya_dun_bi">
<text decode="{{true}}">{{content}}</text>
</view>
</view>
<image class="commonT1_btn" src="{{btnImg}}" mode="aspectFill" onTap="onModalConfirm"/>
...
...
taobao_mini/client/components/commonModalT2/commonModalT2.acss
View file @
e45e44de
...
...
@@ -67,7 +67,7 @@
}
.huo_de_ya_dun_bi {
width: 100%;
height:
3
2rpx;
height:
4
2rpx;
line-height: 32rpx;
opacity: 1;
left: 0;
...
...
taobao_mini/client/components/commonModalT2/commonModalT2.axml
View file @
e45e44de
...
...
@@ -9,7 +9,9 @@
<text class="kan_shi_pin_jiang_li">{{title}}</text>
<view class="flex_content">
<view class="huo_de_ya_dun_bi">{{detail}}</view>
<view class="huo_de_ya_dun_bi">
<text decode="{{true}}">{{detail}}</text>
</view>
<view class="tu_ceng40" a:if="{{}}">
<image class="flex_content_image" src="{{}}" />
<text>+{{coins}}</text>
...
...
taobao_mini/client/components/prizeModal/prizeModal.acss
View file @
e45e44de
...
...
@@ -39,8 +39,14 @@
.my-prize-page .my-prize-empty {
text-align: center;
color: #fff;
margin-top: 30rpx;
color: gray;
margin-top: 60rpx;
font-size: 36rpx;
font-weight: bold;
position: absolute;
z-index: 100;
width: 100%;
text-align: center;
}
.my-prize-page .my-prize-item {
...
...
taobao_mini/client/components/prizeModal/prizeModal.axml
View file @
e45e44de
...
...
@@ -61,7 +61,7 @@
</view>
<view a:if="{{
myPrizeList && myPrizeList.length === 0
}}" class="my-prize-empty">暂无奖品</view>
<view a:if="{{
!myPrizeList.length
}}" class="my-prize-empty">暂无奖品</view>
</view>
<logistics-modal a:if="{{isLogistic}}" prizeItem="{{currentPrize}}" onCloseModal="closeLogisticModal" task="{{task.logisticsImage}}"/>
</view>
\ No newline at end of file
taobao_mini/client/components/ruleModal/ruleModal.acss
View file @
e45e44de
...
...
@@ -18,14 +18,20 @@
.rule-modal__container {
position: absolute;
width: 500rpx;
height: 600rpx;
background: #4eafd7;
width: 470rpx;
height: 524rpx;
background-size: 100% 100%;
left: 50%;
top: 50%;
margin-left: -250rpx;
margin-top: -300rpx;
left: calc(50% - 235rpx);
top: calc(50% - 262rpx);
}
.rule-modal__container_bgimage {
width: 100%;
left: 0;
top: 0;
height: 100%;
position: absolute;
z-index: 0;
}
.rule-modal__bd {
...
...
@@ -38,15 +44,42 @@
font-size: 24rpx;
color: #fff;
line-height: 1.5;
z-index: 10;
overflow: hidden;
}
.rule-modal__bd_title {
color: #f26267;
font-size: 32rpx;
font-weight: bold;
text-align: center;
width: 100%;
margin-top: 44rpx;
line-height: 66rpx;
height: 66rpx;
}
.rule-modal__bd_content {
color: #c85249;
font-size: 24rpx;
margin-top: 16rpx;
line-height: 1.26em;
height: 330rpx;
overflow: scroll;
}
.rule-modal__close {
position: absolute;
right: -20rpx;
top: -80rpx;
height: 86rpx;
width: 86rpx;
background: url('../../assets/modal_close_btn.png') center center no-repeat;
top: -40rpx;
height: 60rpx;
width: 60rpx;
background-size: 48rpx 48rpx;
z-index: 9;
}
.rule-modal__close_image {
width: 60rpx;
height: 60rpx;
}
taobao_mini/client/components/ruleModal/ruleModal.axml
View file @
e45e44de
<view class="rule-modal">
<view class="rule-modal__shade modal-animate-fade-in" />
<view class="rule-modal__container modal-animate-zoom-in">
<view class="rule-modal__close" onTap="onModalClose" />
<image class="rule-modal__container_bgimage" src="//yun.duiba.com.cn/spark/assets/弹窗规则.10abd02fedc22a876f44f383a250c86f9b4466d6.png" mode="aspectFill" />
<view class="rule-modal__close" onTap="onModalClose">
<image class="rule-modal__close_image" src="//yun.duiba.com.cn/spark/assets/弹窗2关闭.478515dc464257d3f3e7c09b760b30e35d439a20.png" mode="aspectFill" />
</view>
<view class="rule-modal__bd">
<slot />
<view class="rule-modal__bd_title">活动规则</view>
<view class="rule-modal__bd_content">
<text decode="{{true}}">{{text}}</text>
</view>
</view>
</view>
</view>
taobao_mini/client/components/ruleModal/ruleModal.js
View file @
e45e44de
Component
({
data
:
{
text
:
''
},
props
:
{
text
:
''
},
didMount
()
{
this
.
setData
({
text
:
this
.
props
.
text
})
},
didUpdate
()
{
this
.
setData
({
text
:
this
.
props
.
text
})
},
methods
:
{
onModalClose
()
{
const
{
onModalClose
}
=
this
.
props
;
...
...
taobao_mini/client/pages/goodsPage/goodsPage.js
View file @
e45e44de
...
...
@@ -105,7 +105,7 @@ Page({
})
||
{}
console
.
log
(
browsResult
)
if
(
browsResult
.
success
)
{
commonToast
(
'任务完成
,请到任务中心查看奖励
'
)
commonToast
(
'任务完成'
)
}
break
;
}
...
...
taobao_mini/client/pages/homePage/homePage.acss
View file @
e45e44de
...
...
@@ -146,6 +146,9 @@
z-index: 0;
}
.opciaty05 {
opacity: 0.5;
}
.bottom_ydgame_block {
...
...
@@ -239,8 +242,8 @@
z-index: 40;
width: 140rpx;
height: 100rpx;
top:
3
0;
right: 30
;
top: 0;
left: 100rpx
;
background: rgba(255, 255, 255, .9);
color: rgb(0, 0, 0);
font-size: 22rpx;
...
...
taobao_mini/client/pages/homePage/homePage.axml
View file @
e45e44de
...
...
@@ -10,8 +10,8 @@
<!-- 头部 规则-奖品 按钮 -->
<view class="head">
<image class="head_ruler" onTap="show
CommonMoadalT1
" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" />
<!-- <image class="head_ruler" onTap="" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" /> -->
<image class="head_ruler" onTap="show
RuleModal
" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" />
<!-- <image class="head_ruler" onTap="
showCommonMoadalT1
" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" /> -->
<image class="head_rewards" onTap="gotoMyPrizePage" src="{{resList['74a63fd3-6776-44a2-990e-fadac00fb757'].url}}" />
</view>
...
...
@@ -52,7 +52,9 @@
<view>观看XXXXX视频</view>
<view>赢惊喜抽奖次数</view>
</view>
<!--
<view class="video_block_up" onTap="onVideoTurnSmall">收起视频</view>
-->
</view>
<!-- 按钮组 左-右 -->
...
...
@@ -60,14 +62,13 @@
<image class="video_btn_right" onTap="videoTurnRight" src="{{resList['cf73af84-5751-4aee-a754-9106162786d9'].url}}" />
</view>
<!--
<view hidden="{{!videoBottom_timeout}}" onTap="onVideoTurnBig" class="video_block_s {{ !videoBottom ? 'block_opciaty0' : ''}}" >
<!-- <image class='video_s' src='' /> -->
<view class='video_s'></view>
<image class="bo_fang_an_niu" src="{{resList['8d5b83a6-59d9-484c-a74e-99f13ba20b02'].url}}" />
<view class="video_block_tips">看视频 赢金币</view>
</view>
-->
<!-- 底部 门票-乐园-抽奖 -->
...
...
@@ -89,8 +90,8 @@
<!-- 选择游戏 -->
<view class="gamechoose_block" a:if='{{ showChooseGame }}'>
<image class="gamechoose_block_back" src="{{resList['22c949b8-84af-4a22-bb21-70088d1eafad'].url}}" />
<image data-gameType='1' onTap="changeGameOrPage" class="gamechoose_block_sc" src="{{resList['f2915694-4e09-4776-8f38-9ddb285e4d17'].url}}" />
<image data-gameType='2' onTap="changeGameOrPage" class="gamechoose_block_xxl" src="{{resList['7aafb158-7fec-4ae1-a83e-496779c4a107'].url}}" />
<image data-gameType='1' onTap="changeGameOrPage" class="gamechoose_block_sc
{{ ticketNum ? '' : 'opciaty05' }}
" src="{{resList['f2915694-4e09-4776-8f38-9ddb285e4d17'].url}}" />
<image data-gameType='2' onTap="changeGameOrPage" class="gamechoose_block_xxl
{{ ticketNum ? '' : 'opciaty05' }}
" src="{{resList['7aafb158-7fec-4ae1-a83e-496779c4a107'].url}}" />
<view class="gameChoose_mask" onTap="closeShowChooseGame"></view>
</view>
</view>
...
...
@@ -112,7 +113,7 @@
<common-modal-t1 a:if="{{commonModalVisibleT1}}" data="{{commonModalDataT1}}" onModalClose="closeCommonModalT1" onModalConfirm="confirmCommonModalT1" />
<common-modal-t2 a:if="{{commonModalVisibleT2}}" data="{{commonModalDataT2}}" onModalClose="closeCommonModalT2" onModalConfirm="confirmCommonModalT2" />
<rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"
><text>{{rule}}</text
></rule-modal>
<rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"
text="{{rule}}"
></rule-modal>
<rewards-modal a:if="{{rewardsModalVisible}}" onModalClose="closeRewardsModal"></rewards-modal>
<prizes-modal a:if="{{prizesModalVisible}}" onModalClose="closePrizesModal"></prizes-modal>
<mission-modal a:if="{{missionModalVisible}}" onModalClose="closeMissionModal"></mission-modal>
taobao_mini/client/pages/homePage/homePage.js
View file @
e45e44de
...
...
@@ -15,9 +15,9 @@ Page({
// 视频地址列表 - 存储播放时常
videoSrcArr
:
[
{
url
:
'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4'
,
timeStamp
:
0
,
totalTime
:
0
},
{
url
:
'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4'
,
timeStamp
:
0
,
totalTime
:
0
},
{
url
:
'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4'
,
timeStamp
:
0
,
totalTime
:
0
}
// { url: 'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4', timeStamp: 0, totalTime: 0, completed: false
},
// { url: 'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4', timeStamp: 0, totalTime: 0, completed: false
},
// { url: 'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4', timeStamp: 0, totalTime: 0, completed: false
}
],
// 视频记录 flag
timeStampCountFlag
:
false
,
...
...
@@ -27,15 +27,18 @@ Page({
timeStampRecord
:
0
,
// 视频预览图列表
posterSrcArr
:
[
'https://yun.duiba.com.cn/spark/assets/bg1.d818f787351875b0982937d8bb68b0655febec3c.png'
,
'https://yun.duiba.com.cn/spark/assets/弹窗背景_奖品.dce4e3dd9a3fcae166dfbd934b714ce1bc7fa5c9.png'
,
'https://yun.duiba.com.cn/spark/assets/7191ae57140b4937ae42500e76aa533693326ef9.png'
,
//
'https://yun.duiba.com.cn/spark/assets/bg1.d818f787351875b0982937d8bb68b0655febec3c.png',
//
'https://yun.duiba.com.cn/spark/assets/弹窗背景_奖品.dce4e3dd9a3fcae166dfbd934b714ce1bc7fa5c9.png',
//
'https://yun.duiba.com.cn/spark/assets/7191ae57140b4937ae42500e76aa533693326ef9.png',
],
// 是否是会员
isVip
:
false
,
// 是否关注店铺
isFollow
:
false
,
// 进入时获取 邀请码
inviteId
:
''
,
// 用户是否登陆
userLogin
:
false
,
data
:
{
resList
:
resList
,
title
:
''
,
...
...
@@ -49,8 +52,6 @@ Page({
videoBottom
:
false
,
// 具有延迟的 视频收起 - flag
videoBottom_timeout
:
false
,
// 视频地址
videoSrc
:
''
,
// 封面图地址
posterSrc
:
''
,
// 视频变大
...
...
@@ -88,11 +89,17 @@ Page({
ticketNum
:
0
,
drawNum
:
0
,
todayFirstLogin
:
true
},
async
onLoad
(
query
)
{
console
.
info
(
`%cPage onLoad with query:
${
JSON
.
stringify
(
query
)}
`
,
ConsoleStyle
)
if
(
query
.
inviteId
)
this
.
inviteId
=
query
.
inviteId
if
(
query
.
inviteId
)
{
app
.
inviteId
=
query
.
inviteId
this
.
inviteId
=
query
.
inviteId
console
.
log
(
'%c该用户是 通过邀请链接 进入'
,
'color:green; font-size:16px; font-weight:bold;'
)
}
// 页面加载
// 开场动画
// this.openAnimation().then(async res_ => {
...
...
@@ -132,8 +139,14 @@ Page({
const
{
success
,
message
,
data
}
=
await
API
.
login
(
param
)
.
catch
(
res
=>
{
commonToast
(
res
&&
res
.
message
);
})
||
{};
if
(
success
)
{
this
.
userLogin
=
true
console
.
log
(
'%c-----用户登陆信息
\
n'
+
'-----yd.login
\
n'
,
ConsoleStyle
,
data
)
app
.
openId
=
data
.
openId
this
.
isNewUser
=
data
.
isNewUser
this
.
hasNewUserAndInvited
()
this
.
getGameInfo
()
this
.
init
(
data
);
}
},
...
...
@@ -146,47 +159,111 @@ Page({
if
(
!
success
)
{
console
.
warn
(
res
);
commonToast
(
res
&&
res
.
message
)
}
else
{
console
.
log
(
'%c-----活动基本信息
\
n'
+
'-----yd.getActivityBaseInfoById
\
n'
,
ConsoleStyle
,
data
)
data
.
videoUrlArr
.
forEach
((
item
,
index
)
=>
{
this
.
videoSrcArr
[
index
]
=
{
url
:
item
,
timeStamp
:
0
,
totalTime
:
0
,
completed
:
false
}
// this.posterSrcArr
})
this
.
setData
({
rule
:
data
.
rule
,
videoSrc
:
this
.
videoSrcArr
[
0
]
})
}
})
.
catch
(
res
=>
{
console
.
warn
(
res
);
commonToast
(
res
&&
res
.
message
);
})
||
{};
},
// 新用户/被邀请的 逻辑
hasNewUserAndInvited
()
{
API
.
getVipInfo
({
activityId
:
app
.
activityId
,
inviteId
:
app
.
inviteId
})
.
then
(
res
=>
{
const
{
success
,
data
,
message
}
=
res
console
.
log
(
'%c-----用户vip信息
\
n'
+
'-----yd.getVipInfo
\
n'
,
ConsoleStyle
,
data
)
if
(
success
&&
data
)
{
app
.
isVip
=
(
data
&&
data
.
isVip
)
||
false
;
app
.
vipUrl
=
(
data
&&
data
.
url
)
||
''
;
this
.
isVip
=
(
data
&&
data
.
isVip
)
||
false
;
}
else
{
commonToast
(
message
)
}
})
.
catch
(
res
=>
{
console
.
warn
(
res
);
commonToast
(
res
&&
res
.
message
)
})
||
{};
// 新用户 助力链接
if
(
this
.
isNewUser
&&
this
.
inviteId
)
{
this
.
showCommonMoadalT1
({
title
:
'温馨提示'
,
content
:
'成为会员 才能为他助力哦~'
,
confirmCallback
:
()
=>
{
navigateToOutside
(
app
.
vipUrl
)
},
btnImg
:
'//yun.duiba.com.cn/spark/assets/一秒成为会员.10be8a8ede8f6c62eadb005744dc54ae182911d9.png'
})
// //yun.duiba.com.cn/spark/assets/为他助力.bc57a24aecb04934067712c76186d800343dabd5.png
}
// 新用户 不是助力链接
else
if
(
this
.
isNewUser
&&
!
this
.
inviteId
)
console
.
log
(
'isNewUser'
)
// 老用户 助力链接
else
if
(
!
this
.
isNewUser
&&
this
.
inviteId
)
{
this
.
showCommonMoadalT1
({
title
:
'很遗憾'
,
content
:
'新会员才能助力哦~'
,
confirmCallback
:
()
=>
{
this
.
closeCommonModalT1
()
},
btnImg
:
'//yun.duiba.com.cn/spark/assets/我也要赢大奖.a22bebbd5be4a6e557ee4ef611216ba73b729d10.png'
})
}
},
// 用户今日首次进入
userFirstInToday
()
{
// 自动播放视频
this
.
videoShowFunc
()
},
// 分享
onShareAppMessage
()
{
// 返回自定义分享信息
SHARE_CONFIG
.
imageUrl
=
''
SHARE_CONFIG
.
path
=
this
.
changeURLArg
(
'/pages/homePage/homePage'
,
'shareId'
,
app
.
openId
)
console
.
log
(
'SHARE_CONFIG.path'
,
SHARE_CONFIG
.
path
)
SHARE_CONFIG
.
path
=
this
.
changeURLArg
(
'/pages/homePage/homePage&'
,
'inviteId'
,
app
.
openId
)
return
SHARE_CONFIG
;
},
// 新用户 被邀请的 逻辑
hasBeenInvited
()
{
console
.
log
(
'%c该用户是被 邀请 进入'
,
'color:green; font-size:16px; font-weight:bold;'
)
},
// 页面加载完成
onReady
()
{
this
.
videoCtx
=
my
.
createVideoContext
(
'videoCtx'
)
this
.
setData
({
videoSrc
:
this
.
videoSrcArr
[
0
].
url
,
posterSrc
:
this
.
posterSrcArr
[
0
]
})
this
.
videoCtx
.
play
()
// this.setData({ videoSrc: this.videoSrcArr[0].url, posterSrc: this.posterSrcArr[0] })
},
// 页面显示
onShow
()
{
if
(
this
.
userLogin
)
this
.
getGameInfo
()
if
(
this
.
isNewUser
&&
this
.
inviteId
&&
this
.
isVip
)
{
}
},
// start
doStart
()
{
this
.
showCommonModal
({
content
:
'活动还未开始
\
n请稍后'
,
btnText
:
'我知道了'
,
commonModalVisibleT1
:
true
,
confirmCallback
:
()
=>
{
this
.
closeCommonModal
();
}
});
// 获取 游戏门票 抽奖次数 今日是否首次登陆
getGameInfo
()
{
API
.
getGameInfo
({
activityId
:
app
.
activityId
})
.
then
(
res
=>
{
const
{
success
,
message
,
data
}
=
res
if
(
!
success
)
{
console
.
warn
(
res
);
commonToast
(
res
&&
res
.
message
)
}
else
{
console
.
log
(
'%c-----获取游戏信息
\
n'
+
'-----yd.getGameInfo
\
n'
,
ConsoleStyle
,
data
)
this
.
setData
({
ticketNum
:
data
.
gameTimes
,
drawNum
:
data
.
lotteryTimes
,
todayFirstLogin
:
data
.
todayFirstLogin
})
if
(
this
.
data
.
todayFirstLogin
)
this
.
userFirstInToday
()
}
})
.
catch
(
res
=>
{
console
.
warn
(
res
);
commonToast
(
res
&&
res
.
message
);
})
||
{};
},
// 开场动画
...
...
@@ -201,10 +278,21 @@ Page({
// 切换到游戏
changeGameOrPage
(
e
)
{
let
type
=
Number
(
e
.
currentTarget
.
dataset
.
gameType
)
this
.
videoCtx
.
pause
()
this
.
setData
({
gameShow
:
true
,
gameType
:
type
})
setTimeout
(()
=>
{
this
.
setData
({
gameShow_timeout
:
true
})
},
350
)
if
(
this
.
data
.
ticketNum
==
0
&&
e
.
currentTarget
.
dataset
.
gameType
!=
3
)
{
this
.
showCommonMoadalT1
({
title
:
'门票不足'
,
content
:
'门票消耗完了!
\
n快去做任务吧~'
,
confirmCallback
:
()
=>
{
this
.
showMissionModal
()
},
btnImg
:
'//yun.duiba.com.cn/spark/assets/赚门票.21d8c2fd01dffd454116bb6c1189ba6bb74306f4.png'
})
return
}
else
{
let
type
=
Number
(
e
.
currentTarget
.
dataset
.
gameType
)
this
.
videoCtx
.
pause
()
this
.
setData
({
gameShow
:
true
,
gameType
:
type
})
setTimeout
(()
=>
{
this
.
setData
({
gameShow_timeout
:
true
})
},
350
)
}
},
// 从游戏 返回 到 主页
...
...
@@ -258,22 +346,6 @@ Page({
}
},
// video - turn small
onVideoTurnSmall
()
{
this
.
videoCtx
.
pause
()
this
.
setData
({
videoBottom
:
true
})
setTimeout
(()
=>
{
this
.
setData
({
videoBottom_timeout
:
true
})
},
350
)
},
// video - turn big
onVideoTurnBig
()
{
this
.
setData
({
videoBottom_timeout
:
false
})
setTimeout
(()
=>
{
this
.
setData
({
videoBottom
:
false
})
this
.
videoCtx
.
play
()
},
350
)
},
// video - change to another video
videoRecord
(
index
)
{
this
.
videoSrcArr
[
index
].
timeStamp
=
this
.
timeStamp
...
...
@@ -325,11 +397,6 @@ Page({
// video - onLoading
onLoading
(
e
)
{
console
.
log
(
e
)
},
// 页面隐藏
onHide
()
{
},
gotoMyPrizePage
()
{
my
.
navigateTo
({
url
:
'../myprize/myprize'
})
},
...
...
@@ -402,7 +469,9 @@ Page({
onReachBottom
()
{
// 页面被拉到底部
},
// 页面隐藏
onHide
()
{
},
// 获取主接口
async
getIndex
()
{
...
...
@@ -432,4 +501,20 @@ Page({
}
}
}
// // video - turn small
// onVideoTurnSmall () {
// this.videoCtx.pause()
// this.setData({ videoBottom: true })
// setTimeout(() => { this.setData({ videoBottom_timeout: true }) }, 350)
// },
// // video - turn big
// onVideoTurnBig () {
// this.setData({ videoBottom_timeout: false })
// setTimeout(() => {
// this.setData({ videoBottom: false })
// this.videoCtx.play()
// }, 350)
// },
});
taobao_mini/client/pages/myprize/myprize.js
View file @
e45e44de
...
...
@@ -210,11 +210,11 @@ Page({
flag
=
true
;
// 判断是否为会员
await
this
.
getUserInfo
()
const
{
isVip
,
vip
Link
}
=
app
;
const
{
isVip
,
vip
Url
}
=
app
;
if
(
!
isVip
)
{
commonToast
(
'立即加入会员,即可领取奖品'
,
2000
);
setTimeout
(()
=>
{
navigateToOutside
(
vip
Link
)
navigateToOutside
(
vip
Url
)
},
1000
)
flag
=
false
return
...
...
@@ -241,14 +241,14 @@ Page({
//获取用户vip信息
async
getUserInfo
()
{
const
{
activityId
}
=
app
;
API
.
getVipInfo
({
activityId
})
const
{
activityId
,
inviteId
}
=
app
;
API
.
getVipInfo
({
activityId
,
inviteId
})
.
then
(
res
=>
{
const
{
success
,
data
,
message
}
=
res
console
.
log
(
'%c-----用户vip信息
\
n'
+
'-----yd.getVipInfo
\
n'
,
ConsoleStyle
,
data
)
if
(
success
&&
data
)
{
app
.
isVip
=
(
data
&&
data
.
isVip
)
||
false
;
app
.
vip
Link
=
(
data
&&
data
.
url
)
||
''
;
app
.
vip
Url
=
(
data
&&
data
.
url
)
||
''
;
flag
=
false
this
.
getMyPrize
()
}
else
{
...
...
taobao_mini/client/pages/turnTablePage/turnTablePage.js
View file @
e45e44de
...
...
@@ -45,7 +45,7 @@ Page({
if
(
!
success
)
{
console
.
warn
(
res
);
commonToast
(
res
&&
res
.
message
)
}
else
{
console
.
log
(
'%c-----获取游戏信息
\
n'
+
'-----yd.getGameInfo
\
n'
,
ConsoleStyle
,
data
)
this
.
setData
({
leftTimes
:
data
.
game
Times
})
this
.
setData
({
leftTimes
:
data
.
lottery
Times
})
}
})
.
catch
(
res
=>
{
console
.
warn
(
res
);
commonToast
(
res
&&
res
.
message
);
})
||
{};
...
...
taobao_mini/client/resconfig/resList.js
View file @
e45e44de
...
...
@@ -592,6 +592,24 @@ const resList = {
ext
:
'.png'
,
url
:
'//yun.duiba.com.cn/spark/assets/谢谢参与.f0ecf9469bcf589fe2b61017631ef8e507a8cf24.png'
,
uuid
:
'2a5c22ac-2449-4e2a-af33-8e3a837e20fe'
},
'3ef613f7-698f-41e1-b81d-da9e44f13fca'
:
{
name
:
'为他助力'
,
ext
:
'.png'
,
url
:
'//yun.duiba.com.cn/spark/assets/为他助力.bc57a24aecb04934067712c76186d800343dabd5.png'
,
uuid
:
'3ef613f7-698f-41e1-b81d-da9e44f13fca'
},
'2e06aa38-3dff-4f72-8662-417614669d43'
:
{
name
:
'我也要赢大奖'
,
ext
:
'.png'
,
url
:
'//yun.duiba.com.cn/spark/assets/一秒成为会员.10be8a8ede8f6c62eadb005744dc54ae182911d9.png'
,
uuid
:
'2e06aa38-3dff-4f72-8662-417614669d43'
},
'fd8a805e-e2e3-49c6-8236-1f181177a313'
:
{
name
:
'一秒成为会员'
,
ext
:
'.png'
,
url
:
'//yun.duiba.com.cn/spark/assets/我也要赢大奖.a22bebbd5be4a6e557ee4ef611216ba73b729d10.png'
,
uuid
:
'fd8a805e-e2e3-49c6-8236-1f181177a313'
}
};
export
default
resList
;
\ No newline at end of file
taobao_mini/client/tbcc-sdk/lib/request.js
View file @
e45e44de
...
...
@@ -84,9 +84,9 @@ const request = ({ cloud, cloudName, requestType = 'cloud' }) => {
const
requestCloud
=
()
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
console
.
log
(
'requestCloud'
,
handle
,
params
);
//
console.log('requestCloud', handle, params);
cloud
.
function
.
invoke
(
_cloudName
,
params
,
handle
).
then
(
res
=>
{
console
.
log
(
'request Cloud callback=>'
,
handle
,
res
,
JSON
.
stringify
(
res
));
//
console.log('request Cloud callback=>', handle, res, JSON.stringify(res));
hideMyLoading
();
if
(
res
&&
res
.
success
)
{
resolve
(
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