diff --git a/common.scss b/common.scss
index a3d0c98..05b845a 100644
--- a/common.scss
+++ b/common.scss
@@ -54,7 +54,7 @@
width: 100vw;
min-height: 100vh;
color: #181818;
- background-color: $uni-bg-color-grey;
+ background: linear-gradient(#DAF3FF, #F4F4F4 200rpx, #F4F4F4);
position: relative;
font-family: PingFang SC;
font-weight: 400;
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index d817774..7693e5e 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -28,13 +28,21 @@
},
data() {
return {
- list: [{
+ list: [
+ {
"selectedIconPath": "/static/image/tabbar/home-active.png",
"iconPath": "/static/image/tabbar/home.png",
"pagePath": "/pages/index/index",
"title": "首页",
key: 'home',
},
+ {
+ "selectedIconPath": "/static/image/tabbar/category-active.png",
+ "iconPath": "/static/image/tabbar/category.png",
+ "pagePath": "/pages/index/category",
+ "title": "分类",
+ key: 'category',
+ },
]
};
},
@@ -69,7 +77,7 @@
z-index: 999999;
bottom: 0;
left: 0;
- color: #BCBCBC;
+ color: #999999;
.tabbar-item {
flex: 1;
@@ -99,7 +107,7 @@
}
.tabbar-active {
- color: $uni-color !important;
+ color: #181818 !important;
}
}
}
diff --git a/components/home/bgSwiperView.vue b/components/home/bgSwiperView.vue
new file mode 100644
index 0000000..f05a878
--- /dev/null
+++ b/components/home/bgSwiperView.vue
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/home/pictureLiveView.vue b/components/home/pictureLiveView.vue
index 3141471..8e0a6d8 100644
--- a/components/home/pictureLiveView.vue
+++ b/components/home/pictureLiveView.vue
@@ -2,13 +2,13 @@
-
+
+
+
+
+
+
+
+ {{ item.title }}
+ {{ item.time }}
+
+
+
+
+
@@ -75,6 +93,12 @@
]
},
+ jumpToLive(id) {
+ // todo
+ },
+ showAll() {
+ // todo
+ }
},
}
@@ -154,4 +178,22 @@
}
}
}
+
+ .swiper {
+ width: 100%;
+ height: 240rpx;
+
+ &-item {
+ width: 180rpx;
+ height: 240rpx;
+
+ &-content {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ border-radius: 12rpx;
+ overflow: hidden;
+ }
+ }
+ }
\ No newline at end of file
diff --git a/components/home/productView.vue b/components/home/productView.vue
index 37044c2..eb872cc 100644
--- a/components/home/productView.vue
+++ b/components/home/productView.vue
@@ -43,7 +43,7 @@
\ No newline at end of file
diff --git a/components/product/sortBar.vue b/components/product/sortBar.vue
new file mode 100644
index 0000000..f5e39b0
--- /dev/null
+++ b/components/product/sortBar.vue
@@ -0,0 +1,107 @@
+
+
+ 综合
+
+ 销量
+
+
+
+
+
+
+
+ 价格
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index a93f57c..070c7b5 100644
--- a/pages.json
+++ b/pages.json
@@ -5,6 +5,12 @@
"style": {
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "pages/index/category",
+ "style": {
+ "navigationBarTitleText": ""
+ }
}
],
"preloadRule": {
diff --git a/pages/index/category.vue b/pages/index/category.vue
new file mode 100644
index 0000000..35eeff0
--- /dev/null
+++ b/pages/index/category.vue
@@ -0,0 +1,752 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f93b6f2..ecda0c9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,9 +1,9 @@
-
-
+
+
@@ -55,6 +55,8 @@
+
+
@@ -64,6 +66,7 @@
import mixinsList from '@/mixins/list.js'
import tabber from '@/components/base/tabbar.vue'
+ import bgSwiperView from '@/components/home/bgSwiperView.vue'
import categoryView from '@/components/home/categoryView.vue'
import recommendView from '@/components/home/recommendView.vue'
import swiperView from '@/components/home/swiperView.vue'
@@ -74,6 +77,7 @@
mixins: [mixinsList],
components: {
tabber,
+ bgSwiperView,
categoryView,
recommendView,
swiperView,
diff --git a/pages_order/product/search.vue b/pages_order/product/search.vue
index 7e80cd3..9207f48 100644
--- a/pages_order/product/search.vue
+++ b/pages_order/product/search.vue
@@ -24,25 +24,7 @@
-
- 综合
-
- 销量
-
-
-
-
-
-
-
- 价格
-
-
-
-
-
-
-
+
@@ -62,11 +44,13 @@