mirror of
https://gitee.com/dromara/go-view.git
synced 2025-02-23 15:52:49 +08:00
fix: 处理冲突bug
This commit is contained in:
parent
372101e0fd
commit
1554943535
@ -9,25 +9,19 @@
|
||||
</n-button>
|
||||
</n-space>
|
||||
</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>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { requireErrorImg } from '@/utils'
|
||||
</script>
|
||||
<script setup lang="ts"></script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@include go('project-template-market') {
|
||||
box-sizing: border-box;
|
||||
height: calc(100vh - 62px);
|
||||
padding-top: 3vh;
|
||||
.content-box {
|
||||
width: 700px;
|
||||
margin: 0 auto 0;
|
||||
padding: 20px;
|
||||
border-radius: 10px;
|
||||
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;
|
||||
}
|
||||
}
|
||||
>>>>>>> dev
|
||||
}
|
||||
|
||||
@include dark() {
|
||||
@include go('project-template-market') {
|
||||
background-color: #18181c;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
Loading…
Reference in New Issue
Block a user