Skip to content

N
new_taobao
Commit 68ca898c authored by Edwise's avatar Edwise 🍷
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/tianmaoxiaoyuan' into tianmaoxiaoyuan

parents 4444d73f 52000307
Show whitespace changes
Inline Side-by-side
Showing with 134 additions and 364 deletions
project/src/canvas/game/mock/miniTb/tmallCat.getMyPrizeList.json
View file @ 68ca898c
...@@ -3,225 +3,15 @@ ...@@ -3,225 +3,15 @@
"data": { "data": {
"list": [ "list": [
{ {
"_id": "5f6d89ea52bbded304a960ac", "_id": "5f71d38a67f1375241ab6b2b",
"activityId": "5f6b09b3c3ad342fed5a0b21", "activityId": "5f7183e852bbded304b27d71",
"createDay": "2020/09/25",
"createTime": 1601014250919,
"drawStatus": 1,
"ename": "",
"expiredTime": 1601628302000,
"id": "5f6d89ea52bbded304a960ac",
"image": "https://img.alicdn.com/imgextra/i2/2208492139886/O1CN01XlNdWj2Mtq8E9OEw1_!!2208492139886-2-miniprogram.png",
"name": "兑换奖励235",
"openId": "AAHVNvjuAMaJc3uyPjeHlCEF",
"prizeDataType": 2,
"prizeId": "5f6b09b39897b412b595a32b",
"remark": "",
"type": 3,
"updateTime": 1601014250919,
"userNick": "honingwon"
},
{
"_id": "5f6d89e70cb733e8927b749f",
"activityId": "5f6b09b3c3ad342fed5a0b21",
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "7254115b0fcc4c77bdbb35ed658c1db2",
"createDay": "2020/09/25",
"createTime": 1601014247528,
"drawStatus": 1,
"effective_interval": 31,
"effective_time_mode": "RELATIVE",
"ename": "",
"end_date": "2020-12-23 23:59:59",
"expiredTime": 1601628302000,
"feature": {
"couponTag": "49534003",
"description": "酒店信用住立减券",
"sellerId": "4064563648",
"spreadId": "3465672059",
"subActId": "34922",
"templateCode": "3545184060",
"title": "酒店信用住优惠券",
"uuid": "6ff76ab7cf3c4002be6f64902e659322"
},
"has_inventory": true,
"id": "5f6d89e70cb733e8927b749f",
"image": "",
"interval_time_unit": "DAYS",
"material": {
"benefitBigPic": "https://gw.alicdn.com/tfs/TB1aF67RFP7gK0jSZFjXXc5aXXa-895-703.png",
"benefitSmallPic": "https://gw.alicdn.com/tfs/TB1aF67RFP7gK0jSZFjXXc5aXXa-895-703.png",
"benefitUrl": "https://h5.m.taobao.com/trip/hotel/search/index.html?ttid=12zfb000000416"
},
"name": "",
"openId": "AAHVNvjuAMaJc3uyPjeHlCEF",
"prizeDataType": 2,
"prizeId": "5f6c3e7d114fbbc8c98bffae",
"remark": "",
"send_life_cycle_state": "running",
"show_rules": {
"show_rule_dto": [
{
"passed": true,
"type": "WIN_LIMIT"
}
]
},
"start_date": "2020-07-15 15:45:12",
"strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
"test": false,
"title": "酒店最高减50元券",
"type": 1,
"type_desc": "飞猪资格券",
"updateTime": 1601014247528,
"userNick": "honingwon"
},
{
"_id": "5f6d89e4e5c0d71b268d571f",
"activityId": "5f6b09b3c3ad342fed5a0b21",
"amount": 10000,
"amount_unit": "分",
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "f8564ef50a86418b9226ce1d9bb6ace6",
"createDay": "2020/09/25",
"createTime": 1601014244212,
"display_amount": "100",
"display_amount_unit": "元",
"display_start_fee": "200",
"drawStatus": 1,
"effective_end": "2020-09-30 00:00:00",
"effective_start": "2020-08-28 00:00:00",
"effective_time_mode": "ABSOLUTE",
"ename": "",
"end_date": "2020-09-26 23:59:59",
"expiredTime": 1601628302000,
"feature": {
"bcType": "B",
"couponTag": "1002",
"itemIds": "611439436633",
"sellerId": "2838892713",
"shopId": "150920153",
"shopLogo": "/5a/f4/TB16vpHhER1BeNjy0FmSuv0wVXa.jpg",
"shopName": "华为官方旗舰店",
"shopSiteCategory": "3",
"shopUrl": "//store.taobao.com/shop/view_shop.htm?shop_id=150920153",
"spreadId": "4328244590",
"templateCode": "15417747656",
"title": "freebuds 3",
"uuid": "ea9a79c0459640f8aeb94c24530e4141"
},
"has_inventory": true,
"id": "5f6d89e4e5c0d71b268d571f",
"image": "",
"material": {
"brandLogo": "T1bOKxFoFcXXb1upjX.jpg"
},
"name": "",
"openId": "AAHVNvjuAMaJc3uyPjeHlCEF",
"prizeDataType": 2,
"prizeId": "5f6c3e7d114fbbc8c98bffae",
"remark": "",
"send_life_cycle_state": "running",
"show_rules": {
"show_rule_dto": [
{
"passed": true,
"type": "WIN_LIMIT"
}
]
},
"start_date": "2020-08-28 11:04:24",
"start_fee": 20000,
"strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
"test": false,
"title": "freebuds 3",
"type": 1,
"type_desc": "商品优惠券",
"updateTime": 1601014244212,
"userNick": "honingwon"
},
{
"_id": "5f6d89709da6714846638db1",
"activityId": "5f6b09b3c3ad342fed5a0b21",
"amount": 20000,
"amount_unit": "分",
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "a66621ec7c434842bfe4d01082128f1d",
"createDay": "2020/09/25",
"createTime": 1601014128038,
"display_amount": "200",
"display_amount_unit": "元",
"display_start_fee": "2000",
"drawStatus": 1,
"effective_end": "2020-10-11 00:00:00",
"effective_start": "2020-08-24 00:00:00",
"effective_time_mode": "ABSOLUTE",
"ename": "",
"end_date": "2020-09-25 23:59:59",
"expiredTime": 1601628302000,
"feature": {
"bcType": "B",
"couponTag": "1002",
"itemIds": "611952670190",
"sellerId": "2838892713",
"shopId": "150920153",
"shopLogo": "/5a/f4/TB16vpHhER1BeNjy0FmSuv0wVXa.jpg",
"shopName": "华为官方旗舰店",
"shopSiteCategory": "3",
"shopUrl": "//store.taobao.com/shop/view_shop.htm?shop_id=150920153",
"spreadId": "4327893208",
"templateCode": "15398721100",
"title": "MatePro",
"uuid": "1094cefe51a348698e6647f5e6ba4181"
},
"has_inventory": true,
"id": "5f6d89709da6714846638db1",
"image": "",
"material": {
"SHORT_NAME": "华为MatePad Pro",
"brandLogo": "T1bOKxFoFcXXb1upjX.jpg",
"itemIDTianHe": "611952670190",
"itemMainPicture": "O1CN01HHEnRU1KZ6mud3VjW_!!6000000001177-2-yinhe.png",
"mamaCouponValue": "学生专享200元",
"mamaShopItemurl": "https://detail.tmall.com/item.htm?spm=a1z10.1-b-s.w20163031-21766675787.18.10577597DWdOA0&id=611952670190&scene=taobao_shop&sku_properties=5919063:6536025"
},
"name": "",
"openId": "AAHVNvjuAMaJc3uyPjeHlCEF",
"prizeDataType": 2,
"prizeId": "5f6c3e7d114fbbc8c98bffae",
"remark": "",
"send_life_cycle_state": "running",
"show_rules": {
"show_rule_dto": [
{
"passed": true,
"type": "WIN_LIMIT"
}
]
},
"start_date": "2020-08-27 16:21:56",
"start_fee": 200000,
"strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
"test": false,
"title": "MatePro",
"type": 1,
"type_desc": "商品优惠券",
"updateTime": 1601014128038,
"userNick": "honingwon"
},
{
"_id": "5f6d89709da6714846638db1",
"activityId": "5f6b09b3c3ad342fed5a0b21",
"amount": 20000, "amount": 20000,
"amount_unit": "分", "amount_unit": "分",
"asac": "1A202010JWPLV3428VWIEP", "asac": "1A202010JWPLV3428VWIEP",
"can_win": true, "can_win": true,
"code": "a66621ec7c434842bfe4d01082128f1d", "code": "a66621ec7c434842bfe4d01082128f1d",
"createDay": "2020/09/25", "createDay": "2020/09/28",
"createTime": 1601014128038, "createTime": 1601295242020,
"display_amount": "200", "display_amount": "200",
"display_amount_unit": "元", "display_amount_unit": "元",
"display_start_fee": "2000", "display_start_fee": "2000",
...@@ -248,7 +38,7 @@ ...@@ -248,7 +38,7 @@
"uuid": "1094cefe51a348698e6647f5e6ba4181" "uuid": "1094cefe51a348698e6647f5e6ba4181"
}, },
"has_inventory": true, "has_inventory": true,
"id": "5f6d89709da6714846638db1", "id": "5f71d38a67f1375241ab6b2b",
"image": "", "image": "",
"material": { "material": {
"SHORT_NAME": "华为MatePad Pro", "SHORT_NAME": "华为MatePad Pro",
...@@ -258,8 +48,8 @@ ...@@ -258,8 +48,8 @@
"mamaCouponValue": "学生专享200元", "mamaCouponValue": "学生专享200元",
"mamaShopItemurl": "https://detail.tmall.com/item.htm?spm=a1z10.1-b-s.w20163031-21766675787.18.10577597DWdOA0&id=611952670190&scene=taobao_shop&sku_properties=5919063:6536025" "mamaShopItemurl": "https://detail.tmall.com/item.htm?spm=a1z10.1-b-s.w20163031-21766675787.18.10577597DWdOA0&id=611952670190&scene=taobao_shop&sku_properties=5919063:6536025"
}, },
"name": "", "name": "fuckyou",
"openId": "AAHVNvjuAMaJc3uyPjeHlCEF", "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
"prizeDataType": 2, "prizeDataType": 2,
"prizeId": "5f6c3e7d114fbbc8c98bffae", "prizeId": "5f6c3e7d114fbbc8c98bffae",
"remark": "", "remark": "",
...@@ -279,127 +69,71 @@ ...@@ -279,127 +69,71 @@
"title": "MatePro", "title": "MatePro",
"type": 1, "type": 1,
"type_desc": "商品优惠券", "type_desc": "商品优惠券",
"updateTime": 1601014128038, "updateTime": 1601295242020,
"userNick": "honingwon" "userNick": "tb80525668"
}, },
{ {
"_id": "5f6d89709da6714846638db1", "_id": "5f71d38852bbded304b3f8a3",
"activityId": "5f6b09b3c3ad342fed5a0b21", "activityId": "5f7183e852bbded304b27d71",
"amount": 20000, "createDay": "2020/09/28",
"amount_unit": "分", "createTime": 1601295240072,
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "a66621ec7c434842bfe4d01082128f1d",
"createDay": "2020/09/25",
"createTime": 1601014128038,
"display_amount": "200",
"display_amount_unit": "元",
"display_start_fee": "2000",
"drawStatus": 1, "drawStatus": 1,
"effective_end": "2020-10-11 00:00:00",
"effective_start": "2020-08-24 00:00:00",
"effective_time_mode": "ABSOLUTE",
"ename": "", "ename": "",
"end_date": "2020-09-25 23:59:59",
"expiredTime": 1601628302000, "expiredTime": 1601628302000,
"feature": { "id": "5f71d38852bbded304b3f8a3",
"bcType": "B", "image": "https://img.alicdn.com/imgextra/i2/2208492139886/O1CN01XlNdWj2Mtq8E9OEw1_!!2208492139886-2-miniprogram.png",
"couponTag": "1002", "name": "兑换奖励235",
"itemIds": "611952670190", "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
"sellerId": "2838892713",
"shopId": "150920153",
"shopLogo": "/5a/f4/TB16vpHhER1BeNjy0FmSuv0wVXa.jpg",
"shopName": "华为官方旗舰店",
"shopSiteCategory": "3",
"shopUrl": "//store.taobao.com/shop/view_shop.htm?shop_id=150920153",
"spreadId": "4327893208",
"templateCode": "15398721100",
"title": "MatePro",
"uuid": "1094cefe51a348698e6647f5e6ba4181"
},
"has_inventory": true,
"id": "5f6d89709da6714846638db1",
"image": "",
"material": {
"SHORT_NAME": "华为MatePad Pro",
"brandLogo": "T1bOKxFoFcXXb1upjX.jpg",
"itemIDTianHe": "611952670190",
"itemMainPicture": "O1CN01HHEnRU1KZ6mud3VjW_!!6000000001177-2-yinhe.png",
"mamaCouponValue": "学生专享200元",
"mamaShopItemurl": "https://detail.tmall.com/item.htm?spm=a1z10.1-b-s.w20163031-21766675787.18.10577597DWdOA0&id=611952670190&scene=taobao_shop&sku_properties=5919063:6536025"
},
"name": "",
"openId": "AAHVNvjuAMaJc3uyPjeHlCEF",
"prizeDataType": 2, "prizeDataType": 2,
"prizeId": "5f6c3e7d114fbbc8c98bffae", "prizeId": "5f6b09b39897b412b595a32b",
"remark": "", "remark": "",
"send_life_cycle_state": "running", "type": 3,
"show_rules": { "updateTime": 1601295240072,
"show_rule_dto": [ "userNick": "tb80525668"
{
"passed": true,
"type": "WIN_LIMIT"
}
]
},
"start_date": "2020-08-27 16:21:56",
"start_fee": 200000,
"strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
"test": false,
"title": "MatePro",
"type": 1,
"type_desc": "商品优惠券",
"updateTime": 1601014128038,
"userNick": "honingwon"
}, },
{ {
"_id": "5f6d89709da6714846638db1", "_id": "5f71d38567f1375241ab6b20",
"activityId": "5f6b09b3c3ad342fed5a0b21", "activityId": "5f7183e852bbded304b27d71",
"amount": 20000, "amount": 10000,
"amount_unit": "分", "amount_unit": "分",
"asac": "1A202010JWPLV3428VWIEP", "asac": "1A202010JWPLV3428VWIEP",
"can_win": true, "can_win": true,
"code": "a66621ec7c434842bfe4d01082128f1d", "code": "f8564ef50a86418b9226ce1d9bb6ace6",
"createDay": "2020/09/25", "createDay": "2020/09/28",
"createTime": 1601014128038, "createTime": 1601295237953,
"display_amount": "200", "display_amount": "100",
"display_amount_unit": "元", "display_amount_unit": "元",
"display_start_fee": "2000", "display_start_fee": "200",
"drawStatus": 1, "drawStatus": 1,
"effective_end": "2020-10-11 00:00:00", "effective_end": "2020-09-30 00:00:00",
"effective_start": "2020-08-24 00:00:00", "effective_start": "2020-08-28 00:00:00",
"effective_time_mode": "ABSOLUTE", "effective_time_mode": "ABSOLUTE",
"ename": "", "ename": "",
"end_date": "2020-09-25 23:59:59", "end_date": "2020-09-26 23:59:59",
"expiredTime": 1601628302000, "expiredTime": 1601628302000,
"feature": { "feature": {
"bcType": "B", "bcType": "B",
"couponTag": "1002", "couponTag": "1002",
"itemIds": "611952670190", "itemIds": "611439436633",
"sellerId": "2838892713", "sellerId": "2838892713",
"shopId": "150920153", "shopId": "150920153",
"shopLogo": "/5a/f4/TB16vpHhER1BeNjy0FmSuv0wVXa.jpg", "shopLogo": "/5a/f4/TB16vpHhER1BeNjy0FmSuv0wVXa.jpg",
"shopName": "华为官方旗舰店", "shopName": "华为官方旗舰店",
"shopSiteCategory": "3", "shopSiteCategory": "3",
"shopUrl": "//store.taobao.com/shop/view_shop.htm?shop_id=150920153", "shopUrl": "//store.taobao.com/shop/view_shop.htm?shop_id=150920153",
"spreadId": "4327893208", "spreadId": "4328244590",
"templateCode": "15398721100", "templateCode": "15417747656",
"title": "MatePro", "title": "freebuds 3",
"uuid": "1094cefe51a348698e6647f5e6ba4181" "uuid": "ea9a79c0459640f8aeb94c24530e4141"
}, },
"has_inventory": true, "has_inventory": true,
"id": "5f6d89709da6714846638db1", "id": "5f71d38567f1375241ab6b20",
"image": "", "image": "",
"material": { "material": {
"SHORT_NAME": "华为MatePad Pro", "brandLogo": "T1bOKxFoFcXXb1upjX.jpg"
"brandLogo": "T1bOKxFoFcXXb1upjX.jpg",
"itemIDTianHe": "611952670190",
"itemMainPicture": "O1CN01HHEnRU1KZ6mud3VjW_!!6000000001177-2-yinhe.png",
"mamaCouponValue": "学生专享200元",
"mamaShopItemurl": "https://detail.tmall.com/item.htm?spm=a1z10.1-b-s.w20163031-21766675787.18.10577597DWdOA0&id=611952670190&scene=taobao_shop&sku_properties=5919063:6536025"
}, },
"name": "", "name": "fuckyou3",
"openId": "AAHVNvjuAMaJc3uyPjeHlCEF", "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
"prizeDataType": 2, "prizeDataType": 2,
"prizeId": "5f6c3e7d114fbbc8c98bffae", "prizeId": "5f6c3e7d114fbbc8c98bffae",
"remark": "", "remark": "",
...@@ -412,64 +146,51 @@ ...@@ -412,64 +146,51 @@
} }
] ]
}, },
"start_date": "2020-08-27 16:21:56", "start_date": "2020-08-28 11:04:24",
"start_fee": 200000, "start_fee": 20000,
"strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a", "strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
"test": false, "test": false,
"title": "MatePro", "title": "freebuds 3",
"type": 1, "type": 1,
"type_desc": "商品优惠券", "type_desc": "商品优惠券",
"updateTime": 1601014128038, "updateTime": 1601295237953,
"userNick": "honingwon" "userNick": "tb80525668"
}, },
{ {
"_id": "5f6d89709da6714846638db1", "_id": "5f71d3849897b412b5a4fa47",
"activityId": "5f6b09b3c3ad342fed5a0b21", "activityId": "5f7183e852bbded304b27d71",
"amount": 20000,
"amount_unit": "分",
"asac": "1A202010JWPLV3428VWIEP", "asac": "1A202010JWPLV3428VWIEP",
"can_win": true, "can_win": true,
"code": "a66621ec7c434842bfe4d01082128f1d", "code": "7254115b0fcc4c77bdbb35ed658c1db2",
"createDay": "2020/09/25", "createDay": "2020/09/28",
"createTime": 1601014128038, "createTime": 1601295236035,
"display_amount": "200",
"display_amount_unit": "元",
"display_start_fee": "2000",
"drawStatus": 1, "drawStatus": 1,
"effective_end": "2020-10-11 00:00:00", "effective_interval": 31,
"effective_start": "2020-08-24 00:00:00", "effective_time_mode": "RELATIVE",
"effective_time_mode": "ABSOLUTE",
"ename": "", "ename": "",
"end_date": "2020-09-25 23:59:59", "end_date": "2020-12-23 23:59:59",
"expiredTime": 1601628302000, "expiredTime": 1601628302000,
"feature": { "feature": {
"bcType": "B", "couponTag": "49534003",
"couponTag": "1002", "description": "酒店信用住立减券",
"itemIds": "611952670190", "sellerId": "4064563648",
"sellerId": "2838892713", "spreadId": "3465672059",
"shopId": "150920153", "subActId": "34922",
"shopLogo": "/5a/f4/TB16vpHhER1BeNjy0FmSuv0wVXa.jpg", "templateCode": "3545184060",
"shopName": "华为官方旗舰店", "title": "酒店信用住优惠券",
"shopSiteCategory": "3", "uuid": "6ff76ab7cf3c4002be6f64902e659322"
"shopUrl": "//store.taobao.com/shop/view_shop.htm?shop_id=150920153",
"spreadId": "4327893208",
"templateCode": "15398721100",
"title": "MatePro",
"uuid": "1094cefe51a348698e6647f5e6ba4181"
}, },
"has_inventory": true, "has_inventory": true,
"id": "5f6d89709da6714846638db1", "id": "5f71d3849897b412b5a4fa47",
"image": "", "image": "",
"interval_time_unit": "DAYS",
"material": { "material": {
"SHORT_NAME": "华为MatePad Pro", "benefitBigPic": "https://gw.alicdn.com/tfs/TB1aF67RFP7gK0jSZFjXXc5aXXa-895-703.png",
"brandLogo": "T1bOKxFoFcXXb1upjX.jpg", "benefitSmallPic": "https://gw.alicdn.com/tfs/TB1aF67RFP7gK0jSZFjXXc5aXXa-895-703.png",
"itemIDTianHe": "611952670190", "benefitUrl": "https://h5.m.taobao.com/trip/hotel/search/index.html?ttid=12zfb000000416"
"itemMainPicture": "O1CN01HHEnRU1KZ6mud3VjW_!!6000000001177-2-yinhe.png",
"mamaCouponValue": "学生专享200元",
"mamaShopItemurl": "https://detail.tmall.com/item.htm?spm=a1z10.1-b-s.w20163031-21766675787.18.10577597DWdOA0&id=611952670190&scene=taobao_shop&sku_properties=5919063:6536025"
}, },
"name": "", "name": "fuckyou2",
"openId": "AAHVNvjuAMaJc3uyPjeHlCEF", "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
"prizeDataType": 2, "prizeDataType": 2,
"prizeId": "5f6c3e7d114fbbc8c98bffae", "prizeId": "5f6c3e7d114fbbc8c98bffae",
"remark": "", "remark": "",
...@@ -482,15 +203,14 @@ ...@@ -482,15 +203,14 @@
} }
] ]
}, },
"start_date": "2020-08-27 16:21:56", "start_date": "2020-07-15 15:45:12",
"start_fee": 200000,
"strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a", "strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
"test": false, "test": false,
"title": "MatePro", "title": "酒店最高减50元券",
"type": 1, "type": 1,
"type_desc": "商品优惠券", "type_desc": "飞猪资格券",
"updateTime": 1601014128038, "updateTime": 1601295236035,
"userNick": "honingwon" "userNick": "tb80525668"
} }
] ]
}, },
......
project/src/canvas/game/mock/miniTb/tmallCat.getTaskList.json
View file @ 68ca898c
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"completeTimes": 0, "completeTimes": 0,
"rewards": 10, "rewards": 10,
"sellerId": "oooo", "sellerId": "oooo",
"status":1, "status": 1,
"taskRateType": 1, "taskRateType": 1,
"taskType": "follow", "taskType": "follow",
"title": "关注店铺1" "title": "关注店铺1"
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"completeTimes": 0, "completeTimes": 0,
"rewards": 10, "rewards": 10,
"sellerId": "wwwww", "sellerId": "wwwww",
"status":1, "status": 1,
"taskRateType": 1, "taskRateType": 1,
"taskType": "follow", "taskType": "follow",
"title": "关注店铺2" "title": "关注店铺2"
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
"completeTimes": 0, "completeTimes": 0,
"itemIds": "", "itemIds": "",
"rewards": "2", "rewards": "2",
"status":2, "status": 1,
"taskRateType": 2, "taskRateType": 2,
"taskType": "browseGoods", "taskType": "browseGoods",
"times": 1, "times": 1,
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
{ {
"completeTimes": 0, "completeTimes": 0,
"rewards": "1", "rewards": "1",
"status": 2, "status": 1,
"taskRateType": 1, "taskRateType": 1,
"taskType": "invites", "taskType": "invites",
"times": 3, "times": 3,
......
taobao_mini/client/components/comtask/comtask.js
View file @ 68ca898c
...@@ -27,7 +27,6 @@ Component({ ...@@ -27,7 +27,6 @@ Component({
async didMount() { async didMount() {
my.showLoading(); my.showLoading();
await API.doSignTask().catch(() => { });
await this.getTaskList(); await this.getTaskList();
my.hideLoading(); my.hideLoading();
}, },
...@@ -103,12 +102,21 @@ Component({ ...@@ -103,12 +102,21 @@ Component({
case 'invites': case 'invites':
my.showSharePanel(); my.showSharePanel();
break; break;
case 'sign':
await this.handleGoSign();
await this.getTaskList();
break;
default: default:
console.log('handleTapGoBtn', taskType); console.log('handleTapGoBtn', taskType);
break; break;
} }
flag = 0; flag = 0;
}, },
async handleGoSign() {
await API.doSignTask( ).catch(res => {
commonToast(res && res.message);
}) || {};
},
async handleGoBrowseGoods(itemId) { async handleGoBrowseGoods(itemId) {
await API.doBrowseGoodsTask({ itemId }).catch(res => { await API.doBrowseGoodsTask({ itemId }).catch(res => {
commonToast(res && res.message); commonToast(res && res.message);
......
taobao_mini/client/components/comtasklist/comtasklist.axml
View file @ 68ca898c
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
<view class="task_list"> <view class="task_list">
<view class="task_item " a:for="{{list}}"> <view class="task_item " a:for="{{list}}">
<image class="task_itembg " src={{resList['b44bac8c-652f-496d-9bc1-165e30d71b02'].url}} /> <image class="task_itembg " src={{resList['b44bac8c-652f-496d-9bc1-165e30d71b02'].url}} />
<image class="task_receivebtn " data-item="{{item}}" onTap="handleTapReceiveBtn" a:if="{{item.status==2}}" src={{resList['b9f1cc3f-4620-44d8-85ae-187be0745ace'].url}} /> <image class="task_receivebtn " data-item="{{item}}" onTap="handleTapReceiveBtn" a:if="{{item.status==2}}" src={{resList['b9f1cc3f-4620-44d8-85ae-187be0745ace'+(item.taskType=='sign' ? '':'')].url}} />
<image class="task_gobtn " data-item="{{item}}" onTap="handleTapGoBtn" a:if="{{item.status==1}}" src={{resList['9ee176ed-5204-4524-97f9-bf17ee698aa8'].url}} /> <image class="task_gobtn " data-item="{{item}}" onTap="handleTapGoBtn" a:if="{{item.status==1}}" src={{resList['9ee176ed-5204-4524-97f9-bf17ee698aa8-'+item.taskType].url}} />
<image class="task_disabedbtn " a:if="{{item.status==3}}" src={{resList['0e0684af-21c7-48e2-9114-8599c1de33f1'].url}} />
<image class="task_disabedbtn " a:if="{{item.status==3}}" src={{resList['0e0684af-21c7-48e2-9114-8599c1de33f1'+ (item.taskType=='follow' ? '-follow':'') ].url}} />
<image class="task_sginicon " a:if="{{item.taskType=='sign'}}" src={{resList['ca4c78b3-caf5-435b-ba32-f187f24d1795'].url}} /> <image class="task_sginicon " a:if="{{item.taskType=='sign'}}" src={{resList['ca4c78b3-caf5-435b-ba32-f187f24d1795'].url}} />
<image class="task_inviteicon " a:if="{{item.taskType=='invites'}}" src={{resList['61cf4c2c-54e4-4cde-aa16-78ee5d17ab06'].url}} /> <image class="task_inviteicon " a:if="{{item.taskType=='invites'}}" src={{resList['61cf4c2c-54e4-4cde-aa16-78ee5d17ab06'].url}} />
<image class="task_focusicon " a:if="{{item.taskType=='follow'}}" src={{resList['7f6ab236c2c0d17c38f1bfb5260d258ebf1cb630'].url}} /> <image class="task_focusicon " a:if="{{item.taskType=='follow'}}" src={{resList['7f6ab236c2c0d17c38f1bfb5260d258ebf1cb630'].url}} />
......
taobao_mini/client/pages/myprize/myprize.js
View file @ 68ca898c
...@@ -79,6 +79,10 @@ Page({ ...@@ -79,6 +79,10 @@ Page({
myPrizeList: [] myPrizeList: []
}) })
}) || {}; }) || {};
data.list.forEach(i => {
console.log('data list item', i);
i.image = i.image || '//yun.duiba.com.cn/aurora/assets/50886651a4b369800cad1e9b958b9edc86150533.png';
});
if (success && data && data.list) { if (success && data && data.list) {
this.setData({ this.setData({
myPrizeList: data.list myPrizeList: data.list
...@@ -140,8 +144,8 @@ Page({ ...@@ -140,8 +144,8 @@ Page({
} }
flag = true; flag = true;
const { item:{strategyCode,code,channel} } = e.target.dataset; const { item: { strategyCode, code, channel } } = e.target.dataset;
this.cloudTBIssue({strategyCode,code,channel}) this.cloudTBIssue({ strategyCode, code, channel })
// const { activityId } = app; // const { activityId } = app;
// console.log(item, '领取权益') // console.log(item, '领取权益')
// const { success, data, message } = await API.receiveEnamePrize({ activityId, _id: item._id }).catch(res => { // const { success, data, message } = await API.receiveEnamePrize({ activityId, _id: item._id }).catch(res => {
......
taobao_mini/client/pages/pageshop/pageshop.js
View file @ 68ca898c
...@@ -51,6 +51,7 @@ Page({ ...@@ -51,6 +51,7 @@ Page({
const { data: { list, happyCoin } } = await API.exchangeGoodList(); const { data: { list, happyCoin } } = await API.exchangeGoodList();
list.forEach(item => { list.forEach(item => {
item.exchanged = item.status == EXCHANGE_STATUS.DONE; item.exchanged = item.status == EXCHANGE_STATUS.DONE;
item.image = item.image || '//yun.duiba.com.cn/aurora/assets/50886651a4b369800cad1e9b958b9edc86150533.png';
}); });
this.setData({ list, happyCoin }); this.setData({ list, happyCoin });
}, },
......
taobao_mini/client/resconfig/resList.js
View file @ 68ca898c
...@@ -23,18 +23,54 @@ const resList = { ...@@ -23,18 +23,54 @@ const resList = {
uuid: 'b9f1cc3f-4620-44d8-85ae-187be0745ace', uuid: 'b9f1cc3f-4620-44d8-85ae-187be0745ace',
url: '//yun.duiba.com.cn/spark/assets/58527ff02cd996f196deade9cf46ed252e2791f6.png' url: '//yun.duiba.com.cn/spark/assets/58527ff02cd996f196deade9cf46ed252e2791f6.png'
}, },
'b9f1cc3f-4620-44d8-85ae-187be0745ace-sign': {
name: 'task_receivebtn',
ext: '.png',
uuid: 'b9f1cc3f-4620-44d8-85ae-187be0745ace-sign',
url: '//yun.duiba.com.cn/aurora/assets/83ee636c40fe4437e632b8ce1197afbb47123edf.png'
},
'9ee176ed-5204-4524-97f9-bf17ee698aa8': { '9ee176ed-5204-4524-97f9-bf17ee698aa8': {
name: 'task_gobtn', name: 'task_gobtn',
ext: '.png', ext: '.png',
uuid: '9ee176ed-5204-4524-97f9-bf17ee698aa8', uuid: '9ee176ed-5204-4524-97f9-bf17ee698aa8',
url: '//yun.duiba.com.cn/spark/assets/f33d667af53b09f154259c209fc0c41454dfca8a.png' url: '//yun.duiba.com.cn/spark/assets/f33d667af53b09f154259c209fc0c41454dfca8a.png'
}, },
'9ee176ed-5204-4524-97f9-bf17ee698aa8-sign': {
name: 'task_gobtn',
ext: '.png',
uuid: '9ee176ed-5204-4524-97f9-bf17ee698aa8-sign',
url: '//yun.duiba.com.cn/aurora/assets/83ee636c40fe4437e632b8ce1197afbb47123edf.png'
},
'9ee176ed-5204-4524-97f9-bf17ee698aa8-follow': {
name: 'task_gobtn',
ext: '.png',
uuid: '9ee176ed-5204-4524-97f9-bf17ee698aa8-follow',
url: '//yun.duiba.com.cn/aurora/assets/b30cdc10518b7cbd68875e1a5ec8b5db4d6458cc.png'
},
'9ee176ed-5204-4524-97f9-bf17ee698aa8-browseGoods': {
name: 'task_gobtn',
ext: '.png',
uuid: '9ee176ed-5204-4524-97f9-bf17ee698aa8-browseGoods',
url: '//yun.duiba.com.cn/aurora/assets/50886651a4b369800cad1e9b958b9edc86150533.png'
},
'9ee176ed-5204-4524-97f9-bf17ee698aa8-invites': {
name: 'task_gobtn',
ext: '.png',
uuid: '9ee176ed-5204-4524-97f9-bf17ee698aa8-invites',
url: '//yun.duiba.com.cn/aurora/assets/76116db5fc5039831f3e266f9b9d1d8e5c0ece7b.png'
},
'0e0684af-21c7-48e2-9114-8599c1de33f1': { '0e0684af-21c7-48e2-9114-8599c1de33f1': {
name: 'task_disabedbtn', name: 'task_disabedbtn',
ext: '.png', ext: '.png',
uuid: '0e0684af-21c7-48e2-9114-8599c1de33f1', uuid: '0e0684af-21c7-48e2-9114-8599c1de33f1',
url: '//yun.duiba.com.cn/spark/assets/2ef2430ab9ec9d0bde4bc1e12f396456578cf3f7.png' url: '//yun.duiba.com.cn/spark/assets/2ef2430ab9ec9d0bde4bc1e12f396456578cf3f7.png'
}, },
'0e0684af-21c7-48e2-9114-8599c1de33f1-follow': {
name: 'task_disabedbtn_follow',
ext: '.png',
uuid: '0e0684af-21c7-48e2-9114-8599c1de33f1-follow',
url: '//yun.duiba.com.cn/aurora/assets/70da64eedbc8b631e546185950cca481f775edea.png'
},
'ca4c78b3-caf5-435b-ba32-f187f24d1795': { 'ca4c78b3-caf5-435b-ba32-f187f24d1795': {
name: 'task_sginicon', name: 'task_sginicon',
ext: '.png', ext: '.png',
......
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