blackteay/go-view
1
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2025-04-25 10:56:34 +08:00
Code Issues Projects Releases Wiki Activity

fix: 处理冲突bug

Browse Source
This commit is contained in:
奔跑的面条 2024-04-10 15:45:26 +08:00
parent 372101e0fd
commit 1554943535
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,25 +9,19 @@
</n-button> </n-button>
</n-space> </n-space>
</div> </div>
<div class="content-box">
<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_izetnl0654w00.png" style="height: 400px" />
<n-button text tag="a" href="https://ai.goviewlink.com/?channel=mayun" target="_blank" type="primary">
前往 GoViewPro 查看 👆
</n-button>
</n-space>
</div>
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts"></script>
import { requireErrorImg } from '@/utils'
</script>
<style lang="scss" scoped> <style lang="scss" scoped>
@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%);
@ -37,10 +31,11 @@ import { requireErrorImg } from '@/utils'
border-radius: 6px; border-radius: 6px;
} }
} }
>>>>>>> dev
} }
@include dark() { @include dark() {
@include go('project-template-market') { @include go('project-template-market') {
background-color: #18181c;
}
} }
</style> </style>