Nnuo 8 éve
szülő
commit
38da1b9626

+ 1 - 1
resources/app/browser.html

@@ -33,7 +33,7 @@
         </li>
         <ul class="OnclickMenu" id="CampusInfoBrowserOnclickMenu">
             <li>关于我们</li>
-            <li>反馈</li>
+            <li onclick="CampusInfoBrowser.OnclickMenu.Feedback()">反馈</li>
             <li onclick="CampusInfoBrowser.OnclickMenu.History()">历史记录</li>
             <li onclick="CampusInfoBrowser.OnclickMenu.Clear()">清除缓存</li>
         </ul>

+ 24 - 24
resources/app/history.html

@@ -18,30 +18,30 @@
 </section>
 <script src="./public/js/uform.js"></script>
 <script>
-    const electron = require('electron');
-    var ipc=require('electron').ipcRenderer;
-    var BrowserHistory = $(".CampusInfoBrowserHistory")[0];
-    for (a in localStorage) {
-        var str = localStorage[a];
-        var storage = JSON.parse(str)
-        HistoryBody=$$("div", {
-            "className": "history_body","title":storage.title,
-        }, BrowserHistory);
-        var first=BrowserHistory.firstChild;//得到第一个元素 
-        BrowserHistory.insertBefore(HistoryBody,first);//在得到的第一个元素之前插入 
-        HistoryBody.time=$$("span", {
-            "className": "history_time","innerHTML":storage.time,
-        }, HistoryBody);
-        HistoryBody.title=$$("p", {
-            "className": "history_title","innerHTML":storage.title,
-        }, HistoryBody);
-        HistoryBody.url=$$("p", {
-            "className": "history_url","innerHTML":storage.url,
-        }, HistoryBody);
-    }
-    $(".newBrowserClose")[0].onclick=function(){
-        ipc.send('BrowserWindow-hide-window');
-    }
+const electron = require('electron');
+var ipc=require('electron').ipcRenderer;
+var BrowserHistory = $(".CampusInfoBrowserHistory")[0];
+for (a in localStorage) {
+    var str = localStorage[a];
+    var storage = JSON.parse(str)
+    HistoryBody=$$("div", {
+        "className": "history_body","title":storage.title,
+    }, BrowserHistory);
+    var first=BrowserHistory.firstChild;//得到第一个元素 
+    BrowserHistory.insertBefore(HistoryBody,first);//在得到的第一个元素之前插入 
+    HistoryBody.time=$$("span", {
+        "className": "history_time","innerHTML":storage.time,
+    }, HistoryBody);
+    HistoryBody.title=$$("p", {
+        "className": "history_title","innerHTML":storage.title,
+    }, HistoryBody);
+    HistoryBody.url=$$("p", {
+        "className": "history_url","innerHTML":storage.url,
+    }, HistoryBody);
+}
+$(".newBrowserClose")[0].onclick=function(){
+    ipc.send('BrowserHistory-hide-window');
+}
 </script>
 </body>
 </html>

+ 4 - 1
resources/app/public/js/browser.js

@@ -324,7 +324,10 @@ CampusInfoBrowser.Init=function () {//初始化
     };
     setInterval('CampusInfoBrowser.Action()',1000);
     CampusInfoBrowser.OnclickMenu.History=function(){
-        ipc.send('BrowserWindow-show-window');
+        ipc.send('BrowserHistory-show-window');
+    }
+    CampusInfoBrowser.OnclickMenu.Feedback=function(){
+        ipc.send('BrowserFeedback-show-window');
     }
     
     CampusInfoBrowser.OnclickMenu.Clear=function(){

+ 58 - 22
resources/app/start.js

@@ -4,8 +4,7 @@ const url = require('url');
 const ipc = electron.ipcMain;
 const app = electron.app;
 const BrowserWindow = electron.BrowserWindow;
-let mainWindow;
-let newBrowserWindow
+let mainWindow,BrowserHistory,BrowserFeedback;
 ipc.on('window-all-closed', function () {//退出
     app.quit();
 });
@@ -19,7 +18,7 @@ ipc.on('orignal-window', function () {//还原
     mainWindow.unmaximize();
 });
 function createWindow() {
-    mainWindow = new BrowserWindow({
+    mainWindow = new BrowserWindow({//游览器窗口
         width: 10000, 
         height: 5000,
         minWidth: 800,
@@ -36,43 +35,80 @@ function createWindow() {
         mainWindow = null
     });
 
-    newBrowserWindow = new BrowserWindow({
+    BrowserHistory = new BrowserWindow({//历史记录
         width: 800, 
         frame: false
     })
-    newBrowserWindow.loadURL(url.format({
+    BrowserHistory.loadURL(url.format({
         pathname: path.join(__dirname, 'history.html'),
         protocol: 'file:',
         slashes: true
     }));
-    // newBrowserWindow.hide();
-    ipc.on('BrowserWindow-show-window', function () {//显示
-        if(newBrowserWindow){
-            newBrowserWindow.hide();
-            newBrowserWindow = null
+    BrowserHistory.hide();
+    ipc.on('BrowserHistory-show-window', function () {//显示
+        if(BrowserHistory){
+            BrowserHistory.hide();
+            BrowserHistory = null
         }
-        newBrowserWindow = new BrowserWindow({
+        BrowserHistory = new BrowserWindow({
             width: 800, 
             frame: false
         })
-        newBrowserWindow.loadURL(url.format({
+        BrowserHistory.loadURL(url.format({
             pathname: path.join(__dirname, 'history.html'),
             protocol: 'file:',
             slashes: true
         }));
-        newBrowserWindow.show();
+        BrowserHistory.show();
     });
-    ipc.on('BrowserWindow-close-window', function () {//隐藏
-        newBrowserWindow.hide();
-        newBrowserWindow = null
+    ipc.on('BrowserHistory-close-window', function () {//隐藏
+        BrowserHistory.hide();
+        BrowserHistory = null
     });
-    ipc.on('BrowserWindow-hide-window', function () {//隐藏
-        newBrowserWindow.hide();
-        newBrowserWindow = null
+    ipc.on('BrowserHistory-hide-window', function () {//隐藏
+        BrowserHistory.hide();
+        BrowserHistory = null
     });
-    newBrowserWindow.webContents.openDevTools();
-    newBrowserWindow.on('closed', function () {
-        newBrowserWindow = null
+    BrowserHistory.on('closed', function () {
+        BrowserHistory = null
+    });
+
+    BrowserFeedback = new BrowserWindow({//反馈
+        width: 800, 
+        frame: false
+    })
+    BrowserFeedback.loadURL(url.format({
+        pathname: path.join(__dirname, 'history.html'),
+        protocol: 'file:',
+        slashes: true
+    }));
+    BrowserFeedback.hide();
+    ipc.on('BrowserFeedback-show-window', function () {//显示
+        if(BrowserFeedback){
+            BrowserFeedback.hide();
+            BrowserFeedback = null
+        }
+        BrowserFeedback = new BrowserWindow({
+            width: 800, 
+            frame: false
+        })
+        BrowserFeedback.loadURL(url.format({
+            pathname: path.join(__dirname, 'feedback.html'),
+            protocol: 'file:',
+            slashes: true
+        }));
+        BrowserFeedback.show();
+    });
+    ipc.on('BrowserFeedback-close-window', function () {//隐藏
+        BrowserFeedback.hide();
+        BrowserFeedback = null
+    });
+    ipc.on('BrowserFeedback-hide-window', function () {//隐藏
+        BrowserFeedback.hide();
+        BrowserFeedback = null
+    });
+    BrowserFeedback.on('closed', function () {
+        BrowserFeedback = null
     });
     
 }