Commit 7273e44f authored by zhangjinzhou's avatar zhangjinzhou

代码暂存

parent 6cb75b98
...@@ -872,24 +872,29 @@ ...@@ -872,24 +872,29 @@
.shou_ye .botnode .selshoes .selscroll { .shou_ye .botnode .selshoes .selscroll {
width: 694rpx; width: 694rpx;
height: 190rpx; height: 230rpx;
opacity: 1; opacity: 1;
display: block; display: block;
left: 0rpx; left: 0rpx;
top: 80rpx; top: 60rpx;
position: absolute; position: absolute;
/* overflow-x:auto; */ /* overflow-x:auto; */
overflow-y: hidden; overflow-y: hidden;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
::-webkit-scrollbar {
/*隐藏滚bai轮*/
display: none;
}
.shou_ye .botnode .selshoes .selscroll .shoes1 { .shou_ye .botnode .selshoes .selscroll .shoes1 {
width: 161rpx; width: 161rpx;
height: 161rpx; height: 161rpx;
opacity: 1; opacity: 1;
display: block; display: block;
left: 0rpx; left: 0rpx;
top: 0rpx; top: 20rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
...@@ -958,7 +963,7 @@ ...@@ -958,7 +963,7 @@
opacity: 1; opacity: 1;
display: block; display: block;
left: 170rpx; left: 170rpx;
top: 0rpx; top: 20rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
...@@ -1027,7 +1032,7 @@ ...@@ -1027,7 +1032,7 @@
opacity: 1; opacity: 1;
display: block; display: block;
left: 340rpx; left: 340rpx;
top: 0rpx; top: 20rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
...@@ -1096,7 +1101,7 @@ ...@@ -1096,7 +1101,7 @@
opacity: 1; opacity: 1;
display: block; display: block;
left: 510rpx; left: 510rpx;
top: 0rpx; top: 20rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
...@@ -1165,7 +1170,7 @@ ...@@ -1165,7 +1170,7 @@
opacity: 1; opacity: 1;
display: block; display: block;
left: 680rpx; left: 680rpx;
top: 0rpx; top: 20rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
......
...@@ -216,7 +216,7 @@ Page({ ...@@ -216,7 +216,7 @@ Page({
} else { } else {
setTimeout(() => { setTimeout(() => {
this.changeBtnReady(true); this.changeBtnReady(true);
},200); }, 200);
} }
}, },
...@@ -1320,14 +1320,19 @@ Page({ ...@@ -1320,14 +1320,19 @@ Page({
attionfrom: "prize", attionfrom: "prize",
}); });
if (type == 5) {//谢谢参与 if (type == 5) {//谢谢参与
if (atype == "prize") {
this.setData({ this.setData({
infobtntype: 1, infobtntype: 1,
infotopshow: false, infotopshow: false,
infotit: "很遗憾\n大奖与你擦肩而过啦" infotit: "很遗憾\n大奖与你擦肩而过啦"
}) })
if (atype == "prize") {
this.openInfo(); this.openInfo();
} else { } else {
this.setData({
infobtntype: 1,
infotopshow: false,
infotit: "很遗憾\n奖品发完啦 下次要赶早哦~"
});
this.playPrizeAni(this.openInfo.bind(this)); this.playPrizeAni(this.openInfo.bind(this));
} }
} else { } else {
...@@ -1338,12 +1343,21 @@ Page({ ...@@ -1338,12 +1343,21 @@ Page({
} }
} }
} else {//失败进谢谢参与 } else {//失败进谢谢参与
console.log("谢谢参与") console.log("谢谢参与");
if (atype == "prize") {
this.setData({
infobtntype: 1,
infotopshow: false,
infotit: "很遗憾\n大奖与你擦肩而过啦"
})
} else {
this.setData({ this.setData({
infobtntype: 1, infobtntype: 1,
infotopshow: false, infotopshow: false,
infotit: "很遗憾\n奖品发完啦 下次要赶早哦~" infotit: "很遗憾\n奖品发完啦 下次要赶早哦~"
}); });
}
if (atype == "prize") { if (atype == "prize") {
this.openInfo(); this.openInfo();
} else { } else {
......
...@@ -730,6 +730,12 @@ const resList = { ...@@ -730,6 +730,12 @@ const resList = {
ext: '.png', ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/为他助力.57006fd0777754592e6de0ac498a4dc9955c1be7.png', url: '//yun.duiba.com.cn/spark/assets/为他助力.57006fd0777754592e6de0ac498a4dc9955c1be7.png',
uuid: 'ae2a2e5c-3af2-4861-82a8-8d863c323db6' uuid: 'ae2a2e5c-3af2-4861-82a8-8d863c323db6'
},
'8b307a60-7bbb-42bb-9da7-1e7bf5ce7600': {
name: '助力图',
ext: '.jpg',
url: '//yun.duiba.com.cn/spark/assets/助力图.1d7113d24fa34d4d2bf141aa60624afd6f93804e.jpg',
uuid: '8b307a60-7bbb-42bb-9da7-1e7bf5ce7600'
} }
}; };
export default resList; export default resList;
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