Compare commits

...

5 Commits

  1. 8
      CHANGELOG.md
  2. 4
      package-lock.json
  3. 2
      package.json
  4. 2
      src/components/PictureText/PictureText.vue
  5. 8
      src/views/Brand/shopList.vue

8
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. 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) ## [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)

4
package-lock.json

@ -1,12 +1,12 @@
{ {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.0.0-B.5",
"version": "1.0.0-B.6",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.0.0-B.5",
"version": "1.0.0-B.6",
"dependencies": { "dependencies": {
"@better-scroll/core": "^2.5.0", "@better-scroll/core": "^2.5.0",
"@better-scroll/observe-image": "^2.5.0", "@better-scroll/observe-image": "^2.5.0",

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.0.0-B.5",
"version": "1.0.0-B.6",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",

2
src/components/PictureText/PictureText.vue

@ -1,5 +1,5 @@
<template> <template>
<div v-if="false && acList.length" class="picture-container">
<div v-if="acList.length" class="picture-container">
<div> <div>
<swiper <swiper
v-if="acList.length && acList[0].content.file_code.length" v-if="acList.length && acList[0].content.file_code.length"

8
src/views/Brand/shopList.vue

@ -475,7 +475,7 @@ function myScrollEnd() {
} }
} }
.shop-scroll { .shop-scroll {
width: 1308px;
width: 1388px;
height: 770px; height: 770px;
padding-bottom: 30px; padding-bottom: 30px;
margin-top: 100px; margin-top: 100px;
@ -522,8 +522,10 @@ function myScrollEnd() {
} }
} }
.shop-wrapper { .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; gap: 16px 8px;
} }
} }

Loading…
Cancel
Save