feat: sync project

This commit is contained in:
2026-03-20 20:58:24 +08:00
parent 04bb11dfff
commit 9a6ebe80c5
32 changed files with 3613 additions and 156 deletions

View File

@@ -0,0 +1,325 @@
<template>
<section class="page-card" v-if="!loading && product">
<div class="checkout-header">
<div>
<h2>立即下单 · {{ product.name }}</h2>
<p class="tag">一个扫码流程即可完成订单</p>
</div>
<button class="ghost" @click="goBack">返回商品</button>
</div>
<div class="checkout-grid">
<div class="checkout-summary">
<img :src="product.coverUrl" :alt="product.name" />
<div class="summary-content">
<h3>{{ product.name }}</h3>
<p class="tag">库存{{ product.quantity }}</p>
<p class="tag">浏览量{{ product.viewCount || 0 }}</p>
<p class="product-price">
<span v-if="isFree" class="free-price">免费</span>
<span
v-else-if="product.discountPrice > 0 && product.discountPrice < product.price"
>
<span class="price-original">¥ {{ product.price.toFixed(2) }}</span>
<span class="price-discount">¥ {{ product.discountPrice.toFixed(2) }}</span>
</span>
<span v-else>¥ {{ product.price.toFixed(2) }}</span>
</p>
<p class="markdown" v-html="renderMarkdown(product.description)"></p>
</div>
</div>
<form class="checkout-form" @submit.prevent="submitOrder" v-if="!orderResult">
<div class="form-field">
<label>下单数量</label>
<input v-model.number="form.quantity" min="1" type="number" />
</div>
<p class="tag">预计总价¥ {{ totalPrice.toFixed(2) }}</p>
<p class="tag login-hint" v-if="!loggedIn">
提示<a :href="loginUrl">登录萌芽账号</a> 后下单可查看历史订单记录
</p>
<button class="primary" type="submit" :disabled="submitting">
{{ submitting ? '生成中...' : '生成二维码下单' }}
</button>
<p class="error" v-if="error">{{ error }}</p>
</form>
</div>
<section class="order-result" v-if="orderResult">
<h4>订单 {{ orderResult.orderId }} 已创建</h4>
<template v-if="!confirmed">
<p class="tag">请扫描下方二维码完成付款</p>
<img :src="orderResult.qrCodeUrl" alt="下单二维码" />
<div class="confirm-area">
<button class="primary" :disabled="confirming" @click="doConfirm">
{{ confirming ? '确认中...' : '我已完成扫码付款' }}
</button>
<p class="tag">扫码完成后点击上方按钮获取购买内容</p>
</div>
<p class="error" v-if="confirmError">{{ confirmError }}</p>
</template>
<template v-else>
<p class="tag confirmed-badge">订单已完成</p>
<div class="result-content" v-if="deliveredCodes.length">
<p class="tag">购买后内容</p>
<textarea class="delivery-box" readonly :value="deliveredCodes.join('\n')"></textarea>
</div>
<p class="tag">感谢购买如有问题请联系售后邮箱</p>
</template>
</section>
</section>
<section class="page-card" v-else-if="!loading">
<h2>未找到该商品</h2>
<p class="tag">该商品无法下单请返回商店页</p>
<div class="detail-actions">
<button class="ghost" @click="goBack">返回商品</button>
</div>
</section>
<section class="page-card" v-else>
<div class="status">加载中...</div>
</section>
</template>
<script setup>
import { computed, onMounted, reactive, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import MarkdownIt from 'markdown-it'
import { fetchProducts, createOrder, confirmOrder } from '../shared/api'
import { authState, isLoggedIn, getLoginUrl } from '../shared/auth'
const route = useRoute()
const router = useRouter()
const md = new MarkdownIt()
const product = ref(null)
const loading = ref(true)
const submitting = ref(false)
const error = ref('')
const orderResult = ref(null)
const confirmed = ref(false)
const confirming = ref(false)
const confirmError = ref('')
const deliveredCodes = ref([])
const loggedIn = computed(() => isLoggedIn())
const loginUrl = computed(() => getLoginUrl())
const form = reactive({
quantity: 1
})
const renderMarkdown = (content) => md.render(content || '')
const getPayPrice = (p) => {
if (!p) return 0
if (p.price === 0) return 0
if (p.discountPrice > 0 && p.discountPrice < p.price) return p.discountPrice
return p.price
}
const unitPrice = computed(() => getPayPrice(product.value))
const isFree = computed(() => unitPrice.value === 0)
const totalPrice = computed(() => {
if (!product.value) {
return 0
}
const qty = form.quantity && form.quantity > 0 ? form.quantity : 1
return unitPrice.value * qty
})
const goBack = () => router.push('/')
const submitOrder = async () => {
if (!product.value) {
return
}
error.value = ''
submitting.value = true
orderResult.value = null
confirmed.value = false
deliveredCodes.value = []
try {
const payload = {
productId: product.value.id,
quantity: form.quantity
}
const token = isLoggedIn() ? authState.token : null
const response = await createOrder(payload, token)
orderResult.value = response
} catch (err) {
error.value = err?.response?.data?.error || '下单失败,请稍候再试'
} finally {
submitting.value = false
}
}
const doConfirm = async () => {
if (!orderResult.value?.orderId) {
return
}
confirmError.value = ''
confirming.value = true
try {
const result = await confirmOrder(orderResult.value.orderId)
deliveredCodes.value = result.deliveredCodes || []
confirmed.value = true
} catch (err) {
confirmError.value = err?.response?.data?.error || '确认失败,请重试'
} finally {
confirming.value = false
}
}
onMounted(async () => {
try {
const list = await fetchProducts()
product.value = list.find((item) => item.id === route.params.id) || null
} finally {
loading.value = false
}
})
</script>
<style scoped>
.checkout-header {
display: flex;
align-items: center;
justify-content: space-between;
gap: 16px;
margin-bottom: 20px;
}
.checkout-grid {
display: grid;
grid-template-columns: minmax(280px, 1fr) 320px;
gap: 24px;
margin-bottom: 20px;
}
.checkout-summary {
background: rgba(255, 255, 255, 0.8);
border-radius: var(--radius);
border: 1px solid var(--line);
padding: 18px;
display: flex;
gap: 18px;
}
.checkout-summary img {
width: 140px;
height: 140px;
object-fit: cover;
border-radius: 12px;
}
.summary-content {
flex: 1;
display: flex;
flex-direction: column;
gap: 8px;
}
.checkout-form {
display: flex;
flex-direction: column;
gap: 12px;
}
.login-hint a {
color: var(--accent-2);
text-decoration: none;
font-weight: 600;
}
.login-hint a:hover {
text-decoration: underline;
}
.order-result {
margin-top: 16px;
text-align: center;
}
.order-result img {
max-width: 320px;
margin: 12px auto;
width: 100%;
border-radius: 14px;
border: 1px solid var(--line);
}
.confirm-area {
display: flex;
flex-direction: column;
align-items: center;
gap: 10px;
margin: 16px 0;
}
.confirmed-badge {
display: inline-block;
padding: 6px 16px;
border-radius: 999px;
background: linear-gradient(135deg, var(--accent), var(--accent-2));
color: white;
font-size: 13px;
font-weight: 600;
margin-bottom: 12px;
}
.result-content {
margin: 12px 0;
display: flex;
flex-direction: column;
align-items: center;
gap: 8px;
}
.delivery-box {
width: min(520px, 100%);
min-height: 120px;
padding: 14px 16px;
border-radius: 14px;
border: 1px solid var(--line);
background: rgba(255, 255, 255, 0.9);
color: var(--text);
font-size: 14px;
line-height: 1.7;
resize: none;
}
.error {
color: #d64848;
font-size: 13px;
}
.status {
padding: 24px 0;
color: var(--muted);
}
.free-price {
color: #3a9a68;
font-weight: 900;
}
@media (max-width: 900px) {
.checkout-grid {
grid-template-columns: 1fr;
}
.checkout-summary {
flex-direction: column;
align-items: center;
}
.checkout-summary img {
width: 100%;
height: 200px;
}
}
</style>

View File

@@ -4,7 +4,17 @@
<div class="detail-summary">
<h2>{{ product.name }}</h2>
<p class="tag">库存{{ product.quantity }}</p>
<p class="product-price">¥ {{ product.price.toFixed(2) }}</p>
<p class="tag">浏览量{{ product.viewCount || 0 }}</p>
<p class="product-price">
<span v-if="isFree" class="free-price">免费</span>
<span
v-else-if="product.discountPrice > 0 && product.discountPrice < product.price"
>
<span class="price-original">¥ {{ product.price.toFixed(2) }}</span>
<span class="price-discount">¥ {{ product.discountPrice.toFixed(2) }}</span>
</span>
<span v-else>¥ {{ product.price.toFixed(2) }}</span>
</p>
</div>
<div class="markdown detail-description" v-html="renderMarkdown(product.description)"></div>
@@ -57,7 +67,7 @@
</div>
<div class="detail-actions">
<button class="buy-button" @click="buy">立即购买</button>
<button class="buy-button" @click="goCheckout">立即下单</button>
<button class="ghost" @click="goBack">返回商店首页</button>
</div>
</div>
@@ -80,7 +90,7 @@
import { computed, onMounted, ref, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import MarkdownIt from 'markdown-it'
import { fetchProducts } from '../shared/api'
import { fetchProducts, recordProductView } from '../shared/api'
const route = useRoute()
const router = useRouter()
@@ -89,6 +99,16 @@ const loading = ref(true)
const product = ref(null)
const currentImageIndex = ref(0)
const getPayPrice = (p) => {
if (!p) return 0
if (p.price === 0) return 0
if (p.discountPrice > 0 && p.discountPrice < p.price) return p.discountPrice
return p.price
}
const unitPrice = computed(() => getPayPrice(product.value))
const isFree = computed(() => unitPrice.value === 0)
const renderMarkdown = (content) => md.render(content || '')
const galleryImages = computed(() => {
@@ -124,8 +144,11 @@ const goBack = () => {
router.push('/')
}
const buy = () => {
alert('已加入购买清单(示例)')
const goCheckout = () => {
if (!product.value) {
return
}
router.push(`/checkout/${product.value.id}`)
}
const prevImage = () => {
@@ -157,6 +180,19 @@ onMounted(async () => {
try {
const list = await fetchProducts()
product.value = list.find((item) => item.id === route.params.id) || null
if (product.value) {
try {
const result = await recordProductView(product.value.id)
if (typeof result.viewCount === 'number') {
product.value = {
...product.value,
viewCount: result.viewCount
}
}
} catch (error) {
console.warn('record product view failed', error)
}
}
} finally {
loading.value = false
}
@@ -269,6 +305,11 @@ onMounted(async () => {
color: var(--muted);
}
.free-price {
color: #3a9a68;
font-weight: 900;
}
@media (max-width: 900px) {
.detail-thumb {
padding: 6px;

View File

@@ -3,28 +3,83 @@
<div class="hero">
<div>
<h2>所有商品</h2>
<div class="filter-search-row">
<div class="filters">
<button
class="filter-btn"
:class="{ active: filter === 'all' }"
type="button"
@click="setFilter('all')"
>
全部
</button>
<button
class="filter-btn"
:class="{ active: filter === 'free' }"
type="button"
@click="setFilter('free')"
>
免费
</button>
</div>
<div class="search-row">
<input
v-model="searchQuery"
class="search-input"
type="text"
placeholder="搜索商品/标签"
/>
</div>
</div>
</div>
</div>
<div v-if="loading" class="status">加载中...</div>
<div v-else>
<div class="grid">
<router-link
<div
v-for="item in pagedProducts"
:key="item.id"
:to="`/product/${item.id}`"
class="product-link"
:class="['product-link', { 'is-disabled': isSoldOut(item) }]"
@click="handleCardClick(item)"
>
<article class="product-card">
<img :src="item.coverUrl" :alt="item.name" />
<div class="product-meta">
<h3>{{ item.name }}</h3>
<span class="product-price">¥ {{ item.price.toFixed(2) }}</span>
<div class="cover-wrap">
<img :src="item.coverUrl" :alt="item.name" />
<div v-if="isSoldOut(item)" class="soldout-badge">已售空</div>
</div>
<div class="card-top">
<h3 class="card-name">{{ item.name }}</h3>
<div class="card-price">
<span v-if="isFree(item)" class="product-price free-price">免费</span>
<span
v-else-if="item.discountPrice > 0 && item.discountPrice < item.price"
class="product-price"
>
<span class="price-original">¥ {{ item.price.toFixed(2) }}</span>
<span class="price-discount">¥ {{ item.discountPrice.toFixed(2) }}</span>
</span>
<span v-else class="product-price">¥ {{ item.price.toFixed(2) }}</span>
</div>
</div>
<div class="card-mid">
<div class="markdown" v-html="renderMarkdown(item.description)"></div>
</div>
<div class="card-bottom">
<div class="meta-row">
<div class="tag">库存{{ item.quantity }}</div>
<div class="tag">浏览量{{ item.viewCount || 0 }}</div>
</div>
<div v-if="item.tags && item.tags.length" class="tag-row">
<span v-for="tag in item.tags" :key="tag" class="tag-chip">
{{ tag }}
</span>
</div>
</div>
<div class="tag">库存{{ item.quantity }}</div>
<div class="markdown" v-html="renderMarkdown(item.description)"></div>
</article>
</router-link>
</div>
</div>
<div class="pagination" v-if="totalPages > 1">
@@ -37,15 +92,20 @@
</template>
<script setup>
import { computed, onMounted, onUnmounted, ref } from 'vue'
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import MarkdownIt from 'markdown-it'
import { fetchProducts } from '../shared/api'
const router = useRouter()
const products = ref([])
const loading = ref(true)
const md = new MarkdownIt()
const page = ref(1)
const perPage = ref(20)
const filter = ref('all')
const searchQuery = ref('')
const renderMarkdown = (content) => md.render(content || '')
@@ -54,15 +114,57 @@ const updatePerPage = () => {
page.value = 1
}
const getPayPrice = (item) => {
if (!item) return 0
// 折扣规则:
// - 未填/无效折扣discountPrice <= 0 或 >= price => 不启用折扣
// - 只有当 discountPrice > 0 且小于原价,才用折扣价
// - 只有 price = 0实付价为 0才显示“免费”
if (item.price === 0) return 0
if (item.discountPrice > 0 && item.discountPrice < item.price) return item.discountPrice
return item.price
}
const isFree = (item) => getPayPrice(item) === 0
const matchesSearch = (item) => {
const q = (searchQuery.value || '').trim().toLowerCase()
if (!q) return true
const name = (item?.name || '').toLowerCase()
const tags = (item?.tags || []).join(',').toLowerCase()
return name.includes(q) || tags.includes(q)
}
const filteredProducts = computed(() => {
let list = products.value
if (filter.value === 'free') list = list.filter((p) => isFree(p))
if ((searchQuery.value || '').trim()) list = list.filter((p) => matchesSearch(p))
return list
})
const totalPages = computed(() =>
Math.max(1, Math.ceil(products.value.length / perPage.value))
Math.max(1, Math.ceil(filteredProducts.value.length / perPage.value))
)
const pagedProducts = computed(() => {
const start = (page.value - 1) * perPage.value
return products.value.slice(start, start + perPage.value)
return filteredProducts.value.slice(start, start + perPage.value)
})
const isSoldOut = (item) => item && item.quantity === 0
const handleCardClick = (item) => {
if (!item || isSoldOut(item)) {
return
}
router.push(`/product/${item.id}`)
}
const setFilter = (next) => {
filter.value = next
page.value = 1
}
onMounted(async () => {
updatePerPage()
window.addEventListener('resize', updatePerPage)
@@ -73,6 +175,14 @@ onMounted(async () => {
}
})
watch(filter, () => {
page.value = 1
})
watch(searchQuery, () => {
page.value = 1
})
onUnmounted(() => {
window.removeEventListener('resize', updatePerPage)
})
@@ -86,6 +196,87 @@ onUnmounted(() => {
margin-bottom: 20px;
}
.filters {
display: flex;
gap: 12px;
margin-top: 0;
flex-wrap: wrap;
}
.filter-search-row {
display: flex;
align-items: center;
justify-content: flex-start;
gap: 16px;
flex-wrap: wrap;
margin-top: 12px;
}
.search-row {
margin-top: 0;
}
.search-input {
width: 320px;
max-width: 100%;
border-radius: 999px;
border: 1px solid var(--line);
background: rgba(255, 255, 255, 0.7);
padding: 10px 14px;
font-family: 'Source Sans 3', sans-serif;
font-size: 14px;
outline: none;
}
.search-input:focus {
border-color: var(--accent);
box-shadow: 0 0 0 3px rgba(180, 154, 203, 0.18);
}
.tag-row {
display: flex;
flex-wrap: wrap;
gap: 8px;
margin-top: 8px;
}
.tag-chip {
padding: 4px 10px;
border-radius: 999px;
font-size: 12px;
font-weight: 700;
color: var(--accent-2);
background: rgba(145, 168, 208, 0.08);
border: 1px solid rgba(145, 168, 208, 0.18);
}
.filter-btn {
padding: 8px 14px;
border-radius: 999px;
border: 1px solid var(--line);
background: rgba(255, 255, 255, 0.6);
color: var(--text);
font-size: 13px;
font-weight: 700;
transition: background 0.2s ease, color 0.2s ease, transform 0.15s ease;
}
.filter-btn:hover {
transform: translateY(-1px);
}
.filter-btn.active {
background: linear-gradient(135deg, var(--accent), var(--accent-2));
border-color: transparent;
color: #fff;
box-shadow: 0 10px 30px rgba(145, 168, 208, 0.35);
}
.free-price {
color: #3a9a68;
font-weight: 900;
}
.product-link {
display: block;
text-decoration: none;
@@ -93,6 +284,106 @@ onUnmounted(() => {
height: 100%;
}
.product-link.is-disabled {
opacity: 0.6;
cursor: not-allowed;
}
.product-card {
display: flex;
flex-direction: column;
flex: 1;
gap: 12px;
height: 100%;
}
.card-top {
display: flex;
align-items: baseline;
justify-content: space-between;
gap: 12px;
}
.card-name {
font-size: 16px;
font-weight: 700;
color: var(--text);
line-height: 1.2;
}
.card-price {
display: flex;
align-items: center;
justify-content: flex-end;
}
.card-mid {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
text-align: center;
}
.card-mid .markdown {
text-align: center;
}
.card-bottom {
display: flex;
flex-direction: column;
gap: 6px;
align-items: flex-start;
}
.meta-row {
display: flex;
gap: 10px;
align-items: center;
flex-wrap: wrap;
}
.cover-wrap {
position: relative;
border-radius: 12px;
overflow: hidden;
}
.cover-wrap img {
width: 100%;
height: 140px;
object-fit: cover;
display: block;
}
.soldout-badge {
position: absolute;
inset: 0;
display: flex;
align-items: center;
justify-content: center;
background: rgba(20, 18, 22, 0.52);
backdrop-filter: blur(3px);
color: #fff;
font-family: 'Playfair Display', serif;
font-size: 22px;
font-weight: 600;
letter-spacing: 4px;
pointer-events: none;
}
.price-original {
text-decoration: line-through;
color: var(--muted);
margin-right: 6px;
font-size: 13px;
}
.price-discount {
color: var(--accent-2);
font-weight: 600;
}
.status {
padding: 24px 0;
color: var(--muted);
@@ -105,4 +396,16 @@ onUnmounted(() => {
gap: 12px;
margin-top: 22px;
}
@media (max-width: 900px) {
.filter-search-row {
flex-direction: column;
align-items: stretch;
gap: 10px;
}
.search-input {
width: 100%;
}
}
</style>