From 113fd1e9c6f383b38767325634c733984b6898cb Mon Sep 17 00:00:00 2001 From: 77 <270260644@qq.com> Date: Thu, 19 Sep 2024 17:57:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../goods/components/detail/detail-tabbar.vue | 8 +- pages/goods/groupon.vue | 8 +- pages/index/page.vue | 1 + pages/index/user.vue | 15 +- .../components/s-block-item/s-block-item.vue | 1 + .../s-menu-button/s-menu-button.vue | 640 +++++++++--------- .../components/s-order-card/s-order-card.vue | 217 +++--- .../s-share-modal/s-share-modal.vue | 4 +- sheep/components/s-user-card/s-user-card.vue | 6 +- .../s-wallet-card/s-wallet-card.vue | 3 +- static/images/activity-btn-disabled.png | Bin 0 -> 1562 bytes static/images/collect_0.png | Bin 0 -> 1359 bytes static/images/collect_1.gif | Bin 0 -> 8009 bytes static/images/default_avatar.png | Bin 0 -> 5930 bytes static/images/groupon-btn.png | Bin 0 -> 6535 bytes static/images/no_0.png | Bin 0 -> 1067 bytes static/images/no_comment.png | Bin 0 -> 726 bytes static/images/no_take.png | Bin 0 -> 1242 bytes static/images/order.png | Bin 0 -> 2996 bytes static/images/seckill-bg.png | Bin 0 -> 36972 bytes static/images/seckill-header.png | Bin 0 -> 33361 bytes static/images/service.png | Bin 0 -> 845 bytes static/images/share.png | Bin 0 -> 1278 bytes static/images/share_link.png | Bin 0 -> 2564 bytes static/images/share_poster.png | Bin 0 -> 2659 bytes static/images/wallet_icon.png | Bin 0 -> 816 bytes 27 files changed, 462 insertions(+), 443 deletions(-) create mode 100644 static/images/activity-btn-disabled.png create mode 100644 static/images/collect_0.png create mode 100644 static/images/collect_1.gif create mode 100644 static/images/default_avatar.png create mode 100644 static/images/groupon-btn.png create mode 100644 static/images/no_0.png create mode 100644 static/images/no_comment.png create mode 100644 static/images/no_take.png create mode 100644 static/images/order.png create mode 100644 static/images/seckill-bg.png create mode 100644 static/images/seckill-header.png create mode 100644 static/images/service.png create mode 100644 static/images/share.png create mode 100644 static/images/share_link.png create mode 100644 static/images/share_poster.png create mode 100644 static/images/wallet_icon.png diff --git a/package.json b/package.json index fce07f3..be8b7b8 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "prettier": "prettier --write \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"", "build:prod": "vue-cli-service build --mode prod", "build:dev": "vue-cli-service build --mode dev" - }, "repository": "https://github.com/sheepjs/shop.git", "keywords": [ @@ -93,6 +92,7 @@ "dependencies": { "dayjs": "^1.11.7", "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "luch-request": "^3.0.8", "pinia": "^2.0.33", "pinia-plugin-persist-uni": "^1.2.0", diff --git a/pages/goods/components/detail/detail-tabbar.vue b/pages/goods/components/detail/detail-tabbar.vue index 4b9a53b..36ed2b6 100644 --- a/pages/goods/components/detail/detail-tabbar.vue +++ b/pages/goods/components/detail/detail-tabbar.vue @@ -11,7 +11,7 @@ 已收藏 @@ -19,7 +19,7 @@ 收藏 @@ -32,7 +32,7 @@ > 客服 @@ -44,7 +44,7 @@ > 分享 diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue index b957761..f04b9b0 100644 --- a/pages/goods/groupon.vue +++ b/pages/goods/groupon.vue @@ -156,7 +156,7 @@ import CombinationApi from '@/sheep/api/promotion/combination'; import SpuApi from '@/sheep/api/product/spu'; - const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-bg.png'); + const headerBg = '@/static/images/seckill-header.png'; const btnBg = sheep.$url.css('/static/img/shop/goods/groupon-btn.png'); const disabledBtnBg = sheep.$url.css('/static/img/shop/goods/activity-btn-disabled.png'); const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png'); @@ -293,7 +293,7 @@ // height: 320rpx; background-size: 100% 100%; border-radius: 10rpx; - background-image: v-bind(headerBg); + background-image: url('@/static/images/seckill-header.png'); background-repeat: no-repeat; .price-box { @@ -417,7 +417,7 @@ font-size: 24rpx; font-weight: 600; margin-left: -36rpx; - background-image: v-bind(btnBg); + background-image: url('@/static/images/groupon-btn.png'); background-repeat: no-repeat; background-size: 100% 100%; color: #ffffff; @@ -430,7 +430,7 @@ font-size: 24rpx; font-weight: 600; margin-left: -36rpx; - background-image: v-bind(disabledBtnBg); + background-image: url('@/static/images/activity-btn-disabled.png'); background-repeat: no-repeat; background-size: 100% 100%; color: #999999; diff --git a/pages/index/page.vue b/pages/index/page.vue index cb37a0c..a54586b 100644 --- a/pages/index/page.vue +++ b/pages/index/page.vue @@ -3,6 +3,7 @@