Skip to content

B
babycare_xiaoxiao
Commit 98066544 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

Merge branch 'master' of http://gitlab2.dui88.com/MrKwon/babycare_xiaoxiao

parents ee1f2a37 a1d2fb41
Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 131 deletions
mock/miniTb/babycare.getPrizesByLevel.json
View file @ 98066544
...@@ -2,121 +2,117 @@ ...@@ -2,121 +2,117 @@
"code": "000000", "code": "000000",
"data": [ "data": [
{ {
"switchStock": 1, "switchStock": 2,
"image": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01c4rCs11wMhRrsjEep_!!2275046294-2-miniprogram.png",
"isBackUp": false, "isBackUp": false,
"properiodto": 1600, "openId": "AAEaCvE-ALiIWXQsJuac30pr",
"level": 1,
"probability": "16",
"openId": "AAFwCvE-ALiIWXYsJuTQVRpH",
"prizeType": 60,
"updateTime": 1594623032191,
"type": 3, "type": 3,
"properiodfrom": 1, "properiodfrom": 1,
"activityId": "5f08084ec3ad3494b9201c0e", "activityId": "5f213ff79897b44ce1d2925d",
"ename": "",
"lockStatus": 1, "lockStatus": 1,
"credits": "", "credits": "",
"createTime": 1594361933509,
"deleteStatus": 1, "deleteStatus": 1,
"name": "60关奖品3",
"useStock": 1,
"rank": "", "rank": "",
"_id": "123", "startTime": "",
"id": "", "id": "",
"stock": 200 "stock": "",
}, "image": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01Zzj1FL1wMhS845iJp_!!2275046294-2-miniprogram.png",
{ "properiodto": 5000,
"image": "https://source.unsplash.com/user/erondu/80x80", "amount": "",
"isBackUp": true, "level": 1,
"properiodto": 10000, "probability": "50",
"level": 2, "prizeType": 10,
"probability": "84", "updateTime": 1596078351399,
"prizeType": 60, "ename": "",
"updateTime": 1594623032197, "createTime": 1596014583758,
"type": 5, "name": "实物1实物1实物1实",
"properiodfrom": 1601,
"activityId": "5f08084ec3ad3494b9201c0e",
"lockStatus": 1,
"createTime": 1594623032197,
"deleteStatus": 1,
"name": "谢谢参与",
"useStock": 0, "useStock": 0,
"_id": "456" "_id": "5f213ff7738989c8b3f46f4b",
"endTime": ""
}, },
{ {
"image": "https://source.unsplash.com/user/erondu/90x90", "switchStock": 2,
"isBackUp": true, "isBackUp": false,
"properiodto": 10000, "openId": "AAEaCvE-ALiIWXQsJuac30pr",
"level": 2, "type": 1,
"probability": "84", "properiodfrom": 5001,
"prizeType": 60, "activityId": "5f213ff79897b44ce1d2925d",
"updateTime": 1594623032197,
"type": 5,
"properiodfrom": 1601,
"activityId": "5f08084ec3ad3494b9201c0e",
"lockStatus": 1, "lockStatus": 1,
"createTime": 1594623032197, "credits": "",
"deleteStatus": 1, "deleteStatus": 1,
"name": "谢谢参与", "rank": "",
"useStock": 0, "startTime": 1593475200000,
"_id": "789" "id": "",
}, "stock": "",
{ "image": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01fcO2aS1wMhS2wKUZO_!!2275046294-0-miniprogram.jpg",
"image": "https://source.unsplash.com/user/erondu/100x100", "amount": "1",
"isBackUp": true,
"properiodto": 10000, "properiodto": 10000,
"level": 2, "level": 2,
"probability": "84", "probability": "50",
"prizeType": 60, "prizeType": 10,
"updateTime": 1594623032197, "updateTime": 1596078351410,
"type": 5, "ename": "18c738e4b1de4de3b481885b0d5e0936",
"properiodfrom": 1601, "createTime": 1596014583758,
"activityId": "5f08084ec3ad3494b9201c0e", "name": "优惠券1",
"lockStatus": 1,
"createTime": 1594623032197,
"deleteStatus": 1,
"name": "谢谢参与",
"useStock": 0, "useStock": 0,
"_id": "1213" "_id": "5f213ff7738989c8b3f46f4c",
"endTime": 1596239999000
}, },
{ {
"image": "https://source.unsplash.com/user/erondu/110x110", "switchStock": 2,
"isBackUp": true, "isBackUp": false,
"properiodto": 10000, "openId": "AAEaCvE-ALiIWXQsJuac30pr",
"level": 2, "type": 3,
"probability": "84", "properiodfrom": 10001,
"prizeType": 60, "activityId": "5f213ff79897b44ce1d2925d",
"updateTime": 1594623032197,
"type": 5,
"properiodfrom": 1601,
"activityId": "5f08084ec3ad3494b9201c0e",
"lockStatus": 1, "lockStatus": 1,
"createTime": 1594623032197, "credits": "",
"deleteStatus": 1, "deleteStatus": 1,
"name": "谢谢参与", "rank": "",
"startTime": "",
"id": "",
"stock": "",
"image": "https://img.alicdn.com/imgextra/i4/2275046294/O1CN01avEmL01wMhS5Wxd63_!!2275046294-2-miniprogram.png",
"properiodto": 10000,
"amount": "",
"level": 3,
"probability": "0",
"prizeType": 10,
"updateTime": 1596078351423,
"ename": "",
"createTime": 1596014583758,
"name": "实物11",
"useStock": 0, "useStock": 0,
"_id": "9898" "_id": "5f213ff7738989c8b3f46f4d",
"endTime": ""
}, },
{ {
"image": "https://source.unsplash.com/user/erondu/120x120", "switchStock": 2,
"isBackUp": true, "isBackUp": false,
"properiodto": 10000, "type": 3,
"level": 2, "properiodfrom": 10001,
"probability": "84", "activityId": "5f213ff79897b44ce1d2925d",
"prizeType": 60,
"updateTime": 1594623032197,
"type": 5,
"properiodfrom": 1601,
"activityId": "5f08084ec3ad3494b9201c0e",
"lockStatus": 1, "lockStatus": 1,
"createTime": 1594623032197, "credits": "",
"deleteStatus": 1, "deleteStatus": 1,
"name": "谢谢参与", "rank": "",
"startTime": "",
"id": "",
"stock": "",
"image": "https://img.alicdn.com/imgextra/i3/2275046294/O1CN01KWxBt41wMhS7Oiham_!!2275046294-2-miniprogram.png",
"properiodto": 10000,
"amount": "",
"level": 4,
"probability": "0",
"prizeType": 10,
"updateTime": 1596078351428,
"ename": "",
"createTime": 1596078351428,
"name": "实物测试名称过长的啦",
"useStock": 0, "useStock": 0,
"_id": "9654" "_id": "5f22390fe5c0d7361f1e6b59",
"endTime": ""
} }
], ],
"success": true, "success": true,
"message": "成功" "message": "成功"
} }
\ No newline at end of file \ No newline at end of file
mock/miniTb/babycare.luckyDraw.json
View file @ 98066544
{ {
"code": "000000", "code": "000000",
"data": { "data": {
"image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01TrcMYF1wMhRuCphHI_!!2275046294-2-miniprogram.png", "image": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01Zzj1FL1wMhS845iJp_!!2275046294-2-miniprogram.png",
"level": 90, "amount": "",
"level": 10,
"drawStatus": 1, "drawStatus": 1,
"openId": "AAHuCvE-ALiIWXYsJuTb5S4W", "openId": "AAFgCvE-ALiIWXYsJuSLKdVt",
"createDay": "2020/07/14", "createDay": "2020/07/30",
"avatar": "sdfwerwerwer", "avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=XFvSvGH0XmQGOFNWMCQyP08yX8cYPFgLXH*IXFMHvHcT&width=80&height=80&type=sns",
"type": 3, "type": 3,
"prizeId": "5f08084e0cb7338a0a377c8d", "prizeId": "5f213ff7738989c8b3f46f4b",
"activityId": "5f08084ec3ad3494b9201c0e", "activityId": "5f213ff79897b44ce1d2925d",
"ename": "", "ename": "",
"userNick": "wmmmmm", "userNick": "lpf468169313",
"name": "90关奖品4", "name": "实物1实物1实物1实",
"_id": "123" "_id": "AAFgCvE-ALiIWXYsJuSLKdVt1596078979091"
}, },
"success": true, "success": true,
"message": "成功" "message": "成功"
} }
\ No newline at end of file \ No newline at end of file
src/scene/LotteryScene.ts
View file @ 98066544
...@@ -91,7 +91,7 @@ export class LotteryScene extends Scene { ...@@ -91,7 +91,7 @@ export class LotteryScene extends Scene {
//如果是失败 //如果是失败
if (!res.success) return; if (!res.success) return;
let id; let id;
if (res.data && res.data._id) id = res.data._id; if (res.data && res.data.prizeId) id = res.data.prizeId;
this.enableMouseEvt(false); this.enableMouseEvt(false);
this.lotScroll.lot(id, () => { this.lotScroll.lot(id, () => {
this.enableMouseEvt(true) this.enableMouseEvt(true)
......
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