Skip to content

N
new_taobao
Commit 6a76caf1 authored by AU-Pro-mac's avatar AU-Pro-mac
Browse files
Options

add new code

parent db0a0172
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 32 deletions
taobao_mini/client/components/comMissionModal/comMissionModal.acss
View file @ 6a76caf1
......@@ -156,6 +156,10 @@
z-index: 2;
}
.waitRecive {
background-color: #f7a35f;
}
.mission_close_btn {
width: 50rpx;
height: 50rpx;
......
taobao_mini/client/components/comMissionModal/comMissionModal.axml
View file @ 6a76caf1
......@@ -22,7 +22,7 @@
class="mission_describe">乐园门票<text class="mission_describe_hightlight">+{{item.rewards}}</text></view>
</view>
<view class="mission_btn {{ item.status === 1 ? 'mission_btn_active' : '' }}"
<view class="mission_btn {{ item.status === 1 ? 'mission_btn_active' : ''}} {{item.status === 2 ? 'waitRecive' : ''}}"
data-taskType="{{item.taskType}}" data-status="{{item.status}}" data-itemIds="{{item.itemIds}}" data-info="{{item}}" onTap="handleDoTaskByType">
<text a:if="{{item.status === 1}}" class="mission_btn_text">{{item.btnText}}</text>
<text a:if="{{item.status === 2}}" class="mission_btn_text">待领取</text>
......
taobao_mini/client/components/comMissionModal/comMissionModal.js
View file @ 6a76caf1
......@@ -154,7 +154,7 @@ Component({
console.log('%c--------领取成功\n' + '-----yd.receiveTaskRewards\n', ConsoleStyle, data)
console.log(`%c--------任务类型\n-----${ds.taskType}\n`, ConsoleStyle)
if (ds.taskType === 'invites') {
commonToast(`已有${ds.info.todayCompleteTimes}位好有为你助力，乐园门票+${Number(ds.info.todayCompleteTimes) * Number(ds.info.rewards)}`)
commonToast(`${ds.info.waitReceive / ds.info.rewards}个好友为你助力成功，乐园门票+${Number(ds.info.waitReceive)}`)
} else if (ds.taskType === 'follow') {
commonToast(`成功关注店铺，乐园门票+${Number(ds.info.waitReceive)}`)
} else if (ds.taskType === 'member') {
......
taobao_mini/client/components/commonModalT2/commonModalT2.axml
View file @ 6a76caf1
......@@ -2,8 +2,9 @@
<view class="commonT2-modal__shade modal-animate-fade-in">
<view class="jiang_li_dan_chuang">
<image class="dan_chuang_bei_jing2" src="//yun.duiba.com.cn/spark/assets/弹窗背景.55cabcd27f981e4a20db75b0b9b34069ca196b3a.png"/>
<view class="jiang_li_dan_chuang" style="height: {{type === 'lottery' ? '523' : '668'}}rpx">
<image a:if="{{type === 'lottery'}}" class="dan_chuang_bei_jing2" src="//yun.duiba.com.cn/spark/assets/6ee9b2730091baea637ef114e9d73b750e549df9.png"/>
<image a:else class="dan_chuang_bei_jing2" src="//yun.duiba.com.cn/spark/assets/弹窗背景.55cabcd27f981e4a20db75b0b9b34069ca196b3a.png"/>
<image onTap="onModalOne" class="qu_chou_jiang" src="{{btnImg1}}" />
......
taobao_mini/client/components/commonModalT2/commonModalT2.js
View file @ 6a76caf1
......@@ -8,7 +8,8 @@ Component({
coins: 0,
btnImg1: '',
btnImg2: '',
rewardsImg: ''
rewardsImg: '',
type: ''
},
props: {
......@@ -23,7 +24,8 @@ Component({
content: this.props.data.content,
btnImg1: this.props.data.btnImg1,
btnImg2: this.props.data.btnImg2,
rewardsImg: this.props.data.rewardsImg
rewardsImg: this.props.data.rewardsImg,
type: this.props.data.type
})
},
......@@ -34,7 +36,8 @@ Component({
content: this.props.data.content,
btnImg1: this.props.data.btnImg1,
btnImg2: this.props.data.btnImg2,
rewardsImg: this.props.data.rewardsImg
rewardsImg: this.props.data.rewardsImg,
type: this.props.data.type
})
}
},
......
taobao_mini/client/pages/homePage/homePage.js
View file @ 6a76caf1
......@@ -32,6 +32,7 @@ Page({
inviteId: '',
// 用户是否登陆
userLogin: false,
videoWatchCompleted: false,
startTime: 0,
endTime: 0,
data: {
......@@ -56,7 +57,7 @@ Page({
muteWhenPlaying: false,
showFullScreenButton: false,
objectFit: 'contain',
autoPlay: false,
autoPlay: true,
directionWhenFullScreen: 90,
initTime: 0,
mobilenetHintType: 1,
......@@ -330,7 +331,7 @@ Page({
confirmCallback: () => {
this.closeCommonModalT1()
},
btnImg: '//yun.duiba.com.cn/spark/assets/我也要赢大奖.a22bebbd5be4a6e557ee4ef611216ba73b729d10.png' })
btnImg: '//yun.duiba.com.cn/spark/assets/我也要赢大奖_np.cbfefdc57213392216846dd07bbb4248e24e683a.png' })
}
......@@ -365,7 +366,7 @@ Page({
confirmCallback: () => {
this.closeCommonModalT1()
},
btnImg: '//yun.duiba.com.cn/spark/assets/我也要赢大奖.a22bebbd5be4a6e557ee4ef611216ba73b729d10.png' })
btnImg: '//yun.duiba.com.cn/spark/assets/我也要赢大奖_np.cbfefdc57213392216846dd07bbb4248e24e683a.png' })
} else {
// old code: if (!data.isVip || data.url) {
if (code == '811001' && data.url) {
......@@ -379,7 +380,7 @@ Page({
}, 3000)
navigateToOutside(data.url)
},
btnImg: '//yun.duiba.com.cn/spark/assets/一秒成为会员.10be8a8ede8f6c62eadb005744dc54ae182911d9.png' })
btnImg: '//yun.duiba.com.cn/spark/assets/a1s成为会员_np.77d27373763893f523837acd535078cddbd6a93a.png' })
} else if (code == '810001') {
this.showCommonMoadalT1({
title: '很遗憾',
......@@ -387,7 +388,7 @@ Page({
confirmCallback: () => {
this.closeCommonModalT1()
},
btnImg: '//yun.duiba.com.cn/spark/assets/我也要赢大奖.a22bebbd5be4a6e557ee4ef611216ba73b729d10.png' })
btnImg: '//yun.duiba.com.cn/spark/assets/我也要赢大奖_np.cbfefdc57213392216846dd07bbb4248e24e683a.png' })
} else {
commonToast(message);
......@@ -408,7 +409,7 @@ Page({
}, 3000)
navigateToOutside(err.data.url)
},
btnImg: '//yun.duiba.com.cn/spark/assets/一秒成为会员.10be8a8ede8f6c62eadb005744dc54ae182911d9.png'
btnImg: '//yun.duiba.com.cn/spark/assets/a1s成为会员_np.77d27373763893f523837acd535078cddbd6a93a.png'
})
} else if (err.code === '810001') {
this.showCommonMoadalT1({
......@@ -417,7 +418,7 @@ Page({
confirmCallback: () => {
this.closeCommonModalT1()
},
btnImg: '//yun.duiba.com.cn/spark/assets/我也要赢大奖.a22bebbd5be4a6e557ee4ef611216ba73b729d10.png' })
btnImg: '//yun.duiba.com.cn/spark/assets/我也要赢大奖_np.cbfefdc57213392216846dd07bbb4248e24e683a.png' })
} else {
commonToast(err.message + '.')
......@@ -539,7 +540,7 @@ Page({
// TODO: 切换到末尾或者开头，左右按钮消失
let i = this.data.videoActiveIndex
if (i > 0) {
this.videoCtx.stop()
// this.videoCtx.stop()
// 因为 现在只有 视频缩小时 会暂停，所以切换时不需要记录 仅在缩小时记录
// this.videoRecord(i)
setTimeout(() => {
......@@ -551,7 +552,7 @@ Page({
videoSrc: vsrc,
videoActiveIndex: i
})
this.videoCtx.play()
// this.videoCtx.play()
}, 100)
}
},
......@@ -561,7 +562,7 @@ Page({
// TODO: 切换到末尾或者开头，左右按钮消失
let i = this.data.videoActiveIndex
if (i < this.videoSrcArr.length - 1) {
this.videoCtx.stop()
// this.videoCtx.stop()
// 因为 现在只有 视频缩小时 会暂停，所以切换时不需要记录 仅在缩小时记录
// this.videoRecord(i)
setTimeout(() => {
......@@ -573,7 +574,7 @@ Page({
videoSrc: vsrc,
videoActiveIndex: i
})
this.videoCtx.play()
// this.videoCtx.play()
}, 100)
}
},
......@@ -599,7 +600,14 @@ Page({
},
// video - onEnded
onEnded(e) { console.log('---- 视频播放结束', e) },
onEnded(e) {
this.videoRecord(this.data.videoActiveIndex)
// 观看超过 14000ms 15s
if (this.videoSrcArr[this.data.videoActiveIndex].timeStamp >= 14000) {
this.videoWatchCompleted = true
console.log('---- 视频播放结束, videoWatchCompleted:', this.videoWatchCompleted, e)
}
},
// video - onPlayError
onPlayError(err) { console.warn('---- 视频播放错误', err) },
......@@ -621,11 +629,12 @@ Page({
this.setData({
videoShow: false
})
// 观看超过 15000ms 15s
if (this.videoSrcArr[this.data.videoActiveIndex].timeStamp >= 15000 && !this.videoSrcArr[this.data.videoActiveIndex].completed) {
// 观看超过 14000ms 15s
if ((this.videoSrcArr[this.data.videoActiveIndex].timeStamp >= 14000 || this.videoWatchCompleted) && !this.videoSrcArr[this.data.videoActiveIndex].completed) {
this.videoSrcArr[this.data.videoActiveIndex].completed = true
this.getWatchRewards()
}
this.videoWatchCompleted = false
this.videoSrcArr.forEach((item) => {
item.timeStamp = 0
})
......@@ -643,15 +652,16 @@ Page({
if (!data.lotteryTimes) return
this.showCommonMoadalT2({
title: '看视频奖励',
content: `抽奖次数+${data.lotteryTimes}`,
content: `抽奖次数+${1}`,
type: 'lottery',
confirmCallback1: () => {
this.gotoTurnTable()
},
confirmCallback2: () => {
this.closeCommonModalT2()
},
btnImg1: '//yun.duiba.com.cn/spark/assets/3d33327ff5974c06f1be66942b315339f310fac9.png',
btnImg2: '//yun.duiba.com.cn/spark/assets/b64ab7dbde250c686b9cc8346509ea6fc23e2a99.png',
btnImg1: '//yun.duiba.com.cn/spark/assets/去抽奖__m_np.744dcd85bf239e6a8a588b85240ebdc6d91c3e22.png',
btnImg2: '//yun.duiba.com.cn/spark/assets/继续观看__m_np.2dc02092676933ac7c264c6072748111d8d42c67.png',
rewardsImg: ''
})
} else {
......@@ -710,10 +720,10 @@ Page({
// 显示通用弹层
showCommonMoadalT2 (obj) {
let { title, content, confirmCallback1, confirmCallback2, btnImg1, btnImg2, rewardsImg } = obj
let { title, content, type, confirmCallback1, confirmCallback2, btnImg1, btnImg2, rewardsImg } = obj
this.setData({
commonModalVisibleT2: true,
commonModalDataT2: { title, content, btnImg1, btnImg2, rewardsImg },
commonModalDataT2: { title, content, btnImg1, btnImg2, rewardsImg, type, },
onModalT2One: () => { confirmCallback1() },
onModalT2Two: () => { confirmCallback2() }
})
......
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @ 6a76caf1
......@@ -30,8 +30,7 @@ Component({
didMount() {
this.setData({ gameType: this.props.gameType })
this.init()
this.getFakeAvatar()
// this.getFakeAvatar()
},
didUpdate(prevProps, prevData) {
......@@ -83,6 +82,7 @@ Component({
onCanvasReady() {
console.log('onCanvasReady')
this.init()
// this.changeGameSence(this.props.gameType)
},
......
taobao_mini/client/pages/turnTablePage/turnTablePage.js
View file @ 6a76caf1
......@@ -165,6 +165,7 @@ Page({
this.showCommonMoadalT2({
title: '恭喜你',
content: `恭喜您获得${data.name}`,
type: '',
confirmCallback1: async () => {
this.setData({ rotateFlag: false })
this.closeCommonModalT2()
......@@ -300,10 +301,10 @@ Page({
// 显示通用弹层
showCommonMoadalT2 (obj) {
let { title, content, confirmCallback1, confirmCallback2, btnImg1, btnImg2, rewardsImg } = obj
let { title, content, type, confirmCallback1, confirmCallback2, btnImg1, btnImg2, rewardsImg } = obj
this.setData({
commonModalVisibleT2: true,
commonModalDataT2: { title, content, btnImg1, btnImg2, rewardsImg },
commonModalDataT2: { title, content, btnImg1, btnImg2, rewardsImg, type },
onModalT2One: () => { confirmCallback1() },
onModalT2Two: () => { confirmCallback2() }
})
......
taobao_mini/client/resconfig/resList.js
View file @ 6a76caf1
......@@ -748,6 +748,60 @@ const resList = {
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/视频关闭按钮close.4f85e4d486ec18f6a68898467e6a9b87778b69e2.png',
uuid: 'ed0d1c0b-722b-4fbd-806f-ed061c228566'
},
'aba397ba-ed91-4d3a-a4a1-9637b5e88656': {
name: '继续观看__m_np',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/继续观看__m_np.2dc02092676933ac7c264c6072748111d8d42c67.png',
uuid: 'aba397ba-ed91-4d3a-a4a1-9637b5e88656'
},
'9eebfc13-3dbb-41d0-b0c5-4241d3031147': {
name: '胶囊消消_np',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/胶囊消消灰_np.0fd01d5834367c5579bc76b27bce9ce02845ae17.png',
uuid: '9eebfc13-3dbb-41d0-b0c5-4241d3031147'
},
'a7ad2273-1152-4c97-9e1d-32aeefd82eee': {
name: '胶囊消消灰_np',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/胶囊消消_np.d4192db6bac54de3ddd9ea3fa286f88e43f163ba.png',
uuid: 'a7ad2273-1152-4c97-9e1d-32aeefd82eee'
},
'27ced170-d730-4d03-a574-d923e6c4c3a5': {
name: '去抽奖__m_np',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/去抽奖__m_np.744dcd85bf239e6a8a588b85240ebdc6d91c3e22.png',
uuid: '27ced170-d730-4d03-a574-d923e6c4c3a5'
},
'fbd1f9dd-8486-48bc-9344-eaa7a86090e7': {
name: '时光传送_np',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/时光传送_np.9b304e74d76d77908f7d90708aa1de9fe7987188.png',
uuid: 'fbd1f9dd-8486-48bc-9344-eaa7a86090e7'
},
'3fe6d3f6-4c7f-4b93-9173-03b2e61c354e': {
name: '时光传送灰_np',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/时光传送灰_np.e9f298a6178118ad997ea78f05f9948c1b7c3262.png',
uuid: '3fe6d3f6-4c7f-4b93-9173-03b2e61c354e'
},
'0e527cf4-80de-425c-bf02-e222905d1636': {
name: '为ta助力_np',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/为ta助力_np.06e0af7237763dfa6cb8da474053e44dd4b6afbe.png',
uuid: '0e527cf4-80de-425c-bf02-e222905d1636'
},
'7a5683e9-68a9-4834-ab67-bdb38cea208c': {
name: '我也要赢大奖_np',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/我也要赢大奖_np.cbfefdc57213392216846dd07bbb4248e24e683a.png',
uuid: '7a5683e9-68a9-4834-ab67-bdb38cea208c'
},
'97149330-6828-4c41-8e5f-ab61dd811bcf': {
name: 'a1s成为会员_np',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/a1s成为会员_np.77d27373763893f523837acd535078cddbd6a93a.png',
uuid: '97149330-6828-4c41-8e5f-ab61dd811bcf'
}
};
export default resList;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment