From a1c84f7e64ecc327bf5df163f9bb0006889527b6 Mon Sep 17 00:00:00 2001 From: liyongle Date: Mon, 28 Aug 2023 15:58:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E5=BA=97=E9=93=BAlog?= =?UTF-8?q?o=E5=B1=85=E4=B8=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ShopItem/ShopItem.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/ShopItem/ShopItem.vue b/src/components/ShopItem/ShopItem.vue index 770d309..67acb55 100644 --- a/src/components/ShopItem/ShopItem.vue +++ b/src/components/ShopItem/ShopItem.vue @@ -50,7 +50,7 @@ function showDetail(shop: Shop) { position: relative; width: 212px; - height: 136px; + height: 145px; border-radius: 16px 16px 0 0; .logo { width: 120px; @@ -59,11 +59,12 @@ function showDetail(shop: Shop) { } } .bottom { - @include fl(space-between); + @include fl(space-between, flex-start); width: 212px; - height: 40px; + height: 31px; padding: 9px 16px; + padding-top: 0; background: rgb(255 255 255 / 60%); border-radius: 0 0 16px 16px; .shop-name { @@ -75,7 +76,7 @@ function showDetail(shop: Shop) { color: #534f46; font-style: normal; font-weight: 700; - line-height: 22px; + // line-height: 22px; } .right { @include fl; @@ -92,7 +93,7 @@ function showDetail(shop: Shop) { color: #615c59; font-style: normal; font-weight: 700; - line-height: 22px; + // line-height: 22px; } } } -- 2.30.2 From 56f4f37a27d15dc00a02bddc641e3ae55fca223d Mon Sep 17 00:00:00 2001 From: liyongle Date: Mon, 28 Aug 2023 16:00:26 +0800 Subject: [PATCH 2/3] chore(release): 1.0.6 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f79011..cce9349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.0.6](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.6-B.0...v1.0.6) (2023-08-28) + + +### Bug Fixes + +* 🧩 店铺logo居中修改 ([a1c84f7](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/a1c84f7e64ecc327bf5df163f9bb0006889527b6)) + ### [1.0.6-B.0](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.5...v1.0.6-B.0) (2023-08-25) ### [1.0.5](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.5-B.0...v1.0.5) (2023-08-25) diff --git a/package-lock.json b/package-lock.json index 6657376..e4b3f08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.6-B.0", + "version": "1.0.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.6-B.0", + "version": "1.0.6", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 599da6e..facd14f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.6-B.0", + "version": "1.0.6", "private": true, "scripts": { "serve": "vue-cli-service serve", -- 2.30.2 From e443ab3ae2f7abfee8cc9dcf0f552d489aa464e8 Mon Sep 17 00:00:00 2001 From: liyongle Date: Mon, 28 Aug 2023 16:00:41 +0800 Subject: [PATCH 3/3] chore(release): 1.0.7-B.0 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cce9349..c4f5c07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.0.7-B.0](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.6...v1.0.7-B.0) (2023-08-28) + ### [1.0.6](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.6-B.0...v1.0.6) (2023-08-28) diff --git a/package-lock.json b/package-lock.json index e4b3f08..0b50389 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.6", + "version": "1.0.7-B.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.6", + "version": "1.0.7-B.0", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index facd14f..1a3ee36 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.6", + "version": "1.0.7-B.0", "private": true, "scripts": { "serve": "vue-cli-service serve", -- 2.30.2