Skip to content

N
new_taobao
Commit 8b1ae69c authored by zhangjinzhou's avatar zhangjinzhou
Browse files
Options

代码暂存

parent 6a44fd83
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10977 additions and 87 deletions
taobao_mini/client/components/comgui_ze_dan_chuang/comgui_ze_dan_chuang.acss
View file @ 8b1ae69c
......@@ -46,5 +46,6 @@
position: absolute;
font-size: 30rpx;
color: #000000;
letter-spacing: 1rpx;
transform-origin: 0rpx 0rpx 0rpx;
}
taobao_mini/client/components/compai_xing_bang/compai_xing_bang.acss
View file @ 8b1ae69c
......@@ -35,7 +35,7 @@
top: 128rpx;
position: absolute;
font-size: 48rpx;
color: #000000;
color: #cc3333;
transform-origin: 0rpx 0rpx 0rpx;
text-align: center;
font-weight: bold;
......@@ -72,7 +72,7 @@
top: 0rpx;
position: absolute;
font-size: 24rpx;
color: #000000;
color: #999999;
transform-origin: 0rpx 0rpx 0rpx;
}
.pai_xing_bang .pai_mingtit .yong_hu_ming {
......@@ -84,7 +84,7 @@
top: 0rpx;
position: absolute;
font-size: 24rpx;
color: #000000;
color: #999999;
transform-origin: 0rpx 0rpx 0rpx;
}
.pai_xing_bang .pai_mingtit .dui_you_ren_shu {
......@@ -96,7 +96,7 @@
top: 0rpx;
position: absolute;
font-size: 24rpx;
color: #000000;
color: #999999;
transform-origin: 0rpx 0rpx 0rpx;
}
.pai_xing_bang .wo_de_pai_ming {
......@@ -110,6 +110,10 @@
transform-origin: 0rpx 0rpx 0rpx;
background-color: #ffe0de;
}
.top3{
font-weight: bold;
font-style: italic;
}
.pai_xing_bang .wo_de_pai_ming .urank {
width: 150rpx;
height: 40rpx;
......@@ -119,7 +123,7 @@
top: 20rpx;
position: absolute;
font-size: 24rpx;
color: #000000;
color: #cc3333;
transform-origin: 0rpx 0rpx 0rpx;
text-align: center;
}
......@@ -145,7 +149,7 @@
top: 20rpx;
position: absolute;
font-size: 24rpx;
color: #000000;
color: #cc3333;
transform-origin: 0rpx 0rpx 0rpx;
text-align: right;
}
......@@ -180,7 +184,7 @@
top: 20rpx;
position: absolute;
font-size: 24rpx;
color: #000000;
color: #cc3333;
transform-origin: 0rpx 0rpx 0rpx;
text-align: center;
}
......@@ -206,7 +210,7 @@
top: 20rpx;
position: absolute;
font-size: 24rpx;
color: #000000;
color: #cc3333;
transform-origin: 0rpx 0rpx 0rpx;
text-align: right;
}
taobao_mini/client/components/compai_xing_bang/compai_xing_bang.axml
View file @ 8b1ae69c
......@@ -9,13 +9,13 @@
<label class="dui_you_ren_shu">队友人数</label>
</view>
<view class="wo_de_pai_ming">
<label class="urank">{{myData.rank}}</label>
<label class="urank{{myData.rank<4?' top3':''}}">{{myData.rank<4?'TOP'+myData.rank:''+myData.rank}}</label>
<label class="uname">{{myData.userNick}}</label>
<label class="uscore">{{myData.count}}</label>
</view>
<scroll-view class="pai_ming_lie_biao" scroll-y="{{true}}" onScrollToUpper="upper" onScrollToLower="lower" onScroll="scroll" >
<view class="rankitem" a:for="{{rankdata}}" a:key="*this" style="top:{{index*80+'rpx;'}}">
<label class="prank">{{item.rank}}</label>
<label class="prank{{index<3?' top3':''}}">{{index<3?'TOP'+(index+1):''+(index+1)}}</label>
<label class="pname">{{item.userNick}}</label>
<label class="pscore">{{item.count}}</label>
</view>
......
taobao_mini/client/components/comxuan_ze_dan_chuang/comxuan_ze_dan_chuang.js
View file @ 8b1ae69c
......@@ -24,8 +24,10 @@ Component({
onPickShoes&&onPickShoes();
},
async chooseShoes() {
console.log("选择这双鞋子", this.data.nselid);
let pickRes = await API.pickShoes().catch(res => {
console.log("选择这双鞋子=========>", this.data.nselid);
let pickRes = await API.pickShoes({
shoesType:this.data.nselid
}).catch(res => {
commonToast(res && res.message);
}) || {};
console.log("选鞋结果",pickRes);
......
taobao_mini/client/components/prizeModal/prizeModal.acss
View file @ 8b1ae69c
......@@ -33,6 +33,7 @@
text-align: center;
color: #fff;
margin-top: 60rpx;
letter-spacing: 1rpx;
}
.my-prize-page .my-prize-item {
......
taobao_mini/client/debug.log
View file @ 8b1ae69c
This diff is collapsed.
taobao_mini/client/mocks/tmallCat.getActivityBaseInfoById.json
View file @ 8b1ae69c
......@@ -4,7 +4,7 @@
"data": {
"rule": "活动规则test233",
"startTime": 1601445959737,
"endTime": 1601455959737,
"endTime": 16014559597370,
"awardReceiveExpiredTime":1601445959737,
"source1": 50,
"source2": "1",
......
taobao_mini/client/mocks/tmallCat.getUserCardInfo.json
View file @ 8b1ae69c
......@@ -2,7 +2,7 @@
"success": true,
"message":"网络异常",
"data": {
"shoesName": "",
"shoesName": "shanhai",
"cardCountList": {
"1":99,
"2":1,
......@@ -14,7 +14,7 @@
"8":0,
"9":0
},
"collectedCount": 1,
"collectedCount": 9,
"canTakeRankPrize":false,
"shoesType": 1,
"inviteResult": {
......
taobao_mini/client/pages/pageshou_ye/pageshou_ye.acss
View file @ 8b1ae69c
......@@ -138,10 +138,11 @@
opacity: 1;
display: block;
left: 120rpx;
top: 0rpx;
top: -10rpx;
position: absolute;
font-size: 22rpx;
font-size: 28rpx;
color: #ffffff;
letter-spacing: 2rpx;
transform-origin: 0rpx 0rpx 0rpx;
}
.shou_ye .topnode .rolediv .sprotxt {
......@@ -150,10 +151,11 @@
opacity: 1;
display: block;
left: 120rpx;
top: 35rpx;
top: 40rpx;
position: absolute;
font-size: 22rpx;
font-size: 24rpx;
color: #ffffff;
letter-spacing: 2rpx;
transform-origin: 0rpx 0rpx 0rpx;
}
.shou_ye .contnode {
......
taobao_mini/client/pages/pageshou_ye/pageshou_ye.axml
View file @ 8b1ae69c
......@@ -12,7 +12,7 @@
<view class="rolediv" a:if="{{selected==2}}">
<image class="playericon" src={{avatar}} />
<label class="xing_ming">{{nickname}}</label>
<label class="sprotxt">你已收集{{collectedCount}}/9碎片</label>
<rich-text class="sprotxt" nodes="{{collectxt}}"></rich-text>
</view>
</view>
<view class="contnode">
......@@ -134,7 +134,7 @@
<view class="homedi" a:if="{{selected==2}}">
<image class="xinshou_li_he" a:if="{{giftype==1}}" src={{resList['fdb09ae1-f82f-45c8-bb48-07e2ebd83cc7'].url}} onTap="onOpenGift" />
<image class="liang_xi_li_he" a:if="{{giftype==2}}" src={{resList['2aecf93a-ded0-413b-8ce8-d93d1c9d3725'].url}} onTap="onOpenGift" />
<image class="jin_li_ren_qi_li_he" a:if="{{giftype==3}}" src={{resList['da0ca4e4-85fe-49da-85b8-d9cf493ec6a2'].url}} onTap="onOpenGift" />
<image class="jin_li_ren_qi_li_he" a:if="{{giftype==3&&canTakeRankPrize}}" src={{resList['da0ca4e4-85fe-49da-85b8-d9cf493ec6a2'].url}} onTap="onOpenGift" />
<view class="ji_sui_piangro" onTap="collectSp" a:if="{{collectedCount!=9}}">
<image class="li_ji_ji_sui_pian" src={{resList['7529fa18-551f-43eb-8fc6-315badcf1e8c'].url}} />
<view class="redinfo">
......@@ -142,7 +142,7 @@
<label class="redtxt">{{drawTimes}}</label>
</view>
</view>
<image class="dui_huan_xin_pin" a:if="{{collectedCount==9}}" onTap="getSprize" src={{resList['752e0da4-1fc0-42dd-9cd5-d7afd53d317a'].url}} />
<image class="dui_huan_xin_pin{{isduihuan?' blackWhiteFilter':''}}" a:if="{{collectedCount==9}}" onTap="getSprize" src={{resList['752e0da4-1fc0-42dd-9cd5-d7afd53d317a'].url}} />
<image class="zhao_huan_hao_you" onTap="shareAct" src={{resList['f293caf3-cb41-400a-b67d-e8fb59d1857d'].url}} />
<label class="sharetxt1">{{nearchatxt}}</label>
<view class="lei_ji_zhao_huangro">
......
taobao_mini/client/pages/pageshou_ye/pageshou_ye.js
View file @ 8b1ae69c
......@@ -51,13 +51,19 @@ Page({
isVip: false,
vipLink: "",
giftype: 3,//1-新手礼盒，2-惊喜礼盒，3-锦鲤礼盒，0-都不显示
ptimgbig:"",//选中的鞋子big
ptimgbig: "",//选中的鞋子big
//两个全局按钮点击，除我的奖品和活动规则外，1活动已结束，2请先打开新手礼盒
actover: true,//活动是否已经结束
opengift: false,//是否打开过新手礼盒
nickname: "张三",
avatar: "//yun.duiba.com.cn/spark/assets/28092c7c919a2c8ea9b750fb79abd2416ba8f90f.png",
shoesName: "",
shoesName: "jijia",
cardCountList: {},
collectedCount: 8,//已收集数量
collectxt: [],//已收集富文本
// 你已收集{{collectedCount}}/9碎片
isduihuan: true,//是否兑换过，兑换过置灰
shoesType: 0,
inviteResult: {},//
drawTimes: 1,//剩余抽卡次数
......@@ -75,7 +81,7 @@ Page({
prizename: "",
prizetype: "",
prizebtntype: 1,
attionfrom:"",//啥功能gift--人气抽奖，prize--中奖弹窗
attionfrom: "",//啥功能gift--人气抽奖，prize--中奖弹窗
//info弹窗
infobtntype: 1,//1知道了，2召唤好友，3马上去抽碎片
infotopshow: false,//顶部恭喜你是否显示
......@@ -157,49 +163,6 @@ Page({
if (netName == "cardani_over") {
console.log("canvas动画播放完毕=======》");
}
// if (netName.indexOf("mine") == 0) {
// var data = {
// success: true
// };
// switch (netName) {
// case "mine.getAppData":
// //获取信息
// let tmpApp = getApp();
// console.log('app信息', tmpApp);
// data = {
// success: true,
// data: {
// activityId: tmpApp.activityId,
// //|| "5e7c40e98564b57d7fb95812",
// nickName: tmpApp.nickName,
// avatar: tmpApp.avatar,
// openId: tmpApp.openId,
// isFocusShop: tmpApp.isFollow || false
// }
// };
// break;
// case "cardani_over":
// console.log("canvas动画播放完毕=======》");
// break;
// case 'test':
// console.log('测试一下', parameter.hint);
// break;
// }
// this.postMessage(netName, data);
// } else {
// var app = getApp(); //获取后端接口
// const {
// function: fc
// } = app.cloud;
// const [myCloudName, handler] = netName.split("."); //待写，
// fc.invoke(myCloudName, parameter, handler).then(res => {
// this.postMessage(netName, res);
// });
// }
},
//鼠标事件
onMouseEvent(e) {
......@@ -239,7 +202,7 @@ Page({
*/
async login() {
const { nickName, avatar } = app;
const { success, data } = await API.login({ userNick: nickName, avatar }).catch(res => {
const { success, data } = await API.login({ userNick: nickName, avatar: avatar }).catch(res => {
commonToast(res && res.message);
}) || {};
......@@ -267,10 +230,16 @@ Page({
const { success, data } = activityInfo;
if (success) {
const { rule, startTime, endTime, awardReceiveExpiredTime, source1, source2, shoesList } = data;
let datenow = Date.now();
let actover = false;
if (datenow >= endTime) {//活动未结束
actover = true;
}
this.setData({
rule: rule,
startTime: startTime,
endTime: endTime,
actover: actover,
awardReceiveExpiredTime: awardReceiveExpiredTime,
source1: source1,
source2: source2,
......@@ -300,11 +269,46 @@ Page({
this.getDrawTimes();
this.getInviteAwardsList();
}
let collectxt = [
{
name: "label",
attrs: {
style: "color:#ffffff"
},
children: [{
type: "text",
text: "你已收集"
}]
},
{
name: "label",
attrs: {
style: "color:#ffcc33"
},
children: [{
type: "text",
text: collectedCount + "/9"
}]
},
{
name: "label",
attrs: {
style: "color:#ffffff"
},
children: [{
type: "text",
text: "碎片"
}]
}
]
this.setData({
selected: selected,
shoesName: shoesName,
cardCountList: cardCountList,
collectedCount: collectedCount,
collectxt: collectxt,
canTakeRankPrize: canTakeRankPrize,
shoesType: shoesType,
inviteResult: inviteResult
......@@ -392,6 +396,10 @@ Page({
let selected = this.data.selected;
if (collectedCount == 0 && selected == 2) {//新人
this.openGift();
} else {
this.setData({
opengift: true
});
}
},
/**
......@@ -412,9 +420,9 @@ Page({
this.openInfo();
} else if (giftype == 3) {//人气锦鲤
this.setData({
attionfrom:"gift",
prizebtntype:2,
prizeimg:resList["shanhaibig"].url
attionfrom: "gift",
prizebtntype: 2,
prizeimg: resList["shanhaibig"].url
});
this.openAttion();
}
......@@ -446,6 +454,7 @@ Page({
let uncommon = false;
let btntype = uncommon ? 2 : 1;
this.setData({
opengift: true,
cardType: cardType,
israre: uncommon,
spimg: spimg,
......@@ -637,17 +646,22 @@ Page({
let sel = Number(dataset.sel);
if (sel && sel != this.data.nselid) {
let nselname = ["jijia", "jianzhen", "erciyuan", "shanhai", "tiancheng"][sel - 1];
let ptimgbig = resList[nselname+"big"].url
let ptimgbig = resList[nselname + "big"].url
this.setData({
nselid: sel,
selshoesname: nselname,
ptimgbig:ptimgbig
ptimgbig: ptimgbig
});
}
}
},
//集碎片
async collectSp() {
let cancontinue = this.checkClickBtn();
if (!cancontinue) {
return false;
}
console.log("点击集碎片");
let drawTimes = this.data.drawTimes;
if (drawTimes < 1) {//无次数
......@@ -725,6 +739,14 @@ Page({
},
//收集完碎片，兑奖
async getSprize() {
let cancontinue = this.checkClickBtn();
if (!cancontinue) {
return false;
}
if (this.data.isduihuan) {
console.log("兑换过了");
return;
}
console.log("收集碎片完毕，去兑奖");
// let collectPrize = await API.takeCollectedPrize().catch(res => {
// commonToast(res && res.message);
......@@ -766,8 +788,8 @@ Page({
prizeimg: image,
prizename: name,
prizetype: type,
prizebtntype:1,
attionfrom:"prize",
prizebtntype: 1,
attionfrom: "prize",
});
if (type == 5) {//谢谢参与
this.setData({
......@@ -801,13 +823,17 @@ Page({
},
//邀请好友
shareAct() {
let cancontinue = this.checkClickBtn();
if (!cancontinue) {
return false;
}
console.log("邀请好友");
this.setData({
whitept_v: false,
ptimg_v: false,
ptimg_ani: false
});
// my.showSharePanel();
// this.setData({
// whitept_v: false,
// ptimg_v: false,
// ptimg_ani: false
// });
my.showSharePanel();
},
//邀请奖励
async getSarePrize(e) {
......@@ -820,7 +846,14 @@ Page({
console.log("邀请好友奖励=====》", pidx, pstatus, sharenums);
if (pstatus == 2) {//点击领取
let invitePrize = await API.takeInvitePrize().catch(res => {
let cancontinue = this.checkClickBtn();
if (!cancontinue) {
return false;
}
let invitePrize = await API.takeInvitePrize({
type: pidx
}).catch(res => {
commonToast(res && res.message);
}) || {};
const { success, data } = invitePrize;
......@@ -855,19 +888,23 @@ Page({
//会员专区
registerVip() {
console.log("会员专区");
let url = this.data.source1;
navigateToOutside(url);
},
//双十一会场链接
registerD11() {
console.log("双十一专区");
let url = this.data.source2;
navigateToOutside(url);
},
onShareAppMessage() {
let {
path,
...rest
} = SHARE_CONFIG;
console.log('app.openId', app.openId);
console.log('app.openId', app.openId, "shoesname", this.data.shoesName);
if (app.openId) {
path = '/pages/pageshou_ye/pageshou_ye' + '?openId=' + app.openId;
path = '/pages/pageshou_ye/pageshou_ye' + '?openId=' + app.openId + "&shoestype=" + this.data.shoesName;
}
console.log('path', path)
......@@ -876,4 +913,19 @@ Page({
path
}
},
//全局按钮点击判断，需确保活动中，打开新手了新手礼盒
checkClickBtn() {
let actover = this.data.actover;
let opengift = this.data.opengift;
if (actover || !opengift) {
if (actover) {
commonToast("活动已结束");
} else if (!opengift) {
this.openGift();
}
return false;
} else {
return true;
}
}
});
\ No newline at end of file
taobao_mini/client/tbcc-sdk/lib/constants.js
View file @ 8b1ae69c
// 分享配置
export const SHARE_CONFIG = {
title: '爱斐楼上请',
desc: '积分盖楼赢锦鲤 享一年新衣',
title: '特步集卡sharetit',
desc: '特步集卡desc',
imageUrl: 'https://isv.alibabausercontent.com/00000000/imgextra/i2/676606897/O1CN01eNrwLl20osHoB4Y7d_!!676606897-2-isvtu-00000000.png', // 分享图片URL
path: '/pages/pageshou_ye/pageshou_ye'
};
......
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