From f610758397d8cba253a7da2a81cf1aa89885430d Mon Sep 17 00:00:00 2001
From: zhangyao <zhangyao@1000mu.com>
Date: Thu, 20 Jul 2023 18:00:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Brand/shopList.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/Brand/shopList.vue b/src/views/Brand/shopList.vue
index 2529dde..a1ca379 100644
--- a/src/views/Brand/shopList.vue
+++ b/src/views/Brand/shopList.vue
@@ -475,7 +475,7 @@ function myScrollEnd() {
     }
   }
   .shop-scroll {
-    width: 1308px;
+    width: 1388px;
     height: 770px;
     padding-bottom: 30px;
     margin-top: 100px;
@@ -522,8 +522,10 @@ function myScrollEnd() {
           }
         }
         .shop-wrapper {
-          display: grid;
-          grid-template-columns: repeat(6, 212px);
+          // display: grid;
+          // grid-template-columns: repeat(6, 212px);
+          display: flex;
+          flex-wrap: wrap;
           gap: 16px 8px;
         }
       }

From 77f3ddcbb2fb081c970207d2bdeeaafce24911ab Mon Sep 17 00:00:00 2001
From: liyongle <liyongle@123>
Date: Thu, 20 Jul 2023 18:04:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E4=BF=AE=E6=94=B9fal?=
 =?UTF-8?q?se?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PictureText/PictureText.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/PictureText/PictureText.vue b/src/components/PictureText/PictureText.vue
index 678eae6..072ab12 100644
--- a/src/components/PictureText/PictureText.vue
+++ b/src/components/PictureText/PictureText.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="false && acList.length" class="picture-container">
+  <div v-if="acList.length" class="picture-container">
     <div>
       <swiper
         v-if="acList.length && acList[0].content.file_code.length"

From 3e2635c71633b71cd8b47d3ac32a29d215327eec Mon Sep 17 00:00:00 2001
From: liyongle <liyongle@123>
Date: Thu, 20 Jul 2023 18:06:07 +0800
Subject: [PATCH 3/3] chore(release): 1.0.0-B.6

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec665aa..1051c4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.0-B.6](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.5...v1.0.0-B.6) (2023-07-20)
+
+
+### Bug Fixes
+
+* 🧩 修改false ([77f3ddc](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/77f3ddcbb2fb081c970207d2bdeeaafce24911ab))
+* 修改品牌样式 ([f610758](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/f610758397d8cba253a7da2a81cf1aa89885430d))
+
 ## [1.0.0-B.5](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.4...v1.0.0-B.5) (2023-07-20)
 
 
diff --git a/package-lock.json b/package-lock.json
index a8dc2a1..272c1aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.5",
+  "version": "1.0.0-B.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "vue_cli_ts",
-      "version": "1.0.0-B.5",
+      "version": "1.0.0-B.6",
       "dependencies": {
         "@better-scroll/core": "^2.5.0",
         "@better-scroll/observe-image": "^2.5.0",
diff --git a/package.json b/package.json
index c6c1d4d..bb08537 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.5",
+  "version": "1.0.0-B.6",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",