浏览代码

refactor: 整理代码,清除无用代码v1.1

chenpeng 1 月之前
父节点
当前提交
7eee29d733
共有 7 个文件被更改,包括 49 次插入130 次删除
  1. 15 14
      utils/array.ts
  2. 1 1
      utils/getType.ts
  3. 7 5
      utils/object.ts
  4. 10 95
      utils/sitemap.config.ts
  5. 1 1
      utils/string.ts
  6. 12 11
      utils/time.ts
  7. 3 3
      utils/useColor.ts

+ 15 - 14
utils/array.ts

@@ -9,10 +9,10 @@
  * @author 李畅
  * @email dotb116393@163.com
  */
-export const arrSort = <T>(arr: Array<T>, valueName: string, flag: boolean): Array<T> | boolean => {
-  if (flag === undefined) {
+export function arrSort<T>(arr: Array<T>, valueName: string, flag: boolean): Array<T> | boolean {
+  if (flag === undefined)
     flag = true
-  }
+
   // 判断是否是数组
   if (isArray(arr)) {
     // 判断数组长度是否为0
@@ -21,23 +21,24 @@ export const arrSort = <T>(arr: Array<T>, valueName: string, flag: boolean): Arr
       newArr = JSON.parse(JSON.stringify(arr)) as Array<T>
       // 对属性排序
       if (valueName) {
-        if (flag) {
+        if (flag)
           newArr.sort((a: any, b: any) => Date.parse(a[valueName]) - Date.parse(b[valueName]))
-        } else {
+        else
           newArr.sort((a: any, b: any) => Date.parse(b[valueName]) - Date.parse(a[valueName]))
-        }
-      } else {
-        if (flag) {
+      }
+      else {
+        if (flag)
           newArr.sort((a: any, b: any) => a - b)
-        } else {
+        else
           newArr.sort((a: any, b: any) => b - a)
-        }
       }
       return newArr
-    } else {
+    }
+    else {
       return false
     }
-  } else {
+  }
+  else {
     return false
   }
 }
@@ -47,6 +48,6 @@ export const arrSort = <T>(arr: Array<T>, valueName: string, flag: boolean): Arr
  * @param target 目标
  * @returns true||false
  */
-export const isArray = (target: unknown): boolean => {
-  return target instanceof Array
+export function isArray(target: unknown): boolean {
+  return Array.isArray(target)
 }

+ 1 - 1
utils/getType.ts

@@ -4,6 +4,6 @@
  * @returns 变量类型
  * @example getType({}) //object
  */
-export const getType = (variable: unknown): string => {
+export function getType(variable: unknown): string {
   return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase()
 }

+ 7 - 5
utils/object.ts

@@ -8,14 +8,16 @@ export function objectCopy<T>(oldObj: T): T {
  * 判断一个对象是否为空对象
  * @param {obejct} obj 目标对象
  */
-export const isEmptyObj = (obj: object) => JSON.stringify(obj) === "{}"
+export const isEmptyObj = (obj: object) => JSON.stringify(obj) === '{}'
 export function getParentsById(list: any, key: string): any {
   for (const i in list) {
-    if (list[i].key === key) return [list[i]]
+    if (list[i].key === key)
+      return [list[i]]
 
     if (list[i].children) {
       const node = getParentsById(list[i].children, key)
-      if (node !== undefined) return node.concat(list[i])
+      if (node !== undefined)
+        return node.concat(list[i])
     }
   }
   return []
@@ -26,7 +28,7 @@ export function getParentsById(list: any, key: string): any {
  * 判断一个对象是否为空对象
  */
 export function updateURLParameter(key, value) {
-  var url = new URL(window.location.href)
+  const url = new URL(window.location.href)
   url.searchParams.set(key, value)
-  history.pushState({}, "", url)
+  history.pushState({}, '', url)
 }

+ 10 - 95
utils/sitemap.config.ts

@@ -14,46 +14,6 @@ export const sitemapConfig = {
       changefreq: 'daily',
       priority: 1,
     },
-    {
-      loc: '/blog',
-      changefreq: 'daily',
-      priority: 0.8,
-    },
-    {
-      loc: '/register',
-      changefreq: 'daily',
-      priority: 0.8,
-    },
-    {
-      loc: '/collections',
-      changefreq: 'daily',
-      priority: 0.8,
-    },
-    {
-      loc: '/about',
-      changefreq: 'daily',
-      priority: 0.8,
-    },
-    {
-      loc: '/service',
-      changefreq: 'daily',
-      priority: 0.8,
-    },
-    {
-      loc: '/policy',
-      changefreq: 'daily',
-      priority: 0.8,
-    },
-    {
-      loc: '/suppliers/all-brands',
-      changefreq: 'daily',
-      priority: 0.8,
-    },
-    {
-      loc: '/contact',
-      changefreq: 'daily',
-      priority: 0.6,
-    },
   ],
 
   // 动态路由生成函数
@@ -61,61 +21,16 @@ export const sitemapConfig = {
     const routes: any[] = []
     try {
       // 获取品牌列表
-      const { data: brandData }: any = await axios.get(`${BASE_URL}/client/brand/list/default`, { params: { pageSize: 10000, pageNo: 1 } })
-      if (brandData.code === 200) {
-        brandData.result.records.forEach((brand: any) => {
-          routes.push({
-            loc: `${BASE_URL}/brand/${brand.id}`,
-            changefreq: 'weekly',
-            priority: 0.7,
-          })
-        })
-      }
-      // 获取专题列表
-      const { data: featuredData }: any = await axios.get(`${BASE_URL}/client/topic/list`, { params: { pageSize: 10000, pageNo: 1 } })
-      if (featuredData.code === 200) {
-        featuredData.result.records.forEach((item: any) => {
-          routes.push({
-            loc: `${BASE_URL}/collections/${item.title}`,
-            changefreq: 'weekly',
-            priority: 0.7,
-          })
-        })
-      }
-      // 获取分类列表
-      const { data: categoryData }: any = await axios.get(`${BASE_URL}/client/category/merchandise`, { params: { all: false, pageSize: 10000, pageNo: 1 } })
-      if (categoryData.code === 200) {
-        categoryData.result.forEach((item: any) => {
-          routes.push({
-            loc: `${BASE_URL}/categories/${item.key}`,
-            changefreq: 'weekly',
-            priority: 0.7,
-          })
-        })
-      }
-      // 获取博客列表
-      const { data: blogData }: any = await axios.get(`${BASE_URL}/client/content/list`, { params: { type: 1, pageSize: 10000, pageNo: 1 } })
-      if (blogData.code === 200) {
-        blogData.result.records.forEach((item: any) => {
-          routes.push({
-            loc: `${BASE_URL}/blog/${item.contentTitle}`,
-            changefreq: 'weekly',
-            priority: 0.7,
-          })
-        })
-      }
-
-      // 获取商品列表
-      const { data: productData }: any = await axios.post(`${BASE_URL}/client/merchandise/list/default`, {}, { params: { pageSize: 10000, pageNo: 1 } })
-      if (productData.code === 200) {
-        productData.result.records.forEach((item: any) => {
-          routes.push({
-            loc: `${BASE_URL}/product/${item.id}`,
-            changefreq: 'weekly',
-            priority: 0.7,
-          })
-        })
-      }
+      // const { data: brandData }: any = await axios.get(`${BASE_URL}/client/brand/list/default`, { params: { pageSize: 10000, pageNo: 1 } })
+      // if (brandData.code === 200) {
+      //   brandData.result.records.forEach((brand: any) => {
+      //     routes.push({
+      //       loc: `${BASE_URL}/brand/${brand.id}`,
+      //       changefreq: 'weekly',
+      //       priority: 0.7,
+      //     })
+      //   })
+      // }
     }
     catch (error) {
       console.error('Error fetching brands:', error)

+ 1 - 1
utils/string.ts

@@ -3,6 +3,6 @@
  * @param {*} targetString
  * @returns true||false
  */
-export const isString = (targetString: unknown): boolean => {
+export function isString(targetString: unknown): boolean {
   return typeof targetString === 'string'
 }

+ 12 - 11
utils/time.ts

@@ -3,14 +3,14 @@
  * @param timeStamp 秒数
  * @returns 时分秒的格式
  */
-export const hourFormat = (timeStamp: number): string => {
-  let hours = parseInt((timeStamp / 60 / 60).toString()).toString()
-  let minute = parseInt(((timeStamp - Number(hours) * 60 * 60) / 60).toString()).toString()
+export function hourFormat(timeStamp: number): string {
+  let hours = Number.parseInt((timeStamp / 60 / 60).toString()).toString()
+  let minute = Number.parseInt(((timeStamp - Number(hours) * 60 * 60) / 60).toString()).toString()
   let second = (timeStamp - Number(hours) * 60 * 60 - Number(minute) * 60).toString()
-  hours = Number(hours) < 10 ? '0' + hours : hours
-  minute = Number(minute) < 10 ? '0' + minute : minute
-  second = Number(second) < 10 ? '0' + second : second
-  return hours + ':' + minute + ':' + second
+  hours = Number(hours) < 10 ? `0${hours}` : hours
+  minute = Number(minute) < 10 ? `0${minute}` : minute
+  second = Number(second) < 10 ? `0${second}` : second
+  return `${hours}:${minute}:${second}`
 }
 
 /**
@@ -19,9 +19,9 @@ export const hourFormat = (timeStamp: number): string => {
  * @example
  * dayOfYear(new Date('2023-2-1')) --> 32
  */
-export const dayOfYear = (date: Date) => {
+export function dayOfYear(date: Date) {
   return Math.floor(
-    (date.getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 1000 / 60 / 60 / 24
+    (date.getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 1000 / 60 / 60 / 24,
   )
 }
 
@@ -31,5 +31,6 @@ export const dayOfYear = (date: Date) => {
  * @param {Date} date2 日期对象2
  * @returns 相差的天数
  */
-export const dayDif = (date1: Date, date2: Date) =>
-  Math.ceil((date1.getTime() - date2.getTime()) / 86400000)
+export function dayDif(date1: Date, date2: Date) {
+  return Math.ceil((date1.getTime() - date2.getTime()) / 86400000)
+}

+ 3 - 3
utils/useColor.ts

@@ -1,7 +1,7 @@
 /**
  * @description 随机生成16进制颜色
- * @return {String}
+ * @return {string}
  */
-export const useColor = (): string => {
-  return '#' + ('00000' + ((Math.random() * 0x1000000) << 0).toString(16)).slice(-6)
+export function useColor(): string {
+  return `#${(`00000${((Math.random() * 0x1000000) << 0).toString(16)}`).slice(-6)}`
 }