diff --git a/App.vue b/App.vue
index 8c2b732..5829821 100644
--- a/App.vue
+++ b/App.vue
@@ -14,4 +14,7 @@
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 152dc4a..edda448 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,24 +1,18 @@
-
+
-
-
@@ -47,8 +41,11 @@
};
uni.setStorageSync('orderInfo',JSON.stringify(orderInfo));
checkEvent()
+ //改界面看效果调试专用
+ // num.value = 94 / 100
+ // popupRef.value.open()
}else{
- sendEvent()
+ sendEvent()
}
})
//检查是否存在可领取红包
@@ -59,33 +56,9 @@
recieveEvent()
}else{
popupNullRef.value.open()
- // uni.showModal({
- // title: '提示',
- // content: '暂无可领取的红包!',
- // showCancel:false,
- // success: function (res) {
- // if (res.confirm) {
- // console.log('用户点击确定');
- // } else if (res.cancel) {
- // console.log('用户点击取消');
- // }
- // }
- // });
}
}).catch(() => {
popupNullRef.value.open()
- // uni.showModal({
- // title: '提示',
- // content: '暂无可领取的红包!',
- // showCancel:false,
- // success: function (res) {
- // if (res.confirm) {
- // console.log('用户点击确定');
- // } else if (res.cancel) {
- // console.log('用户点击取消');
- // }
- // }
- // });
})
}
//发送红包的事件
@@ -126,38 +99,10 @@
width: 100vw;
height: 100vh;
overflow-y: auto;
- .tips-text{
- color:#310000;
- font-size:40rpx;
- position: absolute;
- top:50%;
- left:50%;
- transform: translate(-50%,-50%);
- }
- .btn-area{
- position: absolute;
- top:50%;
- left:50%;
- transform: translate(-50%,-50%);
- image{
- width:300rpx;
- height:100rpx;
- border-radius:100rpx;
- }
- }
- .tips-area{
- width:700rpx;
- margin-top:40rpx;
- .tips-img{
- display: block;
- width:100%;
- }
- }
+ background-color: #d6adff;
}
- .popup-content{
+ .popup-null{
width:610rpx;
- /* height:360rpx; */
- /* background: url("../../static/image/popup_bg.png") no-repeat; */
background-repeat:no-repeat;
background-size:cover;
display: flex;
@@ -165,26 +110,6 @@
align-items: center;
box-sizing: border-box;
position: relative;
- .number{
- color:#834525;
- font-size:40rpx;
- margin-top:70rpx;
- margin-bottom:15rpx;
- > text{
- font-size:40rpx;
- margin:0 12rpx;
- display: inline-block;
- }
- }
- .tips{
- color:#d9c3b5;
- font-size:30rpx;
- margin-bottom:25rpx;
- margin-top:50rpx;
- opacity: 0.6;
- font-size:28rpx;
- font-weight:400;
- }
.tips_null{
color:#666;
font-size:30rpx;
@@ -196,17 +121,43 @@
left:50%;
transform: translate(-50%,-50%);
}
- .btn > image{
- width:350rpx;
- height:76rpx;
- }
- .close {
- position: absolute;
- bottom:-100rpx;
- > image {
- width:60rpx;
- height:60rpx;
+ }
+ .popup-content{
+ width:518rpx;
+ //width:610rpx;
+ background-repeat:no-repeat;
+ background-size:cover;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ box-sizing: border-box;
+ position: relative;
+ .number{
+ color:#A000FF;
+ font-size:82rpx;
+ margin-bottom:10rpx;
+ font-weight:600;
+ > text{
+ font-size:36rpx;
+ margin-left:2rpx;
+ display: inline-block;
+ font-weight:400;
}
}
+ .tips{
+ color:#602BAA;
+ font-size:32rpx;
+ margin-bottom:10rpx;
+ margin-top:120rpx;
+ font-weight:500;
+ }
+ .btn{
+ position: absolute;
+ bottom:32rpx;
+ }
+ .btn > image{
+ width:320rpx;
+ height:88rpx;
+ }
}
diff --git a/static/image/bg_new.png b/static/image/bg_new.png
new file mode 100644
index 0000000..7b6e8b0
Binary files /dev/null and b/static/image/bg_new.png differ
diff --git a/static/image/know_btn.png b/static/image/know_btn.png
new file mode 100644
index 0000000..deecf1b
Binary files /dev/null and b/static/image/know_btn.png differ
diff --git a/static/image/popup_new.png b/static/image/popup_new.png
new file mode 100644
index 0000000..8daf9c6
Binary files /dev/null and b/static/image/popup_new.png differ