From fdff68fe9214595162e85cdadff2ff2ff294755f Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Fri, 10 Jan 2025 08:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html           |  4 ++--
 src/router/index.js         |  3 +++
 src/views/merchant/List.vue | 41 +++++++++++++++++++++++++++++--------
 3 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/public/index.html b/public/index.html
index 0f85304..540f684 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
-<html lang="">
+<html lang="en">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>蜂快 · 运营管理系统</title>
     <script>
       window._AMapSecurityConfig = {
         securityJsCode: '6c7f5a402a13bf2dee1a4bbe0d8023c7'
diff --git a/src/router/index.js b/src/router/index.js
index ebb0e65..4297fe8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -81,6 +81,9 @@ router.beforeEach((to, from, next) => {
       next('/login')
     }
   }
+
+  document.title = to.meta.title ? `${to.meta.title} - 蜂快 · 运营管理系统` : '蜂快 · 运营管理系统'
+  next()
 })
 
 export default router 
\ No newline at end of file
diff --git a/src/views/merchant/List.vue b/src/views/merchant/List.vue
index ceadf0c..a94a1bb 100644
--- a/src/views/merchant/List.vue
+++ b/src/views/merchant/List.vue
@@ -480,12 +480,31 @@ export default defineComponent({
 
     // 取消添加
     const handleCancel = () => {
+      // 重置表单数据
       formRef.value?.resetFields()
-      addModalVisible.value = false
+      
+      // 重置表单状态
+      formState.value = {
+        name: '',
+        business_hours: '',
+        address: '',
+        longitude: null,
+        latitude: null,
+        phone: ''
+      }
+      
+      // 重置搜索相关数据
+      searchAddress.value = ''
+      searchOptions.value = []
+      
+      // 清除地图标记
       if (addMarker.value) {
         addMarker.value.setMap(null)
         addMarker.value = null
       }
+      
+      // 关闭模态框
+      addModalVisible.value = false
     }
 
     // 图片管理相关
@@ -575,17 +594,23 @@ export default defineComponent({
       return true
     }
 
+    // 清空图片管理相关数据
+    const resetImageManager = () => {
+      fileList.value = []
+      currentMerchant.value = null
+      imageModalVisible.value = false
+      previewVisible.value = false
+      previewImage.value = ''
+      previewTitle.value = ''
+    }
+
     // 保存图片列表
     const handleSaveImages = async () => {
       try {
         imagesSaving.value = true
         
-        // 构造符合接口要求的数据格式
         const data = {
           images: fileList.value.map((file, index) => {
-            // 获取图片 URL 的优先级：
-            // 1. 如果是新上传的图片，从 response.urls[0] 获取
-            // 2. 如果是已有的图片，使用 url 字段
             const imageUrl = file.response?.urls?.[0] || file.url
             return {
               image_url: imageUrl,
@@ -594,13 +619,12 @@ export default defineComponent({
           })
         }
 
-        // 打印检查数据
         console.log('Saving data:', data)
 
         const res = await request.put(`/api/merchant/${currentMerchant.value.id}`, data)
         if (res.code === 200) {
           message.success('保存成功')
-          imageModalVisible.value = false
+          resetImageManager()  // 使用重置函数
           fetchData()
         } else {
           throw new Error(res.message || '保存失败')
@@ -615,8 +639,7 @@ export default defineComponent({
 
     // 取消图片管理
     const handleCancelImages = () => {
-      fileList.value = []
-      imageModalVisible.value = false
+      resetImageManager()  // 使用重置函数
     }
 
     onMounted(() => {
