Merge branch 'v1.7.0' of http://192.168.0.115:3000/bill/fuse-code into v1.7.0

src/api/setting.ts

@@ -1,5 +1,5 @@
 import { GET_SETTING, UPDATE_SETTING } from "./constant";
-import defaultCover from "@/assets/pic.jpg";
+import defaultCover from "@/assets/cover.png";
 import { params } from "@/env";
 import axios from "./instance";
 
@@ -16,11 +16,11 @@ export type Setting = {
     position: SceneLocalPos;
     target: SceneLocalPos;
     panoInfo?: {
-      panoId: any,
-      modelId: string,
-      posInModel: SceneLocalPos,
-      rotInModel: SceneLocalPos
-    },
+      panoId: any;
+      modelId: string;
+      posInModel: SceneLocalPos;
+      rotInModel: SceneLocalPos;
+    };
   };
   cover: string;
   back: string;
@@ -32,7 +32,7 @@ const toLocal = (serviceSetting: ServeSetting): Setting => ({
   id: serviceSetting.settingsId,
   pose: serviceSetting.pose && JSON.parse(serviceSetting.pose),
   cover: serviceSetting.cover || defaultCover,
-  back: serviceSetting.back || "none",
+  back: serviceSetting.back || "map",
 });
 
 const toService = (setting: Setting): ServeSetting => ({

src/sdk/association/setting.ts

@@ -1,6 +1,6 @@
 import { setting } from "@/store";
 import { nextTick, watchEffect } from "vue";
-import { SDK } from "../sdk";
+import { SDK, SettingResourceType } from "../sdk";
 import { setPose } from ".";
 
 export const associationSetting = (sdk: SDK, mountEl: HTMLDivElement) => {
@@ -10,7 +10,7 @@ export const associationSetting = (sdk: SDK, mountEl: HTMLDivElement) => {
 
   const stopWatchPose = watchEffect(() => {
     if (!setting.value?.pose) return;
-    setPose(setting.value?.pose)
+    setPose(setting.value?.pose);
     nextTick(() => stopWatchPose());
   });
 
@@ -20,4 +20,14 @@ export const associationSetting = (sdk: SDK, mountEl: HTMLDivElement) => {
       direEl.style.display = setting.value.openCompass ? "block" : "none";
     }
   });
+
+  watchEffect(() => {
+    console.log(setting.value!.back);
+    const back = setting.value!.back || "map";
+    sdk.setBackdrop(
+      back,
+      back === "map" ? SettingResourceType.map : SettingResourceType.envImage,
+      {}
+    );
+  });
 };

src/views/setting/index.vue

@@ -9,24 +9,20 @@
       </ui-group-option>
     </ui-group>
 
-    <!-- <ui-group title="设置天空">
+    <ui-group title="设置天空">
       <ui-group-option>
         <div class="back-layout">
-          <div
-            v-for="back in backs"
-            :key="back.value"
-            class="back-item"
-            :class="{ [back.type]: true, active: setting!.back === back.value}"
-            @click="setting!.back !== back.value && changeBack(back.value)"
-          >
-            <img :src="back.image" v-if="back.type === 'img'" />
+          <div v-for="back in backs" :key="back.value" class="back-item"
+            :class="{ [back.type]: true, active: setting!.back === back.value }"
+            @click="setting!.back !== back.value && changeBack(back.value)">
+            <img :src="back.image" v-if="['img', 'map'].includes(back.type)" />
             <i class="iconfont" :class="back.image" v-else-if="back.type === 'icon'" />
             <span :style="{ background: back.image }" v-else></span>
             <p class="back-item-desc">{{ back.label }}</p>
           </div>
         </div>
       </ui-group-option>
-    </ui-group> -->
+    </ui-group>
   </RightFillPano>
 </template>
 
@@ -43,6 +39,12 @@ watchEffect(async () => {
   backs.value = [
     { label: "无", type: "icon", image: "icon-without", value: "none" },
     {
+      label: "地图",
+      type: "map",
+      image: (await import("./images/map.png")).default,
+      value: "map",
+    },
+    {
       label: "蓝天白云",
       type: "img",
       image: (await import("./images/pic_ltby@2x.png")).default,
@@ -78,9 +80,9 @@ watchEffect(async () => {
       image: (await import("./images/pic_bw@2x.png")).default,
       value: (await import("./images/傍晚.jpg")).default,
     },
-    { label: "灰色", type: "color", image: "#333333", value: "#333" },
-    { label: "黑色", type: "color", image: "#000000", value: "#000" },
-    { label: "白色", type: "color", image: "#ffffff", value: "#fff" },
+    // { label: "灰色", type: "color", image: "#333333", value: "#333" },
+    // { label: "黑色", type: "color", image: "#000000", value: "#000" },
+    // { label: "白色", type: "color", image: "#ffffff", value: "#fff" },
   ];
 });
 
@@ -109,7 +111,6 @@ const initBack = setting.value!.back;
 let isFirst = true;
 const changeBack = (back: string) => {
   setting.value!.back = back;
-  sdk.setBackdrop(back, SettingResourceType.envImage, {});
 
   if (isFirst) {
     let isSave = false;
@@ -117,7 +118,6 @@ const changeBack = (back: string) => {
     enterEdit(() => {
       if (!isSave) {
         setting.value!.back = initBack;
-        sdk.setBackdrop(initBack, SettingResourceType.envImage, {});
       }
       isFirst = true;
     });
@@ -164,7 +164,8 @@ const changeBack = (back: string) => {
 }
 
 .back-item {
-  > span,
+
+  >span,
   .iconfont,
   img {
     display: block;
@@ -188,7 +189,8 @@ const changeBack = (back: string) => {
   }
 
   &.active {
-    > span,
+
+    >span,
     .iconfont,
     img {
       outline-color: #00c8af;