From e823349e201b3eb3759675fd31d2b92402c98a0d Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 3 Apr 2025 17:12:07 +0800
Subject: [PATCH] 11

---
 src/App.vue                                   | 80 +++++++++----------
 src/components/Select/SelectHardSpu.vue       |  4 +-
 src/views/hard/hard-spu-repertory/form.vue    |  2 +-
 .../wallet/wallet-rule-transaction/index.vue  |  4 +-
 4 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d59f175..d6cb27a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,79 +8,79 @@
 </template>
 
 <script setup lang="ts" name="app">
-import { useI18n } from 'vue-i18n';
-import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
-import { useThemeConfig } from '/@/stores/themeConfig';
-import other from '/@/utils/other';
-import { Local, Session } from '/@/utils/storage';
-import mittBus from '/@/utils/mitt';
-import setIntroduction from '/@/utils/setIconfont';
+import { useI18n } from "vue-i18n"
+import { useTagsViewRoutes } from "/@/stores/tagsViewRoutes"
+import { useThemeConfig } from "/@/stores/themeConfig"
+import other from "/@/utils/other"
+import { Local, Session } from "/@/utils/storage"
+import mittBus from "/@/utils/mitt"
+import setIntroduction from "/@/utils/setIconfont"
 
 // 引入组件
-const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue'));
-const Setings = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/setings.vue'));
-const CloseFull = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/closeFull.vue'));
+const LockScreen = defineAsyncComponent(() => import("/@/layout/lockScreen/index.vue"))
+const Setings = defineAsyncComponent(() => import("/@/layout/navBars/breadcrumb/setings.vue"))
+const CloseFull = defineAsyncComponent(() => import("/@/layout/navBars/breadcrumb/closeFull.vue"))
 
 // 定义变量内容
-const { messages, locale } = useI18n();
-const settingsRef = ref();
-const route = useRoute();
-const stores = useTagsViewRoutes();
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
+const { messages, locale } = useI18n()
+const settingsRef = ref()
+const route = useRoute()
+const stores = useTagsViewRoutes()
+const storesThemeConfig = useThemeConfig()
+const { themeConfig } = storeToRefs(storesThemeConfig)
 
 // 设置锁屏时组件显示隐藏
 const setLockScreen = computed(() => {
 	// 防止锁屏后，刷新出现不相关界面
 	// https://gitee.com/lyt-top/vue-next-admin/issues/I6AF8P
-	return themeConfig.value.isLockScreen ? themeConfig.value.lockScreenTime > 1 : themeConfig.value.lockScreenTime >= 0;
-});
+	return themeConfig.value.isLockScreen ? themeConfig.value.lockScreenTime > 1 : themeConfig.value.lockScreenTime >= 0
+})
 
 // 获取全局组件大小
 const getGlobalComponentSize = computed(() => {
-	return other.globalComponentSize();
-});
+	return other.globalComponentSize()
+})
 // 获取全局 i18n
 const getGlobalI18n = computed(() => {
-	return messages.value[locale.value];
-});
+	return messages.value[locale.value]
+})
 // 设置初始化，防止刷新时恢复默认
 onBeforeMount(() => {
 	// 设置批量第三方 icon 图标
-	setIntroduction.cssCdn();
+	setIntroduction.cssCdn()
 	// 设置批量第三方 js
-	setIntroduction.jsCdn();
-});
+	setIntroduction.jsCdn()
+})
 // 页面加载时
 onMounted(() => {
 	nextTick(() => {
 		// 监听布局配'置弹窗点击打开
-		mittBus.on('openSetingsDrawer', () => {
-			settingsRef.value.openDrawer();
-		});
+		mittBus.on("openSetingsDrawer", () => {
+			settingsRef.value.openDrawer()
+		})
 		// 获取缓存中的布局配置
-		if (Local.get('themeConfig')) {
-			storesThemeConfig.setThemeConfig({ themeConfig: Local.get('themeConfig') });
-			document.documentElement.style.cssText = Local.get('themeConfigStyle');
+		if (Local.get("themeConfig")) {
+			storesThemeConfig.setThemeConfig({ themeConfig: Local.get("themeConfig") })
+			document.documentElement.style.cssText = Local.get("themeConfigStyle")
 		}
 		// 获取缓存中的全屏配置
-		if (Session.get('isTagsViewCurrenFull')) {
-			stores.setCurrenFullscreen(Session.get('isTagsViewCurrenFull'));
+		if (Session.get("isTagsViewCurrenFull")) {
+			stores.setCurrenFullscreen(Session.get("isTagsViewCurrenFull"))
 		}
-	});
-});
+	})
+})
 // 页面销毁时，关闭监听布局配置/i18n监听
 onUnmounted(() => {
-	mittBus.off('openSetingsDrawer', () => {});
-});
+	mittBus.off("openSetingsDrawer", () => {})
+})
 // 监听路由的变化，设置网站标题
 watch(
 	() => route.path,
 	() => {
-		other.useTitle();
+		other.useTitle()
 	},
 	{
 		deep: true,
-	}
-);
+	},
+)
 </script>
diff --git a/src/components/Select/SelectHardSpu.vue b/src/components/Select/SelectHardSpu.vue
index bafec4c..6813f05 100644
--- a/src/components/Select/SelectHardSpu.vue
+++ b/src/components/Select/SelectHardSpu.vue
@@ -17,7 +17,9 @@
 			<div class="flex items-center">
 				<div class="color-primary">{{ v.name }}</div>
 				<div class="flex items-center justify-center ml5">
-					<dict-tag :options="state.hardType" :value="v.type" />
+					<div class="flex items-center justify-center ml5">
+						<el-tag size="small"> {{ v.merchantName }} </el-tag>
+					</div>
 				</div>
 			</div>
 		</el-option>
diff --git a/src/views/hard/hard-spu-repertory/form.vue b/src/views/hard/hard-spu-repertory/form.vue
index 60127b4..34034c8 100644
--- a/src/views/hard/hard-spu-repertory/form.vue
+++ b/src/views/hard/hard-spu-repertory/form.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+	<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
 		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
diff --git a/src/views/wallet/wallet-rule-transaction/index.vue b/src/views/wallet/wallet-rule-transaction/index.vue
index 658847a..a680c77 100644
--- a/src/views/wallet/wallet-rule-transaction/index.vue
+++ b/src/views/wallet/wallet-rule-transaction/index.vue
@@ -81,7 +81,7 @@
 						</el-table-column>
 					</el-table-column>
 					<el-table-column label="目标钱包">
-						<el-table-column width="110" label="源钱包">
+						<el-table-column width="110" label="目标钱包">
 							<template #default="{ row }">
 								<div class="flex flex-col items-center justify-center">
 									<div class="color-primary">{{ row.targetWalletTypeName }}</div>
@@ -91,7 +91,7 @@
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column width="110" prop="sourceWalletBalance" label="源钱包余额">
+						<el-table-column width="110" prop="sourceWalletBalance" label="目标钱包余额">
 							<template #default="{ row }">
 								<span class="color-success">{{ displayPrice(row.targetWalletBalance) }}</span>
 							</template>