Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl

src/renderer/src/views/components/headers/components/setPup/components/setting.vue

@@ -677,6 +677,12 @@ const intoBack = async () => {
   const electron = require('electron')
   const { ipcRenderer } = require('electron')
 
+  const token = localStorage.getItem('Authorization')
+  if (!token) {
+    ElMessage({ message: '请先登录后再进入后台管理', type: 'error' })
+    return
+  }
+
   let availablePort = await ipcRenderer.invoke('get-available-port')
 
   let baseURL = localStorage.getItem('ip')
@@ -710,7 +716,7 @@ const intoBack = async () => {
         },
         // `http://localhost:${availablePort}/backManage/index.html#/login?timestamp=${Date.now()}`,
         `${baseURL}/index.html#/login?timestamp=${Date.now()}`,
-        {},
+        { Authorization: token },
         id
       )
     } catch (error) {

src/renderer/src/views/login/useLogin.ts

@@ -81,7 +81,7 @@ export const useLogin = () => {
       })
       localStorage.setItem('frontFunctionArr', JSON.stringify(obj))
       //数据权限
-      let dataArr:any = []
+      let dataArr: any[] = []
       res.data.roleOperates.forEach(item => {
         dataArr.push(item.operate)
       })