add subtitle to nuoche;

Author: dotnet9

src/CodeWF/CodeWF.csproj

@@ -11,7 +11,7 @@
         <PackageReference Include="CodeWF.Tools" Version="1.3.5" />
         <PackageReference Include="Hashids.net" Version="1.7.0" />
         <PackageReference Include="Markdig" Version="0.40.0" />
-        <PackageReference Include="Known" Version="3.1.9" />
+        <PackageReference Include="Known" Version="3.2.0" />
         <ProjectReference Include="..\AntBlazor\AntBlazor.csproj" />
     </ItemGroup>
 

src/CodeWF/Pages/Tool/Converter/NuoChe.razor

@@ -36,6 +36,13 @@
                 <label for="title">标题</label>
                 <input type="text" id="title" placeholder="扫码挪车" value="扫码挪车" />
             </div>
+            <div class="input-group">
+                <div class="checkbox-container">
+                    <input type="checkbox" id="enableSubtitle" />
+                    <label for="enableSubtitle">添加小标题</label>
+                </div>
+                <input type="text" id="subtitle" placeholder="扫码联系车主或拨打电话: 16800000000" disabled />
+            </div>
             <div class="button-group">
                 <button class="primary-button" onclick="generateQrCode()">
                     <i class="fas fa-qrcode"></i> 生成二维码
@@ -289,17 +296,48 @@
     .download-link:hover {
         text-decoration: underline;
     }
-</style>
 
-<!-- 添加Font Awesome图标支持 -->
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
+    /* 添加小标题相关样式 */
+    .checkbox-container {
+        display: flex;
+        align-items: center;
+        margin-bottom: 8px;
+    }
+
+    .checkbox-container input[type="checkbox"] {
+        width: auto;
+        margin-right: 8px;
+    }
+
+    .checkbox-container label {
+        margin-bottom: 0;
+        font-weight: normal;
+    }
+
+    #subtitle {
+        transition: all 0.3s ease;
+    }
+
+    #subtitle:disabled {
+        background-color: #f5f5f5;
+        color: #999;
+    }
+</style>
 
-<!-- 在页面底部添加script标签 -->
-<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 <script>
     async function generateQrCode() {
         const title = document.getElementById('title').value;
         const phoneNumber = document.getElementById('phoneNumber').value;
+        const enableSubtitle = document.getElementById('enableSubtitle').checked;
+        let subtitle = null;
+        
+        if (enableSubtitle) {
+            subtitle = document.getElementById('subtitle').value.trim();
+            if (!subtitle) {
+                subtitle = `扫码联系车主或拨打电话: ${phoneNumber || "16800000000"}`;
+                document.getElementById('subtitle').value = subtitle;
+            }
+        }
 
         if (!title || !phoneNumber) {
             alert('请输入标题和手机号码');
@@ -314,7 +352,8 @@
                 },
                 body: JSON.stringify({
                     title: title,
-                    phoneNumber: phoneNumber
+                    phoneNumber: phoneNumber,
+                    subtitle: subtitle
                 })
             });
 
@@ -345,4 +384,32 @@
             alert('生成二维码失败，请稍后重试');
         }
     }
+
+    // 添加小标题复选框的事件处理
+    document.addEventListener('DOMContentLoaded', function() {
+        const enableSubtitleCheckbox = document.getElementById('enableSubtitle');
+        const subtitleInput = document.getElementById('subtitle');
+        const phoneInput = document.getElementById('phoneNumber');
+        
+        if (enableSubtitleCheckbox && subtitleInput) {
+            enableSubtitleCheckbox.addEventListener('change', function() {
+                subtitleInput.disabled = !this.checked;
+                if (this.checked) {
+                    if (!subtitleInput.value.trim()) {
+                        const phoneNumber = phoneInput.value.trim() || "16800000000";
+                        subtitleInput.value = `扫码联系车主或拨打电话: ${phoneNumber}`;
+                    }
+                    subtitleInput.focus();
+                }
+            });
+            
+            // 当手机号码变化时，如果小标题已启用且使用的是默认格式，则更新小标题中的电话号码
+            phoneInput.addEventListener('input', function() {
+                if (enableSubtitleCheckbox.checked && subtitleInput.value.startsWith('扫码联系车主或拨打电话:')) {
+                    const phoneNumber = this.value.trim() || "16800000000";
+                    subtitleInput.value = `扫码联系车主或拨打电话: ${phoneNumber}`;
+                }
+            });
+        }
+    });
 </script>

src/WebSite/Controllers/ImageController.cs

@@ -22,21 +22,16 @@ public async Task<IActionResult> MergeGenerateIconAsync([FromForm] IFormFile sou
     {
         try
         {
-            // 解析尺寸
             var convertSizes = sizes.Split(',').Select(uint.Parse).ToArray();
 
-            // 保存上传的文件
             var fullPath = await SaveFileAsync(sourceImage, env);
             var fileName = $"{Guid.NewGuid():N}.ico";
             var icoFullPath = Path.Combine(env.WebRootPath, IconFolder, fileName);
 
-            // 确保目录存在
             Directory.CreateDirectory(Path.Combine(env.WebRootPath, IconFolder));
 
-            // 生成图标
             await ImageHelper.MergeGenerateIcon(fullPath, icoFullPath, convertSizes);
 
-            // 返回可访问的URL
             var iconUrl = $"/{IconFolder}/{fileName}";
             return Ok(new { success = true, url = iconUrl });
         }
@@ -56,26 +51,20 @@ public async Task<IActionResult> SeparateGenerateIconAsync([FromForm] IFormFile
         {
             var convertSizes = sizes.Split(',').Select(uint.Parse).ToArray();
 
-            // 创建临时文件夹存放分离的图标
             var folderName = $"icons_{Guid.NewGuid():N}";
             var iconFolderPath = Path.Combine(env.WebRootPath, IconFolder, folderName);
             Directory.CreateDirectory(iconFolderPath);
 
-            // 保存上传的文件并生成图标
             var sourceFilePath = await SaveFileAsync(sourceImage, env);
             await ImageHelper.SeparateGenerateIcon(sourceFilePath, iconFolderPath, convertSizes);
 
-            // 创建压缩文件
             var zipFileName = $"{folderName}.zip";
             var zipFilePath = Path.Combine(env.WebRootPath, IconFolder, zipFileName);
 
-            // 压缩文件夹
             await Task.Run(() => sevenZipCompressor.Zip(iconFolderPath, zipFilePath));
 
-            // 清理临时文件夹
             Directory.Delete(iconFolderPath, true);
 
-            // 返回zip文件的URL
             var zipUrl = $"/{IconFolder}/{zipFileName}";
             return Ok(new { success = true, url = zipUrl });
         }
@@ -109,19 +98,16 @@ public async Task<IActionResult> NuoCheAsync([FromBody] NuoCheRequest request,
             var fileName = $"qrcode_{Guid.NewGuid():N}.png";
             var qrCodePath = Path.Combine(env.WebRootPath, IconFolder, fileName);
 
-            // 确保目录存在
             Directory.CreateDirectory(Path.Combine(env.WebRootPath, IconFolder));
 
-            // 生成二维码
-            QrCodeGenerator.GenerateQrCode(request.Title, generatedUrl, qrCodePath);
+            QrCodeGenerator.GenerateQrCode(request.Title, generatedUrl, qrCodePath, request.SubTitle);
 
-            // 返回可访问的URL
             var qrCodeUrl = $"/{IconFolder}/{fileName}";
             return Ok(new
             {
                 success = true,
-                qrCodeUrl = qrCodeUrl,
-                generatedUrl = generatedUrl
+                qrCodeUrl,
+                generatedUrl
             });
         }
         catch (Exception ex)
@@ -146,5 +132,6 @@ public class NuoCheRequest
     {
         public string Title { get; set; }
         public string PhoneNumber { get; set; }
+        public string? SubTitle { get; set; }
     }
 }

src/WebSite/WebSite.csproj

@@ -10,10 +10,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-	    <PackageReference Include="CodeWF.Tools.Image" Version="1.3.5.3" />
+	    <PackageReference Include="CodeWF.Tools.Image" Version="1.3.5.5" />
 	    <PackageReference Include="FluentValidation" Version="12.0.0-preview1" />
 	    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
-	    <PackageReference Include="Known.Core" Version="3.1.9" />
+	    <PackageReference Include="Known.Core" Version="3.2.0" />
 	    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-preview.1.25120.3" />
 	    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
 	    <PackageReference Include="Quartz.AspNetCore" Version="3.14.0" />