Skip to content

N
new_taobao
Commit 5aec9961 authored by wildfirecode13's avatar wildfirecode13
Browse files
Options

1

parent 23ba43bb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 833 additions and 17 deletions
taobao_mini/client/components/comexchanged/comexchanged.acss
View file @ 5aec9961
......@@ -15,11 +15,12 @@
transform-origin: 0rpx 0rpx 0rpx;
}
.exchanged .exchanged_imgbg {
width: 360rpx;
width: 299rpx;
height: 299rpx;
opacity: 1;
left: 197rpx;
left: 227rpx;
top: 377rpx;
border-radius: 10rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
......@@ -33,11 +34,12 @@
transform-origin: 0rpx 0rpx 0rpx;
}
.exchanged .exchanged_title {
/* width: 164rpx; */
height: 35rpx;
width: 750rpx;
text-align: center;
/* height: 35rpx; */
opacity: 1;
left: 295rpx;
top: 315rpx;
/* left: 295rpx; */
top: 300rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 36rpx;
......
taobao_mini/client/components/prizeModal/prizeModal.acss
View file @ 5aec9961
......@@ -55,6 +55,7 @@
}
.my-prize-page .my-prize-item .my-prize-avatar {
border-radius: 4rpx;
width: 120rpx;
height: 120rpx;
}
......
taobao_mini/client/components/shopModal/shopModal.axml
View file @ 5aec9961
......@@ -8,7 +8,7 @@
<view class="shopitem" a:for="{{list}}">
<image class="shopitem_bg2" src={{resList['a5230993-3870-4a91-bdd1-ffc4782770d0'].url}} />
<image class="shopitem_bg1" src={{resList['dd4ee407-16e4-4cb7-9eba-365b33f466a3'].url}} />
<image class="shopitem_bg1" src={{item.image}} />
<image class="shopitem_avatar" src={{item.image}} />
<image onTap="handleClick" data-item="{{item}}" a:if="{{!item.exchanged}}" class="shopitem_buybtn" src={{resList['dd8ea96e-e33f-4f5d-b31f-29f332c3c867'].url}} />
<image a:if="{{item.exchanged}}" class="shopitem_disabledbtn" src={{resList['8d08152f-311a-446a-a15a-ff02ebed0139'].url}} />
<label a:if="{{!item.exchanged}}" class="shopitem_txt">{{item.value}}</label>
......
taobao_mini/client/pages/myprize/myprize.js
View file @ 5aec9961
......@@ -81,7 +81,7 @@ Page({
}) || {};
data.list.forEach(i => {
console.log('data list item', i);
i.image = i.image || '//yun.duiba.com.cn/aurora/assets/50886651a4b369800cad1e9b958b9edc86150533.png';
i.image = i.image || '//yun.duiba.com.cn/aurora/assets/00b4b751939da230055889445f00f22990ff5f88.png';
});
if (success && data && data.list) {
this.setData({
......
taobao_mini/client/pages/pageshop/pageshop.acss
View file @ 5aec9961
......@@ -59,6 +59,7 @@
}
.shop .shopitem .shopitem_bg1 {
display: none;
width: 224rpx;
height: 161rpx;
opacity: 1;
......@@ -67,6 +68,16 @@
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem .shopitem_avatar {
width: 161rpx;
height: 161rpx;
opacity: 1;
left: 76.5rpx;
top: 29rpx;
position: absolute;
border-radius: 10rpx;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem .shopitem_disabledbtn {
width: 209rpx;
......@@ -90,11 +101,14 @@
.shop .shopitem .shopitem_txt {
pointer-events: none;
width: 88rpx;
width: 122rpx;
font-weight: bold;
letter-spacing: 1rpx;
text-align: center;
/* height: 20rpx; */
opacity: 1;
left: 136rpx;
top: 261rpx;
left: 120rpx;
top: 253rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 21.79723rpx;
......@@ -102,26 +116,25 @@
}
.shop .shopitem .shopitem_name {
width: 209rpx;
width: 200rpx;
/* height: 23rpx; */
opacity: 1;
left: 51rpx;
top: 203rpx;
top: 200rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 20.12052rpx;
color: #474543;
overflow: hidden;
text-align: center;
text-overflow: ellipsis;
white-space: nowrap;
}
.shop .shop_gold {
width: 98rpx;
height: 21rpx;
opacity: 1;
left: 348rpx;
top: 151rpx;
top: 140rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 23.47394rpx;
......
taobao_mini/client/pages/pageshop/pageshop.js
View file @ 5aec9961
......@@ -51,7 +51,7 @@ Page({
const { data: { list, happyCoin } } = await API.exchangeGoodList();
list.forEach(item => {
item.exchanged = item.status == EXCHANGE_STATUS.DONE;
item.image = item.image || '//yun.duiba.com.cn/aurora/assets/50886651a4b369800cad1e9b958b9edc86150533.png';
item.image = item.image || '//yun.duiba.com.cn/aurora/assets/00b4b751939da230055889445f00f22990ff5f88.png';
});
this.setData({ list, happyCoin });
},
......
taobao_mini/mocks/mine.authorize.json 0 → 100644
View file @ 5aec9961
{
"success": true
}
\ No newline at end of file
taobao_mini/mocks/mine.getAppData.json 0 → 100644
View file @ 5aec9961
{
"success": true,
"data": {
"avatar": "https://source.unsplash.com/user/erondu/76x76",
"nickName": "我啊是大请问",
"activityId": "string",
"openId": "string",
"inviteId": "string",
"isFollow": true
}
}
taobao_mini/mocks/mine.navigateToPage.json 0 → 100644
View file @ 5aec9961
{
"success": true
}
\ No newline at end of file
taobao_mini/mocks/mine.showModal.json 0 → 100644
View file @ 5aec9961
{
"success": true
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.doBrowseGoodsTask.json 0 → 100644
View file @ 5aec9961
{
"success": true,
"data": {
"value": "500",
"backTime": "1989897768",
"serverTime": "188888776"
},
"message":"fuck"
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.doFollowTask.json 0 → 100644
View file @ 5aec9961
{
"success": 1,
"data": {
"value": "500",
"backTime": "1989897768",
"serverTime": "188888776"
},
"message":"fuck"
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.doSignTask.json 0 → 100644
View file @ 5aec9961
{
"success": false,
"data": {
"value": "500",
"backTime": "1989897768",
"serverTime": "188888776"
},
"message":"fuck"
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.exchangeGood.json 0 → 100644
View file @ 5aec9961
{
"success": 1,
"data": {
"channel": "aliqua sint fugiat non do",
"strategyCode": "anim",
"code": "amet",
"image": "ea nulla aute eu",
"name": "in",
"type": -27273675.128173023
},
"code": "quis nostrud fugiat pariatur",
"message":"欢乐币不足"
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.exchangeGoodList.json 0 → 100644
View file @ 5aec9961
This diff is collapsed.
taobao_mini/mocks/tmallCat.getMyPrizeList.json 0 → 100644
View file @ 5aec9961
{
"code": "000000",
"data": {
"list": [
{
"_id": "5f71d38a67f1375241ab6b2b",
"activityId": "5f7183e852bbded304b27d71",
"amount": 20000,
"amount_unit": "分",
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "a66621ec7c434842bfe4d01082128f1d",
"createDay": "2020/09/28",
"createTime": 1601295242020,
"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": "5f71d38a67f1375241ab6b2b",
"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": "fuckyou",
"openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
"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": 1601295242020,
"userNick": "tb80525668"
},
{
"_id": "5f71d38852bbded304b3f8a3",
"activityId": "5f7183e852bbded304b27d71",
"createDay": "2020/09/28",
"createTime": 1601295240072,
"drawStatus": 1,
"ename": "",
"expiredTime": 1601628302000,
"id": "5f71d38852bbded304b3f8a3",
"image": "https://img.alicdn.com/imgextra/i2/2208492139886/O1CN01XlNdWj2Mtq8E9OEw1_!!2208492139886-2-miniprogram.png",
"name": "兑换奖励235",
"openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
"prizeDataType": 2,
"prizeId": "5f6b09b39897b412b595a32b",
"remark": "",
"type": 3,
"updateTime": 1601295240072,
"userNick": "tb80525668"
},
{
"_id": "5f71d38567f1375241ab6b20",
"activityId": "5f7183e852bbded304b27d71",
"amount": 10000,
"amount_unit": "分",
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "f8564ef50a86418b9226ce1d9bb6ace6",
"createDay": "2020/09/28",
"createTime": 1601295237953,
"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": "5f71d38567f1375241ab6b20",
"image": "",
"material": {
"brandLogo": "T1bOKxFoFcXXb1upjX.jpg"
},
"name": "fuckyou3",
"openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
"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": 1601295237953,
"userNick": "tb80525668"
},
{
"_id": "5f71d3849897b412b5a4fa47",
"activityId": "5f7183e852bbded304b27d71",
"asac": "1A202010JWPLV3428VWIEP",
"can_win": true,
"code": "7254115b0fcc4c77bdbb35ed658c1db2",
"createDay": "2020/09/28",
"createTime": 1601295236035,
"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": "5f71d3849897b412b5a4fa47",
"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": "fuckyou2",
"openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
"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": 1601295236035,
"userNick": "tb80525668"
}
]
},
"message": "成功",
"success": true
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.getSence.json 0 → 100644
View file @ 5aec9961
{
"success": true,
"message":"",
"data": {
"sence": 1,
"senceTips":["测试","测试"],
"senceGuide":{
"1":false,
"2":false,
"3":false,
"4":true
}
}
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.getTaskList.json 0 → 100644
View file @ 5aec9961
{
"code": "000000",
"data": [
{
"completeTimes": 0,
"rewards": 1,
"status": 2,
"taskRateType": 2,
"taskType": "sign",
"times": 1,
"title": "每日签到",
"todayCompleteTimes": 0,
"waitReceive": 0
},
{
"completeTimes": 0,
"rewards": 10,
"sellerId": "oooo",
"status": 1,
"taskRateType": 1,
"taskType": "follow",
"title": "关注店铺1"
},
{
"completeTimes": 0,
"rewards": 10,
"sellerId": "wwwww",
"status": 1,
"taskRateType": 1,
"taskType": "follow",
"title": "关注店铺2"
},
{
"completeTimes": 0,
"itemIds": "",
"rewards": "2",
"status": 1,
"taskRateType": 2,
"taskType": "browseGoods",
"times": 1,
"title": "浏览商品",
"todayCompleteTimes": 0,
"url": "http://www.taobao.com",
"waitReceive": 0
},
{
"completeTimes": 0,
"rewards": "1",
"status": 1,
"taskRateType": 1,
"taskType": "invites",
"times": 3,
"title": "邀请",
"todayCompleteTimes": 0,
"waitReceive": 0
}
],
"message": "成功",
"success": true
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.getUserEnergy.json 0 → 100644
View file @ 5aec9961
{
"success": true,
"data": 2000,
"code": "culpa eu Ut"
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.getUserInfo.json 0 → 100644
View file @ 5aec9961
{
"success": true,
"message":"",
"data": {
"catType": 4,
"userNick": "Edwise",
"energy": 1000,
"happyCoin":1000,
"experience": 80,
"level": "1",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=vFHbMm8SPFPHPFRHPG7HPmPhvmgyPGPIP07-OF*eMmQT&width=80&height=80&type=sns",
"sence": 1,
"catName": "哈哈哈",
"senceTips":["1说话说话说话说话说话说话说话说话说话说话说话","2说话说话说话说话说话说话说话说话说话说话说话说话","3说话说话说话说话说话说话说话说话说话说话说话说话"],
"energyMax":2000,
"experienceMax":100,
"senceGuide":true
}
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.interaction.json 0 → 100644
View file @ 5aec9961
{
"success": true,
"data": {
"tips": "梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛",
"isUpgrade": true,
"channel": "aliqua",
"strategyCode": "dolore",
"code": "et nostrud adipisicing",
"image": "occaecat aliquip",
"name": "officia et deserunt ut",
"type": 65894870.29773912
},
"code": "culpa eu Ut"
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.login.json 0 → 100644
View file @ 5aec9961
{"success":true,"data":{"openId":"incididunt non"},"code":"dolor ex"}
\ No newline at end of file
taobao_mini/mocks/tmallCat.recallCat.json 0 → 100644
View file @ 5aec9961
{
"success": true,
"data": {
"value": 100,
"type": 4,
"backType": 1,
"desc": "恭喜恭喜恭喜恭喜恭喜恭喜恭喜恭喜恭喜恭喜",
"tips": []
}
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.recallInfo.json 0 → 100644
View file @ 5aec9961
{
"success": true,
"data": {
"value": "500",
"backTime": "1989897768",
"serverTime": "188888776"
}
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.receiveTaskRewards.json 0 → 100644
View file @ 5aec9961
{
"success": 1,
"data": {
"energy": "500",
"times": "1989897768",
"serverTime": "188888776"
},
"message":"fuck"
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.recoverEnergy.json 0 → 100644
View file @ 5aec9961
{
"success": true,
"data": null,
"code": "culpa eu Ut"
}
\ No newline at end of file
taobao_mini/mocks/tmallCat.updateSenceGuide.json 0 → 100644
View file @ 5aec9961
{
"success": true,
"data": null,
"code": "culpa eu Ut"
}
\ 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