Commit 775856ae authored by spc's avatar spc

12

parent 7d7d0597
No preview for this file type
{
"success":true,
"message":"do amet magna",
"code":"occaecat dolore ea velit",
"data":{
"_id":"quis elit fugiat",
"itemId":-53889922.57002734,
"createTime":1600690251689,
"openId":"ea dolor eiusmod Excepteur",
"deleteStatus":-42319130.58476988,
"rule":"in",
"startTime":1604159868046,
"updateTime":1603460390561,
"endTime":1598228727513,
"title":"Ut tempor qui dolor laboris",
"awardReceiveExpiredTime":1601308120892
}
}
\ No newline at end of file
{"code":"adipisicing sunt","success":false,"message":"ea non","data":{"list":{"useUrl":"elit non labore","openId":-16899820.960220918,"_id":"Ut nulla","userNick":"in","avatar":"ullamco eu aliqua mollit eiusmod","activityId":"dolor","prizeId":"nulla enim non aliquip ipsum","type":1,"image":"https://dummyimage.com/400x400","name":"Duis nostrud dolore","drawStatus":1,"createTime":1602033015243,"updateTime":1610946860060,"addressdetail":"laboris ea tempor elit","area":"西湖区","city":"杭州市","phone":16270225970,"provice":"浙江省","receiveName":"labore magna aliquip","receiveTime":1608949355424,"expiredTime":1612654245440}}}
\ No newline at end of file
{
"code":"adipisicing sunt",
"success": true,
"message":"ea non",
"data":{
"list": [
{
"useUrl":"elit non labore",
"openId":-16899820.960220918,
"_id":"Ut nulla",
"userNick":"in",
"avatar":"ullamco eu aliqua mollit eiusmod",
"activityId":"dolor",
"prizeId":"nulla enim non aliquip ipsum",
"type": 3,
"image":"https://dummyimage.com/400x400",
"name":"Duis nostrud dolore",
"drawStatus": 1,
"createTime":1602033015243,
"updateTime":1610946860060,
"addressdetail":"laboris ea tempor elit",
"area":"西湖区",
"city":"杭州市",
"phone":16270225970,
"provice":"浙江省",
"receiveName":"labore magna aliquip",
"receiveTime":1608949355424,
"expiredTime":1612654245440
},
{
"useUrl":"elit non labore",
"openId":-16899820.960220918,
"_id":"Ut nulla",
"userNick":"in",
"avatar":"ullamco eu aliqua mollit eiusmod",
"activityId":"dolor",
"prizeId":"nulla enim non aliquip ipsum",
"type": 3,
"image":"https://dummyimage.com/400x400",
"name":"Duis nostrud dolore",
"drawStatus": 2,
"createTime":1602033015243,
"updateTime":1610946860060,
"addressdetail":"laboris ea tempor elit",
"area":"西湖区",
"city":"杭州市",
"phone":16270225970,
"provice":"浙江省",
"receiveName":"labore magna aliquip",
"receiveTime":1608949355424,
"expiredTime":1612654245440
},
{
"useUrl":"elit non labore",
"openId":-16899820.960220918,
"_id":"Ut nulla",
"userNick":"in",
"avatar":"ullamco eu aliqua mollit eiusmod",
"activityId":"dolor",
"prizeId":"nulla enim non aliquip ipsum",
"type": 3,
"image":"https://dummyimage.com/400x400",
"name":"Duis nostrud dolore",
"drawStatus":1,
"createTime":1602033015243,
"updateTime":1610946860060,
"addressdetail":"laboris ea tempor elit",
"area":"西湖区",
"city":"杭州市",
"phone":16270225970,
"provice":"浙江省",
"receiveName":"labore magna aliquip",
"receiveTime":1608949355424,
"expiredTime":1612654245440
},
{
"useUrl":"elit non labore",
"openId":-16899820.960220918,
"_id":"Ut nulla",
"userNick":"in",
"avatar":"ullamco eu aliqua mollit eiusmod",
"activityId":"dolor",
"prizeId":"nulla enim non aliquip ipsum",
"type": 3,
"image":"https://dummyimage.com/400x400",
"name":"Duis nostrud dolore",
"drawStatus": 3,
"createTime":1602033015243,
"updateTime":1610946860060,
"addressdetail":"laboris ea tempor elit",
"area":"西湖区",
"city":"杭州市",
"phone":16270225970,
"provice":"浙江省",
"receiveName":"labore magna aliquip",
"receiveTime":1608949355424,
"expiredTime":1612654245440
},
{
"useUrl":"elit non labore",
"openId":-16899820.960220918,
"_id":"Ut nulla",
"userNick":"in",
"avatar":"ullamco eu aliqua mollit eiusmod",
"activityId":"dolor",
"prizeId":"nulla enim non aliquip ipsum",
"type": 4,
"image":"https://dummyimage.com/400x400",
"name":"Duis nostrud dolore",
"drawStatus": 6,
"createTime":1602033015243,
"updateTime":1610946860060,
"addressdetail":"laboris ea tempor elit",
"area":"西湖区",
"city":"杭州市",
"phone":16270225970,
"provice":"浙江省",
"receiveName":"labore magna aliquip",
"receiveTime":1608949355424,
"expiredTime":1612654245440
},
{
"useUrl":"elit non labore",
"openId":-16899820.960220918,
"_id":"Ut nulla",
"userNick":"in",
"avatar":"ullamco eu aliqua mollit eiusmod",
"activityId":"dolor",
"prizeId":"nulla enim non aliquip ipsum",
"type": 1,
"image":"https://dummyimage.com/400x400",
"name":"Duis nostrud dolore",
"drawStatus": 5,
"createTime":1602033015243,
"updateTime":1610946860060,
"addressdetail":"laboris ea tempor elit",
"area":"西湖区",
"city":"杭州市",
"phone":16270225970,
"provice":"浙江省",
"receiveName":"labore magna aliquip",
"receiveTime":1608949355424,
"expiredTime":1612654245440
}
]
}
}
\ No newline at end of file
{
"code":-13061372.105427355,
"success":true,
"data":{
"isNewUser": true,
"openId": "laboris tempor",
"inviteId": "reprehenderit tempor"
}
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
const resCanvasListCsd = {
'63cb446e-1158-4a94-bf0c-c19ecc7d2cc6': {
name: 'openTexture',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/openTexture.4558fad0aadb7003efd6b71716816a93ad181283.png',
uuid: '63cb446e-1158-4a94-bf0c-c19ecc7d2cc6'
},
};
export default resCanvasListCsd;
\ No newline at end of file
var fs = require("fs");
// fs.writeFileSync(
// "./released/output.js",
// fs.readFileSync("./output.js")
// )
// var endPath = 'D:/duibaGame/测试项目0527/taobaominiTest/client/pages/index1/';
var endPath = '/Applications/DUIBA-TAOBAO/YD/new_taobao/taobao_mini/client/pages/pagecanvas/';
var version = Math.round(new Date().getTime() / 1000);
// fs.writeFileSync(endPath + "output." + version + ".js", fs.readFileSync("./released/output.js"));
fs.writeFileSync(endPath + "output.js", fs.readFileSync("./released/output.js"));
// console.log("js覆盖完成")
console.log(`版本号:
${version}`)
\ No newline at end of file
......@@ -31,6 +31,7 @@ export namespace InitLottie {
let textureJson = arr[i].json;
FYGE.GlobalLoader.loadImage((s, image) => {
if (s) {
// hhyy
FYGE.createTextureSheet(new FYGE.BaseTexture(image),textureJson );
} else {
mark = false
......
......@@ -6,7 +6,9 @@ import { destroyAllCtrls, changeScene, hideWaiting } from "../module/ctrls";
import { destroyNetData, sendTbNet, TbNetName } from "./TaoBaoNet";
import resCanvasList from '../resCanvasList';
import resCanvasList_ from '../resCanvasList';
import resCanvasListCsd from '../resCanvasListCsd'
const lottieTexture = require('./openAnimation/Texture.json')
import resloadingList from '../resloadingList';
import resLottieList from '../resLottieList';
import { setStage } from "./scenes/stage";
......@@ -15,6 +17,8 @@ import { Ins } from "./Ins";
import { InitLottie } from "./initLottie";
import { XxlScene } from "./xiaoxiaole/XxlScene";
import { CsdScene } from "./chuansongdai/MainScene";
import { OpenAni } from "./openAnimation/MainScene";
import { resolve } from "path";
/**
......@@ -84,6 +88,20 @@ export class Main {
this.gameType = gameType
if (gameType === 1) changeScene(CsdScene)
else if (gameType === 2) changeScene(XxlScene)
else if (gameType === 3) changeScene(OpenAni)
else return
}
loadImageTextures (resCanvasList) {
return new Promise((resolve, reject) => {
FYGE.GlobalLoader.loadImage((s, image) => {
if (s) {
console.log('loadImageTextures')
FYGE.createTextureSheet(new FYGE.BaseTexture(image), lottieTexture );
resolve('complete')
}
}, resCanvasList['63cb446e-1158-4a94-bf0c-c19ecc7d2cc6'].url)
})
}
private async onAddToStage() {
......@@ -100,15 +118,21 @@ export class Main {
Ins.stageW = this.stage.viewRect.width;
Ins.stageH = this.stage.viewRect.height;
console.log("舞台宽高:",Ins.stageW,Ins.stageH)
await RES.loadSparkAssets(resCanvasList);
console.log('resloadingList 加载完毕')
// XxlScene
changeScene(XxlScene)
let resCanvasList = Object.assign(resCanvasList_, resCanvasListCsd)
await RES.loadSparkAssets(resCanvasList)
console.log('resloadingList 加载完毕')
this.loadImageTextures(resCanvasList).then(res => {
changeScene(XxlScene)
})
// XxlScene
// changeScene(CsdScene)
// OpenAni
// await InitLottie.initLottieList(openLottieList);
console.log('resCanvasList 加载完毕')
await InitLottie.initLottieList(resLottieList);
console.log("initLottieList完成")
FYGE.GDispatcher.dispatchEvent("loadEnd");
......
import { Scene } from "../../module/views/Scene";
import { RES } from "../../module/RES";
import Root from './Root';
export class OpenAni extends Scene {
constructor(props) {
super(props)
}
initUi() {
super.initUi();
var canvas: FYGE.Container = new FYGE.Container();
canvas.position.set(0, 0);
this.addChild(canvas);
}
start() {
this.addChild(new Root())
}
}
import { RES } from "../../module/RES"
import resCanvasList from '../../resCanvasList'
import { GDispatcher } from './../Main';
import { open } from './outputTs/open'
export default class Root extends FYGE.Container {
time;
stageHeight;
backGround;
openAni;
constructor() {
super()
this.once(FYGE.Event.ADDED_TO_STAGE, this.onAddToStage, this)
// 全局-游戏开始
GDispatcher.addEventListener('animation-start', () => {}, this)
// 全局-游戏结束(外部监听)
GDispatcher.dispatchEvent('animation-over')
}
initUi () {
this.backGround = new FYGE.Sprite()
this.backGround.x = 0
this.backGround.y = 0
this.backGround.width = 750
this.backGround.height = 1624
this.backGround.texture = RES.getRes(resCanvasList['7fcd3fb3-57bd-436a-afca-989b68b6b311'].url)
this.backGround.visible = false
this.addChild(this.backGround)
this.openAni = new FYGE.Lottie(open)
this.addChild(this.openAni)
// this.openAni.visible = true
this.openAni.play(1)
}
animationStart () {
}
// 结束游戏
animationOver () {
}
// 创建倒计时
createCountdownTimer (options) {
}
onAddToStage () {
this.stageHeight = this.stage.viewRect.height
this.y = this.stage.viewRect.height / 2 - 1624 / 2
this.initUi()
}
}
{
"83bef15f-be0a-4119-a9fa-8fd4aed9217c.png": {
"x": 2,
"y": 2,
"w": 750,
"h": 1624,
"ox": 0,
"oy": 0,
"sw": 750,
"sh": 1624,
"ro": false
},
"ece8d585-6d05-423f-9202-4860976f56ed.png": {
"x": 754,
"y": 2,
"w": 750,
"h": 601,
"ox": 0,
"oy": 195,
"sw": 750,
"sh": 1624,
"ro": false
},
"门_00083.png": {
"x": 2,
"y": 1628,
"w": 48,
"h": 576,
"ox": 108,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00084.png": {
"x": 2,
"y": 1678,
"w": 56,
"h": 576,
"ox": 99,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00085.png": {
"x": 2,
"y": 1736,
"w": 66,
"h": 576,
"ox": 90,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00086.png": {
"x": 2,
"y": 1804,
"w": 74,
"h": 576,
"ox": 81,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00087.png": {
"x": 2,
"y": 1880,
"w": 84,
"h": 576,
"ox": 72,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00081.png": {
"x": 2,
"y": 1966,
"w": 29,
"h": 575,
"ox": 127,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00082.png": {
"x": 2,
"y": 1997,
"w": 38,
"h": 575,
"ox": 117,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00088.png": {
"x": 580,
"y": 1628,
"w": 92,
"h": 575,
"ox": 64,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00089.png": {
"x": 580,
"y": 1722,
"w": 100,
"h": 575,
"ox": 55,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00079.png": {
"x": 579,
"y": 1966,
"w": 14,
"h": 574,
"ox": 145,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00080.png": {
"x": 579,
"y": 1982,
"w": 19,
"h": 574,
"ox": 136,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00090.png": {
"x": 580,
"y": 1824,
"w": 108,
"h": 574,
"ox": 47,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00091.png": {
"x": 1156,
"y": 1824,
"w": 116,
"h": 574,
"ox": 39,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00078.png": {
"x": 580,
"y": 1942,
"w": 22,
"h": 573,
"ox": 145,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00092.png": {
"x": 1732,
"y": 2,
"w": 124,
"h": 573,
"ox": 31,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00077.png": {
"x": 579,
"y": 2003,
"w": 32,
"h": 572,
"ox": 145,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00093.png": {
"x": 1858,
"y": 2,
"w": 133,
"h": 572,
"ox": 23,
"oy": 532,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00076.png": {
"x": 1153,
"y": 2003,
"w": 40,
"h": 570,
"ox": 145,
"oy": 533,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00094.png": {
"x": 1858,
"y": 576,
"w": 140,
"h": 570,
"ox": 16,
"oy": 533,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00095.png": {
"x": 1506,
"y": 2,
"w": 146,
"h": 569,
"ox": 9,
"oy": 533,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00075.png": {
"x": 1993,
"y": 2,
"w": 49,
"h": 568,
"ox": 145,
"oy": 533,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00096.png": {
"x": 1506,
"y": 573,
"w": 154,
"h": 568,
"ox": 2,
"oy": 533,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00074.png": {
"x": 1155,
"y": 1942,
"w": 58,
"h": 567,
"ox": 145,
"oy": 533,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00097.png": {
"x": 1662,
"y": 577,
"w": 156,
"h": 567,
"ox": 0,
"oy": 533,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00073.png": {
"x": 1662,
"y": 2,
"w": 68,
"h": 566,
"ox": 145,
"oy": 533,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00098.png": {
"x": 1157,
"y": 1148,
"w": 156,
"h": 564,
"ox": 0,
"oy": 533,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00072.png": {
"x": 1157,
"y": 1714,
"w": 76,
"h": 563,
"ox": 145,
"oy": 533,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00071.png": {
"x": 1315,
"y": 1148,
"w": 83,
"h": 561,
"ox": 145,
"oy": 534,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00070.png": {
"x": 1400,
"y": 1148,
"w": 92,
"h": 559,
"ox": 145,
"oy": 534,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00099.png": {
"x": 1494,
"y": 1148,
"w": 156,
"h": 558,
"ox": 0,
"oy": 534,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00069.png": {
"x": 1652,
"y": 1148,
"w": 100,
"h": 557,
"ox": 145,
"oy": 534,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00068.png": {
"x": 1754,
"y": 1148,
"w": 108,
"h": 555,
"ox": 145,
"oy": 534,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00067.png": {
"x": 1864,
"y": 1148,
"w": 115,
"h": 552,
"ox": 145,
"oy": 535,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00100.png": {
"x": 754,
"y": 605,
"w": 156,
"h": 552,
"ox": 0,
"oy": 535,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00066.png": {
"x": 754,
"y": 763,
"w": 122,
"h": 549,
"ox": 145,
"oy": 535,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00065.png": {
"x": 754,
"y": 887,
"w": 130,
"h": 548,
"ox": 145,
"oy": 535,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00101.png": {
"x": 754,
"y": 1019,
"w": 156,
"h": 548,
"ox": 0,
"oy": 535,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00064.png": {
"x": 912,
"y": 1019,
"w": 136,
"h": 545,
"ox": 146,
"oy": 536,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00102.png": {
"x": 1732,
"y": 1707,
"w": 156,
"h": 543,
"ox": 0,
"oy": 536,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00063.png": {
"x": 1981,
"y": 1148,
"w": 141,
"h": 542,
"ox": 146,
"oy": 536,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00062.png": {
"x": 1308,
"y": 605,
"w": 147,
"h": 540,
"ox": 146,
"oy": 536,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00061.png": {
"x": 1732,
"y": 1865,
"w": 154,
"h": 537,
"ox": 146,
"oy": 536,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00060.png": {
"x": 2271,
"y": 1865,
"w": 159,
"h": 534,
"ox": 146,
"oy": 537,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00059.png": {
"x": 2000,
"y": 572,
"w": 165,
"h": 532,
"ox": 146,
"oy": 537,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00058.png": {
"x": 2044,
"y": 2,
"w": 170,
"h": 529,
"ox": 146,
"oy": 537,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00057.png": {
"x": 2124,
"y": 1106,
"w": 174,
"h": 526,
"ox": 146,
"oy": 538,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00056.png": {
"x": 2167,
"y": 533,
"w": 179,
"h": 523,
"ox": 147,
"oy": 538,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00055.png": {
"x": 2216,
"y": 2,
"w": 182,
"h": 521,
"ox": 147,
"oy": 538,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00054.png": {
"x": 2277,
"y": 1634,
"w": 186,
"h": 518,
"ox": 147,
"oy": 539,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00053.png": {
"x": 2300,
"y": 1058,
"w": 191,
"h": 515,
"ox": 147,
"oy": 539,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00052.png": {
"x": 2348,
"y": 525,
"w": 195,
"h": 513,
"ox": 147,
"oy": 539,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00051.png": {
"x": 2400,
"y": 2,
"w": 198,
"h": 510,
"ox": 147,
"oy": 540,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00050.png": {
"x": 2493,
"y": 1040,
"w": 201,
"h": 507,
"ox": 147,
"oy": 540,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00049.png": {
"x": 2545,
"y": 514,
"w": 202,
"h": 505,
"ox": 148,
"oy": 540,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00048.png": {
"x": 2600,
"y": 2,
"w": 206,
"h": 502,
"ox": 148,
"oy": 541,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00047.png": {
"x": 2696,
"y": 1021,
"w": 207,
"h": 500,
"ox": 148,
"oy": 541,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00046.png": {
"x": 2749,
"y": 506,
"w": 210,
"h": 498,
"ox": 148,
"oy": 541,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00045.png": {
"x": 2808,
"y": 2,
"w": 213,
"h": 495,
"ox": 148,
"oy": 541,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00044.png": {
"x": 2807,
"y": 1523,
"w": 215,
"h": 492,
"ox": 148,
"oy": 542,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00043.png": {
"x": 2905,
"y": 1006,
"w": 216,
"h": 490,
"ox": 149,
"oy": 542,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00042.png": {
"x": 2961,
"y": 499,
"w": 216,
"h": 489,
"ox": 149,
"oy": 542,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00041.png": {
"x": 3023,
"y": 2,
"w": 219,
"h": 487,
"ox": 149,
"oy": 542,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00040.png": {
"x": 3024,
"y": 1498,
"w": 219,
"h": 484,
"ox": 149,
"oy": 543,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00039.png": {
"x": 3123,
"y": 990,
"w": 220,
"h": 482,
"ox": 149,
"oy": 543,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00038.png": {
"x": 3179,
"y": 491,
"w": 221,
"h": 480,
"ox": 149,
"oy": 543,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00037.png": {
"x": 3244,
"y": 2,
"w": 222,
"h": 479,
"ox": 149,
"oy": 543,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00036.png": {
"x": 3245,
"y": 1474,
"w": 223,
"h": 476,
"ox": 149,
"oy": 544,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00035.png": {
"x": 3345,
"y": 973,
"w": 223,
"h": 475,
"ox": 150,
"oy": 544,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00034.png": {
"x": 3402,
"y": 483,
"w": 225,
"h": 473,
"ox": 150,
"oy": 544,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00033.png": {
"x": 3468,
"y": 2,
"w": 224,
"h": 472,
"ox": 150,
"oy": 544,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00032.png": {
"x": 3570,
"y": 958,
"w": 226,
"h": 471,
"ox": 150,
"oy": 544,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00031.png": {
"x": 3629,
"y": 476,
"w": 226,
"h": 468,
"ox": 150,
"oy": 545,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00030.png": {
"x": 3694,
"y": 2,
"w": 226,
"h": 467,
"ox": 150,
"oy": 545,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00029.png": {
"x": 3857,
"y": 471,
"w": 226,
"h": 466,
"ox": 150,
"oy": 545,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00028.png": {
"x": 3570,
"y": 1186,
"w": 227,
"h": 465,
"ox": 150,
"oy": 545,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00027.png": {
"x": 3570,
"y": 1415,
"w": 226,
"h": 464,
"ox": 150,
"oy": 545,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00026.png": {
"x": 3470,
"y": 1643,
"w": 225,
"h": 463,
"ox": 151,
"oy": 545,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00025.png": {
"x": 1725,
"y": 2021,
"w": 226,
"h": 462,
"ox": 151,
"oy": 545,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00024.png": {
"x": 3470,
"y": 1870,
"w": 227,
"h": 461,
"ox": 151,
"oy": 545,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00022.png": {
"x": 2807,
"y": 2017,
"w": 226,
"h": 459,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00023.png": {
"x": 2189,
"y": 2026,
"w": 226,
"h": 459,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00020.png": {
"x": 3268,
"y": 2099,
"w": 226,
"h": 458,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00021.png": {
"x": 3728,
"y": 2099,
"w": 226,
"h": 458,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00018.png": {
"x": 2650,
"y": 2245,
"w": 226,
"h": 457,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00019.png": {
"x": 3109,
"y": 2327,
"w": 226,
"h": 457,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00000.png": {
"x": 2,
"y": 2037,
"w": 226,
"h": 456,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00013.png": {
"x": 460,
"y": 2037,
"w": 226,
"h": 456,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00014.png": {
"x": 918,
"y": 2037,
"w": 226,
"h": 456,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": false
},
"门_00015.png": {
"x": 1146,
"y": 2045,
"w": 226,
"h": 456,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00016.png": {
"x": 1604,
"y": 2249,
"w": 226,
"h": 456,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": true
},
"门_00017.png": {
"x": 1146,
"y": 2273,
"w": 226,
"h": 456,
"ox": 151,
"oy": 546,
"sw": 750,
"sh": 1200,
"ro": true
}
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
No preview for this file type
......@@ -75,54 +75,53 @@ const apiList = {
isShowLoading: false
},
getActivityBaseInfoById: {
handle: 'getActivityBaseInfoById',
method:'get',
isShowLoading: false
},
// getActivityBaseInfoById: {
// handle: 'getActivityBaseInfoById',
// method:'get',
// isShowLoading: false
// },
// 领取实物奖品
// receiveObjectPrize: {
// handle: 'receiveObjectPrize',
// method:'get',
// isShowLoading: false
// },
receiveObjectPrize: {
handle: 'receiveObjectPrize',
method:'get',
isShowLoading: false
},
// 我的奖品列表
// getMyPrizeList: {
// handle: 'getMyPrizeList',
// method:'get',
// isShowLoading: false
// },
getMyPrizeList: {
handle: 'getMyPrizeList',
method:'get',
isShowLoading: false
},
// 发放权益
// receiveEnamePrize: {
// handle: 'receiveEnamePrize',
// method:'get',
// isShowLoading: false
// },
receiveEnamePrize: {
handle: 'receiveEnamePrize',
method:'get',
isShowLoading: false
},
// 获取会员信息
// getVipInfo: {
// handle: 'getVipInfo',
// method:'get',
// isShowLoading: false
// },
getVipInfo: {
handle: 'getVipInfo',
method:'get',
isShowLoading: false
},
// 概率抽奖
// drawLotteryPrize: {
// handle: 'getVipdrawLotteryPrizeInfo',
// method:'get',
// isShowLoading: false
// },
drawLotteryPrize: {
handle: 'getVipdrawLotteryPrizeInfo',
method:'get',
isShowLoading: false
},
// 获取商品列表
// getItemListByItemIds: {
// handle: 'getItemListByItemIds',
// method:'get',
// isShowLoading: false
// },
// getActivityBaseInfoById: {
// handle: 'getActivityBaseInfoById',
// method:'get',
// isShowLoading: false
// },
getItemListByItemIds: {
handle: 'getItemListByItemIds',
method:'get',
isShowLoading: false
}
};
// 生成API
......
......@@ -2,7 +2,7 @@ import cloud from '@tbmp/mp-cloud-sdk';
import tbcc from './tbcc-sdk';
cloud.init({
env: 'online' // 云函数环境 test 测试环境 online 线上环境
env: 'test' // 云函数环境 test 测试环境 online 线上环境
});
App({
......
{
"pages": [
"pages/myprize/myprize",
"pages/homePage/homePage",
"pages/myprize/myprize",
"pages/index/index",
"pages/pageshop/pageshop",
"pages/tbccDemo/tbccDemo"
......
......@@ -46,10 +46,6 @@
width: 700rpx;
height: 161rpx;
background-color: #ffffff;
border-color:rgb(255, 63, 38);
border-width: 1rpx;
border-style: solid;
/* box-shadow: 2rpx 3rpx 18rpx 0 rgb(255, 63, 38); */
border-radius: 10rpx;
box-sizing: border-box;
}
......@@ -66,6 +62,7 @@
display: flex;
flex-direction: column;
height: 130rpx;
position: relative;
}
.my-prize-page .my-prize-item .my-prize-subtitle {
......@@ -77,7 +74,9 @@
.my-prize-page .my-prize-item .my-prize-copy {
width: 20rpx;
height: 20rpx;
margin-left: 18rpx;
position: absolute;
right: 26rpx;
bottom: 38rpx;
}
.my-prize-page .my-prize-item .prize-status {
......@@ -92,6 +91,7 @@
.my-prize-page .my-prize-item .my-prize-name {
width: 100%;
margin-top: 20rpx;
font-size: 28rpx;
color: #2d2d2d;
letter-spacing: -1rpx;
......@@ -101,7 +101,7 @@
}
.my-prize-page .my-prize-item .my-prize-tip {
margin-top: 16rpx;
margin-top: 2rpx;
font-size: 20rpx;
line-height: 20rpx;
letter-spacing: 0;
......
<view class="my-prize-page" style="{{{'background':`url(${task.image.bg}) no-repeat center top/cover`}}}">
<view class="my-prize-wrap">
<view class="my-prize-label"></view>
<view class="my-prize-list" a:if="{{myPrizeList && myPrizeList.length > 0}}">
<view class="my-prize-list" a:if="{{myPrizeList && myPrizeList.length > 0}}">
<view class="my-prize-item" a:for="{{myPrizeList}}">
<image class="my-prize-avatar" src="{{item.image}}"/>
......@@ -19,7 +20,7 @@
<image class="my-prize-copy" data-text="{{item._id}}" onTap="handleCopyId" src="{{task.image.copyIcon}}" />
<view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FAILURE}}">{{item.remark}}</view>
<view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.REPEAT || (item.drawStatus === PRIZE_DRAW_STATUS_MAP.RECEIVE)}}">请于{{endTime}}前领取</view>
<view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.REPEAT || (item.drawStatus === PRIZE_DRAW_STATUS_MAP.RECEIVE)}}">请于{{item.endTime}}前领取</view>
<view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FINISHED }}">奖品已过期失效</view>
</view>
......
......@@ -13,15 +13,30 @@ Component({
},
props: {
myPrizeList: null, //我的奖品
endTime: null,//到期时间
task: {
image: {},
logisticsImage: {},
btnStyle: {}
}
},
didMount() { },
didUpdate() { },
didMount() {
this.setData({
myPrizeList: this.props.myPrizeList
})
},
didUpdate(prevProps, prevData) {
this.setData({
myPrizeList: this.props.myPrizeList
})
// if (this.props.myPrizeList !== prevProps.gameType) {
// this.setData({ gameType: this.props.gameType })
// // 切换游戏场景
// if (!this.main) return
// this.main.changeGameSence(this.props.gameType)
// }
},
didUnmount() { },
onShareAppMessage() {
return SHARE_CONFIG;
......
......@@ -8,6 +8,21 @@
background: white;
}
.homepage_animation {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
overflow: hidden;
z-index: 30;
}
.homepage_animation_canvas {
width:100%;
height:100%;
}
.homepage_pagecanvas {
position: absolute;
top: 0;
......
<!-- 业务页面部分 -->
<view class="homepage_wrapper {{ gameShow ? 'block_opciaty0' : '' }}" hidden="{{ gameShow_timeout }}">
<!-- 主页 -->
<view class="homepage_mian">
<view class="homepage_back">
<image class="bei_jing80" src="{{resList['abe2084e-ff0b-454d-ad6e-a9117e44bdaa'].url}}" />
......@@ -11,7 +12,7 @@
<view class="head">
<image class="head_ruler" onTap="showRewardsModal" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" />
<!-- <image class="head_ruler" onTap="" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" /> -->
<image class="head_rewards" onTap="showPrizesModal" src="{{resList['74a63fd3-6776-44a2-990e-fadac00fb757'].url}}" />
<image class="head_rewards" onTap="gotoMyPrizePage" src="{{resList['74a63fd3-6776-44a2-990e-fadac00fb757'].url}}" />
</view>
......@@ -93,7 +94,7 @@
</view>
<!-- 游戏部分 -->
<!-- 动画 - 游戏部分 -->
<pagecanvas
class="homepage_pagecanvas"
hidden="{{ !gameShow }}"
......
......@@ -48,8 +48,8 @@ Page({
gameShow: false,
// 出现 游戏 - 具有延迟的
gameShow_timeout: false,
// 展示游戏类型: 1 - 传送带, 2 - 消消乐, 0 - 不展示
gameType: 1,
// 展示游戏类型: 1 - 传送带, 2 - 消消乐, 3 - 开场动画, 0 - 不展示
gameType: 0,
commonModalConfirm: null,
commonModalVisible: false,
ruleModalVisible: false,
......@@ -77,14 +77,21 @@ Page({
],
onLoad(query) {
// 页面加载
// this.getAuth();
console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
// 页面加载
this.openAnimation().then(res => {
// this.getAuth();
this.backToPage()
this.init()
})
},
init() {
// todo: save data
console.log('do init')
API.getActivityBaseInfoById({activityId: app.activityId}).then(res => {
console.log(res)
})
},
// 页面加载完成
......@@ -154,6 +161,15 @@ Page({
});
},
openAnimation () {
return new Promise((resolve, reject) => {
this.setData({ gameShow: true, gameType: 3, gameShow_timeout: true })
setTimeout(() => {
resolve('complete')
}, 5000)
})
},
// 切换到游戏
changeGameOrPage (e) {
let type = Number(e.currentTarget.dataset.gameType)
......@@ -164,7 +180,7 @@ Page({
// 从游戏 返回 到 主页
backToPage () {
this.setData({ gameShow_timeout: false })
this.setData({ gameShow_timeout: false, gameType: 0 })
setTimeout(() => { this.setData({ gameShow: false }) }, 350)
},
......@@ -173,11 +189,9 @@ Page({
videoTurnLeft () {
let i = this.data.videoActiveIndex
if (i > 0) {
console.log('turn left')
this.videoCtx.stop()
this.videoRecord(i)
setTimeout(() => {
console.log('videoTurnLeft')
i -= 1
let vsrc = this.videoSrcArr[i].url,
psrc = this.posterSrcArr[i]
......@@ -195,11 +209,9 @@ Page({
videoTurnRight () {
let i = this.data.videoActiveIndex
if (i < this.videoSrcArr.length - 1) {
console.log('turn right')
this.videoCtx.stop()
this.videoRecord(i)
setTimeout(() => {
console.log('videoTurnRight')
i += 1
let vsrc = this.videoSrcArr[i].url,
psrc = this.posterSrcArr[i]
......@@ -240,23 +252,16 @@ Page({
},
// video - onPlay
onPlay() {
this.timeStampCountFlag = true
console.log('---- 视频开始播放')
},
onPlay() { this.timeStampCountFlag = true },
// video - onPause
onPause() {
console.log('---- 视频播放暂停')
console.log('timeStamp', this.timeStamp)
console.log('---- 视频播放暂停', this.timeStamp)
this.videoRecord(this.data.videoActiveIndex)
},
// video - onEnded
onEnded(e) {
console.log('---- 视频播放结束', e)
// this.videoRecord(this.data.videoActiveIndex)
},
onEnded(e) { console.log('---- 视频播放结束', e) },
// video - onPlayError
onPlayError(err) { console.warn('---- 视频播放错误', err) },
......@@ -287,6 +292,10 @@ Page({
});
},
gotoMyPrizePage() {
my.navigateTo({url: '../myprize/myprize'})
},
// 跳转到天猫页面
goTmallPage() { navigateToOutside(REDIRECT_URL['tmall']); },
......
<view class="my-prize">
<prize-modal
myPrizeList="{{myPrizeList}}"
<prize-modal
myPrizeList="{{myPrizeList}}"
task="{{task}}"
endTime="{{endTime}}"
endTime="{{endTime}}"
onHandleClick="handleClick"/>
</view>
\ No newline at end of file
......@@ -17,18 +17,20 @@ Page({
task: {
image: {
bg: '//yun.duiba.com.cn/spark/assets/bg1.d818f787351875b0982937d8bb68b0655febec3c.png', //背景图
copyIcon: '//yun.dui88.com/duiba-components-c-myprizemyprize_copy_code.png', //复制
addressBth: '//yun.duiba.com.cn/aurora/assets/82cc3c6d8861334ebaf128c98e3341b687bdc007.png', //填写地址(实物奖品)
getBth: '//yun.dui88.com/duiba-components-c-myprizeget_now.png', //立即领取(除实物奖品外)
logisticsBth: '//yun.duiba.com.cn/aurora/assets/661f86ff3392cb3b56922b048acf74bebc07bb23.png', //查看物流
useBtn: '//yun.duiba.com.cn/aurora/assets/0829f92f771c5e9fdb05a258a46b2d038d3a9997.png', //去使用(除实物奖品外)
gotBtn: '//yun.duiba.com.cn/aurora/assets/1120dd6b6ce4abe2666e877e3ae33eb99a778009.png', //已领取(优惠券)
getAgainBtn: '//yun.duiba.com.cn/aurora/assets/716f0a388144945b169554a30ff4a16f7bcb95ab.png', //重新领取
invalidBtn: '//yun.duiba.com.cn/spark/assets/914ba8643c8abb8d710a3126ec312aecf6c4daf0.png', //已失效
failBth: '//yun.duiba.com.cn/spark/assets/8267375232058a6d0140270b1594427fb08d6ae3.png', //领取失败
copyIcon: '//yun.duiba.com.cn/spark/assets/copyicon.4017db37e6be807f8b864c962beafdfeeaeb26f0.png', //复制
logisticsBth: '//yun.duiba.com.cn/spark/assets/mybtn查看物流.03ea3cdd889c8f09885b24a56dc99460734bc8a6.png', //查看物流
useBtn: '//yun.duiba.com.cn/spark/assets/mybtn去使用.c0276af13ecf949f4624244458dad57128641a54.png', //去使用(除实物奖品外)
addressBth: '//yun.duiba.com.cn/spark/assets/mybtn填写地址.ca58f849aea9c78e0290060624e1dd987ca988ae.png', //填写地址(实物奖品)
addressPriceBth: '//yun.duiba.com.cn/spark/assets/mybtn付邮费领取.dc12fb67b913ba8dd444e800b70f4fd54d377692.png', //填写地址(实物奖品)
jj: '//yun.duiba.com.cn/spark/assets/mybtn立即领取.3b85dd66efc6c18549868f543d48c9e6152d2432.png', //立即领取(除实物奖品外)
gotBtn: '//yun.duiba.com.cn/spark/assets/mybtn已领取.e342f48a85fbf9421a45cab37a3eb12eec091705.png', //已领取(优惠券)
getAgainBtn: '//yun.duiba.com.cn/spark/assets/mybtn重新领取.aba2a7e3d9f7724bb6f1aed8ccb50cea0268d0fb.png', //重新领取
invalidBtn: '//yun.duiba.com.cn/spark/assets/mybtn已失效.2fc529b912383145770f97a6c9dd7c413e528172.png', //已失效
failBth: '//yun.duiba.com.cn/spark/assets/mybtn领取失败.3fd23d113a41180b24da14e071772e167ce13b1a.png', //领取失败
doOptions: '//yun.duiba.com.cn/spark/assets/mybtn处理中.2b580c9a13cbaf0f905461d05f7f9a567c63f340.png', //处理中
},
logisticsImage: {
shipped: '//yun.duiba.com.cn/aurora/assets/3a7b68ec171ee339ce619d19f6ae3f9c1e6d801a.png', // 已发货物弹窗
shipped: '//yun.duiba.com.cn/aurora/assets/3a7b68ec171ee339ce619d19f6ae3f9c1e6d801a.png', // 已发货物弹窗
notShipped: '//yun.duiba.com.cn/aurora/assets/ee0300d7b472c555ecf0b7b8d582fcf9189c2d19.png', // 待发货物流弹窗
copyIcon: '//yun.dui88.com/duiba-components-c-myprizemyprize_copy_code.png', //复制
},
......@@ -48,20 +50,25 @@ Page({
// 到期时间
getEndTime(prizeList = []) {
if (!prizeList || !prizeList.length) return null
const endTime = prizeList[0].expiredTime
if (!endTime) return null;
const yy = new Date(endTime).getFullYear();
const mm = new Date(endTime).getMonth() + 1;
const dd = new Date(endTime).getDate();
const t1 = `${yy}${mm}${dd}日`;
// console.log(new Date(endTime).toLocaleDateString())
// const t1 = new Date(endTime).toLocaleDateString() + '';//获取年月日
const t2 = new Date(endTime).getHours() + '';//获取时
const t3 = new Date(endTime).getMinutes() + '';//获取分
const t4 = new Date(endTime).getMilliseconds() + '';//获取秒
console.log(endTime, new Date(endTime + 48 * 60 * 60 * 1000).toLocaleString(), 'endTime');
prizeList.forEach(item => {
// + 8 * 60 * 60 * 1000
const endTime = item.expiredTime
if (!endTime) return null;
const yy = new Date(endTime).getFullYear();
const mm = new Date(endTime).getMonth() + 1;
const dd = new Date(endTime).getDate();
const t1 = `${yy}${mm}${dd}日`;
// console.log(new Date(endTime).toLocaleDateString())
// const t1 = new Date(endTime).toLocaleDateString() + '';//获取年月日
const t2 = new Date(endTime).getHours() + '';//获取时
const t3 = new Date(endTime).getMinutes() + '';//获取分
const t4 = new Date(endTime).getMilliseconds() + '';//获取秒
item.endTime = t1 + ' ' + t2 + ':' + t3
console.log('endTime', endTime, t1 + ' ' + t2 + ':' + t3);
})
this.setData({
endTime: t1 + "" + t2.padStart(2, '0') + ":" + t3.padStart(2, '0') + ":" + t4.padStart(2, '0')
myPrizeList: prizeList
})
},
......@@ -74,16 +81,18 @@ Page({
if (type != 'noLoading') {
my.showLoading();
}
const { success, data, message } = await API.getMyPrizeList({ activityId }).catch(res => {
const { success, data, message } = await API.getMyPrizeList({ activityId })
.catch(res => {
this.setData({
myPrizeList: []
})
}) || {};
if (success && data) {
this.setData({
myPrizeList: data
myPrizeList: data.list
})
this.getEndTime(data)
this.getEndTime(data.list)
}
if (type != 'noLoading') {
my.hideLoading();
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -9,7 +9,7 @@
bottom: 0;
right: 0;
min-height: 100vh; */
background: pink;
background: #fff;
width:100%;
height:100vh;
flex: 1;
......
......@@ -13,7 +13,7 @@ const checkSystem = async () => {
Component({
data: {
// 当前正在进行的游戏
gameType: 1,
gameType: 0,
// 规则弹窗
ruleModalVisible: false,
// 消息弹窗
......
......@@ -310,6 +310,66 @@ const resList = {
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/弹窗背景_奖品.dce4e3dd9a3fcae166dfbd934b714ce1bc7fa5c9.png',
uuid: '2e62917e-4616-4290-96d6-b44345488506'
},
'14063684-72ca-4041-87f3-c4f29053f903': {
name: 'mybtn付邮费领取',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/mybtn付邮费领取.dc12fb67b913ba8dd444e800b70f4fd54d377692.png',
uuid: '14063684-72ca-4041-87f3-c4f29053f903'
},
'aa5ee113-8bcc-4ac3-8569-4721c104c232': {
name: 'mybtn立即领取',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/mybtn立即领取.3b85dd66efc6c18549868f543d48c9e6152d2432.png',
uuid: 'aa5ee113-8bcc-4ac3-8569-4721c104c232'
},
'5fbe734e-092e-40de-aa90-89581efb18c4': {
name: 'mybtn领取失败',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/mybtn领取失败.3fd23d113a41180b24da14e071772e167ce13b1a.png',
uuid: '5fbe734e-092e-40de-aa90-89581efb18c4'
},
'347cd0cd-00ce-4cd9-bb34-555506b20cef': {
name: 'mybtn填写地址',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/mybtn填写地址.ca58f849aea9c78e0290060624e1dd987ca988ae.png',
uuid: '347cd0cd-00ce-4cd9-bb34-555506b20cef'
},
'df32b139-bce5-4607-bf7d-db9b14741b08': {
name: 'mybtn已领取',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/mybtn已失效.2fc529b912383145770f97a6c9dd7c413e528172.png',
uuid: 'df32b139-bce5-4607-bf7d-db9b14741b08'
},
'3aa09e87-abaa-4eb5-b828-534aad0d66bd': {
name: 'mybtn已失效',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/mybtn重新领取.aba2a7e3d9f7724bb6f1aed8ccb50cea0268d0fb.png',
uuid: '3aa09e87-abaa-4eb5-b828-534aad0d66bd'
},
'cf096733-2bd6-4893-b139-e541f53fb64d': {
name: 'mybtn重新领取',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/mybtn已领取.e342f48a85fbf9421a45cab37a3eb12eec091705.png',
uuid: 'cf096733-2bd6-4893-b139-e541f53fb64d'
},
'92011b17-1c87-4ef4-950d-6181f8358b24': {
name: 'copyicon',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/copyicon.4017db37e6be807f8b864c962beafdfeeaeb26f0.png',
uuid: '92011b17-1c87-4ef4-950d-6181f8358b24'
},
'ad89f801-daeb-44c9-9702-040972a4f5a1': {
name: 'mybtn去使用',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/mybtn去使用.c0276af13ecf949f4624244458dad57128641a54.png',
uuid: 'ad89f801-daeb-44c9-9702-040972a4f5a1'
},
'a5624249-1ab0-4cc8-bdfb-6e7c68a329d8': {
name: 'mybtn查看物流',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/mybtn查看物流.03ea3cdd889c8f09885b24a56dc99460734bc8a6.png',
uuid: 'a5624249-1ab0-4cc8-bdfb-6e7c68a329d8'
}
};
export default resList;
......@@ -103,7 +103,8 @@ const request = ({ cloud, cloudName, requestType = 'cloud' }) => {
// console.log('requestCloud', _cloudName, handle, params);
// return requestType === 'ams' ? requestAms() : requestCloud();
return (requestType === 'ams' || requestType === 'yapi') ? requestMock() : requestCloud();
if (requestType === 'yapi') return requestMock()
else if (requestType === 'ams') return requestCloud()
};
};
......
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