diff --git a/common/style/base-style.scss b/common/style/base-style.scss
new file mode 100644
index 0000000..c4d5643
--- /dev/null
+++ b/common/style/base-style.scss
@@ -0,0 +1,9 @@
+$brand-theme-color:#28B389; //品牌主体红色
+
+$border-color:#e0e0e0; //边框颜色
+$border-color-light:#efefef; //边框亮色
+
+$text-font-color-1:#000; //文字主色
+$text-font-color-2:#676767; //副标题颜色
+$text-font-color-3:#a7a7a7; //浅色
+$text-font-color-4:#e4e4e4; //更浅
diff --git a/common/style/common-style.scss b/common/style/common-style.scss
new file mode 100644
index 0000000..e182489
--- /dev/null
+++ b/common/style/common-style.scss
@@ -0,0 +1,19 @@
+view,swiper,swiper-item{
+ box-sizing: border-box;
+}
+
+.pageBg{
+ background:
+ linear-gradient(to bottom,transparent,#fff 400rpx),
+ linear-gradient(to right,#beecd8 20%,#F4E2D8);
+ min-height: 80vh;
+}
+
+.loadingLayout{
+ padding:30rpx 0;
+}
+
+.safe-area-inset-bottom{
+ height: env(safe-area-inset-bottom);
+}
+
diff --git a/components/custom-nav-bar/custom-nav-bar.vue b/components/custom-nav-bar/custom-nav-bar.vue
new file mode 100644
index 0000000..cc66310
--- /dev/null
+++ b/components/custom-nav-bar/custom-nav-bar.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+ {{ title }}
+
+
+ >
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/home-header/home-header.vue b/components/home-header/home-header.vue
deleted file mode 100644
index 3fc1cab..0000000
--- a/components/home-header/home-header.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
diff --git a/pages.json b/pages.json
index e624db5..993dc17 100644
--- a/pages.json
+++ b/pages.json
@@ -64,5 +64,11 @@
"requiredPrivateInfos": [
"getLocation"
]
+ },
+ "easycom": {
+ "autoscan": true,
+ "custom": {
+ "^custom-nav-bar": "@/components/custom-nav-bar/custom-nav-bar.vue"
+ }
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6b7a9e5..4c39415 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,11 +1,8 @@
-
+
+
import commonEnum from '../../enum/commonEnum'
-import HomeHeader from '../../components/home-header/home-header.vue'
import AnnouncementBar from '../../components/announcement-bar/announcement-bar.vue'
import BannerSwiper from '../../components/banner-swiper/banner-swiper.vue'
import EquipmentList from '../../components/equipment-list/equipment-list.vue'
export default {
components: {
- HomeHeader,
AnnouncementBar,
BannerSwiper,
EquipmentList,
@@ -168,7 +163,6 @@ export default {