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
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 131 deletions
mock/miniTb/babycare.getPrizesByLevel.json
View file @ 98066544
{ {
"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, "openId": "AAEaCvE-ALiIWXQsJuac30pr",
"properiodto": 1600, "type": 3,
"level": 1, "properiodfrom": 1,
"probability": "16", "activityId": "5f213ff79897b44ce1d2925d",
"openId": "AAFwCvE-ALiIWXYsJuTQVRpH", "lockStatus": 1,
"prizeType": 60, "credits": "",
"updateTime": 1594623032191, "deleteStatus": 1,
"type": 3, "rank": "",
"properiodfrom": 1, "startTime": "",
"activityId": "5f08084ec3ad3494b9201c0e", "id": "",
"ename": "", "stock": "",
"lockStatus": 1, "image": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01Zzj1FL1wMhS845iJp_!!2275046294-2-miniprogram.png",
"credits": "", "properiodto": 5000,
"createTime": 1594361933509, "amount": "",
"deleteStatus": 1, "level": 1,
"name": "60关奖品3", "probability": "50",
"useStock": 1, "prizeType": 10,
"rank": "", "updateTime": 1596078351399,
"_id": "123", "ename": "",
"id": "", "createTime": 1596014583758,
"stock": 200 "name": "实物1实物1实物1实",
}, "useStock": 0,
{ "_id": "5f213ff7738989c8b3f46f4b",
"image": "https://source.unsplash.com/user/erondu/80x80", "endTime": ""
"isBackUp": true, },
"properiodto": 10000, {
"level": 2, "switchStock": 2,
"probability": "84", "isBackUp": false,
"prizeType": 60, "openId": "AAEaCvE-ALiIWXQsJuac30pr",
"updateTime": 1594623032197, "type": 1,
"type": 5, "properiodfrom": 5001,
"properiodfrom": 1601, "activityId": "5f213ff79897b44ce1d2925d",
"activityId": "5f08084ec3ad3494b9201c0e", "lockStatus": 1,
"lockStatus": 1, "credits": "",
"createTime": 1594623032197, "deleteStatus": 1,
"deleteStatus": 1, "rank": "",
"name": "谢谢参与", "startTime": 1593475200000,
"useStock": 0, "id": "",
"_id": "456" "stock": "",
}, "image": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01fcO2aS1wMhS2wKUZO_!!2275046294-0-miniprogram.jpg",
{ "amount": "1",
"image": "https://source.unsplash.com/user/erondu/90x90", "properiodto": 10000,
"isBackUp": true, "level": 2,
"properiodto": 10000, "probability": "50",
"level": 2, "prizeType": 10,
"probability": "84", "updateTime": 1596078351410,
"prizeType": 60, "ename": "18c738e4b1de4de3b481885b0d5e0936",
"updateTime": 1594623032197, "createTime": 1596014583758,
"type": 5, "name": "优惠券1",
"properiodfrom": 1601, "useStock": 0,
"activityId": "5f08084ec3ad3494b9201c0e", "_id": "5f213ff7738989c8b3f46f4c",
"lockStatus": 1, "endTime": 1596239999000
"createTime": 1594623032197, },
"deleteStatus": 1, {
"name": "谢谢参与", "switchStock": 2,
"useStock": 0, "isBackUp": false,
"_id": "789" "openId": "AAEaCvE-ALiIWXQsJuac30pr",
}, "type": 3,
{ "properiodfrom": 10001,
"image": "https://source.unsplash.com/user/erondu/100x100", "activityId": "5f213ff79897b44ce1d2925d",
"isBackUp": true, "lockStatus": 1,
"properiodto": 10000, "credits": "",
"level": 2, "deleteStatus": 1,
"probability": "84", "rank": "",
"prizeType": 60, "startTime": "",
"updateTime": 1594623032197, "id": "",
"type": 5, "stock": "",
"properiodfrom": 1601, "image": "https://img.alicdn.com/imgextra/i4/2275046294/O1CN01avEmL01wMhS5Wxd63_!!2275046294-2-miniprogram.png",
"activityId": "5f08084ec3ad3494b9201c0e", "properiodto": 10000,
"lockStatus": 1, "amount": "",
"createTime": 1594623032197, "level": 3,
"deleteStatus": 1, "probability": "0",
"name": "谢谢参与", "prizeType": 10,
"useStock": 0, "updateTime": 1596078351423,
"_id": "1213" "ename": "",
}, "createTime": 1596014583758,
{ "name": "实物11",
"image": "https://source.unsplash.com/user/erondu/110x110", "useStock": 0,
"isBackUp": true, "_id": "5f213ff7738989c8b3f46f4d",
"properiodto": 10000, "endTime": ""
"level": 2, },
"probability": "84", {
"prizeType": 60, "switchStock": 2,
"updateTime": 1594623032197, "isBackUp": false,
"type": 5, "type": 3,
"properiodfrom": 1601, "properiodfrom": 10001,
"activityId": "5f08084ec3ad3494b9201c0e", "activityId": "5f213ff79897b44ce1d2925d",
"lockStatus": 1, "lockStatus": 1,
"createTime": 1594623032197, "credits": "",
"deleteStatus": 1, "deleteStatus": 1,
"name": "谢谢参与", "rank": "",
"useStock": 0, "startTime": "",
"_id": "9898" "id": "",
}, "stock": "",
{ "image": "https://img.alicdn.com/imgextra/i3/2275046294/O1CN01KWxBt41wMhS7Oiham_!!2275046294-2-miniprogram.png",
"image": "https://source.unsplash.com/user/erondu/120x120", "properiodto": 10000,
"isBackUp": true, "amount": "",
"properiodto": 10000, "level": 4,
"level": 2, "probability": "0",
"probability": "84", "prizeType": 10,
"prizeType": 60, "updateTime": 1596078351428,
"updateTime": 1594623032197, "ename": "",
"type": 5, "createTime": 1596078351428,
"properiodfrom": 1601, "name": "实物测试名称过长的啦",
"activityId": "5f08084ec3ad3494b9201c0e", "useStock": 0,
"lockStatus": 1, "_id": "5f22390fe5c0d7361f1e6b59",
"createTime": 1594623032197, "endTime": ""
"deleteStatus": 1, }
"name": "谢谢参与",
"useStock": 0,
"_id": "9654"
}
], ],
"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": "",
"drawStatus": 1, "level": 10,
"openId": "AAHuCvE-ALiIWXYsJuTb5S4W", "drawStatus": 1,
"createDay": "2020/07/14", "openId": "AAFgCvE-ALiIWXYsJuSLKdVt",
"avatar": "sdfwerwerwer", "createDay": "2020/07/30",
"type": 3, "avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=XFvSvGH0XmQGOFNWMCQyP08yX8cYPFgLXH*IXFMHvHcT&width=80&height=80&type=sns",
"prizeId": "5f08084e0cb7338a0a377c8d", "type": 3,
"activityId": "5f08084ec3ad3494b9201c0e", "prizeId": "5f213ff7738989c8b3f46f4b",
"ename": "", "activityId": "5f213ff79897b44ce1d2925d",
"userNick": "wmmmmm", "ename": "",
"name": "90关奖品4", "userNick": "lpf468169313",
"_id": "123" "name": "实物1实物1实物1实",
"_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