diff --git a/src/components/pageTopBar/pageTopBar.vue b/src/components/pageTopBar/pageTopBar.vue index 1800a07..13a1fbe 100644 --- a/src/components/pageTopBar/pageTopBar.vue +++ b/src/components/pageTopBar/pageTopBar.vue @@ -33,7 +33,9 @@
@@ -15,8 +15,20 @@
@@ -155,14 +167,23 @@ const tabList = [{
transform: translateX(-50%);
margin: 0 auto;
width: 100%;
+<<<<<<< HEAD
height: 47px;
+=======
+ height: 50px;
+>>>>>>> origin/main
background: rgba(0, 0, 0, 0.596078431372549);
border-bottom: 4px solid rgba(78, 144, 204, 1);
.nav-list {
+<<<<<<< HEAD
// background: red;
color: #e2edf7;
font-size: 18px;
+=======
+ color: #E2EDF7;
+ text-align: center;
+>>>>>>> origin/main
margin: 0 auto;
font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
font-weight: 400;
@@ -194,4 +215,43 @@ const tabList = [{
}
}
+
+.tab-btn {
+ width: 120px;
+ height: 46px;
+ font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+ font-weight: 400;
+ font-style: normal;
+ font-size: 18px;
+ color: #E2EDF7;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .pd-rl-10{
+ padding:0 10px;
+ }
+}
+
+.tab-btn-click {
+ background-color: rgba(98, 177, 255, 1);
+ border: none;
+ border-bottom: 0px;
+ border-radius: 8px;
+ border-bottom-right-radius: 0px;
+ border-bottom-left-radius: 0px;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC', sans-serif;
+ font-weight: 650;
+ font-style: normal;
+ font-size: 18px;
+ color: #FFFFFF;
+}
+
+.carousel-img {
+ margin: 0 auto;
+ width: 660px;
+ height: 280px;
+}
\ No newline at end of file
diff --git a/src/utils/api.js b/src/utils/api.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/utils/axios.js b/src/utils/axios.js
index a9294c0..ab73a34 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -86,6 +86,8 @@ const $post = (url, params) => {
}
//下面是vue3必须加的,vue2不需要,只需要暴露出去get,post方法就可以
export default {
+ get:$get,
+ post:$post,
install: (app) => {
app.config.globalProperties['$get'] = $get;
app.config.globalProperties['$post'] = $post;
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 764f0a7..a17d7c3 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,7 +1,7 @@