From d365829b14ca4256d39694b9cdcd43bad0ad8595 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 11 二月 2022 18:18:39 +0800
Subject: [PATCH] bug修复

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

diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index be4ad27..4e668a0 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -44,6 +44,17 @@
                 step-strictly
                 size="small"
               ></el-input-number
+              >&nbsp;s -->
+
+              <el-input-number
+                v-model="min_len"
+                @change="fakeObj.min = +(min_len / 1.2)"
+                :min="5"
+                :step="5"
+                :max="120"
+                step-strictly
+                size="small"
+              ></el-input-number
               >&nbsp;s
             </div>
           </div>
@@ -102,6 +113,10 @@
                     style="cursor: pointer"
                     >{{ playSpan }}</span
                   >
+                  <!-- <span class="iconfont" v-else style="cursor: pointer">{{
+                    playSpan2
+                  }}</span> -->
+
                   <img
                     v-else
                     src="/images/settings/鏆傚仠.png"
@@ -113,6 +128,13 @@
                       margin-top: 15px;
                     "
                   />
+                  <!-- 
+                  <i
+                    v-if="!item.isPlay"
+                    class="el-icon-video-play"
+                    style=""
+                  ></i>
+                  <i v-else class="el-icon-video-pause"></i> -->
                 </span>
                 <span
                   class="icon iconfont del"
@@ -185,7 +207,7 @@
           <div class="top-title">鍥炬爣涓婚</div>
           <div class="icon-bar" style="cursor: pointer" @click="selectIcons(0)">
             <div class="bar-title">
-              <span class="title">鎵佸钩鍐欏疄鍥炬爣</span>
+              <span class="title">闈㈡�ч鏍�</span>
               <span
                 class="icon iconfont"
                 :class="activeIcons == 0 ? 'icon-active' : 'icon-normal'"
@@ -204,7 +226,7 @@
           </div>
           <div class="icon-bar" style="cursor: pointer" @click="selectIcons(1)">
             <div class="bar-title">
-              <span class="title">鎵佸钩鍖栧浘鏍�</span>
+              <span class="title">绠�绾﹂鏍�</span>
               <span
                 class="icon iconfont"
                 :class="activeIcons == 1 ? 'icon-active' : 'icon-normal'"
@@ -285,14 +307,22 @@
       },
       isPlay: false,
       realIconList: [
-        { url: "/images/settings/鏃ュ織绠＄悊.png", color: "green" },
-        { url: "/images/settings/瀹炴椂鐩戞帶.png", color: "yellow" },
-        { url: "/images/settings/鏁版嵁鍙鍖�.png", color: "pink" },
+        { url: "/images/settings/闈㈡�у浘鏍�/1浠板崸妫�娴�.png" },
+        { url: "/images/settings/闈㈡�у浘鏍�/2涓綋闈欐.png" },
+        { url: "/images/settings/闈㈡�у浘鏍�/3瀹夊叏璀︽垝.png" },
+        { url: "/images/settings/闈㈡�у浘鏍�/4瀹夊叏甯芥娴�.png" },
+        { url: "/images/settings/闈㈡�у浘鏍�/5濂旇窇.png" },
+        { url: "/images/settings/闈㈡�у浘鏍�/6杞﹁締妫�娴�.png" },
+        { url: "/images/settings/闈㈡�у浘鏍�/7鎶界儫.png" },
       ],
       flatIconList: [
-        { url: "/images/settings/鏁版嵁鎺ㄩ��.png" },
-        { url: "/images/settings/鏁版嵁鏍堥厤缃�.png" },
-        { url: "/images/settings/绯荤粺璁剧疆.png" },
+        { url: "/images/settings/绠�绾﹀浘鏍�/1浠板崸妫�娴�.png" },
+        { url: "/images/settings/绠�绾﹀浘鏍�/2涓綋闈欐.png" },
+        { url: "/images/settings/绠�绾﹀浘鏍�/3瀹夊叏璀︽垝.png" },
+        { url: "/images/settings/绠�绾﹀浘鏍�/4瀹夊叏甯芥娴�.png" },
+        { url: "/images/settings/绠�绾﹀浘鏍�/5濂旇窇.png" },
+        { url: "/images/settings/绠�绾﹀浘鏍�/6杞﹁締妫�娴�.png" },
+        { url: "/images/settings/绠�绾﹀浘鏍�/7鎶界儫.png" },
       ],
       tableBGList: [
         { name: "background", url: "/images/desktop/background.png" },
@@ -325,10 +355,16 @@
     });
     const url = this.curUser.backgroundpic;
     this.activeIcons = this.curUser.useIconType - 1;
-    this.universalColor = this.colorList.findIndex(
-      (x) => x.color == localStorage.getItem("--colorCard")
-    );
-    this.activeBg = url ? this.tableBGList.findIndex((x) => x.url == url) : 0;
+    this.universalColor = this.colorList.findIndex((x) => {
+      return x.color == localStorage.getItem("--colorCard");
+    });
+    if (url) {
+      this.activeBg = this.tableBGList.findIndex((x) => {
+        return x.url == url;
+      });
+    } else {
+      this.activeBg = 0;
+    }
     const e = this.$refs.curPage;
     e.addEventListener("click", (e) => {
       if (this.showUpload) {
@@ -364,6 +400,7 @@
       }).then((res) => {
         if (res.success) {
           sessionStorage.setItem("userInfo", JSON.stringify(res.data));
+          debugger;
           this.$message.success(res.msg);
         }
       });
@@ -796,7 +833,9 @@
         font-weight: 700;
         margin-top: 20px;
       }
-
+      /*     .icon-bar:hover {
+        background-color: rgba(233, 233, 233, 1);
+      } */
       .color-bar {
         display: flex;
         justify-content: center;

--
Gitblit v1.8.0