From 856e037e6cc41902fc53a31dc82f291cd21532ef Mon Sep 17 00:00:00 2001 From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com> Date: Mon, 11 Mar 2024 18:01:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/WaterfallsFlow/WaterfallsFlow.vue | 374 +-- components/recommend/index.vue | 210 +- pages.json | 43 +- pages/gather/gather.vue | 329 +- pages/gather/gather_backup.vue | 565 ++++ pages/index/component/homeComb.vue | 949 +++--- pages/index/component/homeComb_backup.vue | 697 ++++ pages/index/index-backup.vue | 1731 ++++++++++ pages/index/index.vue | 2992 +++++++++--------- pages/order_addcart/order_addcart.vue | 472 ++- pages/order_addcart/order_addcart_backup.vue | 1239 ++++++++ pages/user/index.vue | 11 +- pages/users/order_confirm/index.vue | 32 +- pages/whole_sale/index.vue | 317 ++ static/images/1-001.png | Bin 2329 -> 1116 bytes static/images/1-002.png | Bin 3289 -> 3654 bytes static/images/2-001.png | Bin 1598 -> 1100 bytes static/images/2-002.png | Bin 3597 -> 6383 bytes static/images/3-001.png | Bin 1690 -> 1593 bytes static/images/3-002.png | Bin 3588 -> 4908 bytes static/images/4-001.png | Bin 2057 -> 1257 bytes static/images/4-002.png | Bin 3068 -> 3677 bytes static/images/5-001.png | Bin 4279 -> 1287 bytes static/images/5-002.png | Bin 3376 -> 6176 bytes static/images/组 21508@2x.png | Bin 0 -> 3654 bytes static/new_define/loudou.png | Bin 0 -> 427 bytes static/new_define/priceChange.png | Bin 0 -> 329 bytes 27 files changed, 7613 insertions(+), 2348 deletions(-) create mode 100644 pages/gather/gather_backup.vue create mode 100644 pages/index/component/homeComb_backup.vue create mode 100644 pages/index/index-backup.vue create mode 100644 pages/order_addcart/order_addcart_backup.vue create mode 100644 pages/whole_sale/index.vue create mode 100644 static/images/组 21508@2x.png create mode 100644 static/new_define/loudou.png create mode 100644 static/new_define/priceChange.png diff --git a/components/WaterfallsFlow/WaterfallsFlow.vue b/components/WaterfallsFlow/WaterfallsFlow.vue index f5551b0..cd6531f 100644 --- a/components/WaterfallsFlow/WaterfallsFlow.vue +++ b/components/WaterfallsFlow/WaterfallsFlow.vue @@ -1,204 +1,206 @@ + .wf-page { + display: grid; + grid-template-columns: 1fr 1fr; + grid-gap: $grid-gap; + } + + .wf-item { + width: calc((100vw - 2 * #{$page-padding} - #{$grid-gap}) / 2); + padding-bottom: $grid-gap; + } + + .wf-page1 .wf-item { + margin-top: 20rpx; + background-color: #fff; + border-radius: 20rpx; + padding-bottom: 0; + } + + .wf-item-page { + padding-bottom: 20rpx; + } + \ No newline at end of file diff --git a/components/recommend/index.vue b/components/recommend/index.vue index 5981aa9..9accddf 100644 --- a/components/recommend/index.vue +++ b/components/recommend/index.vue @@ -1,8 +1,50 @@