From a16b825c3b8bb21d0d6e5c2558e3843b217b7ab9 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Mon, 16 Sep 2019 00:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/App.vue           | 2 +-
 src/renderer/utils/request.js  | 8 +++-----
 src/renderer/views/Setting.vue | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 22b7dffe..bb1cba77 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -132,7 +132,7 @@ export default {
 
       this.initData()
       this.globalObj.apiSource = this.setting.apiSource
-      this.globalObj.proxy = this.setting.network.proxy
+      this.globalObj.proxy = Object.assign({}, this.setting.network.proxy)
       window.globalObj = this.globalObj
     },
     enableIgnoreMouseEvents() {
diff --git a/src/renderer/utils/request.js b/src/renderer/utils/request.js
index 510d43f4..bb450d90 100644
--- a/src/renderer/utils/request.js
+++ b/src/renderer/utils/request.js
@@ -217,11 +217,9 @@ export const http_jsonp = (url, options, callback) => {
   })
 }
 
-const getProxyInfo = () => {
-  return window.globalObj.proxy.enable
-    ? `http://${window.globalObj.proxy.username}:${window.globalObj.proxy.password}@${window.globalObj.proxy.host}:${window.globalObj.proxy.port};`
-    : undefined
-}
+const getProxyInfo = () => window.globalObj.proxy.enable
+  ? `http://${window.globalObj.proxy.username}:${window.globalObj.proxy.password}@${window.globalObj.proxy.host}:${window.globalObj.proxy.port};`
+  : undefined
 
 const fatchData = (url, method, options, callback) => {
   // console.log(url, options)
diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue
index b7d57644..3db049bf 100644
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -64,10 +64,10 @@ div.scroll(:class="$style.setting")
         material-checkbox(id="setting_list_showalbum" v-model="current_setting.list.isShowAlbumName" label="是否显示专辑栏")
     dt 网络设置
     dd
-      h3 代理设置
+      h3 代理设置（歌曲下载暂不支持代理）
       div
         p
-          material-checkbox(id="setting_network_proxy_enable" v-model="current_setting.network.proxy.enable" @change="handleProxyChange('enabel')" label="是否启用")
+          material-checkbox(id="setting_network_proxy_enable" v-model="current_setting.network.proxy.enable" @change="handleProxyChange('enable')" label="是否启用")
         p
           material-input(:class="$style.gapLeft" v-model="current_setting.network.proxy.host" @change="handleProxyChange('host')" placeholder="主机")
           material-input(:class="$style.gapLeft" v-model="current_setting.network.proxy.port" @change="handleProxyChange('port')" placeholder="端口")