From 06bc63f7cf4ecfae3fc18944a93ea67ab7512245 Mon Sep 17 00:00:00 2001 From: rose <1942951600@qq.com> Date: Mon, 17 May 2021 18:40:58 +0800 Subject: [PATCH] 13 --- src/assets/logo.png | Bin 5010 -> 1852 bytes src/assets/logo2.png | Bin 0 -> 5010 bytes src/components/HeadNav/HeadNav.vue | 11 ++++- src/views/About/Children/Introduce.vue | 28 ++++++++++- src/views/Activity/Activity.vue | 8 ++-- src/views/Cart/Cart.vue | 12 ++--- src/views/Challenge/Children/Solicitation.vue | 20 +++++++- src/views/Challenge/components/Enroll.vue | 3 ++ src/views/Community/Community.vue | 44 +++++++++++------- .../IncubationPlatform/Children/Products.vue | 4 +- .../IncubationPlatform/components/HNav.vue | 2 +- src/views/Knowledge/Knowledge.vue | 2 +- src/views/Policy/components/PolicyList.vue | 22 ++++----- src/views/User/ForgetPassword.vue | 4 ++ src/views/User/Login.vue | 7 ++- src/views/User/Register.vue | 4 ++ 16 files changed, 122 insertions(+), 49 deletions(-) create mode 100644 src/assets/logo2.png diff --git a/src/assets/logo.png b/src/assets/logo.png index 5421d53b154e8b44ee6762cab50ae0cfad41f4b9..eb26c01ec1c9390dce2b5fd996acff31bea4bdb2 100644 GIT binary patch literal 1852 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 diff --git a/src/assets/logo2.png b/src/assets/logo2.png new file mode 100644 index 0000000000000000000000000000000000000000..5421d53b154e8b44ee6762cab50ae0cfad41f4b9 GIT binary patch literal 5010 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 literal 0 HcmV?d00001 diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue index b1b54da..5767435 100644 --- a/src/components/HeadNav/HeadNav.vue +++ b/src/components/HeadNav/HeadNav.vue @@ -58,7 +58,10 @@
- +
+ + +
{{ nickName }}
登录
@@ -329,5 +332,11 @@ export default { height 1px +} +.circle{ + border 2px solid #fff + border-radius 50% + padding 6px + } diff --git a/src/views/About/Children/Introduce.vue b/src/views/About/Children/Introduce.vue index 9fae4ef..4224b9d 100644 --- a/src/views/About/Children/Introduce.vue +++ b/src/views/About/Children/Introduce.vue @@ -13,8 +13,8 @@
-->
-
-
+
+
@@ -66,4 +66,28 @@ export default { .inner-x{ margin auto 1rem } + + +.md-camera { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + width:100%; + height: 120px; + overflow: hidden; + position: relative; + background: #5cb589; + margin: auto; + +} +.box img { + position: absolute; + // top: 0; + // left: 50%; + // margin-left: -50%; + transform: translate(-50%, 0); + width: 100%; + height: 120px; +} diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue index a1b25dc..b6a7455 100644 --- a/src/views/Activity/Activity.vue +++ b/src/views/Activity/Activity.vue @@ -7,18 +7,18 @@