github/go-view
github/go-view
3
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2025-02-23 15:52:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 解决冲突

Browse Source
This commit is contained in:
奔跑的面条 2024-04-10 15:38:02 +08:00
parent cd4ce6bafa
commit c1140a3649
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/views/project/templateMarket/index.vue
View File

@ -1,11 +1,5 @@
<template> <template>
<div class="go-project-template-market"> <div class="go-project-template-market">
<<<<<<< HEAD
<n-space vertical>
<n-image object-fit="contain" height="300" preview-disabled :src="requireErrorImg()"></n-image>
<n-h3>暂时还没有东西呢</n-h3>
</n-space>
=======
<div class="content-box"> <div class="content-box">
<n-space vertical> <n-space vertical>
<img src="https://goviewpro.goviewlink.com/charts-img-db/charts-img-db_id_5pimyysnnh8000.png" style="width: 100%" /> <img src="https://goviewpro.goviewlink.com/charts-img-db/charts-img-db_id_5pimyysnnh8000.png" style="width: 100%" />
@ -15,7 +9,6 @@
</n-button> </n-button>
</n-space> </n-space>
</div> </div>
>>>>>>> dev
</div> </div>
</template> </template>
@ -24,18 +17,8 @@ import { requireErrorImg } from '@/utils'
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
<<<<<<< HEAD
@include go("project-template-market") {
margin-top: 100px;
@extend .go-flex-center;
=======
@include go('project-template-market') { @include go('project-template-market') {
box-sizing: border-box; box-sizing: border-box;
height: calc(100vh - 62px);
padding-top: 3vh;
.content-box {
width: 700px;
margin: 0 auto 0;
padding: 20px; padding: 20px;
border-radius: 10px; border-radius: 10px;
background: linear-gradient(120deg, rgba(255, 255, 255, 0.15) 0%, rgba(29, 83, 163, 0.3) 99.09%); background: linear-gradient(120deg, rgba(255, 255, 255, 0.15) 0%, rgba(29, 83, 163, 0.3) 99.09%);
@ -50,7 +33,5 @@ import { requireErrorImg } from '@/utils'
@include dark() { @include dark() {
@include go('project-template-market') { @include go('project-template-market') {
background-color: #18181c;
} }
}
</style> </style>