From f8d73b1ddbd279a9c5195483867d3c2291e94685 Mon Sep 17 00:00:00 2001
From: yangchunlong <292345300@qq.com>
Date: Wed, 9 Apr 2025 09:25:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  9 +++++
 src/api/index.ts                              |  4 +-
 src/components/ProTable/index.vue             | 13 +++++--
 src/components/rulesForm/index.vue            | 12 +++++-
 .../components/Header/components/Avatar.vue   | 20 ++++++----
 .../components/Tabs/components/MoreButton.vue | 38 +++++++++++--------
 src/layouts/components/Tabs/index.vue         |  4 +-
 .../bannerManagement/list/constant/edit.ts    |  2 +-
 src/views/bannerManagement/list/index.vue     | 33 +++++++---------
 .../feedbackManagement/product/index.vue      | 33 +++-------------
 .../feedbackManagement/purchase/index.vue     | 12 +++++-
 .../productManagement/list/constant/edit.ts   | 32 ++++++++--------
 12 files changed, 115 insertions(+), 97 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 08f9635..04a2129 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,6 +5,8 @@
 </template>
 
 <script setup lang="ts">
+// import { useUserStore } from "@/stores/modules/user";
+// const userStore: any = useUserStore();
 import { reactive, ref, computed } from "vue";
 
 import { useTheme } from "@/hooks/useTheme";
@@ -26,4 +28,11 @@ const assemblySize = computed(() => globalStore.assemblySize);
 
 // element button config
 const buttonConfig = reactive({ autoInsertSpace: false });
+// watch(
+//     () => userStore.languageType,
+//     (newVal: any) => {
+//         console.log(newVal, "=======newVal=======");
+//         window.location.reload();
+//     }
+// );
 </script>
diff --git a/src/api/index.ts b/src/api/index.ts
index 41e3979..f0fb503 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -14,8 +14,10 @@ const getDispositionName = (response: any) => {
     //导出表格,从content-disposition获取表格的名称 只有导出服务端才会返回该字段
     const contentDisposition = response.headers["content-disposition"];
     if (contentDisposition) {
+        let contentDispositionClone = decodeURIComponent(contentDisposition);
+        console.log(contentDispositionClone);
         // 解析 Content-Disposition 以提取文件名
-        const filenameMatch = contentDisposition.match(/filename=(.*)/i);
+        const filenameMatch = contentDispositionClone.match(/filename=(.*)/i);
         if (filenameMatch && filenameMatch[1]) {
             let filename = filenameMatch[1].trim();
             localStorage.setItem("filename", filename);
diff --git a/src/components/ProTable/index.vue b/src/components/ProTable/index.vue
index a10397c..ce8e3b7 100644
--- a/src/components/ProTable/index.vue
+++ b/src/components/ProTable/index.vue
@@ -83,7 +83,7 @@
 
 <script setup lang="ts" name="ProTable">
 // /watch
-import { ref, provide, onMounted, watch } from "vue";
+import { ref, provide, onMounted } from "vue";
 import { ElTable } from "element-plus";
 import { useTable } from "@/hooks/useTable";
 import { useSelection } from "@/hooks/useSelection";
@@ -93,6 +93,8 @@ import SearchForm from "@/components/SearchForm/index.vue";
 import Pagination from "./components/Pagination.vue";
 import ColSetting from "./components/ColSetting.vue";
 import TableColumn from "./components/TableColumn.vue";
+// import { useUserStore } from "@/stores/modules/user";
+// const userStore = useUserStore();
 const $router = useRouter();
 const routeName: any = ref($router.currentRoute.value.name);
 export interface ProTableProps {
@@ -157,7 +159,7 @@ onMounted(() => props.requestAuto && getTableList());
 // 监听页面 initParam 改化，重新获取表格数据
 // watch(() => props.initParam, getTableList, { deep: true });
 // 监听页面 orgCode 改化，重新获取表格数据
-watch(() => props.orgCode, getTableList, { deep: true });
+// watch(() => userStore.languageType, getTableList, { deep: true });
 // 接收 columns 并设置为响应式
 const tableColumns = ref<ColumnProps[]>(props.columns);
 
@@ -195,7 +197,12 @@ const colRef = ref();
 const colSetting = tableColumns.value!.filter(
     item => !["selection", "index", "expand"].includes(item.type!) && item.prop !== "operation" && item.isShow
 );
-
+// watch(
+//     () => userStore.languageType,
+//     (newVal: any) => {
+//         console.log(newVal, "=newVal=");
+//     }
+// );
 // 暴露给父组件的参数和方法(外部需要什么，都可以从这里暴露出去)
 defineExpose({
     element: tableRef,
diff --git a/src/components/rulesForm/index.vue b/src/components/rulesForm/index.vue
index 17fcddc..0be99d9 100644
--- a/src/components/rulesForm/index.vue
+++ b/src/components/rulesForm/index.vue
@@ -108,7 +108,17 @@
                         >
                     </el-radio-group>
                 </template>
-
+                <!-- <template v-if="item.type === 'radio1'">
+                    <el-radio-group v-model="_ruleForm[`${item.prop}`]">
+                        <el-radio
+                            :value="option.value"
+                            :label="option.value"
+                            v-for="(option, optionIndex) in item.options"
+                            :key="optionIndex"
+                            >{{ option.label }}</el-radio
+                        >
+                    </el-radio-group>
+                </template> -->
                 <template v-if="item.type === 'upImg'">
                     <UploadImg v-model:image-url="_ruleForm[`${item.prop}`]">
                         <template #tip>
diff --git a/src/layouts/components/Header/components/Avatar.vue b/src/layouts/components/Header/components/Avatar.vue
index feeada8..d154eec 100644
--- a/src/layouts/components/Header/components/Avatar.vue
+++ b/src/layouts/components/Header/components/Avatar.vue
@@ -42,27 +42,29 @@ import { ref } from "vue";
 import { logoutApi } from "@/api/modules/login";
 import { useMsg } from "@/hooks/useMsg";
 import { useUserStore } from "@/stores/modules/user";
-
 import { ElMessageBox } from "element-plus";
 import { outLogin } from "@/utils/outLogin";
-//getLanguageCutoverApi
 import { getLanguageListApi, getLanguageCutoverApi } from "@/api/modules/global";
-const userStore: any = useUserStore();
 
+const userStore = useUserStore();
 document.cookie = `lang=zh_cn`;
 const langs = ref<any>([]);
 const name = ref("");
-//站点列表
+
+// 站点列表
 const getLanguageList = async () => {
     const result = await getLanguageListApi();
     if (result?.code === 0) {
         const { data } = result;
         langs.value = data;
-        getLanguageCutover(data[0]?.id);
+        console.log(userStore?.languageType, "=====  userStore?.languageType==========");
+        let id = userStore?.languageType ? userStore?.languageType : data[0]?.id;
+        getLanguageCutover(id);
     }
 };
 getLanguageList();
-//站点切换接口
+
+// 站点切换接口
 const getLanguageCutover = async (id: any) => {
     const result = await getLanguageCutoverApi(id);
     if (result?.code === 0) {
@@ -73,10 +75,12 @@ const getLanguageCutover = async (id: any) => {
         name.value = names[0]?.country_name;
     }
 };
-//站点切换事件
+
+// 站点切换事件
 const handleCommand = (val: string) => {
     getLanguageCutover(val);
 };
+
 // 退出登录
 const logout = () => {
     ElMessageBox.confirm("您是否确认重新登录?", "温馨提示", {
@@ -84,7 +88,7 @@ const logout = () => {
         cancelButtonText: "取消",
         type: "warning"
     }).then(async () => {
-        //1.退出登录
+        // 1. 退出登录
         const result: any = await logoutApi();
         if (result?.code === 0) {
             outLogin();
diff --git a/src/layouts/components/Tabs/components/MoreButton.vue b/src/layouts/components/Tabs/components/MoreButton.vue
index c129f00..0be6d05 100644
--- a/src/layouts/components/Tabs/components/MoreButton.vue
+++ b/src/layouts/components/Tabs/components/MoreButton.vue
@@ -34,30 +34,36 @@ import { useTabsStore } from "@/stores/modules/tabs";
 import { useGlobalStore } from "@/stores/modules/global";
 import { useKeepAliveStore } from "@/stores/modules/keepAlive";
 import { useRoute, useRouter } from "vue-router";
-// import { initCache } from "./init/init";
+import { useUserStore } from "@/stores/modules/user";
+const userStore = useUserStore();
 
-// import { useMsg } from "@/hooks/useMsg";
 const route = useRoute();
 const router = useRouter();
 const tabStore = useTabsStore();
 const globalStore = useGlobalStore();
 const keepAliveStore = useKeepAliveStore();
 
-// // refresh current page
-// const refreshCurrentPage: Function = inject("refresh") as Function;
-
-// const refresh = async () => {
-//     // initCache(data);
-//     setTimeout(() => {
-//         keepAliveStore.removeKeepAliveName(route.name as string);
-//         refreshCurrentPage(false);
-//         nextTick(() => {
-//             keepAliveStore.addKeepAliveName(route.name as string);
-//             refreshCurrentPage(true);
-//         });
-//     }, 300);
-// };
+// refresh current page
+const refreshCurrentPage: Function = inject("refresh") as Function;
 
+const refresh = async () => {
+    // initCache(data);
+    setTimeout(() => {
+        keepAliveStore.removeKeepAliveName(route.name as string);
+        refreshCurrentPage(false);
+        nextTick(() => {
+            keepAliveStore.addKeepAliveName(route.name as string);
+            refreshCurrentPage(true);
+        });
+    }, 300);
+};
+watch(
+    () => userStore.languageType,
+    (newVal: any) => {
+        refresh();
+        console.log(newVal, "我是tab");
+    }
+);
 // maximize current page
 const maximize = () => {
     globalStore.setGlobalState("maximize", true);
diff --git a/src/layouts/components/Tabs/index.vue b/src/layouts/components/Tabs/index.vue
index 627b2a0..fc5a5ce 100644
--- a/src/layouts/components/Tabs/index.vue
+++ b/src/layouts/components/Tabs/index.vue
@@ -31,6 +31,7 @@ import { useTabsStore } from "@/stores/modules/tabs";
 import { useAuthStore } from "@/stores/modules/auth";
 import { useKeepAliveStore } from "@/stores/modules/keepAlive";
 import { TabsPaneContext, TabPaneName } from "element-plus";
+
 import MoreButton from "./components/MoreButton.vue";
 
 const route = useRoute();
@@ -55,9 +56,6 @@ watch(
     () => {
         if (route.meta.isFull) return;
         tabsMenuValue.value = route.fullPath;
-        // const TITLES_OBJ = {
-        //     "/articleManagement/list/edit?type=add": "添加文章"
-        // };
         let title: any = route.query.title ? route.query.title : route.meta.title;
         const tabsParams = {
             icon: route.meta.icon as string,
diff --git a/src/views/bannerManagement/list/constant/edit.ts b/src/views/bannerManagement/list/constant/edit.ts
index 48530dd..6852bf3 100644
--- a/src/views/bannerManagement/list/constant/edit.ts
+++ b/src/views/bannerManagement/list/constant/edit.ts
@@ -61,7 +61,7 @@ export const EDIT_FORM_DATA: FormItem[] = [
             },
             {
                 label: "否",
-                value: 0
+                value: -1
             }
         ]
     },
diff --git a/src/views/bannerManagement/list/index.vue b/src/views/bannerManagement/list/index.vue
index cf35b8f..5879838 100644
--- a/src/views/bannerManagement/list/index.vue
+++ b/src/views/bannerManagement/list/index.vue
@@ -152,15 +152,24 @@ const buildTree = (data: any, outerLinkTo: any = "") => {
 };
 // let isFirstRequest = true;
 const handleRadioGroupEmits = (value: any) => {
+    // if (value !== "video" || value !== "image") {
+    //     return;
+    // }
+    if (value === "video") {
+        dataStore.editFormData = EDIT_FORM_DATA1;
+        dataStore.rules = RULES1;
+        getBannerClassEditList();
+    }
     // getBannerClassList();
     if (value === "image") {
         dataStore.isFirstRequest = true;
         dataStore.editFormData = EDIT_FORM_DATA;
         dataStore.rules = RULES;
-    } else {
-        dataStore.editFormData = EDIT_FORM_DATA1;
-        dataStore.rules = RULES1;
+        getBannerClassEditList();
     }
+
+    // console.log(value, "==========value==========");
+    // getBannerClassEditList();
 };
 
 const getSystemUrls = async (node: any, resolve: any) => {
@@ -205,7 +214,6 @@ const getBannerRead = async (id: any) => {
     if (result?.code === 0) {
         dataStore.editRuleForm = result?.data;
         setImgOrVideo();
-
         if (dataStore.editRuleForm.link && dataStore.editRuleForm.link_to) {
             let { id, name, link } = dataStore.editRuleForm.link_echo_data;
             let obj: any = {
@@ -277,7 +285,7 @@ const getBannerClassEditList = async () => {
     }
 };
 
-// 新增 getBannerListSave
+// 新增
 const getBannerListSave = async () => {
     const result = await getBannerListSaveApi(dataStore.editRuleForm);
     if (result?.code === 0) {
@@ -370,21 +378,6 @@ const handleBlur = (row: any) => {
 const handleInput = (row: any) => {
     row.sort = integerRexg(row.sort);
 };
-// watch(
-//     () => dataStore.editRuleForm.type,
-//     newVal => {
-//         console.log(dataStore.editRuleForm.type);
-//         if (newVal === "video") {
-//             dataStore.editFormData = EDIT_FORM_DATA1;
-//         } else {
-//             dataStore.editFormData = EDIT_FORM_DATA;
-//         }
-//     },
-//     {
-//         immediate: true,
-//         deep: true
-//     }
-// );
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/feedbackManagement/product/index.vue b/src/views/feedbackManagement/product/index.vue
index d187ce6..ae09ca4 100644
--- a/src/views/feedbackManagement/product/index.vue
+++ b/src/views/feedbackManagement/product/index.vue
@@ -14,10 +14,10 @@
 
 <script setup lang="ts" name="feedbackProductIndex">
 import ProTable from "@/components/ProTable/index.vue";
-
+// const $router = useRouter();
 //列表接口
 import { getProductListApi } from "@/api/modules/product";
-// import { getCountryListApi } from "@/api/modules/global";
+
 // import { useUserStore } from "@/stores/modules/user";
 // const userStore: any = useUserStore();
 //深拷贝方法
@@ -32,36 +32,15 @@ const dataStore = reactive<any>({
     initParam: cloneDeep(RULE_FORM), // 初始化搜索条件|重置搜索条件
     ruleForm: cloneDeep(RULE_FORM), // 搜索參數
     formData: FORM_DATA //搜索配置项
-    // ZH: [],
-    // EN: []
 });
 
-// const getCountryList = async () => {
-//     const result = await getCountryListApi();
-
-//     if (result?.code === 0) {
-//         dataStore.ZH = [];
-//         dataStore.EN = [];
-//         result?.data.forEach((item: any) => {
-//             dataStore.ZH.push({
-//                 label: item.name,
-//                 value: item.id
-//             });
-//             dataStore.EN.push({
-//                 label: item.name,
-//                 value: item.id
-//             });
-//         });
-//         dataStore.formData[1].options = userStore.languageType === 1 ? dataStore.ZH : dataStore.EN;
-//     }
-// };
-// getCountryList();
 // watch(
 //     () => userStore.languageType,
 //     (newVal: any) => {
-//         dataStore.formData[1].options = newVal === 1 ? dataStore.ZH : dataStore.EN;
-//     },
-//     { deep: true, immediate: true }
+//         console.log(newVal, "=======newVal=======");
+//         // window.location.reload();
+//         $router.go(0);
+//     }
 // );
 </script>
 
diff --git a/src/views/feedbackManagement/purchase/index.vue b/src/views/feedbackManagement/purchase/index.vue
index 5667c74..abdbf2e 100644
--- a/src/views/feedbackManagement/purchase/index.vue
+++ b/src/views/feedbackManagement/purchase/index.vue
@@ -19,6 +19,8 @@
 <script setup lang="ts" name="feedbackContactIndex">
 import ProTable from "@/components/ProTable/index.vue";
 import { useExport } from "@/hooks/useExport";
+// import { useUserStore } from "@/stores/modules/user";
+// const userStore: any = useUserStore();
 //列表接口
 import { getBPListExportApi, getBPListApi, getBPInterestedListApi } from "@/api/modules/purchase";
 //深拷贝方法
@@ -58,10 +60,18 @@ const getBPInterestedList = async () => {
             });
         });
         dataStore.formData[1].options = arr;
-        console.log(result?.data, "=======data========");
     }
 };
 getBPInterestedList();
+// watch(
+//     () => userStore.languageType,
+//     (newVal: any) => {
+//         console.log(newVal);
+
+//         getBPInterestedList();
+//     },
+//     { deep: true, immediate: true }
+// );
 </script>
 
 <style scoped></style>
diff --git a/src/views/productManagement/list/constant/edit.ts b/src/views/productManagement/list/constant/edit.ts
index f8fb54c..8d49e11 100644
--- a/src/views/productManagement/list/constant/edit.ts
+++ b/src/views/productManagement/list/constant/edit.ts
@@ -109,22 +109,22 @@ export const BASIC_INFO_FORM_DATA: FormItem[] = [
         ]
     },
 
-    {
-        prop: "is_show1",
-        placeholder: "",
-        type: "radio",
-        label: "是否启用: ",
-        options: [
-            {
-                label: "是",
-                value: 1
-            },
-            {
-                label: "否",
-                value: 0
-            }
-        ]
-    },
+    // {
+    //     prop: "is_show1",
+    //     placeholder: "",
+    //     type: "radio",
+    //     label: "是否启用: ",
+    //     options: [
+    //         {
+    //             label: "是",
+    //             value: 1
+    //         },
+    //         {
+    //             label: "否",
+    //             value: -1
+    //         }
+    //     ]
+    // },
 
     {
         prop: "seo_title",