Skip to content

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

代码暂存

parent 8386dcc6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 310 additions and 138 deletions
taobao_mini/client/components/comattion_dan_chuang/comattion_dan_chuang.js
View file @ e46cfe63
......@@ -33,7 +33,7 @@ Component({
if(attionfrom=="gift"){
tit = "获得抽取年度人气锦鲤大奖的机会\n快去抽奖吧";
}else if(attionfrom=="prize"){
tit = prizename+"新品一双";
tit = "获得了"+prizename;
}
let subtit = [];
......
taobao_mini/client/components/compai_xing_bang/compai_xing_bang.axml
View file @ e46cfe63
......@@ -9,7 +9,7 @@
<label class="dui_you_ren_shu">队友人数</label>
</view>
<view class="wo_de_pai_ming">
<label class="urank{{myData.rank<4?' top3':''}}">{{myData.rank<4?'TOP'+myData.rank:''+myData.rank}}</label>
<label class="urank{{myData.rank<4?' top3':''}}">{{myData.rank<4&&myData.rank>0?'TOP'+myData.rank:''+myData.rank}}</label>
<label class="uname">{{myData.userNick}}</label>
<label class="uscore">{{myData.count}}</label>
</view>
......
taobao_mini/client/components/compai_xing_bang/compai_xing_bang.js
View file @ e46cfe63
......@@ -10,9 +10,9 @@ Component({
resList: resList,
rankdata: [],
myData: {
rank: "--",
userNick: "用户x",
count: 0
rank: " ",
userNick: "",
count: " "
},
pageidx: 0,
getpage: false
......@@ -73,6 +73,9 @@ Component({
if (list.length < pagesize) {
getpage = true;
}
if(myRank.rank>300){
myRank.rank = "300+"
}
myRank.userNick = this.changenameShow(myRank.userNick);
if(!myRank.count)myRank.count=0;
for(let i=0;i<list.length;i++){
......
taobao_mini/client/components/comsui_pian_dan_chuang/comsui_pian_dan_chuang.js
View file @ e46cfe63
......@@ -56,7 +56,7 @@ Component({
let tit = "你获得了xx碎片";
let subtit = "";
if (btntype == 1) {
tit = "你获得了" + shoesName + "碎片";
tit = "你获得了" + shoesName + "系列碎片";
if(nearchashare&&nearchaprize.length>0&&nearchashare<=3){
subtit = "再召唤"+nearchashare+"位好友就能获得"+nearchaprize;
}
......
taobao_mini/client/components/comxin_ren_li_bao/comxin_ren_li_bao.js
View file @ e46cfe63
......@@ -16,6 +16,12 @@ Component({
*/
onOpenGift(){
const {onOpenGift} = this.props;
my.setStorageSync({
key: 'tbjkactnewgift',
data: {
click:"1"
}
});
onOpenGift&&onOpenGift();
}
},
......
taobao_mini/client/components/prizeModal/prizeModal.acss
View file @ e46cfe63
......@@ -19,7 +19,10 @@
.my-prize-page .my-prize-label {
width: 210rpx;
height: 37rpx;
margin: 40rpx auto;
/* position: absolute; */
/* top:140rpx; */
/* left:270rpx; */
margin: 140rpx auto 50rpx;
background: url('//yun.duiba.com.cn/aurora/assets/f0df2ef677f00130a80cdf125c3456febf18c265.png') no-repeat;
background-size: 100% 100%;
}
......@@ -27,12 +30,16 @@
.my-prize-page .my-prize-list {
width: 100%;
height: auto;
}
.my-prize-page .my-prize-empty {
width: 750rpx;
text-align: center;
color: #fff;
margin-top: 60rpx;
/* position: absolute; */
/* top:350rpx; */
margin-top: 150rpx;
letter-spacing: 1rpx;
}
......@@ -84,7 +91,7 @@
.my-prize-page .my-prize-item .prize-status {
width: 150rpx;
height: 41rpx;
height: 40rpx;
}
.prize-status>image {
......
taobao_mini/client/pages/myprize/myprize.js
View file @ e46cfe63
......@@ -33,8 +33,8 @@ Page({
copyIcon: '//yun.dui88.com/duiba-components-c-myprizemyprize_copy_code.png', //复制
},
btnStyle: { // 按钮自定义样式
width: '154rpx',
height: '49rpx',
width: '150rpx',
height: '40rpx',
}
}
},
......@@ -146,18 +146,18 @@ Page({
}
flag = true;
const { item: { strategyCode, code, channel } } = e.target.dataset;
this.cloudTBIssue({ strategyCode, code, channel })
// const { activityId } = app;
// console.log(item, '领取权益')
// const { success, data, message } = await API.receiveEnamePrize({ activityId, _id: item._id }).catch(res => {
// this.getMyPrize('noLoading')
// commonToast(res && res.message)
// }) || {};
// if (success && data) {
// commonToast('领取成功')
// this.getMyPrize()
// }
// const { item: { strategyCode, code, channel } } = e.target.dataset;
// this.cloudTBIssue({ strategyCode, code, channel })
const { activityId } = app;
console.log(item, '领取权益')
const { success, data, message } = await API.receiveEnamePrize({ activityId, id: item._id }).catch(res => {
this.getMyPrize('noLoading')
commonToast(res && res.message)
}) || {};
if (success && data) {
commonToast('领取成功')
this.getMyPrize()
}
......@@ -169,57 +169,53 @@ Page({
},
// 领取实物前询问
async handleGetEntity(e) {
const text = 'zzzxxx'
commonToast('请前去钉钉领取，钉钉号为：'+text+'。钉钉号已经复制成功。',3000);
setClipboard({ text:`${text}` })
// if (flag) {
// return
// }
// // my.showLoading();
// flag = true;
// const { activityId } = app;
// const { item } = e.target.dataset;
// const userAddress = await getUserAddress({ joinTag: " " }).catch((data) => {
// flag = false
// console.log('getUserAddress出错了，错误信息是', data);
// })
// // my.hideLoading();
// if (!userAddress) return
// // commonToast(' getUserAddress =>'+JSON.stringify( userAddress))
// const { name, telNumber, provinceName, cityName, cityCode, countyName, detailInfo, streetName } = userAddress || {};
// const params = {
// activityId,
// area: countyName,
// addressdetail: detailInfo,
// name,
// phone: telNumber,
// detailInfo,
// cityCode,
// cityName,
// city: cityName,
// province: provinceName,
// provinceName,
// countyName,
// streetName,
// _id: item._id
// }
if (flag) {
return
}
// my.showLoading();
flag = true;
const { activityId } = app;
const { item } = e.target.dataset;
const userAddress = await getUserAddress({ joinTag: "" }).catch((data) => {
flag = false
console.log('getUserAddress出错了，错误信息是', data);
})
// my.hideLoading();
if (!userAddress) return
// commonToast(' getUserAddress =>'+JSON.stringify( userAddress))
const { name, telNumber, provinceName, cityName, cityCode, countyName, detailInfo, streetName } = userAddress || {};
const params = {
activityId,
area: countyName,
addressDetail: detailInfo,
name,
phone: telNumber,
detailInfo,
cityCode,
cityName,
city: cityName,
province: provinceName,
provinceName,
countyName,
streetName,
id: item._id
}
// my.confirm({
// title: '提示',
// content: '确认使用该收货地址：' + name + telNumber + userAddress.duibaAddress.address,
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// success: (result) => {
// console.log(result)
// const { confirm } = result;
my.confirm({
title: '提示',
content: '确认使用该收货地址：' + name + telNumber + userAddress.duibaAddress.address,
confirmButtonText: '确定',
cancelButtonText: '取消',
success: (result) => {
console.log(result)
const { confirm } = result;
// if (confirm) {
// this.receiveObjectPrize(params);
// }
// },
// });
// flag = false
if (confirm) {
this.receiveObjectPrize(params);
}
},
});
flag = false
},
// 领取实物
async receiveObjectPrize(params) {
......@@ -260,11 +256,11 @@ Page({
const { activityId } = app;
const { item } = e.target.dataset;
console.log(item, '领取积分')
const { success, data, message } = await API.receiveEnamePrize({ activityId, _id: item._id }) || {};
const { success, data } = await API.receiveEnamePrize({ activityId, id: item._id }).catch(res => {
commonToast(res && res.message)
}) || {};
if (success && data) {
commonToast('领取成功')
} else {
commonToast(message)
}
flag = false
this.getMyPrize()
......
taobao_mini/client/pages/pagecanvas/output.js
View file @ e46cfe63
......@@ -1791,12 +1791,12 @@ var StartScene = (function (_super) {
return __generator(this, function (_a) {
this.whiteani = new FYGE.Lottie(whitedia_1.whitedia);
this.addChild(this.whiteani);
itxt = new FYGE.TextField();
itxt.size = 66;
itxt.text = "测试动画";
itxt.fillColor = "red";
this.addChild(itxt);
itxt.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, this.resetani, this);
// itxt = new FYGE.TextField();
// itxt.size = 66;
// itxt.text = "测试动画";
// itxt.fillColor = "red";
// this.addChild(itxt);
// itxt.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, this.resetani, this);
return [2];
});
});
......
taobao_mini/client/pages/pageshou_ye/pageshou_ye.axml
View file @ e46cfe63
......@@ -63,7 +63,7 @@
</view>
<view class="pic7{{selected==2&&!cardCountList[7]||cardCountList[7]==0?' blackWhiteFilter':''}}">
<image class="picimg7" src={{resList[selshoesname+7].url}} />
<view class="picredot7" a:if="{{selected==2&&cardCountList[7]&&cardCountList[7]>0}}">
<view class="picredot7" a:if="{{selected==2&&cardCountList[7]&&cardCountList[7]>1}}">
<image class="picredotimg7" src={{resList['9b49cfcd-9ce8-4fe2-bfc0-17532b0ff35b'].url}} />
<label class="picredotnum7">{{cardCountList[7]}}</label>
</view>
......@@ -87,7 +87,7 @@
<view class="ptnode">
<image class="showallimg ptimgani" a:if="{{ptimg_v}}" src={{ptimgbig}} />
</view>
<view class="finapt" a:if="{{selected!=2||isduihuan}}">
<view class="finapt" a:if="{{selected!=2||(isduihuan&&!ptimg_v)}}">
<image class="finaptdi" src={{resList['56d322ae-bfcb-4d03-b5bc-81603cb2fe5b'].url}} />
<image class="finaptimg" src={{ptimgbig}} />
</view>
......@@ -197,8 +197,8 @@
<label class="prizenumstxt4" a:if="{{inviteAwardList[3].type==1}}">{{inviteAwardList[3].rewards+""}}次</label>
</view>
</view>
<image class="hui_yuan_zhuan_qu" onTap="registerVip" src={{resList['d1159e9d-900f-45cf-874f-f7efec6ad918'].url}} />
<image class="shuang_shi_yi_zhuan_qu" onTap="registerD11" src={{resList['e9a0ad73-6fe7-40bd-98cc-9a985bc413e7'].url}} />
<image class="hui_yuan_zhuan_qu" onTap="registerVip" src={{sourceImg1}} />
<image class="shuang_shi_yi_zhuan_qu" onTap="registerD11" src={{sourceImg2}} />
</view>
</view>
</view>
......
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