From 4cae7b89b60956e6c23e4c6e7a9e5a7b76927c53 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 16 十一月 2021 14:02:05 +0800
Subject: [PATCH] 解决冲突

---
 src/pages/settings/views/generalSettings.vue |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index 648d193..906cf8b 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -298,7 +298,9 @@
 <script>
 import { saveAlarmConfig, getDevInfo } from "@/api/system";
 import { uploadSound, getSoundList, deleteSound } from "@/api/event";
-
+import {
+  updateUser,
+} from "@/api/user";
 export default {
   data() {
     return {
@@ -349,9 +351,9 @@
         { url: "/images/settings/绯荤粺璁剧疆.png" },
       ],
       tableBGList: [
-        { name: "background", url: "/images/settings/background.png" },
-        { name: "message", url: "/images/settings/鏁版嵁鎺ㄩ��.png" },
-        { name: "weather", url: "/images/settings/绯荤粺璁剧疆.png" },
+        { name: "background", url: "/images/desktop/background.png" },
+        { name: "message", url: "/images/desktop/message.png" },
+        { name: "weather", url: "/images/desktop/weather.png" },
       ],
       universalColor:'',
       colorList: [
@@ -377,11 +379,11 @@
         _this.curPlayingIndex = null;
       }
     });
-    const url = localStorage.getItem("backgroundPic");
+    const url = this.curUser.backgroundpic;
     if (url) {
-      const arr = url.split("/");
+      // const arr = url.split("/");
       this.activeBg = this.tableBGList.findIndex((x) => {
-        return x.url.includes(arr[arr.length - 1]);
+        return x.url == url;
       });
     } else {
       this.activeBg = 0;
@@ -403,6 +405,10 @@
     max_video_len() {
       return Math.round(this.fakeObj.max * 1.2);
     },
+    curUser() {
+      const info = JSON.parse(sessionStorage.getItem("userInfo"));
+      return info;
+    },
   },
   methods: {
     formatTooltip(v) {
@@ -411,12 +417,16 @@
     pickBg(item, i) {
       this.activeBg = i;
       let message = "changeBackground?" + item.name;
-      window.parent.postMessage(
-        {
-          msg: message,
-        },
-        "*"
-      );
+      window.parent.postMessage(  {msg: message, }, "*" );
+      updateUser({
+        id: this.curUser.id,
+        backgroundpic: item.url,
+      }).then((res) => {
+        if (res.success) {
+          sessionStorage.setItem("userInfo", JSON.stringify(res.data))
+          this.$message.success(res.msg);
+        }
+      });
       this.$forceUpdate()
     },
     togglePlay(item, i) {

--
Gitblit v1.8.0