Merge branch 'xingyy'
# Conflicts: # app/layouts/default.vue # app/pages/home/index.vue # app/pages/profile/index.vue
This commit is contained in:
xingyy
commit
32594d035c
@ -28,5 +28,12 @@ const showLeftArrow = computed(() => route.name && routeWhiteList.includes(route
|
|||||||
:left-arrow="!showLeftArrow"
|
:left-arrow="!showLeftArrow"
|
||||||
placeholder clickable fixed
|
placeholder clickable fixed
|
||||||
@click-left="onBack"
|
@click-left="onBack"
|
||||||
/>
|
>
|
||||||
|
<template #title>
|
||||||
|
<div class="flex flex-col items-center justify-center">
|
||||||
|
<div class="text-#000000 text-17px mb-5px font-600">京都拍卖会</div>
|
||||||
|
<div class="text-#939393 text-10px line-height-none font-100">2025.01.18 蒙娜丽莎的微笑</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</VanNavBar>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@ -1,18 +1,13 @@
|
|||||||
<template>
|
<template>
|
||||||
<main class="flex flex-col min-h-svh">
|
<main class="flex flex-col min-h-svh">
|
||||||
<van-nav-bar fixed>
|
<AppHeader class="h-[var(--van-nav-bar-height)]" />
|
||||||
<template #title>
|
|
||||||
<div class="flex flex-col items-center justify-center">
|
<div class="flex-1 pb-[var(--van-nav-bar-height)]">
|
||||||
<div class="text-#000000 text-17px mb-5px font-600">京都拍卖会</div>
|
|
||||||
<div class="text-#939393 text-10px line-height-none font-100">2025.01.18 蒙娜丽莎的微笑</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</van-nav-bar>
|
|
||||||
<div class="flex-1 pt-46px">
|
|
||||||
<slot />
|
<slot />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<AppFooter />
|
<AppFooter />
|
||||||
</main>
|
</main>
|
||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup lang="ts">
|
||||||
</script>
|
</script>
|
||||||
@ -108,25 +108,25 @@ const clickSwipe=(index)=>{
|
|||||||
<div class="px-[16px] pt-[16px]">
|
<div class="px-[16px] pt-[16px]">
|
||||||
<van-pull-refresh>
|
<van-pull-refresh>
|
||||||
<van-list
|
<van-list
|
||||||
v-model:loading="loading"
|
v-model:loading="loading"
|
||||||
:finished="finished"
|
:finished="finished"
|
||||||
finished-text="没有更多了"
|
finished-text="没有更多了"
|
||||||
@load="loadData"
|
@load="loadData"
|
||||||
>
|
>
|
||||||
<div class="w-full flex gap-[16px]">
|
<div class="w-full flex gap-[16px]">
|
||||||
<div class="flex flex-1 flex-col gap-[16px]">
|
<div class="flex flex-1 flex-col gap-[16px]">
|
||||||
<div
|
<div
|
||||||
v-for="(item, index) in leftColumn"
|
v-for="(item, index) in leftColumn"
|
||||||
:key="index"
|
:key="index"
|
||||||
class="w-full"
|
class="w-full"
|
||||||
@click="openShow"
|
@click="openShow"
|
||||||
>
|
>
|
||||||
<div class="relative w-full">
|
<div class="relative w-full">
|
||||||
<van-image
|
<van-image
|
||||||
:src="item.image"
|
:src="item.image"
|
||||||
:style="{ aspectRatio: item.ratio }"
|
:style="{ aspectRatio: item.ratio }"
|
||||||
fit="cover"
|
fit="cover"
|
||||||
class="w-full"
|
class="w-full"
|
||||||
/>
|
/>
|
||||||
<div class="absolute left-[8px] top-[8px] h-[17px] w-[45px] flex items-center justify-center bg-[#2b53ac] text-[12px] text-[#fff]">
|
<div class="absolute left-[8px] top-[8px] h-[17px] w-[45px] flex items-center justify-center bg-[#2b53ac] text-[12px] text-[#fff]">
|
||||||
LOT{{ index * 2 + 1 }}
|
LOT{{ index * 2 + 1 }}
|
||||||
@ -140,8 +140,8 @@ const clickSwipe=(index)=>{
|
|||||||
起拍价：{{ item.startingPrice }}
|
起拍价：{{ item.startingPrice }}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="item.transactionPrice"
|
v-if="item.transactionPrice"
|
||||||
class="mt-[4px] text-[12px] text-[#b58047]"
|
class="mt-[4px] text-[12px] text-[#b58047]"
|
||||||
>
|
>
|
||||||
成交价：{{ item.transactionPrice }}
|
成交价：{{ item.transactionPrice }}
|
||||||
</div>
|
</div>
|
||||||
@ -150,16 +150,16 @@ const clickSwipe=(index)=>{
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex flex-1 flex-col gap-[16px]">
|
<div class="flex flex-1 flex-col gap-[16px]">
|
||||||
<div
|
<div
|
||||||
v-for="(item, index) in rightColumn"
|
v-for="(item, index) in rightColumn"
|
||||||
:key="index"
|
:key="index"
|
||||||
class="w-full"
|
class="w-full"
|
||||||
>
|
>
|
||||||
<div class="relative w-full">
|
<div class="relative w-full">
|
||||||
<van-image
|
<van-image
|
||||||
:src="item.image"
|
:src="item.image"
|
||||||
:style="{ aspectRatio: item.ratio }"
|
:style="{ aspectRatio: item.ratio }"
|
||||||
fit="cover"
|
fit="cover"
|
||||||
class="w-full"
|
class="w-full"
|
||||||
/>
|
/>
|
||||||
<div class="absolute left-[8px] top-[8px] h-[17px] w-[45px] flex items-center justify-center bg-[#2b53ac] text-[12px] text-[#fff]">
|
<div class="absolute left-[8px] top-[8px] h-[17px] w-[45px] flex items-center justify-center bg-[#2b53ac] text-[12px] text-[#fff]">
|
||||||
LOT{{ index * 2 + 2 }}
|
LOT{{ index * 2 + 2 }}
|
||||||
@ -173,8 +173,8 @@ const clickSwipe=(index)=>{
|
|||||||
起拍价：{{ item.startingPrice }}
|
起拍价：{{ item.startingPrice }}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="item.transactionPrice"
|
v-if="item.transactionPrice"
|
||||||
class="mt-[4px] text-[12px] text-[#b58047]"
|
class="mt-[4px] text-[12px] text-[#b58047]"
|
||||||
>
|
>
|
||||||
成交价：{{ item.transactionPrice }}
|
成交价：{{ item.transactionPrice }}
|
||||||
</div>
|
</div>
|
||||||
@ -203,27 +203,27 @@ const clickSwipe=(index)=>{
|
|||||||
/>
|
/>
|
||||||
</van-swipe-item>
|
</van-swipe-item>
|
||||||
</van-swipe>
|
</van-swipe>
|
||||||
<div class="px-[16px] bg-[#fff] pt-[11px] mb-6px">
|
<div class="px-[16px] bg-[#fff] pt-[11px] mb-6px">
|
||||||
<div class="text-[#000] text-[16px] mb-[12px]">日出而作，日落而息</div>
|
<div class="text-[#000] text-[16px] mb-[12px]">日出而作，日落而息</div>
|
||||||
<div class="text-#575757 text-[14px] pb-8px">
|
<div class="text-#575757 text-[14px] pb-8px">
|
||||||
<div class="flex mb-[4px]">
|
<div class="flex mb-[4px]">
|
||||||
<div class="w-[70px]">作者：</div>
|
<div class="w-[70px]">作者：</div>
|
||||||
<div>张天赐</div>
|
<div>张天赐</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex mb-[4px]">
|
<div class="flex mb-[4px]">
|
||||||
<div class="w-[70px] flex-shrink-0">总平尺数：</div>
|
<div class="w-[70px] flex-shrink-0">总平尺数：</div>
|
||||||
<div>—</div>
|
<div>—</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex mb-[4px]">
|
<div class="flex mb-[4px]">
|
||||||
<div class="w-[70px] flex-shrink-0">长*宽：</div>
|
<div class="w-[70px] flex-shrink-0">长*宽：</div>
|
||||||
<div>100*200cm</div>
|
<div>100*200cm</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex mb-[4px]">
|
<div class="flex mb-[4px]">
|
||||||
<div class="w-[70px] flex-shrink-0">画作简介：</div>
|
<div class="w-[70px] flex-shrink-0">画作简介：</div>
|
||||||
<div>是打卡时间到卡上即可点击卡拉斯科健康就阿斯科利打卡时间到卡萨带手机的啊科技是打卡时</div>
|
<div>是打卡时间到卡上即可点击卡拉斯科健康就阿斯科利打卡时间到卡萨带手机的啊科技是打卡时</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex px-[16px] bg-#fff h-[36px] items-center mb-6px">
|
<div class="flex px-[16px] bg-#fff h-[36px] items-center mb-6px">
|
||||||
<div class="text-[#575757] text-[14px]">起拍价：</div>
|
<div class="text-[#575757] text-[14px]">起拍价：</div>
|
||||||
<div class="text-#575757 text-14px font-bold">RMB 1,000</div>
|
<div class="text-#575757 text-14px font-bold">RMB 1,000</div>
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
|
definePageMeta({
|
||||||
|
layout: 'default',
|
||||||
|
title: '我的',
|
||||||
|
i18n: 'menu.profile',
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="h-full w-[100vw] bg-[url('@/static/images/5532@2x.png')] bg-cover px-[31px]">
|
<div>
|
||||||
123
|
12312
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
|
|
||||||
</style>
|
|
||||||
Loading…
Reference in New Issue
Block a user