From 7e11a67e4d571cea8b9299f4468d88928669eb39 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Wed, 14 Jun 2023 15:18:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=BB=91=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/offline/JSON/getActivityList1.json | 78 +++++++++++++++++++ src/views/Activity/Activity.vue | 8 +- 2 files changed, 82 insertions(+), 4 deletions(-) diff --git a/public/static/offline/JSON/getActivityList1.json b/public/static/offline/JSON/getActivityList1.json index 5aa97b4..ad25bc5 100644 --- a/public/static/offline/JSON/getActivityList1.json +++ b/public/static/offline/JSON/getActivityList1.json @@ -87,6 +87,84 @@ "/iotFile/project-odubitlp9mjy2wyuqkpfga/20230608/vRycElclvtkNVHAmPvFgy.jpg", "/iotFile/project-odubitlp9mjy2wyuqkpfga/20230608/Z8l7mYY91oMk_qiLXbUVN.jpg" ] + }, + { + "activityId": 4390, + "activityName": "444活动打扫宫斗是的呢佛山到哪放大说法达萨罗客服经理肯定萨芬发的", + "activityNameEn": "dddd", + "activityContent": "拉萨动静分离凯撒京东方", + "activityContentEn": "kljl", + "activityAddress": "41111", + "activityAddressEn": "", + "activityType": 1, + "shopCode": "", + "shopName": "", + "shopNameEn": "", + "houseNumber": "", + "fileUrl": "/iotFile/project-odubitlp9mjy2wyuqkpfga/20230609/AqUbanFt3SXwU2dT68uNy.jpg", + "qrFileUrl": "/iotFile/project-odubitlp9mjy2wyuqkpfga/20230609/fCutkOWSsjkSaGJ1OwX38.jpg", + "startDate": "2023-06-07", + "endDate": "2023-07-17", + "building": "濮园未来社区", + "buildingCode": "gAi7ksmAnlR22G8CyLXbI", + "buildingOrder": 0, + "floor": "L1", + "floorCode": "EuMWamqDI1Vd3v-oIYjY5", + "floorOrder": 1, + "point": 3, + "fileUrls": [] + }, + { + "activityId": 4390, + "activityName": "55444活动打扫宫斗是的呢佛山到哪放大说法达萨罗客服经理肯定萨芬发的", + "activityNameEn": "dddd", + "activityContent": "拉萨动静分离凯撒京东方", + "activityContentEn": "kljl", + "activityAddress": "41111", + "activityAddressEn": "", + "activityType": 1, + "shopCode": "", + "shopName": "", + "shopNameEn": "", + "houseNumber": "", + "fileUrl": "/iotFile/project-odubitlp9mjy2wyuqkpfga/20230609/AqUbanFt3SXwU2dT68uNy.jpg", + "qrFileUrl": "/iotFile/project-odubitlp9mjy2wyuqkpfga/20230609/fCutkOWSsjkSaGJ1OwX38.jpg", + "startDate": "2023-06-07", + "endDate": "2023-07-17", + "building": "濮园未来社区", + "buildingCode": "gAi7ksmAnlR22G8CyLXbI", + "buildingOrder": 0, + "floor": "L1", + "floorCode": "EuMWamqDI1Vd3v-oIYjY5", + "floorOrder": 1, + "point": 3, + "fileUrls": [] + }, + { + "activityId": 4390, + "activityName": "66444活动打扫宫斗是的呢佛山到哪放大说法达萨罗客服经理肯定萨芬发的", + "activityNameEn": "dddd", + "activityContent": "拉萨动静分离凯撒京东方", + "activityContentEn": "kljl", + "activityAddress": "41111", + "activityAddressEn": "", + "activityType": 1, + "shopCode": "", + "shopName": "", + "shopNameEn": "", + "houseNumber": "", + "fileUrl": "/iotFile/project-odubitlp9mjy2wyuqkpfga/20230609/AqUbanFt3SXwU2dT68uNy.jpg", + "qrFileUrl": "/iotFile/project-odubitlp9mjy2wyuqkpfga/20230609/fCutkOWSsjkSaGJ1OwX38.jpg", + "startDate": "2023-06-07", + "endDate": "2023-07-17", + "building": "濮园未来社区", + "buildingCode": "gAi7ksmAnlR22G8CyLXbI", + "buildingOrder": 0, + "floor": "L1", + "floorCode": "EuMWamqDI1Vd3v-oIYjY5", + "floorOrder": 1, + "point": 3, + "fileUrls": [] } ] } diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue index aaa5132..c34adc0 100644 --- a/src/views/Activity/Activity.vue +++ b/src/views/Activity/Activity.vue @@ -16,18 +16,18 @@ :looped-slides="1" :dynamic-bullets="true" :observer="true" - :width="547" :grab-cursor="true" + :width="547" --> Date: Wed, 14 Jun 2023 15:19:05 +0800 Subject: [PATCH 2/2] chore(release): 1.0.0-B.2 --- CHANGELOG.md | 12 ++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4240434..51b13af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ 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.2](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/compare/v1.0.0-B.1...v1.0.0-B.2) (2023-06-14) + + +### Features + +* 🚀 修改活动滑动问题 ([7e11a67](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/commit/7e11a67e4d571cea8b9299f4468d88928669eb39)) + + +### Bug Fixes + +* ci ([76e39fd](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/commit/76e39fd4878bd1d01eb5be955cd2c8326919864c)) + ## 1.0.0-B.1 (2023-06-14) diff --git a/package-lock.json b/package-lock.json index 7952f32..950ee32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.1", + "version": "1.0.0-B.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.0-B.1", + "version": "1.0.0-B.2", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index d3df2b5..2e90dd7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.1", + "version": "1.0.0-B.2", "private": true, "scripts": { "serve": "vue-cli-service serve", -- 2.30.2