浏览代码

Merge branch 'develop-test' into develop

YaolongHan 4 年之前
父节点
当前提交
56bb864962
共有 3 个文件被更改,包括 22 次插入13 次删除
  1. 二进制
      src/assets/images/icons/switch-1.png
  2. 3 4
      src/components/floorMap/index.vue
  3. 19 9
      src/components/menuList.vue

二进制
src/assets/images/icons/switch-1.png


+ 3 - 4
src/components/floorMap/index.vue

@@ -324,11 +324,10 @@ export default {
         }
         if (isShopToWell) {
           this.popoverPosition.top = `${e.clientY + 70}px`;
-          this.popoverPosition.left = `${e.clientX+20}px`;
+          this.popoverPosition.left = `${e.clientX + 20}px`;
         } else {
-            this.popoverPosition.top = `${e.clientY}px`;
-            this.popoverPosition.left = `${e.clientX+30}px`;
-
+          this.popoverPosition.top = `${e.clientY}px`;
+          this.popoverPosition.left = `${e.clientX + 30}px`;
         }
 
         this.$nextTick(() => {

+ 19 - 9
src/components/menuList.vue

@@ -41,7 +41,7 @@
         "
       >
         <img class="img1" src="../assets/imgs/scj.png" alt />
-        <span class="span1">图例库</span>
+        <span class="span1" :style="showStyle?'color:#fff':''">图例库</span>
       </span>
 
       <span
@@ -52,7 +52,7 @@
         "
       >
         <img class="img2" src="../assets/imgs/cgx.png" alt />
-        <span class="span2">草稿箱</span>
+        <span class="span2" :style="showStyle?'color:#fff':''">草稿箱</span>
         <span class="span2-num" v-if="draftNum && draftNum <= 99">{{
           draftNum
         }}</span>
@@ -65,10 +65,19 @@
       </span>
       <span>
         <img class="img3" src="../assets/imgs/clock.png" alt />
-        <span class="span3">{{ times }}</span>
+        <span class="span3" :style="showStyle?'color:#fff':''">{{ times }}</span>
       </span>
       <div class="checkkout" v-show="showStyleBtn">
-        <img @click="checkColor" src="../assets/images/icons/switch.png" />
+        <img
+          v-show="showStyle"
+          @click="checkColor"
+          src="../assets/images/icons/switch.png"
+        />
+        <img
+          v-show="!showStyle"
+          @click="checkColor"
+          src="../assets/images/icons/switch-1.png"
+        />
         <div
           class="tip"
           :style="{ color: !showStyle ? '#8e9298' : '#69c4df' }"
@@ -223,9 +232,9 @@ export default {
           } else {
             this.showStyle = true;
             //   改变颜色风格
-            setTimeout(()=>{
+            setTimeout(() => {
               bus.$emit("changeStyleColor", true);
-            })
+            });
           }
         }
       } else {
@@ -288,11 +297,11 @@ export default {
       //   改变颜色风格
       bus.$emit("changeStyleColor", this.showStyle);
 
-       /**
+      /**
        * 皮肤模式切换后,存储用户名,皮肤模式
        */
-      const newV = this.showStyle ? 'dark':'light';
-      localStorage.setItem(`${this.userInfo.username}__skinMode`, newV)
+      const newV = this.showStyle ? "dark" : "light";
+      localStorage.setItem(`${this.userInfo.username}__skinMode`, newV);
     },
   },
 };
@@ -461,6 +470,7 @@ export default {
   align-items: center;
   line-height: 48px;
   color: #646c73;
+  margin-left: 16px;
   img {
     width: 24px;
     height: 24px;