Merge branch 'dev' of https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts into dev

3 years ago · 3cfcde60f5
1 changed files with 5 additions and 3 deletions
--- 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;
        }
      }