diff --git a/components/CustomTabBar.vue b/components/CustomTabBar.vue
new file mode 100644
index 0000000..e30e909
--- /dev/null
+++ b/components/CustomTabBar.vue
@@ -0,0 +1,144 @@
+
+
+
+
+ {{ tabBar.list[0].text }}
+
+
+
+ {{ tabBar.list[1].text }}
+
+
+
+
+
+
+ {{ tabBar.list[2].text }}
+
+
+
+ {{ tabBar.list[3].text }}
+
+
+
+ {{ tabBar.list[4].text }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 32b47d7..f417a53 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,8 @@
{
"path": "pages/index/index",
"style": {
- "navigationBarTitleText": "uni-app"
+ "navigationBarTitleText": "首页",
+ "navigationStyle": "custom"
}
},
{
@@ -11,6 +12,24 @@
"style": {
"navigationBarTitleText": "uni-app"
}
+ },
+ {
+ "path": "pages/map/map",
+ "style": {
+ "navigationBarTitleText": "uni-app"
+ }
+ },
+ {
+ "path": "pages/cart/cart",
+ "style": {
+ "navigationBarTitleText": "uni-app"
+ }
+ },
+ {
+ "path": "pages/coupon/coupon",
+ "style": {
+ "navigationBarTitleText": "uni-app"
+ }
}
],
"subPackages": [{
@@ -27,23 +46,48 @@
"style" : {
"navigationBarTitleText" : "视频"
}
+ },
+ {
+ "path" : "line/index",
+ "style" : {
+ "navigationBarTitleText" : "精选线路"
+ }
}
]
}],
"tabBar": {
- "color": "#999999",
- "selectedColor": "#333333",
+ "custom": true,
+ "color": "#666666",
+ "selectedColor": " #6A8A2D",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"fontSize": "24rpx",
"height": "100rpx",
- "iconWidth": "40rpx",
+ "iconWidth": "53rpx",
"list": [{
+ "pagePath": "pages/map/map",
+ "iconPath": "/static/images/map.png",
+ "selectedIconPath": "/static/images/selectMap.png",
+ "text": "特产地图"
+ },
+ {
+ "pagePath": "pages/coupon/coupon",
+ "iconPath": "/static/images/coupon.png",
+ "selectedIconPath": "/static/images/selectCoupon.png",
+ "text": "领券中心"
+ },
+ {
"pagePath": "pages/index/index",
"iconPath": "/static/images/home.png",
"selectedIconPath": "/static/images/selectHome.png",
"text": "首页"
},
+ {
+ "pagePath": "pages/cart/cart",
+ "iconPath": "/static/images/cart.png",
+ "selectedIconPath": "/static/images/selectCart.png",
+ "text": "购物车"
+ },
{
"pagePath": "pages/user/user",
"iconPath": "/static/images/mine.png",
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
new file mode 100644
index 0000000..ae5132e
--- /dev/null
+++ b/pages/cart/cart.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue
new file mode 100644
index 0000000..769c268
--- /dev/null
+++ b/pages/coupon/coupon.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 77f1cd1..0fd3020 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,11 +1,15 @@
-
-
+
+
diff --git a/pages/map/map.vue b/pages/map/map.vue
new file mode 100644
index 0000000..3460797
--- /dev/null
+++ b/pages/map/map.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 02409e3..aad2859 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -1,8 +1,34 @@
+
+
+
\ No newline at end of file
+ .content {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ }
+
diff --git a/static/css/base.css b/static/css/base.css
index 409c04a..7475fcd 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -12,6 +12,14 @@ input {
border: none;
}
+view {
+ box-sizing: border-box;
+}
+
+.bg {
+ padding-bottom: 250rpx;
+}
+
.flex-between {
display: flex;
justify-content: space-between;
diff --git a/static/images/cart.png b/static/images/cart.png
new file mode 100644
index 0000000..ce33b1e
Binary files /dev/null and b/static/images/cart.png differ
diff --git a/static/images/coupon.png b/static/images/coupon.png
new file mode 100644
index 0000000..0e0f53e
Binary files /dev/null and b/static/images/coupon.png differ
diff --git a/static/images/home.png b/static/images/home.png
index 9d13426..bf08c0c 100644
Binary files a/static/images/home.png and b/static/images/home.png differ
diff --git a/static/images/map.png b/static/images/map.png
new file mode 100644
index 0000000..886e43c
Binary files /dev/null and b/static/images/map.png differ
diff --git a/static/images/mine.png b/static/images/mine.png
index 67970d8..6a9280b 100644
Binary files a/static/images/mine.png and b/static/images/mine.png differ
diff --git a/static/images/selectCart.png b/static/images/selectCart.png
new file mode 100644
index 0000000..74495a2
Binary files /dev/null and b/static/images/selectCart.png differ
diff --git a/static/images/selectCoupon.png b/static/images/selectCoupon.png
new file mode 100644
index 0000000..754d661
Binary files /dev/null and b/static/images/selectCoupon.png differ
diff --git a/static/images/selectHome.png b/static/images/selectHome.png
index 2359413..5a74842 100644
Binary files a/static/images/selectHome.png and b/static/images/selectHome.png differ
diff --git a/static/images/selectMap.png b/static/images/selectMap.png
new file mode 100644
index 0000000..f481d34
Binary files /dev/null and b/static/images/selectMap.png differ
diff --git a/static/images/selectMine.png b/static/images/selectMine.png
index 16e1d34..2b7de3c 100644
Binary files a/static/images/selectMine.png and b/static/images/selectMine.png differ
diff --git a/static/images/tabBarBg.png b/static/images/tabBarBg.png
new file mode 100644
index 0000000..a0f43ae
Binary files /dev/null and b/static/images/tabBarBg.png differ
diff --git a/store/modules/user.js b/store/modules/user.js
index d15a45e..51a3b42 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -37,9 +37,15 @@ export default {
state.toPath = currentPage.$page.fullPath
if(state.toPath == '/pages/login/login') return;
// 登录
+ // #ifdef MP-WEIXIN
uni.navigateTo({
url: '/pages/login/login'
})
+ // #endif
+
+ // #ifdef H5
+
+ // #endif
},
//订单数据
changeOrderInfo(state, data) {
diff --git a/subPackages/line/index.vue b/subPackages/line/index.vue
new file mode 100644
index 0000000..c329a78
--- /dev/null
+++ b/subPackages/line/index.vue
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file