Skip to content

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

44

parents 78a7a259 196a7748
Hide whitespace changes
Inline Side-by-side
Showing with 216 additions and 304 deletions
project/src/canvas/game/mock/miniTb/tmallCat.doBrowseGoodsTask.json
View file @ b7f809dd
{ {
"success": false, "success": true,
"data": { "data": {
"value": "500", "value": "500",
"backTime": "1989897768", "backTime": "1989897768",
......
project/src/canvas/game/mock/miniTb/tmallCat.doFollowTask.json 0 → 100644
View file @ b7f809dd
{
"success": 1,
"data": {
"value": "500",
"backTime": "1989897768",
"serverTime": "188888776"
},
"message":"fuck"
}
\ No newline at end of file
project/src/canvas/game/mock/miniTb/tmallCat.exchangeGoodList.json
View file @ b7f809dd
...@@ -3,6 +3,182 @@ ...@@ -3,6 +3,182 @@
"data": { "data": {
"happyCoin": 90, "happyCoin": 90,
"list": [ "list": [
{
"_id": "5f6c3e7d114fbbc8c98bffae",
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "7254115b0fcc4c77bdbb35ed658c1db2",
"effective_interval": 31,
"effective_time_mode": "RELATIVE",
"end_date": "2020-12-23 23:59:59",
"feature": {
"couponTag": "49534003",
"description": "酒店信用住立减券",
"sellerId": "4064563648",
"spreadId": "3465672059",
"subActId": "34922",
"templateCode": "3545184060",
"title": "酒店信用住优惠券",
"uuid": "6ff76ab7cf3c4002be6f64902e659322"
},
"hasStock": true,
"has_inventory": true,
"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": "酒店最高减50元券",
"send_life_cycle_state": "running",
"show_rules": {
"show_rule_dto": [
{
"passed": true,
"type": "WIN_LIMIT"
}
]
},
"start_date": "2020-07-15 15:45:12",
"status": 1,
"test": false,
"title": "酒店最高减50元券",
"type": 1,
"type_desc": "飞猪资格券",
"value": 10
},
{
"_id": "5f6c3e7d114fbbc8c98bffae",
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "7254115b0fcc4c77bdbb35ed658c1db2",
"effective_interval": 31,
"effective_time_mode": "RELATIVE",
"end_date": "2020-12-23 23:59:59",
"feature": {
"couponTag": "49534003",
"description": "酒店信用住立减券",
"sellerId": "4064563648",
"spreadId": "3465672059",
"subActId": "34922",
"templateCode": "3545184060",
"title": "酒店信用住优惠券",
"uuid": "6ff76ab7cf3c4002be6f64902e659322"
},
"hasStock": true,
"has_inventory": true,
"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": "酒店最高减50元券",
"send_life_cycle_state": "running",
"show_rules": {
"show_rule_dto": [
{
"passed": true,
"type": "WIN_LIMIT"
}
]
},
"start_date": "2020-07-15 15:45:12",
"status": 1,
"test": false,
"title": "酒店最高减50元券",
"type": 1,
"type_desc": "飞猪资格券",
"value": 10
},
{
"_id": "5f6c3e7d114fbbc8c98bffae",
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "7254115b0fcc4c77bdbb35ed658c1db2",
"effective_interval": 31,
"effective_time_mode": "RELATIVE",
"end_date": "2020-12-23 23:59:59",
"feature": {
"couponTag": "49534003",
"description": "酒店信用住立减券",
"sellerId": "4064563648",
"spreadId": "3465672059",
"subActId": "34922",
"templateCode": "3545184060",
"title": "酒店信用住优惠券",
"uuid": "6ff76ab7cf3c4002be6f64902e659322"
},
"hasStock": true,
"has_inventory": true,
"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": "酒店最高减50元券",
"send_life_cycle_state": "running",
"show_rules": {
"show_rule_dto": [
{
"passed": true,
"type": "WIN_LIMIT"
}
]
},
"start_date": "2020-07-15 15:45:12",
"status": 1,
"test": false,
"title": "酒店最高减50元券",
"type": 1,
"type_desc": "飞猪资格券",
"value": 10
},
{
"_id": "5f6c3e7d114fbbc8c98bffae",
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "7254115b0fcc4c77bdbb35ed658c1db2",
"effective_interval": 31,
"effective_time_mode": "RELATIVE",
"end_date": "2020-12-23 23:59:59",
"feature": {
"couponTag": "49534003",
"description": "酒店信用住立减券",
"sellerId": "4064563648",
"spreadId": "3465672059",
"subActId": "34922",
"templateCode": "3545184060",
"title": "酒店信用住优惠券",
"uuid": "6ff76ab7cf3c4002be6f64902e659322"
},
"hasStock": true,
"has_inventory": true,
"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": "酒店最高减50元券",
"send_life_cycle_state": "running",
"show_rules": {
"show_rule_dto": [
{
"passed": true,
"type": "WIN_LIMIT"
}
]
},
"start_date": "2020-07-15 15:45:12",
"status": 1,
"test": false,
"title": "酒店最高减50元券",
"type": 1,
"type_desc": "飞猪资格券",
"value": 10
},
{ {
"_id": "5f6c3e7d114fbbc8c98bffae", "_id": "5f6c3e7d114fbbc8c98bffae",
"asac": "1A202010JWPLV3428VWIEP", "asac": "1A202010JWPLV3428VWIEP",
......
taobao_mini/client/api.js
View file @ b7f809dd
...@@ -23,6 +23,11 @@ const request = tbccRequest({ ...@@ -23,6 +23,11 @@ const request = tbccRequest({
// api handle 列表 // api handle 列表
const apiList = { const apiList = {
...capi, ...capi,
doFollowTask: {
handle: 'doFollowTask',
method: 'get',
isShowLoading: false
},
doBrowseGoodsTask: { doBrowseGoodsTask: {
handle: 'doBrowseGoodsTask', handle: 'doBrowseGoodsTask',
method: 'get', method: 'get',
......
taobao_mini/client/app.js
View file @ b7f809dd
...@@ -9,7 +9,7 @@ cloud.init({ ...@@ -9,7 +9,7 @@ cloud.init({
App({ App({
env, env,
requestType: 'cloud', // yapi，cloud: 云函数 requestType: 'cloud', // yapi，cloud: 云函数
// requestType: 'local', // yapi，cloud: 云函数 // requestType: 'local', // yapi，cloud: 云函数
cloudName: 'tmallCat', // 主云函数项目名 tmallCat cloudName: 'tmallCat', // 主云函数项目名 tmallCat
// cloudName: 'bubbleSurviva', // 主云函数项目名 tmallCat // cloudName: 'bubbleSurviva', // 主云函数项目名 tmallCat
cloud, cloud,
......
taobao_mini/client/components/comtask/comtask.acss
View file @ b7f809dd
...@@ -35,12 +35,14 @@ ...@@ -35,12 +35,14 @@
.task_list { .task_list {
width: 100%; width: 100%;
height: auto; height: 620rpx;
/* background-color: black; */ /* background-color: black; */
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
align-content: flex-start; align-content: flex-start;
padding: 162rpx 0 0 41rpx; margin-top: 162rpx;
padding: 0rpx 0 0 41rpx;
overflow-x: auto;
} }
.task .task_item { .task .task_item {
width: 668rpx; width: 668rpx;
......
taobao_mini/client/components/comtask/comtask.js
View file @ b7f809dd
...@@ -54,8 +54,8 @@ Component({ ...@@ -54,8 +54,8 @@ Component({
my.showLoading(); my.showLoading();
flag = 1; flag = 1;
const { item } = e.target.dataset; const { item } = e.target.dataset;
const { taskType } = item; const { taskType,sellerId } = item;
const { success, data, message } = await API.receiveTaskRewards({ taskType }).catch(res => { const { success, data, message } = await API.receiveTaskRewards({ taskType,sellerId }).catch(res => {
commonToast(res && res.message); commonToast(res && res.message);
}) || {}; }) || {};
if (success && data) { if (success && data) {
...@@ -68,19 +68,33 @@ Component({ ...@@ -68,19 +68,33 @@ Component({
if (flag) return; if (flag) return;
flag = 1; flag = 1;
const { item } = e.target.dataset; const { item } = e.target.dataset;
const {taskType}=item; const { taskType,sellerId } = item;
console.log('handleTapGoBtn', taskType);
switch (taskType) { switch (taskType) {
case 'browseGoods': case 'browseGoods':
await this.handleGoBrowseGoods(); await this.handleGoBrowseGoods();
await this.getTaskList();
break;
case 'follow':
console.log('item,sellerId',item,sellerId)
await this.handleGoFollow(sellerId);
await this.getTaskList();
break; break;
default: default:
console.log('handleTapGoBtn', taskType);
break; break;
} }
flag = 0;
}, },
async handleGoBrowseGoods(itemId) { async handleGoBrowseGoods(itemId) {
await API.doBrowseGoodsTask({itemId}); await API.doBrowseGoodsTask({ itemId }).catch(res => {
commonToast(res && res.message);
}) || {};
},
async handleGoFollow(sellerId) {
await API.doFollowTask({sellerId}).catch(res => {
commonToast(res && res.message);
}) || {};
}, },
onModalClose() { onModalClose() {
const { onModalClose } = this.props; const { onModalClose } = this.props;
......
taobao_mini/client/components/comtasklist/comtasklist.acss
View file @ b7f809dd
.taskcontainer {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 20;
background: rgba(0, 0, 0, 0.5);
}
.task {
width: 750rpx;
height: 792rpx;
opacity: 1;
top: 100%;
margin-top: -792rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_bg {
width: 750rpx;
height: 792rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_close {
width: 57rpx;
height: 57rpx;
opacity: 1;
left: 684rpx;
top: 53rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task_list {
width: 100%;
height: auto;
/* background-color: black; */
display: flex;
flex-flow: row wrap;
align-content: flex-start;
padding: 162rpx 0 0 41rpx;
}
.task .task_item {
width: 668rpx;
height: 141rpx;
opacity: 1;
margin: 0 0rpx 16rpx 0;
position: relative;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_item .task_itembg {
width: 668rpx;
height: 141rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_item .task_receivebtn {
width: 165rpx;
height: 61rpx;
opacity: 1;
left: 479rpx;
top: 25rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_item .task_gobtn {
width: 165rpx;
height: 61rpx;
opacity: 1;
left: 479rpx;
top: 25rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_item .task_disabedbtn {
width: 165rpx;
height: 61rpx;
opacity: 1;
left: 479rpx;
top: 26rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_item .task_sginicon {
width: 90rpx;
height: 91rpx;
opacity: 1;
left: 25rpx;
top: 25rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_item .task_inviteicon {
width: 90rpx;
height: 91rpx;
opacity: 1;
left: 25rpx;
top: 25rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_item .task_focusicon {
width: 90rpx;
height: 91rpx;
opacity: 1;
left: 25rpx;
top: 25rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_item .task_readicon {
width: 90rpx;
height: 91rpx;
opacity: 1;
left: 25rpx;
top: 25rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.task .task_item .task_title {
/* width: 52rpx; */
height: 26rpx;
opacity: 1;
left: 139rpx;
top: 36rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 28rpx;
color: #685b4e;
}
.task .task_item .task_award {
width: 118rpx;
height: 24rpx;
opacity: 1;
left: 138rpx;
top: 78rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 26rpx;
color: #39abed;
}
.task .task_item .task_progress {
width: 90rpx;
height: 22rpx;
opacity: 1;
left: 517rpx;
top: 95rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 24rpx;
color: #685b4e;
}
taobao_mini/client/components/shopModal/shopModal.acss
View file @ b7f809dd
.shop-page {
width: 100vw;
height: 100vh;
opacity: 1;
position: absolute;
top: 0;
left: 0;
overflow: hidden;
/* background: url('') no-repeat center top/cover; */
}
.shop-wrap {
width: 100%;
position: absolute;
bottom: 0;
top: 254rpx;
padding-left: 54rpx;
right:0;
overflow-x: auto;
}
.shop-list {
width: 100%;
height: auto;
/* background-color: black; */
display: flex;
flex-flow: row wrap;
align-content: flex-start;
}
.shop .shopbg {
width: 750rpx;
height: 1624rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem {
position: relative;
/* display: flex;
justify-content: center;
align-items: center; */
box-sizing: border-box;
width: 309rpx;
height: 324rpx;
opacity: 1;
margin: 0 30rpx 30rpx 0;
/* left: 54rpx;
top: 254rpx; */
}
.shop .shopitem .shopitem_bg2 {
width: 309rpx;
height: 324rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem .shopitem_bg1 {
width: 224rpx;
height: 161rpx;
opacity: 1;
left: 45rpx;
top: 29rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem .shopitem_disabledbtn {
width: 209rpx;
height: 60rpx;
opacity: 1;
left: 49rpx;
top: 241rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem .shopitem_buybtn {
width: 217rpx;
height: 68rpx;
opacity: 1;
left: 45rpx;
top: 237rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem .shopitem_txt {
pointer-events: none;
width: 88rpx;
/* height: 20rpx; */
opacity: 1;
left: 136rpx;
top: 261rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 21.79723rpx;
color: #474543;
}
.shop .shopitem .shopitem_name {
width: 209rpx;
/* height: 23rpx; */
opacity: 1;
left: 51rpx;
top: 203rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 20.12052rpx;
color: #474543;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.shop .shop_gold {
width: 98rpx;
height: 21rpx;
opacity: 1;
left: 348rpx;
top: 151rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 23.47394rpx;
color: #7b644e;
}
.shop .shop_backbtn {
width: 67rpx;
height: 67rpx;
opacity: 1;
left: 48rpx;
top: 41rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
\ No newline at end of file
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