diff --git a/src/assets/imgs/public/rainCloud.png b/src/assets/imgs/public/rainCloud.png new file mode 100644 index 0000000000000000000000000000000000000000..2362d2cac62c6e0afbff717c6c5ee17fd9f20b87 Binary files /dev/null and b/src/assets/imgs/public/rainCloud.png differ diff --git a/src/assets/imgs/public/sapling1.png b/src/assets/imgs/public/sapling1.png index be84f202fcf83f4a2bd341144398f237cbcfaa77..35d3feb4d9fcd9dd7f449e48a73ccf63be1df2d7 100644 Binary files a/src/assets/imgs/public/sapling1.png and b/src/assets/imgs/public/sapling1.png differ diff --git a/src/assets/imgs/public/sapling22.png b/src/assets/imgs/public/sapling22.png index 61f2c7af492e3164da17537b8df24856a5795b64..797cf6a66f561efe4f63d80c0a68fe3ad0e7bae5 100644 Binary files a/src/assets/imgs/public/sapling22.png and b/src/assets/imgs/public/sapling22.png differ diff --git a/src/assets/imgs/public/sapling3.png b/src/assets/imgs/public/sapling3.png index 26cdfbc0a20d0eb1cb55ef0f0e2077aef177557e..e3010c0da99c8a5c2d7bdd0898abe28a93444de5 100644 Binary files a/src/assets/imgs/public/sapling3.png and b/src/assets/imgs/public/sapling3.png differ diff --git a/src/assets/imgs/public/sapling4.png b/src/assets/imgs/public/sapling4.png index 56e923f3a4fd637a35cb18355c254126294f9186..33d62f01ef04d97ddfcfbcb85b1ec244b05d40c1 100644 Binary files a/src/assets/imgs/public/sapling4.png and b/src/assets/imgs/public/sapling4.png differ diff --git a/src/assets/imgs/public/sapling5.png b/src/assets/imgs/public/sapling5.png index a29afef11b0fba2d91d9476b212080f33e9e9dd6..0b8a89d0b49381304efda0bcb809ba3a0c8e3dae 100644 Binary files a/src/assets/imgs/public/sapling5.png and b/src/assets/imgs/public/sapling5.png differ diff --git a/src/assets/imgs/public/waterdrop.png b/src/assets/imgs/public/waterdrop.png index 88a062fa4176bb63d06361924d9c178a7149348c..8fe77c65ffb5e32463ce016907eafe83a803ef97 100644 Binary files a/src/assets/imgs/public/waterdrop.png and b/src/assets/imgs/public/waterdrop.png differ diff --git a/src/assets/js/index.js b/src/assets/js/index.js index a2fd79118182da7a531b19a26f426a3a810b7bc1..4b5474b82dfd30ebd42494bf1d2f8e2920b41453 100644 --- a/src/assets/js/index.js +++ b/src/assets/js/index.js @@ -45,73 +45,83 @@ function transformLang() { } //倒计时 +let daojishi = { + + djsFun: function () { + console.log(43); + var show = document.getElementsByClassName('show'); + console.log(show); + var flower = document.getElementsByClassName('flower'); + var djs = 90, add = 1; + var total = 9000; + var timer = null; + var tiktock = document.getElementById('tiktock'); + var gydj = setInterval(function () { + djs--; + add++; + if (add >= 15) { + flower[0].style.opacity = 1; -function djsFun() { - // console.log(43); - var show = document.getElementsByClassName('show'); - var flower = document.getElementsByClassName('flower'); - var djs = 90, add = 1; - var total = 9000; - var timer = null; - var tiktock = document.getElementById('tiktock'); - var gydj = setInterval(function () { - djs--; - add++; - if (add >= 15) { - flower[0].style.opacity = 1; + } + if (add >= 30) { + flower[1].style.opacity = 1; + watering.style.display = 'block' + } + if (add >= 45) { + flower[0].style.opacity = 0; + flower[1].style.opacity = 0; + flower[2].style.opacity = 1; + } + if (add >= 60) { + flower[0].style.opacity = 0; + flower[1].style.opacity = 0; + flower[2].style.opacity = 0; + document.getElementsByClassName('sunshine')[0].style.display = 'block' + flower[3].style.opacity = 1; + } + if (add >= 75) { + flower[0].style.opacity = 0; + flower[1].style.opacity = 0; + flower[2].style.opacity = 0; + flower[3].style.opacity = 0; + flower[4].style.opacity = 1; + } + // daojishi.innerText = djs; + for (var i = 0; i < show.length; i++) { + show[i].style.top = 140 - (add * 1.55) + 'px' + } + if (djs == 0) { + clearInterval(gydj) + } + }, 1000) + + function countdown() { + + var timer = setInterval(function () { + total--; + if (total <= 0) { + clearInterval(timer); + tiktock.innerHTML = "0:00"; + } else { + var ss = Math.floor(total / 100); + var ms = total - Math.floor(total / 100) * 100; + tiktock.innerHTML = ss + ":" + ms; + } + }, 10); } + + countdown(); if (add >= 30) { flower[1].style.opacity = 1; watering.style.display = 'block' } - if (add >= 45) { - flower[0].style.opacity = 0; - flower[1].style.opacity = 0; - flower[2].style.opacity = 1; - } - if (add >= 60) { - flower[0].style.opacity = 0; - flower[1].style.opacity = 0; - flower[2].style.opacity = 0; - document.getElementsByClassName('sunshine')[0].style.display = 'block' - flower[3].style.opacity = 1; - } - if (add >= 75) { - flower[0].style.opacity = 0; - flower[1].style.opacity = 0; - flower[2].style.opacity = 0; - flower[3].style.opacity = 0; - flower[4].style.opacity = 1; - } - - // daojishi.innerText = djs; - for (var i = 0; i < show.length; i++) { - show[i].style.top = 140 - (add * 1.55) + 'px' - } - if (djs == 0) { - clearInterval(gydj) - } - }, 1000) - - function countdown() { - - var timer = setInterval(function () { - total--; - if (total <= 0) { - clearInterval(timer); - tiktock.innerHTML = "0:00"; - } else { - var ss = Math.floor(total / 100); - var ms = total - Math.floor(total / 100) * 100; - tiktock.innerHTML = ss + ":" + ms; - } - }, 10); - } - if (add >= 30) { - flower[1].style.opacity = 1; - watering.style.display = 'block' } - } +// const daojishi = { +// begin: function () { +// console.log('创建了~'); +// } +// } +export default daojishi diff --git a/src/pages/category/components/residence.vue b/src/pages/category/components/residence.vue index 93f48fe3005b982e78e46c693fb73a5a03a26936..0091612048a007a18ca8486c02ab120507d08516 100644 --- a/src/pages/category/components/residence.vue +++ b/src/pages/category/components/residence.vue @@ -4,7 +4,7 @@ diff --git a/src/pages/components/flowerTimer.vue b/src/pages/components/flowerTimer.vue index a2b20e3c160765bbffb2b56832131d49b8e6294b..4d479d38776aa1189656d7ad8137996ad20ef03c 100644 --- a/src/pages/components/flowerTimer.vue +++ b/src/pages/components/flowerTimer.vue @@ -17,52 +17,71 @@ 秒

--> -
+
- +
- +
-

页面停留时间超过 - 10:00 秒我们将自行
向公益机构捐赠 - 0.2元

+
页面停留时间超过 + 90 秒我们将自行
向公益机构捐赠 + 0.2元 +
+ 90:00秒 +
+
+
+ If you stay in the page for more than + + 90 + seconds, and we
will donate + 0.1 + yuan to the public interest organization. +
+ +