qiushang 11 months ago
parent
commit
0034a94ffb

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "Ds8JqlRmiiGR"
-!define PRODUCT_VERSION        		"2.0.2.7"
+!define PRODUCT_VERSION        		"2.0.2.8"
 !define PRODUCT_NAME           		"星优图片下载器"
 !define INSTALL_OUTPUT_NAME    		"XYCapture_XY.exe" 
 !define EXE_NAME               		"XYCapture.exe"
 !define PRODUCT_PATHNAME           	"XYCapture"     #安装卸载项用到的KEY,注册表
 !define INSTALL_APPEND_PATH         "XYCapture"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.2.7.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.2.8.7z"
 !define PRODUCT_PUBLISHER      	    "苏州星优办公软件有限公司"
 !define PRODUCT_LEGAL          	    "苏州星优办公软件有限公司"
 !define STATISTICS_url              "https://www.xingyousoft.com/api/index/user_log"   # 统计网址
-!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.0.2.7"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.0.2.8"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYCapture",
-	"version": "2.0.2.7",
+	"version": "2.0.2.8",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "capture",

+ 0 - 539
src/renderer/assets/css/font/demo.css

@@ -1,539 +0,0 @@
-/* Logo 字体 */
-@font-face {
-  font-family: "iconfont logo";
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
-}
-
-.logo {
-  font-family: "iconfont logo";
-  font-size: 160px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-/* tabs */
-.nav-tabs {
-  position: relative;
-}
-
-.nav-tabs .nav-more {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  height: 42px;
-  line-height: 42px;
-  color: #666;
-}
-
-#tabs {
-  border-bottom: 1px solid #eee;
-}
-
-#tabs li {
-  cursor: pointer;
-  width: 100px;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  font-size: 16px;
-  border-bottom: 2px solid transparent;
-  position: relative;
-  z-index: 1;
-  margin-bottom: -1px;
-  color: #666;
-}
-
-
-#tabs .active {
-  border-bottom-color: #f00;
-  color: #222;
-}
-
-.tab-container .content {
-  display: none;
-}
-
-/* 页面布局 */
-.main {
-  padding: 30px 100px;
-  width: 960px;
-  margin: 0 auto;
-}
-
-.main .logo {
-  color: #333;
-  text-align: left;
-  margin-bottom: 30px;
-  line-height: 1;
-  height: 110px;
-  margin-top: -50px;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.main .logo a {
-  font-size: 160px;
-  color: #333;
-}
-
-.helps {
-  margin-top: 40px;
-}
-
-.helps pre {
-  padding: 20px;
-  margin: 10px 0;
-  border: solid 1px #e7e1cd;
-  background-color: #fffdef;
-  overflow: auto;
-}
-
-.icon_lists {
-  width: 100% !important;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.icon_lists li {
-  width: 100px;
-  margin-bottom: 10px;
-  margin-right: 20px;
-  text-align: center;
-  list-style: none !important;
-  cursor: default;
-}
-
-.icon_lists li .code-name {
-  line-height: 1.2;
-}
-
-.icon_lists .icon {
-  display: block;
-  height: 100px;
-  line-height: 100px;
-  font-size: 42px;
-  margin: 10px auto;
-  color: #333;
-  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
-  -moz-transition: font-size 0.25s linear, width 0.25s linear;
-  transition: font-size 0.25s linear, width 0.25s linear;
-}
-
-.icon_lists .icon:hover {
-  font-size: 100px;
-}
-
-.icon_lists .svg-icon {
-  /* 通过设置 font-size 来改变图标大小 */
-  width: 1em;
-  /* 图标和文字相邻时,垂直对齐 */
-  vertical-align: -0.15em;
-  /* 通过设置 color 来改变 SVG 的颜色/fill */
-  fill: currentColor;
-  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
-      normalize.css 中也包含这行 */
-  overflow: hidden;
-}
-
-.icon_lists li .name,
-.icon_lists li .code-name {
-  color: #666;
-}
-
-/* markdown 样式 */
-.markdown {
-  color: #666;
-  font-size: 14px;
-  line-height: 1.8;
-}
-
-.highlight {
-  line-height: 1.5;
-}
-
-.markdown img {
-  vertical-align: middle;
-  max-width: 100%;
-}
-
-.markdown h1 {
-  color: #404040;
-  font-weight: 500;
-  line-height: 40px;
-  margin-bottom: 24px;
-}
-
-.markdown h2,
-.markdown h3,
-.markdown h4,
-.markdown h5,
-.markdown h6 {
-  color: #404040;
-  margin: 1.6em 0 0.6em 0;
-  font-weight: 500;
-  clear: both;
-}
-
-.markdown h1 {
-  font-size: 28px;
-}
-
-.markdown h2 {
-  font-size: 22px;
-}
-
-.markdown h3 {
-  font-size: 16px;
-}
-
-.markdown h4 {
-  font-size: 14px;
-}
-
-.markdown h5 {
-  font-size: 12px;
-}
-
-.markdown h6 {
-  font-size: 12px;
-}
-
-.markdown hr {
-  height: 1px;
-  border: 0;
-  background: #e9e9e9;
-  margin: 16px 0;
-  clear: both;
-}
-
-.markdown p {
-  margin: 1em 0;
-}
-
-.markdown>p,
-.markdown>blockquote,
-.markdown>.highlight,
-.markdown>ol,
-.markdown>ul {
-  width: 80%;
-}
-
-.markdown ul>li {
-  list-style: circle;
-}
-
-.markdown>ul li,
-.markdown blockquote ul>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown>ul li p,
-.markdown>ol li p {
-  margin: 0.6em 0;
-}
-
-.markdown ol>li {
-  list-style: decimal;
-}
-
-.markdown>ol li,
-.markdown blockquote ol>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown code {
-  margin: 0 3px;
-  padding: 0 5px;
-  background: #eee;
-  border-radius: 3px;
-}
-
-.markdown strong,
-.markdown b {
-  font-weight: 600;
-}
-
-.markdown>table {
-  border-collapse: collapse;
-  border-spacing: 0px;
-  empty-cells: show;
-  border: 1px solid #e9e9e9;
-  width: 95%;
-  margin-bottom: 24px;
-}
-
-.markdown>table th {
-  white-space: nowrap;
-  color: #333;
-  font-weight: 600;
-}
-
-.markdown>table th,
-.markdown>table td {
-  border: 1px solid #e9e9e9;
-  padding: 8px 16px;
-  text-align: left;
-}
-
-.markdown>table th {
-  background: #F7F7F7;
-}
-
-.markdown blockquote {
-  font-size: 90%;
-  color: #999;
-  border-left: 4px solid #e9e9e9;
-  padding-left: 0.8em;
-  margin: 1em 0;
-}
-
-.markdown blockquote p {
-  margin: 0;
-}
-
-.markdown .anchor {
-  opacity: 0;
-  transition: opacity 0.3s ease;
-  margin-left: 8px;
-}
-
-.markdown .waiting {
-  color: #ccc;
-}
-
-.markdown h1:hover .anchor,
-.markdown h2:hover .anchor,
-.markdown h3:hover .anchor,
-.markdown h4:hover .anchor,
-.markdown h5:hover .anchor,
-.markdown h6:hover .anchor {
-  opacity: 1;
-  display: inline-block;
-}
-
-.markdown>br,
-.markdown>p>br {
-  clear: both;
-}
-
-
-.hljs {
-  display: block;
-  background: white;
-  padding: 0.5em;
-  color: #333333;
-  overflow-x: auto;
-}
-
-.hljs-comment,
-.hljs-meta {
-  color: #969896;
-}
-
-.hljs-string,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-strong,
-.hljs-emphasis,
-.hljs-quote {
-  color: #df5000;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-type {
-  color: #a71d5d;
-}
-
-.hljs-literal,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-attribute {
-  color: #0086b3;
-}
-
-.hljs-section,
-.hljs-name {
-  color: #63a35c;
-}
-
-.hljs-tag {
-  color: #333333;
-}
-
-.hljs-title,
-.hljs-attr,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo {
-  color: #795da3;
-}
-
-.hljs-addition {
-  color: #55a532;
-  background-color: #eaffea;
-}
-
-.hljs-deletion {
-  color: #bd2c00;
-  background-color: #ffecec;
-}
-
-.hljs-link {
-  text-decoration: underline;
-}
-
-/* 代码高亮 */
-/* PrismJS 1.15.0
-https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  background: none;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-
-  -moz-tab-size: 4;
-  -o-tab-size: 4;
-  tab-size: 4;
-
-  -webkit-hyphens: none;
-  -moz-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-@media print {
-
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: .5em 0;
-  overflow: auto;
-}
-
-:not(pre)>code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-
-/* Inline code */
-:not(pre)>code[class*="language-"] {
-  padding: .1em;
-  border-radius: .3em;
-  white-space: normal;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-
-.token.punctuation {
-  color: #999;
-}
-
-.namespace {
-  opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #9a6e3a;
-  background: hsla(0, 0%, 100%, .5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-
-.token.function,
-.token.class-name {
-  color: #DD4A68;
-}
-
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-
-.token.italic {
-  font-style: italic;
-}
-
-.token.entity {
-  cursor: help;
-}

+ 0 - 395
src/renderer/assets/css/font/demo_index.html

@@ -1,395 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8"/>
-  <title>iconfont Demo</title>
-  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
-  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
-  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
-  <link rel="stylesheet" href="demo.css">
-  <link rel="stylesheet" href="iconfont.css">
-  <script src="iconfont.js"></script>
-  <!-- jQuery -->
-  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
-  <!-- 代码高亮 -->
-  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
-  <style>
-    .main .logo {
-      margin-top: 0;
-      height: auto;
-    }
-
-    .main .logo a {
-      display: flex;
-      align-items: center;
-    }
-
-    .main .logo .sub-title {
-      margin-left: 0.5em;
-      font-size: 22px;
-      color: #fff;
-      background: linear-gradient(-45deg, #3967FF, #B500FE);
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
-    }
-  </style>
-</head>
-<body>
-  <div class="main">
-    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
-      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
-      
-    </a></h1>
-    <div class="nav-tabs">
-      <ul id="tabs" class="dib-box">
-        <li class="dib active"><span>Unicode</span></li>
-        <li class="dib"><span>Font class</span></li>
-        <li class="dib"><span>Symbol</span></li>
-      </ul>
-      
-      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4464344" target="_blank" class="nav-more">查看项目</a>
-      
-    </div>
-    <div class="tab-container">
-      <div class="content unicode" style="display: block;">
-          <ul class="icon_lists dib-box">
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe626;</span>
-                <div class="name">链接</div>
-                <div class="code-name">&amp;#xe626;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe602;</span>
-                <div class="name">文件类型-Word</div>
-                <div class="code-name">&amp;#xe602;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe607;</span>
-                <div class="name">文件类型-Exe</div>
-                <div class="code-name">&amp;#xe607;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe608;</span>
-                <div class="name">文件类型-Pdf</div>
-                <div class="code-name">&amp;#xe608;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe609;</span>
-                <div class="name">文件类型-Txt</div>
-                <div class="code-name">&amp;#xe609;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe628;</span>
-                <div class="name">爆款</div>
-                <div class="code-name">&amp;#xe628;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe627;</span>
-                <div class="name">企业微信</div>
-                <div class="code-name">&amp;#xe627;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe78b;</span>
-                <div class="name">网址</div>
-                <div class="code-name">&amp;#xe78b;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe66c;</span>
-                <div class="name">火</div>
-                <div class="code-name">&amp;#xe66c;</div>
-              </li>
-          
-          </ul>
-          <div class="article markdown">
-          <h2 id="unicode-">Unicode 引用</h2>
-          <hr>
-
-          <p>Unicode 是字体在网页端最原始的应用方式,特点是:</p>
-          <ul>
-            <li>支持按字体的方式去动态调整图标大小,颜色等等。</li>
-            <li>默认情况下不支持多色,直接添加多色图标会自动去色。</li>
-          </ul>
-          <blockquote>
-            <p>注意:新版 iconfont 支持两种方式引用多色图标:SVG symbol 引用方式和彩色字体图标模式。(使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。)</p>
-          </blockquote>
-          <p>Unicode 使用步骤如下:</p>
-          <h3 id="-font-face">第一步:拷贝项目下面生成的 <code>@font-face</code></h3>
-<pre><code class="language-css"
->@font-face {
-  font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1711084941351') format('woff2'),
-       url('iconfont.woff?t=1711084941351') format('woff'),
-       url('iconfont.ttf?t=1711084941351') format('truetype');
-}
-</code></pre>
-          <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
-<pre><code class="language-css"
->.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-</code></pre>
-          <h3 id="-">第三步:挑选相应图标并获取字体编码,应用于页面</h3>
-<pre>
-<code class="language-html"
->&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
-</code></pre>
-          <blockquote>
-            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>
-          </blockquote>
-          </div>
-      </div>
-      <div class="content font-class">
-        <ul class="icon_lists dib-box">
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-lianjie"></span>
-            <div class="name">
-              链接
-            </div>
-            <div class="code-name">.iconx-lianjie
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-Word"></span>
-            <div class="name">
-              文件类型-Word
-            </div>
-            <div class="code-name">.iconx-Word
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-Exe"></span>
-            <div class="name">
-              文件类型-Exe
-            </div>
-            <div class="code-name">.iconx-Exe
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-Pdf"></span>
-            <div class="name">
-              文件类型-Pdf
-            </div>
-            <div class="code-name">.iconx-Pdf
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-txt1"></span>
-            <div class="name">
-              文件类型-Txt
-            </div>
-            <div class="code-name">.iconx-txt1
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-baokuan"></span>
-            <div class="name">
-              爆款
-            </div>
-            <div class="code-name">.iconx-baokuan
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-qiyeweixin"></span>
-            <div class="name">
-              企业微信
-            </div>
-            <div class="code-name">.iconx-qiyeweixin
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-wangzhi"></span>
-            <div class="name">
-              网址
-            </div>
-            <div class="code-name">.iconx-wangzhi
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-huo"></span>
-            <div class="name">
-              火
-            </div>
-            <div class="code-name">.iconx-huo
-            </div>
-          </li>
-          
-        </ul>
-        <div class="article markdown">
-        <h2 id="font-class-">font-class 引用</h2>
-        <hr>
-
-        <p>font-class 是 Unicode 使用方式的一种变种,主要是解决 Unicode 书写不直观,语意不明确的问题。</p>
-        <p>与 Unicode 使用方式相比,具有如下特点:</p>
-        <ul>
-          <li>相比于 Unicode 语意明确,书写更直观。可以很容易分辨这个 icon 是什么。</li>
-          <li>因为使用 class 来定义图标,所以当要替换图标时,只需要修改 class 里面的 Unicode 引用。</li>
-        </ul>
-        <p>使用步骤如下:</p>
-        <h3 id="-fontclass-">第一步:引入项目下面生成的 fontclass 代码:</h3>
-<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
-</code></pre>
-        <h3 id="-">第二步:挑选相应图标并获取类名,应用于页面:</h3>
-<pre><code class="language-html">&lt;span class="iconfont iconx-xxx"&gt;&lt;/span&gt;
-</code></pre>
-        <blockquote>
-          <p>"
-            iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>
-        </blockquote>
-      </div>
-      </div>
-      <div class="content symbol">
-          <ul class="icon_lists dib-box">
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-lianjie"></use>
-                </svg>
-                <div class="name">链接</div>
-                <div class="code-name">#iconx-lianjie</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-Word"></use>
-                </svg>
-                <div class="name">文件类型-Word</div>
-                <div class="code-name">#iconx-Word</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-Exe"></use>
-                </svg>
-                <div class="name">文件类型-Exe</div>
-                <div class="code-name">#iconx-Exe</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-Pdf"></use>
-                </svg>
-                <div class="name">文件类型-Pdf</div>
-                <div class="code-name">#iconx-Pdf</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-txt1"></use>
-                </svg>
-                <div class="name">文件类型-Txt</div>
-                <div class="code-name">#iconx-txt1</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-baokuan"></use>
-                </svg>
-                <div class="name">爆款</div>
-                <div class="code-name">#iconx-baokuan</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-qiyeweixin"></use>
-                </svg>
-                <div class="name">企业微信</div>
-                <div class="code-name">#iconx-qiyeweixin</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-wangzhi"></use>
-                </svg>
-                <div class="name">网址</div>
-                <div class="code-name">#iconx-wangzhi</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-huo"></use>
-                </svg>
-                <div class="name">火</div>
-                <div class="code-name">#iconx-huo</div>
-            </li>
-          
-          </ul>
-          <div class="article markdown">
-          <h2 id="symbol-">Symbol 引用</h2>
-          <hr>
-
-          <p>这是一种全新的使用方式,应该说这才是未来的主流,也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
-            这种用法其实是做了一个 SVG 的集合,与另外两种相比具有如下特点:</p>
-          <ul>
-            <li>支持多色图标了,不再受单色限制。</li>
-            <li>通过一些技巧,支持像字体那样,通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
-            <li>兼容性较差,支持 IE9+,及现代浏览器。</li>
-            <li>浏览器渲染 SVG 的性能一般,还不如 png。</li>
-          </ul>
-          <p>使用步骤如下:</p>
-          <h3 id="-symbol-">第一步:引入项目下面生成的 symbol 代码:</h3>
-<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
-</code></pre>
-          <h3 id="-css-">第二步:加入通用 CSS 代码(引入一次就行):</h3>
-<pre><code class="language-html">&lt;style&gt;
-.icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-&lt;/style&gt;
-</code></pre>
-          <h3 id="-">第三步:挑选相应图标并获取类名,应用于页面:</h3>
-<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
-  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
-&lt;/svg&gt;
-</code></pre>
-          </div>
-      </div>
-
-    </div>
-  </div>
-  <script>
-  $(document).ready(function () {
-      $('.tab-container .content:first').show()
-
-      $('#tabs li').click(function (e) {
-        var tabContent = $('.tab-container .content')
-        var index = $(this).index()
-
-        if ($(this).hasClass('active')) {
-          return
-        } else {
-          $('#tabs li').removeClass('active')
-          $(this).addClass('active')
-
-          tabContent.hide().eq(index).fadeIn()
-        }
-      })
-    })
-  </script>
-</body>
-</html>

+ 0 - 51
src/renderer/assets/css/font/iconfont.css

@@ -1,51 +0,0 @@
-@font-face {
-  font-family: "iconfont"; /* Project id 4464344 */
-  src: url('iconfont.woff2?t=1711084941351') format('woff2'),
-       url('iconfont.woff?t=1711084941351') format('woff'),
-       url('iconfont.ttf?t=1711084941351') format('truetype');
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.iconx-lianjie:before {
-  content: "\e626";
-}
-
-.iconx-Word:before {
-  content: "\e602";
-}
-
-.iconx-Exe:before {
-  content: "\e607";
-}
-
-.iconx-Pdf:before {
-  content: "\e608";
-}
-
-.iconx-txt1:before {
-  content: "\e609";
-}
-
-.iconx-baokuan:before {
-  content: "\e628";
-}
-
-.iconx-qiyeweixin:before {
-  content: "\e627";
-}
-
-.iconx-wangzhi:before {
-  content: "\e78b";
-}
-
-.iconx-huo:before {
-  content: "\e66c";
-}
-

BIN
src/renderer/assets/css/font/iconfont.eot


File diff suppressed because it is too large
+ 0 - 0
src/renderer/assets/css/font/iconfont.js


+ 0 - 72
src/renderer/assets/css/font/iconfont.json

@@ -1,72 +0,0 @@
-{
-  "id": "4464344",
-  "name": "星星",
-  "font_family": "iconfont",
-  "css_prefix_text": "iconx-",
-  "description": "软件",
-  "glyphs": [
-    {
-      "icon_id": "10905595",
-      "name": "链接",
-      "font_class": "lianjie",
-      "unicode": "e626",
-      "unicode_decimal": 58918
-    },
-    {
-      "icon_id": "22735865",
-      "name": "文件类型-Word",
-      "font_class": "Word",
-      "unicode": "e602",
-      "unicode_decimal": 58882
-    },
-    {
-      "icon_id": "22761835",
-      "name": "文件类型-Exe",
-      "font_class": "Exe",
-      "unicode": "e607",
-      "unicode_decimal": 58887
-    },
-    {
-      "icon_id": "22761836",
-      "name": "文件类型-Pdf",
-      "font_class": "Pdf",
-      "unicode": "e608",
-      "unicode_decimal": 58888
-    },
-    {
-      "icon_id": "22761837",
-      "name": "文件类型-Txt",
-      "font_class": "txt1",
-      "unicode": "e609",
-      "unicode_decimal": 58889
-    },
-    {
-      "icon_id": "24516106",
-      "name": "爆款",
-      "font_class": "baokuan",
-      "unicode": "e628",
-      "unicode_decimal": 58920
-    },
-    {
-      "icon_id": "25566954",
-      "name": "企业微信",
-      "font_class": "qiyeweixin",
-      "unicode": "e627",
-      "unicode_decimal": 58919
-    },
-    {
-      "icon_id": "12406913",
-      "name": "网址",
-      "font_class": "wangzhi",
-      "unicode": "e78b",
-      "unicode_decimal": 59275
-    },
-    {
-      "icon_id": "631375",
-      "name": "火",
-      "font_class": "huo",
-      "unicode": "e66c",
-      "unicode_decimal": 58988
-    }
-  ]
-}

File diff suppressed because it is too large
+ 0 - 31
src/renderer/assets/css/font/iconfont.svg


BIN
src/renderer/assets/css/font/iconfont.ttf


BIN
src/renderer/assets/css/font/iconfont.woff


BIN
src/renderer/assets/css/font/iconfont.woff2


+ 102 - 171
src/renderer/assets/css/fontx/demo_index.html

@@ -55,87 +55,69 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
-              <span class="icon iconfont">&#xe78b;</span>
-                <div class="name">网址</div>
-                <div class="code-name">&amp;#xe78b;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe7b2;</span>
-                <div class="name">企业微信</div>
-                <div class="code-name">&amp;#xe7b2;</div>
+              <span class="icon iconfont">&#xe658;</span>
+                <div class="name">免责</div>
+                <div class="code-name">&amp;#xe658;</div>
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xe660;</span>
-                <div class="name">导入Excel @2x</div>
-                <div class="code-name">&amp;#xe660;</div>
+              <span class="icon iconfont">&#xe950;</span>
+                <div class="name">图片压缩</div>
+                <div class="code-name">&amp;#xe950;</div>
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xe6c5;</span>
-                <div class="name">PDF转word</div>
-                <div class="code-name">&amp;#xe6c5;</div>
+              <span class="icon iconfont">&#xe626;</span>
+                <div class="name">链接</div>
+                <div class="code-name">&amp;#xe626;</div>
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xe749;</span>
-                <div class="name">输出_table转txt输出</div>
-                <div class="code-name">&amp;#xe749;</div>
+              <span class="icon iconfont">&#xe602;</span>
+                <div class="name">文件类型-Word</div>
+                <div class="code-name">&amp;#xe602;</div>
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xe650;</span>
-                <div class="name">CAJ转PDF</div>
-                <div class="code-name">&amp;#xe650;</div>
+              <span class="icon iconfont">&#xe607;</span>
+                <div class="name">文件类型-Exe</div>
+                <div class="code-name">&amp;#xe607;</div>
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xe651;</span>
-                <div class="name">JPG转PDF</div>
-                <div class="code-name">&amp;#xe651;</div>
+              <span class="icon iconfont">&#xe608;</span>
+                <div class="name">文件类型-Pdf</div>
+                <div class="code-name">&amp;#xe608;</div>
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xe67c;</span>
-                <div class="name">cbz 转 PDF</div>
-                <div class="code-name">&amp;#xe67c;</div>
+              <span class="icon iconfont">&#xe609;</span>
+                <div class="name">文件类型-Txt</div>
+                <div class="code-name">&amp;#xe609;</div>
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xe67d;</span>
-                <div class="name">HWP 转 PDF</div>
-                <div class="code-name">&amp;#xe67d;</div>
+              <span class="icon iconfont">&#xe628;</span>
+                <div class="name">爆款</div>
+                <div class="code-name">&amp;#xe628;</div>
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xe66c;</span>
-                <div class="name">火</div>
-                <div class="code-name">&amp;#xe66c;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe636;</span>
-                <div class="name">文件</div>
-                <div class="code-name">&amp;#xe636;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe696;</span>
-                <div class="name">word</div>
-                <div class="code-name">&amp;#xe696;</div>
+              <span class="icon iconfont">&#xe627;</span>
+                <div class="name">企业微信</div>
+                <div class="code-name">&amp;#xe627;</div>
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xe6b0;</span>
-                <div class="name">txt</div>
-                <div class="code-name">&amp;#xe6b0;</div>
+              <span class="icon iconfont">&#xe78b;</span>
+                <div class="name">网址</div>
+                <div class="code-name">&amp;#xe78b;</div>
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xea43;</span>
-                <div class="name">文件,pdf</div>
-                <div class="code-name">&amp;#xea43;</div>
+              <span class="icon iconfont">&#xe66c;</span>
+                <div class="name">火</div>
+                <div class="code-name">&amp;#xe66c;</div>
               </li>
           
           </ul>
@@ -156,9 +138,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1710338016552') format('woff2'),
-       url('iconfont.woff?t=1710338016552') format('woff'),
-       url('iconfont.ttf?t=1710338016552') format('truetype');
+  src: url('iconfont.woff2?t=1725584676706') format('woff2'),
+       url('iconfont.woff?t=1725584676706') format('woff'),
+       url('iconfont.ttf?t=1725584676706') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -185,128 +167,101 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
-            <span class="icon iconfont iconx-wangzhi"></span>
-            <div class="name">
-              网址
-            </div>
-            <div class="code-name">.iconx-wangzhi
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-qiyeweixin"></span>
-            <div class="name">
-              企业微信
-            </div>
-            <div class="code-name">.iconx-qiyeweixin
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-daoruExcel2x"></span>
-            <div class="name">
-              导入Excel @2x
-            </div>
-            <div class="code-name">.iconx-daoruExcel2x
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont iconx-PDFzhuanword"></span>
+            <span class="icon iconfont iconx-mianze-01"></span>
             <div class="name">
-              PDF转word
+              免责
             </div>
-            <div class="code-name">.iconx-PDFzhuanword
+            <div class="code-name">.iconx-mianze-01
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconx-shuchu_tablezhuantxtshuchu"></span>
+            <span class="icon iconfont iconx-tupianyasuo"></span>
             <div class="name">
-              输出_table转txt输出
+              图片压缩
             </div>
-            <div class="code-name">.iconx-shuchu_tablezhuantxtshuchu
+            <div class="code-name">.iconx-tupianyasuo
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconx-CAJzhuanPDF"></span>
+            <span class="icon iconfont iconx-lianjie"></span>
             <div class="name">
-              CAJ转PDF
+              链接
             </div>
-            <div class="code-name">.iconx-CAJzhuanPDF
+            <div class="code-name">.iconx-lianjie
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconx-JPGzhuanPDF"></span>
+            <span class="icon iconfont iconx-Word"></span>
             <div class="name">
-              JPG转PDF
+              文件类型-Word
             </div>
-            <div class="code-name">.iconx-JPGzhuanPDF
+            <div class="code-name">.iconx-Word
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconx-a-cbzzhuanPDF"></span>
+            <span class="icon iconfont iconx-Exe"></span>
             <div class="name">
-              cbz 转 PDF
+              文件类型-Exe
             </div>
-            <div class="code-name">.iconx-a-cbzzhuanPDF
+            <div class="code-name">.iconx-Exe
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconx-a-HWPzhuanPDF"></span>
+            <span class="icon iconfont iconx-Pdf"></span>
             <div class="name">
-              HWP 转 PDF
+              文件类型-Pdf
             </div>
-            <div class="code-name">.iconx-a-HWPzhuanPDF
+            <div class="code-name">.iconx-Pdf
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconx-huo"></span>
+            <span class="icon iconfont iconx-txt1"></span>
             <div class="name">
-              
+              文件类型-Txt
             </div>
-            <div class="code-name">.iconx-huo
+            <div class="code-name">.iconx-txt1
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconx-wenjian"></span>
+            <span class="icon iconfont iconx-baokuan"></span>
             <div class="name">
-              文件
+              爆款
             </div>
-            <div class="code-name">.iconx-wenjian
+            <div class="code-name">.iconx-baokuan
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconx-word"></span>
+            <span class="icon iconfont iconx-qiyeweixin"></span>
             <div class="name">
-              word
+              企业微信
             </div>
-            <div class="code-name">.iconx-word
+            <div class="code-name">.iconx-qiyeweixin
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconx-txt"></span>
+            <span class="icon iconfont iconx-wangzhi"></span>
             <div class="name">
-              txt
+              网址
             </div>
-            <div class="code-name">.iconx-txt
+            <div class="code-name">.iconx-wangzhi
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconx-pdf-full"></span>
+            <span class="icon iconfont iconx-huo"></span>
             <div class="name">
-              文件,pdf
+              
             </div>
-            <div class="code-name">.iconx-pdf-full
+            <div class="code-name">.iconx-huo
             </div>
           </li>
           
@@ -339,114 +294,90 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-wangzhi"></use>
-                </svg>
-                <div class="name">网址</div>
-                <div class="code-name">#iconx-wangzhi</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-qiyeweixin"></use>
-                </svg>
-                <div class="name">企业微信</div>
-                <div class="code-name">#iconx-qiyeweixin</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-daoruExcel2x"></use>
+                  <use xlink:href="#iconx-mianze-01"></use>
                 </svg>
-                <div class="name">导入Excel @2x</div>
-                <div class="code-name">#iconx-daoruExcel2x</div>
+                <div class="name">免责</div>
+                <div class="code-name">#iconx-mianze-01</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-PDFzhuanword"></use>
+                  <use xlink:href="#iconx-tupianyasuo"></use>
                 </svg>
-                <div class="name">PDF转word</div>
-                <div class="code-name">#iconx-PDFzhuanword</div>
+                <div class="name">图片压缩</div>
+                <div class="code-name">#iconx-tupianyasuo</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-shuchu_tablezhuantxtshuchu"></use>
+                  <use xlink:href="#iconx-lianjie"></use>
                 </svg>
-                <div class="name">输出_table转txt输出</div>
-                <div class="code-name">#iconx-shuchu_tablezhuantxtshuchu</div>
+                <div class="name">链接</div>
+                <div class="code-name">#iconx-lianjie</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-CAJzhuanPDF"></use>
+                  <use xlink:href="#iconx-Word"></use>
                 </svg>
-                <div class="name">CAJ转PDF</div>
-                <div class="code-name">#iconx-CAJzhuanPDF</div>
+                <div class="name">文件类型-Word</div>
+                <div class="code-name">#iconx-Word</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-JPGzhuanPDF"></use>
+                  <use xlink:href="#iconx-Exe"></use>
                 </svg>
-                <div class="name">JPG转PDF</div>
-                <div class="code-name">#iconx-JPGzhuanPDF</div>
+                <div class="name">文件类型-Exe</div>
+                <div class="code-name">#iconx-Exe</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-a-cbzzhuanPDF"></use>
+                  <use xlink:href="#iconx-Pdf"></use>
                 </svg>
-                <div class="name">cbz 转 PDF</div>
-                <div class="code-name">#iconx-a-cbzzhuanPDF</div>
+                <div class="name">文件类型-Pdf</div>
+                <div class="code-name">#iconx-Pdf</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-a-HWPzhuanPDF"></use>
+                  <use xlink:href="#iconx-txt1"></use>
                 </svg>
-                <div class="name">HWP 转 PDF</div>
-                <div class="code-name">#iconx-a-HWPzhuanPDF</div>
+                <div class="name">文件类型-Txt</div>
+                <div class="code-name">#iconx-txt1</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-huo"></use>
+                  <use xlink:href="#iconx-baokuan"></use>
                 </svg>
-                <div class="name"></div>
-                <div class="code-name">#iconx-huo</div>
+                <div class="name">爆款</div>
+                <div class="code-name">#iconx-baokuan</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-wenjian"></use>
-                </svg>
-                <div class="name">文件</div>
-                <div class="code-name">#iconx-wenjian</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-word"></use>
+                  <use xlink:href="#iconx-qiyeweixin"></use>
                 </svg>
-                <div class="name">word</div>
-                <div class="code-name">#iconx-word</div>
+                <div class="name">企业微信</div>
+                <div class="code-name">#iconx-qiyeweixin</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-txt"></use>
+                  <use xlink:href="#iconx-wangzhi"></use>
                 </svg>
-                <div class="name">txt</div>
-                <div class="code-name">#iconx-txt</div>
+                <div class="name">网址</div>
+                <div class="code-name">#iconx-wangzhi</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#iconx-pdf-full"></use>
+                  <use xlink:href="#iconx-huo"></use>
                 </svg>
-                <div class="name">文件,pdf</div>
-                <div class="code-name">#iconx-pdf-full</div>
+                <div class="name"></div>
+                <div class="code-name">#iconx-huo</div>
             </li>
           
           </ul>

+ 25 - 37
src/renderer/assets/css/fontx/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4464344 */
-  src: url('iconfont.woff2?t=1710338016552') format('woff2'),
-       url('iconfont.woff?t=1710338016552') format('woff'),
-       url('iconfont.ttf?t=1710338016552') format('truetype');
+  src: url('iconfont.woff2?t=1725584676706') format('woff2'),
+       url('iconfont.woff?t=1725584676706') format('woff'),
+       url('iconfont.ttf?t=1725584676706') format('truetype');
 }
 
 .iconfont {
@@ -13,59 +13,47 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.iconx-wangzhi:before {
-  content: "\e78b";
-}
-
-.iconx-qiyeweixin:before {
-  content: "\e7b2";
-}
-
-.iconx-daoruExcel2x:before {
-  content: "\e660";
-}
-
-.iconx-PDFzhuanword:before {
-  content: "\e6c5";
+.iconx-mianze-01:before {
+  content: "\e658";
 }
 
-.iconx-shuchu_tablezhuantxtshuchu:before {
-  content: "\e749";
+.iconx-tupianyasuo:before {
+  content: "\e950";
 }
 
-.iconx-CAJzhuanPDF:before {
-  content: "\e650";
+.iconx-lianjie:before {
+  content: "\e626";
 }
 
-.iconx-JPGzhuanPDF:before {
-  content: "\e651";
+.iconx-Word:before {
+  content: "\e602";
 }
 
-.iconx-a-cbzzhuanPDF:before {
-  content: "\e67c";
+.iconx-Exe:before {
+  content: "\e607";
 }
 
-.iconx-a-HWPzhuanPDF:before {
-  content: "\e67d";
+.iconx-Pdf:before {
+  content: "\e608";
 }
 
-.iconx-huo:before {
-  content: "\e66c";
+.iconx-txt1:before {
+  content: "\e609";
 }
 
-.iconx-wenjian:before {
-  content: "\e636";
+.iconx-baokuan:before {
+  content: "\e628";
 }
 
-.iconx-word:before {
-  content: "\e696";
+.iconx-qiyeweixin:before {
+  content: "\e627";
 }
 
-.iconx-txt:before {
-  content: "\e6b0";
+.iconx-wangzhi:before {
+  content: "\e78b";
 }
 
-.iconx-pdf-full:before {
-  content: "\ea43";
+.iconx-huo:before {
+  content: "\e66c";
 }
 

File diff suppressed because it is too large
+ 0 - 0
src/renderer/assets/css/fontx/iconfont.js


+ 52 - 73
src/renderer/assets/css/fontx/iconfont.json

@@ -6,67 +6,74 @@
   "description": "软件",
   "glyphs": [
     {
-      "icon_id": "12406913",
-      "name": "网址",
-      "font_class": "wangzhi",
-      "unicode": "e78b",
-      "unicode_decimal": 59275
+      "icon_id": "33845663",
+      "name": "免责",
+      "font_class": "mianze-01",
+      "unicode": "e658",
+      "unicode_decimal": 58968
     },
     {
-      "icon_id": "25960536",
-      "name": "企业微信",
-      "font_class": "qiyeweixin",
-      "unicode": "e7b2",
-      "unicode_decimal": 59314
+      "icon_id": "37225921",
+      "name": "图片压缩",
+      "font_class": "tupianyasuo",
+      "unicode": "e950",
+      "unicode_decimal": 59728
+    },
+    {
+      "icon_id": "10905595",
+      "name": "链接",
+      "font_class": "lianjie",
+      "unicode": "e626",
+      "unicode_decimal": 58918
     },
     {
-      "icon_id": "21052060",
-      "name": "导入Excel @2x",
-      "font_class": "daoruExcel2x",
-      "unicode": "e660",
-      "unicode_decimal": 58976
+      "icon_id": "22735865",
+      "name": "文件类型-Word",
+      "font_class": "Word",
+      "unicode": "e602",
+      "unicode_decimal": 58882
     },
     {
-      "icon_id": "25647518",
-      "name": "PDF转word",
-      "font_class": "PDFzhuanword",
-      "unicode": "e6c5",
-      "unicode_decimal": 59077
+      "icon_id": "22761835",
+      "name": "文件类型-Exe",
+      "font_class": "Exe",
+      "unicode": "e607",
+      "unicode_decimal": 58887
     },
     {
-      "icon_id": "31108584",
-      "name": "输出_table转txt输出",
-      "font_class": "shuchu_tablezhuantxtshuchu",
-      "unicode": "e749",
-      "unicode_decimal": 59209
+      "icon_id": "22761836",
+      "name": "文件类型-Pdf",
+      "font_class": "Pdf",
+      "unicode": "e608",
+      "unicode_decimal": 58888
     },
     {
-      "icon_id": "32290623",
-      "name": "CAJ转PDF",
-      "font_class": "CAJzhuanPDF",
-      "unicode": "e650",
-      "unicode_decimal": 58960
+      "icon_id": "22761837",
+      "name": "文件类型-Txt",
+      "font_class": "txt1",
+      "unicode": "e609",
+      "unicode_decimal": 58889
     },
     {
-      "icon_id": "32290624",
-      "name": "JPG转PDF",
-      "font_class": "JPGzhuanPDF",
-      "unicode": "e651",
-      "unicode_decimal": 58961
+      "icon_id": "24516106",
+      "name": "爆款",
+      "font_class": "baokuan",
+      "unicode": "e628",
+      "unicode_decimal": 58920
     },
     {
-      "icon_id": "34008131",
-      "name": "cbz 转 PDF",
-      "font_class": "a-cbzzhuanPDF",
-      "unicode": "e67c",
-      "unicode_decimal": 59004
+      "icon_id": "25566954",
+      "name": "企业微信",
+      "font_class": "qiyeweixin",
+      "unicode": "e627",
+      "unicode_decimal": 58919
     },
     {
-      "icon_id": "34008145",
-      "name": "HWP 转 PDF",
-      "font_class": "a-HWPzhuanPDF",
-      "unicode": "e67d",
-      "unicode_decimal": 59005
+      "icon_id": "12406913",
+      "name": "网址",
+      "font_class": "wangzhi",
+      "unicode": "e78b",
+      "unicode_decimal": 59275
     },
     {
       "icon_id": "631375",
@@ -74,34 +81,6 @@
       "font_class": "huo",
       "unicode": "e66c",
       "unicode_decimal": 58988
-    },
-    {
-      "icon_id": "4046524",
-      "name": "文件",
-      "font_class": "wenjian",
-      "unicode": "e636",
-      "unicode_decimal": 58934
-    },
-    {
-      "icon_id": "9920242",
-      "name": "word",
-      "font_class": "word",
-      "unicode": "e696",
-      "unicode_decimal": 59030
-    },
-    {
-      "icon_id": "16167292",
-      "name": "txt",
-      "font_class": "txt",
-      "unicode": "e6b0",
-      "unicode_decimal": 59056
-    },
-    {
-      "icon_id": "18174847",
-      "name": "文件,pdf",
-      "font_class": "pdf-full",
-      "unicode": "ea43",
-      "unicode_decimal": 59971
     }
   ]
 }

BIN
src/renderer/assets/css/fontx/iconfont.ttf


BIN
src/renderer/assets/css/fontx/iconfont.woff


BIN
src/renderer/assets/css/fontx/iconfont.woff2


+ 21 - 8
src/renderer/components/home.vue

@@ -890,6 +890,7 @@
 							};
 							
 							let titleFlag = true;
+							let skuNum = 0, mainNum = 0, videoNum = 0;
 							
 							page.on('response', async(response) => {
 								
@@ -995,9 +996,14 @@
 								if (response.headers()['content-type'] && response.headers()['content-type'].startsWith('image/')) {
 									let regex = /^https:\/\/img[0-9]+.360buyimg.com\/n/;
 									if(regex.exec(response.url())){ // 匹配符合规则的图片路径
-										if(response.url().indexOf('/s40x40_jfs/') > -1 && this.settingData.skuImg){ // sku图片
-											let skuNum = 0;
-											let skuImgUrl = response.url().replace('/s40x40_jfs/', '/jfs/').replace(/\/n[0-9]+\/jfs\//, '/n1/jfs/').replace('.avif', '');
+										let skuReg = /\/n[0-9]+\/s(60|40)x(80|40)_jfs\//;
+										if(response.url().match(skuReg) && this.settingData.skuImg){ // sku图片
+											let replaceStr = '/n1/s800x800_jfs/';
+											if(response.url().match(/\/n[0-9]+\/s60x80_jfs\//)){
+												replaceStr = '/n1/s750x1000_jfs/';
+											}
+											let skuImgUrl = response.url().replace(skuReg, replaceStr).replace('.avif', '');
+											if(response.url().match(skuReg))
 											jdImgInfo.skuImg.push(skuImgUrl);
 											
 											let fileName = skuImgUrl.split('/').pop();
@@ -1019,19 +1025,27 @@
 												}
 											}
 										}
+										
 										let reg = /\/n[0-9]+\/jfs\//;
-										let reg2 = /\/n[0-9]+\/s54x54_jfs\//;
+										let reg2 = /\/n[0-9]+\/s(54|50)x(54|66)_jfs\//;
 										if(response.url().match(reg) || response.url().match(reg2)){ // 主图
-											let mainNum = 0;
-											let mainImgUrl = response.url().replace(reg, '/n1/jfs/').replace(reg2, '/n1/jfs/').replace('.avif', '');
+											let replaceStr = '/n1/s800x800_jfs/';
+											if(response.url().match(/\/n[0-9]+\/s50x66_jfs\//)){
+												replaceStr = '/n1/s750x1000_jfs/';
+											}
+											let mainImgUrl = response.url().replace(reg, replaceStr).replace(reg2, replaceStr).replace('.avif', '');
 											jdImgInfo.mainImg.push(mainImgUrl);
 											
 											let fileName = mainImgUrl.split('/').pop();
 											if(fileName){
 												let queryIndex = fileName.indexOf('?');
+												let queryIndex2 =  fileName.indexOf('!');
 												if (queryIndex !== -1) {
 													fileName = fileName.substr(0, queryIndex);  
 												}
+												if (queryIndex2 !== -1) {
+													fileName = fileName.substr(0, queryIndex2);  
+												}
 												if (!fs.existsSync(urlInfo.newPath + '\\主图')) {
 													fs.mkdirSync(urlInfo.newPath + '\\主图');
 												}
@@ -1183,7 +1197,7 @@
 							const classList = await classListProperty.jsonValue();
 							const classesArray = Object.values(classList);
 							const allClasses = classesArray.join('.');
-							if(allClasses){
+							if(allClasses && allClasses.indexOf('active-') < 0){
 								await page.hover('li.'+allClasses);
 							}
 							
@@ -1750,7 +1764,6 @@
 </script>
 
 <style lang="scss">
-	@import "../assets/css/font/iconfont.css";
 	@import "../assets/css/fontx/iconfont.css";
 	@import "../assets/css/home.scss";
 

+ 35 - 8
src/renderer/components/update.vue

@@ -2,13 +2,8 @@
     <div>
 		<div :style="{background: '#fafafa', padding: '5px 20px', lineHeight: '34px'}" class="footer-between">
 		    <div>
+				<span @click="mianVisible = true" class="footer-menu"><i class="iconfont iconx-mianze-01"></i>免责声明</span>
 		        <a href="https://www.xingyousoft.com"><span class="footer-menu"><i class="iconfont iconx-wangzhi"></i>官网</span></a>
-				<el-popover placement="bottom" width="200" trigger="click" popper-class="wei-dialog">
-				    <a slot="reference"><span class="footer-menu"><i class="iconfont iconx-qiyeweixin"></i>客服</span></a>
-					<div class="api">
-						<img src="../assets/image/qrcode.png" style="width: 100%;"/>
-					</div>
-				</el-popover>
 		    </div>
 			
 			<div>
@@ -16,8 +11,14 @@
 				<a v-for="(item, key) in linkList" :key="key" @click="openUrl(item.url)"><span class="footer-menu">{{item.title}}</span></a>
 			</div>
 			
-		    <div style="cursor:pointer;position: relative;font-size: 13px;" @click="updateSoft()">
-		        <span>
+		    <div style="cursor:pointer;position: relative;font-size: 13px;" >
+				<el-popover placement="bottom" width="200" trigger="click" popper-class="wei-dialog">
+				    <a slot="reference"><span class="footer-menu"><i class="iconfont iconx-qiyeweixin"></i>客服</span></a>
+					<div class="api">
+						<img src="../assets/image/qrcode.png" style="width: 100%;"/>
+					</div>
+				</el-popover>
+		        <span @click="updateSoft()">
 					<el-badge is-dot v-if="isUpdate">
 						<i class="el-icon-refresh-right" style="font-size: 20px;"></i>
 					</el-badge>
@@ -46,6 +47,25 @@
 				<el-button type="primary" @click="execSoft()">确 定</el-button>
 			</span>
 		</el-dialog>
+		
+		<!-- 免责声明 -->
+		<el-dialog title="免责声明" :visible.sync="mianVisible" width="700px" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+			<div style="color: #666; font-size: 14px; line-height: 1.5;">
+				<p>所有使用{{softInfo.softName}}的用户(以下简称用户)在使用{{softInfo.softName}}(以下简称本软件)前必须阅读并同意本声明中的条款。否则,无权使用本软件。</p>
+				<p class="mian-title">1、法律合规性:</p>
+				<p>用户必须确保在使用本软件时,严格遵守国家及地方的法律法规,包括但不限于《中华人民共和国计算机信息网络国际联网管理暂行规定》等相关规定。
+				不得利用本软件非法访问或使用任何网站、系统或数据,以免触犯法律,导致法律责任。</p>
+				<p class="mian-title">2、使用风险与后果:</p>
+				<p>用户需自行承担因使用本软件而产生的所有风险和后果,包括但不限于下载失败、数据丢失、网站账号被封禁等。本软件不对任何因使用本软件而导致的直接或间接损失负责。<p>
+				<p class="mian-title">3、合理使用与道德约束:</p>
+				<p>用户从自己的网店或网址中提取图片、视频,不得用于任何违法、不道德或侵犯他人权益的目的。在使用过程中,应控制访问频率,避免对目标网站服务器造成过大负荷,影响网站正常运营,请用户自觉遵守他人的知识产权,不要使用未经授权的图片、商标等。</p>
+				<p class="mian-title">4、免责条款:</p>
+				<p>在任何情况下,本软件开发商均不对因使用本软件而产生的任何损失承担责任,包括但不限于直接经济损失、商誉损失、数据丢失等。</p>
+			</div>
+			<div slot="footer" class="dialog-footer-center">
+				<el-button @click="mianVisible = false;">同意并使用</el-button>
+			</div>
+		</el-dialog>
     </div>
 </template>
 
@@ -59,7 +79,9 @@
         name: "updateRef",
 		data(){
 			return {
+				mianVisible: false,
 				softInfo: {
+					softName: pjson.softInfo.softName,
 					version: pjson.version,
 					name: pjson.softInfo.downloadName,
 					percent: 0,
@@ -230,4 +252,9 @@
 .wei-dialog{
 	padding: 0 !important;
 }
+.mian-title{
+	color: #333;
+	font-weight: 600; 
+	padding: 9px 0;
+}
 </style>

Some files were not shown because too many files changed in this diff