修改U学模式

src/main/events/ipc.js

@@ -55,23 +55,42 @@ class IpcEvents {
 
     // 显示右键菜单
     ipcMain.on('show-context-menu', (event) => {
+      const displayDetail = screen.getPrimaryDisplay();
+      const displayWH = displayDetail.size; //displayWH.width //displayWH.height
       const window_left_distance = Number( process.env.VUE_APP_WINDOW_LEFT );
       const window_bottom_distance = Number( process.env.VUE_APP_WINDOW_BOTTOM );
-      const displayDetail = screen.getPrimaryDisplay();
       let currentMode = this.store.get("currentMode");
-      let displayWH = displayDetail.size;
+      
+      const whDetail = {
+        'modeUXue': {
+          width: Number( process.env.VUE_APP_UXueModeW ),
+          height: Number( process.env.VUE_APP_UXueModeH ),
+        },
+        'modeJianYue': {
+          width: displayWH.width,
+          height: Number( process.env.VUE_APP_mainH ),
+        },
+        'modeJiJian': {
+          width: Number( process.env.VUE_APP_JiJianModeW ),
+          height: Number( process.env.VUE_APP_JiJianModeH ),
+        },
+      };
+      
+      
+      
       let template = [
         {
           label: '简约模式',
           str:'modeJianYue',
           click: () => {
+            let {width,height} = whDetail['modeJianYue'];
             event.sender.send('context-menu-command', 'modeJianYue');
             this.store.set("currentMode", "modeJianYue");
             this.windowManager.mainWindow.win.setBounds({ 
               x: window_left_distance, 
-              y: (displayWH.height - Number(process.env.VUE_APP_mainH) - window_bottom_distance),
-              width: displayWH.width, 
-              height: Number(process.env.VUE_APP_mainH) 
+              y: (displayWH.height - height - window_bottom_distance),
+              width, 
+              height 
             }, true);
           }
         },
@@ -79,13 +98,14 @@ class IpcEvents {
           label: '极简模式',
           str:'modeJiJian',
           click: () => {
+            let {width,height} = whDetail['modeJiJian'];
             event.sender.send('context-menu-command', 'modeJiJian');
             this.store.set("currentMode", "modeJiJian");
             this.windowManager.mainWindow.win.setBounds({ 
               x: window_left_distance, 
-              y: ( Number(displayWH.height) - Number( process.env.VUE_APP_JiJianModeH ) - window_bottom_distance), 
-              width: Number( process.env.VUE_APP_JiJianModeW ), 
-              height: Number( process.env.VUE_APP_JiJianModeH ) 
+              y: ( Number(displayWH.height) - height - window_bottom_distance), 
+              width, 
+              height 
             }, true);
           }
         },
@@ -93,12 +113,13 @@ class IpcEvents {
           label: 'U学模式',
           str:'modeUXue',
           click: () => {
+            let {width,height} = whDetail['modeUXue'];
             event.sender.send('context-menu-command', 'modeUXue');
             this.windowManager.mainWindow.win.setBounds({ 
               x: window_left_distance, 
-              y: ( Number(displayWH.height) - Number( process.env.VUE_APP_UXueModeH ) - window_bottom_distance), 
-              width: displayWH.width, 
-              height: Number( process.env.VUE_APP_UXueModeH ) 
+              y: ( Number(displayWH.height) - height - window_bottom_distance), 
+              width, 
+              height 
             }, true);
             this.store.set("currentMode", "modeUXue");
           }

src/renderer/components/Dockmode/second.vue

@@ -212,16 +212,17 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: center;
-    height: 72px;
-    margin-left: 40px;
+    // height: 72px;
+    height: 99px;
+    // margin-left: 40px;
+    padding: 0 50px 0 40px;
     background-size: contain;
     // background-size: 100%;
     background-position: center;
     background-repeat: no-repeat;
-    // border: 1px solid red;
-    // width: 820px;
-    max-width: 1100px;
+    // max-width: 1100px;
     // background-image: url(~@/assets/bgc/3.png);
+    // background-color: rgba(255, 255, 255, 0.2);
     .scroll_bar {
       height: 44px;
     }
@@ -273,35 +274,40 @@ export default {
     // }
     // background: linear-gradient(180deg, rgba(255,255,255,0) 45%, rgba(255,255,255,0.01) 55%, rgba(255,255,255,0) 100%);
   }
+  @tabHeight:50px;
   .tab_group {
     display: flex;
     align-items: center;
-    height: 30px;
+    height: @tabHeight;
     // padding: 0 90px 0 80px;
-    // padding: 0 50px;
+    padding: 0 26px;
     text-align: center;
-    background-image: url(~@/assets/bgc/1.png);
+    background-image: url(~@/assets/bgc/1.png),url(~@/assets/bgc/4.png);
+    background-position: 0 -1px, calc(100%) -1px;
     background-repeat: no-repeat;
-    background-size: contain;
-    background-position:40px -5px;
+    background-size: 26px 52px;
+    // background-position:40px -5px;
   }
   .tab_item {
     display: flex;
-    align-items: center;
+    // align-items: center;
     justify-content: center;
     // padding-top: 6px;
     // width: 176px;
     // width: 132px;
-    width: 206px;
+    // width: 206px;
+    width: 161px;
     // flex: 1;
     flex-shrink: 0;
     cursor: pointer;
-    line-height: 1;
+    // line-height: 1;
     height: 100%;
     background-image: url(~@/assets/bgc/3.png);
-    background-size: 206px 52px;
-    background-position: -50px ;
+    background-size: auto @tabHeight;
+    // background-position: -50px ;
     background-repeat: repeat;
+    box-sizing: border-box;
+    padding-top: 24px;
     // border: 1px solid red;
     &.disable {
       cursor: auto;
@@ -328,11 +334,14 @@ export default {
       
     }
     &.active {
+      padding-top: 20px;
       background-image: url(~@/assets/bgc/2.png);
       background-position: bottom;
       // background-size: auto 48px;
-      background-size: 100% 36px;
+      background-size: 100% @tabHeight;
       background-repeat: no-repeat;
+      width: 186px;
+      // background-color: rgba(255, 255, 255, 0.2);
       .tab_name {
         font-size: 14px;
         color: #FFFFFF;