From 6f67273a9a12bb2568a3b9e551b5de666d06a83c Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 17 Jan 2025 16:56:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor(store):=20=E9=87=8D=E6=9E=84=20home=20?=
 =?UTF-8?q?store=20=E5=B9=B6=E6=94=B9=E5=90=8D=E4=B8=BA=20goods=20store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 home store 重命名为 goods store，以更准确地反映其用途
- 更新了相关文件中的导入路径和引用
-调整了首页布局和组件以适应新的 goods store 结构
- 新增了 goods store 中的 actionDetails 和 itemList 属性
---
 app/api/goods/index.js                       | 16 ++++++++++++++++
 app/api/http.js                              |  6 +++---
 app/components/AppHeader.vue                 |  4 ++--
 app/layouts/README.md                        |  2 +-
 app/layouts/default.vue                      |  2 +-
 app/pages/home/components/Cescribe/index.vue | 15 +++++++++++++++
 app/pages/home/components/Column/index.vue   |  8 ++++++--
 app/pages/home/components/index.vue          |  2 +-
 app/pages/home/index.vue                     | 15 +++++++--------
 app/stores/{home => goods}/index.js          |  7 +++++--
 10 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 app/api/goods/index.js
 create mode 100644 app/pages/home/components/Cescribe/index.vue
 rename app/stores/{home => goods}/index.js (95%)

diff --git a/app/api/goods/index.js b/app/api/goods/index.js
new file mode 100644
index 0000000..7f9adea
--- /dev/null
+++ b/app/api/goods/index.js
@@ -0,0 +1,16 @@
+import { getHttp } from '~/api/http.js'
+
+export async function artworkList(data) {
+    const http = getHttp()
+    return await http('/api/v1/m/auction/default/artwork/list', {
+        method: 'POST',
+        body: data,
+    })
+}
+export async function defaultDetail(data) {
+    const http = getHttp()
+    return await http('/api/v1/m/auction/default/detail', {
+        method: 'POST',
+        body: data,
+    })
+}
\ No newline at end of file
diff --git a/app/api/http.js b/app/api/http.js
index db74379..85ca5bd 100644
--- a/app/api/http.js
+++ b/app/api/http.js
@@ -2,6 +2,7 @@
 import { useRuntimeConfig } from '#app'
 import { ofetch } from 'ofetch'
 import {message} from '@/components/x-message/useMessage.js'
+import {authStore} from "@/stores/auth/index.js";
 let httpStatusErrorHandler
 
 let http
@@ -12,15 +13,14 @@ export function setupHttp() {
 
   const config = useRuntimeConfig()
   const baseURL = config.public.NUXT_PUBLIC_API_BASE
-
+  const {token}= authStore()
   http = ofetch.create({
     baseURL,
     headers: { 'Content-Type': 'application/json' },
     async onRequest({ options }) {
-      const token = localStorage.getItem('token')
       options.headers = {
         ...options.headers,
-        ...(token && { Authorization: token }),
+        Authorization:token.value
       }
     },
     async onResponse({ response }) {
diff --git a/app/components/AppHeader.vue b/app/components/AppHeader.vue
index 9a047ac..4c058c7 100644
--- a/app/components/AppHeader.vue
+++ b/app/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useAppHeaderRouteNames as routeWhiteList } from '~/config'
-import { homeStore } from "@/stores/home/index.js";
+import { homeStore } from "@/stores/goods/index.js";
 const { fullLive } = homeStore()
 const route = useRoute()
 const router = useRouter()
@@ -40,7 +40,7 @@ const showLeftArrow = computed(() => route.name && routeWhiteList.includes(route
     placeholder clickable fixed
     @click-left="onBack"
   >
-    <template #title v-if="route.meta.i18n==='menu.home'">
+    <template #title v-if="route.meta.i18n==='menu.goods'">
 
       <div class="flex flex-col items-center justify-center">
         <div class="text-#000000 text-17px mb-5px font-600">{{ title }}</div>
diff --git a/app/layouts/README.md b/app/layouts/README.md
index 2be4436..ff0c124 100644
--- a/app/layouts/README.md
+++ b/app/layouts/README.md
@@ -7,7 +7,7 @@ By default, `default.vue` will be used unless an alternative is specified in the
 ```vue
 <script setup lang="ts">
 definePageMeta({
-  layout: 'home',
+  layout: 'goods',
 })
 </script>
 ```
diff --git a/app/layouts/default.vue b/app/layouts/default.vue
index c20d956..c29e7ce 100644
--- a/app/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -8,6 +8,6 @@
   </main>
 </template>
 <script setup >
-import { homeStore } from "@/stores/home/index.js";
+import { homeStore } from "@/stores/goods/index.js";
 const { fullLive } = homeStore()
 </script>
\ No newline at end of file
diff --git a/app/pages/home/components/Cescribe/index.vue b/app/pages/home/components/Cescribe/index.vue
new file mode 100644
index 0000000..20594f0
--- /dev/null
+++ b/app/pages/home/components/Cescribe/index.vue
@@ -0,0 +1,15 @@
+<script setup>
+
+</script>
+
+<template>
+  <div class="px-16px pt-14px">
+    <div class="text-#575757 text-14px">
+      这里是后台富文本配置的说明，啊即可打开三等奖撒度老师的湿答答是快乐的阿四大皆空
+    </div>
+  </div>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/app/pages/home/components/Column/index.vue b/app/pages/home/components/Column/index.vue
index 0a98be6..84f87a6 100644
--- a/app/pages/home/components/Column/index.vue
+++ b/app/pages/home/components/Column/index.vue
@@ -16,7 +16,7 @@
         <div
             class="absolute left-[8px] top-[8px] h-[17px] w-[45px] flex items-center justify-center bg-[#2b53ac] text-[12px] text-[#fff]"
         >
-          LOT{{ index + 1 }}
+          LOT{{ item.index+1 }}
         </div>
       </div>
       <div class="pt-[8px]">
@@ -39,7 +39,11 @@
 
 <script setup>
 const props = defineProps({
-  items: Array
+  items: Array,
+  colIndex: {
+    type: Number,
+    default: 0
+  }
 });
 
 const emit = defineEmits(['openShow']);
diff --git a/app/pages/home/components/index.vue b/app/pages/home/components/index.vue
index 819d6af..e05f768 100644
--- a/app/pages/home/components/index.vue
+++ b/app/pages/home/components/index.vue
@@ -27,7 +27,7 @@ const openShow = () => {
           <div
             class="absolute left-[8px] top-[8px] h-[17px] w-[45px] flex items-center justify-center bg-[#2b53ac] text-[12px] text-[#fff]"
           >
-            LOT{{ index + 1 }}
+            LOT{{ item.index + 1 }}
           </div>
         </div>
         <div class="pt-[8px]">
diff --git a/app/pages/home/index.vue b/app/pages/home/index.vue
index bfe89fb..64f2ca3 100644
--- a/app/pages/home/index.vue
+++ b/app/pages/home/index.vue
@@ -2,12 +2,10 @@
 import {useRect} from '@vant/use';
 import LiveRoom from '@/pages/LiveRoom/index.client.vue';
 import itemDetail from '@/components/itemDetail/index.vue';
-import {homeStore} from "@/stores/home/index.js";
+import {homeStore} from "@/stores/goods/index.js";
 import Column from './components/Column/index.vue'
 
 const {fullLive} = homeStore();
-
-
 definePageMeta({
   layout: 'default',
   i18n: 'menu.home',
@@ -21,17 +19,17 @@ const show = ref(false);
 const showHeight = ref('');
 const list = ref([{
   image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/637d95b4-2ae9-4a74-bd60-a3a9d2ca2ca0.png',
-  title: '张天赐 | 日出而作，日落而息',
+  title: '张天赐 | 日出而作，日落而息1',
   startingPrice: 'RMB 1,000',
   transactionPrice: 'RMB 10,000',
 }, {
   image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/f7b65e23-ce21-41b4-8e58-9e6dc6950727.png',
-  title: '张天赐 | 日出而作，日落而息',
+  title: '张天赐 | 日出而作，日落而息2',
   startingPrice: 'RMB 1,000',
   transactionPrice: '',
 }, {
   image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/41eceb23-d168-4049-ae8e-48c5328b192f.png',
-  title: '张天赐 | 日出而作，日落而息',
+  title: '张天赐 | 日出而作，日落而息3',
   startingPrice: 'RMB 1,000',
   transactionPrice: '',
 }, {
@@ -75,7 +73,8 @@ const onRefresh = () => {
 const columns = computed(() => {
   const result = [[], []];
   list.value.forEach((item, index) => {
-    result[index % 2].push(item);
+    // 为每个项目添加一个 index 属性
+    result[index % 2].push({ ...item, index });
   });
   return result;
 });
@@ -108,7 +107,7 @@ const changeLive = () => {
               <van-pull-refresh>
                 <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="loadData">
                   <div class="w-full flex gap-[16px]">
-                    <Column v-for="(column, colIndex) in columns" :key="colIndex" :items="column" @openShow="openShow"/>
+                    <Column v-for="(column, colIndex) in columns" :key="colIndex" :colIndex="colIndex" :items="column" @openShow="openShow"/>
                   </div>
                 </van-list>
               </van-pull-refresh>
diff --git a/app/stores/home/index.js b/app/stores/goods/index.js
similarity index 95%
rename from app/stores/home/index.js
rename to app/stores/goods/index.js
index dae33b7..d307b71 100644
--- a/app/stores/home/index.js
+++ b/app/stores/goods/index.js
@@ -1,7 +1,8 @@
 import { createGlobalState } from '@vueuse/core'
 export const homeStore = createGlobalState(() => {
+    const actionDetails=ref({})
     const fullLive=ref(false)
-    const list = ref([{
+    const itemList = ref([{
         image: 'https://e-cdn.fontree.cn/fonchain-main/prod/file/default/setting/637d95b4-2ae9-4a74-bd60-a3a9d2ca2ca0.png',
         title: '张天赐 | 日出而作，日落而息',
         startingPrice: 'RMB 1,000',
@@ -42,8 +43,10 @@ export const homeStore = createGlobalState(() => {
         startingPrice: 'RMB 1,000',
         transactionPrice: 'RMB 10,000',
     }])
+
     return{
-        list,
+        actionDetails,
+        itemList,
         fullLive
     }
 })
\ No newline at end of file