From 5b498724c4bf5040d929d68cb06ed84828746d97 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Tue, 23 Sep 2025 22:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E8=8D=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=8A=E4=B8=8A=E4=BC=A0=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/upnew/types.ts                            |   1 +
 assets/images/yuan.png                        | Bin 0 -> 1513 bytes
 assets/images/zhuan.png                       | Bin 0 -> 1821 bytes
 .../drawe-components/RecommendedColumnsV2.vue |  14 ++++++++++--
 components/kl-card-picture/index.vue          |  10 +++++++--
 .../model-components/RecommendedColumnsV2.vue |  17 +++++++++++---
 .../text-components/RecommendedColumnsV2.vue  |  21 +++++++++++++-----
 pages/toolbox-detail/index.vue                |   4 ++--
 pages/upnew/index.vue                         |   8 +++++--
 9 files changed, 59 insertions(+), 16 deletions(-)
 create mode 100644 assets/images/yuan.png
 create mode 100644 assets/images/zhuan.png

diff --git a/api/upnew/types.ts b/api/upnew/types.ts
index b6031a0..ee8845a 100644
--- a/api/upnew/types.ts
+++ b/api/upnew/types.ts
@@ -80,6 +80,7 @@ export interface pageRes {
     previewPoint?: number
     commentsPoint?: number
     hotPoint?: number
+    source?: number
   }[]
   total: number
 }
diff --git a/assets/images/yuan.png b/assets/images/yuan.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2dbcf33af71dc06b987d93aec1bf2c54633e8b6
GIT binary patch
literal 1513
zcmV<F1s3{=P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000G^Nkl<ZcmeEN
zTXx$x3<bFu&+KC2Ri%GU{?b)dvx_#1341SSS(HS;dO4QU>KGIW0u*owK13x^CS2*;
zzfbA;pC26^QhMGaoo)Pfc$wgqinsu@j!XLZA(EatQr#UUXB(58w1WUd0(pj-03`Id
zTpahB*l`_z5ReDL2!Pz{hm?DJ$Ii_$jUaHyVki&QdH~S*-0MTJFH%NCtB-{{JpjJ6
z^R3e<o!Tt#7XZ9*LcvU-5dnpG4By|wo=9Mm1bG#bcvsRDt(8y!)cGVmWLklIZ=L=H
z$3bsDo6O%&8emg+dw(G*80;w1Jb-YX4-^1NVml8+!}onUZTY8Qz-BiZ&O;#%Cxw2a
zp;1Kp%!esu+e1?~I7a~@-~$_+x`>4EYScUq+w%cY5G95Gs@^d4F|Mk055(kf5NAF>
z1jrwK0f1x-foP1KI$m5!xP87Gd3*kl{x__CiuDSS96B=TO4w#f609Ty^G<~4`xAQI
z6%&BE_?XL{A9MH18Ctd)0I?>~;gfb+UJrnt6YRmefIZ9n9qI-E7|vrEl__K`QK}n{
zqI>-7ckWgVOI-Gi0AO$AeK~hy9*H?ai%!IxjHi$+ylw=**c#5z9UWdcd6ERP_gESn
z%q<D0QdPo|r@9bZ`}-6C=!Bj%;6NhZ<s@{RB-Z6Dr_=*!yO#Py{>=f%Jw<0GS~N>6
zztGH583^AT06{1Zp1ExiFEnc!ygdMGtosDr`v8EYZOL((E{Pk1avuQX<EdK_@YM;&
zQ&Y+t`>xI12LR0Ac{RWnr_0JPF|THCm)r+{?d)IO(q8~pL-^ng+$RD)aTU1MKeqwE
zdBMpBEnNki6YSjZ?DRGOTr*?wDj+y^8#I0u?1B8CxC#KS-GlZXuDA+-N#1%NCMGrD
z3-PSMm+)(E4ge1`^km4lV`gn=geOUuOl9S@5&&ybiZHOVjJ?FYzwYH}bdBgxr;>9)
zUa2=Ge5}RCPX#wiE>7cO&6$dNF3@g!@h(8)OS;w^^?3lo`!(4)_3HpI-u3BNX@nY`
ziWwYv<&{ECo{kH2geTCr&(U?7)v9#>&>(HbPIRS!(Ibf(ZzKel@urBh|M?EOTY<0`
z0NVggP=zN9`=WTsVtilnOELrjho(zZOP$34l#TTA#l}QKw^!K}I5Bo5JEy~mlV()}
zXM!t1SPlSsplXxEhWzZjaTr>4$dE;29SDQyLLG-kewG$yCvmn06zuRvC4Si;!y$ye
zIs~~nKkDSKKih(^2!K2zSImcVdeUP}j;u$75WpVI2;;3mm<<38uehFB#<HlDa9+nf
zC&eTuDais%jLX_y7xRyyIbzQSKn))?0|p($?o6y5-P`+%%)Vk%Q{iwBJa1eVn=#Ml
zM8A4|?I=WHsP_D&soEI6RCXEFvp;uhn~=#0XcH5w0+Sh&)A;~g9$GvDJT>UdQV?Je
z_x>ectF7?W$~Fo3)_*->*mizTz`Mc1zi2Z7&>dWBPjTl%`{7qNmc2nLR5hzS0H$q>
z?(x_<q{5$&0Dw>(XWp|3LN=6tF#YT3$=2#rA9KR^ZijrWo%OuX001#A>s8kf-!nVO
z$uiFdz+2L+)^^Bumu)PYQOrpx;rre6|GwIx@7W}$_c;WkPD-`4o9a+@5v0tH$+bPm
zD@~6~#Eb&eJ|GBO!SsCuw!;JWrvSK7Ky@^fo)3wLlE~T{sna+-Nqn#1cH7%tqxTv9
z^g#h&MmI0acmyB>lnBPoNMFLPIezx7b)Llw04#9lruVO$aEDs>*8@O@!a$&qeef(c
zeDF<uEIjD}Kt2Vy%M*+fmcIsthC`gb4gDDb&<f}{d3X>)!(mP5Tfc^P695Vlgd7d=
zm?HuWT6+d6+=2R!Z0*CH;g0i(TCbNnzX1RM|NkH>!)yQm00v1!K~w_(+7hE?!P0KZ
P00000NkvXXu0mjfN65J7

literal 0
HcmV?d00001

diff --git a/assets/images/zhuan.png b/assets/images/zhuan.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fac6e6f62e03cf7531ddebd440912dede6e8042
GIT binary patch
literal 1821
zcmV+&2jcjNP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000KkNkl<Zcmdql
zy^<S66b0axAi*x10G#kskWod5F%Gd`fB;^Ch*z+A1tMMo0$#v&Xp9LdC=w`s5<`Gp
zHVIxaUu*AFZ|_K&(Tr?qRXWqRdv4#k=k)C!?atFP_}sg<xOVsc;wIetesL@C?fu09
zqW|O1i(7mG&mgt569Ev;XviYCn5SE_ly1Ock*)=TVDuk8OxO4X%-yvZlL`=|5zc7H
zrsi}0TuPT-UE=LGQwqHMPD&8{@X?ynOiiU2Dup1%r@|xxoFHD1MhwBX8q$|uX#{9+
z?p#WNAQAoW(VAl}F@Ud1AxKn)v9TB>Kuz4Lm820Hn;<cu7Go+Qwh~|!ajP~3=~bc;
zBBR+(;X{Zq+hVW)$d~(DdG4Bckd2lIQ4z+7U|Yyde+UK%KxyPXK)L56ntiSRJWvZE
zH#rW;rMCbAQ(Ev?b@o1h5OR`>9OcUHgI)p%D6oJY<bmvcf}G?gC%MX*y$Kry5J*6Q
zobVpR-bctyj&hT;+}Z1}RsaD65<uWxp75SA1>`7KvE+^edlgm+;6xR`M5QG#`w$>k
zIm;CXT-aS$DS#8z1c8(m`;Z`Kxyu=sRU&i>5M?8PK!O}1<nDEybAKV-$Zd5wB>?iu
zhMxf1Lxvw|^7nUyDqxp5B|uBQ__<k5I7C||=e#?r;Di8HKRY&;v#|ONjr_&MR_LmN
z69SyY)z1nv7a}xGN>vrK0>tVom)1GYI2#wQ#;z)81(?s$hr6Kq#h3r3ufKVk?tXWa
z{`hmz>k<3|edqKE+%9ZU1+4(~hajz!&P4dVAx?n4;rN&6J8zSpD&T`_yb-bhW%+ZM
z3iax}{@QF~=vt_&@8=XZ&g<)78<f7&MsFf3U1bknHKpGSwO?Z;+$j6(S^#4;%-a@i
zg&%K&EI_j^`BzeVbKB?#Ft6MO(w#^7*QMd+Sw(Pl4&(|zG?ZbF!N(uHkUsnL#q>$j
zMjZRtSPl2fF@DAZ<-O95``fm`^=O{1wE}D#Y}Gucc-(Us+S|a6@pbJRJr2xu^ZVYL
zzkG2w@Bfmh(;s;#g{coW_akwB_5HFRe%rL?Us}%c+h_jh(XtbR%ij1a0;1GqZET;g
zlPyrL<lYP5SCJKogMmE;N<Rd!kJ-i|CfgX42U{r=+abCR5pPr5bw9Y`K6wQo77w)z
z^tJUEA!1C+PaAM<tV8&XZRfLDx}BQOlPAq(g0IyZ8m1;s9KR@Q@Pnc8YyaSi`{Wg1
z)re5SR){3naWBT|R>gDyc_2_dXWRbd0!SnXMoSdqz&5Vc2c)!pP|xi%r}laL?{ehA
zg_Pz;i*!df2HDR7<tp|)?4o+6%I}|t>CR3nAQD6pqOY~ue$e<!(H=LZ8oFQ`xF7H{
zJM5|2`TQtNdI%x~K@w4<(}oYB%nM&F#5AQJ_SiNKL2>3+uFSFkk0*Ky2wJb4u^P(R
zsvAd?Q0B2qA>2nE*i#_5UcEfKnYX}f;#XlRK8P0GgoqzN%9&l>3!4yOo4?90e1^0S
z{$6@F|DF7tl?6yoQ|`n~H@1aj<51f~G@fA&Uu}$)t?g0vr?i&>97l}OIPPxMDC@w`
z00e+?o@%f?Y>je!Tl>LZ%bCibl?8AP>~b4;P+t(Bs~QL}wi2SkgR7jf0E{WOL5?@_
zLI{X3Y?T%LF>U<z5u+6#s=ziVUlW|h!a)`o5({ZCS36{G?Q8Yx^5@eEptGwguyRg)
z7)pe{c{#rkmmnXfe}p<AKv@M83#UVByK*hL#NiiyCj`iY@k%^CE%VrcUskO?TBihv
zDsc1H-&_wHvHD8CUVY3?31BeJ0taFQ$m0igk$bFu7kP9#1;|x!l&*6SKp^%ZLC$iQ
z^X!-lyGEw~oQR-o*aA)cY7}=@kgJ@<#{n017gh?uS=k7{{-rq&1ZM9u<S17;${h#x
zDy$X2Bmo3s3#_!*`v|$oQEqaUJ9`~A3ShE80<x8s2eJ1Fa*~^z<SJ+OCiD_O5CH{d
zdyogR_W@qla*~T2<;w1Z-U0|FaGa<f_`^>rJx?J#TMk~=@{^k!*?loc070FoA6%Zz
zD6RiIgmBQ6tM1QR<mD!(As8$`1gCU}V2lt}1oU@-Anu^E>Mim2X4khNFUPF~FqsH-
zH4s8s5(4;*L68=6O5%~zC;=i!DTGxqP6&{AF4yLtkpuyxfFG~}?t?kz25Ej`=TaZB
z;^LH;M1TlLh$~HUQ5CU8lq)d;NCASt4up?6;s)udiHi-B3Ls#B7*L8qkc$`7?M&+U
zU-7B=L|@AX5H^>f_BS-Hr@mtc{s#a6|NpBvEHVH900v1!K~w_(z7+sTULwk900000
LNkvXXu0mjf-n~xh

literal 0
HcmV?d00001

diff --git a/components/drawe-components/RecommendedColumnsV2.vue b/components/drawe-components/RecommendedColumnsV2.vue
index 156c1a1..4dab4fa 100644
--- a/components/drawe-components/RecommendedColumnsV2.vue
+++ b/components/drawe-components/RecommendedColumnsV2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="relative mt-[34px] w-[100%]">
     <KlTabBar v-model="query.source" :data="tabBar" />
-    <div class="absolute right-[0px] top-[0px] text-[16px] text-[#999999] font-normal"
-      >共<span class="color-[#1A65FF]">{{ result?.total }}</span
+    <div class="absolute right-[0px] top-[0px] text-[16px] text-[#999999] font-normal">
+      <el-button type="warning" class="mr-4px" @click="handleUpload">上传工具</el-button>
+      共<span class="color-[#1A65FF]">{{ result?.total }}</span
       >个筛选结果</div
     >
     <div class="content mt-[10px]">
@@ -22,6 +23,7 @@
   import { ref } from 'vue'
   import type { pageRes, pageReq } from '~/api/upnew/types'
   import emptyImg from '~/assets/images/empty.png'
+  import useUserStore from '~/stores/user'
 
   const query = defineModel<pageReq>('modelValue', {
     required: true,
@@ -45,6 +47,14 @@
       value: 2,
     },
   ])
+  const handleUpload = () => {
+    // 先判断登录
+    const store = useUserStore()
+    if (!store.token) {
+      return ElMessage.error('请先登录')
+    }
+    navigateTo('/upnew?drawType=1')
+  }
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/components/kl-card-picture/index.vue b/components/kl-card-picture/index.vue
index 69dd064..2aa612e 100644
--- a/components/kl-card-picture/index.vue
+++ b/components/kl-card-picture/index.vue
@@ -6,12 +6,17 @@
     <div class="box-border p-[16px]">
       <div class="flex items-center justify-between">
         <div>
-          <div class="title mr-[38px] text-[16px] text-[#333333] font-bold">{{ props.itemInfo.title }}</div>
+          <div class="title mr-[38px] text-[16px] text-[#333333] font-bold flex items-center" :title="props.itemInfo.title">
+            <img v-if="props.itemInfo.source === 2" src="~/assets/images/zhuan.png" alt="" srcset="" class="mr-[2px] w-[22px] relative bottom-[-4px]" />
+            <img v-if="props.itemInfo.source === 1" src="~/assets/images/yuan.png" alt="" srcset="" class="mr-[2px] w-[20px] relative bottom-[-4px]" />
+            {{ props.itemInfo.title }}
+          </div>
           <div class="mt-[8px] text-[15px] text-[#999999] font-normal">by {{ props.itemInfo?.ownedUserIdInfo?.nickName }}</div>
+          <div class="mt-[4px] text-[13px] text-[#999999] font-normal">{{ dayjs(props.itemInfo.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
         </div>
         <div><img :src="props.itemInfo?.ownedUserIdInfo?.avatar" alt="" srcset="" class="h-[40px] w-[40px] rd-[50%]" /></div>
       </div>
-      <div class="mt-[24px] flex items-center justify-between">
+      <div class="mt-[14px] flex items-center justify-between">
         <div class="flex items-center justify-between text-[14px] text-[#666666] font-normal">
           <div class="mr-[9px] flex items-center">
             <img src="~/assets/images/look.png" alt="" srcset="" class="mr-[2px] h-[17px]" />
@@ -35,6 +40,7 @@
 </template>
 
 <script lang="ts" setup>
+  import dayjs from 'dayjs'
   import type { PropType } from 'vue'
   import type { pageRes } from '~/api/upnew/types'
   const props = defineProps({
diff --git a/components/model-components/RecommendedColumnsV2.vue b/components/model-components/RecommendedColumnsV2.vue
index 3161bc7..92e9db8 100644
--- a/components/model-components/RecommendedColumnsV2.vue
+++ b/components/model-components/RecommendedColumnsV2.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="relative mt-[34px] w-[100%]">
     <KlTabBar v-model="query.source" :data="tabBar" />
-    <div class="absolute right-[0px] top-[0px] text-[16px] text-[#999999] font-normal"
-      >共<span class="color-[#1A65FF]">{{ result?.total }}</span
+    <div class="absolute right-[0px] top-[0px] text-[16px] text-[#999999] font-normal">
+      <el-button type="warning" class="mr-4px" @click="handleUpload">上传工具</el-button>
+      共<span class="color-[#1A65FF]">{{ result?.total }}</span
       >个筛选结果</div
     >
     <div class="content mt-[10px]">
@@ -22,11 +23,12 @@
   import { ref } from 'vue'
   import type { pageRes, pageReq } from '~/api/upnew/types'
   import emptyImg from '~/assets/images/empty.png'
+  import useUserStore from '~/stores/user'
 
   const query = defineModel<pageReq>('modelValue', {
     required: true,
   })
-  const result = defineModel<pageRes| null>('result', {
+  const result = defineModel<pageRes | null>('result', {
     required: true,
   })
 
@@ -44,6 +46,15 @@
       value: 2,
     },
   ])
+
+  const handleUpload = () => {
+    // 先判断登录
+    const store = useUserStore()
+    if (!store.token) {
+      return ElMessage.error('请先登录')
+    }
+    navigateTo('/upnew?drawType=3')
+  }
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/components/text-components/RecommendedColumnsV2.vue b/components/text-components/RecommendedColumnsV2.vue
index f44f01a..8f6daf1 100644
--- a/components/text-components/RecommendedColumnsV2.vue
+++ b/components/text-components/RecommendedColumnsV2.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="relative mt-[34px] w-[100%]">
     <KlTabBar v-model="query.source" :data="tabBar" />
-    <div class="absolute right-[0px] top-[0px] text-[16px] text-[#999999] font-normal"
-      >共<span class="color-[#1A65FF]">{{ result?.total }}</span
-      >个筛选结果</div
-    >
+    <div class="absolute right-[0px] top-[0px] text-[16px] text-[#999999] font-normal">
+      <el-button type="warning" class="mr-4px" @click="handleUpload">上传工具</el-button>
+      共<span class="color-[#1A65FF]">{{ result?.total }}</span>
+      个筛选结果
+    </div>
     <div class="content mt-[10px]">
       <el-row :gutter="20">
         <el-col v-for="(item, index) in result?.list" :key="index" :span="6">
@@ -22,6 +23,7 @@
   import { ref } from 'vue'
   import type { pageRes, pageReq } from '~/api/upnew/types'
   import emptyImg from '~/assets/images/empty.png'
+  import useUserStore from '~/stores/user'
 
   const query = defineModel<pageReq>('modelValue', {
     required: true,
@@ -34,7 +36,7 @@
   const tabBar = ref([
     {
       label: '文本推荐',
-      value: -1
+      value: -1,
     },
     {
       label: '原创文本',
@@ -45,6 +47,15 @@
       value: 2,
     },
   ])
+
+  const handleUpload = () => {
+    // 先判断登录
+    const store = useUserStore()
+    if (!store.token) {
+      return ElMessage.error('请先登录')
+    }
+    navigateTo('/upnew?drawType=2')
+  }
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/pages/toolbox-detail/index.vue b/pages/toolbox-detail/index.vue
index 2eca57c..d81d574 100644
--- a/pages/toolbox-detail/index.vue
+++ b/pages/toolbox-detail/index.vue
@@ -1,7 +1,7 @@
 <!-- 工具箱详情页面 -->
 <template>
   <KlNavTab />
-  <div class="toolbox-detail w-[1019px] min-h-[374px] bg-[#FFFFFF] rounded-[12px] border border-solid border-[#EEEEEE] pa-[37px] pt-[20px] box-border ma-auto mt-[30px]">
+  <div class="toolbox-detail w-[1200px] min-h-[374px] bg-[#FFFFFF] rounded-[12px] border border-solid border-[#EEEEEE] pa-[37px] pt-[20px] box-border ma-auto mt-[30px]">
     <div class="w-[100%]">
       <h1 class="font-[Microsoft_YaHei] font-bold text-[24px] text-[#333333] leading-[21px]">工具箱使用详情</h1>
       <div class="flex items-center w-[100%] mt-[30px]">
@@ -28,7 +28,7 @@
         </div>
       </div>
     </div>
-    <div class="w-[938px] h-[1px] bg-[#EEEEEE] rounded-[1px] my-[20px]"></div>
+    <div class="w-[100%] h-[1px] bg-[#EEEEEE] rounded-[1px] my-[20px]"></div>
     <div class="body">
       <p class="font-[Microsoft_YaHei] font-normal text-[14px] text-[#333333] leading-[26px]">
         这里是工具箱的详细使用说明和描述内容。您可以在这里添加关于该工具箱功能的详细介绍，
diff --git a/pages/upnew/index.vue b/pages/upnew/index.vue
index 731913e..8b27dac 100644
--- a/pages/upnew/index.vue
+++ b/pages/upnew/index.vue
@@ -46,6 +46,10 @@
     return route.query.type || 'add'
   })
 
+  const drawType = computed(() => {
+    return route.query.drawType || 1
+  })
+
   const form = reactive<TcreateReq>({
     activeName: 1, // 标签
     id: '', // 图纸id  id,示例值(24548)
@@ -172,9 +176,9 @@
   const drawTypeRef = ref<InstanceType<typeof DrawType>>()
   onMounted(() => {
     // 初始化图纸类型
-    drawTypeRef.value?.handleTypeChange(1)
+    drawTypeRef.value?.handleTypeChange(Number(drawType.value))
     // 初始化图纸类型
-    form.type = 1
+    form.type = Number(drawType.value)
 
     if (type.value !== 'add') {
       getDetail()