diff --git a/src/assets/images/ynyc/login.png b/src/assets/images/ynyc/login.png
deleted file mode 100644
index a517a6e..0000000
Binary files a/src/assets/images/ynyc/login.png and /dev/null differ
diff --git a/src/assets/images/ynyc/login.webp b/src/assets/images/ynyc/login.webp
new file mode 100644
index 0000000..50314b4
Binary files /dev/null and b/src/assets/images/ynyc/login.webp differ
diff --git a/src/assets/images/ynyc/notLogin.png b/src/assets/images/ynyc/notLogin.png
deleted file mode 100644
index b8c9cd3..0000000
Binary files a/src/assets/images/ynyc/notLogin.png and /dev/null differ
diff --git a/src/assets/images/ynyc/notLogin.webp b/src/assets/images/ynyc/notLogin.webp
new file mode 100644
index 0000000..9399277
Binary files /dev/null and b/src/assets/images/ynyc/notLogin.webp differ
diff --git a/src/assets/images/ynyc/receive.png b/src/assets/images/ynyc/receive.png
deleted file mode 100644
index 001ab27..0000000
Binary files a/src/assets/images/ynyc/receive.png and /dev/null differ
diff --git a/src/assets/images/ynyc/result.png b/src/assets/images/ynyc/result.png
deleted file mode 100644
index 9cd2a29..0000000
Binary files a/src/assets/images/ynyc/result.png and /dev/null differ
diff --git a/src/assets/images/ynyc/result.webp b/src/assets/images/ynyc/result.webp
new file mode 100644
index 0000000..adca273
Binary files /dev/null and b/src/assets/images/ynyc/result.webp differ
diff --git a/src/assets/images/ynyc/rules.png b/src/assets/images/ynyc/rules.png
deleted file mode 100644
index 5771377..0000000
Binary files a/src/assets/images/ynyc/rules.png and /dev/null differ
diff --git a/src/assets/images/ynyc/rules.webp b/src/assets/images/ynyc/rules.webp
new file mode 100644
index 0000000..d2a07f2
Binary files /dev/null and b/src/assets/images/ynyc/rules.webp differ
diff --git a/src/assets/images/ynyc/view.png b/src/assets/images/ynyc/view.png
deleted file mode 100644
index 6731d63..0000000
Binary files a/src/assets/images/ynyc/view.png and /dev/null differ
diff --git a/src/assets/images/ynyc/view.webp b/src/assets/images/ynyc/view.webp
new file mode 100644
index 0000000..9172eb4
Binary files /dev/null and b/src/assets/images/ynyc/view.webp differ
diff --git a/src/pages/ynyc/index.vue b/src/pages/ynyc/index.vue
index 7888af7..f194f60 100644
--- a/src/pages/ynyc/index.vue
+++ b/src/pages/ynyc/index.vue
@@ -240,8 +240,9 @@ page {
}
.ynyc {
width: 100vw;
- height: 1334rpx;
- // height: 100vh;
+ height: 100vh;
+ // max-height: 1334rpx;
+ overflow: auto;
.mast-content {
height: 100% !important;
@@ -253,7 +254,7 @@ page {
position: fixed;
bottom: 0;
left: 0;
- background-image: url('@/assets/images/ynyc/rules.png');
+ background-image: url('@/assets/images/ynyc/rules.webp');
background-size: 100% 100%;
width: 100%;
height: 100%;
@@ -325,22 +326,26 @@ page {
.receive {
position: relative;
- background-image: url('@/assets/images/ynyc/receive.png');
+ background-image: url('@/assets/images/ynyc/view.webp');
background-size: 100% 100%;
width: 100%;
- height: 100%;
+ // height: 100%;
+ height: 1660rpx;
}
.receive-rules {
position: absolute;
- top: 123rpx;
+ // top: 103rpx;
+ top: 133rpx;
right: 0;
z-index: 1;
width: 50rpx;
- height: 124rpx;
+ // height: 124rpx;
+ height: 144rpx;
}
.receive-btn {
position: absolute;
- top: 813rpx;
+ // top: 753rpx;
+ top: 953rpx;
left: 102rpx;
width: 553rpx;
height: 122rpx !important;
@@ -352,7 +357,8 @@ page {
}
.receive-content {
position: absolute;
- top: 923rpx;
+ // top: 863rpx;
+ top: 1103rpx;
left: 0;
width: 100%;
height: 102rpx;
@@ -364,39 +370,41 @@ page {
color: #ffcc89;
font-size: 27rpx;
}
- .receive-txt::before {
- content: '';
- display: block;
- position: absolute;
- top: 30rpx;
- left: 110rpx;
- width: 50rpx;
- height: 50rpx;
- border-radius: 50%;
- background-color: rgb(249, 76, 58);
- }
- .receive-txt::after {
- content: '';
- display: block;
- position: absolute;
- top: 28rpx;
- right: 108rpx;
- width: 50rpx;
- height: 50rpx;
- border-radius: 50%;
- background-color: rgb(249, 76, 58);
- }
+ // .receive-txt::before {
+ // content: '';
+ // display: block;
+ // position: absolute;
+ // top: 50rpx;
+ // left: 110rpx;
+ // width: 50rpx;
+ // height: 50rpx;
+ // border-radius: 50%;
+ // background-color: rgb(249, 76, 58);
+ // }
+ // .receive-txt::after {
+ // content: '';
+ // display: block;
+ // position: absolute;
+ // top: 28rpx;
+ // right: 108rpx;
+ // width: 50rpx;
+ // height: 50rpx;
+ // border-radius: 50%;
+ // background-color: rgb(249, 76, 58);
+ // }
.result {
position: relative;
- background-image: url('@/assets/images/ynyc/result.png');
+ background-image: url('@/assets/images/ynyc/result.webp');
background-size: 100% 100%;
width: 100%;
- height: 100%;
+ // height: 100%;
+ // height: 1334rpx;
+ height: 1660rpx;
}
.result-title {
position: absolute;
- top: 590rpx;
+ top: 850rpx;
left: 0;
width: 100%;
}
@@ -412,17 +420,41 @@ page {
}
.result-cancle {
position: absolute;
- top: 834rpx;
- left: 344rpx;
+ top: 1034rpx;
+ left: 324rpx;
width: 62rpx;
height: 62rpx;
+ border-radius: 50%;
+ border: 5rpx solid #fff;
+ }
+ .result-cancle::before {
+ content: '';
+ display: block;
+ width: 41rpx;
+ height: 6rpx;
+ background: #fff;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%) rotate(45deg);
+ }
+ .result-cancle::after {
+ content: '';
+ display: block;
+ width: 41rpx;
+ height: 6rpx;
+ background: #fff;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%) rotate(-45deg);
}
.result-led {
position: absolute;
- top: 404rpx;
- left: 454rpx;
+ top: 614rpx;
+ left: 445rpx;
width: 142rpx;
- height: 122rpx;
+ height: 142rpx;
}
.result-bottom {
position: fixed;
@@ -430,7 +462,7 @@ page {
bottom: 0;
width: 100%;
background-color: rgba(0, 0, 0, 0.6);
- height: calc(100vh - 1334rpx);
+ height: calc(100vh - 1660rpx);
}
}
diff --git a/src/pages/ynyc/login.vue b/src/pages/ynyc/login.vue
index ebb4ea6..ee734be 100644
--- a/src/pages/ynyc/login.vue
+++ b/src/pages/ynyc/login.vue
@@ -31,7 +31,7 @@
立即参与
- 对不起，您不符合活动参与资格！
+ {{ showmsg }}
@@ -92,7 +92,8 @@ const code = ref('')
const codemsg = ref('获取验证码')
const codesecond = ref(60)
const show = ref(false)
-const phoneRegex = /^(\+\d{1,2}\s)?\(?\d{3,4}\)?[\s.-]?\d{3,4}[\s.-]?\d{4}$/
+const showmsg = ref('对不起，您不符合活动参与资格！')
+const phoneRegex = /^1[3-9]\d{9}$/
const query = reactive({})
const contentMsg = ref('')
@@ -140,10 +141,12 @@ const getPhoneVaild = async () => {
}
}, 800)
} else {
- uni.showToast({
- title: res.message,
- icon: 'none',
- })
+ show.value = true
+ showmsg.value = res.message
+ // uni.showToast({
+ // title: res.message,
+ // icon: 'none',
+ // })
}
}
@@ -182,10 +185,12 @@ const loginFun = async () => {
'*',
)
} else {
- uni.showToast({
- title: res.message,
- icon: 'none',
- })
+ show.value = true
+ showmsg.value = res.message
+ // uni.showToast({
+ // title: res.message,
+ // icon: 'none',
+ // })
}
}
@@ -214,8 +219,11 @@ page {
min-height: 38rpx;
}
.ynyc {
+ position: relative;
width: 100vw;
- height: 1334rpx;
+ height: 100vh;
+ max-height: 1334rpx;
+ overflow: hidden;
background-color: #fafafa;
.mast-content {
@@ -225,15 +233,18 @@ page {
}
.login {
- position: relative;
- background-image: url('@/assets/images/ynyc/login.png');
+ position: fixed;
+ top: 0;
+ left: 0;
+ background-image: url('@/assets/images/ynyc/login.webp');
background-size: 100% 100%;
width: 100%;
- height: 100%;
+ // height: 100%;
+ height: 1334rpx;
}
.notLogin {
position: relative;
- background-image: url('@/assets/images/ynyc/notLogin.png');
+ background-image: url('@/assets/images/ynyc/notLogin.webp');
background-size: 100% 100%;
width: 599rpx;
height: 543rpx;
@@ -241,7 +252,9 @@ page {
.notLogin-txt {
position: absolute;
top: 278rpx;
- left: 58rpx;
+ left: 0;
+ width: 100%;
+ text-align: center;
}
.notLogin-btn {
position: absolute;
@@ -252,7 +265,7 @@ page {
}
.login-rules {
position: absolute;
- top: 65rpx;
+ top: 155rpx;
right: 0;
z-index: 1;
width: 50rpx;
@@ -260,26 +273,31 @@ page {
}
.login-input-name {
position: absolute;
- top: 583rpx;
- left: 110rpx;
+ top: 680rpx;
+ left: 118rpx;
width: 530rpx;
height: 38rpx !important;
background-color: #f2f2f2;
}
.login-input-verify {
position: absolute;
- top: 673rpx;
- left: 110rpx;
- width: 260rpx;
- height: 38rpx !important;
+ top: 760rpx;
+ left: 85rpx;
+ // width: 260rpx;
+ // height: 38rpx !important;
+ // background-color: #f2f2f2;
+ width: 230rpx;
+ height: 40rpx !important;
+ padding: 24rpx 32rpx 22rpx;
background-color: #f2f2f2;
+ border-radius: 30rpx;
}
.login-valid {
position: absolute !important;
- top: 662rpx;
+ top: 760rpx;
right: 84rpx;
width: 262rpx;
- height: 76rpx !important;
+ height: 86rpx !important;
color: #c91b10 !important;
border: 2rpx solid #c91b10 !important;
border-radius: 50rpx !important;
@@ -287,7 +305,7 @@ page {
}
.login-btn {
position: absolute;
- top: 800rpx;
+ top: 900rpx;
left: 82rpx;
width: 586rpx;
height: 102rpx !important;
@@ -302,7 +320,7 @@ page {
position: fixed;
bottom: 0;
left: 0;
- background-image: url('@/assets/images/ynyc/rules.png');
+ background-image: url('@/assets/images/ynyc/rules.webp');
background-size: 100% 100%;
width: 100%;
height: 100%;