Merge branch 'xj' of http://192.168.0.115:3000/bill/fuse-code into xj

src/views/setting/index.vue

@@ -102,13 +102,20 @@
               v-else-if="back.backType === 'icon'"
             />
             <span :style="{ background: back.resource }" v-else></span>
-
-            <a class="back-item-desc">
-              {{
-                (settingResourceTypeDesc[back.backType] &&
-                  settingResourceTypeDesc[back.backType] + "-") + back.name
-              }}
-            </a>
+            <Tooltip placement="bottom">
+              <template #title>
+                {{
+                  (settingResourceTypeDesc[back.backType] &&
+                    settingResourceTypeDesc[back.backType] + "-") + back.name
+                }}
+              </template>
+              <a class="back-item-desc">
+                {{
+                  (settingResourceTypeDesc[back.backType] &&
+                    settingResourceTypeDesc[back.backType] + "-") + back.name
+                }}
+              </a>
+            </Tooltip>
 
             <ui-icon
               v-if="!back.sys"
@@ -136,8 +143,8 @@
     <Teleport
       to="#layout-app"
       v-if="
-        (setting?.backType === SettingResourceType.bottomImage &&
-          $router.currentRoute.value.name === RoutesName.setting)
+        setting?.backType === SettingResourceType.bottomImage &&
+        $router.currentRoute.value.name === RoutesName.setting
       "
     >
       <div class="slider-demo-block-group">
@@ -232,7 +239,8 @@ import { uploadFile } from "@/api";
 import { SettingResource, addSettingResource } from "@/api/setting-resource";
 import { SettingResourceType } from "@/api/setting-resource";
 import { Dialog } from "bill/index";
-import { Slider } from "ant-design-vue";
+import { Slider, Tooltip } from "ant-design-vue";
+import 'ant-design-vue/lib/tooltip/style/index.css';
 import { RoutesName } from "@/router";
 
 fetchSettingResources();