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

fix: 🧩 修改问题

pull/2/head
deepblues 3 years ago
parent
a1375a845b
commit
b6f3b66ed9
8 changed files with 378 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 172
      public/static/offline/JSON/getArtData.json
  2. 171
      public/static/offline/JSON/getArtList.json
  3. 18
      src/components/PathGroup/PathGroup.vue
  4. 1
      src/components/ShopItem/ShopItem.vue
  5. 4
      src/views/Art/Art.vue
  6. 12
      src/views/Art/ArtMapItem.vue
  7. 4
      src/views/Art/ArtRightItem.vue
  8. 14
      src/views/Nav/Nav.vue

172
public/static/offline/JSON/getArtData.json
View File

File diff suppressed because one or more lines are too long

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

@ -1 +1,170 @@
{"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}]}
{
"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
}]
}

18
src/components/PathGroup/PathGroup.vue
View File

@ -93,14 +93,16 @@ const yourpos = computed(() => {
})
//终点图
const lastImage = computed(() => {
console.log(shop.value.logoUrl.search('http'))
return shop.value.logoUrl.search('http') !== -1 ||
shop.value.logoUrl.search('/static') !== -1 ||
shop.value.logoUrl.search('/base64') !== -1
? shop.value.logoUrl
: shop.value.logoUrl
? config.value.baseUrl + shop.value.logoUrl
: require('@/assets/images/header/logo.svg')
if (shop.logoUrl) {
return shop.value.logoUrl?.search('http') !== -1 ||
shop.value.logoUrl?.search('/static') !== -1 ||
shop.value.logoUrl?.search('/base64') !== -1
? shop.value.logoUrl
: shop.value.logoUrl
? config.value.sourceUrl + shop.value.logoUrl
: require('@/assets/images/header/logo.svg')
}
return require('@/assets/images/header/logo.svg')
})
defineExpose({
resetPlayIdx

1
src/components/ShopItem/ShopItem.vue
View File

@ -65,6 +65,7 @@ defineProps<{ shop: any }>()
flex-direction: column;
.name {
max-width: 90%;
height: 18px;
font-size: 16px;
color: #685c3b;

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

@ -510,9 +510,9 @@ function clickGo(item: ArtItem) {
.map-group {
position: absolute;
top: 85px;
left: 510px;
left: 580px;
li {
margin-bottom: -108px;
margin-bottom: -70px;
img {
height: 205px;
}

12
src/views/Art/ArtMapItem.vue
View File

@ -29,7 +29,9 @@ const props = defineProps({
artInfo: {
type: Object,
// eslint-disable-next-line @typescript-eslint/no-empty-function, no-empty-function
default: () => {}
default: () => {
return { artworkName: '' }
}
}
})
function clickGo() {
@ -56,10 +58,11 @@ function clickGo() {
.intro-container {
display: inline-block;
padding-top: 16px;
padding-left: 6px;
padding-left: 12px;
.art-title {
max-width: 170px;
height: 16px;
font-size: 14px;
font-family: 'font_bold';
color: #736661;
@ -70,7 +73,8 @@ function clickGo() {
}
.art-author {
max-width: 170px;
margin-top: 6px;
height: 14px;
margin-top: 2px;
font-size: 10px;
font-family: 'font_bold';
color: #9b8c85;
@ -115,7 +119,7 @@ function clickGo() {
bottom: 0;
width: 65px;
height: 36px;
padding-top: 8px;
padding-top: 12px;
padding-left: 29px;
font-size: 16px;
font-family: 'font_bold';

4
src/views/Art/ArtRightItem.vue
View File

@ -54,6 +54,7 @@ function clickGo() {
.art-title {
max-width: 200px;
height: 18px;
font-size: 16px;
font-family: 'font_bold';
color: #736661;
@ -64,7 +65,8 @@ function clickGo() {
}
.art-author {
max-width: 150px;
margin-top: 4px;
height: 14px;
margin-top: 2px;
font-size: 12px;
font-family: 'font_regular';
color: #9b8c85;

14
src/views/Nav/Nav.vue
View File

@ -38,6 +38,7 @@
>{{ switchLanguage(shop, 'shopName') }}
</marquees>
</div>
<div class="line"></div>
<h3 class="author">{{ shop.artAuthor }}</h3>
<!-- 介绍 -->
<scroll-view
@ -334,7 +335,16 @@ watch(shop, newVal => {
z-index: 1;
width: 824px;
height: 1078px;
background: linear-gradient(171.17deg, rgb(217 214 205 / 40%) 7.32%, #ecebe7 89.2%);
background: linear-gradient(180deg, #ded8c8 0%, #efeee4 47.92%, #fafafa 100%);
.line {
position: absolute;
top: 456px;
left: 48px;
width: 727px;
height: 1px;
border: 1px solid rgb(0 0 0 / 6%);
}
.marquee-wrapper {
overflow: hidden;
width: 340px;
@ -393,11 +403,13 @@ watch(shop, newVal => {
max-width: 180px;
}
.go-container {
max-width: 180px;
font-size: 36px;
font-family: 'font_bold';
color: rgb(0 0 0 / 60%);
font-style: normal;
font-weight: 700;
line-height: 120%;
}
}
.art-images {

Write Preview
Loading…
Cancel
Save