fix

fix: debug
2024-05-27 17:41:51 +08:00 · 2024-05-27 12:04:16 +08:00 · 2024-05-14 15:20:18 +08:00 · 2024-05-14 15:13:56 +08:00 · 2024-05-14 10:52:13 +08:00
14 changed files with 108 additions and 360 deletions
@@ -1,12 +1,12 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'development'
 # 网站名称
-VITE_APP_TITLE = '工具坊'
-# 网站域名
-VITE_APP_WEBSITE = 'xxx.xxx.com'
+VITE_APP_TITLE = 'Tools-Web'
+# 简短描述
+VITE_APP_DESC = '一个轻量的工具集合站'
 # base api
 VITE_APP_BASE_API = '/v1'
-# 服务端地址: https://xxx.xxx.com
+# 服务端地址: https://xxx.xxx.com; 使用mock时不需要填写
 VITE_SERVE = ''
 # 自定义启动host
 VITE_HOST = '127.0.0.1'
@@ -27,7 +27,7 @@
      })();
    </script>
  </head>
-  <body style="background-color: var(--base-gray)">
+  <body class="bg-[--base-gray]">
    <!--[if lt IE 9]>
    <div class="notice chromeframe">您的浏览器版本<strong>很旧很旧</strong>，为了正常地访问网站，请升级您的浏览器</div>
    <![endif]-->
@@ -1,307 +1,16 @@
 //获取tools
 function getTools() {
-  return [
-    {
-      id: 1,
-      title: '时间戳转换',
-      logo: '/images/logo/Time.png',
-      desc: '在线时间戳转换工具以及获取当前时间戳',
-      url: '/timetran',
-      cateId: 2,
-      cate: '开发运维',
-    },
-    {
-      id: 1,
-      title: 'MD5在线加密',
-      logo: '/images/logo/md5.png',
-      desc: 'MD5在线加密,长度包含32位、16位',
-      url: '/MD5',
-      cateId: 2,
-      cate: '开发运维',
-    },
-    {
-      id: 1,
-      title: 'Json在线转换',
-      logo: '/images/logo/json.png',
-      desc: '在线编辑json, 语法检查',
-      url: '/json',
-      cateId: 2,
-      cate: '开发运维',
-    },
-    {
-      id: 1,
-      title: '正则测试工具',
-      logo: '/images/logo/reg.png',
-      desc: '正则表达式测试工具, 常用正则表达式',
-      url: '/reg',
-      cateId: 2,
-      cate: '开发运维',
-    },
-    {
-      id: 1,
-      title: 'Unicode转中文',
-      logo: '/images/logo/union.png',
-      desc: 'Unicode和中文的相互转换',
-      url: '/unicode',
-      cateId: 2,
-      cate: '开发运维',
-    },
-    {
-      id: 1,
-      title: '字数统计',
-      logo: '/images/logo/wordCount.png',
-      desc: '在线统计字符串的字数、段落、标点符号数量',
-      url: '/wordCount',
-      cateId: 3,
-      cate: '文本处理',
-    },
-    {
-      id: 1,
-      title: 'IP查询',
-      logo: '/images/logo/IP.png',
-      desc: '在线查询ip地址、ip归属地',
-      url: '/ip',
-      cateId: 6,
-      cate: '查询相关',
-    },
-    {
-      id: 1,
-      title: '常用进制转换',
-      logo: '/images/logo/scaletran.png',
-      desc: '在线进制转换工具,可在2到64进制之间相互转换',
-      url: '/scaletran',
-      cateId: 4,
-      cate: '教育学术',
-    },
-    {
-      id: 1,
-      title: '在线图片处理',
-      logo: '/images/logo/img.png',
-      desc: '在线图片裁剪，标注，滤镜，画等操作',
-      url: '/signimage',
-      cateId: 5,
-      cate: '图片处理',
-    },
-    {
-      id: 1,
-      title: '随机密码生成',
-      logo: '/images/logo/keywords.png',
-      desc: '密码生成器、随机字符串生成,批量生成',
-      url: '/random_password',
-      cateId: 2,
-      cate: '开发运维',
-    },
-    {
-      id: 1,
-      title: 'URL编码/解码',
-      logo: '/images/logo/url.png',
-      desc: 'URL在线编码解码工具（UrlEncode编码 和 UrlDecode解码）',
-      url: '/urlencode',
-      cateId: 2,
-      cate: '开发运维',
-    },
-    {
-      id: 1,
-      title: 'UUID生成器',
-      logo: '/images/logo/uuid.png',
-      desc: '批量生成UUID',
-      url: '/uuid',
-      cateId: 2,
-      cate: '开发运维',
-    },
-    {
-      id: 1,
-      title: '手持弹幕',
-      logo: '/images/logo/dm.png',
-      desc: '手持滚动弹幕',
-      url: '/barrage',
-      cateId: 7,
-      cate: '其他',
-    },
-    {
-      id: 1,
-      title: 'ASCII码表',
-      logo: '/images/logo/ascii.png',
-      desc: 'ASCII码表,控制代码、标准ASCII字符和非标准ASCII字符对照表',
-      url: '/ascii',
-      cateId: 4,
-      cate: '教育学术'
-    },
-    {
-      id: 1,
-      title: '单位换算',
-      logo: '/images/logo/unit.png',
-      desc: '在线重量、长度、面积、时间、角度、速度、温度、压力、热量、功率等换算',
-      url: '/unit',
-      cateId: 4,
-      cate: '教育学术'
-    },
-    {
-      id: 1,
-      title: '色板',
-      logo: '/images/logo/palettes.png',
-      desc: '包含纯色、渐变与阶梯色和常用色彩组合',
-      url: '/palettes',
-      cateId: 7,
-      cate: '其他工具'
-    },
-    {
-      id: 1,
-      title: '二维码生成',
-      logo: '/images/logo/qrcode.png',
-      desc: '在线生成带logo、透明、艺术的二维码',
-      url: '/qrcode',
-      cateId: 5,
-      cate: '图片处理'
-    },
-    {
-      id: 1,
-      title: '帮我决定',
-      logo: '/images/logo/choose.png',
-      desc: '选择困难，难以决定，今天吃什么，现在做什么，自定义选项都给你安排的明明白白',
-      url: '/decision',
-      cateId: 9,
-      cate: '选择随机'
-    },
-    {
-      id: 1,
-      title: '摩斯电码',
-      logo: '/images/logo/medium.png',
-      desc: '支持中文的摩斯电码编码解码',
-      url: '/morse',
-      cateId: 4,
-      cate: '教育学术'
-    },
-    {
-      id: 1,
-      title: '生成随机数',
-      logo: '/images/logo/random.png',
-      desc: '可定制范围内进行随机数字，可用于抽奖、点名等用途',
-      url: '/random',
-      cateId: 9,
-      cate: '选择随机'
-    },
-    {
-      id: 1,
-      title: '数字转金额大写',
-      logo: '/images/logo/numberToChinese.png',
-      desc: '在线数字一键转换成人民币大写，中文大写转换数字',
-      url: '/numberToChinese',
-      cateId: 7,
-      cate: '其他工具'
-    },
-    {
-      id: 1,
-      title: '文本对比',
-      logo: '/images/logo/diff.png',
-      desc: '文本差异比对支持中文、英文、代码比对',
-      url: '/diff',
-      cateId: 3,
-      cate: '文本处理'
-    },
-    {
-      id: 1,
-      title: 'markdown编辑器',
-      logo: '/images/logo/file-markdown-fill.png',
-      desc: '在线创建或编辑markdown, 实时预览，导出markdown',
-      url: '/markdown',
-      cateId: 3,
-      cate: '文本处理'
-    },
-    {
-      id: 1,
-      title: '文本转图片',
-      logo: '/images/logo/text_to_img.png',
-      desc: '把文本转换成图片，生成长图，具有超多个性文字排版',
-      url: '/textToImg',
-      cateId: 5,
-      cate: '图片处理'
-    },
-    {
-      id: 1,
-      title: '网站favicon获取',
-      logo: '/images/logo/IP.png',
-      desc: '获取网站logo、icon、favicon、标题、关键词、描述等信息',
-      url: '/webInfo',
-      cateId: 6,
-      cate: '查询相关',
-    },
-    {
-      id: 1,
-      title: '柱状图',
-      logo: '/images/logo/bar.png',
-      desc: '在线制作柱状图，像做表格一样制作可视化图表，支持导出静态或动态图表',
-      url: '/bar',
-      cateId: 8,
-      cate: '数据图表',
-    },
-    {
-      id: 1,
-      title: '折线图',
-      logo: '/images/logo/line.png',
-      desc: '在线制作折线图，像做表格一样制作可视化图表，支持导出静态或动态图表',
-      url: '/line',
-      cateId: 8,
-      cate: '数据图表',
-    },
-    {
-      id: 1,
-      title: '饼图',
-      logo: '/images/logo/pie.png',
-      desc: '在线制作饼图，像做表格一样制作可视化图表，支持导出静态或动态图表',
-      url: '/pie',
-      cateId: 8,
-      cate: '数据图表',
-    },
-    {
-      id: 1,
-      title: '散点图',
-      logo: '/images/logo/scatter.png',
-      desc: '在线制作散点图，像做表格一样制作可视化图表，支持导出静态或动态图表',
-      url: '/scatter',
-      cateId: 8,
-      cate: '数据图表',
-    },
-    {
-      id: 1,
-      title: '抛硬币',
-      logo: '/images/logo/coin.png',
-      desc: '在线抛硬币，选择困难那么交给硬币来帮你选择吧',
-      url: '/coin',
-      cateId: 9,
-      cate: '选择随机',
-    },
-    {
-      id: 1,
-      title: '投骰子',
-      logo: '/images/logo/dice.png',
-      desc: '在线投骰子，可自定义骰子数量，简单好用的骰子工具',
-      url: '/dice',
-      cateId: 9,
-      cate: '选择随机',
-    },
-    {
-      id: 1,
-      title: '文本去重',
-      logo: '/images/logo/textRemoveDuplicate.png',
-      desc: '可以删除或去除文本或字符串中的重复行',
-      url: '/textRemoveDuplicate',
-      cateId: 3,
-      cate: '文本处理',
-    },
-    {
-      id: 1,
-      title: '图片分割',
-      logo: '/images/logo/imgCut.png',
-      desc: '将图片分割成四宫格、九宫格、十六宫格，支持自定义行与列',
-      url: '/imgCut',
-      cateId: 5,
-      cate: '图片处理',
-    },
-  ]
+  let tools = [] as any[]
+  let toolsCate = getToolsCate()
+  for (let item in toolsCate) {
+    for (let _item in toolsCate[item].list) {
+      tools.push(toolsCate[item].list[_item])
+    }
+  }
+  return tools
 }

-//获取tools分类已经对应的工具
+//获取tools分类与对应的工具
 function getToolsCate() {
  return [
    {
@@ -672,7 +381,8 @@ export default [
      if (title != '') {
        list = list.filter(item => {
          let tmpValue = item.title.toLowerCase()
-          return tmpValue.indexOf(title.toLowerCase()) !== -1;
+          let tmpDesc = item.desc.toLowerCase()
+          return tmpValue.indexOf(title.toLowerCase()) !== -1 || tmpDesc.indexOf(title.toLowerCase()) !== -1;
        });
      }
      //分类筛选
@@ -23,7 +23,7 @@ const componentStore = useComponentStore()
      v-model="componentStore.leftComDrawer" 
      direction="ltr"
      >
-      <Left bgColor="#fff"></Left>
+      <Left></Left>
    </el-drawer>

    <!-- right -->
@@ -1,34 +1,28 @@
 <script setup lang="ts">
-// import { ref } from 'vue'
-// import { copy } from '@/utils/string'
-// const info = reactive({
-//   title: "关于本站",
-// })
-const feedBackUrl = import.meta.env.VITE_FEEDBACK_URL
-//copy
-// const copyRes = async (resStr: string) => {
-//   copy(resStr)
-// }
 </script>

 <template>
-  <div class="flex flex-col mt-3 flex-1">
-    <div class="bg-white rounded-md p-5">
-      <br>
-      <p>本项目基于 <el-link class="" href="https://github.com/taoran1401/tools-web" target="_blank" type="primary">tools-web</el-link> 构建</p>
-      <br>
-      <p class=""><span class="bg-gray-200 p-1">ctrl + D</span>收藏本站，以便以后使用</p>
-      <br>
-      <p class="font-bold">联系作者/问题反馈</p>
-      <br>
-      <p>反馈中心：<el-link :href="feedBackUrl">{{ feedBackUrl }}</el-link></p>
-      <br>
-      <p>邮箱：taoran0796@163.com</p>
-      <br>
+  <div class="flex flex-col mt-8 flex-1 items-center bg-white rounded-md p-10">
+    <div class="p-5 w-2/3">
+      <h1 class="text-2xl font-bold">关于 Tools-Web</h1>
+      <p class="mt-6">
+        <el-text><el-link href="https://github.com/taoran1401/tools-web" target="_blank" type="primary">Tools-Web</el-link> 是一款免费开源的轻量工具集合站，包含开发、文本、媒体、图表、生活、查询等实用工具；如果对您有帮助，请将其分享给您的朋友，并且添加到收藏夹中！顺便再点个⭐️吧！</el-text>
+      </p>
+
+      <h1 class="text-2xl font-bold mt-6 mb-6">技术</h1>
+      <p>
+        <el-text>主要基于Vite + Vue + ElementPlus + Typescript + TailwindCss开发，某些工具使用了第三方开源库，您可以在仓库的 <el-link href="https://github.com/taoran1401/tools-web/blob/master/package.json" target="_blank" type="primary">package.json</el-link> 文件中找到完整的列表。</el-text>
+      </p>
+      <h1 class="text-2xl font-bold mt-6 mb-6">发现了 Bug？</h1>
+      <p>
+        <el-text>如果您发现了 Bug，或者某些功能未能按预期工作，请在 GitHub 仓库的 <el-link type="primary" target="_blank" href="https://github.com/taoran1401/tools-web/issues/new" class="">issues</el-link> 中提交错误报告。</el-text>
+      </p>
    </div>
  </div>
 </template>

 <style scoped>
-
+.title{
+  /* rgb(51, 54, 57) */
+}
 </style>
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 const beianNo = ref('粤ICP备19038804号-1')
-const copyright = ref('ranblogs.com')
+const appDesc = ref(import.meta.env.VITE_APP_DESC || '')
 </script>

 <template>
-  <div class="bg-white w-full rounded-2xl z-10 p-5 text-center">
-    Copyright © 2023  · {{ copyright }} &nbsp;&nbsp; <a href="https://xy.ranblogs.com/tools_web.html" target="_blank">隐私权政策</a> &nbsp;&nbsp; <a href="https://beian.miit.gov.cn/" target="_blank">{{ beianNo }}</a> 
+  <div class="w-full rounded-2xl z-10 p-5 text-center">
+    {{ appDesc }}  © 2024 <a href="https://github.com/taoran1401/tools-web" target="_blank" class="text-blue-700">Tools-Web</a> &nbsp;&nbsp; <a href="https://xy.ranblogs.com/tools_web.html" target="_blank">隐私权政策</a> &nbsp;&nbsp; <a href="https://beian.miit.gov.cn/" target="_blank">{{ beianNo }}</a> 
  </div>
 </template>

@@ -16,7 +16,7 @@ const options = ref<ToolsInfo[]>([])
 const loginRef = ref()
 const userPopRef = ref()
 const defAvatar = ref(defaultAvatar)
-const feedBackUrl = import.meta.env.VITE_FEEDBACK_URL
+// const feedBackUrl = import.meta.env.VITE_FEEDBACK_URL
 //store
 const toolsStore = useToolsStore()
 const componentStore = useComponentStore()
@@ -112,7 +112,7 @@ onMounted(() => {
 </script>

 <template>
-  <header class="h-20 w-full flex justify-between pt-2 pb-2 c-xs:h-16 c-xs:border-b-[1px] items-center">
+  <header class="h-24 w-full flex justify-between pt-2 pb-2 c-xs:h-16 c-xs:border-b-[1px] items-center">
    <div class="flex items-center">
      <Transition name="fold" class="hidden c-sm:block c-md:hidden c-xs:block">
        <svg v-if="!componentStore.leftComDrawer" @click="componentStore.setleftComDrawerStatus(true)" t="1702978210636" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7618" width="30" height="30">
@@ -132,8 +132,16 @@ onMounted(() => {
          <path fill="#444" fill-opacity=".9" d="M895.936 256l-768-0.896 0.128-64L896 192l-0.064 64zM179.2 689.152l202.688-152a32 32 0 0 0 0-51.2L179.2 333.952a32 32 0 0 0-51.2 25.6v304a32 32 0 0 0 51.2 25.6z m12.8-89.6v-176l117.312 88L192 599.552zM896 544H480v-64H896v64z m-0.064 288l-768-0.896 0.128-64L896 768l-0.064 64z" p-id="7619"></path>
        </svg>
      </Transition>
-    
-      <div class="md:w-80 c-xs:72">
+      
+      <div class="ml-3 mr-1">
+        <router-link to="/">
+          <svg t="1715590310537" class="icon" viewBox="0 0 1053 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4287" width="25" height="25">
+            <path d="M526.63454 58.067422a21.503527 21.503527 0 0 1-27.501109 0.175539l474.979265 381.50475a31.538506 31.538506 0 1 0 39.496274-49.150919L538.629705 9.004273a41.602742 41.602742 0 0 0-51.988799 0.234052L11.573871 398.671586a31.538506 31.538506 0 1 0 39.993635 48.79984L526.63454 58.067422z" fill="#2c2c2c" p-id="4288"></path><path d="M1013.60897 564.087832L538.629705 182.583083a41.602742 41.602742 0 0 0-51.988799 0.204795L11.573871 572.191883a31.538506 31.538506 0 1 0 39.993635 48.79984l66.763331-54.709653v361.61033A94.644775 94.644775 0 0 0 213.004869 1022.537175H441.732179v-247.275931a15.79851 15.79851 0 0 1 15.739997-15.79851h110.472541c8.68918 0 15.769253 7.080073 15.769253 15.79851v247.275931H812.441281a94.615518 94.615518 0 0 0 94.644775-94.615518V559.465305l66.997383 53.831959a31.538506 31.538506 0 1 0 39.525531-49.209432z m-169.629183 363.804568c0 17.436874-14.101633 31.538506-31.567763 31.538506h-165.591785v-184.198919a78.875522 78.875522 0 0 0-78.875522-78.904778h-110.472541a78.875522 78.875522 0 0 0-78.846265 78.904778v184.198919h-165.591786c-17.46613 0-31.597019-14.130889-31.597019-31.538506V514.527323L512.883986 242.851471l331.095801 265.941578v419.128608z" fill="#2c2c2c" p-id="4289" stroke="black" stroke-width="10"></path>
+          </svg>
+        </router-link>
+      </div>
+
+      <div>
        <!-- <el-input 
          v-model="searchParam.title" 
          placeholder="搜索工具" 
@@ -154,12 +162,13 @@ onMounted(() => {
          placeholder="输入关键词搜索，如文本、json、图片等"
          :remote-method="searchTools"
          :loading="loading"
-          class="ml-3 mr-3 md:w-80 c-xs:w-60"
+          class="ml-3 mr-3 md:w-[45rem] c-xs:w-60"
+          size="large"
        >
          <el-option
            v-for="item in toolsStore.list"
            :key="item.id"
-            :label="item.title"
+            :label="item.title + ' - ' + item.desc"
            :value="item.id"
            @click="optionClick(item.url)"
          >
@@ -170,9 +179,27 @@ onMounted(() => {

    <div class=" w-full md:w-auto flex md:block c-xs:w-auto">
      <ul class="flex mt-4 flex-col md:flex-row md:mt-0 justify-end items-center c-xs:mt-0">
-        <li class="hover:text-blue-500">
-          <el-link :href="feedBackUrl" size="large" target="_blank">建议/问题</el-link>
+        <li class="ml-3">
+          <router-link to="/about">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              content="关于tools-web"
+              placement="bottom"
+            >
+              <svg t="1715594765484" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5578" width="33" height="33"><path d="M511.899716 948.506609c-241.310951 0-437.636339-196.318224-437.636339-437.636339 0-241.323231 196.325387-437.639408 437.636339-437.639408s437.636339 196.316178 437.636339 437.639408C949.536055 752.188384 753.210667 948.506609 511.899716 948.506609zM511.899716 113.944122c-218.866776 0-396.926148 178.064488-396.926148 396.926148 0 218.856543 178.059372 396.926148 396.926148 396.926148 218.868823 0 396.926148-178.069605 396.926148-396.926148C908.825864 292.00861 730.768539 113.944122 511.899716 113.944122zM561.15656 335.324138c-29.853935 0-54.03773-24.189935-54.03773-54.047963 0-29.855982 24.184819-54.047963 54.03773-54.047963 29.838585 0 54.0408 24.191982 54.0408 54.047963C615.19736 311.134203 590.995145 335.324138 561.15656 335.324138zM424.962691 430.321746c0-4.394077 0-8.806573 0-13.19758 42.878576-17.016559 108.943224-10.793834 153.201218-26.418696 1.75804 0 3.510964 0 5.27719 0-21.329794 108.134813-66.391083 206.496028-76.599585 316.955792 2.425236 1.850138 2.086521 1.473561 5.287423 2.623757 33.247218 11.155061 52.320623-66.110697 73.948199-60.727083 21.644973 5.38873-13.548574 43.733037-18.47784 50.193169-19.400862 25.362644-56.465013 68.439742-100.376105 68.657706-31.008224 0.181125-63.159482-19.378349-58.101279-71.301929 5.056156-51.981908 34.219359-124.319423 50.172703-182.263114C472.184179 468.050022 488.801648 429.049776 424.962691 430.321746z" fill="#515151" p-id="5579"></path></svg>
+            </el-tooltip>
+          </router-link>
        </li>
+
+        <li class="ml-3">
+          <a href="https://github.com/taoran1401/tools-web" target="_blank">
+            <svg t="1715594665374" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4334" width="33" height="33"><path d="M512 85.333333C276.266667 85.333333 85.333333 276.266667 85.333333 512a426.410667 426.410667 0 0 0 291.754667 404.821333c21.333333 3.712 29.312-9.088 29.312-20.309333 0-10.112-0.554667-43.690667-0.554667-79.445333-107.178667 19.754667-134.912-26.112-143.445333-50.133334-4.821333-12.288-25.6-50.133333-43.733333-60.288-14.933333-7.978667-36.266667-27.733333-0.554667-28.245333 33.621333-0.554667 57.6 30.933333 65.621333 43.733333 38.4 64.512 99.754667 46.378667 124.245334 35.2 3.754667-27.733333 14.933333-46.378667 27.221333-57.045333-94.933333-10.666667-194.133333-47.488-194.133333-210.688 0-46.421333 16.512-84.778667 43.733333-114.688-4.266667-10.666667-19.2-54.4 4.266667-113.066667 0 0 35.712-11.178667 117.333333 43.776a395.946667 395.946667 0 0 1 106.666667-14.421333c36.266667 0 72.533333 4.778667 106.666666 14.378667 81.578667-55.466667 117.333333-43.690667 117.333334-43.690667 23.466667 58.666667 8.533333 102.4 4.266666 113.066667 27.178667 29.866667 43.733333 67.712 43.733334 114.645333 0 163.754667-99.712 200.021333-194.645334 210.688 15.445333 13.312 28.8 38.912 28.8 78.933333 0 57.045333-0.554667 102.912-0.554666 117.333334 0 11.178667 8.021333 24.490667 29.354666 20.224A427.349333 427.349333 0 0 0 938.666667 512c0-235.733333-190.933333-426.666667-426.666667-426.666667z" fill="#000000" p-id="4335"></path></svg>
+          </a>
+        </li>
+        <!-- <li class="hover:text-blue-500">
+          <el-link :href="feedBackUrl" size="large" target="_blank">建议/问题</el-link>
+        </li> -->
        <li class="ml-3" v-if="userStore.isLogin()">
          <!-- userStore.avatar -->
          <el-image class="w-10 h-10 cursor-pointer" fit="cover" :src="(userStore.avatar == '' || userStore.avatar == null || userStore.avatar == undefined) ? defAvatar : userStore.avatar" v-popover="userPopRef"></el-image>
@@ -207,4 +234,17 @@ onMounted(() => {
  transform: translateX(20px);
  opacity: 0;
 } 
+
+:deep(.el-input__wrapper) {
+    box-shadow: 0 0 0 0px var(--el-input-border-color, var(--el-border-color)) inset;
+    cursor: default;
+}
+:deep(.el-input__wrapper) {
+    box-shadow: 0 0 0 0px var(--el-input-border-color, var(--el-border-color)) inset;
+    cursor: default;
+}
+.el-select :deep(.el-input__wrapper){
+  background-color: rgba(46, 51, 56, 0.05);
+  background-color: rgb(255, 255, 255);
+}
 </style>
@@ -3,14 +3,11 @@
 import { onMounted, ref, reactive } from 'vue';
 import { useToolsStore } from '@/store/modules/tools'
 import { useRouter, useRoute } from "vue-router"
-const props = defineProps({
-  bgColor: String,
-})
 const router = useRouter()
 const route = useRoute()

 const appName = ref(import.meta.env.VITE_APP_TITLE || '工具坊')
-const appNet = ref(import.meta.env.VITE_APP_WEBSITE || '')
+const appNet = ref(import.meta.env.VITE_APP_DESC || '')
 //菜单选中
 const defaultActive = ref('collect')
 //默认展开的菜单
@@ -56,8 +53,8 @@ const gotoAbout = () => {
  router.push('about')
 }

-onMounted(() => {
-  getToolCates()
+onMounted(async () => {
+  await getToolCates()
 })
 </script>

@@ -66,7 +63,7 @@ onMounted(() => {
    <el-scrollbar>
      <!-- logo -->
      <div class="flex justify-center">
-        <router-link class="flex flex-row h-20" to="/">
+        <router-link class="flex flex-row h-24" to="/">
          <img class="h-12 w-auto rounded-lg mr-2 mt-auto mb-auto" src="@/assets/logo.png" :alt="appNet">
          <div class="flex flex-col  mt-auto mb-auto">
            <div class="text-2xl">{{ appName }}</div>
@@ -81,7 +78,7 @@ onMounted(() => {
          class="w-[200px]"
          :default-active="defaultActive"
          :default-openeds="defaultOpeneds"
-          :background-color="props.bgColor ?? '#f5f5fb'"
+          background-color="transparent"
          @open="handleOpen"
          @close="handleClose"
        >
@@ -29,7 +29,7 @@ const attrColor = ref('#5470c6')
 //标题位置
 const titlePos = ref('center')
 //标题
-const title = ref('然部落在线工具')
+const title = ref('Tools-Web')
 //副标题
 const subTitle = ref('在线图表制作工具')
 //显示标题 - 开关
@@ -39,7 +39,7 @@ const subTitleSwitch = ref(true)

 /** 水印 */
 const watermarkSwitch = ref(false)  //开关
-const waterMarkText = ref('然部落工具');
+const waterMarkText = ref('Tools-Web');

 //创建水印
 const createWatermark = () => {
@@ -29,7 +29,7 @@ const attrColor = ref('#5470c6')
 //标题位置
 const titlePos = ref('center')
 //标题
-const title = ref('然部落在线工具')
+const title = ref('Tools-Web')
 //副标题
 const subTitle = ref('在线图表制作工具')
 //显示标题 - 开关
@@ -39,7 +39,7 @@ const subTitleSwitch = ref(true)

 /** 水印 */
 const watermarkSwitch = ref(false)  //开关
-const waterMarkText = ref('然部落工具');
+const waterMarkText = ref('Tools-Web');

 //创建水印
 const createWatermark = () => {
@@ -29,7 +29,7 @@ const attrColor = ref('#5470c6')
 //标题位置
 const titlePos = ref('center')
 //标题
-const title = ref('然部落在线工具')
+const title = ref('Tools-Web')
 //副标题
 const subTitle = ref('在线图表制作工具')
 //显示标题 - 开关
@@ -39,7 +39,7 @@ const subTitleSwitch = ref(true)

 /** 水印 */
 const watermarkSwitch = ref(false)  //开关
-const waterMarkText = ref('然部落工具');
+const waterMarkText = ref('Tools-Web');

 //创建水印
 const createWatermark = () => {
@@ -29,7 +29,7 @@ const attrColor = ref('#5470c6')
 //标题位置
 const titlePos = ref('center')
 //标题
-const title = ref('然部落在线工具')
+const title = ref('Tools-Web')
 //副标题
 const subTitle = ref('在线图表制作工具')
 //显示标题 - 开关
@@ -39,7 +39,7 @@ const subTitleSwitch = ref(true)

 /** 水印 */
 const watermarkSwitch = ref(false)  //开关
-const waterMarkText = ref('然部落工具');
+const waterMarkText = ref('Tools-Web');

 //创建水印
 const createWatermark = () => {
@@ -21,6 +21,13 @@ router.beforeEach((to, _from, next) => {
    let oldTitle = document.title
    document.title = <string>to.meta.title + '-' + oldTitle
  }
+  // console.log(to,_from)
+  // if (window.location.hostname == 'ascii.ranblogs.com') {
+  // if (to.fullPath != '/ascii' &&  window.location.hostname == 'mshop.io') {
+  //   next('/ascii')
+  // } else {
+  //   next()
+  // }
  next()
 })
 //路由后置卫士
@@ -6,8 +6,8 @@ export const constantRoute = [
    component: () => import('@/components/Home/Home.vue'),
    name: 'home',
    meta: {
-      keywords: '然部落,在线工具,开发人员工具,时间戳转换,加密,解密,md5,进制转换,二维码,正则表达式,json格式化,照片处理,字数统计',
-      description: '然部落,在线工具,在线工具大全,开发人员工具,日常生活工具,办公助手,时间戳转换,加密,解密,md5,进制转换,二维码,正则表达式,json格式化,照片处理,字数统计',
+      keywords: 'Tools-Web,在线工具,开发人员工具,时间戳转换,加密,解密,md5,进制转换,二维码,正则表达式,json格式化,照片处理,字数统计',
+      description: 'Tools-Web,在线工具,在线工具大全,开发人员工具,日常生活工具,办公助手,时间戳转换,加密,解密,md5,进制转换,二维码,正则表达式,json格式化,照片处理,字数统计',
    }
  },
  //工具
Author	SHA1	Message	Date
osiris	fe129d3f9f	fix	2024-05-27 17:41:51 +08:00
osiris	1dba247410	fix	2024-05-27 12:04:16 +08:00
osiris	b235935fd3	fix: debug	2024-05-14 15:20:18 +08:00
osiris	92347aa62d	fix:	2024-05-14 15:13:56 +08:00
osiris	49be0ddcbc	feat:	2024-05-14 10:52:13 +08:00