From 0d9bbca9c4cf3ab5d644a36caa050ac100930874 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Wed, 2 Aug 2023 11:27:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=8C=E8=89=BA=E6=9C=AF=E5=9B=BE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/offline/JSON/getArtList.json | 170 ------------------ .../offline/JSON/getArtPictureList.json | 60 +++++++ src/components/Carousel/Carousel.vue | 4 +- src/enums/index.ts | 2 +- src/http/api/base/index.ts | 2 +- src/types/activity.d.ts | 31 +++- src/views/Activity/Activity.vue | 2 +- src/views/Member/Member.vue | 4 +- src/views/School/School.vue | 2 +- 9 files changed, 95 insertions(+), 182 deletions(-) delete mode 100644 public/static/offline/JSON/getArtList.json create mode 100644 public/static/offline/JSON/getArtPictureList.json diff --git a/public/static/offline/JSON/getArtList.json b/public/static/offline/JSON/getArtList.json deleted file mode 100644 index 6abbebf..0000000 --- a/public/static/offline/JSON/getArtList.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "code": 200, - "msg": "操作成功", - "data": [{ - "fileCode": "jA2-kvdFAMBJSydN25BEg", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/jA2-kvdFAMBJSydN25BEg.jpg", - "flag": 1, - "artType": 1 - }, { - "fileCode": "5pQeWHTN9dRlXIyuE8Sqr", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5pQeWHTN9dRlXIyuE8Sqr.jpg", - "flag": 1, - "artType": 1 - }, { - "fileCode": "_WcayletIXukHgV9Rx3Ya", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_WcayletIXukHgV9Rx3Ya.jpg", - "flag": 1, - "artType": 1 - }, { - "fileCode": "Ira19CENuPgm4Ikktgzci", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Ira19CENuPgm4Ikktgzci.jpg", - "flag": 1, - "artType": 1 - }, { - "fileCode": "tlONBF4aAXF9VdKIJ2ri3", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/tlONBF4aAXF9VdKIJ2ri3.jpg", - "flag": 1, - "artType": 1 - }, { - "fileCode": "Rb8lH7lciGt1vNUZIdgQe", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Rb8lH7lciGt1vNUZIdgQe.jpg", - "flag": 2, - "artType": 1 - }, { - "fileCode": "IAERcSDTLeuyCxIWX5YN1", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/IAERcSDTLeuyCxIWX5YN1.jpg", - "flag": 2, - "artType": 1 - }, { - "fileCode": "s3pMCKIacVBF3rNS-_W62", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/s3pMCKIacVBF3rNS-_W62.jpg", - "flag": 2, - "artType": 1 - }, { - "fileCode": "eNhVVNUBgSJxM_MxsKbML", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/eNhVVNUBgSJxM_MxsKbML.jpg", - "flag": 2, - "artType": 1 - }, { - "fileCode": "fsOn2GiMRQ_hvnWiVBXsV", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/fsOn2GiMRQ_hvnWiVBXsV.jpg", - "flag": 2, - "artType": 1 - }, { - "fileCode": "H40UUmExfcFpebA2i-Bk6", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/H40UUmExfcFpebA2i-Bk6.jpg", - "flag": 1, - "artType": 1 - }, { - "fileCode": "JfQC8KoD1vGInd2YXOQSl", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/JfQC8KoD1vGInd2YXOQSl.jpg", - "flag": 2, - "artType": 2 - }, { - "fileCode": "yFB0w-HGSiAH3mF3S9VNi", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/yFB0w-HGSiAH3mF3S9VNi.jpg", - "flag": 2, - "artType": 2 - }, { - "fileCode": "IbQ0bamzhOEixOQwuP_Rc", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/IbQ0bamzhOEixOQwuP_Rc.jpg", - "flag": 2, - "artType": 2 - }, { - "fileCode": "nUm7hTA1R8Kg5IfaZm2BY", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/nUm7hTA1R8Kg5IfaZm2BY.jpg", - "flag": 2, - "artType": 2 - }, { - "fileCode": "5NkXmpBZ9s-wYh9BDmOFF", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5NkXmpBZ9s-wYh9BDmOFF.jpg", - "flag": 2, - "artType": 2 - }, { - "fileCode": "7EYcvZzHZYODEg97WTCp7", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/7EYcvZzHZYODEg97WTCp7.jpg", - "flag": 1, - "artType": 2 - }, { - "fileCode": "LpAEW1Lvc3BLdNJ6XHbc_", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/LpAEW1Lvc3BLdNJ6XHbc_.jpg", - "flag": 1, - "artType": 2 - }, { - "fileCode": "sLED3A_AYzulI-IF9m-b3", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/sLED3A_AYzulI-IF9m-b3.jpg", - "flag": 1, - "artType": 2 - }, { - "fileCode": "QaZFHo6mTlLHvOJGPKl2C", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/QaZFHo6mTlLHvOJGPKl2C.jpg", - "flag": 1, - "artType": 2 - }, { - "fileCode": "7eJGjEg08DyDG1GQuEZHS", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/7eJGjEg08DyDG1GQuEZHS.jpg", - "flag": 1, - "artType": 2 - }, { - "fileCode": "G97GPxe7KT-TMvcre2lnx", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/G97GPxe7KT-TMvcre2lnx.jpg", - "flag": 2, - "artType": 3 - }, { - "fileCode": "hzSAiHPb56KAecI8nVCPo", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/hzSAiHPb56KAecI8nVCPo.jpg", - "flag": 2, - "artType": 3 - }, { - "fileCode": "ZK0pAC8PdhwGBnynVxRgo", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/ZK0pAC8PdhwGBnynVxRgo.jpg", - "flag": 2, - "artType": 3 - }, { - "fileCode": "hi4XfhlASneBc0MX2svS2", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/hi4XfhlASneBc0MX2svS2.jpg", - "flag": 1, - "artType": 3 - }, { - "fileCode": "ABTnGXm0pP9FNPngvDRaU", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/ABTnGXm0pP9FNPngvDRaU.jpg", - "flag": 1, - "artType": 3 - }, { - "fileCode": "aszyTxdOZzNTNxz5nJwNk", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/aszyTxdOZzNTNxz5nJwNk.jpg", - "flag": 1, - "artType": 3 - }, { - "fileCode": "bkvvG13h76NVlUqNayhFE", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/bkvvG13h76NVlUqNayhFE.jpg", - "flag": 1, - "artType": 3 - }, { - "fileCode": "4AFl7ggDnt56Xa1Adphl9", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/4AFl7ggDnt56Xa1Adphl9.jpg", - "flag": 2, - "artType": 3 - }, { - "fileCode": "3Uh28D-mldlpsgQglStQ_", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/3Uh28D-mldlpsgQglStQ_.png", - "flag": 2, - "artType": 4 - }, { - "fileCode": "Fh3-6ToyKkizMA5HCB04P", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Fh3-6ToyKkizMA5HCB04P.png", - "flag": 2, - "artType": 4 - }, { - "fileCode": "iWIiFMC6V35LjoZocZqWZ", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/iWIiFMC6V35LjoZocZqWZ.png", - "flag": 1, - "artType": 4 - }, { - "fileCode": "pc-DdL_2pDm_3rk9Fo-R5", - "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/pc-DdL_2pDm_3rk9Fo-R5.png", - "flag": 1, - "artType": 4 - }] -} diff --git a/public/static/offline/JSON/getArtPictureList.json b/public/static/offline/JSON/getArtPictureList.json new file mode 100644 index 0000000..e0fdd3f --- /dev/null +++ b/public/static/offline/JSON/getArtPictureList.json @@ -0,0 +1,60 @@ +{ + "code": 200, + "msg": "操作成功", + "data": [ + { + "pictureName": "99", + "pictureNameEn": "99", + "crossCode": "FP7jtiX1wTqaPq7oWaTw7", + "verticalCode": "GuK7hB-2TUCjs_LR0sAfE", + "pictureType": 1, + "crossUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5pQeWHTN9dRlXIyuE8Sqr.jpg", + "verticalUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_WcayletIXukHgV9Rx3Ya.jpg" + }, + { + "pictureName": "99", + "pictureNameEn": "99", + "crossCode": "FP7jtiX1wTqaPq7oWaTw7", + "verticalCode": "GuK7hB-2TUCjs_LR0sAfE", + "pictureType": 2, + "crossUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5pQeWHTN9dRlXIyuE8Sqr.jpg", + "verticalUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_WcayletIXukHgV9Rx3Ya.jpg" + }, + { + "pictureName": "99", + "pictureNameEn": "99", + "crossCode": "FP7jtiX1wTqaPq7oWaTw7", + "verticalCode": "GuK7hB-2TUCjs_LR0sAfE", + "pictureType": 3, + "crossUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5pQeWHTN9dRlXIyuE8Sqr.jpg", + "verticalUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_WcayletIXukHgV9Rx3Ya.jpg" + }, + { + "pictureName": "99", + "pictureNameEn": "99", + "crossCode": "FP7jtiX1wTqaPq7oWaTw7", + "verticalCode": "GuK7hB-2TUCjs_LR0sAfE", + "pictureType": 4, + "crossUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5pQeWHTN9dRlXIyuE8Sqr.jpg", + "verticalUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_WcayletIXukHgV9Rx3Ya.jpg" + }, + { + "pictureName": "99", + "pictureNameEn": "99", + "crossCode": "FP7jtiX1wTqaPq7oWaTw7", + "verticalCode": "GuK7hB-2TUCjs_LR0sAfE", + "pictureType": 1, + "crossUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5pQeWHTN9dRlXIyuE8Sqr.jpg", + "verticalUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_WcayletIXukHgV9Rx3Ya.jpg" + }, + { + "pictureName": "99", + "pictureNameEn": "99", + "crossCode": "FP7jtiX1wTqaPq7oWaTw7", + "verticalCode": "GuK7hB-2TUCjs_LR0sAfE", + "pictureType": 2, + "crossUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5pQeWHTN9dRlXIyuE8Sqr.jpg", + "verticalUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_WcayletIXukHgV9Rx3Ya.jpg" + } + ] +} \ No newline at end of file diff --git a/src/components/Carousel/Carousel.vue b/src/components/Carousel/Carousel.vue index 27dfa64..c7c0e48 100644 --- a/src/components/Carousel/Carousel.vue +++ b/src/components/Carousel/Carousel.vue @@ -12,8 +12,8 @@ :dynamic-bullets="true" class="myswiper" > - - + + diff --git a/src/enums/index.ts b/src/enums/index.ts index f6773e9..b217688 100644 --- a/src/enums/index.ts +++ b/src/enums/index.ts @@ -25,7 +25,7 @@ export enum HTTP_CODE { ERR_NULL = 401, //未识别到语音 ERR_DISCERNING = 201 //语音识别中 } - +//1文化学院,2金卡会员,3黑卡会员,4活动 export enum PictureStatus { SCHOOL = 1, // 文化学院 GOLD = 2, // 金卡会员 diff --git a/src/http/api/base/index.ts b/src/http/api/base/index.ts index a0e4b27..4ba10c4 100644 --- a/src/http/api/base/index.ts +++ b/src/http/api/base/index.ts @@ -24,4 +24,4 @@ export const getHandWriting = (data: WrittenQuery) => request({ url: ' export const getIndexJson = () => request({ url: `/JSON/index.json` }) // 获取活动、会员卡等 -export const getArtList = () => request({ url: `/JSON/getArtList.json` }) +export const getArtList = () => request({ url: `/JSON/getArtPictureList.json` }) diff --git a/src/types/activity.d.ts b/src/types/activity.d.ts index 497282d..ee6d65a 100644 --- a/src/types/activity.d.ts +++ b/src/types/activity.d.ts @@ -23,8 +23,31 @@ declare interface Activity { } declare interface Picture { - fileCode: string // 图片编码 - fileUrl: string // 图片地址 - flag: PictureType // 图片横竖 - artType: PictureStatus // 图片类型 + // fileCode: string // 图片编码 + // fileUrl: string // 图片地址 + // flag: PictureType // 图片横竖 + // artType: PictureStatus // 图片类型 + + crossCode: string + /** + * 横版图片地址 + */ + crossUrl: string + /** + * 中文标题名称 + */ + pictureName: string + /** + * 英文标题名称 + */ + pictureNameEn: string + /** + * 类型，1文化学院,2金卡会员,3黑卡会员,4活动 + */ + pictureType: PictureStatus + verticalCode: string + /** + * 竖版图片地址 + */ + verticalUrl: string } diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue index c806c66..31beaeb 100644 --- a/src/views/Activity/Activity.vue +++ b/src/views/Activity/Activity.vue @@ -17,7 +17,7 @@ const aclist = ref([]) const store = useRootStore() const { pictureList } = toRefs(store) pictureList.value?.forEach(item => { - if (item.artType === PictureStatus.ACTIVITY && item.flag === PictureType.H) { + if (item.pictureType === PictureStatus.ACTIVITY) { aclist.value.push(item) } }) diff --git a/src/views/Member/Member.vue b/src/views/Member/Member.vue index aaf25e4..0d01a5c 100644 --- a/src/views/Member/Member.vue +++ b/src/views/Member/Member.vue @@ -37,14 +37,14 @@ function getInfo(status: PictureStatus) { if (status === PictureStatus.GOLD) { goldMemberInfo.value = [] pictureList.value.forEach(item => { - if (item.artType === status && item.flag === PictureType.H) { + if (item.pictureType === status) { goldMemberInfo.value.push(item) } }) } else { blackMemberInfo.value = [] pictureList.value.forEach(item => { - if (item.artType === status && item.flag === PictureType.H) { + if (item.pictureType === status) { blackMemberInfo.value.push(item) } }) diff --git a/src/views/School/School.vue b/src/views/School/School.vue index 75cfd79..0011aef 100644 --- a/src/views/School/School.vue +++ b/src/views/School/School.vue @@ -17,7 +17,7 @@ const aclist = ref([]) const store = useRootStore() const { pictureList } = toRefs(store) pictureList.value?.forEach(item => { - if (item.artType === PictureStatus.SCHOOL && item.flag === PictureType.H) { + if (item.pictureType === PictureStatus.SCHOOL) { aclist.value.push(item) } }) From ddb6cf5f0e246635f196d3b26df9cbb92555403d Mon Sep 17 00:00:00 2001 From: zhangyao Date: Wed, 2 Aug 2023 11:28:17 +0800 Subject: [PATCH 2/2] chore(release): 1.1.0-B.21 --- 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 befdd68..343616a 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.1.0-B.21](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.20...v1.1.0-B.21) (2023-08-02) + + +### Bug Fixes + +* 修改会员活动，艺术图接口 ([0d9bbca](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/0d9bbca9c4cf3ab5d644a36caa050ac100930874)) + ## [1.1.0-B.20](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.19...v1.1.0-B.20) (2023-07-27) diff --git a/package-lock.json b/package-lock.json index 18d2cda..def495a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.1.0-B.20", + "version": "1.1.0-B.21", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.1.0-B.20", + "version": "1.1.0-B.21", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index e70d803..044d18c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.1.0-B.20", + "version": "1.1.0-B.21", "private": true, "scripts": { "serve": "vue-cli-service serve",