Skip to content

N
new_taobao
Commit 1e17ae37 authored by wildfirecode13's avatar wildfirecode13
Browse files
Options

Merge branch 'tianmaoxiaoyuan' of gitlab2.dui88.com:wanghongyuan/new_taobao into tianmaoxiaoyuan

parents 5f8bb25b 68634529
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 63878 additions and 219 deletions
project/src/canvas/game/output.js
View file @ 1e17ae37
This diff is collapsed.
project/src/canvas/game/output.js.map
View file @ 1e17ae37
This diff is collapsed.
project/src/canvas/game/released/output.js
View file @ 1e17ae37
This diff is collapsed.
project/src/canvas/game/src/Ins.ts
View file @ 1e17ae37
......@@ -4,6 +4,7 @@ import resCanvasList from "../resCanvasList"
import { SCENETYPE } from "./Enum";
import { GDispatcher } from "./Main";
import { sendTbNet, TbNetName } from "./TaoBaoNet";
import { Button } from "./ui/button";
/**记录全局信息与全局方法 */
export class Ins {
/**舞台宽高 */
......@@ -91,6 +92,20 @@ export class Ins {
return btn;
}
/**生成一个按钮 */
public static initButton(uuid?: string, x = 0, y = 0){
let btn;
if (uuid) {
btn = new Button(this.getRes(uuid));
}else{
btn = new Button();
}
// btn.initButton();
btn.x = x;
btn.y = y;
return btn;
}
/**生成一个文本
* data:{color?:string,size?:number,x?:number,y?:number,text?:string}
*/
......
project/src/canvas/game/src/TaoBaoNet.ts
View file @ 1e17ae37
......@@ -37,6 +37,11 @@ export enum TbNetName {
*/
updateSenceGuide = "tmallCat.updateSenceGuide",
/**
* 召回信息
*/
recallInfo = "tmallCat.recallInfo",
/**
* 埋点统计 到时改名字
* activityId params elemType
......
project/src/canvas/game/src/guide/Guide.ts
View file @ 1e17ae37
......@@ -39,15 +39,15 @@ export class Guide extends Module {
callBack;
catImg1:FYGE.Lottie;
catImg1: FYGE.Lottie;
initUi() {
var that = this;
that.index = 0;
that.catPosArr = [80, 40, 60, 70];
var arr = [lanmao02shuohua,jumaoshuohua,sanhua02shuohua2,xianluoshuohua]
var arr = [lanmao02shuohua, jumaoshuohua, sanhua02shuohua2, xianluoshuohua]
/**猫咪图片 */
that.catImgUUIDArr = ['3e6311fd-15ab-4656-bb84-1c49f4ad4ed9', 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d', '9fc6517e-debe-4457-88ef-9c733d5bc072', 'ecb49f23-2e65-4507-8be6-1eee021a3b35']
......@@ -66,7 +66,7 @@ export class Guide extends Module {
// that.addChild(that.catImg);
that.catImg1 = new FYGE.Lottie(arr[Ins.userInfo.catType - 1])
that.addChild(that.catImg1);
if(Ins.userInfo.catType == 2){
if (Ins.userInfo.catType == 2) {
that.catImg1.y = 30;
}
// var x = (Ins.stageW - that.catImg.width) * 0.5;
......@@ -82,21 +82,27 @@ export class Guide extends Module {
}
changeGuide() {
this.index++;
if (this.index >= this['guideUUIDArr_' + this.guideType].length) {
var that = this;
that.index++;
if (that.index >= that['guideUUIDArr_' + that.guideType].length) {
that.guideTouch.mouseEnable = false;
setTimeout(() => {
if (that && that.guideTouch)
that.guideTouch.mouseEnable = true;
}, 1000);
// GDispatcher.dispatchEvent(MSG.GUIDE_BEDROOMEND);
this.callBack && this.callBack();
that.callBack && that.callBack();
return;
}
this.guide.texture = RES.getRes(resCanvasList[this['guideUUIDArr_' + this.guideType][this.index]].url)
if (this.guideType == 3 || this.guideType == 4) {
if (this.index == 4 || this.index == 5) {
this.catImg1.visible = false;
that.guide.texture = RES.getRes(resCanvasList[that['guideUUIDArr_' + that.guideType][that.index]].url)
if (that.guideType == 3 || that.guideType == 4) {
if (that.index == 4 || that.index == 5) {
that.catImg1.visible = false;
} else {
this.catImg1.visible = true;
that.catImg1.visible = true;
}
}
console.log(this.guide.x, this.guide.y)
console.log(that.guide.x, that.guide.y)
}
initEvents() {
......
project/src/canvas/game/src/scenes/MainScene.ts
View file @ 1e17ae37
......@@ -40,6 +40,9 @@ export class MainScene extends Scene {
private maxEnergy: number = 1500; //最大精力值
private recoverEnergyHandler: any; //恢复精力的定时器,用于保存下来方便清空
/**召回倒计时 */
private recallTimer;
/**猫咪等级 */
private level: number = 0;
......@@ -108,9 +111,23 @@ export class MainScene extends Scene {
that.cat.visible = false;
//当猫出走的时候，隐藏猫咪，创建信封
that.letter.visible = true;
// that.initRecallCatTimer()
}
}
/**当猫出走的时候，初始化前端的召回倒计时 */
initRecallCatTimer(){
var that = this;
sendTbNet(TbNetName.recallInfo,{},(s,r)=>{
if(s){
that.recallTimer = setTimeout(()=>{
that.recallCat();
},r.data.backTime-r.data.serverTime)
}
})
}
/**初始化引导 */
initGuide(sence) {
var that = this;
......@@ -154,7 +171,17 @@ export class MainScene extends Scene {
openLetter() {
console.log("打开信封弹窗")
if (this.letter && this.letter.visible) {
Ins.showModule('messageModal', { catName: Ins.userInfo.catName })
Ins.showLoading();
sendTbNet(TbNetName.recallInfo,{},(s,r)=>{
if(s){
Ins.hideLoading();
Ins.showModule('messageModal', { catName: Ins.userInfo.catName ,recallInfo:r.data})
}else{
Ins.hideLoading();
Ins.showToast(r.message);
}
})
}
}
......@@ -327,6 +354,7 @@ export class MainScene extends Scene {
Ins.senceInfo = r.data;
if (r.data.sence < 4) {
Ins.catIsOut = false;
// clearTimeout(that.recallTimer)
that.letter.visible = false;
if (r.data.sence == 3) {
that.cat.visible = true;
......
project/src/canvas/game/src/ui/Button.ts 0 → 100644
View file @ 1e17ae37
export class Button extends FYGE.Sprite{
constructor(texture?:FYGE.Texture){
super(texture)
this.anchorX = texture.baseTexture.width/2;
this.anchorY = texture.baseTexture.width/2;
this.initButton();
// this.addEventListener(FYGE.Event.ADDED_TO_STAGE,this.initButton,this);
this.addEventListener(FYGE.Event.REMOVED_FROM_STAGE,this.removeButton,this);
}
initButton(){
console.log("初始化按钮")
this.addEventListener(FYGE.MouseEvent.MOUSE_DOWN,this.touchEvent,this);
this.addEventListener(FYGE.MouseEvent.MOUSE_OUT,this.touchEvent,this);
this.addEventListener(FYGE.MouseEvent.MOUSE_UP,this.touchEvent,this)
}
touchEvent(e:FYGE.MouseEvent){
console.log("按钮事件")
var that = this;
if(!that) return;
if(e.type==FYGE.MouseEvent.MOUSE_DOWN){
FYGE.Tween.removeTweens(that);
FYGE.Tween.get(that).to({scaleX:0.9,scaleY:0.9},50)
}else{
FYGE.Tween.removeTweens(that);
FYGE.Tween.get(that).to({scaleX:1,scaleY:1},50)
}
}
removeButton(){
this.removeEventListener(FYGE.MouseEvent.MOUSE_DOWN,this.touchEvent,this);
this.removeEventListener(FYGE.MouseEvent.MOUSE_OVER,this.touchEvent,this);
this.removeEventListener(FYGE.MouseEvent.MOUSE_UP,this.touchEvent,this)
}
}
\ No newline at end of file
project/src/canvas/game/src/ui/MainSceneBtnUi.ts
View file @ 1e17ae37
......@@ -7,6 +7,9 @@ import PanelCtrl from "../../module/ctrls/panelCtrl";
import { changeScene, showPanel } from "../../module/ctrls";
import { RulePanel } from "../panels/rulePanel";
import { MyPrizeScene } from "../scenes/MyPrizeScene";
import { sendTbNet, TbNetName } from "../TaoBaoNet";
import { getStage } from "../scenes/stage";
import { Button } from "./button";
export class MainSceneBtnUi extends Module {
/**主场景ui
......@@ -25,7 +28,7 @@ export class MainSceneBtnUi extends Module {
/**商城按钮 */
private shapGoBtn: FYGE.Sprite;
/**返回按钮 */
private returnBtn: FYGE.Sprite;
private returnBtn: Button;
/**攻略按钮 */
private strategyBtn: FYGE.Sprite;
/**奖品按钮 */
......@@ -59,6 +62,8 @@ export class MainSceneBtnUi extends Module {
/**互动进行中，当互动进行中时，无法点击互动按钮进行互动 */
private actRunning: boolean = false;
// private btnArr:FYGE.Sprite[] = [];
initUi() {
var that = this;
that.initUniversalUi();
......@@ -80,19 +85,19 @@ export class MainSceneBtnUi extends Module {
that.bottomBtnGroup.mouseEnable = that.bottomBtnGroup.mouseChildren = true;
that.addChild(that.bottomBtnGroup);
that.strategyBtn = Ins.initSprite("e636bd22-361f-442a-8684-ccfe1141485a", 579, 112);
that.strategyBtn = Ins.initButton("e636bd22-361f-442a-8684-ccfe1141485a", 579, 112);
that.topBtnGroup.addChild(that.strategyBtn);
that.prizeBtn = Ins.initSprite("e8b083c7-307a-4446-9bc9-99f75c3573e5", 579, 237);
that.prizeBtn = Ins.initButton("e8b083c7-307a-4446-9bc9-99f75c3573e5", 579, 237);
that.topBtnGroup.addChild(that.prizeBtn);
that.energyBtn = Ins.initSprite("cdb8e186-9872-442e-b71e-bba0a9ce5846", 542, -7);
that.energyBtn = Ins.initButton("cdb8e186-9872-442e-b71e-bba0a9ce5846", 542, -7);
that.bottomBtnGroup.addChild(that.energyBtn);
that.initActBtn();
that.initCatInfoGroup();
that.initFishPointGroup();
that.shapGoBtn = Ins.initSprite("dba58651-57a3-4b75-9447-0e4d498dd8cd")
that.shapGoBtn = Ins.initButton("dba58651-57a3-4b75-9447-0e4d498dd8cd")
that.shapGoBtn.position.set((Ins.stageW - that.shapGoBtn.width) >> 1, 137);
that.bottomBtnGroup.addChild(that.shapGoBtn);
that.updateUserInfo();
......@@ -153,17 +158,17 @@ export class MainSceneBtnUi extends Module {
/**初始化互动按钮 */
initActBtn() {
var that = this;
that.combingBtn = Ins.initSprite("aa17cfa9-f1db-47eb-9eeb-f5947b7f47a8", 69);
that.combingBtn = Ins.initButton("aa17cfa9-f1db-47eb-9eeb-f5947b7f47a8", 69);
that.bottomBtnGroup.addChild(that.combingBtn);
that.catBtn = Ins.initSprite("0b44efa9-1e8a-4c43-a2a5-93852d88918c", 214);
that.catBtn = Ins.initButton("0b44efa9-1e8a-4c43-a2a5-93852d88918c", 214);
that.bottomBtnGroup.addChild(that.catBtn);
that.returnBtn = Ins.initSprite("55f703cd-f0d2-4ec1-9430-6193c1cbc1cb", 69);
that.returnBtn = Ins.initButton("55f703cd-f0d2-4ec1-9430-6193c1cbc1cb", 69);
that.bottomBtnGroup.addChild(that.returnBtn);
that.touchHeadBtn = Ins.initSprite("b7ec0f16-ea48-4e41-8def-7cc660fa93d7", 214);
that.touchHeadBtn = Ins.initButton("b7ec0f16-ea48-4e41-8def-7cc660fa93d7", 214);
that.bottomBtnGroup.addChild(that.touchHeadBtn);
that.playBtn = Ins.initSprite("922deced-62d2-4995-9dd6-82bc7913f362", 214);
that.playBtn = Ins.initButton("922deced-62d2-4995-9dd6-82bc7913f362", 214);
that.bottomBtnGroup.addChild(that.playBtn);
that.catRecall = Ins.initSprite("72345190-f95b-4152-bccf-393b8a5aa8d0", 69)
that.catRecall = Ins.initButton("72345190-f95b-4152-bccf-393b8a5aa8d0", 69)
that.bottomBtnGroup.addChild(that.catRecall);
that.hideAllActBtn();
that.changeBtnByUiType(that.uiType)
......@@ -298,7 +303,17 @@ export class MainSceneBtnUi extends Module {
/**召回猫咪事件 */
catRecallHandler() {
console.log("召回猫咪");
Ins.showModule("recallcatModal", { catType: Ins.userInfo.catType })
Ins.showLoading();
sendTbNet(TbNetName.recallInfo, {}, (s, r) => {
if (s) {
Ins.hideLoading();
Ins.showModule('recallcatModal', { catType: Ins.userInfo.catType, catName: Ins.userInfo.catName, recallInfo: r.data })
} else {
Ins.hideLoading();
Ins.showToast(r.message);
}
})
// Ins.showModule("recallcatModal", { catType: Ins.userInfo.catType })
}
/**补充精力 */
......
taobao_mini/client/components/comcatname/comcatname.acss
View file @ 1e17ae37
......@@ -79,10 +79,10 @@
background-color: rgba(0, 0, 0, 0);
}
.catname .catnameinput .catnameinputrandom {
width: 500rpx;
width: 150rpx;
height: 26rpx;
opacity: 1;
left: 0rpx;
left: 175rpx;
top: 121rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
......
taobao_mini/client/components/comcatname/comcatname.js
View file @ 1e17ae37
......@@ -2,16 +2,19 @@
import API from '../../api';
import resList from '../../resconfig/resList';
const app = getApp();
const { tbcc } = app;
const {
tbcc
} = app;
const {
textRiskIdentification
} = tbcc.tb;
textRiskIdentification,
commonToast
} = tbcc.tb;
Component({
props: {
catImgArr: ["90b114e6-83cb-46f1-b607-f88c50077b05", "4e471df6-01ab-421d-ba0b-084b2110dc6d" , "003e9904-aee4-4b8d-8d5d-fb4b1188bec1","90283bd3-4b18-4535-97a8-90318f068781"],
catImgArr: ["90b114e6-83cb-46f1-b607-f88c50077b05", "4e471df6-01ab-421d-ba0b-084b2110dc6d", "003e9904-aee4-4b8d-8d5d-fb4b1188bec1", "90283bd3-4b18-4535-97a8-90318f068781"],
catName: ""
},
data: {
......@@ -23,6 +26,8 @@ Component({
/**获取字符串字符长度 */
getlen(str) {
var strlen = 0;
console.log("名称长度", str.length)
console.log("charChodeAt", str.charCodeAt)
for (var i = 0; i < str.length; i++) {
if (str.charCodeAt(i) > 255) //如果是汉字，则字符串长度加2
strlen += 2;
......@@ -59,48 +64,58 @@ Component({
this.props.catName = e.detail.value;
// console.log(this.props.catName)
},
/**确认 */
/**确认领养 */
async catNameSure() {
let name = this.props.catName;
let len = this.getlen(name);
console.log("名称字符长度",len)
if (len <= 0) {
my.showToast({
content: "名字不能为空哦",
});
}else if(len>12){
} else if (len > 6) {
my.showToast({
content: "名字过长哦",
});
}else {
} else {
/**检查敏感词 */
console.log('检查敏感词',name)
console.log('检查敏感词', name)
const success = await textRiskIdentification(name).catch(err => {
console.log('textRiskIdentification error',err);
});
console.log('敏感词校验结果',success)
if(success!== true) {
commonToast(err)
console.log('textRiskIdentification error', err);
});
console.log('敏感词校验结果', success)
if (!success) {
commonToast("非法名称")
console.log('敏感词校验失败.')
return;
} else {
my.showLoading();
/**调用领养接口 */
const adoptCat = await API.adoptCat({
catName: name,
catType: this.props.selectType,
// invitedId: 'openId:AAHVNvjuAMaJc3uyPjeHlCEF'//honingwon
invitedId: app.inviteId
});
console.log("aaaa", adoptCat)
if (adoptCat && adoptCat.success) {
// my.showToast({content:'邀请成功'+app.inviteId})
my.hideLoading();
this.onModalClose();
this.onSelectCatOk();
} else {
console.log("ergerg")
my.hideLoading();
my.showToast({
content: adoptCat.message || '网络异常，请稍后重试~'
})
}
}
my.showLoading();
/**调用领养接口 */
const adoptCat = await API.adoptCat({
catName: name,
catType: this.props.selectType,
// invitedId: 'openId:AAHVNvjuAMaJc3uyPjeHlCEF'//honingwon
invitedId: app.inviteId
});
console.log("aaaa",adoptCat)
if (adoptCat && adoptCat.success) {
// my.showToast({content:'邀请成功'+app.inviteId})
my.hideLoading();
this.onModalClose();
this.onSelectCatOk();
} else {
console.log("ergerg")
my.showToast({content:adoptCat.message||'网络异常，请稍后重试~'})
}
}
console.log(this.props.catName)
}
......
taobao_mini/client/components/commessage/commessage.acss
View file @ 1e17ae37
......@@ -24,7 +24,7 @@
margin-top: -325rpx;
/* top: 418rpx; */
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
.message .message_bg {
width: 676rpx;
......@@ -34,15 +34,30 @@
transform-origin: 0rpx 0rpx 0rpx;
}
.message .message_txt {
width: 142rpx;
width: 676rpx;
height: 25rpx;
opacity: 1;
left: 268rpx;
left: 0rpx;
top: 355rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 26rpx;
color: #685b4e;
text-align: center;
}
.message .message_backTime {
width: 578rpx;
height: 58rpx;
opacity: 1;
display: block;
left: 60rpx;
top: 211rpx;
position: absolute;
font-size: 28rpx;
color: rgba(104, 91, 78, 1);
transform-origin: 0rpx 0rpx 0rpx;
text-align: center;
font-weight: bold;
}
.message .message_btn {
width: 45rpx;
......@@ -51,7 +66,7 @@
left: 577rpx;
top: 24rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
.message .message_closebtn {
width: 352rpx;
......@@ -60,5 +75,5 @@
left: 161rpx;
top: 510rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
taobao_mini/client/components/commessage/commessage.axml
View file @ 1e17ae37
<view class="message-modal">
<view class="message__shade modal-animate-fade-in" />
<view class="message ">
<image class="message_bg " src={{resList['ed31e83e-535d-45bf-ba5b-20827a4cd104'].url}} />
<view class="message modal-animate-zoom-in">
<image class="message_bg " src={{resList['fc1fd3ee-e606-46de-9bb6-ea5fb41567df'].url}} />
<label class="message_txt ">{{mydata.catName+" 留"}}</label>
<image class="message_btn " onTap="onModalClose" src={{resList['3ad6a924-dda8-49f4-b8fc-0e796347e802'].url}} />
<image class="message_closebtn " onTap="onModalClose" src={{resList['5488b126-f520-496f-ace6-010a89eb108f'].url}} />
<label class="message_backTime ">{{backTime}}</label>
<image class="message_btn" onTap="onModalClose" src={{resList['3ad6a924-dda8-49f4-b8fc-0e796347e802'].url}} />
<image class="message_closebtn btn" onTap="onModalClose" src={{resList['5488b126-f520-496f-ace6-010a89eb108f'].url}} />
</view>
</view>
\ No newline at end of file
taobao_mini/client/components/commessage/commessage.js
View file @ 1e17ae37
......@@ -2,31 +2,50 @@
import API from '../../api';
import resList from '../../resconfig/resList';
const app = getApp();
const { tbcc } = app;
const { commonToast } = tbcc.tb;
Component({
props: {
mydata:null
mydata: null
},
data: {
resList: resList,
backTime:''
backTime: ''
},
methods: {
onModalClose() {
const { onModalClose } = this.props;
onModalClose && onModalClose();
console.log('onModalClose')
}
},
async didMount(){
const recall = await API.recallInfo();
if(recall&&recall.success){
},
/**根据时间戳获取日期-月-日 */
getDateDayMonthByTime(time) {
let date = new Date(time);
let hours = date.getHours();
let minutes = date.getMinutes();
minutes = minutes <= 0 ? '' : minutes + '分'
date = hours + "点" + minutes;
return date;
},
async getBackTime() {
// my.showLoading();
// const recall = await API.recallInfo().catch(r=>{
// commonToast(r&&r.message)
// my.hideLoading();
// })||{};
// if (recall && recall.success) {
// my.hideLoading();
this.setData({
backTime:recall.data.backTime
backTime: this.getDateDayMonthByTime(this.props.mydata.recallInfo.backTime)
})
}else{
my.showToast(recall?recall.message:null);
// }
}
},
didMount() {
this.getBackTime();
}
});
\ No newline at end of file
taobao_mini/client/components/comrecallcat/comrecallcat.acss
View file @ 1e17ae37
......@@ -52,7 +52,7 @@
height: 105rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
.recallcat .recallbtngroup .recallbtngo {
width: 281rpx;
......@@ -60,7 +60,7 @@
opacity: 1;
left: 327rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
.recallcat .recallbtnclose {
width: 44rpx;
......
taobao_mini/client/components/comrecallcat/comrecallcat.axml
View file @ 1e17ae37
......@@ -3,8 +3,8 @@
<label class="recallcatbacklabel">{{timeText}}</label>
<label class="recallcathappycoin">{{happyCoinCnt}}</label>
<view class="recallbtngroup">
<image class="recallbtncancel" onTap="onModalClose" src={{resList['6957d9f3-9aa4-4ed6-9b83-57cc68f16512'].url}} />
<image class="recallbtngo" onTap="onRecallCat" src={{resList['6d8cdd11-fbc5-4e84-b5ef-1f74c9070738'].url}} />
<image class="recallbtncancel btn" onTap="onModalClose" src={{resList['6957d9f3-9aa4-4ed6-9b83-57cc68f16512'].url}} />
<image class="recallbtngo btn" disable="{{btnEnable}}" onTap="onRecallCat" src={{resList['6d8cdd11-fbc5-4e84-b5ef-1f74c9070738'].url}} />
</view>
<image class="recallbtnclose" onTap="onModalClose" src={{resList['29e80fbb-98ed-40fb-a11b-e14b45fee158'].url}} />
</view>
taobao_mini/client/components/comrecallcat/comrecallcat.js
View file @ 1e17ae37
......@@ -2,12 +2,18 @@
import API from '../../api';
import resList from '../../resconfig/resList';
const app = getApp();
const { tbcc } = app;
const { commonToast } = tbcc.tb;
Component({
props: {},
props: {
mydata:null
},
data: {
resList: resList,
timeText: '',
happyCoinCnt: ''
happyCoinCnt: '',
btnEnable:true
},
methods: {
onModalClose() {
......@@ -27,6 +33,7 @@ Component({
let hours = date.getHours();
let minutes = date.getMinutes();;
let seconds = date.getSeconds();
if (hours <= 0) {
if (minutes <= 0) {
// if (seconds <= 0) {
......@@ -47,36 +54,66 @@ Component({
return date;
},
/**计算两个时间戳相差的时间，小时，分，秒 */
compareTime(startTime,endTime){
let between = (endTime - startTime)/1000;
let hours = Math.floor(between%(24*36000)/3600);
let minutes = Math.floor(between%3600/60);
let seconds = Math.floor(between%60/60);
let date;
if (hours <= 0) {
if (minutes <= 0) {
// if (seconds <= 0) {
date = 0 + '小时' + 0 + '分';
// } else {
// date = seconds + "秒"
// }
} else {
date = hours + '小时' + minutes + '分';
}
} else {
date = hours + '小时' + minutes + '分';
}
return date;
},
/**召回猫，打开召回猫的奖励弹窗 */
async onRecallCat() {
const recallCat = await API.recallCat();
if(!this.data.btnEnable) return;
console.log("召回猫")
my.__clickDelay__(this);
my.showLoading();
const recallCat = await API.recallCat().catch(r=>{
my.hideLoading();
commonToast(r&&r.message);
})||{};
if (recallCat && recallCat.success) {
my.hideLoading();
this.onModalClose();
const {
onRecallCat
} = this.props;
onRecallCat && onRecallCat(recallCat.data);
my.__updateUserInfo__();
} else {
my.showToast({content:recallCat ? recallCat.message : null})
}
}
}
},
async didMount() {
const recall = await API.recallInfo();
console.log(recall);
if (recall && recall.success) {
var text = "猫咪预计" + this.getDateDayMonthByTime(recall.data.backTime - recall.data.serverTime) + "后回寝";
// const recall = await API.recallInfo().catch(r=>{
// commonToast(r&&r.message)
// })||{};
// console.log(recall);
// if (recall && recall.success) {
var text = "猫咪预计" + this.compareTime(this.props.mydata.recallInfo.serverTime , this.props.mydata.recallInfo.backTime) + "后回寝";
this.setData({
timeText: text,
happyCoinCnt: recall.data.value + ''
happyCoinCnt: this.props.mydata.recallInfo.value + ''
})
} else {
my.showToast(recall ? recall.message : null)
}
// }
}
});
\ No newline at end of file
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
View file @ 1e17ae37
<view disable-scroll="true" class="page-game">
<canvas disable-scroll="true" id="canvas" class="canvas" onTouchStart="onMouseEvent" onTouchMove="onMouseEvent" onTouchEnd="onMouseEvent" onReady="onCanvasReady">
<canvas disable-scroll="true" id="canvas" type="webgl" class="canvas" onTouchStart="onMouseEvent" onTouchMove="onMouseEvent" onTouchEnd="onMouseEvent" onReady="onCanvasReady">
</canvas>
</view>
......@@ -9,7 +9,7 @@
<message-modal a:if="{{messageModalVisible}}" mydata="{{messageModalData}}" onModalClose="closeMessageModal"></message-modal>
<view class="popcontainer" a:if="{{selectcatModalVisible}}"><selectcat-modal onModalClose="closeSelectcatModal" onSelectCat="selectCat"></selectcat-modal></view>
<view class="popcontainer" a:if="{{catnameModalVisible}}" ><catname-modal selectType="{{catType}}" onModalClose="closeCatnameModal" onSelectCatOk="selectCatOk" /></view>
<view class="popcontainer" a:if="{{recallcatModalVisible}}"><recallcat-modal onRecallCat="recallCat" onModalClose="closeRecallcatModal"></recallcat-modal></view>
<view class="popcontainer" a:if="{{recallcatModalVisible}}"><recallcat-modal mydata="{{recallcatModalData}}" onRecallCat="recallCat" onModalClose="closeRecallcatModal"></recallcat-modal></view>
<view class="popcontainer" a:if="{{getcatModalVisible}}"><getcat-modal selectType="{{catType}}" catName="{{catName}}" onPostSelectCat="postSelectCat" onModalClose="closeGetcatModal"></getcat-modal></view>
<view class="popcontainer" a:if="{{catbackbedModalVisible}}"><catbackbed-modal mydata="{{recallcatModalData}}" recallCatInfo="{{recallCatInfo}}" onUpdateUserInfo="updateUserInfo" onModalClose="closeCatbackModal"></catbackbed-modal></view>
<task-modal a:if="{{taskModalVisible}}" onModalClose="closeTaskModal"></task-modal>
......
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @ 1e17ae37
......@@ -35,7 +35,7 @@ Page({
data: {
catType: 1,
catName: '',
activityBaseInfo:null,
activityBaseInfo: null,
recallCatInfo: {},
taskModalVisible: 0,
messageModalVisible: false,
......@@ -53,9 +53,15 @@ Page({
catruleModalVisible: 0
},
async doHelp() {
if(!app.inviteId) return;
if (!app.inviteId) return;
commonToast('正在发起助力~')
const { success, data, message } = await API.doHelp({ inviteId: app.inviteId }).catch(res => {
const {
success,
data,
message
} = await API.doHelp({
inviteId: app.inviteId
}).catch(res => {
commonToast(res && res.message);
}) || {};
......@@ -89,7 +95,7 @@ Page({
console.log('on ready')
//授权和登录先搞
await this.getAuth();
// await this.getAuth();
// this.initCanvas();
my.__onMessage__ = (e) => {
this.onMessage(e)
......@@ -128,7 +134,18 @@ Page({
console.log("通知canvas刷新用户信息")
this.main && this.main.dispatchGlobalEvent("UPDATE_USERINFO")
}
my.__clickDelay__ = (obj) => {
obj.setData({
btnEnable:false
})
setTimeout(()=>{
if(obj){
obj.setData({
btnEnable:true
})
}
},2000)
}
// setTimeout(() => {
// my.__pageTo__('myprize')
// }, 100);
......@@ -166,12 +183,14 @@ Page({
this.doHelp();
}
},
fail: () => { console.log('createCanvas fail'); }
fail: () => {
console.log('createCanvas fail');
}
});
},
onCanvasReady(query) {
console.log('onCanvasReady',query)
console.log('onCanvasReady', query)
//授权和登录先搞
checkSystem().then(r => {
if (r) {
......@@ -312,45 +331,50 @@ Page({
app.nickName = nickName;
app.avatar = avatar;
this.login();
}
},
/**
* 登录接口
*/
async login() {
const {
nickName,
avatar
} = app;
const {
success, data,
} = await API.login({
userNick: nickName,
avatar
}).catch(res => {
commonToast(res && res.message);
}) || {};
const {
nickName,
avatar
} = app;
const {
success,
data,
} = await API.login({
userNick: nickName,
avatar
}).catch(res => {
commonToast(res && res.message);
}) || {};
if (success) {
app.openId = data.openId;
this.getActivityBaseInfoById();
}
if (success) {
app.openId=data.openId;
this.getActivityBaseInfoById();
}
},
/**
* 获取活动信息
*/
async getActivityBaseInfoById(){
async getActivityBaseInfoById() {
my.showLoading();
const {success,data} = await API.getActivityBaseInfoById().catch(r=>{
commonToast(r&&r.message)
})||{};
const {
success,
data
} = await API.getActivityBaseInfoById().catch(r => {
my.hideLoading();
commonToast(r && r.message)
}) || {};
if(success){
if (success) {
my.hideLoading();
this.setData({
activityBaseInfo:data
activityBaseInfo: data
})
this.initCanvas();
}
......@@ -382,6 +406,7 @@ Page({
},
/**召回猫 */
recallCat(r) {
this.main.dispatchGlobalEvent("RECALL_CAT");
this.setData({
recallCatInfo: r,
catbackbedModalVisible: true
......@@ -440,12 +465,15 @@ Page({
},
onShareAppMessage() {
// 返回自定义分享信息
let { path, ...rest } = SHARE_CONFIG;
console.log('app.openId',app.openId);
let {
path,
...rest
} = SHARE_CONFIG;
console.log('app.openId', app.openId);
if (app.openId) {
path = '/pages/pagecanvas/pagecanvas' + '?openId=' + app.openId;
}
console.log('path',path)
console.log('path', path)
return {
...rest,
......
taobao_mini/client/resconfig/resList.js
View file @ 1e17ae37
......@@ -495,6 +495,12 @@ const resList = {
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/unluckyBtn.e57fc34e49370d30a6942fb835395377a9cf4721.png',
uuid: 'c8c50400-1d65-4971-8be5-e4fb2eecfcd5'
},
'fc1fd3ee-e606-46de-9bb6-ea5fb41567df': {
name: 'catMessageBg',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/catMessageBg.e74d2bf93254933a994d05aa9ce29f9e3914c149.png',
uuid: 'fc1fd3ee-e606-46de-9bb6-ea5fb41567df'
}
};
export default resList;
taobao_mini/debug.log
View file @ 1e17ae37
This diff is collapsed.
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