diff --git a/index.html b/index.html index f28d1e0..eab480c 100644 --- a/index.html +++ b/index.html @@ -2,8 +2,489 @@ - + + 都江堰机关幼儿园 +
diff --git a/package-lock.json b/package-lock.json index 347e8e4..be8b98f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "static-extend": "^0.1.2", "vue": "^2.5.2", "vue-awesome-swiper": "^4.1.1", + "vue-meta": "^2.4.0", "vue-router": "^3.0.1", "vue-seamless-scroll": "^1.1.23", "vue-touch": "^2.0.0-beta.4" @@ -3580,6 +3581,14 @@ "regexp.prototype.flags": "^1.2.0" } }, + "node_modules/deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/define-properties": { "version": "1.1.3", "resolved": "https://registry.nlark.com/define-properties/download/define-properties-1.1.3.tgz?cache=0&sync_timestamp=1621222541805&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdefine-properties%2Fdownload%2Fdefine-properties-1.1.3.tgz", @@ -12970,6 +12979,14 @@ "node": ">=0.10.0" } }, + "node_modules/vue-meta": { + "version": "2.4.0", + "resolved": "https://registry.npmmirror.com/vue-meta/-/vue-meta-2.4.0.tgz", + "integrity": "sha512-XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw==", + "dependencies": { + "deepmerge": "^4.2.2" + } + }, "node_modules/vue-router": { "version": "3.5.3", "resolved": "https://registry.npmmirror.com/vue-router/download/vue-router-3.5.3.tgz", @@ -17292,6 +17309,11 @@ "regexp.prototype.flags": "^1.2.0" } }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.nlark.com/define-properties/download/define-properties-1.1.3.tgz?cache=0&sync_timestamp=1621222541805&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdefine-properties%2Fdownload%2Fdefine-properties-1.1.3.tgz", @@ -25082,6 +25104,14 @@ } } }, + "vue-meta": { + "version": "2.4.0", + "resolved": "https://registry.npmmirror.com/vue-meta/-/vue-meta-2.4.0.tgz", + "integrity": "sha512-XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw==", + "requires": { + "deepmerge": "^4.2.2" + } + }, "vue-router": { "version": "3.5.3", "resolved": "https://registry.npmmirror.com/vue-router/download/vue-router-3.5.3.tgz", diff --git a/package.json b/package.json index bb5667d..b1cdccb 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "static-extend": "^0.1.2", "vue": "^2.5.2", "vue-awesome-swiper": "^4.1.1", + "vue-meta": "^2.4.0", "vue-router": "^3.0.1", "vue-seamless-scroll": "^1.1.23", "vue-touch": "^2.0.0-beta.4" diff --git a/src/assets/css/electron.css b/src/assets/css/electron.css index f575225..60ae875 100644 --- a/src/assets/css/electron.css +++ b/src/assets/css/electron.css @@ -12,16 +12,16 @@ body { background-color: #9c7cfa; } body::-webkit-scrollbar { - width: 0px; - height: 100vh; + width: 0rem; + /* height: 100vh; */ } body::-webkit-scrollbar-thumb { - border-radius: 0px; - -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2); + border-radius: 0rem; + -webkit-box-shadow: inset 0 0 0.3125rem rgba(0,0,0,0.2); background: rgba(0,0,0,0.2); } body::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2); + -webkit-box-shadow: inset 0 0 0.3125rem rgba(0,0,0,0.2); border-radius: 0; background: rgba(0,0,0,0.1); @@ -47,10 +47,10 @@ img { justify-content: space-between; align-items: center; background-color: #FFFFFF; - box-shadow: 0px 3px 7px 0px rgba(134, 105, 220, 0.35); + box-shadow: 0rem 0.1875rem 0.4375rem 0px rgba(134, 105, 220, 0.35); width: 100%; - height: 98px; - padding: 0 60px; + height: 6.125rem; + padding: 0 3.75rem; } .header-box .logo-box { /* display: flex; */ @@ -59,7 +59,7 @@ img { /* background: url(../../../static/img/home/logo-bottom.png) no-repeat; */ /* background-size: 100% 100%; */ /* width: 177px; */ - max-width: 500px; + max-width: 31.25rem; /* height: 162px; */ /* margin-left: 16%; */ /* margin-top: 20px; */ @@ -71,15 +71,15 @@ img { /* justify-content: space-between; */ align-items: center; /* flex-direction: column; */ - max-width: 430px; + max-width: 26.875rem; } .logo img { /* object-fit: cover; */ - width: 76px; - height: 76px; + width: 4.75rem; + height: 4.75rem; border-radius: 100%; background-color: #9c7cfa; - margin-right: 10px; + margin-right: 0.625rem; } .logo div { color: #7557cc; @@ -92,11 +92,11 @@ img { align-items: center; color: #9c7cfa; font-weight: bold; - font-size: 20px; + font-size: 1.25rem; } .title-item { /* padding: 30px 20px 12px 20px; */ - padding: 30px 20px 9px 20px; + padding: 1.875rem 1.25rem 0.5625rem 1.25rem; cursor: pointer; -webkit-tap-highlight-color: transparent; } @@ -114,34 +114,34 @@ img { .weather-box { display: flex; align-items: center; - font-size: 16px; + font-size: 1rem; } .weather-box img { - width: 60px; - height: 51px; + width: 3.75rem; + height: 3.1875rem; } .weather-three { display: flex; align-items: center; justify-content: space-around; - width: 234px; - height: 28px; + width: 14.625rem; + height: 1.75rem; background-color: #FF9393; - border-radius: 10px; + border-radius: 0.625rem; color: #fff; - margin-top: 2px; + margin-top: 0.125rem; } /* 内容主体 start */ .main { - margin: 60px 0 90px 0; - padding: 0 60px; + margin: 3.75rem 0 5.625rem 0; + padding: 0 3.75rem; display: flex; justify-content: space-between; } .main-box { - margin: 60px 0 0px 0; - padding: 0 60px; + margin: 3.75rem 0 0px 0; + padding: 0 3.75rem; display: flex; justify-content: space-between; } @@ -152,47 +152,47 @@ img { } .left-one { position: relative; - margin-bottom: 20px; + margin-bottom: 1.25rem; background: url(../../../static/img/home/left-kuang.png) no-repeat; background-size: 100% 100%; - width: 390px; + width: 24.375rem; /* height: 296px; */ - height: 244px; + height: 15.25rem; } .left-one:first-child{ - height: 296px; + height: 18.5rem; } .left-one:last-child{ - height: 222px; + height: 13.875rem; } .left-content { display: flex; flex-direction: column; - padding: 0 20px; + padding: 0 1.25rem; color: #7557cc; } .left-title { color: #FFE68F; font-weight: bold; text-align: center; - font-size: 36px; + font-size: 2.25rem; margin: 0; position: relative; - height: 70px; - line-height: 70px; + height: 4.375rem; + line-height: 4.375rem; width: 100%; text-align: center; display: flex; align-items: center; } .left-one:nth-child(2) .left-title { - height: 57px; + height: 3.5625rem; } .left-one:nth-child(3) .left-title { - height: 53px; + height: 3.3125rem; } .main-right .left-title{ - height: 57px; + height: 3.5625rem; } .pultitle { width: 100%; @@ -200,7 +200,7 @@ img { left: 50%; transform: translateX(-50%); */ } -.three-content {font-size: 18px;line-height: 30px;color: #7557CC;} +.three-content {font-size: 1.125rem;line-height: 1.875rem;color: #7557CC;} .left-last { display: flex; justify-content: space-around; @@ -211,53 +211,53 @@ img { align-items: center; } .left-last > div div:nth-child(1) { - font-weight: bold;font-size: 30px; + font-weight: bold;font-size: 1.875rem; } .left-last > div div:nth-child(2) { - color: #9C7CFA;font-size: 18px; + color: #9C7CFA;font-size: 1.125rem; } -.left-notice {font-size: 18px;line-height: 30px;height: 60px;} -.notice-time {display: flex;justify-content: space-between;margin: 10px 0;font-size: 18px;color: #6E6E6E;margin-top: 0px;} +.left-notice {font-size: 1.125rem;line-height: 1.875rem;height: 3.75rem;} +.notice-time {display: flex;justify-content: space-between;margin: 0.625rem 0;font-size: 1.125rem;color: #6E6E6E;margin-top: 0px;} .notice-time div:nth-child(2) { display: flex;align-items: center; } .notice-time img { - width: 20px;height: 15px;margin-right: 2px; + width: 1.25rem;height: 0.9375rem;margin-right: 0.125rem; } -.line {border-bottom: 2px dashed #9C7CFA;margin: 10px 0;} -.eat-three {display: flex;justify-content: space-around;align-items: center; margin-top: 20px;font-size: 24px;} +.line {border-bottom: 0.125rem dashed #9C7CFA;margin: 0.625rem 0;} +.eat-three {display: flex;justify-content: space-around;align-items: center; margin-top: 1.25rem;font-size: 1.5rem;} .threeMealActive{ - font-size: 30px!important;font-weight: bold!important; + font-size: 1.875rem!important;font-weight: bold!important; } -.meal-box {padding-top: 10px;display: flex;align-items: center;} -.meal-box img {width: 88px;max-height: 88px; border-radius: 10px;object-fit: cover;margin-right: 34px;} -.meal-box div {font-size: 18px;line-height: 30px;} +.meal-box {padding-top: 0.625rem;display: flex;align-items: center;} +.meal-box img {width: 5.5rem;max-height: 5.5rem; border-radius: 0.625rem;object-fit: cover;margin-right: 2.125rem;} +.meal-box div {font-size: 1.125rem;line-height: 1.875rem;} .main-center { - margin: 0 20px; - height: 767px; + margin: 0 1.25rem; + height: 47.9375rem; /* width: 60%; */ } -.center-title {color: #7557CC;font-size: 36px;text-align: center;line-height: 40px;padding-top: 32px;} +.center-title {color: #7557CC;font-size: 2.25rem;text-align: center;line-height: 2.5rem;padding-top: 2rem;} .center-img-box { background: url(../../../static/img/home/class-dongt.png) no-repeat; background-size: 100% 100%; - width: 912px; - height: 767px; + width: 57rem; + height: 47.9375rem; } -.img-box {margin: 56px 70px 0px 65px;position: relative;} +.img-box {margin: 3.5rem 4.375rem 0px 4.0625rem;position: relative;} /* .swiper-container{border-radius: 10px;border: 5px solid #9c7cfa;height: 460px;} */ -.home-swiper {border-radius: 10px;border: 5px solid #9c7cfa;height: 466px;} -.swiper-pagination {position: absolute;left: 50%;transform: translateX(-60%);bottom: 120px;} -.home-slide{height: 466px;overflow: hidden;} +.home-swiper {border-radius: 0.625rem;border: 0.3125rem solid #9c7cfa;height: 29.125rem;} +.swiper-pagination {position: absolute;left: 50%;transform: translateX(-60%);bottom: 7.5rem;} +.home-slide{height: 29.125rem;overflow: hidden;} .home-slide img{object-fit: cover;width: 100%;height: 100%;} -.swiper-pagination .swiper-pagination-bullet {margin: 0 6px;} +.swiper-pagination .swiper-pagination-bullet {margin: 0 0.375rem;} .swiper-pagination .swiper-pagination-bullet-active {background-color: #9c7cfa;} -.remind-box {display: flex;justify-content: center;margin-top: -30px;} -.remind-box > div {background-color: rgba(0,0,0,.3);color: #FFFFFF;border-radius: 50px;position: relative;width: 174px;height: 64px;display: flex;justify-content: center;align-items: center;} -.remind-box > div:nth-child(2) {margin: 0 88px;} -.remind-box img {width: 47px;height: 41px;} -.msg-box div:nth-child(1) {font-weight: bold;font-size: 30px;} -.msg-box div:nth-child(2) {position: absolute;right: -5px;top: -6px;width:33px;height: 33px;background-color:#FF9393;border-radius: 50%;text-align: center;line-height: 33px;} +.remind-box {display: flex;justify-content: center;margin-top: -1.875rem;} +.remind-box > div {background-color: rgba(0,0,0,.3);color: #FFFFFF;border-radius: 3.125rem;position: relative;width: 10.875rem;height: 4rem;display: flex;justify-content: center;align-items: center;} +.remind-box > div:nth-child(2) {margin: 0 5.5rem;} +.remind-box img {width: 2.9375rem;height: 2.5625rem;} +.msg-box div:nth-child(1) {font-weight: bold;font-size: 1.875rem;} +.msg-box div:nth-child(2) {position: absolute;right: -0.3125rem;top: -0.375rem;width:2.0625rem;height: 2.0625rem;background-color:#FF9393;border-radius: 50%;text-align: center;line-height: 2.0625rem;} .main-right { position: relative; display: inline-block; @@ -867,7 +867,7 @@ table tr td:first-child { /* 新增css */ .notice-open-01,.notice-open-02{ width: 80%; - height: 90%; + /* height: 90%; */ overflow: hidden; overflow-y: scroll; } diff --git a/src/components/babyActivity.vue b/src/components/babyActivity.vue index 0656534..69a4ec4 100644 --- a/src/components/babyActivity.vue +++ b/src/components/babyActivity.vue @@ -1,5 +1,5 @@