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

src/sdk/association.ts

@@ -425,6 +425,7 @@ export const setupAssociation = (mountEl: HTMLDivElement) => {
       setting.value?.pose && sdk.comeTo(setting.value.pose)
 
       setBackdrop(setting.value!.back, setting.value!.backType);
+      setMap(setting.value!.mapOpen, setting.value!.mapType)
       
 
       ;(document.querySelector('#direction') as HTMLDivElement)!.style.display = setting.value!.openCompass ? 'block' : 'none';
@@ -449,7 +450,6 @@ export const setBackdrop = (back: string, type: SettingResourceType) => {
     sdk.switchMapType && sdk.switchMapType(back)
     // 'satellite' | 'standard'
 
-    setMap(setting.value!.mapOpen, setting.value!.mapType)
   } else if (type!== SettingResourceType.icon) {
     setting.value?.back && sdk.setBackdrop(back, type)
   } else {

src/views/setting/index.vue

@@ -51,7 +51,10 @@
             :class="{ [back.backType]: true, active: setting!.back === back.resource }"
             @click="setting!.back !== back.resource && changeBack(back.resource, back.backType, setting!.openCompass, setting!.mapOpen, setting!.mapType)"
           >
-            <img :src="back.resource" v-if="back.backType === 'img'" />
+            <img
+              :src="back.resource"
+              v-if="back.backType === 'img' || back.backType === 'bimg'"
+            />
             <i
               class="iconfont"
               :class="back.resource"
@@ -112,10 +115,10 @@
       <div class="edit-hot">
         <a
           @click="
-            () => {
-              addSettingResource(addTemp!);
+            async () => {
+              await addSettingResource(addTemp!);
               addTemp = undefined;
-              fetchSettingResources();
+              await fetchSettingResources();
             }
           "
         >