style:百战style

JX3BOX · Jul 30, 2023 · eaeb108 · eaeb108
1 parent ecfc47c
commit eaeb108
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 6 deletions.
diff --git a/src/assets/css/baizhan/baizhan.less b/src/assets/css/baizhan/baizhan.less
@@ -44,6 +44,21 @@
         &:hover {
             .c-sidebar-left-toggle {
                 .db;
+                background-color: @baizhan_tab_bg;
+                border-color: @baizhan_tab_bg;
+                color: @baizhan_color;
+            }
+        }
+        @media screen and (max-width: @ipad) {
+            background-color: @baizhan_tab_bg;
+
+            .c-sidebar-left-toggle {
+                .none;
+            }
+            &:hover {
+                .c-sidebar-left-toggle {
+                    .none;
+                }
             }
         }
         .m-baizhan-left {
@@ -91,6 +106,9 @@
         &:hover {
             .c-sidebar-right-toggle {
                 .db;
+                background-color: #101827;
+                border-color: #101827;
+                color: @baizhan_color;
             }
         }
         &.is-close {

diff --git a/src/assets/css/baizhan/map_level_info.less b/src/assets/css/baizhan/map_level_info.less
@@ -77,6 +77,12 @@
                 }
                 .u-skill-icon {
                     .size(30px, 30px);
+                    &.is-passive {
+                        .size(26px, 26px);
+                        margin-right: 2px;
+                        margin-left: 2px;
+                        border-radius: 50%;
+                    }
                 }
                 &.u-skill-icon__1 {
                     // 白色

diff --git a/src/assets/css/baizhan/skills.less b/src/assets/css/baizhan/skills.less
@@ -110,6 +110,9 @@
                     // 黑色
                     border-color: @skill_7;
                 }
+                &.is-passive {
+                    border-radius: 50%;
+                }
                 img {
                     .size(100%, 100%);
                     transform: scale(1.15);

diff --git a/src/components/baizhan/main_tabs.vue b/src/components/baizhan/main_tabs.vue
@@ -15,7 +15,7 @@
         <div class="u-map-info">
             <div class="u-map-title">
                 <img class="u-title-icon" src="@/assets/img/baizhan/tabs/map_active.svg" alt="" />
-                <span>地图信息</span>
+                <span>{{ activeTab === "map" ? "地图" : "数据" }}信息</span>
             </div>
             <div class="u-map-update">更新时间：{{ update_time }}</div>
             <div class="u-map-duration">

diff --git a/src/components/baizhan/map_level_info.vue b/src/components/baizhan/map_level_info.vue
@@ -47,7 +47,12 @@
                         :href="getUrl(skill.skillId)"
                         target="_blank"
                     >
-                        <img class="u-skill-icon" :src="skill.skillIcon" :alt="skill.skillName" />
+                        <img
+                            class="u-skill-icon"
+                            :class="skill.isPassive && 'is-passive'"
+                            :src="skill.skillIcon"
+                            :alt="skill.skillName"
+                        />
                         <span>{{ skill.skillName }}</span>
                     </a>
                 </div>
@@ -81,6 +86,7 @@ export default {
                         skillName: skillObj?.szSkillName,
                         skillColor: skillObj?.nColor,
                         skillIcon: iconLink(skillObj?.skillIconId || 13),
+                        isPassive: !!~~skillObj?.Skill?.IsPassiveSkill,
                     };
                 }),
             };

diff --git a/src/components/baizhan/skill_icon.vue b/src/components/baizhan/skill_icon.vue
@@ -8,7 +8,10 @@
             :popper-class="`u-skill__popup__${source.nColor}`"
         >
             <template slot="reference">
-                <div class="u-skill-icon" :class="`u-skill-icon__${source.nColor}`">
+                <div
+                    class="u-skill-icon"
+                    :class="[!!~~data.IsPassiveSkill ? 'is-passive' : '', `u-skill-icon__${source.nColor}`]"
+                >
                     <img :src="iconLink(iconId || data.IconID, client)" @click.stop="getUrl(data.SkillID)" />
                 </div>
             </template>

diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue
@@ -62,8 +62,15 @@ export default {
         color: #c8c8c8 !important;
     }
     @media screen and (max-width: @ipad) {
-        .u-title {
-            margin-left: 20px;
+        .u-menu {
+            .db !important;
+        }
+        .u-channel-logo {
+            width: 0;
+            padding-left: 10px;
+            img {
+                .none !important;
+            }
         }
     }
     img,

diff --git a/src/views/Baizhan.vue b/src/views/Baizhan.vue
@@ -2,7 +2,7 @@
     <app-layout slug="baizhan" className="p-baizhan-app">
         <div class="p-baizhan" v-loading="loading">
             <LeftSidebar class="m-baizhan-sidebar">
-                <div class="m-baizhan-left" v-if="!isPhone()">
+                <div class="m-baizhan-left">
                     <main-tabs></main-tabs>
                     <keep-alive>
                         <component :is="leftComponent"></component>