diff --git a/components/lf-title-line/lf-title-line.vue b/components/lf-title-line/lf-title-line.vue new file mode 100644 index 0000000..d656b77 --- /dev/null +++ b/components/lf-title-line/lf-title-line.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/components/lf-waterfall/lf-waterfall.vue b/components/lf-waterfall/lf-waterfall.vue index 93cbdce..dab9463 100644 --- a/components/lf-waterfall/lf-waterfall.vue +++ b/components/lf-waterfall/lf-waterfall.vue @@ -56,6 +56,7 @@ methods: { onClick(){ console.log("aaaa"); + this.$url('/pages/goodsDetail/index'); this.$emit('click'); } } diff --git a/pages.json b/pages.json index 5525a57..5d885f1 100644 --- a/pages.json +++ b/pages.json @@ -115,6 +115,12 @@ "style": { "navigationBarTitleText": "添加频道" } + }, + { + "path": "pages/goodsList/index", + "style": { + "navigationBarTitleText": "商品列表" + } } ], "globalStyle": { diff --git a/pages/channel/index.vue b/pages/channel/index.vue index 6b309dc..35452b3 100644 --- a/pages/channel/index.vue +++ b/pages/channel/index.vue @@ -17,7 +17,7 @@ 机票酒店 - + {{ item.name }} @@ -28,7 +28,7 @@ 旅游度假 - + {{ item.name }} @@ -39,7 +39,7 @@ 接送服务 - + {{ item.name }} @@ -50,7 +50,7 @@ 其他精选 - + {{ item.name }} @@ -216,4 +216,11 @@ .lf-p-l-5{ padding-left: 5rpx; } + // .select-box{ + // overflow: hidden; + // padding-top: 1rpx; + // width: 100%; + // height: max-content; + // border-radius: 5rpx; + // } diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue index 814b867..9ee495e 100644 --- a/pages/discover/discover.vue +++ b/pages/discover/discover.vue @@ -2,11 +2,11 @@ - + - + @@ -18,11 +18,11 @@ - + - + @@ -33,6 +33,8 @@ + + diff --git a/pages/goodsList/index.vue b/pages/goodsList/index.vue new file mode 100644 index 0000000..abf8b86 --- /dev/null +++ b/pages/goodsList/index.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index dda143f..0b3e9d8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,10 +1,10 @@ diff --git a/static/center/collect-active.png b/static/center/collect-active.png new file mode 100644 index 0000000..a04dac0 Binary files /dev/null and b/static/center/collect-active.png differ diff --git a/static/center/collect.png b/static/center/collect.png new file mode 100644 index 0000000..e487184 Binary files /dev/null and b/static/center/collect.png differ diff --git a/static/center/home.png b/static/center/home.png new file mode 100644 index 0000000..96dfb2a Binary files /dev/null and b/static/center/home.png differ diff --git a/static/center/loginout.png b/static/center/loginout.png new file mode 100644 index 0000000..f5b7aa5 Binary files /dev/null and b/static/center/loginout.png differ diff --git a/static/center/order.png b/static/center/order.png new file mode 100644 index 0000000..b8c8429 Binary files /dev/null and b/static/center/order.png differ diff --git a/static/center/problem.png b/static/center/problem.png new file mode 100644 index 0000000..5cc0025 Binary files /dev/null and b/static/center/problem.png differ diff --git a/static/center/scan.png b/static/center/scan.png new file mode 100644 index 0000000..f7b20f3 Binary files /dev/null and b/static/center/scan.png differ diff --git a/static/center/service.png b/static/center/service.png new file mode 100644 index 0000000..37eafff Binary files /dev/null and b/static/center/service.png differ diff --git a/static/center/share.png b/static/center/share.png new file mode 100644 index 0000000..84a1bc9 Binary files /dev/null and b/static/center/share.png differ diff --git a/static/center/shop-logo.png b/static/center/shop-logo.png new file mode 100644 index 0000000..0d786f0 Binary files /dev/null and b/static/center/shop-logo.png differ diff --git a/static/center/suggestion.png b/static/center/suggestion.png new file mode 100644 index 0000000..d348c3b Binary files /dev/null and b/static/center/suggestion.png differ diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue index 36dd5c2..883865d 100644 --- a/uview-ui/components/u-tabs/u-tabs.vue +++ b/uview-ui/components/u-tabs/u-tabs.vue @@ -199,7 +199,7 @@ computed: { // 移动bar的样式 tabBarStyle() { - let scrollBarLeft = this.scrollBarLeft - 7; + let scrollBarLeft = this.scrollBarLeft - 9; let style = { width: this.barWidth + 'rpx', transform: `translate(${scrollBarLeft}px, -100%)`,