From 0e8fb5c838f1989d5dfb7f4153a67e43b9c713d7 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Fri, 5 Sep 2025 21:43:22 +0800
Subject: [PATCH 01/11] =?UTF-8?q?refactor:=20=E6=B7=BB=E5=8A=A0=E5=9B=BD?=
 =?UTF-8?q?=E5=A4=96=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?isDomestic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/foreign/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pages/foreign/index.vue b/pages/foreign/index.vue
index 47fc700..ba97ecb 100644
--- a/pages/foreign/index.vue
+++ b/pages/foreign/index.vue
@@ -35,13 +35,19 @@
   import { page } from '~/api/upnew/index'
   import type { pageRes, pageReq } from '~/api/upnew/types'
 
-  const query = reactive<pageReq>({
+  const query = reactive<
+    pageReq & {
+      isDomestic: number
+    }
+  >({
     pageNo: 1,
     pageSize: 10,
     projectType: '-1',
     editions: '-1',
     source: -1,
     type: 1,
+    /**是否是国内: 1是 0否 */
+    isDomestic: 1,
   })
   // const result = reactive<pageRes>({
   //   list: [],

From d24ece1724073285cd0608c1277e83bfe60822ea Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Fri, 5 Sep 2025 21:47:20 +0800
Subject: [PATCH 02/11] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toolbox/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/toolbox/index.vue b/pages/toolbox/index.vue
index ed7e1ae..f58fa72 100644
--- a/pages/toolbox/index.vue
+++ b/pages/toolbox/index.vue
@@ -37,11 +37,11 @@
           <!-- <div class="text-16px text-[#999999] font-normal">暂无数据</div> -->
           <el-empty v-if="!pageRes.list.length" :image="emptyImg"></el-empty>
         </div>
-        <div class="mt-[20px]">
+        <div class="mt-[20px] text-right">
           <el-pagination
             v-model:current-page="pageReq.pageNum"
             :page-size="pageReq.pageSize"
-            layout="total, sizes, prev, pager, next"
+            layout="total, prev, pager, next"
             :total="pageRes?.total"
             :page-sizes="[10, 20, 30]"
             class="justify-center!"

From 24d2b82221602eb0d34f35f7b99fde81fc0a6d6f Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Fri, 5 Sep 2025 22:06:29 +0800
Subject: [PATCH 03/11] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=AE=B1=E5=88=86=E9=A1=B5=E5=92=8C=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toolbox/index.vue | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/pages/toolbox/index.vue b/pages/toolbox/index.vue
index f58fa72..1184e99 100644
--- a/pages/toolbox/index.vue
+++ b/pages/toolbox/index.vue
@@ -37,18 +37,16 @@
           <!-- <div class="text-16px text-[#999999] font-normal">暂无数据</div> -->
           <el-empty v-if="!pageRes.list.length" :image="emptyImg"></el-empty>
         </div>
-        <div class="mt-[20px] text-right">
-          <el-pagination
-            v-model:current-page="pageReq.pageNum"
-            :page-size="pageReq.pageSize"
-            layout="total, prev, pager, next"
-            :total="pageRes?.total"
-            :page-sizes="[10, 20, 30]"
-            class="justify-center!"
-            @current-change="handleCurrentChange"
-            @size-change="handleSizeChange"
-          />
-        </div>
+        <el-pagination
+          v-if="pageRes?.list.length"
+          v-model:current-page="pageReq.pageNum"
+          :page-size="pageReq.pageSize"
+          layout="total, prev, pager, next"
+          :total="pageRes?.total"
+          :page-sizes="[10, 20, 30]"
+          class="mt-[20px]"
+          @current-change="handleCurrentChange"
+        />
       </div>
     </div>
     <div class="right w-[398px]">
@@ -115,10 +113,16 @@
   //   total: 0,
   // })
 
-  const {data: pageRes, refresh: getPage } = await useAsyncData(`draw-page-list-${Date.now()}`, async () => {
-    const res = await page(pageReq)
-    return res.data
-  })
+  const { data: pageRes, refresh: getPage } = await useAsyncData(
+    `draw-page-toobox-list`,
+    async () => {
+      const res = await page(pageReq)
+      return res.data
+    },
+    {
+      immediate: true,
+    }
+  )
 
   const loading = ref(false)
   // const getPage = () => {
@@ -153,13 +157,13 @@
     getPage()
   }
 
-  const {data: recommendList} = await useAsyncData(`draw-recommend-list-${Date.now()}`, async () => {
+  const { data: recommendList } = await useAsyncData(`draw-recommend-list-getRelationRecommend`, async () => {
     const res = await getRelationRecommend({
       type: 4,
     })
     return res.data
   })
-    
+
   // 猜你喜欢
   // const recommendList = ref<ProjectDrawPageRespVO[]>([]) // 猜你喜欢数据
   // const getRelationRecommendList = () => {

From b7d6b37e8795910ec81b6a0b1656133d9af3cc97 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Sat, 6 Sep 2025 18:39:16 +0800
Subject: [PATCH 04/11] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=E5=92=8C=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/upnew/index.ts                  |  4 +-
 api/upnew/types.ts                  |  4 +-
 pages/upnew/components/DrawForm.vue | 77 +++++++++++++++-------------
 pages/upnew/components/DrawType.vue | 79 ++++++++++++-----------------
 pages/upnew/components/Preview.vue  | 20 ++++----
 pages/upnew/index.vue               | 10 ++--
 6 files changed, 92 insertions(+), 102 deletions(-)

diff --git a/api/upnew/index.ts b/api/upnew/index.ts
index d339297..fa155ab 100644
--- a/api/upnew/index.ts
+++ b/api/upnew/index.ts
@@ -16,7 +16,7 @@ export const create = (params: TcreateReq) => {
  * @returns
  */
 export const parent = (params: { type: string | number; parentId: number | string }) => {
-  return useFetchRequest.get<IResponse<parentRes[]>>('/prod-api/app-api/business/app/dict/parent', { query: params })
+  return useDollarFetchRequest.get<IResponse<parentRes[]>>('/prod-api/app-api/business/app/dict/parent', { query: params })
 }
 /**
  * 获取具有上下级的字典信息
@@ -32,7 +32,7 @@ export const parentV2 = (params: { type: string | number; parentId: number | str
  * @returns
  */
 export const indexTabs = () => {
-  return useFetchRequest.get<IResponse<parentRes[]>>('/prod-api/app-api/business/project/index/index-tab3')
+  return useDollarFetchRequest.get<IResponse<parentRes[]>>('/prod-api/app-api/business/project/index/index-tab3')
 }
 /**
  * 模糊查询获取标签内容
diff --git a/api/upnew/types.ts b/api/upnew/types.ts
index 9f077b6..8e60383 100644
--- a/api/upnew/types.ts
+++ b/api/upnew/types.ts
@@ -10,9 +10,9 @@ export interface FileItem {
 
 // 定义整个 JSON 对象的类型
 export interface TcreateReq {
-  activeName: string
+  activeName: string | number
   id: number | string
-  type: any[]
+  type: number
   isDomestic: number | string
   province: string // 省份编码
   city: string // 城市编码
diff --git a/pages/upnew/components/DrawForm.vue b/pages/upnew/components/DrawForm.vue
index c978df5..3cd88de 100644
--- a/pages/upnew/components/DrawForm.vue
+++ b/pages/upnew/components/DrawForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form-item label-width="110px" :prop="`${props.vaildRules}.files`" :rules="{ required: true, message: '请上传图纸', trigger: ['blur', 'change'] }">
+    <!-- <el-form-item label-width="110px" :prop="`${props.vaildRules}.files`" :rules="{ required: true, message: '请上传图纸', trigger: ['blur', 'change'] }">
       <KlUploader
         v-model:file-list="form.files"
         :limit="1000"
@@ -11,33 +11,44 @@
         @preview="handlePreview"
       >
       </KlUploader>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item
       label-width="110px"
       label="标题："
       :prop="`${props.vaildRules}.title`"
-      :rules="{ required: true, message: '请输入标题', trigger: ['blur', 'change'] }"
+      :rules="[
+        { required: true, message: '20-50 字符，结构可用分类关键词+作品名/资源价值版本/使用场景', trigger: ['blur', 'change'] },
+        {
+          validator: (rule: any, value: any, callback: any) => {
+            if (value && value.length < 20) {
+              callback(new Error('20-50 字符，结构可用分类关键词+作品名/资源价值版本/使用场景'))
+            }
+            callback()
+          },
+          trigger: ['blur', 'change'],
+        },
+      ]"
     >
-      <el-input v-model="form.title" placeholder="请输入标题" class="w-361px!" maxlength="128"></el-input>
+      <el-input v-model="form.title" placeholder="请输入标题" minlength="20" maxlength="50"></el-input>
     </el-form-item>
     <el-form-item
       label-width="110px"
-      label="分类："
+      label="专业分类："
       :prop="`${props.vaildRules}.projectType`"
       :rules="{ required: true, message: '请选择分类', trigger: ['blur', 'change'] }"
     >
       <!-- <el-select v-model="form.projectType" placeholder="请选择分类" class="w-361px!" multiple>
         <el-option v-for="(item, index) in projectTypeList" :key="index" :label="item.name" :value="item.id" />
       </el-select> -->
-      <el-cascader v-model="form.projectType" class="w-361px!" :options="projectTypeList" :props="cascaderProps" clearable collapse-tags />
+      <el-cascader v-model="form.projectType" class="w-[100%]!" :options="projectTypeList" :props="cascaderProps" clearable collapse-tags />
     </el-form-item>
     <el-form-item
       label-width="110px"
-      label="软件版本："
+      label="软件分类："
       :prop="`${props.vaildRules}.editions`"
       :rules="{ required: true, message: '请选择软件版本', trigger: ['blur', 'change'] }"
     >
-      <el-select v-model="form.editions" placeholder="请选择软件版本" class="w-361px!">
+      <el-select v-model="form.editions" placeholder="请选择软件版本">
         <el-option v-for="(item, index) in editionsList" :key="index" :label="item.name" :value="item.id" />
       </el-select>
     </el-form-item>
@@ -54,20 +65,11 @@
     </el-form-item>
     <el-form-item
       label-width="110px"
-      label="标签："
+      label="作品标签："
       :prop="`${props.vaildRules}.labels`"
-      :rules="{ required: true, message: '请选择标签', trigger: ['blur', 'change'] }"
+      :rules="{ required: false, message: '请选择标签', trigger: ['blur', 'change'] }"
     >
-      <el-select
-        v-model="form.labels"
-        :remote-method="remoteMethod"
-        :loading="loading"
-        multiple
-        filterable
-        remote
-        placeholder="请输入搜索标签"
-        class="w-361px!"
-      >
+      <el-select v-model="form.labels" :remote-method="remoteMethod" :loading="loading" multiple filterable remote placeholder="请输入搜索标签">
         <el-option v-for="(item, index) in labelsList" :key="index" :label="item" :value="item" />
       </el-select>
     </el-form-item>
@@ -75,11 +77,11 @@
       label-width="110px"
       label="金币："
       :prop="`${props.vaildRules}.points`"
-      :rules="{ required: true, message: '请输入金币', trigger: ['blur', 'change'] }"
+      :rules="{ required: true, message: '金币设置分销为0-15,设置0金币为专属资源可直接获利2-15金币', trigger: ['blur', 'change'] }"
     >
-      <el-input-number v-model="form.points" :controls="false" :precision="0" :min="0" placeholder="请输入金币" class="w-361px! text-left!"></el-input-number>
+      <el-input-number v-model="form.points" :controls="false" :precision="0" :min="0" placeholder="请输入金币" class="w-[100%]! text-left!"></el-input-number>
     </el-form-item>
-    <el-form-item
+    <!-- <el-form-item
       label-width="110px"
       label="图形格式："
       :prop="`${props.vaildRules}.formatType`"
@@ -88,7 +90,7 @@
       <el-checkbox-group v-model="form.formatType">
         <el-checkbox v-for="(item, index) in formatTypeList" :key="index" :label="item" :value="item"></el-checkbox>
       </el-checkbox-group>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item
       label-width="110px"
       label="上传封面："
@@ -103,9 +105,9 @@
         tips="上传图片支持jpg/gif/png格式、第一张为封面图片、每张图片大小不得超过1M"
         @validate="formRef?.validateField(`${props.vaildRules}.coverImages`)"
       >
-        <div class="h-77px w-161px flex items-center justify-center border border-[#cdd0d6] rounded-1px border-dashed bg-[#fafafa]">
+        <div class="h-[77px] w-[161px] flex items-center justify-center border border-[#cdd0d6] rounded-[1px] border-dashed bg-[#fafafa]">
           <el-icon class="text-[#999999]"><Plus /></el-icon>
-          <div class="ml-4px mt-2px text-14px text-[#999999] font-normal">上传图纸</div>
+          <div class="ml-[4px] mt-[2px] text-[14px] text-[#999999] font-normal">上传图纸</div>
         </div>
       </KlUploader>
     </el-form-item>
@@ -123,9 +125,9 @@
         :show-tip="false"
         @validate="formRef?.validateField(`${props.vaildRules}.renderings`)"
       >
-        <div class="h-77px w-161px flex items-center justify-center border border-[#cdd0d6] rounded-1px border-dashed bg-[#fafafa]">
+        <div class="h-[77px] w-[161px] flex items-center justify-center border border-[#cdd0d6] rounded-[1px] border-dashed bg-[#fafafa]">
           <el-icon class="text-[#999999]"><Plus /></el-icon>
-          <div class="ml-4px mt-2px text-14px text-[#999999] font-normal">上传图纸</div>
+          <div class="ml-[4px] mt-[2px] text-[14px] text-[#999999] font-normal">上传图纸</div>
         </div>
       </KlUploader>
     </el-form-item>
@@ -134,15 +136,15 @@
     </el-form-item>
     <el-form-item
       label-width="110px"
-      label="描述："
+      label="作品描述："
       :prop="`${props.vaildRules}.description`"
       :rules="[
-        { required: true, message: '请输入描述', trigger: ['blur', 'change'] },
+        { required: true, message: '简介字数限制60-150 字符，需包含用途、文件介绍、适用场景等', trigger: ['blur', 'change'] },
         {
           validator: (rule, value, callback) => {
             console.log(rule)
-            if (value.length < 70) {
-              callback(new Error('输入内容不能少于 70 字'))
+            if (value.length < 60) {
+              callback(new Error('简介字数限制60-150 字符，需包含用途、文件介绍、适用场景等'))
             } else {
               callback()
             }
@@ -151,7 +153,7 @@
         },
       ]"
     >
-      <el-input v-model="form.description" type="textarea" :rows="6" placeholder="请输入描述" class="w-361px!" minlength="70" show-word-limit></el-input>
+      <el-input v-model="form.description" type="textarea" :rows="6" placeholder="请输入描述" minlength="60" maxlength="150" show-word-limit></el-input>
     </el-form-item>
   </div>
 </template>
@@ -216,7 +218,7 @@
       formatTypeList.value = res.data
     })
   }
-  getFormatTypeList()
+  // getFormatTypeList()
 
   const projectTypeList = ref<any>([])
   /** 获取分类下拉框 */
@@ -225,7 +227,6 @@
       projectTypeList.value = res.data
     })
   }
-  getParent()
 
   /** 版本 */
   const editionsList = ref<any>([])
@@ -237,11 +238,15 @@
       editionsList.value = res.data
     })
   }
-  getEditionsList()
 
   const handlePreview = (val: any) => {
     emit('preview', val)
   }
+
+  onMounted(() => {
+    getEditionsList()
+    getParent()
+  })
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/upnew/components/DrawType.vue b/pages/upnew/components/DrawType.vue
index 5708e72..39ce1a4 100644
--- a/pages/upnew/components/DrawType.vue
+++ b/pages/upnew/components/DrawType.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="box-border border border-[#EEEEEE] rounded-12px border-solid bg-[#FFFFFF] px-33px py-22px pb-10px!">
+  <div class="box-border border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[33px] py-[22px] pb-[10px]!">
     <el-form-item
       label="选择上传资料类型："
       label-width="170px"
@@ -7,37 +7,40 @@
       prop="type"
       :rules="[{ required: true, message: '请选择上传资料类型', trigger: 'change' }]"
     >
-      <el-checkbox-group v-model="form.type" @change="handleTypeChange">
-        <el-checkbox :value="1">图纸</el-checkbox>
-        <el-checkbox :value="3">模型</el-checkbox>
-        <el-checkbox :value="2">文本</el-checkbox>
-      </el-checkbox-group>
+      <el-radio-group v-model="form.type" @change="handleTypeChange(form.type)">
+        <el-radio :value="1">图纸</el-radio>
+        <el-radio :value="3">模型</el-radio>
+        <el-radio :value="2">文本</el-radio>
+      </el-radio-group>
     </el-form-item>
-    <el-form-item
-      label="选择国家："
-      label-width="110px"
-      label-position="left"
-      prop="isDomestic"
-      :rules="[{ required: true, message: '请选择国家', trigger: 'change' }]"
-    >
-      <el-select v-model="form.isDomestic" placeholder="请选择" class="w-200px!" @change="handleCountryChange">
-        <el-option label="国内" :value="1"></el-option>
-        <el-option label="国外" :value="0"></el-option>
-      </el-select>
-    </el-form-item>
-    <div class="flex">
+    <div class="flex gap-[20px]">
       <el-form-item
+        label="选择国家："
+        label-width="110px"
+        label-position="left"
+        prop="isDomestic"
+        :rules="[{ required: true, message: '请选择国家', trigger: 'change' }]"
+      >
+        <el-select v-model="form.isDomestic" placeholder="请选择" class="w-[200px]!" @change="handleCountryChange">
+          <el-option label="国内" :value="1"></el-option>
+          <el-option label="国外" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.isDomestic === 0"
         label="所在地区："
         label-width="110px"
         label-position="left"
         prop="province"
         :rules="[{ required: true, message: '请选择所在地区', trigger: 'change' }]"
       >
-        <el-select v-model="form.province" placeholder="请选择" class="w-200px!" @change="handleProvinceChange">
+        <el-select v-model="form.province" filterable placeholder="请选择" class="w-[200px]!">
           <el-option v-for="(item, index) in provinceList" :key="index" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label-width="10px" label-position="left" prop="city" :rules="[{ required: true, message: '请选择地址', trigger: 'change' }]">
+    </div>
+    <!-- <div class="flex"> -->
+    <!-- <el-form-item label-width="10px" label-position="left" prop="city" :rules="[{ required: true, message: '请选择地址', trigger: 'change' }]">
         <el-select v-model="form.city" placeholder="请选择" class="w-200px!" @change="handleCityChange">
           <el-option v-for="(item, index) in cityList" :key="index" :label="item.name" :value="item.id" />
         </el-select>
@@ -46,8 +49,8 @@
         <el-select v-model="form.county" placeholder="请选择" class="w-200px!">
           <el-option v-for="(item, index) in countyList" :key="index" :label="item.name" :value="item.id" />
         </el-select>
-      </el-form-item>
-    </div>
+      </el-form-item> -->
+    <!-- </div> -->
   </div>
 </template>
 
@@ -63,32 +66,16 @@
 
   // 添加旧值引用
   const oldTypeValue = ref<(number | string)[]>([])
-  const handleTypeChange = (val: any) => {
-    console.log(val, 'val')
-
-    // 新增的项（当前值有但旧值没有的）
-    const added = val.filter((item: number | string) => !oldTypeValue.value.includes(item))
-    // 减少的项（旧值有但当前值没有的）
-    const removed = oldTypeValue.value.filter((item) => !val.includes(item))
-
-    if (added.length) {
-      form.value.draws.push({
+  const handleTypeChange = (val: number) => {
+    form.value.draws = [
+      {
         ...JSON.parse(JSON.stringify(DrawsEnmu)),
-        type: added[0],
-      })
-    } else if (removed.length) {
-      form.value.draws = form.value.draws.filter((item) => item.type !== removed[0])
-    }
-
-    // 更新旧值
-    oldTypeValue.value = [...val]
-    // 更新当前activeName值
-    if (!val?.length) {
-      form.value.activeName = ''
-    }
+        type: val,
+      },
+    ]
 
     nextTick(() => {
-      form.value.activeName = val[val.length - 1]
+      form.value.activeName = val
     })
   }
 
diff --git a/pages/upnew/components/Preview.vue b/pages/upnew/components/Preview.vue
index 6ecfabb..4f53a48 100644
--- a/pages/upnew/components/Preview.vue
+++ b/pages/upnew/components/Preview.vue
@@ -1,20 +1,18 @@
 <template>
   <div class="ml-[23px] box-border min-h-[930px] w-[516px] border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[33px] py-[22px]">
-    <div class="flex items-center">
-      <img src="~/assets/images/preview.png" alt="" srcset="" width="16px" height="19px" /><span class="ml-[7px] text-[18px] text-[#333333] font-normal"
-        >预览</span
-      ></div
-    >
-    <div class="mt-[20px]">
+    <!-- <div class="flex items-center">
+      <img src="~/assets/images/preview.png" alt="" srcset="" width="16px" height="19px" /><span class="ml-[7px] text-[18px] text-[#333333] font-normal">
+        预览
+      </span>
+    </div> -->
+    <!-- <div class="mt-[20px]">
       <el-image :src="previewUrl" class="mb-[16px] max-h-[320px] max-w-[460px] min-h-[200px]" fit="contain"></el-image>
       <span class="text-[16px] text-[#333333] font-normal">{{ previewName || '图纸标题' }}</span></div
-    >
-    <div class="my-[30px] h-[1px] w-[460px] rounded-[1px] bg-[#EEEEEE]"></div>
+    > -->
+    <!-- <div class="my-[30px] h-[1px] w-[460px] rounded-[1px] bg-[#EEEEEE]"></div> -->
     <div class="flex items-center">
       <img src="~/assets/images/tip.png" width="20px" height="20px" />
-      <span class="ml-[7px] text-[18px] text-[#333333] font-normal">
-        上传遇到问题可以咨询
-      </span>
+      <span class="ml-[7px] text-[18px] text-[#333333] font-normal"> 上传遇到问题可以咨询 </span>
     </div>
     <div class="mt-[20px] text-center"><el-image src="https://picsum.photos/290/290?_t" alt="" srcset="" class="h-[290px] w-[290px]" /></div>
     <div class="mt-[30px] text-center text-[16px] text-[#333333] font-normal">
diff --git a/pages/upnew/index.vue b/pages/upnew/index.vue
index 399f5ea..7b32cfe 100644
--- a/pages/upnew/index.vue
+++ b/pages/upnew/index.vue
@@ -36,9 +36,9 @@
   const router = useRouter() // 导入路由实例，用于跳转页面
 
   const form = reactive<TcreateReq>({
-    activeName: '', // 标签
+    activeName: 1, // 标签
     id: '', // 图纸id  id,示例值(24548)
-    type: [], // 图纸类型 类型,示例值(1)
+    type: 1, // 图纸类型 类型,示例值(1)
     isDomestic: '', // 是否是国内: 1是 0否
     province: '', // 省份编码
     city: '', // 城市编码
@@ -121,12 +121,12 @@
   }
 
   // 图纸类型
-  const drawTypeRef = ref()
+  const drawTypeRef = ref<InstanceType<typeof DrawType>>()
   onMounted(() => {
     // 初始化图纸类型
-    drawTypeRef.value.handleTypeChange([1])
+    drawTypeRef.value?.handleTypeChange(1)
     // 初始化图纸类型
-    form.type = [1]
+    form.type = 1
   })
 </script>
 <style lang="scss" scoped>

From d006b3e5af7aabbb19290a78b0e4066dabae1138 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Sat, 6 Sep 2025 18:42:07 +0800
Subject: [PATCH 05/11] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E6=8B=A9=E5=99=A8=E5=AE=BD=E5=BA=A6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/upnew/components/DrawType.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/upnew/components/DrawType.vue b/pages/upnew/components/DrawType.vue
index 39ce1a4..31e8565 100644
--- a/pages/upnew/components/DrawType.vue
+++ b/pages/upnew/components/DrawType.vue
@@ -21,7 +21,7 @@
         prop="isDomestic"
         :rules="[{ required: true, message: '请选择国家', trigger: 'change' }]"
       >
-        <el-select v-model="form.isDomestic" placeholder="请选择" class="w-[200px]!" @change="handleCountryChange">
+        <el-select v-model="form.isDomestic" placeholder="请选择" class="w-[240px]!" @change="handleCountryChange">
           <el-option label="国内" :value="1"></el-option>
           <el-option label="国外" :value="0"></el-option>
         </el-select>
@@ -34,7 +34,7 @@
         prop="province"
         :rules="[{ required: true, message: '请选择所在地区', trigger: 'change' }]"
       >
-        <el-select v-model="form.province" filterable placeholder="请选择" class="w-[200px]!">
+        <el-select v-model="form.province" filterable placeholder="请选择" class="w-[240px]!">
           <el-option v-for="(item, index) in provinceList" :key="index" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>

From 18ebc086451f034099f8dc56a08a8576459b79e7 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Sat, 6 Sep 2025 18:42:55 +0800
Subject: [PATCH 06/11] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B9=E9=A1=B6=E9=83=A8=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/upnew/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/upnew/index.vue b/pages/upnew/index.vue
index 7b32cfe..8a1672b 100644
--- a/pages/upnew/index.vue
+++ b/pages/upnew/index.vue
@@ -13,7 +13,7 @@
               <DrawForm v-if="form.draws[index]" v-model="form.draws[index]" :vaild-rules="'draws.' + index" :form-ref="formRef" @preview="handlePreview" />
             </el-tab-pane>
           </el-tabs>
-          <el-form-item label-width="110px" class="mt-[20px]">
+          <el-form-item label-width="110px">
             <!-- <el-button class="w-121px h-37px!" :loading="loading" @click="handleSubmit">预览</el-button> -->
             <el-button type="primary" class="w-[121px] h-[37px]!" :loading="loading" @click="handleSubmit">发布</el-button>
           </el-form-item>

From 615ac78156ae71c306f5e116cb23736d80bdd242 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Sat, 6 Sep 2025 18:47:00 +0800
Subject: [PATCH 07/11] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=BE=93=E5=85=A5=E6=8F=90=E7=A4=BA=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/upnew/components/DrawForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/upnew/components/DrawForm.vue b/pages/upnew/components/DrawForm.vue
index 3cd88de..c336aed 100644
--- a/pages/upnew/components/DrawForm.vue
+++ b/pages/upnew/components/DrawForm.vue
@@ -29,7 +29,7 @@
         },
       ]"
     >
-      <el-input v-model="form.title" placeholder="请输入标题" minlength="20" maxlength="50"></el-input>
+      <el-input v-model="form.title" placeholder="20-50 字符，结构可用分类关键词+作品名/资源价值版本/使用场景" minlength="20" maxlength="50"></el-input>
     </el-form-item>
     <el-form-item
       label-width="110px"
@@ -79,7 +79,7 @@
       :prop="`${props.vaildRules}.points`"
       :rules="{ required: true, message: '金币设置分销为0-15,设置0金币为专属资源可直接获利2-15金币', trigger: ['blur', 'change'] }"
     >
-      <el-input-number v-model="form.points" :controls="false" :precision="0" :min="0" placeholder="请输入金币" class="w-[100%]! text-left!"></el-input-number>
+      <el-input-number v-model="form.points" :controls="false" :precision="0" :min="0" placeholder="金币设置分销为0-15,设置0金币为专属资源可直接获利2-15金币" class="w-[100%]! text-left!"></el-input-number>
     </el-form-item>
     <!-- <el-form-item
       label-width="110px"
@@ -153,7 +153,7 @@
         },
       ]"
     >
-      <el-input v-model="form.description" type="textarea" :rows="6" placeholder="请输入描述" minlength="60" maxlength="150" show-word-limit></el-input>
+      <el-input v-model="form.description" type="textarea" :rows="6" placeholder="简介字数限制60-150 字符，需包含用途、文件介绍、适用场景等" minlength="60" maxlength="150" show-word-limit></el-input>
     </el-form-item>
   </div>
 </template>

From cd58054cfacd496ac6ec9069f930685d5f2814a2 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Sat, 6 Sep 2025 21:05:12 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=A2?=
 =?UTF-8?q?=E6=9C=8D=E5=BE=AE=E4=BF=A1=E5=8A=9F=E8=83=BD=E5=92=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/upnew/index.ts                 |  7 +++++++
 pages/upnew/components/Preview.vue | 19 +++++++++++++------
 pages/upnew/index.vue              | 15 +++++++++------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/api/upnew/index.ts b/api/upnew/index.ts
index fa155ab..dfc138a 100644
--- a/api/upnew/index.ts
+++ b/api/upnew/index.ts
@@ -73,3 +73,10 @@ export const recommendTop = (params: recommendTopReq) => {
 export const homeLabel = () => {
   return useFetchRequest.get<IResponse<ProjectDictNodeVO[]>>('/prod-api/app-api/business/app/dict/index-tab')
 }
+
+/**
+ * 获取客服微信
+ */
+export const getWechat = () => {
+  return useDollarFetchRequest.get<IResponse<string>>('/prod-api/app-api/system/index-setting/kefu-wechat')
+}
diff --git a/pages/upnew/components/Preview.vue b/pages/upnew/components/Preview.vue
index 4f53a48..277bb51 100644
--- a/pages/upnew/components/Preview.vue
+++ b/pages/upnew/components/Preview.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="ml-[23px] box-border min-h-[930px] w-[516px] border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[33px] py-[22px]">
+  <div class="ml-[23px] box-border min-h-[930px] w-[400px] border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[33px] py-[22px]">
     <!-- <div class="flex items-center">
       <img src="~/assets/images/preview.png" alt="" srcset="" width="16px" height="19px" /><span class="ml-[7px] text-[18px] text-[#333333] font-normal">
         预览
@@ -11,22 +11,29 @@
     > -->
     <!-- <div class="my-[30px] h-[1px] w-[460px] rounded-[1px] bg-[#EEEEEE]"></div> -->
     <div class="flex items-center">
-      <img src="~/assets/images/tip.png" width="20px" height="20px" />
-      <span class="ml-[7px] text-[18px] text-[#333333] font-normal"> 上传遇到问题可以咨询 </span>
+      <!-- <img src="~/assets/images/tip.png" width="20px" height="20px" /> -->
+      <span class="ml-[7px] text-[16px] text-[#666] font-normal">tips：遇到上传问题可以咨询 </span>
     </div>
-    <div class="mt-[20px] text-center"><el-image src="https://picsum.photos/290/290?_t" alt="" srcset="" class="h-[290px] w-[290px]" /></div>
-    <div class="mt-[30px] text-center text-[16px] text-[#333333] font-normal">
+    <div class="mt-[20px] text-center">
+      <qrcode-vue :value="wechatData" :size="200" level="H" class="mt-[10px]" />
+      <!-- <el-image src="https://picsum.photos/290/290?_t" alt="" srcset="" class="h-[290px] w-[290px]" /> -->
+    </div>
+    <!-- <div class="mt-[30px] text-center text-[16px] text-[#333333] font-normal">
       <div>TEL：13315189735 </div>
       <div class="mt-[4px]">在线时间：8:30-18:00</div>
-    </div>
+    </div> -->
   </div>
 </template>
 
 <script setup lang="ts">
+  import QrcodeVue from 'qrcode.vue'
+  import { getWechat } from '~/api/upnew/index'
   const previewUrl = defineModel<string>('previewUrl', {
     required: true,
   })
   const previewName = defineModel<string>('previewName', {
     required: true,
   })
+
+  const { data: wechatData } = await getWechat()
 </script>
diff --git a/pages/upnew/index.vue b/pages/upnew/index.vue
index 8a1672b..783e478 100644
--- a/pages/upnew/index.vue
+++ b/pages/upnew/index.vue
@@ -3,7 +3,7 @@
   <KlNavTab />
   <!-- 发布图纸 -->
   <div class="ma-auto mt-[30px] w-[1440px] flex">
-    <div class="w-[900px]">
+    <div class="w-[1016px]">
       <el-form ref="formRef" :model="form" label-width="120px">
         <!-- 图纸分类 -->
         <DrawType ref="drawTypeRef" v-model="form" />
@@ -93,11 +93,14 @@
             if (code === 0) {
               // 弹窗提示
               ElMessage.success('操作成功')
-              router.back()
-              // 关闭弹窗
-              // setTimeout(() => {
-              //   window.close()
-              // }, 300)
+              // 跳转页面
+              if (form.type === 1) {
+                navigateTo('/drawe')
+              } else if (form.type === 2) {
+                navigateTo('/text')
+              } else if (form.type === 3) {
+                navigateTo('/model')
+              }
             }
           })
           .finally(() => {

From 7c821667816230aa490cb134fc67b2b40863fc61 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Sat, 6 Sep 2025 21:11:55 +0800
Subject: [PATCH 09/11] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E7=BB=84=E4=BB=B6=E9=AB=98=E5=BA=A6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/upnew/components/Preview.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/upnew/components/Preview.vue b/pages/upnew/components/Preview.vue
index 277bb51..af02bf5 100644
--- a/pages/upnew/components/Preview.vue
+++ b/pages/upnew/components/Preview.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="ml-[23px] box-border min-h-[930px] w-[400px] border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[33px] py-[22px]">
+  <div class="ml-[23px] box-border h-[330px] w-[400px] border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[33px] py-[22px]">
     <!-- <div class="flex items-center">
       <img src="~/assets/images/preview.png" alt="" srcset="" width="16px" height="19px" /><span class="ml-[7px] text-[18px] text-[#333333] font-normal">
         预览

From 9f5942546dd4c21f81e1a9eeaed1c58418de69f8 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Sun, 7 Sep 2025 15:26:01 +0800
Subject: [PATCH 10/11] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=B0=81=E8=A3=85=E5=92=8C=E7=94=A8=E6=88=B7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composables/useDollarFetchRequest.ts | 95 +++++++++++-----------------
 1 file changed, 37 insertions(+), 58 deletions(-)

diff --git a/composables/useDollarFetchRequest.ts b/composables/useDollarFetchRequest.ts
index 939b80a..332b289 100644
--- a/composables/useDollarFetchRequest.ts
+++ b/composables/useDollarFetchRequest.ts
@@ -1,77 +1,56 @@
-import { isArray } from "~/utils/utils";
+import { isArray } from '~/utils/utils'
+import useUserStore from '~/stores/user'
 // import refreshToken from "~/utils/RefreshToken";
 
-type FetchType = typeof $fetch;
-export type FetchOptions = Parameters<FetchType>[1];
+type FetchType = typeof $fetch
+export type FetchOptions = Parameters<FetchType>[1]
 
-const useClientRequest = async <T = unknown>(
-  url: string,
-  opts?: FetchOptions
-) => {
-  const token = useCookie<string | undefined>("token");
-  const runtimeConfig = useRuntimeConfig();
+const useClientRequest = async <T = unknown>(url: string, opts?: FetchOptions) => {
+  const token = useCookie<string | undefined>('token')
+  const runtimeConfig = useRuntimeConfig()
+  const userStore = useUserStore()
 
   const defaultOptions: FetchOptions = {
     baseURL: runtimeConfig.public.apiBase,
     onRequest({ options }) {
-      options.headers = options.headers || 'application/json';
-      if (token.value) {
-        options.headers.set("Authorization", `Bearer ${token.value}`);
+      options.headers = options.headers || 'application/json'
+      if (token.value || userStore.token) {
+        options.headers.set('Authorization', `Bearer ${token.value || userStore.token}`)
       }
     },
     onResponse({ response }) {
       if (+response.status === 200 && +response._data.code !== 0) {
-        ElMessage.error(response._data.msg);
+        ElMessage.error(response._data.msg)
       }
     },
     onResponseError({ response }) {
-      ElMessage.error(
-        isArray(response._data.data.msg)
-          ? response._data.data.msg[0]
-          : response._data.data.msg
-      );
+      ElMessage.error(isArray(response._data.data.msg) ? response._data.data.msg[0] : response._data.data.msg)
     },
-  };
-
-   // 明确转换返回类型
-  const response = await $fetch(url, { ...defaultOptions, ...opts });
-  return response as unknown as T;
-};
-
-  // GET请求
-  export const get = <T = unknown>(
-    endpoint: string, 
-    config?: Omit<FetchOptions, 'method'>
-  ): Promise<T> => {
-    return useClientRequest<T>(endpoint, { ...config, method: 'GET' })
-
   }
 
-    // POST请求
-  export const post = <T = unknown>(
-    endpoint: string, 
-    body?: any, 
-    config?: Omit<FetchOptions, 'method' | 'body'>
-  ): Promise<T> => {
-    return useClientRequest<T>(endpoint, { ...config, method: 'POST', body })
-  }
+  // 明确转换返回类型
+  const response = await $fetch(url, { ...defaultOptions, ...opts })
+  return response as unknown as T
+}
 
-  
-  // DELETE请求
-  export const del = <T = unknown>(
-    endpoint: string, 
-    config?: Omit<FetchOptions, 'method'>
-  ): Promise<T> => {
-    return useClientRequest<T>(endpoint, { ...config, method: 'DELETE' })
-  }
+// GET请求
+export const get = <T = unknown>(endpoint: string, config?: Omit<FetchOptions, 'method'>): Promise<T> => {
+  return useClientRequest<T>(endpoint, { ...config, method: 'GET' })
+}
 
-    // PUT请求
-  export const put = <T = unknown>(
-    endpoint: string, 
-    body?: any, 
-    config?: Omit<FetchOptions, 'method' | 'body'>
-  ): Promise<T> => {
-    console.log({ ...config, method: 'PUT', body });
-    
-    return useClientRequest<T>(endpoint, { ...config, method: 'PUT', body })
-  }
+// POST请求
+export const post = <T = unknown>(endpoint: string, body?: any, config?: Omit<FetchOptions, 'method' | 'body'>): Promise<T> => {
+  return useClientRequest<T>(endpoint, { ...config, method: 'POST', body })
+}
+
+// DELETE请求
+export const del = <T = unknown>(endpoint: string, config?: Omit<FetchOptions, 'method'>): Promise<T> => {
+  return useClientRequest<T>(endpoint, { ...config, method: 'DELETE' })
+}
+
+// PUT请求
+export const put = <T = unknown>(endpoint: string, body?: any, config?: Omit<FetchOptions, 'method' | 'body'>): Promise<T> => {
+  console.log({ ...config, method: 'PUT', body })
+
+  return useClientRequest<T>(endpoint, { ...config, method: 'PUT', body })
+}

From 7a33f67aed66a43b4d1f11c137c60c041e0b9532 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Sun, 7 Sep 2025 22:30:20 +0800
Subject: [PATCH 11/11] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/home/index.ts                     |  7 +++++++
 pages/home/components/MainContent.vue | 23 +++++++++--------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/api/home/index.ts b/api/home/index.ts
index 87b9b56..989faea 100644
--- a/api/home/index.ts
+++ b/api/home/index.ts
@@ -103,4 +103,11 @@ export const getTDK = () => {
  */
 export const getTDKList = () => {
   return useFetchRequest.get<IResponse<TdkSettingsDO[]>>('/prod-api/app-api/business/tdk-settings/list-menu', {})
+}
+
+/**
+ * 通知列表
+ */
+export const getNoticeList = () => {
+  return useDollarFetchRequest.get<IResponse<any>>('/prod-api/app-api/system/index-setting/notice-list', {})
 }
\ No newline at end of file
diff --git a/pages/home/components/MainContent.vue b/pages/home/components/MainContent.vue
index b99834e..a8efe0d 100644
--- a/pages/home/components/MainContent.vue
+++ b/pages/home/components/MainContent.vue
@@ -2,27 +2,19 @@
 <template>
   <div class="main-content">
     <div class="flex">
-      <div class="h-424px w-957px">
+      <div class="h-[424px] w-[957px]">
         <el-carousel height="424px" indicator-position="none">
           <el-carousel-item v-for="(item, index) in bannerList" :key="index">
-            <el-image
-              :src="item.content"
-              class="w-100%"
-              :class="{ 'cursor-pointer': item.url }"
-              fit="cover"
-              @click="handleClick(item.url)"
-            />
+            <el-image :src="item.content" class="w-[100%]" :class="{ 'cursor-pointer': item.url }" fit="cover" @click="handleClick(item.url)" />
           </el-carousel-item>
         </el-carousel>
       </div>
       <LoginForm />
     </div>
-    <div
-      class="box-border h-56px w-1219px flex items-center border border-[#EEEEEE] border-solid border-t-none bg-[#FFFFFF] pl-10px line-height-46px"
-    >
-      <img src="~/assets/images/voice.png" alt="" srcset="" class="mr-10px h-15px w-16px" />
+    <div class="box-border h-[56px] w-[1219px] flex items-center border border-[#EEEEEE] border-solid border-t-none bg-[#FFFFFF] pl-[10px] line-height-[46px]">
+      <img src="~/assets/images/voice.png" alt="" srcset="" class="mr-[10px] h-[15px] w-[16px]" />
       <Vue3Marquee :duration="10" direction="normal" pause-on-hover>
-        · 经典来袭，SolidWorks装配经典案例之气动发动机
+        <template v-for="(item, index) in noticeList" :key="index"> {{ item }} </template>
       </Vue3Marquee>
     </div>
   </div>
@@ -33,7 +25,7 @@
   import LoginForm from './LoginForm.vue'
   import { Vue3Marquee } from 'vue3-marquee'
 
-  import { getSettingPage } from '~/api/home/index'
+  import { getSettingPage, getNoticeList } from '~/api/home/index'
 
   const pageReq = reactive({
     type: 1,
@@ -50,6 +42,9 @@
       navigateTo(url)
     }
   }
+
+  const { data: noticeList } = await getNoticeList()
+  console.log(noticeList)
 </script>
 
 <style scoped lang="scss">