project-shenyangk11
/
sy_k11_H_base_daoshi_vue_ts
forked from common/base_daoshi_vue_ts
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev
liyongle 3 years ago
parent
27ca98a5ac ddb6cf5f0e
commit
795c2d244c
12 changed files with 105 additions and 185 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      CHANGELOG.md
  2. 4
      package-lock.json
  3. 2
      package.json
  4. 170
      public/static/offline/JSON/getArtList.json
  5. 60
      public/static/offline/JSON/getArtPictureList.json
  6. 4
      src/components/Carousel/Carousel.vue
  7. 2
      src/enums/index.ts
  8. 2
      src/http/api/base/index.ts
  9. 31
      src/types/activity.d.ts
  10. 2
      src/views/Activity/Activity.vue
  11. 4
      src/views/Member/Member.vue
  12. 2
      src/views/School/School.vue

7
CHANGELOG.md
View File

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

4
package-lock.json
View File

@ -1,12 +1,12 @@
{ {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.1.0-B.20",
"version": "1.1.0-B.21",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.1.0-B.20",
"version": "1.1.0-B.21",
"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
View File

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

170
public/static/offline/JSON/getArtList.json
View File

@ -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
}]
}

60
public/static/offline/JSON/getArtPictureList.json
View File

@ -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"
}
]
}

4
src/components/Carousel/Carousel.vue
View File

@ -12,8 +12,8 @@
:dynamic-bullets="true" :dynamic-bullets="true"
class="myswiper" class="myswiper"
> >
<swiper-slide v-for="item in acList" :key="item.fileCode">
<img :src="item.fileUrl" class="img" />
<swiper-slide v-for="item in acList" :key="item.crossCode">
<img :src="item.crossUrl" class="img" />
</swiper-slide> </swiper-slide>
</swiper> </swiper>
<img v-else src="../../assets/images/nodata.svg" class="stay-tuned" alt="" /> <img v-else src="../../assets/images/nodata.svg" class="stay-tuned" alt="" />

2
src/enums/index.ts
View File

@ -25,7 +25,7 @@ export enum HTTP_CODE {
ERR_NULL = 401, //未识别到语音 ERR_NULL = 401, //未识别到语音
ERR_DISCERNING = 201 //语音识别中 ERR_DISCERNING = 201 //语音识别中
} }
//1文化学院,2金卡会员,3黑卡会员,4活动
export enum PictureStatus { export enum PictureStatus {
SCHOOL = 1, // 文化学院 SCHOOL = 1, // 文化学院
GOLD = 2, // 金卡会员 GOLD = 2, // 金卡会员

2
src/http/api/base/index.ts
View File

@ -24,4 +24,4 @@ export const getHandWriting = (data: WrittenQuery) => request<string[]>({ url: '
export const getIndexJson = () => request({ url: `/JSON/index.json` }) export const getIndexJson = () => request({ url: `/JSON/index.json` })
// 获取活动、会员卡等 // 获取活动、会员卡等
export const getArtList = () => request<Picture[]>({ url: `/JSON/getArtList.json` })
export const getArtList = () => request<Picture[]>({ url: `/JSON/getArtPictureList.json` })

31
src/types/activity.d.ts
View File

@ -23,8 +23,31 @@ declare interface Activity {
} }
declare interface Picture { 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
} }

2
src/views/Activity/Activity.vue
View File

@ -17,7 +17,7 @@ const aclist = ref<Picture[]>([])
const store = useRootStore() const store = useRootStore()
const { pictureList } = toRefs(store) const { pictureList } = toRefs(store)
pictureList.value?.forEach(item => { pictureList.value?.forEach(item => {
if (item.artType === PictureStatus.ACTIVITY && item.flag === PictureType.H) {
if (item.pictureType === PictureStatus.ACTIVITY) {
aclist.value.push(item) aclist.value.push(item)
} }
}) })

4
src/views/Member/Member.vue
View File

@ -37,14 +37,14 @@ function getInfo(status: PictureStatus) {
if (status === PictureStatus.GOLD) { if (status === PictureStatus.GOLD) {
goldMemberInfo.value = [] goldMemberInfo.value = []
pictureList.value.forEach(item => { pictureList.value.forEach(item => {
if (item.artType === status && item.flag === PictureType.H) {
if (item.pictureType === status) {
goldMemberInfo.value.push(item) goldMemberInfo.value.push(item)
} }
}) })
} else { } else {
blackMemberInfo.value = [] blackMemberInfo.value = []
pictureList.value.forEach(item => { pictureList.value.forEach(item => {
if (item.artType === status && item.flag === PictureType.H) {
if (item.pictureType === status) {
blackMemberInfo.value.push(item) blackMemberInfo.value.push(item)
} }
}) })

2
src/views/School/School.vue
View File

@ -17,7 +17,7 @@ const aclist = ref<Picture[]>([])
const store = useRootStore() const store = useRootStore()
const { pictureList } = toRefs(store) const { pictureList } = toRefs(store)
pictureList.value?.forEach(item => { pictureList.value?.forEach(item => {
if (item.artType === PictureStatus.SCHOOL && item.flag === PictureType.H) {
if (item.pictureType === PictureStatus.SCHOOL) {
aclist.value.push(item) aclist.value.push(item)
} }
}) })

Write Preview
Loading…
Cancel
Save