diff --git a/components/CustomTabBar.vue b/components/CustomTabBar.vue
new file mode 100644
index 0000000..761cea5
--- /dev/null
+++ b/components/CustomTabBar.vue
@@ -0,0 +1,100 @@
+
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/Search.vue b/components/Search.vue
deleted file mode 100644
index d924d5e..0000000
--- a/components/Search.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
- 搜索你想要的产品
-
-
-
- 搜索
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/components/SearchHeader.vue b/components/SearchHeader.vue
deleted file mode 100644
index 852d88a..0000000
--- a/components/SearchHeader.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
diff --git a/components/TitleHeader.vue b/components/TitleHeader.vue
deleted file mode 100644
index 2a68099..0000000
--- a/components/TitleHeader.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
diff --git a/components/recommend.vue b/components/recommend.vue
deleted file mode 100644
index c3edf58..0000000
--- a/components/recommend.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-
-
- 为您推荐
-
-
-
-
-
-
- {{item.title}}
-
-
-
- {{tagItem}}
-
-
- {{showPrice(item.price)}}
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
- {{tagItem}}
-
-
- {{showPrice(item.price)}}
-
-
-
-
-
-
-
-
-
-
-
- {{item.goods.title}}
-
-
-
- {{tagItem}}
-
-
- {{showPrice(item.goods.price)}}
-
-
-
-
-
-
-
-
- {{item.goods.title}}
-
-
-
- {{tagItem}}
-
-
- {{showPrice(item.goods.price)}}
-
-
-
-
- 没有更多数据了
-
-
-
-
-
-
\ No newline at end of file
diff --git a/components/recommend.vue.rej b/components/recommend.vue.rej
deleted file mode 100644
index f9362a8..0000000
--- a/components/recommend.vue.rej
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/components/recommend.vue b/components/recommend.vue (rejected hunks)
-@@ -142,9 +142,7 @@
- url: '/subPackages/details/scenicDetails?id='+id
- })
- }else if(this.scenic_type_id == 5){
-- uni.navigateTo({
-- url: '/subPackages1/hotel/hotelDetails?id='+id
-- })
-+
- }else if(this.scenic_type_id == 11){
-
- }else if(this.scenic_type_id == 12){
diff --git a/pages.json b/pages.json
index 9adff65..f44b7b8 100644
--- a/pages.json
+++ b/pages.json
@@ -65,24 +65,27 @@
]
}],
"tabBar": {
+ "custom": true,
"color": "#333333",
"selectedColor": "#6CA5AA",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"fontSize": "24rpx",
- "height": "100rpx",
+ "height": "123rpx",
"iconWidth": "40rpx",
"list": [{
"pagePath": "pages/index/index",
"iconPath": "/static/images/home.png",
"selectedIconPath": "/static/images/selectHome.png",
- "text": "首页"
+ "text": "首页",
+ "visible": false
},
{
"pagePath": "pages/stratIndex",
"iconPath": "/static/images/home.png",
"selectedIconPath": "/static/images/selectHome.png",
- "text": "首页"
+ "text": "首页",
+ "visible": false
}
]
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6abe273..2f734bd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -111,12 +111,14 @@
-
+